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

Feat/my page #52

Open
wants to merge 141 commits into
base: feature/mypage
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
fcabaf0
chore: 커밋테스트
dongbin420 Jul 10, 2023
0fc8519
chore: FE브랜치 action설정 이전 커밋
dongbin420 Jul 10, 2023
bf235af
depoly.yml 파일 추가
dongbin420 Jul 10, 2023
32c4635
setup .github폴더위치 루트로 이동
dongbin420 Jul 10, 2023
09cca7b
Merge branch 'FE' of https://github.com/dongbin420/seb44_main_024 int…
dongbin420 Jul 10, 2023
c8fdb18
fix/에러사항 수정
k22y22 Jul 10, 2023
ed18206
Merge branch 'FE' of https://github.com/dongbin420/seb44_main_024 int…
dongbin420 Jul 10, 2023
05623a9
fix: 에러수정
dongbin420 Jul 10, 2023
51a377a
Merge pull request #1 from dongbin420/feat/리뷰작성
dongbin420 Jul 10, 2023
14f02b1
fix: yml 파일 수정
dongbin420 Jul 10, 2023
44f310b
Merge pull request #2 from dongbin420/feat/리뷰작성
dongbin420 Jul 10, 2023
9aa3fa1
feat/json 서버 생성, 로그인 상태 전역 설정
k22y22 Jul 10, 2023
d2d940c
remove/필요없는 함수 제거
k22y22 Jul 11, 2023
5b5b9be
Merge pull request #3 from dongbin420/feat/test-server-login
k22y22 Jul 11, 2023
064e5a1
feat/jwt 토큰 저장 설정
k22y22 Jul 11, 2023
f1ee581
Merge pull request #4 from dongbin420/feat/test-jwt
k22y22 Jul 11, 2023
5af2814
refactor: 데이터 리팩토링 및 http 작업
dongbin420 Jul 11, 2023
9614fe3
refactor
k22y22 Jul 12, 2023
88524e6
리뷰 페이지네이션 기능
dongbin420 Jul 12, 2023
4975a40
fix: 리뷰 태그 버그 수정
dongbin420 Jul 13, 2023
c32303a
refactor: 리뷰 페이지네이션 컴포넌트화
dongbin420 Jul 13, 2023
9d363d5
feat: 리뷰수정 기능추가
dongbin420 Jul 13, 2023
594f1b3
feat/token 구현
k22y22 Jul 13, 2023
a3d58a7
Merge pull request #5 from dongbin420/feat/test-jwt-cookie
k22y22 Jul 13, 2023
174b00f
feat/인가코드까지 받아옴
k22y22 Jul 13, 2023
e208a90
리뷰삭제요청 및 mockupdata수정
dongbin420 Jul 13, 2023
5f50ed4
Merge branch 'FE' of https://github.com/dongbin420/seb44_main_024 int…
dongbin420 Jul 13, 2023
4e0b7ec
Merge pull request #6 from dongbin420/feat/리뷰작성
dongbin420 Jul 13, 2023
1752e5c
메인페이지(header, 영화 배열)
Seunghyun-FE Jul 14, 2023
816caae
feat/네이버 인증코드 받아옴
k22y22 Jul 14, 2023
59b6b4e
feat/카카오 로그인 at 받아오기
k22y22 Jul 14, 2023
7606e5e
Merge branch 'FE' into feat/mainpage
Seunghyun-FE Jul 14, 2023
e3fe374
기본 라우터 설정
Seunghyun-FE Jul 14, 2023
0b2b702
Update App.tsx
Seunghyun-FE Jul 14, 2023
3eb9c79
Squashed commit of the following:
Seunghyun-FE Jul 14, 2023
bafda5a
스타일링 개선, 스크롤 효과
dongbin420 Jul 14, 2023
2f74364
Merge branch 'FE' of https://github.com/dongbin420/seb44_main_024 int…
dongbin420 Jul 14, 2023
cd87167
refactor/코드리뷰반영
k22y22 Jul 16, 2023
f1aa6cd
fix/confilct 해결 후 merge
k22y22 Jul 16, 2023
eb74434
Merge pull request #8 from dongbin420/feat/Oauth
k22y22 Jul 16, 2023
35a0a6b
fix/app 순서 변경
k22y22 Jul 16, 2023
a1e72b3
feat: 이미지모달, 배역, 헤더적용 css
dongbin420 Jul 16, 2023
def1718
Merge branch 'FE' of https://github.com/dongbin420/seb44_main_024 int…
dongbin420 Jul 16, 2023
2c12615
Merge pull request #9 from dongbin420/feat/details-page-css
dongbin420 Jul 16, 2023
cda9cf1
feat/로딩 스피너 추가
k22y22 Jul 17, 2023
d1b196a
remove/로그인 확인용 함수 삭제
k22y22 Jul 17, 2023
c16251c
feat: 추천영화 및 에러핸들링 임시
dongbin420 Jul 17, 2023
2a319f9
Merge pull request #10 from dongbin420/feat/details-recommend
dongbin420 Jul 17, 2023
ad50492
feat/에러페이지 구현
k22y22 Jul 17, 2023
234d3c4
Merge pull request #11 from dongbin420/feat/redirectPage
k22y22 Jul 17, 2023
12c8fcd
Merge pull request #12 from dongbin420/feat/errorPage
k22y22 Jul 17, 2023
5fdc734
fix/에러이미지 경로수정
k22y22 Jul 17, 2023
58e6471
fi/안쓰는 함수삭제
k22y22 Jul 17, 2023
249833f
feat: searchPage 생성, 라우터 추가
dongbin420 Jul 17, 2023
24b13bb
chore: main.tsx 충돌해결
dongbin420 Jul 17, 2023
174fdae
feat: 검색페이지 1차
dongbin420 Jul 17, 2023
e13f5d1
fix: header, movieposter컴포넌트 수정
dongbin420 Jul 18, 2023
94730fe
Merge pull request #13 from dongbin420/feat/search
dongbin420 Jul 18, 2023
2fa6373
refactor/상태가 아닌 쿠키로 로그인 관리하도록 변경
k22y22 Jul 18, 2023
e9f39cc
Merge pull request #14 from dongbin420/refactor/cookie-login
k22y22 Jul 18, 2023
e28866b
feat: 댓글 작성폼
dongbin420 Jul 18, 2023
2984b07
refactor/버튼rounded, 헤더에 딱붙는 로그인 페이지 수정
k22y22 Jul 18, 2023
7cf1fec
Merge pull request #15 from dongbin420/refactor/design
k22y22 Jul 18, 2023
c764b1b
feat: 댓글 crud 틀 구성
dongbin420 Jul 18, 2023
207c49a
fix: tags배열 '#'제거, html태그에 '#'추가
dongbin420 Jul 18, 2023
70e340c
Merge branch 'FE' of https://github.com/dongbin420/seb44_main_024 int…
dongbin420 Jul 18, 2023
19abe2c
fix: 상세페이지 로그인관련 수정
dongbin420 Jul 18, 2023
010dcfe
Merge pull request #16 from dongbin420/feat/comment
dongbin420 Jul 18, 2023
19a56fd
fix: 데이터관련 백엔드 요청반영
dongbin420 Jul 18, 2023
b36c281
feat/중복가입 에러 설정
k22y22 Jul 19, 2023
8b2973d
refactor/as 없게 수정
k22y22 Jul 19, 2023
fc1a25d
Merge pull request #17 from dongbin420/feat/signup
k22y22 Jul 19, 2023
03cfbb3
chore: 스크롤효과 버그 수정전 커밋
dongbin420 Jul 19, 2023
2e5911d
fix:상세페이지 스크롤효과 수정
dongbin420 Jul 19, 2023
48fa0f0
fix: 인물사진 변경, 상세페이지 메인 노란색배경으로 변경
dongbin420 Jul 20, 2023
555ec68
로그인 기능 제외 상세페이지 http요청 임시완료, header수정
dongbin420 Jul 20, 2023
5ffd969
인물 검색 링크걸기, 리뷰모달 유효성검사
dongbin420 Jul 20, 2023
4154705
fix: 필요없는 주석 제거 및 수정, 유저 default 프로필사진 변경
dongbin420 Jul 20, 2023
6cdb9fa
Merge branch 'FE' of https://github.com/dongbin420/seb44_main_024 int…
dongbin420 Jul 20, 2023
7dcdc2d
fix: 이미지모달 수정, 예고편 링크 수정, 영화정보 조건부 렌더링
dongbin420 Jul 20, 2023
7b18437
remove: search 목업데이터 삭제
dongbin420 Jul 20, 2023
fe7931c
Merge pull request #18 from dongbin420/refactor/details-page-http
dongbin420 Jul 20, 2023
1799b90
remove/json-server 삭제
k22y22 Jul 20, 2023
f89a9f4
feat/주소변경
k22y22 Jul 20, 2023
ca9a0b3
fix: css스크롤효과 제거
dongbin420 Jul 20, 2023
61266cf
Merge pull request #19 from dongbin420/refactor/details-page-http
dongbin420 Jul 20, 2023
07889be
기본 구조 설계
sonagi98 Jul 14, 2023
6849179
feat/공통으로 사용되는 영화 목록 컴포넌트 추가
sonagi98 Jul 19, 2023
7ea8dcb
feat/ 장르정보 삭제, 프로필이미지 컴포넌트 분리
sonagi98 Jul 19, 2023
f77fd91
remove/주소오타
k22y22 Jul 20, 2023
05a713a
feat/css 적용
sonagi98 Jul 20, 2023
1e8450b
fix/ css 수정
sonagi98 Jul 21, 2023
e082c6f
fix: 수정된 api에 따라 수정, 상세페이지 메인css 수정
dongbin420 Jul 21, 2023
6128642
페이지 연결
sonagi98 Jul 21, 2023
124aa14
feat / 정보 수정 화면 구현
sonagi98 Jul 21, 2023
daea1c0
리프레시 토큰도 쿠키에 저장
k22y22 Jul 21, 2023
b869e6a
remove: json-서버 관련 삭제
k22y22 Jul 21, 2023
2acd7be
fix: 스크롤효과 적용, 이전 주석 제거
dongbin420 Jul 21, 2023
2129a14
Merge branch 'FE' of https://github.com/dongbin420/seb44_main_024 int…
dongbin420 Jul 21, 2023
6bf7126
Merge pull request #20 from dongbin420/refactor/details-page-http
dongbin420 Jul 21, 2023
b7891f9
Merge branch 'FE' of https://github.com/dongbin420/seb44_main_024 int…
dongbin420 Jul 21, 2023
5334404
feat/사이트이름설정
k22y22 Jul 21, 2023
e4a93e1
주석 삭제, 수정
sonagi98 Jul 21, 2023
9b33b2f
Merge pull request #21 from dongbin420/feat/mypage
sonagi98 Jul 21, 2023
cef2810
Merge pull request #22 from dongbin420/feat/login-signup-server
k22y22 Jul 21, 2023
f9b03ee
Merge branch 'FE' of https://github.com/dongbin420/seb44_main_024 int…
dongbin420 Jul 21, 2023
8766874
fix: 상세페이지 로그인 필요한 요청 조건문, 토큰 추가
dongbin420 Jul 21, 2023
be0fa1d
fix: 감독 이미지 링크 버그 수정
dongbin420 Jul 21, 2023
dac211b
remove:필요없는 쿠키 삭제
k22y22 Jul 23, 2023
85e3ccf
Merge pull request #23 from dongbin420/feat/login-signup-server
k22y22 Jul 23, 2023
1d110b5
feat. 카테고리페이지, footer
Seunghyun-FE Jul 23, 2023
374e281
Merge branch 'feat/categories' into FE
Seunghyun-FE Jul 23, 2023
4221830
fix. 몇가지 수정
Seunghyun-FE Jul 23, 2023
dac14f0
Merge branch 'FE' of https://github.com/dongbin420/seb44_main_024 int…
dongbin420 Jul 23, 2023
011e541
fix: movieId추가, 링크 스크롤 효과, 리뷰유저관련
dongbin420 Jul 23, 2023
aacfed5
Merge pull request #24 from dongbin420/refactor/details-page-http
dongbin420 Jul 23, 2023
2489f9a
feat: 상세페이지 리뷰태그 링크 추가
dongbin420 Jul 23, 2023
21de532
feat/쿠키다시 설정하고 로그아웃 구현
k22y22 Jul 23, 2023
79e14f8
Merge pull request #25 from dongbin420/feat/log-out
k22y22 Jul 23, 2023
1e31e53
Merge branch 'FE' of https://github.com/dongbin420/seb44_main_024 int…
dongbin420 Jul 23, 2023
022e815
refactor:콘솔로그 삭제
k22y22 Jul 23, 2023
a0a13b1
Merge branch 'FE' of https://github.com/dongbin420/seb44_main_024 int…
dongbin420 Jul 24, 2023
38438eb
feat/mypage 구성
sonagi98 Jul 21, 2023
0427a3a
종속성 변경
sonagi98 Jul 23, 2023
ba342d7
fix/ props 수정
sonagi98 Jul 24, 2023
9bcf887
주석 수정
sonagi98 Jul 24, 2023
d6b5d22
Merge pull request #26 from dongbin420/feat/my_page
sonagi98 Jul 24, 2023
36aed7a
fix. 쿠키 확인 기능 및 형식 수정
Seunghyun-FE Jul 24, 2023
b47411d
fix: 로그인 상태 적용, 기타 리뷰관련 버그 수정
dongbin420 Jul 24, 2023
532f6ae
Merge branch 'FE' of https://github.com/dongbin420/seb44_main_024 int…
dongbin420 Jul 24, 2023
98efe17
Merge pull request #27 from dongbin420/refactor/details-page-http
dongbin420 Jul 24, 2023
a3b4c70
remove / 사용하지 않는 api 삭제
sonagi98 Jul 24, 2023
14e6ba8
feat/ 유저정보 api 연결
sonagi98 Jul 24, 2023
375a0b9
feat / 리뷰 보기, 북마크 보기 api 연결
sonagi98 Jul 24, 2023
8816388
fix/ 빌드 오류 수정
sonagi98 Jul 24, 2023
93e4f33
주석 삭제
sonagi98 Jul 24, 2023
dfa25ee
fix/ 빌드오류수정
sonagi98 Jul 24, 2023
8341a70
remove:안쓰는함수삭제
k22y22 Jul 24, 2023
f60d31b
feat / 계정 삭제 버튼 추가
sonagi98 Jul 24, 2023
81d237d
fix/ unthorization 문제 수정
sonagi98 Jul 24, 2023
97fe114
fix / 정보가 로딩된 후 화면 렌더링되도록 변경
sonagi98 Jul 24, 2023
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
93 changes: 89 additions & 4 deletions client/package-lock.json

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

8 changes: 6 additions & 2 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,24 @@
},
"dependencies": {
"@reduxjs/toolkit": "^1.9.5",
"@types/pica": "^9.0.1",
"@types/react-redux": "^7.1.25",
"@types/react-router-dom": "^5.3.3",
"axios": "^1.4.0",
"pica": "^9.0.1",
"react": "^18.2.0",
"react-cookie": "^4.1.1",
"react-dom": "^18.2.0",
"react-icons": "^4.10.1",
"react-rating-stars-component": "^2.2.0",
"react-redux": "^8.1.1",
"react-router-dom": "^6.14.1"
"react-router-dom": "^6.14.1",
"react-spinners": "^0.13.8"
},
"devDependencies": {
"@types/node": "^20.4.0",
"@types/react": "^18.0.37",
"@types/react-dom": "^18.0.11",
"@types/react-router-dom": "^5.3.3",
"@typescript-eslint/eslint-plugin": "^5.60.1",
"@typescript-eslint/parser": "^5.60.1",
"@vitejs/plugin-react": "^4.0.0",
Expand Down
Binary file added client/public/img/errorImg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 39 additions & 0 deletions client/public/mockupdata/highscoredata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"data": [
{
"docId": "K28661",
"title": "스파이더맨: 어크로스 더 유니버스",
"repRlsDate": "20230602",
"score": 4.6,
"posterUrl": "https://i.namu.wiki/i/YaOX0b7cNnR9sLNgLAncoYcIHJ71PLcvP1FC89HWvwGxoXG6wuUlXAsBFHI_f6lvahFXRhljZis-zI4PFA1ys4wJtoBgYIINQCAPNWqW-uo2Lk3nNu_NMLvMI9vbWPhfBoqYdY8s5C7NOtKPMFiqGA.webp"
},
{
"docId": "K28662",
"title": "인터스텔라",
"repRlsDate": "20141107",
"score": 4.5,
"posterUrl": "https://i.namu.wiki/i/ei0XJc1X5aV2Z9rEN1L9BnJVfQ0VfizGdGK3QTFwhz5QXOxGSeZ2zWcJsvFZ2FjXl23ajEOeCE4msO1EZ6xHFMDi_YafkaoFB9jPS7HExnYJMmwbJxh2XStOdh4Wtp24sTKvTAsltpYceUiOcgwa-Q.webp"
},
{
"docId": "K28663",
"title": "겨울왕국",
"repRlsDate": "20131127",
"score": 4.3,
"posterUrl": "https://i.namu.wiki/i/mvGynWOsOvDngjMlad2Kz5JxZQ1BqcTtPkAg2P3oE5FA6RAvYTAlcbt8rP8iNjBC4kQ3z4JLJRg1m6IzLkKrOjAmss32AVu_4uedeWfsjmunm61tfxeDGQd-VYt51nhpJjMaoxTwhm9KLmxcMJrsdQ.webp"
},
{
"docId": "K28664",
"title": "범죄와의 전쟁",
"repRlsDate": "20120202",
"score": 4.1,
"posterUrl": "https://i.namu.wiki/i/kUuVAVNy0jTXcSQ6xPvGDpN9BUOkdxtPuki4RCYHpb9eD5YFYbvbsPWNerBfqTIqGeTzB2OF9EJ1RyA6PNXVi0vRzY0d3dQsSzgkpRw75xsonNpl3ZPX2uhr9Gc6NBLLKqy4UT0DmeqdIy9SnpvnoQ.webp"
},
{
"docId": "K28665",
"title": "해리포터와 마법사의 돌",
"repRlsDate": "20011114",
"score": 4.0,
"posterUrl": "https://i.namu.wiki/i/_pr1mVcm6gjM8u7gz6kDuVfUSOn0UeYrXDPNWNHAVRS0FikoDjTpg9hBOBo3erF-FK5FRkkJgqZd8GmfHia3Y-8JpbWdXxBqF0vQCAD--iXiAb1D2O82ZgHCZlxS1whQdPiwgTxvCV4BN9bxdXZTYQ.webp"
}
]
}
100 changes: 0 additions & 100 deletions client/public/mockupdata/moviedetails.json

This file was deleted.

Loading