Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nina/stylingbranch #46

Open
wants to merge 69 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
e9fa02f
Actors List + Cursor pointer
ninaderochka Nov 9, 2022
07a77e2
Merge pull request #19 from hamadmh/new-branch-/nina/actorslist
hamadmh Nov 10, 2022
70ac508
completed the Navbar
BaraaNazar Nov 10, 2022
8a6cd7b
Merge branch 'main' into NAVBAR
hamadmh Nov 10, 2022
152e613
Merge pull request #20 from hamadmh/NAVBAR
hamadmh Nov 10, 2022
3f528dd
fixed cursor
ninaderochka Nov 10, 2022
87a836c
Closed New Issues
ninaderochka Nov 11, 2022
ea9f6f1
Grid layout done
hamadmh Nov 12, 2022
2e36dcd
making the page
hamadmh Nov 12, 2022
1145dfb
Done
hamadmh Nov 12, 2022
89b9445
Merge pull request #25 from hamadmh/Mohammed/Grid_layout
hamadmh Nov 12, 2022
0a6cf97
Merge branch 'main' into Mohammed/About-us-page
BaraaNazar Nov 12, 2022
5e394d6
Merge pull request #24 from hamadmh/Mohammed/About-us-page
BaraaNazar Nov 12, 2022
b3c6e15
fix
hamadmh Nov 12, 2022
b6473f4
Merge pull request #23 from hamadmh/nina/trailer
hamadmh Nov 12, 2022
e94987c
Changes
ninaderochka Nov 12, 2022
72d7fa9
Merge branch 'main' into nina/trailer
hamadmh Nov 12, 2022
cd872ab
Merge pull request #26 from hamadmh/nina/trailer
hamadmh Nov 12, 2022
ba60f94
updated search bar and added fixed home button
BaraaNazar Nov 12, 2022
1d526a6
Merge branch 'main' into Baraa/search-box
hamadmh Nov 12, 2022
161e564
Merge pull request #27 from hamadmh/Baraa/search-box
hamadmh Nov 12, 2022
46907af
fixes
hamadmh Nov 12, 2022
f1f7eb2
updated search box
BaraaNazar Nov 12, 2022
7d7a18e
fixes
hamadmh Nov 12, 2022
ce0b82b
updated things
BaraaNazar Nov 12, 2022
4272a2a
Merge pull request #29 from hamadmh/Baraa/search-box
hamadmh Nov 12, 2022
78b74c6
fixes
hamadmh Nov 12, 2022
3b35ea7
updated search bar
BaraaNazar Nov 14, 2022
9a821c0
Production companies and logo
hamadmh Nov 14, 2022
7194002
Actors List
ninaderochka Nov 14, 2022
ce58701
Merge pull request #31 from hamadmh/Mohammed/single-movie-production
hamadmh Nov 14, 2022
6065df2
Merge branch 'main' into nina/actorsList
hamadmh Nov 14, 2022
807ea4d
Merge pull request #32 from hamadmh/nina/actorsList
hamadmh Nov 14, 2022
0613897
styling
ninaderochka Nov 14, 2022
c2bdf26
Merge branch 'main' into nina/styling
hamadmh Nov 15, 2022
2464f3b
Merge pull request #37 from hamadmh/nina/styling
hamadmh Nov 15, 2022
088db6b
Single Actors Page
ninaderochka Nov 15, 2022
5ce2d05
Merge branch 'main' into nina/singleActorsPage
hamadmh Nov 15, 2022
3e119e0
Merge pull request #38 from hamadmh/nina/singleActorsPage
hamadmh Nov 15, 2022
c6f08f9
companies
hamadmh Nov 15, 2022
9b01f00
Merge branch 'main' into Baraa/search-box
ninaderochka Nov 15, 2022
fd5da4b
Merge pull request #30 from hamadmh/Baraa/search-box
hamadmh Nov 15, 2022
de0f580
updated
BaraaNazar Nov 15, 2022
cb0ac1e
Merge branch 'main' into Baraa/Updated-searchbox
BaraaNazar Nov 15, 2022
0608f09
Merge pull request #39 from hamadmh/Baraa/Updated-searchbox
BaraaNazar Nov 15, 2022
e7b3990
Trying to fix main
ninaderochka Nov 15, 2022
b18de2e
lastUpdat on searchbar
BaraaNazar Nov 16, 2022
eaab77b
list updated
BaraaNazar Nov 16, 2022
2ea9be0
Merge pull request #40 from hamadmh/Baraa/lastUpdate-searchbar
hamadmh Nov 16, 2022
39942e1
working on genres
BaraaNazar Nov 16, 2022
6c41a49
fixes
hamadmh Nov 16, 2022
6cba4ff
movie genres in the single movie page
hamadmh Nov 16, 2022
ecf2f66
genres still don't work
hamadmh Nov 16, 2022
dbf607b
director
hamadmh Nov 16, 2022
1982a31
removed grid
ninaderochka Nov 17, 2022
3a623da
added toggle to the window to hide the list of searchbar
BaraaNazar Nov 17, 2022
0175c60
finished converting genres-ids to words
BaraaNazar Nov 17, 2022
a530844
Merge branch 'main' into Baraa/lastUpdate-searchbar
BaraaNazar Nov 17, 2022
5cb23c3
genres_ids to words
BaraaNazar Nov 17, 2022
c559ca5
Merge pull request #41 from hamadmh/Baraa/lastUpdate-searchbar
ninaderochka Nov 17, 2022
d6fd110
styling and other thing
BaraaNazar Nov 17, 2022
1eb4712
Merge branch 'main' into Baraa/styling-search-bar
BaraaNazar Nov 17, 2022
2ac8ec0
Styling homepage
ninaderochka Nov 17, 2022
b16b605
Merge pull request #42 from hamadmh/Baraa/styling-search-bar
ninaderochka Nov 17, 2022
88db5ef
Ajustment
ninaderochka Nov 17, 2022
60362f4
Styling
ninaderochka Nov 17, 2022
3c339c5
Merge branch 'main' into nina/stylingHome
hamadmh Nov 17, 2022
fafb65f
Merge pull request #43 from hamadmh/nina/stylingHome
hamadmh Nov 17, 2022
245c29d
Merge branch 'main' into nina/stylingbranch
hamadmh Nov 17, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
genres_ids to words
BaraaNazar committed Nov 17, 2022
commit 5cb23c3336f8aedda57d48d9dec66300b19d204e
35 changes: 0 additions & 35 deletions script.js
Original file line number Diff line number Diff line change
@@ -12,41 +12,6 @@ window.addEventListener("click", ()=>{
document.getElementById("render-search").classList.toggle("hidden")

})
// const genreTranslations ={
// 28:"Action",
// 12:"Adventure",
// 16:"Animation",
// 35:"Comedy",
// 80:"Crime",
// 99:"Documentary",
// 18:"Drama",
// 10751:"Family",
// 14:"Fantasy",
// 36:"History",
// 27:"Horror",
// 10402:"Music",
// 9648:"Mystery",
// 10749:"Romance",
// 878:"Science Fiction",
// 10770:"TV Movie",
// 53:"Thriller",
// 10752:"War",
// 37:"Western"
// }
// console.log(genres)
// let keys = Object.keys(genres)
// let values = Object.values(genres)
// console.log(keys)
// console.log(values)
// function convertGenres(key){
// if(keys === genres.keys)
// return genres.values}

// for(let i=0; i< genres.length; i++){
// let converter = genres[i].id
// converter = genres[i].name
// return converter
// }

// -----------------------