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/final adjustment #49

Open
wants to merge 98 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 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
702f2b8
Merge pull request #44 from hamadmh/nina/stylingbranch
hamadmh Nov 17, 2022
67afc8d
styling
ninaderochka Nov 17, 2022
5c61aa1
styling
ninaderochka Nov 17, 2022
8ccd390
Merge branch 'main' into nina/stylingHome
ninaderochka Nov 18, 2022
e4b7d3c
filter functiion with added filter list to the navbar, added style to…
BaraaNazar Nov 18, 2022
fd3c995
Merge branch 'main' into Baraa/filter-Function
BaraaNazar Nov 18, 2022
317ebef
Merge pull request #45 from hamadmh/nina/stylingHome
hamadmh Nov 18, 2022
3299a12
fixing js
ninaderochka Nov 18, 2022
36fd9a2
fixed the gender in the single actor page
hamadmh Nov 18, 2022
d6131b5
Merge branch 'main' into Baraa/filter-Function
ninaderochka Nov 18, 2022
afa0307
Merge pull request #47 from hamadmh/Mohammed/gender-single-actor-page
hamadmh Nov 18, 2022
5ad5a07
styling
ninaderochka Nov 18, 2022
2f9a460
5 movies he/she's known for
hamadmh Nov 18, 2022
7994216
Merge pull request #48 from hamadmh/nina/test
hamadmh Nov 18, 2022
322eea6
Merge pull request #49 from hamadmh/Mohammed/single-actor-known-for
hamadmh Nov 18, 2022
6d0f5dc
related movies
hamadmh Nov 18, 2022
2ccd7cd
code looks nicer
hamadmh Nov 18, 2022
e233244
responsive now
hamadmh Nov 18, 2022
765dace
fixed the movie and it's discription
hamadmh Nov 19, 2022
e56f1c0
Merge branch 'main' into Baraa/filter-Function
ninaderochka Nov 19, 2022
337af8d
Merge pull request #46 from hamadmh/Baraa/filter-Function
ninaderochka Nov 19, 2022
4fb1edf
adjudtment
ninaderochka Nov 19, 2022
196981b
last version
BaraaNazar Nov 19, 2022
a108190
Merge branch 'main' into Baraa/Last-version-of-code
BaraaNazar Nov 19, 2022
56458b6
Merge pull request #50 from hamadmh/Baraa/Last-version-of-code
BaraaNazar Nov 19, 2022
d433807
last updated version
BaraaNazar Nov 19, 2022
0380718
last updated version of the project
BaraaNazar Nov 19, 2022
cb0e937
final adjustment
ninaderochka Nov 19, 2022
5b4b158
Merge branch 'main' into nina/finalAdjustment
ninaderochka Nov 19, 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
Binary file added .DS_Store
Binary file not shown.
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"liveServer.settings.port": 5504
}
116 changes: 116 additions & 0 deletions about.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width,initial-scale=1">
<link rel="stylesheet" href="style.css">
<script src="https://cdn.tailwindcss.com"></script>
<title>Movie</title>
</head>

<body class="bg-black">
<nav class="bg-white border-gray-200 dark:border-gray-600 dark:bg-gray-900">
<div class="flex flex-wrap justify-between items-center mx-auto max-w-screen-xl px-4 md:px-6 py-2.5">
<a href="./index.html" class="flex items-center">
<img src="./muggles logo.png" class="mr-3 h-6 sm:h-9" alt="Muggles">
<span class="self-center text-xl font-semibold whitespace-nowrap dark:text-white"></span>
</a>
<button onclick="toggleItNavbar()" data-collapse-toggle="mega-menu-full" type="button" class="inline-flex items-center p-2 ml-1 text-sm text-grey-700 rounded-lg md:hidden hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-gray-200 dark:text-gray-400 dark:hover:bg-gray-700 dark:focus:ring-gray-600" aria-controls="mega-menu-full" aria-expanded="false">
<span class="sr-only">Open main menu</span>
<svg class="w-6 h-6" aria-hidden="true" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M3 5a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zM3 10a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zM3 15a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1z" clip-rule="evenodd"></path></svg>
</button>
<div id="mega-menu-full" class="hidden justify-between items-center w-full md:flex md:w-auto md:order-1">
<ul class="flex flex-col p-4 mt-4 rounded-lg border border-gray-100 md:flex-row md:space-x-8 md:mt-0 md:text-sm md:font-medium md:border-0 md:bg-white dark:bg-gray-800 md:dark:bg-gray-900 dark:border-gray-700">
<li>
<a href="./index.html" class="block py-2 pr-4 pl-3 text-gray-700 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-red-700 md:p-0 dark:text-gray-400 md:dark:hover:text-red-500 dark:hover:bg-gray-700 dark:hover:text-red-500 md:dark:hover:bg-transparent dark:border-gray-700" aria-current="page">Home</a>
</li>
<li>
<button onclick="toggleIt()" id="mega-menu-full-dropdown-button" data-collapse-toggle="mega-menu-full-dropdown" class=" flex justify-between items-center py-2 pr-4 pl-3 w-full font-medium text-gray-700 rounded md:w-auto hover:bg-gray-100 md:hover:bg-transparent md:border-0 md:hover:text-red-600 md:p-0 dark:text-gray-400 md:dark:hover:text-red-500 dark:hover:bg-gray-700 dark:hover:text-red-500 md:dark:hover:bg-transparent dark:border-gray-700">Movies <svg class="ml-1 w-5 h-5 " fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z" clip-rule="evenodd"></path></svg></button>
</li>
<li>
<a href="./actorslist.html" class="block py-2 pr-4 pl-3 text-gray-700 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-red-700 md:p-0 dark:text-gray-400 md:dark:hover:text-red-500 dark:hover:bg-gray-700 dark:hover:text-red-500 md:dark:hover:bg-transparent dark:border-gray-700">Actors</a>
</li>
<li>
<a href="./about.html" class="block py-2 pr-4 pl-3 text-gray-700 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-red-700 md:p-0 dark:text-gray-400 md:dark:hover:text-red-500 dark:hover:bg-gray-700 dark:hover:text-red-500 md:dark:hover:bg-transparent dark:border-gray-700">About</a>
</li>
</ul>
</div>
</div>
<div id="mega-menu-full-dropdown" class="mt-1 bg-gray-50 border-gray-200 shadow-sm md:bg-white border-y dark:bg-gray-800 dark:border-gray-600">
<div id="movieGenres" class="genres grid py-5 px-4 mx-auto max-w-screen-xl text-gray-900 dark:text-white sm:grid-cols-2 md:px-6 hidden ">
</div>
</div>
</nav>
<!-- start of Search Bar -->
<div class="flex items-center z-10">
<div class="relative w-full">
<div class="absolute inset-y-0 left-0 flex items-center pl-3 pointer-events-none">
<svg aria-hidden="true" class="w-5 h-5 text-gray-500 dark:text-gray-400" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M8 4a4 4 0 100 8 4 4 0 000-8zM2 8a6 6 0 1110.89 3.476l4.817 4.817a1 1 0 01-1.414 1.414l-4.816-4.816A6 6 0 012 8z" clip-rule="evenodd"></path></svg>
</div>
<input id="movie-search-box" type="text" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg z-10 focus:ring-red-500 focus:border-red-500 block w-full pl-10 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-red-500 dark:focus:border-red-500" placeholder="Search for movies, actors..." required>
</div>
<button id="movie-search-btn" type="submit" class="inline-flex items-center py-2.5 px-3 ml-2 text-sm font-medium text-white bg-red rounded-lg border border-red hover:bg-red-800 focus:ring-4 focus:outline-none focus:ring-red-300 dark:bg-red-600 dark:hover:bg-red dark:focus:ring-red-800">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" style="fill: rgb(255, 255, 255);transform: msFilter"><path d="m11.293 17.293 1.414 1.414L19.414 12l-6.707-6.707-1.414 1.414L15.586 11H6v2h9.586z"></path></svg>
</button>
</div>
<div class="absolute flex flex-col search-list" id="search-list">
<div id="errorMessage" class="text-lg text-red-600"></div>
<ul id="render-search" class="text-black bg-white rounded-sm poflex search-list-item dark:bg-gray-900 dark:text-gray-100 dark:hover:bg-gray-700 dark:focus:ring-gray-600">
</ul>
</div>
</div>
<!-- end of Search Bar -->

<main><div class="w-cover">
<h1>About Us</h1>
<h3>This is a movie website, where you can watch the latest movies, their actors, their rating, and everything else in between.</h3></div>
</main>


<footer class="bg-black font-gotham">
<div class="max-w-7xl mx-auto py-12 px-4 overflow-hidden sm:px-6 lg:px-8">

<nav class="-mx-5 -my-2 flex flex-wrap justify-center" aria-label="Footer">
<div class="px-5 py-2">
<a href="https://github.com/BaraaNazar" class="text-base text-white hover:text-red-500">
Baraa
</a>
</div>
<div class="px-5 py-2">
<a href="https://github.com/hamadmh" class="text-base text-white hover:text-red-500">
Mohammed
</a>
</div>
<div class="px-5 py-2">
<a href="https://github.com/ninaderochka" class="text-base text-white hover:text-red-500">
Nina
</a>
</div>
</nav>

<div class="mt-8 flex justify-center space-x-6">
<a href="#" class="text-gray-400 hover:text-white">
<span class="sr-only">Facebook</span>
<svg class="h-6 w-6" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
<path fill-rule="evenodd" d="M22 12c0-5.523-4.477-10-10-10S2 6.477 2 12c0 4.991 3.657 9.128 8.438 9.878v-6.987h-2.54V12h2.54V9.797c0-2.506 1.492-3.89 3.777-3.89 1.094 0 2.238.195 2.238.195v2.46h-1.26c-1.243 0-1.63.771-1.63 1.562V12h2.773l-.443 2.89h-2.33v6.988C18.343 21.128 22 16.991 22 12z" clip-rule="evenodd" />
</svg>
</a>
<a href="#" class="text-gray-400 hover:text-white">
<span class="sr-only">Instagram</span>
<svg class="h-6 w-6" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
<path fill-rule="evenodd" d="M12.315 2c2.43 0 2.784.013 3.808.06 1.064.049 1.791.218 2.427.465a4.902 4.902 0 011.772 1.153 4.902 4.902 0 011.153 1.772c.247.636.416 1.363.465 2.427.048 1.067.06 1.407.06 4.123v.08c0 2.643-.012 2.987-.06 4.043-.049 1.064-.218 1.791-.465 2.427a4.902 4.902 0 01-1.153 1.772 4.902 4.902 0 01-1.772 1.153c-.636.247-1.363.416-2.427.465-1.067.048-1.407.06-4.123.06h-.08c-2.643 0-2.987-.012-4.043-.06-1.064-.049-1.791-.218-2.427-.465a4.902 4.902 0 01-1.772-1.153 4.902 4.902 0 01-1.153-1.772c-.247-.636-.416-1.363-.465-2.427-.047-1.024-.06-1.379-.06-3.808v-.63c0-2.43.013-2.784.06-3.808.049-1.064.218-1.791.465-2.427a4.902 4.902 0 011.153-1.772A4.902 4.902 0 015.45 2.525c.636-.247 1.363-.416 2.427-.465C8.901 2.013 9.256 2 11.685 2h.63zm-.081 1.802h-.468c-2.456 0-2.784.011-3.807.058-.975.045-1.504.207-1.857.344-.467.182-.8.398-1.15.748-.35.35-.566.683-.748 1.15-.137.353-.3.882-.344 1.857-.047 1.023-.058 1.351-.058 3.807v.468c0 2.456.011 2.784.058 3.807.045.975.207 1.504.344 1.857.182.466.399.8.748 1.15.35.35.683.566 1.15.748.353.137.882.3 1.857.344 1.054.048 1.37.058 4.041.058h.08c2.597 0 2.917-.01 3.96-.058.976-.045 1.505-.207 1.858-.344.466-.182.8-.398 1.15-.748.35-.35.566-.683.748-1.15.137-.353.3-.882.344-1.857.048-1.055.058-1.37.058-4.041v-.08c0-2.597-.01-2.917-.058-3.96-.045-.976-.207-1.505-.344-1.858a3.097 3.097 0 00-.748-1.15 3.098 3.098 0 00-1.15-.748c-.353-.137-.882-.3-1.857-.344-1.023-.047-1.351-.058-3.807-.058zM12 6.865a5.135 5.135 0 110 10.27 5.135 5.135 0 010-10.27zm0 1.802a3.333 3.333 0 100 6.666 3.333 3.333 0 000-6.666zm5.338-3.205a1.2 1.2 0 110 2.4 1.2 1.2 0 010-2.4z" clip-rule="evenodd" />
</svg>
</a>
<a href="#" class="text-gray-400 hover:text-white">
<span class="sr-only">github</span>
<svg class="h-6 w-6" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
<path fill-rule="evenodd" d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z" clip-rule="evenodd" />
</svg>
</a>
</div>

<p class="mt-8 text-center text-base text-gray-400">
&copy; 2022 Muggles Team, All rights reserved.
</p>
</div>
</footer>
</body>
</html>
Loading