From ea7861b63ab696eea910632fe727ab1f638cdb77 Mon Sep 17 00:00:00 2001 From: geonhee-min Date: Wed, 3 Dec 2025 17:06:20 +0900 Subject: [PATCH] =?UTF-8?q?issue=20#=20-=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4,=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4,=20=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20?= =?UTF-8?q?=EC=B4=88=EA=B8=B0=ED=99=94=20=ED=99=94=EB=A9=B4=20=EB=AA=A8?= =?UTF-8?q?=EB=B0=94=EC=9D=BC=20ui=20=EB=8C=80=EB=B9=84=20=EC=9E=91?= =?UTF-8?q?=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/ui/page/account/login/LoginPage.tsx | 6 +- src/ui/page/account/signup/SignUpPage.tsx | 270 +++++++++++----------- src/ui/page/schedule/ScheduleMainPage.tsx | 26 +++ 4 files changed, 170 insertions(+), 134 deletions(-) create mode 100644 src/ui/page/schedule/ScheduleMainPage.tsx diff --git a/.env.development b/.env.development index 460e575..c1da8f0 100644 --- a/.env.development +++ b/.env.development @@ -1 +1 @@ -VITE_API_URL=http://localhost:8080 +VITE_API_URL=http://localhost:8088 diff --git a/src/ui/page/account/login/LoginPage.tsx b/src/ui/page/account/login/LoginPage.tsx index eefe02d..7e7551e 100644 --- a/src/ui/page/account/login/LoginPage.tsx +++ b/src/ui/page/account/login/LoginPage.tsx @@ -17,11 +17,13 @@ import { toast } from 'sonner'; import { useAuthStore } from '@/store/authStore'; import { Checkbox } from '@/components/ui/checkbox'; import { Label } from '@/components/ui/label'; +import { useIsMobile } from '@/hooks/use-mobile'; export default function LoginPage() { const [isLoading, setIsLoading] = useState(false); const [autoLogin, setAutoLogin] = useState(false); const { login } = useAuthStore(); + const isMobile = useIsMobile(); const navigate = useNavigate(); const accountNetwork = new AccountNetwork(); const loginForm = useForm>({ @@ -73,7 +75,7 @@ export default function LoginPage() { }; login({...data}); moveToHomePage(); - return ""; + return "로그인 성공"; } else { throw new Error(res.data.message); } @@ -102,7 +104,7 @@ export default function LoginPage() { return (
- + 로그인 diff --git a/src/ui/page/account/signup/SignUpPage.tsx b/src/ui/page/account/signup/SignUpPage.tsx index abe3adc..a36bb0e 100644 --- a/src/ui/page/account/signup/SignUpPage.tsx +++ b/src/ui/page/account/signup/SignUpPage.tsx @@ -18,6 +18,8 @@ import { AccountNetwork } from '@/network/AccountNetwork'; import { toast } from 'sonner'; import { useNavigate } from 'react-router-dom'; import { PageRouting } from '@/const/PageRouting'; +import { useIsMobile } from '@/hooks/use-mobile'; +import { ScrollArea } from '@/components/ui/scroll-area'; export default function SignUpPage() { const [emailVerificationModalOpen, setEmailVerificationModalOpen] = useState(false); @@ -28,6 +30,7 @@ export default function SignUpPage() { const accountNetwork = new AccountNetwork(); const navigate = useNavigate(); + const isMobile = useIsMobile(); const signUpForm = useForm>({ resolver: zodResolver(SignUpSchema), @@ -119,145 +122,150 @@ export default function SignUpPage() { } return ( -
- - 회원가입 - -
- - ( - - 아이디 -
+
+ + + 회원가입 + + + + + ( + + 아이디 +
+ + +
+ { isCheckedAccountIdDuplication &&

사용할 수 있는 아이디입니다

} + +
+ )} + /> + ( + + 이름 - -
- { isCheckedAccountIdDuplication &&

사용할 수 있는 아이디입니다

} - - - )} - /> - ( - - 이름 - - - - )} - /> - ( - - 닉네임 - - - - )} - /> - ( - - 이메일 -
+ + + )} + /> + ( + + 닉네임 - -
- { isCheckedEmailDuplication &&

사용할 수 있는 이메일입니다

} - -
- )} - /> - ( - - 비밀번호 - - - - )} - /> - ( - - 비밀번호 확인 - - - - )} - /> - - - - - - 회원가입 - - } - email={duplicationCheckedEmail} - open={emailVerificationModalOpen} // ✅ 부모 상태 연결 - setOpen={setEmailVerificationModalOpen} // ✅ 부모 상태 변경 함수 전달 - onVerifySuccess={signup} // ✅ 인증 성공 시 signup 호출 - /> - - + + + )} + /> + ( + + 이메일 +
+ + +
+ { isCheckedEmailDuplication &&

사용할 수 있는 이메일입니다

} + +
+ )} + /> + ( + + 비밀번호 + + + + )} + /> + ( + + 비밀번호 확인 + + + + )} + /> + + + + + + + 회원가입 + + } + email={duplicationCheckedEmail} + open={emailVerificationModalOpen} // ✅ 부모 상태 연결 + setOpen={setEmailVerificationModalOpen} // ✅ 부모 상태 변경 함수 전달 + onVerifySuccess={signup} // ✅ 인증 성공 시 signup 호출 + /> + + + +
); } diff --git a/src/ui/page/schedule/ScheduleMainPage.tsx b/src/ui/page/schedule/ScheduleMainPage.tsx new file mode 100644 index 0000000..d99c82f --- /dev/null +++ b/src/ui/page/schedule/ScheduleMainPage.tsx @@ -0,0 +1,26 @@ +import { Calendar } from "@/components/ui/calendar"; +import { DayButton } from "react-day-picker"; + +export function ScheduleMainPage() { + return ( +
+ ( + + ), + Week: (props) => ( + + ), + Day: (props) => ( + + ) + }} + > + + +
+ ) +} \ No newline at end of file