From 4eb315c2032cf66dd769225bedf3523cfed172be Mon Sep 17 00:00:00 2001 From: Adithya Anandsaikrishnan Date: Thu, 1 Feb 2024 14:32:56 -0800 Subject: [PATCH 1/8] =?UTF-8?q?feat:=20=E2=9C=A8=20created=20member=20type?= =?UTF-8?q?s=20for=20groups=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/groups/MembersCarousel.svelte | 2 + src/lib/stores/groupStores.ts | 54 +++++++++++++++++++ src/lib/types/members.ts | 8 +++ src/routes/groups/+page.svelte | 0 4 files changed, 64 insertions(+) create mode 100644 src/lib/components/groups/MembersCarousel.svelte create mode 100644 src/lib/stores/groupStores.ts create mode 100644 src/lib/types/members.ts create mode 100644 src/routes/groups/+page.svelte diff --git a/src/lib/components/groups/MembersCarousel.svelte b/src/lib/components/groups/MembersCarousel.svelte new file mode 100644 index 00000000..0fbba997 --- /dev/null +++ b/src/lib/components/groups/MembersCarousel.svelte @@ -0,0 +1,2 @@ + diff --git a/src/lib/stores/groupStores.ts b/src/lib/stores/groupStores.ts new file mode 100644 index 00000000..9671fe33 --- /dev/null +++ b/src/lib/stores/groupStores.ts @@ -0,0 +1,54 @@ +// import {writable} from "svelte/store"; + +import type { Member } from "$lib/types/members"; + +export const exampleMembers: Member[] = [ + { + id: "1", + username: "user1", + email: "ALP1@gmail.com", + profile_picture: "https://i.stack.imgur.com/34AD2.jpg", + profile_page: `/users/user1`, + created_at: new Date(), + }, + { + id: "2", + username: "user2", + email: "alp2@gmail.com", + profile_picture: "https://i.stack.imgur.com/34AD2.jpg", + profile_page: `/users/user2`, + created_at: new Date(), + }, + { + id: "3", + username: "user3", + email: "doglover@gmail.com", + profile_picture: "https://i.stack.imgur.com/34AD2.jpg", + profile_page: `/users/user3`, + created_at: new Date(), + }, + { + id: "4", + username: "user4", + email: "mentoscandy@gmail.com", + profile_picture: "https://i.stack.imgur.com/34AD2.jpg", + profile_page: `/users/user4`, + created_at: new Date(), + }, + { + id: "5", + username: "user5", + email: "whousesaolanymore@aol.com", + profile_picture: "https://i.stack.imgur.com/34AD2.jpg", + profile_page: `/users/user5`, + created_at: new Date(), + }, + { + id: "6", + username: "user6", + email: "outlookuser@outlook.com", + profile_picture: "https://i.stack.imgur.com/34AD2.jpg", + profile_page: `/users/user6`, + created_at: new Date(), + }, +]; diff --git a/src/lib/types/members.ts b/src/lib/types/members.ts new file mode 100644 index 00000000..b0039fe4 --- /dev/null +++ b/src/lib/types/members.ts @@ -0,0 +1,8 @@ +export type Member = { + id: string; + username: string; + email: string; + profile_picture: string; + profile_page: string; + created_at: Date; +}; diff --git a/src/routes/groups/+page.svelte b/src/routes/groups/+page.svelte new file mode 100644 index 00000000..e69de29b From de5cf766964681eaed1175c2936b2297e7512afb Mon Sep 17 00:00:00 2001 From: Adithya Anandsaikrishnan Date: Thu, 1 Feb 2024 14:52:34 -0800 Subject: [PATCH 2/8] =?UTF-8?q?feat:=20=E2=9C=A8=20added=20members=20to=20?= =?UTF-8?q?groups=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/groups/MembersCarousel.svelte | 15 ++++++ src/lib/stores/groupStores.ts | 48 +++++++++++-------- src/routes/groups/+page.svelte | 38 +++++++++++++++ 3 files changed, 81 insertions(+), 20 deletions(-) diff --git a/src/lib/components/groups/MembersCarousel.svelte b/src/lib/components/groups/MembersCarousel.svelte index 0fbba997..ef7bbe59 100644 --- a/src/lib/components/groups/MembersCarousel.svelte +++ b/src/lib/components/groups/MembersCarousel.svelte @@ -1,2 +1,17 @@ + +
+ {#each $members as member (member.id)} + +
+

+ @{member.username} +

+ + {/each} +
diff --git a/src/lib/stores/groupStores.ts b/src/lib/stores/groupStores.ts index 9671fe33..8b7771c0 100644 --- a/src/lib/stores/groupStores.ts +++ b/src/lib/stores/groupStores.ts @@ -1,54 +1,62 @@ -// import {writable} from "svelte/store"; +import { writable } from "svelte/store"; import type { Member } from "$lib/types/members"; -export const exampleMembers: Member[] = [ +const exampleMembers: Member[] = [ { id: "1", - username: "user1", + username: "whodunit", email: "ALP1@gmail.com", - profile_picture: "https://i.stack.imgur.com/34AD2.jpg", - profile_page: `/users/user1`, + profile_picture: + "https://images.unsplash.com/photo-1507003211169-0a1dd7228f2d?q=80&w=1287&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D", + profile_page: `/users/whodunit`, created_at: new Date(), }, { id: "2", - username: "user2", + username: "youserone", email: "alp2@gmail.com", - profile_picture: "https://i.stack.imgur.com/34AD2.jpg", - profile_page: `/users/user2`, + profile_picture: + "https://images.unsplash.com/photo-1500648767791-00dcc994a43e?q=80&w=1287&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D", + profile_page: `/users/youserone`, created_at: new Date(), }, { id: "3", - username: "user3", + username: "salaman", email: "doglover@gmail.com", - profile_picture: "https://i.stack.imgur.com/34AD2.jpg", - profile_page: `/users/user3`, + profile_picture: + "https://images.unsplash.com/photo-1535713875002-d1d0cf377fde?q=80&w=1160&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D", + profile_page: `/users/salaman`, created_at: new Date(), }, { id: "4", - username: "user4", + username: "george42", email: "mentoscandy@gmail.com", - profile_picture: "https://i.stack.imgur.com/34AD2.jpg", - profile_page: `/users/user4`, + profile_picture: + "https://images.unsplash.com/photo-1633332755192-727a05c4013d?q=80&w=1160&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D", + profile_page: `/users/george42`, created_at: new Date(), }, { id: "5", - username: "user5", + username: "ren2", email: "whousesaolanymore@aol.com", - profile_picture: "https://i.stack.imgur.com/34AD2.jpg", - profile_page: `/users/user5`, + profile_picture: + "https://images.unsplash.com/photo-1544168190-79c17527004f?q=80&w=1288&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D", + profile_page: `/users/ren2`, created_at: new Date(), }, { id: "6", - username: "user6", + username: "chlo1", email: "outlookuser@outlook.com", - profile_picture: "https://i.stack.imgur.com/34AD2.jpg", - profile_page: `/users/user6`, + profile_picture: + "https://images.unsplash.com/photo-1619895862022-09114b41f16f?q=80&w=1170&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D", + profile_page: `/users/chlo1`, created_at: new Date(), }, ]; + +export const members = writable(exampleMembers); diff --git a/src/routes/groups/+page.svelte b/src/routes/groups/+page.svelte index e69de29b..5b0cdc61 100644 --- a/src/routes/groups/+page.svelte +++ b/src/routes/groups/+page.svelte @@ -0,0 +1,38 @@ + + +
+
+

Members

+ +
+ +
+ +
+

Meetings

+
+ Scheduled + Unscheduled +
+
+ + + {#if tabSet === 0} +
+ {:else if tabSet === 1} +
+ +
+ {/if} + + +
+
From 0d3e2cee10379aa7aa53dfbdfa34ef5684ccaeb2 Mon Sep 17 00:00:00 2001 From: Adithya Anandsaikrishnan Date: Thu, 1 Feb 2024 15:18:42 -0800 Subject: [PATCH 3/8] =?UTF-8?q?feat:=20=E2=9C=A8=20added=20groups=20to=20s?= =?UTF-8?q?idebar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/components/SideBar/SideBar.svelte | 10 ++-- .../groups/GroupScheduledMeetingList.svelte | 57 +++++++++++++++++++ src/lib/stores/groupStores.ts | 13 +++-- src/routes/groups/+page.svelte | 4 +- 4 files changed, 72 insertions(+), 12 deletions(-) create mode 100644 src/lib/components/groups/GroupScheduledMeetingList.svelte diff --git a/src/lib/components/SideBar/SideBar.svelte b/src/lib/components/SideBar/SideBar.svelte index 8ce93b07..ecd52977 100644 --- a/src/lib/components/SideBar/SideBar.svelte +++ b/src/lib/components/SideBar/SideBar.svelte @@ -6,6 +6,7 @@ import CalendarIcon from "~icons/material-symbols/calendar-clock"; import CloseIcon from "~icons/material-symbols/close-rounded"; + import GroupsIcon from "~icons/material-symbols/groups"; import SettingsIcon from "~icons/material-symbols/settings-rounded"; export let displayCloseButton = false; @@ -17,21 +18,22 @@ diff --git a/src/lib/components/groups/MembersCarousel.svelte b/src/lib/components/groups/MembersCarousel.svelte index ef7bbe59..06773956 100644 --- a/src/lib/components/groups/MembersCarousel.svelte +++ b/src/lib/components/groups/MembersCarousel.svelte @@ -4,7 +4,12 @@
{#each $members as member (member.id)} - +
{#each $groups as group (group.id)} - +
g.id === groupID)!; + let tabSet: number = 0; -
+
+
+

{group.name}

+ A cute dog +
+

Members

From 61f2d7c9eea52c16989c4b98276779710dde01db Mon Sep 17 00:00:00 2001 From: Adithya Anandsaikrishnan Date: Thu, 8 Feb 2024 14:28:41 -0800 Subject: [PATCH 6/8] =?UTF-8?q?refactor:=20=E2=99=BB=EF=B8=8F=20completed?= =?UTF-8?q?=20styling=20for=20groups=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/components/groups/MembersCarousel.svelte | 4 +++- src/routes/groups/[groupID]/+page.svelte | 12 +++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/lib/components/groups/MembersCarousel.svelte b/src/lib/components/groups/MembersCarousel.svelte index 06773956..5f3c1e9e 100644 --- a/src/lib/components/groups/MembersCarousel.svelte +++ b/src/lib/components/groups/MembersCarousel.svelte @@ -14,7 +14,9 @@ class="card flex h-24 w-24 snap-start rounded-lg bg-cover bg-center px-2 md:h-40 md:w-40" style="background-image:url({member.profile_picture})" >
-

+

@{member.username}

diff --git a/src/routes/groups/[groupID]/+page.svelte b/src/routes/groups/[groupID]/+page.svelte index 799553b3..1412fa61 100644 --- a/src/routes/groups/[groupID]/+page.svelte +++ b/src/routes/groups/[groupID]/+page.svelte @@ -14,13 +14,19 @@
-
-

{group.name}

+
A cute dog +

+ {group.name} +

From 447712441c3e27f3dd67814544262410372d1480 Mon Sep 17 00:00:00 2001 From: Adithya Anandsaikrishnan Date: Thu, 8 Feb 2024 15:23:22 -0800 Subject: [PATCH 7/8] =?UTF-8?q?feat:=20=E2=9C=A8=20added=20modal=20display?= =?UTF-8?q?ing=20a=20list=20of=20all=20attendees?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../summary/ModalMeetingUsers.svelte | 38 +++++++++++++ .../summary/ScheduledMeetingsList.svelte | 55 ++++++++++++++++--- src/routes/+layout.svelte | 14 ++++- 3 files changed, 97 insertions(+), 10 deletions(-) create mode 100644 src/lib/components/summary/ModalMeetingUsers.svelte diff --git a/src/lib/components/summary/ModalMeetingUsers.svelte b/src/lib/components/summary/ModalMeetingUsers.svelte new file mode 100644 index 00000000..601e8761 --- /dev/null +++ b/src/lib/components/summary/ModalMeetingUsers.svelte @@ -0,0 +1,38 @@ + + + + +{#if $modalStore[0]} +
+
{$modalStore[0].title ?? "(title missing)"}
+ + + {#each $members as member (member.id)} + {member.username} + {/each} + + +
+ +
+
+{/if} diff --git a/src/lib/components/summary/ScheduledMeetingsList.svelte b/src/lib/components/summary/ScheduledMeetingsList.svelte index 6966f0de..abfe559a 100644 --- a/src/lib/components/summary/ScheduledMeetingsList.svelte +++ b/src/lib/components/summary/ScheduledMeetingsList.svelte @@ -1,5 +1,5 @@ {#each Object.keys(sortedMeetings) as date} @@ -27,11 +37,20 @@
{#each sortedMeetings[date] as meeting}
- +

{meeting.name}

@@ -52,20 +71,38 @@
-
+
e.stopPropagation()} + on:click={(e) => e.stopPropagation()} + role="radiogroup" + tabindex="0" + > - Yes e.stopPropagation()}>Yes - No e.stopPropagation()}>No - Maybe e.stopPropagation()}>Maybe
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 2da138d9..fe215569 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,14 +1,24 @@ + + {#if activateHamburger} From 1b71e72b1702c235e9a99230228ae948a91a4723 Mon Sep 17 00:00:00 2001 From: Adithya Anandsaikrishnan Date: Thu, 8 Feb 2024 16:41:15 -0800 Subject: [PATCH 8/8] =?UTF-8?q?refactor:=20=E2=99=BB=EF=B8=8F=20removed=20?= =?UTF-8?q?modal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../summary/ModalMeetingUsers.svelte | 38 ----------- .../summary/ScheduledMeetingsList.svelte | 63 ++++++------------- src/routes/+layout.svelte | 14 +---- src/routes/groups/[groupID]/+page.svelte | 2 +- 4 files changed, 20 insertions(+), 97 deletions(-) delete mode 100644 src/lib/components/summary/ModalMeetingUsers.svelte diff --git a/src/lib/components/summary/ModalMeetingUsers.svelte b/src/lib/components/summary/ModalMeetingUsers.svelte deleted file mode 100644 index 601e8761..00000000 --- a/src/lib/components/summary/ModalMeetingUsers.svelte +++ /dev/null @@ -1,38 +0,0 @@ - - - - -{#if $modalStore[0]} -
-
{$modalStore[0].title ?? "(title missing)"}
- - - {#each $members as member (member.id)} - {member.username} - {/each} - - -
- -
-
-{/if} diff --git a/src/lib/components/summary/ScheduledMeetingsList.svelte b/src/lib/components/summary/ScheduledMeetingsList.svelte index abfe559a..bfeed1ae 100644 --- a/src/lib/components/summary/ScheduledMeetingsList.svelte +++ b/src/lib/components/summary/ScheduledMeetingsList.svelte @@ -1,5 +1,5 @@ {#each Object.keys(sortedMeetings) as date} @@ -37,20 +37,11 @@
{#each sortedMeetings[date] as meeting}
- +

{meeting.name}

@@ -71,38 +62,20 @@
-
e.stopPropagation()} - on:click={(e) => e.stopPropagation()} - role="radiogroup" - tabindex="0" - > +
- e.stopPropagation()}>YesYes - e.stopPropagation()}>NoNo - e.stopPropagation()}>MaybeMaybe
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index fe215569..2da138d9 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,24 +1,14 @@ - - {#if activateHamburger} diff --git a/src/routes/groups/[groupID]/+page.svelte b/src/routes/groups/[groupID]/+page.svelte index 1412fa61..6ac99d7a 100644 --- a/src/routes/groups/[groupID]/+page.svelte +++ b/src/routes/groups/[groupID]/+page.svelte @@ -13,7 +13,7 @@ let tabSet: number = 0; -
+