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

FE-27 🔀 브랜치 최신화 (충돌수정) #111

Merged
merged 80 commits into from
Jul 30, 2024
Merged

FE-27 🔀 브랜치 최신화 (충돌수정) #111

Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
4a0d730
Merge pull request #11 from epigram5-9/merge/FE-29
jangmoonwon Jul 10, 2024
8ee83af
:heavy_plus_sign: 이미지 파일 추가
jangmoonwon Jul 10, 2024
f472f6f
:lipstick: 로그인 페이지 레이아웃 생성
jangmoonwon Jul 10, 2024
5b33ad7
:lipstick: 로그인 페이지 UI 생성 및 반응형 디자인 구현
jangmoonwon Jul 10, 2024
f69dd4f
Merge branch 'epic/FE-29' into feat/FE-30--signin-page-ui
jangmoonwon Jul 10, 2024
342bf76
Merge pull request #13 from epigram5-9/feat/FE-30--signin-page-ui
jangmoonwon Jul 11, 2024
c38c937
FE-60 :sparkles: react hook form, zod 추가
jangmoonwon Jul 12, 2024
03c6928
FE-60 :lipstick: 로그인 폼 스타일 수정
jangmoonwon Jul 12, 2024
8717c2f
FE-60 :recycle: 로그인 스키마 분리
jangmoonwon Jul 12, 2024
665deb9
Merge pull request #20 from epigram5-9/feat/FE-60--signin-vaildate
jangmoonwon Jul 13, 2024
3b7f965
:twisted_rightwards_arrows: Merge branch 'epic/FE-29' into merge/FE-29
jangmoonwon Jul 14, 2024
bad3c27
Merge pull request #23 from epigram5-9/merge/FE-29
jangmoonwon Jul 15, 2024
07493a9
:sparkles: 로그인 응답 데이터 스키마 정의
jangmoonwon Jul 17, 2024
10c6440
:sparkles: 로그인 api 생성
jangmoonwon Jul 17, 2024
5392384
:sparkles: 요청과 응답에 관한 인터셉터 추가
jangmoonwon Jul 17, 2024
22106ac
:sparkles: useSignin mutation hook 생성
jangmoonwon Jul 17, 2024
e4bebb9
:zap: useSignin hook 로그인 폼에 적용
jangmoonwon Jul 17, 2024
74648e7
:lipstick: 회원가입 페이지 레이아웃 추가
jangmoonwon Jul 17, 2024
8a437d1
:lipstick: 간편 로그인 로고 추가
jangmoonwon Jul 17, 2024
9537b85
:lipstick: 회원가입 ui 추가
jangmoonwon Jul 17, 2024
7da1e94
Merge pull request #36 from epigram5-9/feat/FE-63
jangmoonwon Jul 18, 2024
61098fb
Merge pull request #37 from epigram5-9/feat/FE-67
jangmoonwon Jul 18, 2024
eb34b5d
:sparkles: 회원가입 스키마 정의
jangmoonwon Jul 18, 2024
eaaf1cc
:heavy_plus_sign: 회원가입 페이지에 스키마 적용
jangmoonwon Jul 18, 2024
dfb693a
:lipstick: 에러 메시지 뜰 때 라벨, 인풋도 같은 에러 색깔 추가
jangmoonwon Jul 18, 2024
c1305fc
:memo: 유효성 검사를 통한 버튼의 비활성화 처리
jangmoonwon Jul 18, 2024
91e1fff
:memo: 유효성 검사에 따른 인풋 테두리 색상 처리
jangmoonwon Jul 18, 2024
03d62c5
Merge pull request #40 from epigram5-9/feat/FE-68
jangmoonwon Jul 19, 2024
bfd7d3b
:fire: AuthLayout 삭제
jangmoonwon Jul 19, 2024
467a76c
:art: 회원가입 페이지 브라우저 확대시 ui 깨짐 수정
jangmoonwon Jul 19, 2024
bd48061
:truck: 정규표현식 네이밍 변경
jangmoonwon Jul 19, 2024
1256f61
Merge pull request #48 from epigram5-9/fix/FE-66
jangmoonwon Jul 20, 2024
265c6e7
🔀 Merge branch 'epic/FE-29' into merge/FE-29
jangmoonwon Jul 20, 2024
9a253df
Merge pull request #50 from epigram5-9/merge/FE-29
jangmoonwon Jul 21, 2024
a81913f
:fire: AuthLayout 삭제
jangmoonwon Jul 22, 2024
d7cc6ad
:art: onSubmit 함수 인라인으로 정의
jangmoonwon Jul 22, 2024
da2ccc7
:recycle: 응답 인터셉터의 에러 처리 및 토큰 갱신 로직 개선
jangmoonwon Jul 22, 2024
9f18429
:recycle: postSignin api 에러처리 로직 삭제
jangmoonwon Jul 22, 2024
ba68251
:fire: useSignin hook 삭제
jangmoonwon Jul 22, 2024
9b205a5
:truck: useSigninMutation hook으로 이름 변경 및 파일 이동
jangmoonwon Jul 22, 2024
243e509
:sparkles: Toaster 컴포넌트 추가
jangmoonwon Jul 22, 2024
2c484ba
:sparkles: toast로 에러메시지 띄우기
jangmoonwon Jul 22, 2024
e4b2064
Merge pull request #54 from epigram5-9/fix/FE-29
jangmoonwon Jul 22, 2024
c3b2e06
:twisted_rightwards_arrows: Merge branch 'epic/FE-66' into merge/FE-66
jangmoonwon Jul 22, 2024
36f4b58
Merge pull request #55 from epigram5-9/merge/FE-66
jangmoonwon Jul 22, 2024
70d45e4
:sparkles: 회원가입 응답 데이터 스키마 정의
jangmoonwon Jul 23, 2024
f79b702
:sparkles: 회원가입 api 생성
jangmoonwon Jul 23, 2024
8ba0103
:sparkles: useRegisterMutation hook 생성
jangmoonwon Jul 23, 2024
e5efa3e
:zap: 회원가입 폼에 mutaion hook 적용
jangmoonwon Jul 23, 2024
ca394cc
:sparkles: Toaster 컴포넌트 추가
jangmoonwon Jul 23, 2024
4e9e01a
:sparkles: toast로 에러메시지 띄우기
jangmoonwon Jul 23, 2024
ea2264f
:zap: isAxiosError로 변경
jangmoonwon Jul 24, 2024
8a35cf2
Merge pull request #69 from epigram5-9/fix/FE-69
jangmoonwon Jul 24, 2024
a367f41
Merge pull request #59 from epigram5-9/feat/FE-69
jangmoonwon Jul 25, 2024
596369a
FE-29 :twisted_rightwards_arrows: 로그인 페이지 머지 요청 (#39)
jangmoonwon Jul 25, 2024
7c1f9c4
:twisted_rightwards_arrows: 메인 pr 최신화 및 confiict 수정
jangmoonwon Jul 26, 2024
5785703
:twisted_rightwards_arrows: 충돌 해결
jangmoonwon Jul 26, 2024
a715986
Merge branch 'epic/FE-66' into merge/FE-66
jangmoonwon Jul 26, 2024
9715918
:bug: postSignup 함수 추가
jangmoonwon Jul 26, 2024
0762f98
:bug: postSignin 내보내는 방식 수정
jangmoonwon Jul 26, 2024
a45fdf4
:twisted_rightwards_arrows: conflict 수정
jangmoonwon Jul 26, 2024
7e4eba6
:wrench: lint 수정
jangmoonwon Jul 26, 2024
b5227f6
Merge pull request #74 from epigram5-9/merge/FE-66
jangmoonwon Jul 26, 2024
fbe86b8
:sparkles: oauth api 생성
jangmoonwon Jul 27, 2024
4ba94c8
FE-71 🔀 에피그램 작성 페이지 (#71)
jisurk Jul 27, 2024
a8378ef
:sparkles: 카카오톡 리디렉트 uri 설정
jangmoonwon Jul 27, 2024
0039236
:sparkles: useKakaoLogin mutation hook 생성
jangmoonwon Jul 27, 2024
599efae
:zap: 네이버 구글 카카오 간편 로그인 링크 설정
jangmoonwon Jul 27, 2024
912b9ef
:twisted_rightwards_arrows: Merge branch 'epic/FE-66' into merge/FE-66
jangmoonwon Jul 27, 2024
ceaaeec
Merge pull request #87 from epigram5-9/merge/FE-66
jangmoonwon Jul 27, 2024
ae7c00e
:twisted_rightwards_arrows: Merge branch 'epic/FE-29' of into merge/F…
jangmoonwon Jul 28, 2024
192e06e
:recycle: 에러처리 로직 수정
jangmoonwon Jul 28, 2024
3322aaa
Merge pull request #95 from epigram5-9/fix/FE-66
jangmoonwon Jul 28, 2024
33faa00
Merge pull request #94 from epigram5-9/merge/FE-29
jangmoonwon Jul 28, 2024
ffd5e62
Merge branch 'epic/FE-29' into feat/FE-70
jangmoonwon Jul 28, 2024
1cc4151
Merge pull request #83 from epigram5-9/feat/FE-70
jangmoonwon Jul 28, 2024
9daf9fe
Merge pull request #72 from epigram5-9/epic/FE-66
jangmoonwon Jul 30, 2024
197e37c
Merge pull request #96 from epigram5-9/epic/FE-29
jangmoonwon Jul 30, 2024
547e7d3
FE-51 :twisted_rightwards_arrows: 공용 API 머지 요청 (#92)
JeonYumin94 Jul 30, 2024
86717a7
Merge branch 'main' into merge/FE-27--my-page
kich555 Jul 30, 2024
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

These merge commits were added into this branch cleanly.

There are no new changes to show.