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

[5주차] ForgetMeNot 미션 제출합니다 #4

Closed
wants to merge 75 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
6cec7e8
feat : next.js 세팅
JeeeunOh Nov 7, 2022
240f742
feat : readMe 수정
JeeeunOh Nov 7, 2022
6ab37a5
feat : nextJS로 app 세팅
JeeeunOh Nov 7, 2022
c921076
fix : 쓸데없는 코드 다 지우기
JeeeunOh Nov 7, 2022
010591d
feat : 라우터 구성
JeeeunOh Nov 7, 2022
903c49a
(chaeyeon) style: change global.css
chaeyeonan Nov 7, 2022
1c4d617
(chaeyeon) style: change container/main css
chaeyeonan Nov 7, 2022
9a6ea9a
feat : 네비게이터 png 추가
JeeeunOh Nov 7, 2022
530be51
feat : styled-components 세팅
JeeeunOh Nov 7, 2022
4ae25d3
Merge remote-tracking branch 'origin/chaeyeon' into 0909oje
JeeeunOh Nov 7, 2022
8a26c58
fix : 네비게이터 작업중
JeeeunOh Nov 7, 2022
2c8cb9b
feat: detail page 초안
chaeyeonan Nov 7, 2022
90e4fc5
feat : 네비게이션 바 추가
JeeeunOh Nov 7, 2022
c31c476
fix : 라우터 링크 리스트 삭제
JeeeunOh Nov 7, 2022
70becae
영화 카테고리 컴포넌트 생성
JeeeunOh Nov 7, 2022
d4d0251
feat : 메인영화 밑 버튼 세팅
JeeeunOh Nov 7, 2022
4ba5335
feat: search page 초안
chaeyeonan Nov 8, 2022
aeec980
ongoing: png -> svg
chaeyeonan Nov 8, 2022
2b1e0a9
ongoing: import svg
chaeyeonan Nov 8, 2022
8ae3560
fix : svg 적용
JeeeunOh Nov 8, 2022
e0830e1
fix : 이미지 svg로 변경
JeeeunOh Nov 8, 2022
88ae9e3
feat : 애니메이션 2초 보여주고 home 진입
JeeeunOh Nov 8, 2022
b6bc589
fix : 애니메이션 지속 시간 수정
JeeeunOh Nov 8, 2022
6e69797
svg 이미지 경로 변경
chaeyeonan Nov 9, 2022
355fa26
fix: icon 확장자 svg로 변환
chaeyeonan Nov 9, 2022
87fc34e
fix : 커밍쑨, 다운로드 작동 안하게 수정
JeeeunOh Nov 9, 2022
e41ddb2
feat : preview 이미지 서버에서 가져옴
JeeeunOh Nov 9, 2022
55227de
feat : info 안에 영화 데이터 배열 담기
JeeeunOh Nov 9, 2022
7cc63a5
feat : 카테고리별로 다른 사진 뜨게 설정
JeeeunOh Nov 9, 2022
9196de5
feat : home -> detail 연결
JeeeunOh Nov 9, 2022
e7f9557
fix : 네비게이터에서 detail 페이지 삭제
JeeeunOh Nov 9, 2022
14c2bd2
chore : 쓸데없는 주석 삭제
JeeeunOh Nov 9, 2022
7644abd
Merge branch 'chaeyeon' into 0909oje
JeeeunOh Nov 9, 2022
bb9c0f7
fix : 로고 수정
JeeeunOh Nov 9, 2022
158e4a1
feat: search page api 연결
chaeyeonan Nov 9, 2022
6ed3655
fix : 영화 이미지 비율 수정
JeeeunOh Nov 9, 2022
ac163a8
fix : 이미지 파일들 asset/img/로 이동
JeeeunOh Nov 9, 2022
6ad82f8
feat: 검색 기능 완료
chaeyeonan Nov 9, 2022
bdd7edb
fix : 글씨 css 수정
JeeeunOh Nov 9, 2022
a2b0fb3
Merge branch 'chaeyeon' into 0909oje
JeeeunOh Nov 9, 2022
12f05dd
fix : 폴더구조 바꾼것 반영
JeeeunOh Nov 9, 2022
471e5fc
feat: search 리스트에서 detail 연결
chaeyeonan Nov 9, 2022
0055d72
fix: 필요없는 이미지 삭제
chaeyeonan Nov 9, 2022
4f84a71
우당탕탕
JeeeunOh Nov 9, 2022
d722164
feat : pageProps
JeeeunOh Nov 9, 2022
434f1db
for pull
chaeyeonan Nov 9, 2022
75d5d02
Merge branch '0909oje' of https://github.com/ForgetMeNot-FE/next-netf…
chaeyeonan Nov 9, 2022
acc385f
feat: search page getServerSideProps
chaeyeonan Nov 9, 2022
390ea6e
fix: change search api path
chaeyeonan Nov 9, 2022
75d0321
feat : api 연결 완료
JeeeunOh Nov 9, 2022
38b13d2
Merge branch 'chaeyeon' into 0909oje
JeeeunOh Nov 9, 2022
4cdb9d5
feat : merge
JeeeunOh Nov 9, 2022
3ce4ccc
fix : roundImg 이미지 깨짐 수정
JeeeunOh Nov 9, 2022
1465197
feat : detail 페이지 SSR 적용
JeeeunOh Nov 10, 2022
fd61a58
fix : 쓸데없는 코드 삭제
JeeeunOh Nov 10, 2022
d5ddeeb
fix : 라운드 이미지 깨짐 수정
JeeeunOh Nov 10, 2022
b958cf6
fix : title 폰트사이즈 수정
JeeeunOh Nov 10, 2022
e1c4601
Update README.md
JeeeunOh Nov 10, 2022
00317a1
Update README.md
JeeeunOh Nov 10, 2022
afe699f
feat: for pull
chaeyeonan Nov 11, 2022
921b60c
fix: image 파일 경로 변경 & naviagtion 수정
chaeyeonan Nov 11, 2022
ebc0a5a
feat: 서치페이지 부분 스크롤 추가
chaeyeonan Nov 11, 2022
e821fed
fix: 전체적인 디자인 수정
chaeyeonan Nov 11, 2022
b96b93c
fix: 쓸데없는 코드 수정
chaeyeonan Nov 11, 2022
9cfd602
Merge pull request #1 from ForgetMeNot-FE/chaeyeon
chaeyeonan Nov 11, 2022
3100f69
fix: key 오류 수정
chaeyeonan Nov 11, 2022
003f91a
fix: key 오류 수정
chaeyeonan Nov 11, 2022
b070641
Merge pull request #2 from ForgetMeNot-FE/chaeyeon
chaeyeonan Nov 11, 2022
9d2e7f4
fix: 마지막 key 수정이길..
chaeyeonan Nov 11, 2022
13ed30a
Merge pull request #3 from ForgetMeNot-FE/chaeyeon
chaeyeonan Nov 11, 2022
635c68b
fix: 진짜진짜 마지막 key 오류 수정
chaeyeonan Nov 11, 2022
4d99757
Merge pull request #4 from ForgetMeNot-FE/chaeyeon
chaeyeonan Nov 11, 2022
d1610a1
fix: 진짜 최종
chaeyeonan Nov 11, 2022
74ade68
Merge pull request #5 from ForgetMeNot-FE/chaeyeon
chaeyeonan Nov 11, 2022
d5015f5
fix : api 관련 변수들 api-info에 모아놓기
JeeeunOh Nov 12, 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 app/asset/netflix.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 22 additions & 3 deletions app/pages/index.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,28 @@
import styles from "../styles/Home.module.css";
import { useEffect } from "react";
import netflix from "../asset/netflix.gif";
import styled from "styled-components";

export default function Home() {

useEffect(() => {
setTimeout(function(){
location.href='home';
}, 2000)
Copy link

Choose a reason for hiding this comment

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

헛 저희도 이 방법 사용했는데 애니메이션 보여주는 시간 정하는 것도 은근 까다롭더라구용 ㅎㅎ

});

return (
<div className={styles.container}>
<main className={styles.main}>넷플릭스 로고 띄워야함</main>
</div>
<Container>
<GIF src={netflix.src}/>
</Container>
);
}

const Container = styled.div`
display: relative;
`
const GIF = styled.img`
position: absolute;
top: 20%;
width: 100%;
`