diff --git a/src/components/Button.svelte b/src/components/Button.svelte
index c4ceb83..17ce62c 100644
--- a/src/components/Button.svelte
+++ b/src/components/Button.svelte
@@ -1,3 +1,14 @@
-
\ No newline at end of file
+
+
+
diff --git a/src/components/CouncilCard.svelte b/src/components/CouncilCard.svelte
index 343ddb8..0959cf1 100644
--- a/src/components/CouncilCard.svelte
+++ b/src/components/CouncilCard.svelte
@@ -1,31 +1,49 @@
-
-
-
- {#if image}
-
- {:else}
-
- {/if}
-
{name} - {yearProgram}
-
-
~ {position} ~
-
{email}
-
{positionDescription}
+
+
+
+
+

+
+
+
{name}
+
{position}
+
+
+
+
+
+
diff --git a/src/components/CouncilCardPopUp.svelte b/src/components/CouncilCardPopUp.svelte
new file mode 100644
index 0000000..802e16b
--- /dev/null
+++ b/src/components/CouncilCardPopUp.svelte
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+

+
+
{yearProgram}
+
+
+
{name}
+
{position}
+
{positionDescription}
+
{email}
+
+
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.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 e18d4a7..069abec 100644
--- a/src/routes/council/+page.svelte
+++ b/src/routes/council/+page.svelte
@@ -1,26 +1,108 @@
-
ECSESS council
Meet the council!
-
- Group picture!
-
-
- {#each data.members as councilMember}
-
- {/each}
+
+
Our Student Council
+
+
+
+ {#if president}
+ handleViewProfile(president!)}
+ />
+ {/if}
+
+
+
+ {#each vps as councilMember}
+ handleViewProfile(councilMember)}
+ />
+ {/each}
+ {#each ureps as councilMember}
+ handleViewProfile(councilMember)}
+ />
+ {/each}
+
+
+ {#if selectedMember}
+
+
(selectedMember = null)}
+ >
+
+
+ {/if}
+
+
+
+
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
-
-
-
-
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;
+}