From 8c06c911e6a42ec4f41e7c005dd17516b7ce2447 Mon Sep 17 00:00:00 2001 From: hojin Date: Wed, 12 Jun 2024 16:56:25 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/home/MainHeader.tsx | 15 +++++------ src/components/home/OfficeInfo.tsx | 21 ++++++++------- src/components/layout/header/Header.tsx | 2 +- .../reservation/model/myreservation.ts | 1 + src/components/sign/backarrow/BackArrow.tsx | 26 +++++++++---------- .../sign/signup/EmailVerification.tsx | 4 --- .../sign/signup/PasswordVerification.tsx | 17 +++++++++++- .../sign/signup/PhoneCertification.tsx | 7 ----- src/components/sign/signup/Terms.tsx | 19 +++++++------- src/constant/temrs.ts | 9 ++++--- src/models/terms.ts | 1 + src/pages/mypage/changepassword/index.tsx | 2 +- src/pages/mypage/changeprofile/index.tsx | 2 +- src/pages/mypage/guide/index.tsx | 2 +- src/pages/mypage/index.tsx | 3 +-- src/pages/mypage/notice/index.tsx | 2 +- src/pages/mypage/question/index.tsx | 3 +-- src/pages/mypage/withdraw/index.tsx | 2 +- src/pages/notification/index.tsx | 2 +- src/pages/signup/index.tsx | 2 +- 20 files changed, 75 insertions(+), 67 deletions(-) diff --git a/src/components/home/MainHeader.tsx b/src/components/home/MainHeader.tsx index 45e0fd6..e4f0ce4 100644 --- a/src/components/home/MainHeader.tsx +++ b/src/components/home/MainHeader.tsx @@ -1,23 +1,22 @@ 'use client'; -import Link from 'next/link'; +import { useRouter } from 'next/router'; import React from 'react'; const MainHeader = () => { + const router = useRouter(); return (
-
+
-
+
router.push('mypage/question')}>
- -
- -
- +
router.push('/notification')}> + +
diff --git a/src/components/home/OfficeInfo.tsx b/src/components/home/OfficeInfo.tsx index e45e7a3..7aab641 100644 --- a/src/components/home/OfficeInfo.tsx +++ b/src/components/home/OfficeInfo.tsx @@ -37,16 +37,17 @@ const OfficeInfo = () => { return (
- {data.length == 0 ? : null} - {data.map((room: todayListData, i: number) => { - if (room.spaceType == 'FOCUSDESK') { - return ; - } else if (room.spaceType == 'MEETINGROOM') { - return ; - } else { - return ; - } - })} + {data && data.length == 0 ? : null} + {data && + data.map((room: todayListData, i: number) => { + if (room.spaceType == 'FOCUSDESK') { + return ; + } else if (room.spaceType == 'MEETINGROOM') { + return ; + } else { + return ; + } + })}
); }; diff --git a/src/components/layout/header/Header.tsx b/src/components/layout/header/Header.tsx index 51c4d26..f2e0623 100644 --- a/src/components/layout/header/Header.tsx +++ b/src/components/layout/header/Header.tsx @@ -9,7 +9,7 @@ const Header = () => {
-
+
router.push('mypage/question')} className="cursor-pointer">
diff --git a/src/components/reservation/model/myreservation.ts b/src/components/reservation/model/myreservation.ts index b0d890d..85ad053 100644 --- a/src/components/reservation/model/myreservation.ts +++ b/src/components/reservation/model/myreservation.ts @@ -30,6 +30,7 @@ export interface reservationDetailData { participants: participantsType[]; myMemberType: string; reservationProgress: string; + reservationStatus: string; } export interface Representative { diff --git a/src/components/sign/backarrow/BackArrow.tsx b/src/components/sign/backarrow/BackArrow.tsx index 56e3009..c2c3507 100644 --- a/src/components/sign/backarrow/BackArrow.tsx +++ b/src/components/sign/backarrow/BackArrow.tsx @@ -1,23 +1,23 @@ -import Link from 'next/link'; +import { useRouter } from 'next/router'; interface BackArrowProps { width: string; height: string; name?: string; - link: string; } -export const BackArrow = ({ width, height, name, link }: BackArrowProps) => { +export const BackArrow = ({ width, height, name }: BackArrowProps) => { + const router = useRouter(); return ( -
- - Back - +
router.back()} + className="h-[48px] flex flex-row justify-start items-center"> + Back
{name}
diff --git a/src/components/sign/signup/EmailVerification.tsx b/src/components/sign/signup/EmailVerification.tsx index eb2cffb..9180142 100644 --- a/src/components/sign/signup/EmailVerification.tsx +++ b/src/components/sign/signup/EmailVerification.tsx @@ -109,10 +109,6 @@ const EmailVerification = ({ onNext }: EmailVerification) => { } }, [emailValid]); - useEffect(() => { - startRef.current?.focus(); - }, []); - useEffect(() => { let timeoutId: NodeJS.Timeout; if (errorMessage != '') { diff --git a/src/components/sign/signup/PasswordVerification.tsx b/src/components/sign/signup/PasswordVerification.tsx index 83b992b..adad434 100644 --- a/src/components/sign/signup/PasswordVerification.tsx +++ b/src/components/sign/signup/PasswordVerification.tsx @@ -6,6 +6,8 @@ import Terms from './Terms'; import { JobPositionType } from '@/models/jobPosition'; import { jobPosition } from '@/constant/jobPosition'; import ToBack from '@/components/shared/sign/ToBack'; +import { TermsType } from '@/models/terms'; +import { 약관목록 } from '@constant/temrs'; /* eslint-disable no-unused-vars */ const JobPosition = dynamic(() => import('./JobPosition'), { ssr: false @@ -33,6 +35,10 @@ const PasswordVerification = ({ onNext, applyValues }: PasswordVerificationProps const [isAllDataValid, setIsAllDataValid] = useState(false); // 모두동의 job선택됨 비밀번호 통과 + const [termsAgreements, setTermsAgreements] = useState(() => + setInitialValues(약관목록) + ); + useEffect(() => { if (isAllAgreeChecked && selectedJob != '' && !passwordError && password != '') { setIsAllDataValid(true); @@ -240,7 +246,12 @@ const PasswordVerification = ({ onNext, applyValues }: PasswordVerificationProps />
- +