From e641ed9aa82a0ab54720f2b60aee20c7a49a6a4f Mon Sep 17 00:00:00 2001 From: Eunseo Sim <55528304+simeunseo@users.noreply.github.com> Date: Tue, 25 Jun 2024 16:55:46 +0900 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=EC=84=A0=ED=98=B8=20=EC=8B=9C?= =?UTF-8?q?=EA=B0=84=20=EC=9E=85=EB=A0=A5=EC=8B=9C=20=EB=8B=A4=EC=9D=8C=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=ED=99=9C=EC=84=B1=ED=99=94=20=EC=95=88?= =?UTF-8?q?=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/SteppingStone/SteppingLayout.tsx | 1 - .../components/useFunnel/SetTimes.tsx | 19 +++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/pages/SteppingStone/SteppingLayout.tsx b/src/pages/SteppingStone/SteppingLayout.tsx index b7f21bb4..f5d0a208 100644 --- a/src/pages/SteppingStone/SteppingLayout.tsx +++ b/src/pages/SteppingStone/SteppingLayout.tsx @@ -39,7 +39,6 @@ function SteppingLayout({ steppingType }: SteppingProps) { ); const handlePopstate = () => { - alert('handle 작동'); navigate('/'); }; diff --git a/src/pages/createMeeting/components/useFunnel/SetTimes.tsx b/src/pages/createMeeting/components/useFunnel/SetTimes.tsx index 1612a9b8..0a79fe03 100644 --- a/src/pages/createMeeting/components/useFunnel/SetTimes.tsx +++ b/src/pages/createMeeting/components/useFunnel/SetTimes.tsx @@ -71,8 +71,9 @@ function SetTimes({ meetingInfo, setMeetingInfo, setStep }: FunnelProps) { meetingInfo.preferTimes.length >= 2 || (meetingInfo.preferTimes[0].startTime !== '00:00' && meetingInfo.preferTimes[0].endTime !== '00:00') - ) + ) { return true; + } return false; }; @@ -180,13 +181,7 @@ function SetTimes({ meetingInfo, setMeetingInfo, setStep }: FunnelProps) { ); diff --git a/src/pages/OverallSchedule/OverallSchedule.tsx b/src/pages/OverallSchedule/OverallSchedule.tsx index 114487aa..2f69658f 100644 --- a/src/pages/OverallSchedule/OverallSchedule.tsx +++ b/src/pages/OverallSchedule/OverallSchedule.tsx @@ -44,7 +44,6 @@ const OverallSchedule = () => { const result = await overallScheduleApi(meetingId); const { data } = result.data; const uniqueData = [...new Set(data.totalUserNames)]; - console.log(uniqueData); setOverallScheduleData(data); setMemberCount(data.memberCount); setTotalUserNames(uniqueData); @@ -61,9 +60,6 @@ const OverallSchedule = () => { const formattedAvailableDateTimes = overallScheduleData && getFormattedAvailableDateTimes(overallScheduleData); -console.log(timeSlotUserNames); -console.log(formattedAvailableDateTimes); -console.log(timeSlotUserNames); return ( {overallScheduleData ? ( diff --git a/src/pages/OverallSchedule/components/Column.tsx b/src/pages/OverallSchedule/components/Column.tsx index 9f59786e..91085345 100644 --- a/src/pages/OverallSchedule/components/Column.tsx +++ b/src/pages/OverallSchedule/components/Column.tsx @@ -30,7 +30,6 @@ const Column = (props: ColumnProps) => { } = props; const handleSlotClick = () => { - console.log(filterUserNames(userNames)); setTimeSlotUserName(userNames); setClickedTimeSlot(rowIdx + timeSlot); }; diff --git a/src/pages/OverallSchedule/components/Row.tsx b/src/pages/OverallSchedule/components/Row.tsx index 7db6bffe..2ea71238 100644 --- a/src/pages/OverallSchedule/components/Row.tsx +++ b/src/pages/OverallSchedule/components/Row.tsx @@ -54,7 +54,6 @@ const Row = (props: RowProps) => { if (objArray === undefined) return; const targetObj = objArray.find((obj)=> obj.time === targetTime); if(targetObj){ - console.log(targetObj.userNames); const temp=filterUserNames(targetObj.userNames); return temp; } diff --git a/src/pages/SteppingStone/SteppingLayout.tsx b/src/pages/SteppingStone/SteppingLayout.tsx index f5d0a208..3c5182ce 100644 --- a/src/pages/SteppingStone/SteppingLayout.tsx +++ b/src/pages/SteppingStone/SteppingLayout.tsx @@ -48,14 +48,6 @@ function SteppingLayout({ steppingType }: SteppingProps) { }; }, []); - // useEffect(() => { - // history.pushState(null, '', location.href); - // console.log(location.href); - // window.onpopstate = function() { - // history.go(1); - // }; - // }, []); - return ( <> diff --git a/src/pages/selectSchedule/SelectModal.tsx b/src/pages/selectSchedule/SelectModal.tsx index 5a0a6136..993012fd 100644 --- a/src/pages/selectSchedule/SelectModal.tsx +++ b/src/pages/selectSchedule/SelectModal.tsx @@ -24,15 +24,12 @@ function SelectModal({ setShowModal }: ModalProps) { const navigate = useNavigate(); const { auth, meetingId } = useParams(); const updateScheduleType = transformHostScheduleType(scheduleList); - console.log(updateScheduleType); const updateMemberScheduleType = transformUserScheduleType(scheduleList, userName); - console.log(updateMemberScheduleType); const postHostAvailableApi = async () => { try { if (meetingId && updateScheduleType) { const { data } = await hostAvailableApi(meetingId, updateScheduleType); - console.log(data); if (data.code === 201) { setShowModal(false); navigate(`/${auth}/schedule-complete/${meetingId}`); @@ -80,14 +77,6 @@ function SelectModal({ setShowModal }: ModalProps) { } }; - useEffect( - () => { - console.log(scheduleList); - }, - [scheduleList], - ); - - // console.log(transformedScheduleList); const finishConfirm = () => { //여기에 api 연결하세요. if (auth === 'host') { diff --git a/src/pages/selectSchedule/SelectSchedulePage.tsx b/src/pages/selectSchedule/SelectSchedulePage.tsx index cb5b3066..af0f9d5e 100644 --- a/src/pages/selectSchedule/SelectSchedulePage.tsx +++ b/src/pages/selectSchedule/SelectSchedulePage.tsx @@ -102,7 +102,6 @@ function SelectSchedulePage() { priority: 0, }; setScheduleList([...scheduleList, schedule]); - console.log(scheduleList); }; const deleteDataList = (index: number) => { @@ -269,9 +268,9 @@ const StyledBtnSection = styled.section` bottom: 0; align-items: end; justify-content: center; - background: ${({ theme }) => theme.colors.dim_gradient}; - margin-top:3rem; + margin-top: 3rem; + background: ${({ theme }) => theme.colors.dim_gradient}; padding-bottom: 2.9rem; width: 100%; diff --git a/src/pages/selectSchedule/components/DateSelect.tsx b/src/pages/selectSchedule/components/DateSelect.tsx index ed7ccac3..cc9d7cce 100644 --- a/src/pages/selectSchedule/components/DateSelect.tsx +++ b/src/pages/selectSchedule/components/DateSelect.tsx @@ -19,7 +19,6 @@ function DateSelect({ id, handleDate, availableDates, scheduleList }: PropTypes) const [isOpen, setIsOpen] = useState(false); const ref = useRef(null); - console.log(id); useEffect( () => { const clickOutSide = (e: MouseEvent) => { diff --git a/src/pages/selectSchedule/utils/changeApiReq.ts b/src/pages/selectSchedule/utils/changeApiReq.ts index f23f1ebc..441f8294 100644 --- a/src/pages/selectSchedule/utils/changeApiReq.ts +++ b/src/pages/selectSchedule/utils/changeApiReq.ts @@ -9,9 +9,6 @@ export const transformHostScheduleType = ( scheduleList: ScheduleStates[], ): (HostAvailableSchduleRequestType | null)[] => { return scheduleList.map((item) => { - // const regexResult = item.date.match(/(\d+)월 (\d+)일 \((\S+)\)/); - // console.log(regexResult); - const matchedResult = item.date.match(/(\d+)월 (\d+)일 \((\S+)\)/); if (!matchedResult) { return null; // Handle the case when there is no match for the date pattern diff --git a/src/utils/apis/overallScheduleApi.ts b/src/utils/apis/overallScheduleApi.ts index 8d0c8377..f73cfe28 100644 --- a/src/utils/apis/overallScheduleApi.ts +++ b/src/utils/apis/overallScheduleApi.ts @@ -5,8 +5,7 @@ import { authClient, client } from './axios'; /** 가능 시간 입력 선택지 조회 api */ export const availbleScheduleOptionApi = (meetingId?: string) => { - const data= client.get(`/meeting/${meetingId}/schedule`); - console.log(data); + const data = client.get(`/meeting/${meetingId}/schedule`); return client.get(`/meeting/${meetingId}/schedule`); }; From 4b80479e671e0267b994a5fb1455e09a6fd0b6f9 Mon Sep 17 00:00:00 2001 From: Eunseo Sim <55528304+simeunseo@users.noreply.github.com> Date: Mon, 1 Jul 2024 16:42:18 +0900 Subject: [PATCH 3/6] Update README.md --- README.md | 58 +------------------------------------------------------ 1 file changed, 1 insertion(+), 57 deletions(-) diff --git a/README.md b/README.md index 72a2d019..8ad7853b 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,7 @@ # 🏃 모든 회의의 시작, ASAP 💨 - -![BRANDING 1_PLAN](https://github.com/ASAP-as-soon-as-possible/ASAP_Client/assets/55528304/2526c8a1-21e7-471d-bce8-db8874a5cc5c) ![BRANDING 3_PLAN](https://github.com/ASAP-as-soon-as-possible/ASAP_Client/assets/55528304/ddf9b475-a825-4577-8e14-b8d190a864b2) -ASAP 은 회의를 진행하는 업무시간 외 일련의 사전작업들을 쉽고 빠르고 간편하게 처리해주는 웹서비스입니다. - -ASAP은 회의를 진행하는 업무시간 외 일련의 사전작업들을 쉽고 빠르고 간편하게 처리해주는 '최적의 회의시간 도출' 웹서비스입니다. +ASAP은 회의를 진행하는 업무시간 외 일련의 사전작업들을 쉽고 빠르고 간편하게 처리해주는 '최적의 회의시간 도출' 웹 서비스입니다. 2. **회의 관련 정보를 하나의 큐카드로 정리해 제공**함으로써 회의 시간 외 추가 공지사항을 단톡방에 올리는 수고로움 또한 덜어주고자 합니다. @@ -25,8 +21,6 @@ ASAP은 회의를 진행하는 업무시간 외 일련의 사전작업들을 쉽 | :-----------------------------------------------------------------------------------------------------------------------: | | 7️⃣  준비물 등 추가 내용 | -## 📥  가능 시간 입력하기 - ## 📥 가능 시간 입력하기 | | | | :---: | :---: | @@ -45,56 +39,6 @@ ASAP은 회의를 진행하는 업무시간 외 일련의 사전작업들을 쉽 | [이재훈](https://github.com/ljh0608) | [이동헌](https://github.com/eastlaw80) | [심은서](https://github.com/simeunseo) | [정찬우](https://github.com/Chanwoo-Jeong) | | `WEB FE` `리드개발자` | `WEB FE` | `WEB FE` | `WEB FE` | -# ⚒️ 기술 스택 - -```jsx - "@types/axios": "^0.14.0", - "@types/react-copy-to-clipboard": "^5.0.4", - "axios": "^1.4.0", - "copy-text-to-clipboard": "^3.2.0", - "html2canvas": "^1.4.1", - "postcss-syntax": "^0.36.2", - "prettier": "1.13", - "react": "^18.2.0", - "react-copy-to-clipboard": "^5.1.0", - "react-dom": "^18.2.0", - "react-error-boundary": "^4.0.10", - "react-multi-date-picker": "^4.1.2", - "react-router-dom": "6", - "react-toastify": "^9.1.3", - "recoil": "^0.7.7", - "recoil-persist": "^5.1.0", - "styled-reset": "^4.5.1", - "swiper": "^10.0.4", - "vite-plugin-svgr": "^3.2.0" - "@stylelint/postcss-css-in-js": "^0.38.0", - "@types/node": "^20.3.2", - "@types/react": "^18.0.37", - "@types/react-dom": "^18.0.11", - "@types/styled-components": "^5.1.26", - "@typescript-eslint/eslint-plugin": "^5.60.1", - "@typescript-eslint/parser": "^5.60.1", - "@vitejs/plugin-react": "^4.0.0", - "babel-plugin-styled-components": "^2.1.4", - "eslint": "^8.43.0", - "eslint-plugin-import": "^2.27.5", - "eslint-plugin-jsx-a11y": "^6.7.1", - "eslint-plugin-react": "^7.32.2", - "eslint-plugin-react-hooks": "^4.6.0", - "eslint-plugin-react-refresh": "^0.3.4", - "postcss": "^8.4.24", - "prettier-plugin-style-order": "^0.2.2", - "styled-components": "^6.0.1", - "stylelint": "15.5.0", - "stylelint-config-concentric-order": "^5.1.0", - "stylelint-config-prettier": "^9.0.5", - "stylelint-config-recommended": "^12.0.0", - "stylelint-config-styled-components": "^0.1.1", - "typescript": "^5.0.2", - "vite": "^4.3.9", - "vite-plugin-babel-macros": "^1.0.6" -``` - ### 🏙️  환경 구축 `React.js` `TypeScript` `Yarn` `Vite` From 89a4e6cc866df89fd2ccdae9e756ee2f6e2fc36e Mon Sep 17 00:00:00 2001 From: Eunseo Sim <55528304+simeunseo@users.noreply.github.com> Date: Mon, 1 Jul 2024 16:44:57 +0900 Subject: [PATCH 4/6] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8ad7853b..053e2a3e 100644 --- a/README.md +++ b/README.md @@ -17,18 +17,18 @@ ASAP은 회의를 진행하는 업무시간 외 일련의 사전작업들을 쉽 | :---: | :---: | :---: | | 4️⃣ 회의 장소 입력 | 5️⃣ 회의 시간 설정 | 6️⃣ 방장 정보 입력 | -| | +| | | :-----------------------------------------------------------------------------------------------------------------------: | | 7️⃣  준비물 등 추가 내용 | ## 📥 가능 시간 입력하기 -| | | +| | | | :---: | :---: | | 1️⃣ 일정 등록 | 2️⃣ 우선 순위 입력 | ## 📥 회의 일정 확인하기 -| | | | +| | | | | :---: | :---: | :---: | | 1️⃣ 종합 일정 시간표 확인 | 2️⃣ 최적의 회의시간 추천 | 3️⃣ 큐카드 공유하기 | From 5252f89ae5c43a708408de5b0ff38c97b5168b44 Mon Sep 17 00:00:00 2001 From: Eunseo Sim <55528304+simeunseo@users.noreply.github.com> Date: Wed, 3 Jul 2024 20:12:48 +0900 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20/time=20POST=20=EC=9A=94=EC=B2=AD?= =?UTF-8?q?=EA=B0=92=EC=97=90=EC=84=9C=20id=EC=99=80=20dayOfWeek=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=20=EC=82=AD=EC=A0=9C,=20month=EC=99=80=20day?= =?UTF-8?q?=EC=97=90=EC=84=9C=20padStart=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/selectSchedule/utils/changeApiReq.ts | 8 +++----- src/types/createAvailableSchduleType.ts | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/pages/selectSchedule/utils/changeApiReq.ts b/src/pages/selectSchedule/utils/changeApiReq.ts index 441f8294..e4b5f18c 100644 --- a/src/pages/selectSchedule/utils/changeApiReq.ts +++ b/src/pages/selectSchedule/utils/changeApiReq.ts @@ -13,13 +13,11 @@ export const transformHostScheduleType = ( if (!matchedResult) { return null; // Handle the case when there is no match for the date pattern } - const [, month, day, dateOfWeek] = matchedResult; + const [, month, day, ,] = matchedResult; return { - id: item.id.toString(), - month: month.padStart(2, '0'), - day: day.padStart(2, '0'), - dayOfWeek: dateOfWeek, + month: month, + day: day, startTime: item.startTime, endTime: item.endTime, priority: item.priority, diff --git a/src/types/createAvailableSchduleType.ts b/src/types/createAvailableSchduleType.ts index 9f0d7e29..01e187bd 100644 --- a/src/types/createAvailableSchduleType.ts +++ b/src/types/createAvailableSchduleType.ts @@ -1,8 +1,6 @@ export interface HostAvailableSchduleRequestType { - id: string; month: string; day: string; - dayOfWeek: string; startTime: string; endTime: string; priority: number; From 8911bc96fb4f19ad90764787cc821fece472a725 Mon Sep 17 00:00:00 2001 From: Eunseo Sim <55528304+simeunseo@users.noreply.github.com> Date: Wed, 3 Jul 2024 20:17:05 +0900 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=EB=A9=A4=EB=B2=84=20=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=EC=97=90=20=EB=8C=80=ED=95=B4=EC=84=9C=EB=8F=84=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/selectSchedule/utils/changeApiReq.ts | 9 +++------ src/types/createAvailableSchduleType.ts | 2 -- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/pages/selectSchedule/utils/changeApiReq.ts b/src/pages/selectSchedule/utils/changeApiReq.ts index e4b5f18c..db14f82e 100644 --- a/src/pages/selectSchedule/utils/changeApiReq.ts +++ b/src/pages/selectSchedule/utils/changeApiReq.ts @@ -35,7 +35,6 @@ export const transformUserScheduleType = ( // Handle the case when there is no match for the date pattern // For example, you can return an empty object or any default value you prefer. return { - id: '', month: '', day: '', dayOfWeek: '', @@ -47,12 +46,10 @@ export const transformUserScheduleType = ( // const [, month, day, dateOfWeek]: string[] | null = item.date.match( // /(\d+)월 (\d+)일 \((\S+)\)/, // ); - const [, month, day, dateOfWeek] = matchedResult; + const [, month, day, ,] = matchedResult; return { - id: item.id.toString(), - month: month.padStart(2, '0'), - day: day.padStart(2, '0'), - dayOfWeek: dateOfWeek, + month: month, + day: day, startTime: item.startTime, endTime: item.endTime, priority: item.priority, diff --git a/src/types/createAvailableSchduleType.ts b/src/types/createAvailableSchduleType.ts index 01e187bd..caa0bfca 100644 --- a/src/types/createAvailableSchduleType.ts +++ b/src/types/createAvailableSchduleType.ts @@ -17,10 +17,8 @@ export interface HostAvailableScheduleResponseType { export interface UserAvailableScheduleRequestType { name: string; availableTimes: { - id: string; month: string; day: string; - dayOfWeek: string; startTime: string; endTime: string; priority: number;