From 4040fa8bcbc4b415f8a37b1e6b83721cd711fefb Mon Sep 17 00:00:00 2001
From: EETagent <vojta.jungmann@gmail.com>
Date: Sat, 3 Dec 2022 14:14:26 +0100
Subject: [PATCH] feat: massive layout refactor, redirect when cookie is not
 set

---
 frontend/src/{ => lib}/@api/candidate.ts               |  4 ++--
 frontend/src/{ => lib}/@api/index.ts                   |  0
 .../components/dashboard/CoverLetterUploadCard.svelte  |  4 ++--
 .../components/dashboard/DashboardUploadCard.svelte    |  2 +-
 .../dashboard/PortfolioLetterUploadCard.svelte         |  4 ++--
 .../components/dashboard/PortfolioZipUploadCard.svelte |  4 ++--
 .../lib/components/dashboard/StatusNotification.svelte |  2 +-
 frontend/src/{ => lib}/stores/candidate.ts             |  0
 frontend/src/{ => lib}/stores/portfolio.ts             |  0
 .../(admin)/admin/(authenticated)/+layout.server.ts    | 10 ++++++++++
 .../admin/(authenticated)}/+page.svelte                |  0
 .../routes/{ => (admin)}/admin/auth/login/+page.svelte |  0
 .../(candidate)/(authenticated)/+layout.server.ts      | 10 ++++++++++
 .../(authenticated)}/dashboard/+page.svelte            |  4 ++--
 .../(authenticated)}/register/+page.svelte             |  2 +-
 .../src/routes/{ => (candidate)}/login/+page.svelte    |  0
 .../login/[code=application]/+page.svelte              |  2 +-
 frontend/src/routes/+layout.js                         |  6 ------
 frontend/src/routes/+layout.ts                         |  7 +++++++
 19 files changed, 41 insertions(+), 20 deletions(-)
 rename frontend/src/{ => lib}/@api/candidate.ts (95%)
 rename frontend/src/{ => lib}/@api/index.ts (100%)
 rename frontend/src/{ => lib}/stores/candidate.ts (100%)
 rename frontend/src/{ => lib}/stores/portfolio.ts (100%)
 create mode 100644 frontend/src/routes/(admin)/admin/(authenticated)/+layout.server.ts
 rename frontend/src/routes/{admin => (admin)/admin/(authenticated)}/+page.svelte (100%)
 rename frontend/src/routes/{ => (admin)}/admin/auth/login/+page.svelte (100%)
 create mode 100644 frontend/src/routes/(candidate)/(authenticated)/+layout.server.ts
 rename frontend/src/routes/{ => (candidate)/(authenticated)}/dashboard/+page.svelte (94%)
 rename frontend/src/routes/{ => (candidate)/(authenticated)}/register/+page.svelte (99%)
 rename frontend/src/routes/{ => (candidate)}/login/+page.svelte (100%)
 rename frontend/src/routes/{ => (candidate)}/login/[code=application]/+page.svelte (98%)
 delete mode 100644 frontend/src/routes/+layout.js
 create mode 100644 frontend/src/routes/+layout.ts

diff --git a/frontend/src/@api/candidate.ts b/frontend/src/lib/@api/candidate.ts
similarity index 95%
rename from frontend/src/@api/candidate.ts
rename to frontend/src/lib/@api/candidate.ts
index ded10b8..277deee 100644
--- a/frontend/src/@api/candidate.ts
+++ b/frontend/src/lib/@api/candidate.ts
@@ -1,6 +1,6 @@
 import axios, { type AxiosProgressEvent } from 'axios';
-import type { CandidateData, CandidateLogin } from 'src/stores/candidate';
-import type { SubmissionProgress } from 'src/stores/portfolio';
+import type { CandidateData, CandidateLogin } from '$lib/stores/candidate';
+import type { SubmissionProgress } from '$lib/stores/portfolio';
 import { API_URL, errorHandler } from '.';
 
 export async function apiWhoami(): Promise<string> {
diff --git a/frontend/src/@api/index.ts b/frontend/src/lib/@api/index.ts
similarity index 100%
rename from frontend/src/@api/index.ts
rename to frontend/src/lib/@api/index.ts
diff --git a/frontend/src/lib/components/dashboard/CoverLetterUploadCard.svelte b/frontend/src/lib/components/dashboard/CoverLetterUploadCard.svelte
index 9c39fa2..54b2b41 100644
--- a/frontend/src/lib/components/dashboard/CoverLetterUploadCard.svelte
+++ b/frontend/src/lib/components/dashboard/CoverLetterUploadCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { AxiosProgressEvent } from "axios";
-	import { fetchSubmProgress } from "../../../stores/portfolio";
-	import { apiUploadCoverLetter } from "../../../@api/candidate";
+	import { fetchSubmProgress } from "$lib/stores/portfolio";
+	import { apiUploadCoverLetter } from "$lib/@api/candidate";
 	import DashboardUploadCard from "./DashboardUploadCard.svelte";
 
     const onFileDrop = async (file: File) => {
diff --git a/frontend/src/lib/components/dashboard/DashboardUploadCard.svelte b/frontend/src/lib/components/dashboard/DashboardUploadCard.svelte
index 6415de2..a4562c2 100644
--- a/frontend/src/lib/components/dashboard/DashboardUploadCard.svelte
+++ b/frontend/src/lib/components/dashboard/DashboardUploadCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import FileType from './FileType.svelte';
 	import FileDrop from 'filedrop-svelte';
-	import { submissionProgress, UploadStatus, type Status } from '../../../stores/portfolio';
+	import { submissionProgress, UploadStatus, type Status } from '$lib/stores/portfolio';
 	import { createEventDispatcher } from 'svelte';
 	import StatusNotification from './StatusNotification.svelte';
 
diff --git a/frontend/src/lib/components/dashboard/PortfolioLetterUploadCard.svelte b/frontend/src/lib/components/dashboard/PortfolioLetterUploadCard.svelte
index e61ef57..f63f4ec 100644
--- a/frontend/src/lib/components/dashboard/PortfolioLetterUploadCard.svelte
+++ b/frontend/src/lib/components/dashboard/PortfolioLetterUploadCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { AxiosProgressEvent } from "axios";
-	import { fetchSubmProgress } from "../../../stores/portfolio";
-	import { apiUploadPortfolioLetter } from "../../../@api/candidate";
+	import { fetchSubmProgress } from "$lib/stores/portfolio";
+	import { apiUploadPortfolioLetter } from "../../@api/candidate";
 	import DashboardUploadCard from "./DashboardUploadCard.svelte";
 
     const onFileDrop = async (file: File) => {
diff --git a/frontend/src/lib/components/dashboard/PortfolioZipUploadCard.svelte b/frontend/src/lib/components/dashboard/PortfolioZipUploadCard.svelte
index 8c3861b..f0b248e 100644
--- a/frontend/src/lib/components/dashboard/PortfolioZipUploadCard.svelte
+++ b/frontend/src/lib/components/dashboard/PortfolioZipUploadCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { AxiosProgressEvent } from "axios";
-	import { fetchSubmProgress } from "../../../stores/portfolio";
-	import { apiUploadPortfolioZip } from "../../../@api/candidate";
+	import { fetchSubmProgress } from "$lib/stores/portfolio";
+	import { apiUploadPortfolioZip } from "$lib/@api/candidate";
 	import DashboardUploadCard from "./DashboardUploadCard.svelte";
 
     const onFileDrop = async (file: File) => {
diff --git a/frontend/src/lib/components/dashboard/StatusNotification.svelte b/frontend/src/lib/components/dashboard/StatusNotification.svelte
index 26359b7..c99b615 100644
--- a/frontend/src/lib/components/dashboard/StatusNotification.svelte
+++ b/frontend/src/lib/components/dashboard/StatusNotification.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { Status } from "../../../stores/portfolio";
+	import type { Status } from "$lib/stores/portfolio";
 
 
     export let status: Status;
diff --git a/frontend/src/stores/candidate.ts b/frontend/src/lib/stores/candidate.ts
similarity index 100%
rename from frontend/src/stores/candidate.ts
rename to frontend/src/lib/stores/candidate.ts
diff --git a/frontend/src/stores/portfolio.ts b/frontend/src/lib/stores/portfolio.ts
similarity index 100%
rename from frontend/src/stores/portfolio.ts
rename to frontend/src/lib/stores/portfolio.ts
diff --git a/frontend/src/routes/(admin)/admin/(authenticated)/+layout.server.ts b/frontend/src/routes/(admin)/admin/(authenticated)/+layout.server.ts
new file mode 100644
index 0000000..af8cb9a
--- /dev/null
+++ b/frontend/src/routes/(admin)/admin/(authenticated)/+layout.server.ts
@@ -0,0 +1,10 @@
+import type { LayoutServerLoad } from './$types';
+
+import { redirect } from '@sveltejs/kit';
+
+export const load: LayoutServerLoad = ({ cookies }) => {
+	const isAuthenticated = cookies.get('id');
+	if (!isAuthenticated) {
+		throw redirect(302, '/admin/auth/login');
+	}
+};
diff --git a/frontend/src/routes/admin/+page.svelte b/frontend/src/routes/(admin)/admin/(authenticated)/+page.svelte
similarity index 100%
rename from frontend/src/routes/admin/+page.svelte
rename to frontend/src/routes/(admin)/admin/(authenticated)/+page.svelte
diff --git a/frontend/src/routes/admin/auth/login/+page.svelte b/frontend/src/routes/(admin)/admin/auth/login/+page.svelte
similarity index 100%
rename from frontend/src/routes/admin/auth/login/+page.svelte
rename to frontend/src/routes/(admin)/admin/auth/login/+page.svelte
diff --git a/frontend/src/routes/(candidate)/(authenticated)/+layout.server.ts b/frontend/src/routes/(candidate)/(authenticated)/+layout.server.ts
new file mode 100644
index 0000000..e0a95f7
--- /dev/null
+++ b/frontend/src/routes/(candidate)/(authenticated)/+layout.server.ts
@@ -0,0 +1,10 @@
+import type { LayoutServerLoad } from './$types';
+
+import { redirect } from '@sveltejs/kit';
+
+export const load: LayoutServerLoad = ({ cookies }) => {
+	const isAuthenticated = cookies.get('id');
+	if (!isAuthenticated) {
+		throw redirect(302, '/login');
+	}
+};
diff --git a/frontend/src/routes/dashboard/+page.svelte b/frontend/src/routes/(candidate)/(authenticated)/dashboard/+page.svelte
similarity index 94%
rename from frontend/src/routes/dashboard/+page.svelte
rename to frontend/src/routes/(candidate)/(authenticated)/dashboard/+page.svelte
index c57ddca..2fbf528 100644
--- a/frontend/src/routes/dashboard/+page.svelte
+++ b/frontend/src/routes/(candidate)/(authenticated)/dashboard/+page.svelte
@@ -6,11 +6,11 @@
 
 	import DashboardUploadCard from '$lib/components/dashboard/DashboardUploadCard.svelte';
 	import DashboardInfoCard from '$lib/components/dashboard/DashboardInfoCard.svelte';
-	import { candidateData, fetchDetails } from '../../stores/candidate';
+	import { candidateData, fetchDetails } from '$lib/stores/candidate';
 	import CoverLetterUploadCard from '$lib/components/dashboard/CoverLetterUploadCard.svelte';
 	import PortfolioLetterUploadCard from '$lib/components/dashboard/PortfolioLetterUploadCard.svelte';
 	import PortfolioZipUploadCard from '$lib/components/dashboard/PortfolioZipUploadCard.svelte';
-	import { fetchSubmProgress } from '../../stores/portfolio';
+	import { fetchSubmProgress } from '$lib/stores/portfolio';
 
 	
 	let fullName = "";
diff --git a/frontend/src/routes/register/+page.svelte b/frontend/src/routes/(candidate)/(authenticated)/register/+page.svelte
similarity index 99%
rename from frontend/src/routes/register/+page.svelte
rename to frontend/src/routes/(candidate)/(authenticated)/register/+page.svelte
index e2cf89e..eaa8a0c 100644
--- a/frontend/src/routes/register/+page.svelte
+++ b/frontend/src/routes/(candidate)/(authenticated)/register/+page.svelte
@@ -10,7 +10,7 @@
 	import IdField from '$lib/components/textfield/IdField.svelte';
 	import TelephoneField from '$lib/components/textfield/TelephoneField.svelte';
 	import TextField from '$lib/components/textfield/TextField.svelte';
-	import { fillDetails, candidateData, type CandidateData } from '../../stores/candidate';
+	import { fillDetails, candidateData, type CandidateData } from '$lib/stores/candidate';
 
 	import { createForm } from 'svelte-forms-lib';
 	import * as yup from 'yup';
diff --git a/frontend/src/routes/login/+page.svelte b/frontend/src/routes/(candidate)/login/+page.svelte
similarity index 100%
rename from frontend/src/routes/login/+page.svelte
rename to frontend/src/routes/(candidate)/login/+page.svelte
diff --git a/frontend/src/routes/login/[code=application]/+page.svelte b/frontend/src/routes/(candidate)/login/[code=application]/+page.svelte
similarity index 98%
rename from frontend/src/routes/login/[code=application]/+page.svelte
rename to frontend/src/routes/(candidate)/login/[code=application]/+page.svelte
index 78a1c10..983b092 100644
--- a/frontend/src/routes/login/[code=application]/+page.svelte
+++ b/frontend/src/routes/(candidate)/login/[code=application]/+page.svelte
@@ -4,7 +4,7 @@
 	import woman from '$lib/assets/woman.png';
 	import { onMount } from 'svelte';
 	import { page } from '$app/stores';
-	import { login } from '../../../stores/candidate';
+	import { login } from '$lib/stores/candidate';
 	import { goto } from '$app/navigation';
 	
 	
diff --git a/frontend/src/routes/+layout.js b/frontend/src/routes/+layout.js
deleted file mode 100644
index 25b03d3..0000000
--- a/frontend/src/routes/+layout.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/** @type {import('./$types').PageLoad} */
-export const load = async ({ url }) => {
-	return {
-		url: url.pathname
-	};
-};
diff --git a/frontend/src/routes/+layout.ts b/frontend/src/routes/+layout.ts
new file mode 100644
index 0000000..1a056d4
--- /dev/null
+++ b/frontend/src/routes/+layout.ts
@@ -0,0 +1,7 @@
+import type { LayoutLoad } from './$types';
+
+export const load: LayoutLoad = async ({ url }) => {
+	return {
+		url: url.pathname
+	};
+};