From 79d81ce2a054e09f9e2b7359a5ac29d301cc198e Mon Sep 17 00:00:00 2001 From: jiohjung98 Date: Wed, 12 Jun 2024 16:38:49 +0900 Subject: [PATCH 1/8] =?UTF-8?q?fix:=20=EA=B3=B5=EC=A7=80=EC=82=AC=ED=95=AD?= =?UTF-8?q?=20background=20color?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/home/OfficeNotice.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/home/OfficeNotice.tsx b/src/components/home/OfficeNotice.tsx index 4d806f2..059c55e 100644 --- a/src/components/home/OfficeNotice.tsx +++ b/src/components/home/OfficeNotice.tsx @@ -36,7 +36,7 @@ const OfficeNotice: React.FC = () => { return ( <> -
+
From 9d9d1da0db83a724cfade40ece6bbdee1331b82c Mon Sep 17 00:00:00 2001 From: jiohjung98 Date: Wed, 12 Jun 2024 16:39:27 +0900 Subject: [PATCH 2/8] =?UTF-8?q?fix:=20=EB=84=A4=EB=B8=8C=EB=B0=94=20?= =?UTF-8?q?=EC=98=88=EC=95=BD=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/layout/footer/Footer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/layout/footer/Footer.tsx b/src/components/layout/footer/Footer.tsx index 4fdfb60..53a6f95 100644 --- a/src/components/layout/footer/Footer.tsx +++ b/src/components/layout/footer/Footer.tsx @@ -41,7 +41,7 @@ const Footer = () => { )}
- 예약/일정 + 예약
From dc1299b71b69ee9b29d2bb1e83609f2450a1d0c2 Mon Sep 17 00:00:00 2001 From: jiohjung98 Date: Wed, 12 Jun 2024 16:41:59 +0900 Subject: [PATCH 3/8] =?UTF-8?q?fix:=20=EB=AA=A8=EB=8B=AC=20=EC=98=88?= =?UTF-8?q?=EC=95=BD=20=EB=B2=84=ED=8A=BC=20background=20color?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reservation/meetingRoom/DatePickerModal.tsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/reservation/meetingRoom/DatePickerModal.tsx b/src/components/reservation/meetingRoom/DatePickerModal.tsx index 68b8224..e665dcb 100644 --- a/src/components/reservation/meetingRoom/DatePickerModal.tsx +++ b/src/components/reservation/meetingRoom/DatePickerModal.tsx @@ -330,11 +330,12 @@ const DatePickerModal: React.FC = ({ )}
- +
From a914dd2675fa0c89a554bc770e044254747582b6 Mon Sep 17 00:00:00 2001 From: jiohjung98 Date: Wed, 12 Jun 2024 16:43:35 +0900 Subject: [PATCH 4/8] =?UTF-8?q?fix:=20=EC=B2=B4=ED=81=AC=EB=B0=95=EC=8A=A4?= =?UTF-8?q?=20border=20none?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/globals.css | 1 - 1 file changed, 1 deletion(-) diff --git a/src/styles/globals.css b/src/styles/globals.css index 9540453..8a36adb 100644 --- a/src/styles/globals.css +++ b/src/styles/globals.css @@ -114,7 +114,6 @@ input[type="checkbox"] { -webkit-appearance: none; -moz-appearance: none; background-color: #f4f4f5; - border: 2px solid #e4e4e7; border-radius: 4px; position: relative; cursor: pointer; From 07ed142ffc1304f7a0e097f6e4db415dc00e4150 Mon Sep 17 00:00:00 2001 From: jiohjung98 Date: Wed, 12 Jun 2024 16:54:48 +0900 Subject: [PATCH 5/8] =?UTF-8?q?fix:=20=EA=B5=AC=EB=B6=84=EC=84=A0=20width?= =?UTF-8?q?=20100%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reservation/meetingRoom/MeetingRoomInfo.tsx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/components/reservation/meetingRoom/MeetingRoomInfo.tsx b/src/components/reservation/meetingRoom/MeetingRoomInfo.tsx index e6c7d6d..acae3f5 100644 --- a/src/components/reservation/meetingRoom/MeetingRoomInfo.tsx +++ b/src/components/reservation/meetingRoom/MeetingRoomInfo.tsx @@ -248,7 +248,9 @@ const MeetingRoomInfo = () => { -
+
+
+
console.log("Edit clicked")}> { />
-
+
+
+
일정
@@ -282,7 +286,9 @@ const MeetingRoomInfo = () => {
-
+
+
+
setShowSearch(!showSearch)}>
From 8c06c911e6a42ec4f41e7c005dd17516b7ce2447 Mon Sep 17 00:00:00 2001 From: hojin Date: Wed, 12 Jun 2024 16:56:25 +0900 Subject: [PATCH 6/8] =?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 />
- +
@@ -560,13 +486,9 @@ const MeetingRoomIndex: React.FC = () => { 조건에 맞는 미팅룸이 없습니다.
) : ( -
+
{meetingRooms.map((room) => ( -
handleRoomClick(room.meetingRoomId)}> +
handleRoomClick(room.meetingRoomId)}>
{ {room.meetingRoomName}
- floor + floor
- {room.meetingRoomFloor < 0 - ? `B${Math.abs(room.meetingRoomFloor)}` - : `${room.meetingRoomFloor}`} - 층 -
- capacity -
- 최대 {room.meetingRoomCapacity}명 + {room.meetingRoomFloor < 0 ? `B${Math.abs(room.meetingRoomFloor)}` : `${room.meetingRoomFloor}`}층
+ capacity +
최대 {room.meetingRoomCapacity}명
@@ -611,207 +516,106 @@ const MeetingRoomIndex: React.FC = () => {
)}
- {meetingRooms.length === 0 && ( + {meetingRooms.length === 0 && (
- {newMeetingRooms?.length != 0 && newMeetingRooms2?.length != 0 && ( - <> -
-
- - 같은 조건 - - - 으로 - - - {' '} -
- - - 근처 지점 - - - 에서 찾아봤어요. - -
- + {newMeetingRooms?.length != 0 && newMeetingRooms2?.length != 0 && ( + <>
같은 조건으로
근처 지점에서 찾아봤어요.
)} {newMeetingRoomsInfo && newMeetingRooms?.length > 0 && ( - <> -
-
-
- {newMeetingRoomsInfo[0].branchName} -
-
-
- 지점 상세보기 -
- arrow -
-
-
- location -
- {currentBranch?.branchName}으로부터{' '} - {newMeetingRoomsInfo[0].distance.toFixed(2)}km -
+ <>
+
+
{newMeetingRoomsInfo[0].branchName}
+
+
지점 상세보기
+ arrow
-
+
+ location +
{currentBranch?.branchName}으로부터 {newMeetingRoomsInfo[0].distance.toFixed(2)}km
+
+
{newMeetingRooms.map((room) => (
handleRoomClick(room.meetingRoomId)} - style={{ minWidth: 160, maxWidth: 160, marginRight: 10 }}> + style={{ minWidth: 160, maxWidth: 160, marginRight: 10 }} + >
{room.meetingRoomName} + className="object-cover rounded" />
{room.meetingRoomName}
- floor + floor
- {room.meetingRoomFloor < 0 - ? `B${Math.abs(room.meetingRoomFloor)}` - : `${room.meetingRoomFloor}`} - 층 -
- capacity -
- 최대 {room.meetingRoomCapacity}명 + {room.meetingRoomFloor < 0 ? `B${Math.abs(room.meetingRoomFloor)}` : `${room.meetingRoomFloor}`}층
+ capacity +
최대 {room.meetingRoomCapacity}명
))} -
- - )} +
+ )} {newMeetingRoomsInfo2 && newMeetingRooms2?.length > 0 && ( - <> -
-
-
- {newMeetingRoomsInfo2[0].branchName} -
-
-
- 지점 상세보기 -
- arrow -
-
-
- location -
- {currentBranch?.branchName}점으로부터{' '} - {newMeetingRoomsInfo2[0].distance.toFixed(2)}km -
+ <>
+
+
{newMeetingRoomsInfo2[0].branchName}
+
+
지점 상세보기
+ arrow
-
+
+ location +
{currentBranch?.branchName}점으로부터 {newMeetingRoomsInfo2[0].distance.toFixed(2)}km
+
+
{newMeetingRooms2.map((room) => (
handleRoomClick(room.meetingRoomId)} - style={{ minWidth: 160, maxWidth: 160, marginRight: 10 }}> + style={{ minWidth: 160, maxWidth: 160, marginRight: 10 }} + >
{room.meetingRoomName} + className="object-cover rounded" />
{room.meetingRoomName}
- floor + floor
- {room.meetingRoomFloor < 0 - ? `B${Math.abs(room.meetingRoomFloor)}` - : `${room.meetingRoomFloor}`} - 층 -
- capacity -
- 최대 {room.meetingRoomCapacity}명 + {room.meetingRoomFloor < 0 ? `B${Math.abs(room.meetingRoomFloor)}` : `${room.meetingRoomFloor}`}층
+ capacity +
최대 {room.meetingRoomCapacity}명
))} -
- - )} +
+ )}
)} +
{startTime && endTime && ( @@ -831,6 +635,7 @@ const MeetingRoomIndex: React.FC = () => { )}
); -}; - -export default MeetingRoomIndex; + }; + + export default MeetingRoomIndex; + \ No newline at end of file diff --git a/src/components/reservation/meetingRoom/MeetingRoomInfo.tsx b/src/components/reservation/meetingRoom/MeetingRoomInfo.tsx index 6c04326..4fb4146 100644 --- a/src/components/reservation/meetingRoom/MeetingRoomInfo.tsx +++ b/src/components/reservation/meetingRoom/MeetingRoomInfo.tsx @@ -49,6 +49,16 @@ const MeetingRoomInfo = () => { inputRef.current?.focus(); }; + const [toastMessage, setToastMessage] = useState(''); + +const showToast = (message: React.SetStateAction) => { + setToastMessage(message); + setTimeout(() => { + setToastMessage(''); + }, 3000); +}; + + const selectedBranch = useBranchStore((state) => state.selectedBranch); const updatedTimeSelected = useBranchStore((state) => state.updatedTimeSelected); const reservedBranch = useBranchStore2((state) => state.reservedBranch); @@ -185,9 +195,15 @@ const MeetingRoomInfo = () => { }; const handleAddMember = (member: Member) => { + if (addedMembers.length >= (meetingRoom!.meetingRoomCapacity - 1)) { + showToast(`최대 ${meetingRoom!.meetingRoomCapacity - 1}명까지 초대할 수 있습니다.`); + return; + } setAddedMembers([...addedMembers, member]); setInvitedMemberIds([...invitedMemberIds, member.memberId]); - }; +}; + + const handleRemoveMember = (member: Member) => { setAddedMembers(addedMembers.filter((m) => m.memberId !== member.memberId)); @@ -380,6 +396,11 @@ const MeetingRoomInfo = () => { )}
+ {toastMessage && ( +
+ {toastMessage} +
+ )}
Location

일정이 이미 있는 사용자는 참석 멤버로 등록할 수 없어요! 일정을 조정한 뒤 추가할 수 있습니다.

From 32821973487ba48485f5f1b95e6f408177a8f1d8 Mon Sep 17 00:00:00 2001 From: jiohjung98 Date: Wed, 12 Jun 2024 17:28:50 +0900 Subject: [PATCH 8/8] =?UTF-8?q?fix:=20=EC=B2=B4=ED=81=AC=EB=B0=95=EC=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/globals.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/globals.css b/src/styles/globals.css index 8a36adb..7b36edb 100644 --- a/src/styles/globals.css +++ b/src/styles/globals.css @@ -124,7 +124,7 @@ input[type="checkbox"]:checked { } input[type="checkbox"]:checked::after { - content: '✔'; + content: '✓'; font-size: 16px; color: #7c3aed; position: absolute;