From 12aff943ffe857f129f6b013fd86f76b6c009cbe Mon Sep 17 00:00:00 2001 From: Chanwoo-Jeong Date: Thu, 27 Jul 2023 21:11:56 +0900 Subject: [PATCH 01/18] =?UTF-8?q?feat:=20=ED=86=B5=ED=95=A9=EA=B2=80?= =?UTF-8?q?=EC=83=89=EC=9D=84=20=EC=9C=84=ED=95=9C=20metatag=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index 38672560..08deac30 100644 --- a/index.html +++ b/index.html @@ -11,6 +11,7 @@ + ASAP, 최적의 회의시간 도출서비스 From 974997240dfdad0bc86e8aeb5b73be9921fe4222 Mon Sep 17 00:00:00 2001 From: Chanwoo-Jeong Date: Thu, 27 Jul 2023 23:13:29 +0900 Subject: [PATCH 02/18] =?UTF-8?q?deploy:=20=ED=86=B5=ED=95=A9=EA=B2=80?= =?UTF-8?q?=EC=83=89=EC=9D=84=20=EC=9C=84=ED=95=9C=20robots.txt=20,=20site?= =?UTF-8?q?map.xml=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/robots.txt | 2 ++ public/sitemap.xml | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 public/robots.txt create mode 100644 public/sitemap.xml diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 00000000..c2a49f4f --- /dev/null +++ b/public/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Allow: / diff --git a/public/sitemap.xml b/public/sitemap.xml new file mode 100644 index 00000000..533e309b --- /dev/null +++ b/public/sitemap.xml @@ -0,0 +1,16 @@ + + + + + + + https://www.beginwithasap.com/ + 2023-07-27T14:09:18+00:00 + + + + \ No newline at end of file From dd0b82f7a3a00a1abdbbedeca860be386369741a Mon Sep 17 00:00:00 2001 From: Chanwoo-Jeong Date: Tue, 1 Aug 2023 18:48:38 +0900 Subject: [PATCH 03/18] =?UTF-8?q?deploy:=20index.html=20meta=20description?= =?UTF-8?q?=20=ED=83=9C=EA=B7=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 08deac30..4f534412 100644 --- a/index.html +++ b/index.html @@ -12,7 +12,8 @@ - ASAP, 최적의 회의시간 도출서비스 + ASAP + From b2f2fa5c5675420445fc5dd33804a0cbb4c2dbd3 Mon Sep 17 00:00:00 2001 From: ljh0608 Date: Mon, 16 Oct 2023 15:04:44 +0900 Subject: [PATCH 04/18] =?UTF-8?q?fix:=20=EC=8B=9C=EA=B0=84=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=EC=8B=9C=20=EC=97=90=EB=9F=AC=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/selectSchedule/SelectSchedulePage.tsx | 4 +++- src/pages/selectSchedule/components/TimeSelect.tsx | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pages/selectSchedule/SelectSchedulePage.tsx b/src/pages/selectSchedule/SelectSchedulePage.tsx index e360f73c..cb5b3066 100644 --- a/src/pages/selectSchedule/SelectSchedulePage.tsx +++ b/src/pages/selectSchedule/SelectSchedulePage.tsx @@ -102,6 +102,7 @@ function SelectSchedulePage() { priority: 0, }; setScheduleList([...scheduleList, schedule]); + console.log(scheduleList); }; const deleteDataList = (index: number) => { @@ -219,7 +220,7 @@ const SelectPageWrapper = styled.div` const PlusButton = styled.button` margin-top: 3.2rem; - margin-bottom: 12.2rem; + margin-bottom: 16.2rem; border-radius: 0.8rem; background-color: ${({ theme }) => theme.colors.grey2}; width: 33.5rem; @@ -270,6 +271,7 @@ const StyledBtnSection = styled.section` justify-content: center; background: ${({ theme }) => theme.colors.dim_gradient}; + margin-top:3rem; padding-bottom: 2.9rem; width: 100%; diff --git a/src/pages/selectSchedule/components/TimeSelect.tsx b/src/pages/selectSchedule/components/TimeSelect.tsx index 097802d8..68956179 100644 --- a/src/pages/selectSchedule/components/TimeSelect.tsx +++ b/src/pages/selectSchedule/components/TimeSelect.tsx @@ -41,7 +41,7 @@ function TimeSelect({ text, id, handleStartTime, scheduleList, preferTimes }: Pr return ( - {scheduleList[id - 1].startTime ? ( + {scheduleList[id - 1]?.startTime ? ( {scheduleList[id - 1].startTime} From a027ae52fa367d76459e7de6aa1738916f3ae711 Mon Sep 17 00:00:00 2001 From: ljh0608 Date: Fri, 3 Nov 2023 12:51:18 +0900 Subject: [PATCH 05/18] =?UTF-8?q?hotfix:=20=EB=B9=84=EB=B0=80=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=EC=88=A8=EA=B9=80=EC=B2=98=EB=A6=AC=20=EB=8B=A4?= =?UTF-8?q?=EC=8B=9C=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/atomComponents/PasswordInput.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/atomComponents/PasswordInput.tsx b/src/components/atomComponents/PasswordInput.tsx index 856b76cc..1cd9229b 100644 --- a/src/components/atomComponents/PasswordInput.tsx +++ b/src/components/atomComponents/PasswordInput.tsx @@ -16,6 +16,7 @@ function PasswordInput({ value, placeholder, passWordOnChange, page }: ValueProp const [inputType, setInputType] = useState(true); const changePasswordType = () => { + console.log(inputType); setInputType((prev) => !prev); }; return ( @@ -26,7 +27,7 @@ function PasswordInput({ value, placeholder, passWordOnChange, page }: ValueProp value={value} onChange={passWordOnChange} $iserror={value.length < 4} - type={inputType ? `number` : undefined} + type={inputType ? 'password' : `number`} inputMode="numeric" /> From 8cd4404e839509b9abb3c7a458846fc4e85b386f Mon Sep 17 00:00:00 2001 From: ljh0608 Date: Tue, 7 Nov 2023 11:53:26 +0900 Subject: [PATCH 06/18] =?UTF-8?q?fix:=20=EC=B2=AB=EB=A1=9C=EB=94=A9?= =?UTF-8?q?=EB=95=8C=20meetingInfo=20prefertime=EC=A7=80=EC=9B=8C=EC=A3=BC?= =?UTF-8?q?=EB=8A=94=20=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../createMeeting/components/useFunnel/SetTimes.tsx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/pages/createMeeting/components/useFunnel/SetTimes.tsx b/src/pages/createMeeting/components/useFunnel/SetTimes.tsx index d3ffcba8..5bd94bfe 100644 --- a/src/pages/createMeeting/components/useFunnel/SetTimes.tsx +++ b/src/pages/createMeeting/components/useFunnel/SetTimes.tsx @@ -17,15 +17,14 @@ function SetTimes({ meetingInfo, setMeetingInfo, setStep }: FunnelProps) { const [endDropDown, setEndDropDown] = useState(false); const getDate = (btnState: boolean, startTime: string, endTime: string) => { + console.log('getDate 함수 호출'); + if (!btnState) { - // btnState가 true인 경우 preferTimes에 객체를 추가 setMeetingInfo((prev) => ({ ...prev, preferTimes: [...prev.preferTimes, { startTime: startTime, endTime: endTime }], })); } else { - console.log(btnState); - // btnState가 false인 경우 해당 startTime과 endTime을 가진 객체를 preferTimes에서 삭제 setMeetingInfo((prev) => ({ ...prev, preferTimes: prev.preferTimes.filter( @@ -62,7 +61,6 @@ function SetTimes({ meetingInfo, setMeetingInfo, setStep }: FunnelProps) { useEffect( () => { - console.log(meetingInfo.preferTimes[0]); if ( meetingInfo.preferTimes && meetingInfo.preferTimes[0] && @@ -77,6 +75,10 @@ function SetTimes({ meetingInfo, setMeetingInfo, setStep }: FunnelProps) { }, [meetingInfo.preferTimes], ); + + useEffect(() => { + deletePreferTimes(); + }, []); return ( From f9feedd9a446596425015aef96762cd959f8101f Mon Sep 17 00:00:00 2001 From: ljh0608 Date: Tue, 7 Nov 2023 15:34:33 +0900 Subject: [PATCH 07/18] =?UTF-8?q?fix:=20meetingInfo.preferTimes=20?= =?UTF-8?q?=EC=B4=88=EA=B8=B0=EA=B0=92=2000:00=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=84=B8=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/createMeeting/CreateMeeting.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/createMeeting/CreateMeeting.tsx b/src/pages/createMeeting/CreateMeeting.tsx index 96dc4bea..0b5c4a4d 100644 --- a/src/pages/createMeeting/CreateMeeting.tsx +++ b/src/pages/createMeeting/CreateMeeting.tsx @@ -1,4 +1,4 @@ -import { useState } from 'react'; +import { useEffect, useState } from 'react'; import Header from 'components/moleculesComponents/Header'; import ReturnBodyComponent from 'pages/createMeeting/components/ReturnBodyComponent'; @@ -11,7 +11,7 @@ import { MeetingInfo } from './types/useFunnelInterface'; const initialMeetingInfo: MeetingInfo = { title: '', availableDates: [''], - preferTimes: [], + preferTimes: [{ startTime: '00:00', endTime: '00:00' }], place: '', placeDetail: '', duration: '', @@ -24,6 +24,9 @@ function CreateMeeting() { const [step, setStep] = useState(0); const [meetingInfo, setMeetingInfo] = useState(initialMeetingInfo); const currentStep = funnelStep[step]; + useEffect(() => { + console.log(meetingInfo); + }, []); return ( <> From df701494facdd400fe4d45006939f0555f6f32a1 Mon Sep 17 00:00:00 2001 From: ljh0608 Date: Tue, 7 Nov 2023 15:39:02 +0900 Subject: [PATCH 08/18] =?UTF-8?q?fix:=20=EC=84=A0=ED=98=B8=EC=8B=9C?= =?UTF-8?q?=EA=B0=84=20=EC=9E=85=EB=A0=A5=20=EC=A4=91=EB=B3=B5=20=EC=84=A0?= =?UTF-8?q?=ED=83=9D=EB=90=98=EB=8A=94=20=EC=97=90=EB=9F=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20/=20=EC=A7=81=EC=A0=91=EC=9E=85=EB=A0=A5=20?= =?UTF-8?q?=EC=97=90=EB=9F=AC=20/=20=EB=B2=84=ED=8A=BC=20on/off=20?= =?UTF-8?q?=ED=8A=B8=EB=A6=AC=EA=B1=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/StartDropDown.tsx | 7 +-- .../components/useFunnel/SetPlace.tsx | 3 +- .../components/useFunnel/SetTimes.tsx | 58 +++++++++++-------- 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/src/pages/createMeeting/components/StartDropDown.tsx b/src/pages/createMeeting/components/StartDropDown.tsx index a8f53217..ce8f0999 100644 --- a/src/pages/createMeeting/components/StartDropDown.tsx +++ b/src/pages/createMeeting/components/StartDropDown.tsx @@ -4,22 +4,21 @@ import Text from 'components/atomComponents/Text'; import styled from 'styled-components/macro'; import { theme } from 'styles/theme'; -import { timeList } from '../data/meetingInfoData'; import { MeetingInfo } from '../types/useFunnelInterface'; interface PropTypes { time: string; type: string; - setIsOpen: Dispatch>; + setMeetingInfo: Dispatch>; } -function StartDropDown({ time, type, setIsOpen, setMeetingInfo }: PropTypes) { +function StartDropDown({ time, type, setMeetingInfo }: PropTypes) { const getTime = (time: string) => { if (type == 'start') { setMeetingInfo((prev) => ({ ...prev, - preferTimes: [{ startTime: time, endTime: '00:00' }], + preferTimes: [{ startTime: time, endTime: prev.preferTimes[0].endTime }], })); } else if (type == 'end') { setMeetingInfo((prev) => ({ diff --git a/src/pages/createMeeting/components/useFunnel/SetPlace.tsx b/src/pages/createMeeting/components/useFunnel/SetPlace.tsx index 532ec0d4..b2b2c9b1 100644 --- a/src/pages/createMeeting/components/useFunnel/SetPlace.tsx +++ b/src/pages/createMeeting/components/useFunnel/SetPlace.tsx @@ -9,6 +9,7 @@ function SetPlace({ meetingInfo, setMeetingInfo, setStep }: FunnelProps) { const setPlaceDetail = (place: string) => { setMeetingInfo((prev) => ({ ...prev, place, placeDetail: '' })); }; + console.log(meetingInfo); return ( @@ -16,7 +17,7 @@ function SetPlace({ meetingInfo, setMeetingInfo, setStep }: FunnelProps) { return (