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

main merge v5 #440

Merged
merged 147 commits into from
Oct 9, 2024
Merged

main merge v5 #440

merged 147 commits into from
Oct 9, 2024

Conversation

moondda
Copy link
Contributor

@moondda moondda commented Oct 8, 2024

No description provided.

se0jinYoon and others added 30 commits August 14, 2024 19:34
@se0jinYoon
feat: 두 개 버튼 모달 구현
d2a6259
@se0jinYoon
feat: useModal훅 사용으로 변경, 배경 클릭 useRef 제거
76a5272
@se0jinYoon
feat: 그룹 생성 페이지 모달 연결
10a36f5
@se0jinYoon
fix: 에디터 페이지 왼쪽,오른쪽 버튼 함수 재연결
f9bfde0
@se0jinYoon
feat: modal createPortal로 변경
327cff6
@se0jinYoon
feat: 그룹 가입 default 모달 연결
85f703c
@se0jinYoon
chore: 모달 DEFAULT 인 경우 prop 제거
0142277
@se0jinYoon
feat: 글 상세 페이지 모달 연결
d48d4c8
@se0jinYoon
feat: 가로 꽉찬 버튼 모달 구현, 에디터 모달 연결
6490fdc
@se0jinYoon
feat: 글 모임 삭제 모달 연결, 공통모달 Spacing 조건부 처리
c478e02
@se0jinYoon
feat: 관리자페이지 멤버 삭제 모달 연결
29d0b88
@se0jinYoon
chore: 안 쓰는 import 삭제
97e1f0a
@se0jinYoon
refactor: useBlocker 적용 시도
1b18c26
@namdaeun
Merge pull request #405 from Mile-Writings/hotfix/#404/fixCarouselPad…
52f73b6 
…ding

[Hotfix/#404] 메인 캐러셀 스타일 수정
@namdaeun
Merge pull request #407 from Mile-Writings/hotfix/#404/fixCarouselPad…
7e2417e 
…ding

[hotfix/#404] 캐러셀 본문과 이미지 간 gap 추가
@ljh0608
Merge pull request #411 from Mile-Writings/hotfox/#409/groupInvite400…
366f184 
…errorHandling

[ Hotfix/#409 ] group invite400error handling (to develop)
@ljh0608
Merge pull request #412 from Mile-Writings/hotfix/#409/groupInviteErr…
aa7a914 
…orHandling

[ Hotfix/#409 ] group 초대페이지 에러 핸들링 수정 , 로그인 페이지에서 이전페이지 라우팅하는 기능 추가
@se0jinYoon
chore: useBlocker 코드 삭제
d56ae6a
@se0jinYoon
feat: 글 모임 생성 헤더 버튼-5개 초과 모달 연결
33f4b75
@se0jinYoon
chore: merge develop
eb7b12a
@se0jinYoon
feat: 글모임 초대페이지 5개 초과 가입시 모달 연결
5fc1ed1
@se0jinYoon
refactor: 공통 모달 두개 버튼 합성컴포넌트로 변경
141190a
@se0jinYoon
refactor: 공통 모달 버튼 하나로 처리
b2395c6
@se0jinYoon
refactor: 변경된 모달로 코드 변경
b88e69d
@se0jinYoon
refactor: fullmodal prop 네이밍 변경 및 반영
e0c4037
@se0jinYoon
chore: 기존 모달 파일 삭제
0548c0a
@ljh0608
chore: 모임정보페이지 주석제거
5fd9142
@moondda
feat/#416 :글모임 생성화면
28eaa40
@moondda
feat/#416 : 관리자 글감 관련 400 처리
f7dfb64
@moondda
feat/#416 : 관리자 글모임 정보 400
11f30ac
moondda and others added 24 commits October 1, 2024 16:44
@moondda
feat/#428 : 미리보기 적용
c166154
@moondda
feat/#428 : 유저 이름 & 소개글 api 통합
83d552e
@moondda
fix/#428 : conflict 해결
5219f7c
@moondda
chore/#428 : 변수 네이밍 변경
0204775
@moondda
Revert "chore/#428 : 변수 네이밍 변경"
30e47f6 
This reverts commit 0204775.
@moondda
chore/#428 : 콘솔 삭제
127c447
@ljh0608
refactor : api promise return 하도록 변경
6beb74a
@ljh0608
design: lottie삽입
e34b3fc
@ljh0608
Merge pull request #429 from Mile-Writings/refactor/#415/curiousAPIOp…
06fa4d2 
…timisticUpdate

[Refactor/#415] 궁금해요 버튼 optimistic update(낙관적 업데이트) UX개선
@ljh0608
Merge branch 'develop' of https://github.com/Mile-Writings/Mile-Client …
e3dcbcd 
…into refactor/#432/MainPagePerformanceOptimization
@ljh0608
chore: build error
442ace2
@ljh0608
Merge pull request #433 from Mile-Writings/refactor/#432/MainPagePerf…
13e5a7b 
…ormanceOptimization

[ Refactor/#432 ] main page 성능개선 (feat 이미지 확장자 변경, lazy loading)
@se0jinYoon
Merge pull request #425 from Mile-Writings/refactor/#414/useBlocker
f73ba85 
[ Refactor/#414 ] 페이지 이탈 커스텀훅 / react-router-dom 버전 업데이트
@se0jinYoon
chore: 페이지 이탈 모달 내용 상수 파일로 분리
f94720c
@se0jinYoon
fix: default modal 버튼 텍스트 prop 방식 변경
5b7ab45
@se0jinYoon
design: z-index 헤더, 모달 +1ㅅ
4b12529
@se0jinYoon
merge develop
9e962d2
@se0jinYoon
chore: modal image png로 변경
cf0a7bb
@se0jinYoon
Merge pull request #419 from Mile-Writings/refactor/#383/modalRefactor
3246c43 
[Refactor/#383] 공통 모달 리팩토링
@se0jinYoon
Merge pull request #436 from Mile-Writings/design/#435/createGroupRem…
ec31099 
…oveScroll

[design/#435] 글 모임 생성 페이지 가로 스크롤 추가
@se0jinYoon
Merge pull request #437 from Mile-Writings/design/#434/footerRedesign
c1c49ce 
[ Design/#434 ] 푸터 변경사항 반영
@moondda
chore/#428 : 콘솔 삭제
34f0f06
@moondda
fix: merge conflict잡기
1ef1491
@moondda
Merge pull request #438 from Mile-Writings/fix/#428/moimInfoGet
b04bb98 
[Fix/#428] 내 정보 get api 통합 + 링크미리보기 설정
@vercel Vercel
Copy link

vercel bot commented Oct 8, 2024 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
mile-client ✅ Ready (Inspect) Visit Preview 💬 Add feedback Oct 9, 2024 9:11am

@github-actions GitHub Actions
Copy link

github-actions bot commented Oct 9, 2024

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

@github-actions github-actions bot added the size/xl size/xl label Oct 9, 2024
@se0jinYoon se0jinYoon merged commit 22a974c into main Oct 9, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
size/xl size/xl
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@moondda @se0jinYoon @namdaeun @ljh0608