diff --git a/src/routes/+page.server.js b/src/routes/+page.server.js
index f005270..ce28e8b 100644
--- a/src/routes/+page.server.js
+++ b/src/routes/+page.server.js
@@ -5,6 +5,9 @@ const query = `*[_type == "homepage"].description[].children[].text`;
export const load = async () => {
return {
- description: await getFromCMS(query)
+ description: await getFromCMS(query),
+ ohs: "",
+ pictures: "",
+ FAQs: "",
};
};
diff --git a/src/routes/council/+page.server.js b/src/routes/council/+page.server.js
index 1138bdf..b5662e2 100644
--- a/src/routes/council/+page.server.js
+++ b/src/routes/council/+page.server.js
@@ -1,6 +1,5 @@
import { getFromCMS } from 'utils/utils.js';
-// needs to concat and format this text
const query = `*[_type == "members"]{
name,
email,
diff --git a/src/routes/council/+page.svelte b/src/routes/council/+page.svelte
index 9b1d1fc..e18d4a7 100644
--- a/src/routes/council/+page.svelte
+++ b/src/routes/council/+page.svelte
@@ -1,6 +1,7 @@
@@ -9,6 +10,7 @@
Meet the council!
Group picture!
+
{#each data.members as councilMember}
{/each}
-
- Here are the members of the ECSESS council!
-
-
President
-
Name:
-
Email:
-
Year:
-
Program:
-
diff --git a/src/routes/events/+page.server.js b/src/routes/events/+page.server.js
new file mode 100644
index 0000000..d4ca43c
--- /dev/null
+++ b/src/routes/events/+page.server.js
@@ -0,0 +1,17 @@
+import { getFromCMS } from 'utils/utils.js';
+
+// needs to concat and format this text
+const query = `*[_type == "events"]{
+ name,
+ category,
+ date,
+ location,
+ description,
+ "lastUpdated": _updatedAt,
+}`;
+
+export const load = async () => {
+ return {
+ events: await getFromCMS(query)
+ };
+};
diff --git a/src/routes/events/+page.svelte b/src/routes/events/+page.svelte
index 99a748b..0f16f25 100644
--- a/src/routes/events/+page.svelte
+++ b/src/routes/events/+page.svelte
@@ -1,9 +1,19 @@
ECSESS Events
Events
+ {#each data.events as event}
+
+
{event.name}
+
{event.date}
+
{event.location}
+
{event.description}
+
+
+ {/each}
diff --git a/src/routes/resources/+page.server.js b/src/routes/resources/+page.server.js
new file mode 100644
index 0000000..e983751
--- /dev/null
+++ b/src/routes/resources/+page.server.js
@@ -0,0 +1,15 @@
+import { getFromCMS } from 'utils/utils.js';
+
+// needs to concat and format this text
+const query = `*[_type == "resources"]{
+ title,
+ url,
+ description,
+ "lastUpdated":_updatedAt
+}`;
+
+export const load = async () => {
+ return {
+ resources: await getFromCMS(query)
+ };
+};
diff --git a/src/routes/resources/+page.svelte b/src/routes/resources/+page.svelte
index ec7d09f..ac49ed6 100644
--- a/src/routes/resources/+page.svelte
+++ b/src/routes/resources/+page.svelte
@@ -1,15 +1,19 @@
Resources
- Resources
-
- Resources for ECSE students at McGill University, presented by ECSESS!
+ Resources
- Technical
+ Resources for ECSE students at McGill University, presented by ECSESS!
- Academic
+ {#each data.resources as re}
+ {re.title}
+ {re.url}
+ {re.description}
+ ==============
+ {/each}
diff --git a/src/utils/schemas.ts b/src/utils/schemas.ts
new file mode 100644
index 0000000..b3a758c
--- /dev/null
+++ b/src/utils/schemas.ts
@@ -0,0 +1,8 @@
+type CouncilMember = {
+ name: string,
+ email: string,
+ position: string,
+ positionDescription: string,
+ image: string, // URL
+ yearProgram: string
+}
\ No newline at end of file