From e9709cf563b08b672341692c24733f26da4be05b Mon Sep 17 00:00:00 2001 From: selfishAltruism Date: Sun, 24 Mar 2024 16:30:16 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EC=BA=A1=EC=B2=98=20=EB=B0=A9=EC=A7=80?= =?UTF-8?q?=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=B6=94=EA=B0=80=20=EB=B0=8F?= =?UTF-8?q?=20router=20=EC=97=B0=EA=B2=B0=20(#111)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/PageRouter.tsx | 2 + src/configs/path.ts | 1 + src/pages/home/event/EventPage.tsx | 129 +++-------------------- src/pages/home/event/EventPageUiStore.ts | 2 +- 4 files changed, 18 insertions(+), 116 deletions(-) diff --git a/src/PageRouter.tsx b/src/PageRouter.tsx index 4470f9dc..c6c68cad 100644 --- a/src/PageRouter.tsx +++ b/src/PageRouter.tsx @@ -13,6 +13,7 @@ import * as Switch from './pages'; import { PAGE_URL } from '@/configs/path'; const HomePage = lazy(() => import('./pages/home/HomePage')); +const EventPage = lazy(() => import('./pages/home/event/EventPage')); export const PageRouter: React.FC = () => ( }> @@ -26,6 +27,7 @@ export const PageRouter: React.FC = () => ( + diff --git a/src/configs/path.ts b/src/configs/path.ts index 8e233ab3..58e5bbac 100644 --- a/src/configs/path.ts +++ b/src/configs/path.ts @@ -8,6 +8,7 @@ export enum PAGE_URL { NoPermission = '/auth/noPermission', Home = '/home', + Event = '/event', // 동아리 Circle = '/circle', diff --git a/src/pages/home/event/EventPage.tsx b/src/pages/home/event/EventPage.tsx index e99fe686..de99893d 100644 --- a/src/pages/home/event/EventPage.tsx +++ b/src/pages/home/event/EventPage.tsx @@ -53,125 +53,13 @@ const EventPage: React.FC = observer(() => { if (isDuplicatedEmail) trigger('email'); }, [isDuplicatedEmail]); - useAuthRedirect(); - return ( <> -
+
+
- { - // 이메일 유효성 검사는 진행했고, - if (isDuplicatedEmail === true) { - // 검사했던 이메일과 지금 입력된 이메일이 같은 경우 에러 - if (chekedEmail === value) return '중복된 이메일입니다.'; - else return true; - } - return true; - }, - pattern: { - value: emailReg, - message: '이메일 형식에 맞게 입력하세요.', - }, - }} - /> - {errors.email ? {errors.email?.message} : null} - - (영어 + 숫자 + 특수문자)', - }, - }} - /> - {errors.password ? ( - - ) : null} - - value === password || '비밀번호가 일치하지 않습니다.', - }} - /> - {errors.passwordConfirm ? ( - {errors.passwordConfirm?.message} - ) : null} - - - {errors.name ? {errors.name?.message} : null} - - - {errors.admissionYear ? ( - {errors.admissionYear?.message} - ) : null} - - - {errors.studentId ? {errors.studentId?.message} : null}
@@ -186,11 +74,22 @@ const EventPage: React.FC = observer(() => { ); }); -export const Message = styled.div` +const Message = styled.div` text-align: right; color: #ff7473; font-size: 12px; line-height: 21px; `; +const PreventionImg = styled.img` + width: 200px; + animation: rotate_image 6s linear infinite; + transform-origin: 50% 50%; + @keyframes rotate_image { + 100% { + transform: rotate(360deg); + } + } +`; + export default PageStoreHOC(, { store: PageUiStoreImpl }); diff --git a/src/pages/home/event/EventPageUiStore.ts b/src/pages/home/event/EventPageUiStore.ts index e29cdcfa..bedb448f 100644 --- a/src/pages/home/event/EventPageUiStore.ts +++ b/src/pages/home/event/EventPageUiStore.ts @@ -29,4 +29,4 @@ export class EventPageUiStore { } } -export const PageUiStoreImpl = new SignUpPageUiStore(); +export const PageUiStoreImpl = new EventPageUiStore();