Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
d1792de
feat(App): modified App.js
yunsaeng Nov 27, 2022
7286922
feat(Header): modified Header.js
yunsaeng Nov 27, 2022
54ea620
feat(Header): modified Header.js
yunsaeng Nov 27, 2022
65b6d95
feat(Main): delete Main.jsx
yunsaeng Nov 27, 2022
8e08e84
feat(Signin): delete Signin.jsx
yunsaeng Nov 27, 2022
d69caff
feat(Signup): delete Signup.jsx
yunsaeng Nov 27, 2022
3465fda
feat(Signin): add Signin.js
yunsaeng Nov 27, 2022
3e4533c
feat(Signup): add Signup.js
yunsaeng Nov 27, 2022
f50c29c
fix: fix Header.css error #13
yerinjo Nov 28, 2022
561f777
fix: fix Header.js error
yerinjo Nov 29, 2022
c1f1850
feat: add header margin-bottom
yerinjo Nov 29, 2022
c2ac89a
fix: relocate code
yerinjo Nov 29, 2022
0bea6ce
fix: relocate code
yerinjo Nov 29, 2022
9998d77
fix: change option hover color #13
yerinjo Nov 29, 2022
042832a
feat: add header/li css
yerinjo Nov 29, 2022
9672965
feat: add header/li css
yerinjo Nov 29, 2022
43df207
feat: link to signup/in #13
yerinjo Nov 29, 2022
58b53d9
feat: link to signup/in #13
yerinjo Nov 29, 2022
2b4a920
feat: btn to homepage #13
yerinjo Nov 29, 2022
9ad375b
feat: btn to hompage #13
yerinjo Nov 29, 2022
86d31dc
fix: signup/in page title name #13
yerinjo Dec 2, 2022
c78002c
feat: add react-responsive 9.0.2 #16
yerinjo Dec 2, 2022
5708d75
feat: add list hover css #15
yerinjo Dec 3, 2022
fa1c971
feat: add className, poster block #movieinfo
yerinjo Dec 3, 2022
be2b5a4
feat: add movieinfo css
yerinjo Dec 3, 2022
1ea159f
feat: add movieinfo poster to movielist.js
yerinjo Dec 3, 2022
dbb6b28
fix: change signin/up bg color #sign/up css
yerinjo Dec 3, 2022
4c06bb9
fix: change signup btn link #signup.js
yerinjo Dec 3, 2022
982a683
feat: add hover option #signin/up css
yerinjo Dec 4, 2022
1fe775c
fix: change poster->img #movieinfo/list.js
yerinjo Dec 4, 2022
11dabf9
feat: movieinfo poster size change #movieinfo.css
yerinjo Dec 5, 2022
8f81578
feat: gride movieinfo #movielist.css
yerinjo Dec 5, 2022
206d276
fix: fix className #movieinfo.js
yerinjo Dec 5, 2022
5e76bb6
fix: add ul className #movielist.js
yerinjo Dec 5, 2022
93b6ca8
feat: add movie textbox css #movieinfo.css
yerinjo Dec 6, 2022
bf7ebd6
fix: add div className #movieinfo.js
yerinjo Dec 6, 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
75 changes: 75 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"@testing-library/user-event": "^13.5.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-responsive": "^9.0.2",
"react-router-dom": "^6.4.3",
"react-scripts": "5.0.1",
"recoil": "^0.7.6",
Expand Down
4 changes: 4 additions & 0 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import Popular from './pages/Popular';
import Romance from './pages/Romance';
import Science from './pages/Science';
import Search from './pages/Search';
import Signin from './pages/Signin';
import Signup from './pages/Signup';

const DUMMY_MOVIES = [
{
Expand Down Expand Up @@ -67,6 +69,8 @@ const App = () => (
<Route path="/animation" element={<Animation movies={DUMMY_MOVIES} />} />
<Route path="/romance" element={<Romance movies={DUMMY_MOVIES} />} />
<Route path="/science" element={<Science movies={DUMMY_MOVIES} />} />
<Route path="/SignIn" element={<Signin />} />
<Route path="/SignUp" element={<Signup />} />
<Route path="/search/:title" element={<Search movies={DUMMY_MOVIES} />} />
</Routes>
</BrowserRouter>
Expand Down
19 changes: 12 additions & 7 deletions src/components/Header/Header.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ a{
font-size:15px
}

div {
.header-option{
box-sizing: content-box;
width: 100%;
color: #1b2035;
right: 30px;
padding-top: 30px;
cursor: pointer;
Expand All @@ -26,7 +25,7 @@ option{


option:hover{
color:#9c5eb8;
color:#c9418c;
}

nav {
Expand All @@ -39,9 +38,11 @@ nav {
#nav3 {
width: 100%;
text-align: center;

margin-bottom: 60px;

}
#nav3>h1 {

.homebtn {
line-height: 80px;
display: block;
font-size: 30px;
Expand All @@ -50,9 +51,11 @@ nav {
left: 30px;
background: linear-gradient(to right top, #2c9fbc,#c9418c);
color: transparent;
-webkit-background-clip: text;
background-clip: text;
}



#nav3>ul {
display: inline-block;
}
Expand All @@ -66,8 +69,10 @@ nav {
list-style: none;
}

li:hover{
.header-ul li:hover{
color:#c9418c;
transform:translateY(-5px);
transition: 0.8s;

}

Expand Down
56 changes: 29 additions & 27 deletions src/components/Header/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,37 @@ import { Link } from 'react-router-dom';

const Header = () => (
<header>
<div>
<option>
<Link to="Sign In">Sign In</Link>
</option>
<option>
<Link to="Sign Up">Sign Up</Link>
</option>
<option>
<Link to="Log Out">Log Out</Link>
</option>
<div className="header-option">
<Link to="/SignIn">
<option>Sign In</option>
</Link>
<Link to="/SignUp">
<option>Sign Up</option>
</Link>
<Link to="/">
<option>Log Out</option>
</Link>
</div>
<nav id="nav3">
<h1>OSS-Project</h1>
<ul>
<li>
<Link to="/popular">Popular</Link>{' '}
</li>
<li>
<Link to="/animation">Animation</Link>
</li>
<li>
<Link to="/romance">Romance</Link>
</li>
<li>
<Link to="/science">Science Fiction</Link>
</li>
<li>
<Link to="/action">Action</Link>
</li>
<Link to="/">
<h1 className="homebtn">OSS-Project</h1>
</Link>
<ul className="header-ul">
<Link to="/popular">
<li>Popular</li>
</Link>
<Link to="/animation">
<li>Animation</li>
</Link>
<Link to="/romance">
<li>Romance</li>
</Link>
<Link to="/science">
<li>Science Fiction</li>
</Link>
<Link to="/action">
<li>Action</li>
</Link>
</ul>
<form>
<input type="text" />
Expand Down
21 changes: 16 additions & 5 deletions src/components/Movies/MovieInfo.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
import './movieinfo.css';

// import styled from 'styled-components';

const MovieInfo = (props) => (
<li>
<h2>{props.title}</h2>
<div>{props.genre}</div>
<div>{props.rank}</div>
</li>
<div className="movie-info">
<li className="movie-container">
<div className="movie-poster">
<img alt="movieIMG" src={props.img} />
</div>
<div className="movie-box">
<h1 className="movie-title">{props.title}</h1>
<div className="movie-genre">{props.genre}</div>
<div className="movie-rank">{props.rank}</div>
</div>
</li>
</div>
);

export default MovieInfo;
6 changes: 4 additions & 2 deletions src/components/Movies/MovieList.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import './movielist.css';

import MovieInfo from './MovieInfo';

const MovieList = (props) => (
<ul>
<ul className="movie-list">
{props.movies.map((movie) => (
<MovieInfo key={movie.id} title={movie.title} genre={movie.genre} rank={movie.rank} />
<MovieInfo key={movie.id} img={movie.img} title={movie.title} genre={movie.genre} rank={movie.rank} />
))}
</ul>
);
Expand Down
35 changes: 35 additions & 0 deletions src/components/Movies/movieinfo.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
.movie-info{
margin-top: 50px;
display:flex;
justify-content:center;
}


.movie-poster img {
position:relative;
padding-top:5%;
width: 80%;
height: 100%;

}



.movie-container {
margin-bottom: 8rem;
display: flex;
flex-basis: 30%;
width: 320px;
height: 400px;
background: #fff;
box-shadow: 4px 4px 14px 0px #cacaca;
}

.movie-title {
font-weight: 900;
background: linear-gradient(to right top, #2c9fbc,#c9418c);
color: transparent;
background-clip: text;
}


4 changes: 4 additions & 0 deletions src/components/Movies/movielist.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.movie-list{
display: grid;

}
7 changes: 0 additions & 7 deletions src/pages/Main.jsx

This file was deleted.

Loading