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

[Refactor/#383] 공통 모달 리팩토링 #419

Merged
merged 54 commits into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
d2a6259
feat: 두 개 버튼 모달 구현
se0jinYoon Aug 14, 2024
76a5272
feat: useModal훅 사용으로 변경, 배경 클릭 useRef 제거
se0jinYoon Aug 14, 2024
10a36f5
feat: 그룹 생성 페이지 모달 연결
se0jinYoon Aug 14, 2024
f9bfde0
fix: 에디터 페이지 왼쪽,오른쪽 버튼 함수 재연결
se0jinYoon Aug 14, 2024
327cff6
feat: modal createPortal로 변경
se0jinYoon Aug 14, 2024
85f703c
feat: 그룹 가입 default 모달 연결
se0jinYoon Aug 14, 2024
0142277
chore: 모달 DEFAULT 인 경우 prop 제거
se0jinYoon Aug 14, 2024
d48d4c8
feat: 글 상세 페이지 모달 연결
se0jinYoon Aug 14, 2024
6490fdc
feat: 가로 꽉찬 버튼 모달 구현, 에디터 모달 연결
se0jinYoon Aug 14, 2024
c478e02
feat: 글 모임 삭제 모달 연결, 공통모달 Spacing 조건부 처리
se0jinYoon Aug 15, 2024
29d0b88
feat: 관리자페이지 멤버 삭제 모달 연결
se0jinYoon Aug 15, 2024
97e1f0a
chore: 안 쓰는 import 삭제
se0jinYoon Aug 15, 2024
1b18c26
refactor: useBlocker 적용 시도
se0jinYoon Aug 16, 2024
d56ae6a
chore: useBlocker 코드 삭제
se0jinYoon Aug 19, 2024
33f4b75
feat: 글 모임 생성 헤더 버튼-5개 초과 모달 연결
se0jinYoon Aug 19, 2024
eb7b12a
chore: merge develop
se0jinYoon Aug 19, 2024
5fc1ed1
feat: 글모임 초대페이지 5개 초과 가입시 모달 연결
se0jinYoon Aug 19, 2024
141190a
refactor: 공통 모달 두개 버튼 합성컴포넌트로 변경
se0jinYoon Aug 19, 2024
b2395c6
refactor: 공통 모달 버튼 하나로 처리
se0jinYoon Aug 19, 2024
b88e69d
refactor: 변경된 모달로 코드 변경
se0jinYoon Aug 19, 2024
e0c4037
refactor: fullmodal prop 네이밍 변경 및 반영
se0jinYoon Aug 19, 2024
0548c0a
chore: 기존 모달 파일 삭제
se0jinYoon Aug 19, 2024
8685c01
refactor: full모달 버튼 합성 컴포넌트 형태로 변경
se0jinYoon Aug 22, 2024
db30589
feat: 모달 - 스크롤방지 연결
se0jinYoon Aug 24, 2024
704e7c6
chore: 필요없는 코드 삭제
se0jinYoon Aug 24, 2024
8b9b0e6
feat: react-router-dom 버전 업데이트, createBrowserRouter로 변경
se0jinYoon Sep 1, 2024
adfeefd
feat: createBrowserRouter로 변경, Layout 컴포넌트 구현, 그룹생성 url 변경
se0jinYoon Sep 2, 2024
e8f104f
feat: 페이지 이탈 함수 커스텀훅 구현
se0jinYoon Sep 2, 2024
afa7ddd
chore: 페이지 이탈 코드 연결 위해 모달 컴포넌트 가져옴
se0jinYoon Sep 2, 2024
af3f3eb
feat: 페이지 이탈 공통 모달 구현
se0jinYoon Sep 2, 2024
a1b8d37
fix: 페이지 이탈 모달 분리한 것 삭제, 모달 열고닫는 훅 useBlockPageExit에 추가
se0jinYoon Sep 2, 2024
89d72e8
feat: 그룹생성 페이지 이탈 모달 추가
se0jinYoon Sep 2, 2024
b50d8ec
Merge branch 'refactor/#383/modalRefactor' of https://github.com/Mile…
se0jinYoon Sep 2, 2024
132b688
fix: 페이지 이탈 hook 이탈 무시 조건부 추가
se0jinYoon Sep 2, 2024
f68d468
feat: 페이지 이탈 모달 적용
se0jinYoon Sep 2, 2024
c153e58
chore: 에디터 페이지 이탈 모달 문구 수정
se0jinYoon Sep 2, 2024
91f6aad
feat: 관리자 페이지 모임정보 수정 페이지 이탈 모달 추가
se0jinYoon Sep 2, 2024
4c856b9
chore: 뒤로가기 이탈 모달 제거
se0jinYoon Sep 2, 2024
5b21840
fix: private Route 반영
se0jinYoon Sep 12, 2024
8c1ecc3
chore: 코드리뷰 반영-임시저장관련 함수 공통 로직 중복 줄이기
se0jinYoon Sep 12, 2024
2de71a1
fix: useModal setter함수 return 삭제, useEffect 제거
se0jinYoon Sep 12, 2024
03025cb
fix: 모달 wrapper display 조건부 처리 변경
se0jinYoon Sep 12, 2024
887e0a8
chore: handleClickBg -> onClickBg 네이밍 변경
se0jinYoon Sep 12, 2024
34074d5
chore: default 모달 사이즈 상수 파일 분리
se0jinYoon Sep 12, 2024
e68224e
fix: useModal useEffect 추가
se0jinYoon Sep 12, 2024
fc3f96c
style: z-index 숫자 변경
se0jinYoon Sep 12, 2024
c36133b
chore: 모달 content 상수파일 분리
se0jinYoon Sep 12, 2024
d28221e
Merge branch 'refactor/#383/modalRefactor' into refactor/#414/useBlocker
ljh0608 Sep 23, 2024
f73ba85
Merge pull request #425 from Mile-Writings/refactor/#414/useBlocker
se0jinYoon Oct 6, 2024
f94720c
chore: 페이지 이탈 모달 내용 상수 파일로 분리
se0jinYoon Oct 6, 2024
5b7ab45
fix: default modal 버튼 텍스트 prop 방식 변경
se0jinYoon Oct 7, 2024
4b12529
design: z-index 헤더, 모달 +1ㅅ
se0jinYoon Oct 7, 2024
9e962d2
merge develop
se0jinYoon Oct 7, 2024
cf0a7bb
chore: modal image png로 변경
se0jinYoon Oct 8, 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
1 change: 1 addition & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<title>MILE</title>
</head>
<body>
<div id="modal"></div>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-quill": "^2.0.0",
"react-router-dom": "^6.21.1",
"react-router-dom": "^6.26.1",
"react-slick": "^0.29.0",
"slick-carousel": "^1.8.1"
},
Expand Down
10 changes: 8 additions & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import styled from '@emotion/styled';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
import Router from './routers/Router';
import router from './routers/Router';

import { RouterProvider } from 'react-router-dom';
import { Suspense } from 'react';
import Loading from './pages/loading/Loading';

const App = () => {
const queryClient = new QueryClient({
Expand All @@ -15,7 +19,9 @@ const App = () => {
<div style={{ fontSize: '16px' }}>
<QueryClientProvider client={queryClient}>
<DesktopWrapper>
<Router />
<Suspense fallback={<Loading />}>
<RouterProvider router={router} />
</Suspense>
</DesktopWrapper>
<ReactQueryDevtools initialIsOpen />
</QueryClientProvider>
Expand Down
Binary file added src/assets/images/alertDelete.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/alertModify.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/svgs/alertDeletePng.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/svgs/alertModifyPng.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/commons/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ export const DefaultHeader = () => {
const HeaderWrapper = styled.div`
position: fixed;
top: 0%;
z-index: 4;
z-index: 3;
display: flex;
align-items: center;
justify-content: space-between;
Expand Down
13 changes: 13 additions & 0 deletions src/components/commons/Layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { Outlet } from 'react-router-dom';
import ScrollToTop from './ScrollToTop';

const Layout = () => {
return (
<>
<ScrollToTop />
<Outlet />
</>
);
};

export default Layout;
178 changes: 0 additions & 178 deletions src/components/commons/Modal.tsx

This file was deleted.

Loading