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.

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

Jump to bottom

[6주차] Team Buldog 김다희 & 이지인 미션 제출합니다. #15

Open
wants to merge 97 commits into
base: master
Choose a base branch
from
Open

[6주차] Team Buldog 김다희 & 이지인 미션 제출합니다. #15

wants to merge 97 commits into from

Commits on May 6, 2024

  1. feat : 초기 설정

    @jinnyleeis
    jinnyleeis committed May 6, 2024
    Configuration menu
    Copy the full SHA
    d8d1945 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from jinnyleeis/master 

    feat : 초기 설정
    @jinnyleeis
    jinnyleeis authored May 6, 2024
    Configuration menu
    Copy the full SHA
    09683ee View commit details
    Browse the repository at this point in the history

  3. style : global font

    @jinnyleeis
    jinnyleeis committed May 6, 2024
    Configuration menu
    Copy the full SHA
    aeb9628 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2 from jinnyleeis/master 

    style : global font
    @jinnyleeis
    jinnyleeis authored May 6, 2024
    Configuration menu
    Copy the full SHA
    b97d1fb View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. feat : tawilwind css, prettier setting

    @jinnyleeis
    jinnyleeis committed May 8, 2024
    Configuration menu
    Copy the full SHA
    7986c9f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from jinnyleeis/master 

    feat : tawilwind css, prettier setting
    @jinnyleeis
    jinnyleeis authored May 8, 2024
    Configuration menu
    Copy the full SHA
    1d9533d View commit details
    Browse the repository at this point in the history

  3. feat: 폰트 적용

    @Dahn12
    Dahn12 committed May 8, 2024
    Configuration menu
    Copy the full SHA
    5851f5e View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. feat: header 틀 완성

    @Dahn12
    Dahn12 committed May 9, 2024
    Configuration menu
    Copy the full SHA
    e2eb310 View commit details
    Browse the repository at this point in the history

  2. feat: navbar, controller 컴포넌트 틀 완성

    @Dahn12
    Dahn12 committed May 9, 2024
    Configuration menu
    Copy the full SHA
    7ef2794 View commit details
    Browse the repository at this point in the history

  3. feat: 컴포넌트 파일 생성

    @Dahn12
    Dahn12 committed May 9, 2024
    Configuration menu
    Copy the full SHA
    6e108ae View commit details
    Browse the repository at this point in the history

  4. fix: tailwind 다시 깔았음

    @Dahn12
    Dahn12 committed May 9, 2024
    Configuration menu
    Copy the full SHA
    3d2679a View commit details
    Browse the repository at this point in the history

  5. Revert "fix: tailwind 다시 깔았음" 

    This reverts commit 3d2679a.
    @Dahn12
    Dahn12 committed May 9, 2024
    Configuration menu
    Copy the full SHA
    f51edf3 View commit details
    Browse the repository at this point in the history

  6. fix: tailwind 수정 완료

    @Dahn12
    Dahn12 committed May 9, 2024
    Configuration menu
    Copy the full SHA
    63814cb View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. feat : api

    @jinnyleeis
    jinnyleeis committed May 10, 2024
    Configuration menu
    Copy the full SHA
    6d912a0 View commit details
    Browse the repository at this point in the history

  2. Create main.yml

    @jinnyleeis
    jinnyleeis authored May 10, 2024
    Configuration menu
    Copy the full SHA
    da57bd7 View commit details
    Browse the repository at this point in the history

  3. Update main.yml

    @jinnyleeis
    jinnyleeis authored May 10, 2024
    Configuration menu
    Copy the full SHA
    e650847 View commit details
    Browse the repository at this point in the history

  4. Update main.yml

    @jinnyleeis
    jinnyleeis authored May 10, 2024
    Configuration menu
    Copy the full SHA
    884bef0 View commit details
    Browse the repository at this point in the history

  5. Update main.yml

    @jinnyleeis
    jinnyleeis authored May 10, 2024
    Configuration menu
    Copy the full SHA
    6bf832f View commit details
    Browse the repository at this point in the history

  6. Update main.yml

    @jinnyleeis
    jinnyleeis authored May 10, 2024
    Configuration menu
    Copy the full SHA
    daa4189 View commit details
    Browse the repository at this point in the history

  7. Update main.yml

    @jinnyleeis
    jinnyleeis authored May 10, 2024
    Configuration menu
    Copy the full SHA
    396e052 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #4 from team-Buldok/fixTailwind 

    Fix tailwind
    @jinnyleeis
    jinnyleeis authored May 10, 2024
    Configuration menu
    Copy the full SHA
    acfb4de View commit details
    Browse the repository at this point in the history

  9. update packge.json

    @jinnyleeis
    jinnyleeis committed May 10, 2024
    Configuration menu
    Copy the full SHA
    87e17b5 View commit details
    Browse the repository at this point in the history

  10. Update package.json

    @jinnyleeis
    jinnyleeis committed May 10, 2024
    Configuration menu
    Copy the full SHA
    e7aa2a6 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' of https://github.com/jinnyleeis/next-netflix-19th

    @jinnyleeis
    jinnyleeis committed May 10, 2024
    Configuration menu
    Copy the full SHA
    5ad33e3 View commit details
    Browse the repository at this point in the history

  12. .

    @jinnyleeis
    jinnyleeis committed May 10, 2024
    Configuration menu
    Copy the full SHA
    c886d0d View commit details
    Browse the repository at this point in the history

  13. feat: Navbar 스타일링

    @Dahn12
    Dahn12 committed May 10, 2024
    Configuration menu
    Copy the full SHA
    0a1aae4 View commit details
    Browse the repository at this point in the history

  14. feat: header 스타일링

    @Dahn12
    Dahn12 committed May 10, 2024
    Configuration menu
    Copy the full SHA
    e2dd5ed View commit details
    Browse the repository at this point in the history

  15. fear : movie data feching api 구현, 캐러셀 구현

    @jinnyleeis
    jinnyleeis committed May 10, 2024
    Configuration menu
    Copy the full SHA
    1a30a03 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'jiinlee' into fixTailwind

    @jinnyleeis
    jinnyleeis committed May 10, 2024
    Configuration menu
    Copy the full SHA
    a7fd88f View commit details
    Browse the repository at this point in the history

  17. feat : 삭제

    @jinnyleeis
    jinnyleeis committed May 10, 2024
    Configuration menu
    Copy the full SHA
    dcb4dfc View commit details
    Browse the repository at this point in the history

  18. feat: controller 스타일링

    @Dahn12
    Dahn12 committed May 10, 2024
    Configuration menu
    Copy the full SHA
    5ffe34c View commit details
    Browse the repository at this point in the history

  19. Merge branch 'fixTailwind' of https://github.com/team-Buldok/next-net… 

    …flix-19th into fixTailwind
    @Dahn12
    Dahn12 committed May 10, 2024
    Configuration menu
    Copy the full SHA
    bdb3f57 View commit details
    Browse the repository at this point in the history

  20. fix: merge 후 확인

    @Dahn12
    Dahn12 committed May 10, 2024
    Configuration menu
    Copy the full SHA
    adbb45b View commit details
    Browse the repository at this point in the history

  21. feat: carousel 이미지 변환 구현 완료

    @Dahn12
    Dahn12 committed May 10, 2024
    Configuration menu
    Copy the full SHA
    d187927 View commit details
    Browse the repository at this point in the history

  22. docs: 불필요한 css 파일 삭제

    @Dahn12
    Dahn12 committed May 10, 2024
    Configuration menu
    Copy the full SHA
    57a7120 View commit details
    Browse the repository at this point in the history

  23. fix: global.css 수정

    @Dahn12
    Dahn12 committed May 10, 2024
    Configuration menu
    Copy the full SHA
    e39ed5b View commit details
    Browse the repository at this point in the history

  24. feat: landing logo 완성

    @Dahn12
    Dahn12 committed May 10, 2024
    Configuration menu
    Copy the full SHA
    5976212 View commit details
    Browse the repository at this point in the history

  25. feat : Mainlists 컴포넌트 분리

    @jinnyleeis
    jinnyleeis committed May 10, 2024
    Configuration menu
    Copy the full SHA
    a41cdce View commit details
    Browse the repository at this point in the history

  26. fix : carousel 이미지 비율 맞게 채워지도록 수정

    @Dahn12
    Dahn12 committed May 10, 2024
    Configuration menu
    Copy the full SHA
    7a3b9f9 View commit details
    Browse the repository at this point in the history

  27. Merge branch 'fixTailwind' of https://github.com/team-Buldok/next-net… 

    …flix-19th into fixTailwind
    @Dahn12
    Dahn12 committed May 10, 2024
    Configuration menu
    Copy the full SHA
    fd501d1 View commit details
    Browse the repository at this point in the history

  28. fix: mainlists 컴포넌트 이미지 사이즈 수정

    @Dahn12
    Dahn12 committed May 10, 2024
    Configuration menu
    Copy the full SHA
    4f9cfc8 View commit details
    Browse the repository at this point in the history

  29. feat: 전체 디자인 수정

    @Dahn12
    Dahn12 committed May 10, 2024
    Configuration menu
    Copy the full SHA
    a4ec9a8 View commit details
    Browse the repository at this point in the history

  30. Merge branch 'fixTailwind'

    @jinnyleeis
    jinnyleeis committed May 10, 2024
    Configuration menu
    Copy the full SHA
    0f411bf View commit details
    Browse the repository at this point in the history

  31. fix : 배포

    @jinnyleeis
    jinnyleeis committed May 10, 2024
    Configuration menu
    Copy the full SHA
    cc849c6 View commit details
    Browse the repository at this point in the history

  32. delete : 불필요 파일

    @jinnyleeis
    jinnyleeis committed May 10, 2024
    Configuration menu
    Copy the full SHA
    f2322d7 View commit details
    Browse the repository at this point in the history

  33. fix : change next-netflix -> src

    @jinnyleeis
    jinnyleeis committed May 10, 2024
    Configuration menu
    Copy the full SHA
    dbe0149 View commit details
    Browse the repository at this point in the history

  34. Merge pull request #5 from jinnyleeis/master 

    .
    @jinnyleeis
    jinnyleeis authored May 10, 2024
    Configuration menu
    Copy the full SHA
    4712125 View commit details
    Browse the repository at this point in the history

  35. fix : 배포

    @jinnyleeis
    jinnyleeis committed May 10, 2024
    Configuration menu
    Copy the full SHA
    ec4083c View commit details
    Browse the repository at this point in the history

  36. fix : 배포

    @jinnyleeis
    jinnyleeis committed May 10, 2024
    Configuration menu
    Copy the full SHA
    ab092e3 View commit details
    Browse the repository at this point in the history

  37. feat : preview 원형으로 , 스크롤바 삭제

    @jinnyleeis
    jinnyleeis committed May 10, 2024
    Configuration menu
    Copy the full SHA
    0c8ed24 View commit details
    Browse the repository at this point in the history

  38. refactor : api 기능 정리

    @jinnyleeis
    jinnyleeis committed May 10, 2024
    Configuration menu
    Copy the full SHA
    d170258 View commit details
    Browse the repository at this point in the history

  39. Merge pull request #6 from jinnyleeis/master 

    ,
    @jinnyleeis
    jinnyleeis authored May 10, 2024
    Configuration menu
    Copy the full SHA
    3b30736 View commit details
    Browse the repository at this point in the history

  40. .

    @jinnyleeis
    jinnyleeis committed May 10, 2024
    Configuration menu
    Copy the full SHA
    c2846d1 View commit details
    Browse the repository at this point in the history

  41. Merge branch 'master' of https://github.com/jinnyleeis/next-netflix-19th

    @jinnyleeis
    jinnyleeis committed May 10, 2024
    Configuration menu
    Copy the full SHA
    bebef4a View commit details
    Browse the repository at this point in the history

  42. fix : 파일 정리, 배포 해결

    @jinnyleeis
    jinnyleeis committed May 10, 2024
    Configuration menu
    Copy the full SHA
    800e6f3 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2024

  1. Merge pull request #7 from jinnyleeis/master 

    .
    @jinnyleeis
    jinnyleeis authored May 11, 2024
    Configuration menu
    Copy the full SHA
    1582c86 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2024

  1. fix : 넷플릭스 폰트 적용x 문제 해결

    @jinnyleeis
    jinnyleeis committed May 12, 2024
    Configuration menu
    Copy the full SHA
    201d8e8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8 from jinnyleeis/master 

    fix : 넷플릭스 폰트 적용x 문제 해결
    @jinnyleeis
    jinnyleeis authored May 12, 2024
    Configuration menu
    Copy the full SHA
    cdfe3b5 View commit details
    Browse the repository at this point in the history

  3. docs: package.json 불필요한 파일 삭제

    @Dahn12
    Dahn12 committed May 12, 2024
    Configuration menu
    Copy the full SHA
    f33a7a4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into Dahn12

    @Dahn12
    Dahn12 committed May 12, 2024
    Configuration menu
    Copy the full SHA
    007580b View commit details
    Browse the repository at this point in the history

  5. docs: package.json 불필요한 파일 삭제

    @Dahn12
    Dahn12 committed May 12, 2024
    Configuration menu
    Copy the full SHA
    80e6e47 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. feat : detail 동적 페이지, search 페이지 뼈대 추가

    @jinnyleeis
    jinnyleeis committed May 15, 2024
    Configuration menu
    Copy the full SHA
    5d19490 View commit details
    Browse the repository at this point in the history

  2. feat : navbar 아이콘 클릭에 따른 -> 페이지 라우팅

    @jinnyleeis
    jinnyleeis committed May 15, 2024
    Configuration menu
    Copy the full SHA
    c4a23d6 View commit details
    Browse the repository at this point in the history

  3. feat : current path에 따른, navitem 텍스트 색상 변화

    @jinnyleeis
    jinnyleeis committed May 15, 2024
    Configuration menu
    Copy the full SHA
    48a7c00 View commit details
    Browse the repository at this point in the history

  4. feat, fix : navbar 컴포넌트 공용 레이아웃으로 변경 

    navbar 컴포넌트 공용 레이아웃으로 변경
-> main 내에 있어서, mainlist 와 겹치는 문제 해결 -> 완전히 레이아웃에서 분리
최상위 경로에선 display : none으로 설정 (랜딩페이지에선 렌더링xx)
    @jinnyleeis
    jinnyleeis committed May 15, 2024
    Configuration menu
    Copy the full SHA
    1dbc8e7 View commit details
    Browse the repository at this point in the history

  5. Delete Nav-links.tsx

    @jinnyleeis
    jinnyleeis committed May 15, 2024
    Configuration menu
    Copy the full SHA
    6fb4411 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #9 from jinnyleeis/master 

    feat : 페이지 navigation
    @jinnyleeis
    jinnyleeis authored May 15, 2024
    Configuration menu
    Copy the full SHA
    2d47fc6 View commit details
    Browse the repository at this point in the history

  7. feat. : id에 따른 movie detail 받아오는 api 구현, delete : 불필요 img

    @jinnyleeis
    jinnyleeis committed May 15, 2024
    Configuration menu
    Copy the full SHA
    2573a61 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #10 from jinnyleeis/master 

    feat. : id에 따른 movie detail 받아오는 api 구현, delete : 불필요 img
    @jinnyleeis
    jinnyleeis authored May 15, 2024
    Configuration menu
    Copy the full SHA
    a521046 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. Merge branch 'master' into Dahn12

    @Dahn12
    Dahn12 committed May 16, 2024
    Configuration menu
    Copy the full SHA
    63b2d02 View commit details
    Browse the repository at this point in the history

  2. feat : detail 페이지, overview, poster img 추가

    @jinnyleeis
    jinnyleeis committed May 16, 2024
    Configuration menu
    Copy the full SHA
    5156966 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #11 from jinnyleeis/master 

    feat : detail 페이지, overview, poster img 추가
    @jinnyleeis
    jinnyleeis authored May 16, 2024
    Configuration menu
    Copy the full SHA
    d04d2b0 View commit details
    Browse the repository at this point in the history

  4. feat : 이미지 클릭 시 해당 영화 detail로 이동

    @jinnyleeis
    jinnyleeis committed May 16, 2024
    Configuration menu
    Copy the full SHA
    68a0df0 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #12 from jinnyleeis/master 

    feat : 이미지 클릭 시 해당 영화 detail로 이동
    @jinnyleeis
    jinnyleeis authored May 16, 2024
    Configuration menu
    Copy the full SHA
    bcccd56 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into Dahn12

    @Dahn12
    Dahn12 committed May 16, 2024
    Configuration menu
    Copy the full SHA
    a6c674d View commit details
    Browse the repository at this point in the history

  7. feat: searchpage, searchlist 틀잡기(기능, style x)

    @Dahn12
    Dahn12 committed May 16, 2024
    Configuration menu
    Copy the full SHA
    8ca7a51 View commit details
    Browse the repository at this point in the history

  8. feat: 검색 기능 구현

    @Dahn12
    Dahn12 committed May 16, 2024
    Configuration menu
    Copy the full SHA
    ccc4371 View commit details
    Browse the repository at this point in the history

  9. feat : api 1개로, main 페이지 서버 컴포넌트로 변경 

    utils -> movieAPI에 fetch 함수
이를 main 페이지에서 이용해서, 영화 정보 불러오기
클라이언트 컴포넌트인 search 페이지에서 api를 통해, 검색어에 따른 영화정보 불러올 수 있도록 구현
    @jinnyleeis
    jinnyleeis committed May 16, 2024
    Configuration menu
    Copy the full SHA
    3cd72e9 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #13 from jinnyleeis/master 

    feat : api 1개로, main 페이지 서버 컴포넌트로 변경
    @jinnyleeis
    jinnyleeis authored May 16, 2024
    Configuration menu
    Copy the full SHA
    c75a47c View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. fix : 검색 시 영화 정보 중복 문제

    @jinnyleeis
    jinnyleeis committed May 17, 2024
    Configuration menu
    Copy the full SHA
    80ff729 View commit details
    Browse the repository at this point in the history

  2. feat : http 요청 200번대인 이미지만 필터링하는 checkImage 함수 구현

    @jinnyleeis
    jinnyleeis committed May 17, 2024
    Configuration menu
    Copy the full SHA
    bc53ab9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'team-Buldok:master' into master

    @jinnyleeis
    jinnyleeis authored May 17, 2024
    Configuration menu
    Copy the full SHA
    d0fe966 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #14 from jinnyleeis/master 

    fix : 검색 페이지 영화 중복으로 뜨는 문제, 이미지 url 200번대 요청만 필터링
    @jinnyleeis
    jinnyleeis authored May 17, 2024
    Configuration menu
    Copy the full SHA
    09a57f1 View commit details
    Browse the repository at this point in the history

  5. feat: search page 일부 css

    @Dahn12
    Dahn12 committed May 17, 2024
    Configuration menu
    Copy the full SHA
    7b78d60 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into Dahn12 

    # Conflicts:
#	src/app/search/page.tsx
    @Dahn12
    Dahn12 committed May 17, 2024
    Configuration menu
    Copy the full SHA
    9baa23b View commit details
    Browse the repository at this point in the history

  7. feat: search page 디자인 완성

    @Dahn12
    Dahn12 committed May 17, 2024
    Configuration menu
    Copy the full SHA
    6c68820 View commit details
    Browse the repository at this point in the history

  8. feat : 미들웨어 추가, 404,403,각종 페이지 

    search에서 api 요청보내는 것과 - 직접 주소창에 /api url 입력하는것 fetch 인자에 header 추가해서 구분 -> middleware에서 이 header에 따라 api 실행 or rewrite할지 처리
    @jinnyleeis
    jinnyleeis committed May 17, 2024
    Configuration menu
    Copy the full SHA
    3b437d3 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #15 from jinnyleeis/master 

    feat : 미들웨어 추가, 404,403,각종 페이지
    @jinnyleeis
    jinnyleeis authored May 17, 2024
    Configuration menu
    Copy the full SHA
    90cee50 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'Dahn12' of https://github.com/team-Buldok/next-netflix-… 

    …19th into Dahn12
    @Dahn12
    Dahn12 committed May 17, 2024
    Configuration menu
    Copy the full SHA
    ef70e00 View commit details
    Browse the repository at this point in the history

  11. feat : 변하는 캐러셀 영화에 맞게, 영화 소개도 업데이트 되도록 수정 

    이를 위해 wrapper client- component인 movieindex 추가
이유 - main 페이지는 서버 컴포넌트로 유지하기 위해서, hook을 사용하지 못하므로
클라이언트 컴포넌트로 MovieINdex 컴포넌트 추가 (캐러셀, 컨트롤러 부모 컴포넌트)
    @jinnyleeis
    jinnyleeis committed May 17, 2024
    Configuration menu
    Copy the full SHA
    3a10bd3 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #16 from jinnyleeis/master 

    feat : 변하는 캐러셀 영화에 맞게, 영화 소개도 업데이트 되도록 수정
    @jinnyleeis
    jinnyleeis authored May 17, 2024
    Configuration menu
    Copy the full SHA
    276d090 View commit details
    Browse the repository at this point in the history

  13. feat: detailpage 디자인 완성

    @Dahn12
    Dahn12 committed May 17, 2024
    Configuration menu
    Copy the full SHA
    dab5391 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' into Dahn12 

    # Conflicts:
#	src/app/components/Carousel.tsx
    @Dahn12
    Dahn12 committed May 17, 2024
    Configuration menu
    Copy the full SHA
    e666e2e View commit details
    Browse the repository at this point in the history

  15. feat: image 그라데이션 적용

    @Dahn12
    Dahn12 committed May 17, 2024
    Configuration menu
    Copy the full SHA
    f13a673 View commit details
    Browse the repository at this point in the history

  16. fix: navbar 색상변경

    @Dahn12
    Dahn12 committed May 17, 2024
    Configuration menu
    Copy the full SHA
    cc2a320 View commit details
    Browse the repository at this point in the history

  17. fix: mainpage 밀림 수정

    @Dahn12
    Dahn12 committed May 17, 2024
    Configuration menu
    Copy the full SHA
    c04915f View commit details
    Browse the repository at this point in the history

  18. fix: search input focusing 제거

    @Dahn12
    Dahn12 committed May 17, 2024
    Configuration menu
    Copy the full SHA
    8dc6294 View commit details
    Browse the repository at this point in the history