From 5f9666f7b07bc4262dffee8461f8408853926331 Mon Sep 17 00:00:00 2001 From: Minh Nguyen <64875104+MinhxNguyen7@users.noreply.github.com> Date: Mon, 15 Jan 2024 07:32:07 +0000 Subject: [PATCH 01/12] =?UTF-8?q?chore:=20=F0=9F=94=A7=20rename=20calendar?= =?UTF-8?q?Store=20to=20meetingSetupStore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/components/Calendar/Calendar.svelte | 12 ++++++------ src/lib/components/Calendar/CalendarBody.svelte | 4 ++-- .../{calendarStores.ts => meetingSetupStores.ts} | 0 3 files changed, 8 insertions(+), 8 deletions(-) rename src/lib/stores/{calendarStores.ts => meetingSetupStores.ts} (100%) diff --git a/src/lib/components/Calendar/Calendar.svelte b/src/lib/components/Calendar/Calendar.svelte index ec023109..e1c7555d 100644 --- a/src/lib/components/Calendar/Calendar.svelte +++ b/src/lib/components/Calendar/Calendar.svelte @@ -1,7 +1,7 @@ -
-

{monthName} {currentYear}

-
+
+

{monthName} {currentYear}

+
@@ -47,8 +47,8 @@ {#each WEEKDAYS as dayOfWeek} -
-

+

+

{dayOfWeek}

diff --git a/src/lib/components/Calendar/CalendarBody.svelte b/src/lib/components/Calendar/CalendarBody.svelte index 04e9fe48..f34c3d70 100644 --- a/src/lib/components/Calendar/CalendarBody.svelte +++ b/src/lib/components/Calendar/CalendarBody.svelte @@ -1,7 +1,7 @@ -
+
From 51ec7b74b1b6bd8fc57f1db43fe2304e436fee07 Mon Sep 17 00:00:00 2001 From: Minh Nguyen <64875104+MinhxNguyen7@users.noreply.github.com> Date: Mon, 15 Jan 2024 07:53:07 +0000 Subject: [PATCH 03/12] =?UTF-8?q?chore:=20=F0=9F=94=A7=20extract=20compone?= =?UTF-8?q?nts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meetingSetup/Calendar/Calendar.svelte | 50 +++++++++---------- .../meetingSetup/MeetingSetupPage.svelte | 7 +++ src/routes/+page.svelte | 4 +- 3 files changed, 33 insertions(+), 28 deletions(-) create mode 100644 src/lib/components/meetingSetup/MeetingSetupPage.svelte diff --git a/src/lib/components/meetingSetup/Calendar/Calendar.svelte b/src/lib/components/meetingSetup/Calendar/Calendar.svelte index c4bd58b7..d77d20a0 100644 --- a/src/lib/components/meetingSetup/Calendar/Calendar.svelte +++ b/src/lib/components/meetingSetup/Calendar/Calendar.svelte @@ -37,30 +37,28 @@ }; -
-

{monthName} {currentYear}

-
- - - - - {#each WEEKDAYS as dayOfWeek} - - {/each} - - - -
-
-

- {dayOfWeek} -

-
-
- -
+

{monthName} {currentYear}

+
+ + + + + {#each WEEKDAYS as dayOfWeek} + + {/each} + + + +
+
+

+ {dayOfWeek} +

+
+
+
diff --git a/src/lib/components/meetingSetup/MeetingSetupPage.svelte b/src/lib/components/meetingSetup/MeetingSetupPage.svelte new file mode 100644 index 00000000..1d600ea5 --- /dev/null +++ b/src/lib/components/meetingSetup/MeetingSetupPage.svelte @@ -0,0 +1,7 @@ + + +
+ +
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 4cd3cc81..f6887125 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,7 +1,7 @@
- +
From a1e1dd3e9491debee00fbbcea5bf766bd3b95d2c Mon Sep 17 00:00:00 2001 From: Minh Nguyen <64875104+MinhxNguyen7@users.noreply.github.com> Date: Fri, 19 Jan 2024 00:18:17 +0000 Subject: [PATCH 04/12] =?UTF-8?q?feat:=20=E2=9C=A8=20meeting=20name=20fiel?= =?UTF-8?q?d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meetingSetup/MeetingNameField.svelte | 25 +++++++++++++++++++ .../meetingSetup/MeetingSetupPage.svelte | 2 ++ src/lib/stores/meetingSetupStores.ts | 3 +++ 3 files changed, 30 insertions(+) create mode 100644 src/lib/components/meetingSetup/MeetingNameField.svelte diff --git a/src/lib/components/meetingSetup/MeetingNameField.svelte b/src/lib/components/meetingSetup/MeetingNameField.svelte new file mode 100644 index 00000000..976c371b --- /dev/null +++ b/src/lib/components/meetingSetup/MeetingNameField.svelte @@ -0,0 +1,25 @@ + + +
+ +
diff --git a/src/lib/components/meetingSetup/MeetingSetupPage.svelte b/src/lib/components/meetingSetup/MeetingSetupPage.svelte index 1d600ea5..d9d1dd34 100644 --- a/src/lib/components/meetingSetup/MeetingSetupPage.svelte +++ b/src/lib/components/meetingSetup/MeetingSetupPage.svelte @@ -1,7 +1,9 @@
+
diff --git a/src/lib/stores/meetingSetupStores.ts b/src/lib/stores/meetingSetupStores.ts index 7f1b9f2d..e774820d 100644 --- a/src/lib/stores/meetingSetupStores.ts +++ b/src/lib/stores/meetingSetupStores.ts @@ -46,3 +46,6 @@ export const updateSelectedRange = (startDate: Day, endDate: Day): void => { return modifiedSelectedDays; }); }; + +export const DEFAULT_MEETING_NAME = "Meeting Name"; +export const meetingName = writable(DEFAULT_MEETING_NAME); From a83304885654cf1ec397536ed3033e2fcc4ecae4 Mon Sep 17 00:00:00 2001 From: Adithya Anandsaikrishnan Date: Thu, 25 Jan 2024 14:23:28 -0800 Subject: [PATCH 05/12] =?UTF-8?q?feat:=20=E2=9C=A8=20setup=20time=20select?= =?UTF-8?q?ion=20on=20meeting=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meetingSetup/MeetingSetupPage.svelte | 5 ++- .../meetingSetup/MeetingTimeField.svelte | 37 +++++++++++++++++++ src/lib/stores/meetingSetupStores.ts | 11 ++++++ src/lib/types/meetings.ts | 5 +++ 4 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 src/lib/components/meetingSetup/MeetingTimeField.svelte diff --git a/src/lib/components/meetingSetup/MeetingSetupPage.svelte b/src/lib/components/meetingSetup/MeetingSetupPage.svelte index d9d1dd34..94762e30 100644 --- a/src/lib/components/meetingSetup/MeetingSetupPage.svelte +++ b/src/lib/components/meetingSetup/MeetingSetupPage.svelte @@ -1,9 +1,12 @@
+
diff --git a/src/lib/components/meetingSetup/MeetingTimeField.svelte b/src/lib/components/meetingSetup/MeetingTimeField.svelte new file mode 100644 index 00000000..f608a6c7 --- /dev/null +++ b/src/lib/components/meetingSetup/MeetingTimeField.svelte @@ -0,0 +1,37 @@ + + + +
+ + +
diff --git a/src/lib/stores/meetingSetupStores.ts b/src/lib/stores/meetingSetupStores.ts index e774820d..112ca896 100644 --- a/src/lib/stores/meetingSetupStores.ts +++ b/src/lib/stores/meetingSetupStores.ts @@ -1,6 +1,7 @@ import { writable } from "svelte/store"; import { Day } from "$lib/components/meetingSetup/Calendar/CalendarDay"; +import type { MeetingTime } from "$lib/types/meetings"; export const selectedDays = writable([]); @@ -49,3 +50,13 @@ export const updateSelectedRange = (startDate: Day, endDate: Day): void => { export const DEFAULT_MEETING_NAME = "Meeting Name"; export const meetingName = writable(DEFAULT_MEETING_NAME); + +// TODO: Convert to ZotDate + +export const DEFAULT_MEETING_TIMES: MeetingTime = { + startTime: "08:00", + endTime: "17:00", +}; + +export const startTime = writable(DEFAULT_MEETING_TIMES.startTime); +export const endTime = writable(DEFAULT_MEETING_TIMES.endTime); diff --git a/src/lib/types/meetings.ts b/src/lib/types/meetings.ts index ad6105da..ec5c881b 100644 --- a/src/lib/types/meetings.ts +++ b/src/lib/types/meetings.ts @@ -23,3 +23,8 @@ export type UnscheduledMeeting = { endTime: string; location: string; }; + +export type MeetingTime = { + startTime: string; + endTime: string; +}; From 5fe017479e55f3a8a5e7b7e2005c39ec6c794cda Mon Sep 17 00:00:00 2001 From: Adithya Anandsaikrishnan Date: Thu, 25 Jan 2024 14:33:11 -0800 Subject: [PATCH 06/12] =?UTF-8?q?feat:=20=E2=9C=A8=20made=20select=20event?= =?UTF-8?q?s=20select=20all=20text=20on=20inputs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/components/meetingSetup/MeetingNameField.svelte | 8 ++++++-- src/lib/components/meetingSetup/MeetingTimeField.svelte | 6 ------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/lib/components/meetingSetup/MeetingNameField.svelte b/src/lib/components/meetingSetup/MeetingNameField.svelte index 976c371b..9d240061 100644 --- a/src/lib/components/meetingSetup/MeetingNameField.svelte +++ b/src/lib/components/meetingSetup/MeetingNameField.svelte @@ -8,8 +8,11 @@ $meetingName = DEFAULT_MEETING_NAME; }); - const onSelect = () => { - // TODO: Select all text in field + const onFocus = (e: Event) => { + (e.target as HTMLInputElement).select(); + }; + const onSelect = (e: Event) => { + (e.target as HTMLInputElement).select(); }; @@ -19,6 +22,7 @@ alt="meeting name input" id="meeting-name-input" class="input h-full w-full rounded-lg text-center text-2xl text-zinc-500" + on:focus={onFocus} on:select={onSelect} bind:value={$meetingName} /> diff --git a/src/lib/components/meetingSetup/MeetingTimeField.svelte b/src/lib/components/meetingSetup/MeetingTimeField.svelte index f608a6c7..53a5249c 100644 --- a/src/lib/components/meetingSetup/MeetingTimeField.svelte +++ b/src/lib/components/meetingSetup/MeetingTimeField.svelte @@ -8,10 +8,6 @@ $startTime = DEFAULT_MEETING_TIMES.startTime; $endTime = DEFAULT_MEETING_TIMES.endTime; }); - - const onSelect = () => { - // TODO: Select all text in field - }; @@ -22,7 +18,6 @@ id="meeting-start-time-input" class="input h-full w-full rounded-lg text-center text-2xl text-zinc-500" step="900" - on:select={onSelect} bind:value={$startTime} />
From 3a3102fdc839513e74f6cbddc0bd1de2a46023f1 Mon Sep 17 00:00:00 2001 From: Adithya Anandsaikrishnan Date: Thu, 25 Jan 2024 15:22:16 -0800 Subject: [PATCH 07/12] =?UTF-8?q?feat:=20=E2=9C=A8=20created=20sample=20av?= =?UTF-8?q?ailability=20page=20with=20persistent=20data=20from=20submissio?= =?UTF-8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meetingSetup/MeetingContinueButton.svelte | 11 +++++++ .../meetingSetup/MeetingSetupPage.svelte | 4 ++- .../meetingSetup/MeetingTimeField.svelte | 2 +- src/routes/availability/+page.svelte | 29 +++++++++++++++++++ 4 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 src/lib/components/meetingSetup/MeetingContinueButton.svelte create mode 100644 src/routes/availability/+page.svelte diff --git a/src/lib/components/meetingSetup/MeetingContinueButton.svelte b/src/lib/components/meetingSetup/MeetingContinueButton.svelte new file mode 100644 index 00000000..0dde27ff --- /dev/null +++ b/src/lib/components/meetingSetup/MeetingContinueButton.svelte @@ -0,0 +1,11 @@ + + + diff --git a/src/lib/components/meetingSetup/MeetingSetupPage.svelte b/src/lib/components/meetingSetup/MeetingSetupPage.svelte index 94762e30..dc69b215 100644 --- a/src/lib/components/meetingSetup/MeetingSetupPage.svelte +++ b/src/lib/components/meetingSetup/MeetingSetupPage.svelte @@ -1,12 +1,14 @@ -
+
+
diff --git a/src/lib/components/meetingSetup/MeetingTimeField.svelte b/src/lib/components/meetingSetup/MeetingTimeField.svelte index 53a5249c..3a94470d 100644 --- a/src/lib/components/meetingSetup/MeetingTimeField.svelte +++ b/src/lib/components/meetingSetup/MeetingTimeField.svelte @@ -11,7 +11,7 @@ -
+
+ import { Table, type TableSource, tableSourceValues } from "@skeletonlabs/skeleton"; + + import { endTime, meetingName, startTime } from "$lib/stores/meetingSetupStores"; + + const mockTimes = [ + ["08:00", true, false, true, false, true], + ["8:30", true, false, true, false, true], + ["9:00", true, false, true, false, true], + ["9:30", true, false, true, false, true], + ["10:00", true, false, true, false, true], + ]; + const mockLabels = ["Time", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday"]; + + const mockTable: TableSource = { + head: mockLabels, + body: tableSourceValues(mockTimes), + }; + + +
+
+

{$meetingName}

+ + +

Start: {$startTime}

+

End: {$endTime}

+ + From 5467e24eb2934547f6e035405ea96d73270fcb94 Mon Sep 17 00:00:00 2001 From: Adithya Anandsaikrishnan Date: Thu, 25 Jan 2024 16:23:22 -0800 Subject: [PATCH 08/12] =?UTF-8?q?refactor:=20=E2=99=BB=EF=B8=8F=20modified?= =?UTF-8?q?=20availability=20to=20sample=20availability?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/components/meetingSetup/MeetingContinueButton.svelte | 2 +- src/routes/{availability => availability-sample}/+page.svelte | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/routes/{availability => availability-sample}/+page.svelte (100%) diff --git a/src/lib/components/meetingSetup/MeetingContinueButton.svelte b/src/lib/components/meetingSetup/MeetingContinueButton.svelte index 0dde27ff..4c61e7cd 100644 --- a/src/lib/components/meetingSetup/MeetingContinueButton.svelte +++ b/src/lib/components/meetingSetup/MeetingContinueButton.svelte @@ -2,7 +2,7 @@ import { goto } from "$app/navigation"; const onClick = () => { - goto("/availability"); + goto("/availability-sample"); }; diff --git a/src/routes/availability/+page.svelte b/src/routes/availability-sample/+page.svelte similarity index 100% rename from src/routes/availability/+page.svelte rename to src/routes/availability-sample/+page.svelte From 066226ddb8ef3322aa45d1334d036b6e842d9072 Mon Sep 17 00:00:00 2001 From: Adithya Anandsaikrishnan Date: Thu, 1 Feb 2024 12:26:33 -0800 Subject: [PATCH 09/12] =?UTF-8?q?fix:=20=F0=9F=90=9B=20fixed=20bugs=20aris?= =?UTF-8?q?en=20from=20combining=20main=20into=20feature=20branch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/components/Calendar/Calendar.svelte | 69 ------------------- .../meetingSetup/Calendar/Calendar.svelte | 17 +++-- .../meetingSetup/Calendar/CalendarBody.svelte | 4 +- 3 files changed, 12 insertions(+), 78 deletions(-) delete mode 100644 src/lib/components/Calendar/Calendar.svelte diff --git a/src/lib/components/Calendar/Calendar.svelte b/src/lib/components/Calendar/Calendar.svelte deleted file mode 100644 index c1b79367..00000000 --- a/src/lib/components/Calendar/Calendar.svelte +++ /dev/null @@ -1,69 +0,0 @@ - - -
-

{monthName} {currentYear}

-
- -
- - - {#each WEEKDAYS as dayOfWeek} - - {/each} - - - -
-
-

- {dayOfWeek} -

-
-
- -
-
diff --git a/src/lib/components/meetingSetup/Calendar/Calendar.svelte b/src/lib/components/meetingSetup/Calendar/Calendar.svelte index d77d20a0..96073bf2 100644 --- a/src/lib/components/meetingSetup/Calendar/Calendar.svelte +++ b/src/lib/components/meetingSetup/Calendar/Calendar.svelte @@ -1,17 +1,24 @@

{monthName} {currentYear}

@@ -56,7 +59,7 @@ {/each} - +