basic data loading works

jsconfig.json

@@ -2,7 +2,7 @@
 	"extends": "./.svelte-kit/tsconfig.json",
 	"compilerOptions": {
 		"allowJs": true,
-		"checkJs": true,
+		"checkJs": false,
 		"esModuleInterop": true,
 		"forceConsistentCasingInFileNames": true,
 		"resolveJsonModule": true,

src/hooks.server.js

@@ -1,10 +1,10 @@
 import cookie from 'cookie'
 
 export const handle = async ({ event, resolve }) => {
-	const cookies = cookie.parse(event.request.headers.get('cookie') || '')
+	const authCookie = event.cookies.get('auth')
 
-	if (cookies.auth) {
-		const auth = cookies.auth.split(':')
+	if (authCookie) {
+		const auth = authCookie.split(':')
 		event.locals.user = {
 			username: auth[0],
 			password: auth[1],
@@ -13,12 +13,5 @@ export const handle = async ({ event, resolve }) => {
 	}
 
 	const response = await resolve(event)
-
 	return response
 }
-
-// Sets session on client-side
-// try console logging session in routes' load({ session }) functions
-export const getSession = async (event) => {
-	return event.locals
-}

src/routes/+layout.server.js

@@ -0,0 +1,7 @@
+/** @type {import('./$types').PageServerLoad} */
+export async function load({ params, locals }) {
+	console.log('layout server load')
+	return {
+		user: locals
+	}
+}

src/routes/+layout.svelte

@@ -1,64 +1,77 @@
-<script context="module">
+<!-- <script context="module">
 	export async function load({ url }) {
 		return {
 			props: {
 				key: url.href
 			}
 		}
 	}
-</script>
-
+</script> -->
 <script>
 	import '../app.scss'
 	import { onMount } from 'svelte'
-	import { fly } from 'svelte/transition'
-	import { fade } from 'svelte/transition'
-	import { session, page } from '$app/stores'
-	import { browser } from '$app/environment'
-	import { parseData } from '$lib/js/parseData.js'
-	import { settings } from '$lib/js/settings.js'
-	import { oldAssignments } from '$lib/js/oldAssignments.js'
-	import Spinner from '$lib/components/Spinner.svelte'
-
-	export let key
-	let spinning = false
+	// import { fly } from 'svelte/transition'
+	// import { fade } from 'svelte/transition'
+	// import { page } from '$app/stores'
+	// import { browser } from '$app/environment'
+	// import { parseData } from '$lib/js/parseData.js'
+	// import { settings } from '$lib/js/settings.js'
+	// import { oldAssignments } from '$lib/js/oldAssignments.js'
+	// import Spinner from '$lib/components/Spinner.svelte'
+
+	export let data
+
+	// export let key
+	// let spinning = false
 
 	onMount(async () => {
-		if ($session.user) {
-			console.log('fetch')
+		if (data.user) {
 			await load()
 		}
 	})
 
-	$: if ($session.periods) {
-		$session.selected = $session.periods[$session.selectedPeriod]
-	}
-
 	async function load() {
 		const res = await fetch('/data')
 		const json = await res.json()
-		let { student, periods, currentPeriod } = json
-		$session = {
-			...$session,
-			student,
-			periods,
-			currentPeriod,
-			selectedPeriod: currentPeriod,
-			selected: periods[currentPeriod],
-			gradebook: periods[currentPeriod]
-		}
-		parseData($session, $oldAssignments)
-		$oldAssignments = $oldAssignments
+		console.log(json)
 	}
 
-	async function refresh() {
-		spinning = true
-		await load()
-		spinning = false
-	}
+	// onMount(async () => {
+	// 	if ($session.user) {
+	// 		console.log('fetch')
+	// 		await load()
+	// 	}
+	// })
+
+	// $: if ($session.periods) {
+	// 	$session.selected = $session.periods[$session.selectedPeriod]
+	// }
+
+	// async function load() {
+	// 	const res = await fetch('/data')
+	// 	const json = await res.json()
+	// 	let { student, periods, currentPeriod } = json
+	// 	$session = {
+	// 		...$session,
+	// 		student,
+	// 		periods,
+	// 		currentPeriod,
+	// 		selectedPeriod: currentPeriod,
+	// 		selected: periods[currentPeriod],
+	// 		gradebook: periods[currentPeriod]
+	// 	}
+	// 	parseData($session, $oldAssignments)
+	// 	$oldAssignments = $oldAssignments
+	// }
+
+	// async function refresh() {
+	// 	spinning = true
+	// 	await load()
+	// 	spinning = false
+	// }
 </script>
 
-<svelte:head>
+<!-- <svelte:head>
 	<meta name="color-scheme" content={$settings.theme} />
 	<link rel="stylesheet" href={`/themes/${$settings.theme}.css`} />
 </svelte:head>
@@ -250,4 +263,4 @@
 			height: calc(100% - 2 * $spacing - 50px);
 		}
 	}
-</style>
+</style> -->

src/routes/+page.server.js

@@ -0,0 +1,11 @@
+import { redirect } from '@sveltejs/kit'
+
+/** @type {import('./$types').PageLoad} */
+export async function load({ params, locals }) {
+	console.log('page server load')
+	if (!locals.user) {
+		console.log('redirect')
+		throw redirect(307, '/login')
+	}
+	return {}
+}

src/routes/+page.svelte

@@ -1,4 +1,4 @@
-<script context="module">
+<!-- <script context="module">
 	export async function load({ session }) {
 		if (!session.user) {
 			return {
@@ -233,4 +233,4 @@
 			display: none;
 		}
 	}
-</style>
+</style> -->

src/routes/data/index.js → src/routes/data/+server.js

@@ -1,12 +1,14 @@
 import { login } from 'studentvue.js'
 import * as cookie from 'cookie'
 
-export async function get(event) {
-	console.log('get all')
+export async function GET({ locals }) {
+	console.log('get data')
+	console.log(locals)
+
 	let client = await login(
-		Buffer.from(event.locals.user.districtUrl, 'base64').toString('ascii'),
-		Buffer.from(event.locals.user.username, 'base64').toString('ascii'),
-		Buffer.from(event.locals.user.password, 'base64').toString('ascii')
+		Buffer.from(locals.user.districtUrl, 'base64').toString('ascii'),
+		Buffer.from(locals.user.username, 'base64').toString('ascii'),
+		Buffer.from(locals.user.password, 'base64').toString('ascii')
 	)
 	// let student = JSON.parse(await client.getStudentInfo()).StudentInfo
 	// let gradebook = JSON.parse(await client.getGradebook()).Gradebook
@@ -31,16 +33,24 @@ export async function get(event) {
 		}
 	}
 
+	console.log('logged in')
+
 	const currentPeriod = result[1].ReportingPeriods.ReportPeriod.findIndex((period) => {
 		const date = new Date()
 		return date > new Date(period.StartDate) && date < new Date(period.EndDate)
 	})
 
-	return {
-		body: {
+	console.log({
+		student: result.shift(),
+		periods: result,
+		currentPeriod
+	})
+
+	return new Response(
+		JSON.stringify({
 			student: result.shift(),
 			periods: result,
 			currentPeriod
-		}
-	}
+		})
+	)
 }