From 4e820c5722a7ed52ebfd0448ef3510e1612f28b5 Mon Sep 17 00:00:00 2001 From: zzzmlssqnzzz Date: Wed, 18 Jun 2025 23:20:37 -0400 Subject: [PATCH 01/10] council card base component --- src/components/CouncilCardBase.svelte | 76 +++++++++++++++++++++++++++ src/routes/council/+page.svelte | 61 +++++++++++++++++---- src/utils/schemas.ts | 16 +++--- 3 files changed, 134 insertions(+), 19 deletions(-) create mode 100644 src/components/CouncilCardBase.svelte diff --git a/src/components/CouncilCardBase.svelte b/src/components/CouncilCardBase.svelte new file mode 100644 index 0000000..a2c5c9e --- /dev/null +++ b/src/components/CouncilCardBase.svelte @@ -0,0 +1,76 @@ + + + + +
+
+ {#if image} + + {:else} + + {/if} +
+
+
{name}
+
{position}
+ View Profile +
+
+ + + diff --git a/src/routes/council/+page.svelte b/src/routes/council/+page.svelte index e18d4a7..d08ca5b 100644 --- a/src/routes/council/+page.svelte +++ b/src/routes/council/+page.svelte @@ -1,26 +1,65 @@ - ECSESS council

Meet the council!

-

Group picture!

- -
- {#each data.members as councilMember} - +
+
+ {#if president} + + {/if} +
+
+
+ {#each vps as councilMember} + + > {/each} + {#each ureps as councilMember} + + {/each} +
diff --git a/src/utils/schemas.ts b/src/utils/schemas.ts index b3a758c..592f756 100644 --- a/src/utils/schemas.ts +++ b/src/utils/schemas.ts @@ -1,8 +1,8 @@ -type CouncilMember = { - name: string, - email: string, - position: string, - positionDescription: string, - image: string, // URL - yearProgram: string -} \ No newline at end of file +export default interface CouncilMember { + name: string; + email: string; + position: string; + positionDescription: string; + image: string; // URL + yearProgram: string; +} From 989b0af73f31b719fdd2baf1033161bbeeb147c8 Mon Sep 17 00:00:00 2001 From: zzzmlssqnzzz Date: Thu, 19 Jun 2025 00:15:29 -0400 Subject: [PATCH 02/10] modifying card council component --- src/components/CouncilCard.svelte | 55 +++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 10 deletions(-) diff --git a/src/components/CouncilCard.svelte b/src/components/CouncilCard.svelte index 343ddb8..3567354 100644 --- a/src/components/CouncilCard.svelte +++ b/src/components/CouncilCard.svelte @@ -15,17 +15,52 @@ import { Avatar } from '@skeletonlabs/skeleton-svelte'; + +
- {#if image} - - {:else} - - {/if} -

{name} - {yearProgram}

-
-

~ {position} ~

-

{email}

-

{positionDescription}

+
+
+ {#if image} + + {:else} + + {/if} +
+ {yearProgram} +
+
+

{name}

+
+

{position}

+

{positionDescription}

+
+ +

{email}

+
From 9b470e2ce874c768dcee3fb24af12938b1f79dd8 Mon Sep 17 00:00:00 2001 From: zzzmlssqnzzz Date: Thu, 19 Jun 2025 21:42:05 -0400 Subject: [PATCH 03/10] added interaction between card council base and card council component --- src/components/CouncilCard.svelte | 16 ++++++------ src/components/CouncilCardBase.svelte | 5 ++-- src/routes/council/+page.svelte | 37 +++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 10 deletions(-) diff --git a/src/components/CouncilCard.svelte b/src/components/CouncilCard.svelte index 3567354..b711c99 100644 --- a/src/components/CouncilCard.svelte +++ b/src/components/CouncilCard.svelte @@ -21,11 +21,13 @@ align-items: center; gap: 1rem; background-color:transparent; - padding: 1.5rem; border-radius: 20px; + padding:1.5rem; color: #0A3D2A; - background-color: #E8FFD9; - max-width: 500px; + border-color:transparent; + background-image: linear-gradient(to bottom right, #E8FFD9, #97C583); + max-width: 450px; + height: 250px; } .profile-img{ @@ -35,13 +37,11 @@ .profile-img :global(img) { object-fit: cover; - width: 100%; - height: 100%; + max-width: 100%; } - -
+
@@ -61,6 +61,6 @@

{positionDescription}

-

{email}

+ {email}
diff --git a/src/components/CouncilCardBase.svelte b/src/components/CouncilCardBase.svelte index a2c5c9e..ab6ccb8 100644 --- a/src/components/CouncilCardBase.svelte +++ b/src/components/CouncilCardBase.svelte @@ -1,7 +1,8 @@ From efa8266df0a01f287ffb41f445ebf2e0a39b6ec7 Mon Sep 17 00:00:00 2001 From: Antoine Phan Date: Fri, 20 Jun 2025 10:57:38 -0400 Subject: [PATCH 05/10] Remove showroom because it's kinda useless now --- src/routes/showroom/+page.svelte | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 src/routes/showroom/+page.svelte diff --git a/src/routes/showroom/+page.svelte b/src/routes/showroom/+page.svelte deleted file mode 100644 index 1d61941..0000000 --- a/src/routes/showroom/+page.svelte +++ /dev/null @@ -1,22 +0,0 @@ - - - Component showroom for developers - -
- - -
-
- - - Description of the workshop - - -
-
- -
From ffd0a053bc4e46f07024ec60ff57e5791ca8306e Mon Sep 17 00:00:00 2001 From: Antoine Phan Date: Fri, 20 Jun 2025 10:58:05 -0400 Subject: [PATCH 06/10] Clean up styling classes with tailwind `@apply` --- src/components/CouncilCard.svelte | 30 +++++------------ src/components/CouncilCardBase.svelte | 47 +++++++-------------------- 2 files changed, 21 insertions(+), 56 deletions(-) diff --git a/src/components/CouncilCard.svelte b/src/components/CouncilCard.svelte index b711c99..bcb7671 100644 --- a/src/components/CouncilCard.svelte +++ b/src/components/CouncilCard.svelte @@ -15,30 +15,21 @@ import { Avatar } from '@skeletonlabs/skeleton-svelte'; -
@@ -56,11 +47,8 @@

{name}

-

{position}

{positionDescription}

-
- {email}
diff --git a/src/components/CouncilCardBase.svelte b/src/components/CouncilCardBase.svelte index 017eabc..54ad76e 100644 --- a/src/components/CouncilCardBase.svelte +++ b/src/components/CouncilCardBase.svelte @@ -2,59 +2,35 @@ let { onViewProfile, name, position, image } = $props(); import placeholder from 'assets/placeholderAvatar.png'; import { Avatar } from '@skeletonlabs/skeleton-svelte'; + import Button from 'components/Button.svelte'; - @@ -69,7 +45,8 @@
{name}
{position}
- + +
From 73e46d95c93b8c0353865ba06420369f5647f029 Mon Sep 17 00:00:00 2001 From: Antoine Phan Date: Fri, 20 Jun 2025 10:59:12 -0400 Subject: [PATCH 07/10] Add goofy picture, use \ No newline at end of file + + + diff --git a/src/routes/council/+page.server.js b/src/routes/council/+page.server.js index b5662e2..c9fce06 100644 --- a/src/routes/council/+page.server.js +++ b/src/routes/council/+page.server.js @@ -9,8 +9,13 @@ const query = `*[_type == "members"]{ yearProgram }`; +const councilGoofyPicQuery = `*[_type == "homepage"]{ + "url": councilGoofyPic.asset->url+"?h=1000&fm=webp" +}[0]`; + export const load = async () => { return { - members: await getFromCMS(query) + members: await getFromCMS(query), + councilGoofyPic: await getFromCMS(councilGoofyPicQuery), }; }; diff --git a/src/routes/council/+page.svelte b/src/routes/council/+page.svelte index 614f1a9..aa42043 100644 --- a/src/routes/council/+page.svelte +++ b/src/routes/council/+page.svelte @@ -3,30 +3,31 @@ import Section from 'components/Section.svelte'; import CardCouncilBase from 'components/CouncilCardBase.svelte'; import CouncilCardBase from 'components/CouncilCardBase.svelte'; - import type CouncilMember from 'utils/schemas' + import type CouncilMember from 'utils/schemas'; let { data } = $props(); - let years = ["U4", "U3", "U2", "U1", "U0"] - let vps : CouncilMember[] = [] - let ureps : CouncilMember[] = [] + let years = ['U4', 'U3', 'U2', 'U1', 'U0']; + let vps: CouncilMember[] = []; + let ureps: CouncilMember[] = []; // svelte-ignore non_reactive_update - let president: CouncilMember | null = null; + let president: CouncilMember | null = null; data.members.forEach((member: CouncilMember) => { - if (member.position.includes("VP") || member.position.includes("Equity and Mental Health Officer")){ - vps.push(member); - } - else if (member.position.includes("Representative")){ - ureps.push(member) + if ( + member.position.includes('VP') || + member.position.includes('Equity and Mental Health Officer') + ) { + vps.push(member); + } else if (member.position.includes('Representative')) { + ureps.push(member); ureps.sort((a, b) => { - const aYear = years.findIndex(y => a.position.includes(y)) - const bYear = years.findIndex(y => b.position.includes(y)) - return aYear - bYear - }) + const aYear = years.findIndex((y) => a.position.includes(y)); + const bYear = years.findIndex((y) => b.position.includes(y)); + return aYear - bYear; + }); + } else if (member.position.includes('President')) { + president = member; } - else if (member.position.includes("President")){ - president = member - } - }) + }); let selectedMember = $state(null); @@ -35,15 +36,18 @@ } // svelte-ignore state_referenced_locally - console.log(selectedMember) + // console.log(selectedMember); ECSESS council

Meet the council!

-

Group picture!

+
+

Our Student Council

+ ECSESS Council, but we are goofy +
-
+
{#if president}
-
- {#each vps as councilMember} - handleViewProfile(councilMember)} - > - {/each} - {#each ureps as councilMember} - handleViewProfile(councilMember)} - > - {/each} +
+ {#each vps as councilMember} + handleViewProfile(councilMember)} + > + {/each} + {#each ureps as councilMember} + handleViewProfile(councilMember)} + > + {/each}
{#if selectedMember} - -
(selectedMember = null)} - > + +
(selectedMember = null)} + > -
+ /> +
{/if}
From 258d1fd483cc9ac16ee743557281381955aa3ca1 Mon Sep 17 00:00:00 2001 From: zzzmlssqnzzz Date: Mon, 7 Jul 2025 18:42:05 -0400 Subject: [PATCH 08/10] fixing profile img formatting --- src/components/CouncilCard.svelte | 14 +++++--------- src/components/CouncilCardBase.svelte | 7 +------ src/components/NavBar.svelte | 3 --- src/routes/council/+page.svelte | 2 ++ 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/components/CouncilCard.svelte b/src/components/CouncilCard.svelte index bcb7671..de6b321 100644 --- a/src/components/CouncilCard.svelte +++ b/src/components/CouncilCard.svelte @@ -12,7 +12,6 @@ */ let { name, position, email, positionDescription, yearProgram, image } = $props(); import placeholder from 'assets/placeholderAvatar.png'; - import { Avatar } from '@skeletonlabs/skeleton-svelte';
@@ -37,11 +37,7 @@
- {#if image} - - {:else} - - {/if} + {name}
{yearProgram}
diff --git a/src/components/CouncilCardBase.svelte b/src/components/CouncilCardBase.svelte index 54ad76e..0959cf1 100644 --- a/src/components/CouncilCardBase.svelte +++ b/src/components/CouncilCardBase.svelte @@ -1,7 +1,6 @@ @@ -36,11 +35,7 @@
- {#if image} - - {:else} - - {/if} + {name}
{name}
diff --git a/src/components/NavBar.svelte b/src/components/NavBar.svelte index e63eb74..0464d43 100644 --- a/src/components/NavBar.svelte +++ b/src/components/NavBar.svelte @@ -12,7 +12,4 @@ Events Resources Join ECSESS - {#if import.meta.env.DEV} - Componenets - {/if} diff --git a/src/routes/council/+page.svelte b/src/routes/council/+page.svelte index aa42043..16224fc 100644 --- a/src/routes/council/+page.svelte +++ b/src/routes/council/+page.svelte @@ -35,6 +35,8 @@ selectedMember = member; } + console.log(ureps) + // svelte-ignore state_referenced_locally // console.log(selectedMember); From 2bf2d849fe4b7c786930b329f8a659b88be6a11b Mon Sep 17 00:00:00 2001 From: zzzmlssqnzzz Date: Mon, 7 Jul 2025 18:50:19 -0400 Subject: [PATCH 09/10] small style fix --- src/components/CouncilCard.svelte | 71 +++++++++++++------------- src/components/CouncilCardBase.svelte | 49 ------------------ src/components/CouncilCardPopUp.svelte | 54 ++++++++++++++++++++ src/routes/council/+page.svelte | 19 ++++--- 4 files changed, 98 insertions(+), 95 deletions(-) delete mode 100644 src/components/CouncilCardBase.svelte create mode 100644 src/components/CouncilCardPopUp.svelte diff --git a/src/components/CouncilCard.svelte b/src/components/CouncilCard.svelte index de6b321..0959cf1 100644 --- a/src/components/CouncilCard.svelte +++ b/src/components/CouncilCard.svelte @@ -1,50 +1,49 @@
- - -
-
- {name} -
- {yearProgram} -
-
-

{name}

-

{position}

-

{positionDescription}

- {email} +
+ {name}
+
+
{name}
+
{position}
+ + +
+ + + diff --git a/src/components/CouncilCardBase.svelte b/src/components/CouncilCardBase.svelte deleted file mode 100644 index 0959cf1..0000000 --- a/src/components/CouncilCardBase.svelte +++ /dev/null @@ -1,49 +0,0 @@ - - - - -
-
- {name} -
-
-
{name}
-
{position}
- - -
-
- - - diff --git a/src/components/CouncilCardPopUp.svelte b/src/components/CouncilCardPopUp.svelte new file mode 100644 index 0000000..27d39cd --- /dev/null +++ b/src/components/CouncilCardPopUp.svelte @@ -0,0 +1,54 @@ + + + + +
+ + +
+
+ {name} +
+ {yearProgram} +
+
+

{name}

+

{position}

+

{positionDescription}

+ {email} +
+
diff --git a/src/routes/council/+page.svelte b/src/routes/council/+page.svelte index 16224fc..069abec 100644 --- a/src/routes/council/+page.svelte +++ b/src/routes/council/+page.svelte @@ -1,8 +1,7 @@ @@ -37,8 +26,6 @@
- -
{name}