-
diff --git a/client/src/routes/plans/+layout.svelte b/client/src/routes/plans/+layout.svelte
new file mode 100644
index 0000000..5124ef4
--- /dev/null
+++ b/client/src/routes/plans/+layout.svelte
@@ -0,0 +1,21 @@
+
+
+
+
+ {@render children()}
+
+
+
diff --git a/client/src/routes/plans/+page.server.ts b/client/src/routes/plans/+page.server.ts
index 088ea19..97d1db6 100644
--- a/client/src/routes/plans/+page.server.ts
+++ b/client/src/routes/plans/+page.server.ts
@@ -1,9 +1,19 @@
-import { getUserProgramName } from '$lib/server-url';
+import { getAllPlansHref, getUserProgramNameHref } from '$lib/server-url';
import type { Plan } from '$lib/types';
-import { redirect } from '@sveltejs/kit';
-import type { PageServerLoad } from './$types';
+import { fail, redirect } from '@sveltejs/kit';
+import type { Actions, PageServerLoad } from './$types';
-export const load: PageServerLoad = async ({ locals }) => {
+export interface PlanResult {
+ id: string;
+ title: string;
+ term: Plan['term'];
+ created_at: string;
+ updated_at: string;
+ user_id: string;
+ course_count: number;
+}
+
+export const load: PageServerLoad = async ({ locals, request, fetch }) => {
if (!locals.user) {
throw redirect(303, '/login');
}
@@ -13,47 +23,84 @@ export const load: PageServerLoad = async ({ locals }) => {
}
try {
- const res = await fetch(getUserProgramName(), {
- credentials: 'include'
+ const cookieHeader = request.headers.get('cookie') ?? '';
+ const res = await fetch(getAllPlansHref(), {
+ headers: {
+ cookie: cookieHeader,
+ accept: 'application/json'
+ }
});
-
+ const body = await res.json();
if (res.ok) {
- const body = await res.json();
-
- //placeholder
- const plans: Plan[] = [
- {
- id: '12324',
- title: 'If commuting at home',
- term: 'Fall 2026',
- createdAt: new Date(Date.now()).toDateString()
- },
- {
- id: '12234',
- title: 'If commuting at home',
- term: 'Fall 2026',
- createdAt: new Date(Date.now()).toDateString()
- },
- {
- id: '1231',
- title: 'If commuting at home',
- term: 'Fall 2026',
- createdAt: new Date(Date.now()).toDateString()
- },
- {
- id: '12314',
- title: 'If commuting at home',
- term: 'Fall 2026',
- createdAt: new Date(Date.now()).toDateString()
+ const res2 = await fetch(getUserProgramNameHref(), {
+ headers: {
+ cookie: cookieHeader,
+ accept: 'application/json'
}
- ];
+ });
- return {
- programName: body,
- plans
- };
+ if (res2.ok) {
+ const plans: Plan[] = (Array.isArray(body) ? body : []).filter(Boolean).map((x: PlanResult) => ({
+ title: x.title,
+ term: x.term,
+ id: x.id,
+ userID: x.user_id,
+ createdAt: x.created_at,
+ courseCount: x.course_count
+ }));
+ const programName = await res2.json();
+
+ return {
+ programName,
+ plans
+ };
+ } else {
+ console.error('Could not fetch course name');
+ }
+ } else {
+ console.error('could not fetch plans');
}
} catch (err) {
console.log(err);
}
};
+
+export const actions: Actions = {
+ createPlan: async ({ request }) => {
+ const cookieHeader = request.headers.get('cookie');
+ if (!cookieHeader?.includes('wos_session=')) {
+ throw redirect(303, '/login');
+ }
+
+ const formData = await request.formData();
+ const title = String(formData.get('title') ?? '').trim();
+ const term = String(formData.get('term') ?? '').trim();
+
+ if (!title || !term) {
+ return fail(400, {
+ createPlanError: 'Title and term are required.'
+ });
+ }
+
+ const res = await fetch(getAllPlansHref(), {
+ method: 'POST',
+ headers: {
+ cookie: cookieHeader,
+ accept: 'application/json',
+ 'content-type': 'application/json'
+ },
+ body: JSON.stringify({
+ title,
+ term
+ })
+ });
+
+ if (!res.ok) {
+ return fail(res.status, {
+ createPlanError: 'Could not create plan. Please try again.'
+ });
+ }
+
+ throw redirect(303, '/plans');
+ }
+};
diff --git a/client/src/routes/plans/+page.svelte b/client/src/routes/plans/+page.svelte
index 7567237..6fca539 100644
--- a/client/src/routes/plans/+page.svelte
+++ b/client/src/routes/plans/+page.svelte
@@ -1,5 +1,4 @@
Plans | PathWeave
-
-
+
+
You're in
+
+ {data.programName}
+
-
-
You're in
-
{data.programName}
-
-
-
Plans
-
- {#each data.plans as plan (plan.id)}
-
- {/each}
-
-
-
-
- New Plan
- Choose a new name and term
-
-
+
+
Plans
+
+ {#each data.plans as plan, i (plan.id)}
+
+ {/each}
+
+
+
+
+ New Plan
+ Choose a new name and term
+
+
-
-
+
+
+