Skip to content

feat: Flixter - Pull Request to base repo #64

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.

Sign up for GitHub

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

Open
jasynj wants to merge 19 commits into
base: main
Choose a base branch
from
Open

feat: Flixter - Pull Request to base repo #64

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a212b3b
feat: created MovieCard component that displays data from API
jasynj Jun 10, 2025
d5fe3a0
feat: Added movielist component
jasynj Jun 10, 2025
7c520e9
Created search-form
jasynj Jun 10, 2025
1cfb8fb
feat: IMPLEMENTED WEBSITE DESIGN, chose color scheme and website them…
jasynj Jun 10, 2025
0e35622
feat: added load more button
jasynj Jun 10, 2025
d07ab11
Added responsive design for Add.header
jasynj Jun 10, 2025
915b10f
feat: add MovieModal and CSS for dynamic movie detail popup, updated …
jasynj Jun 11, 2025
5cd679c
chore: add .env to gitignore
jasynj Jun 11, 2025
402ac4c
style: tweaked modal info grid arrangement, converted px units to rem
jasynj Jun 11, 2025
656266e
feat: Implemented drop-down menu and functionality
jasynj Jun 11, 2025
40afa37
feat: add favorite/watched toggles and sidebar navigation with filtering
jasynj Jun 11, 2025
ebffc7e
style: Updated liked/watched icons and edited sidebar styling
jasynj Jun 11, 2025
594f8a5
bugfix: connected sidebar.css
jasynj Jun 11, 2025
420d182
feat: added modal thumbnails for video preview
jasynj Jun 11, 2025
53e5c83
style: final changes and formatting
jasynj Jun 13, 2025
b8198a1
Bugfix: moved header to front
jasynj Jun 13, 2025
b237211
Update README.md
jasynj Jun 13, 2025
bcc4e0a
Added walkthrough video to README
jasynj Jun 13, 2025
8536e31
Update src/index.css
jasynj Jun 18, 2025
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
56 changes: 50 additions & 6 deletions src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,65 @@
.header
{
/* display: ; */
}

.title
{

background-color: #1a1a1a;
/* background-color: red; */
z-index: 10000;
height: 70px;
display: flex;
/* flex-direction: row; */
align-items: center;
justify-content: center;

/* background-color: #282c34; */
/* display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between; */
Comment on lines +14 to +18
Copy link
Copy Markdown

@ishanbalar ishanbalar Jun 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commented lines lead to un-readable code, Please avoid having them

color: white;
/* padding-bottom: 1.5rem: */
position: fixed;
top: 20;
width: 100%;
z-index: 1000;

text-transform: uppercase;
/* box-shadow: inset 1px 1px 50px 9px rgba(67, 30, 30, 0.9); */
}

.title h1
{
font-size: 3.2rem;
font-weight: 700;
letter-spacing: 0.25rem;
}

.App {
text-align: center;
display: flex;
flex-direction: column;
min-height: 100vh;
overflow-x: hidden;
}

.App-header {
background-color: #282c34;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
/* justify-content: space-between; */
color: white;
padding: 1.5rem;
position: fixed;
top: 65px;
width: 100%;
z-index: 1000;

/* margin-left: 20rem; */
}

.App-main {
Expand All @@ -29,12 +73,12 @@
background-color: #282c34;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
align-items: right;
justify-content: right;
color: white;
padding: 1.5rem;
width: 100%;
margin-left: 18rem;
/* margin-left: 18rem; */


text-align: center;
Expand Down Expand Up @@ -63,10 +107,10 @@
}
@media (max-width: 768px) {
.App-main {
margin-left: 60px; /* Match collapsed sidebar width */
margin-left: 60px;
}

.App-footer {
margin-left: 60px; /* Match collapsed sidebar width */
margin-left: 60px;
}
}
20 changes: 12 additions & 8 deletions src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,18 @@ const App = () => {

return (
<div className="App">
<header className="App-header">
<h1>Flixster</h1>
{currentPage === 'home' && (
<>
<SearchForm onSearch={handleSearch} onClear={handleClearSearch} />
<SortForm onSortChange={handleSortChange} />
</>
)}
<header className="header">
<div class="title">
<h1>Flixster</h1>
</div>
<banner className="App-header">
{currentPage === 'home' && (
<>
<SearchForm onSearch={handleSearch} onClear={handleClearSearch} />
<SortForm onSortChange={handleSortChange} />
</>
)}
</banner>
</header>

<SideBar currentPage={currentPage} onPageChange={handlePageChange} />
Expand Down
2 changes: 1 addition & 1 deletion src/MovieCard.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
.vote-average {
background-color: #fa5252;
color: black;
padding: 0.2rem 0.5rem;
padding: 0.5rem 1rem;
margin: 0.05rem auto;
border-radius: 4px;
font-weight: bold;
Expand Down
4 changes: 3 additions & 1 deletion src/SearchForm.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
{
width: 100%;

padding-left: 200px;
padding-right: 200px;

Comment on lines +4 to +13
Copy link
Copy Markdown

@ishanbalar ishanbalar Jun 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove empty lines and format the code across all files

display: flex;
align-items: center;
Expand All @@ -21,7 +23,7 @@

border: 0.1rem solid rgba(250, 82, 82, 0.6);
border-right: none;
width: 50vw;
width: 30vw;

padding: 1rem 1rem;
/* margin-right: 2rem; */
Expand Down
4 changes: 2 additions & 2 deletions src/SideBar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
width: 20rem;
left: 0;
top: 0;
padding-top: 10rem;
padding-top: 17rem;
box-shadow: 2px 0 5px rgba(0, 0, 0, 0.3);
z-index: 900;
}
Expand Down Expand Up @@ -40,7 +40,7 @@

.side-bar-link:hover {
background-color: #333;
color: #fa5252;
color: rgb(250, 82, 82);
}

.side-bar-link.active {
Expand Down