Merge pull request #1 from networkpsych/dev

removed old routing schema and other refactors
networkpsych · Jul 13, 2024 · 50cd2ca · 50cd2ca · vercel · Jul 13, 2024
2 parents c7cca3d + a9e2acd
commit 50cd2ca
Show file tree

Hide file tree

Showing 26 changed files with 108 additions and 148 deletions.
diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
diff --git a/.gitignore b/.gitignore
@@ -42,6 +42,7 @@ build/Release
 node_modules/
 jspm_packages/
 
+
 # Snowpack dependency directory (https://snowpack.dev/)
 web_modules/
 

diff --git a/.svelte-kit/generated/client/app.js b/.svelte-kit/generated/client/app.js
@@ -9,21 +9,18 @@ export const nodes = [
 	() => import('./nodes/5'),
 	() => import('./nodes/6'),
 	() => import('./nodes/7'),
-	() => import('./nodes/8'),
-	() => import('./nodes/9'),
-	() => import('./nodes/10')
+	() => import('./nodes/8')
 ];
 
-export const server_loads = [3];
+export const server_loads = [0];
 
 export const dictionary = {
-		"/": [~4],
-		"/(errors)/404": [5,[2]],
-		"/(wedding)/about": [6,[3]],
-		"/(wedding)/home": [7,[3]],
-		"/(wedding)/links": [8,[3]],
-		"/(wedding)/memories": [9,[3]],
-		"/(wedding)/rsvp": [~10,[3]]
+		"/": [3],
+		"/(errors)/404": [4,[2]],
+		"/about": [5],
+		"/links": [6],
+		"/memories": [7],
+		"/rsvp": [~8]
 	};
 
 export const hooks = {

diff --git a/.svelte-kit/generated/client/nodes/0.js b/.svelte-kit/generated/client/nodes/0.js
@@ -1 +1,3 @@
-export { default as component } from "../../../../node_modules/@sveltejs/kit/src/runtime/components/layout.svelte";
+import * as universal from "../../../../src/routes/+layout.ts";
+export { universal };
+export { default as component } from "../../../../src/routes/+layout.svelte";
diff --git a/.svelte-kit/generated/client/nodes/3.js b/.svelte-kit/generated/client/nodes/3.js
@@ -1,3 +1 @@
-import * as universal from "../../../../src/routes/(wedding)/+layout.ts";
-export { universal };
-export { default as component } from "../../../../src/routes/(wedding)/+layout.svelte";
+export { default as component } from "../../../../src/routes/+page.svelte";
diff --git a/.svelte-kit/generated/client/nodes/4.js b/.svelte-kit/generated/client/nodes/4.js
@@ -1 +1 @@
-export { default as component } from "../../../../src/routes/+page.svelte";
+export { default as component } from "../../../../src/routes/(errors)/404/+page.svelte";
diff --git a/.svelte-kit/generated/client/nodes/5.js b/.svelte-kit/generated/client/nodes/5.js
@@ -1 +1 @@
-export { default as component } from "../../../../src/routes/(errors)/404/+page.svelte";
+export { default as component } from "../../../../src/routes/about/+page.svelte";
diff --git a/.svelte-kit/generated/client/nodes/6.js b/.svelte-kit/generated/client/nodes/6.js
@@ -1 +1 @@
-export { default as component } from "../../../../src/routes/(wedding)/about/+page@(wedding).svelte";
+export { default as component } from "../../../../src/routes/links/+page.svelte";
diff --git a/.svelte-kit/generated/server/internal.js b/.svelte-kit/generated/server/internal.js
@@ -18,10 +18,10 @@ export const options = {
 	root,
 	service_worker: false,
 	templates: {
-		app: ({ head, body, assets, nonce, env }) => "<!doctype html>\n<html lang=\"en\" class=\"dark\">\n\t<head>\n\t\t<meta charset=\"utf-8\" />\n\t\t<link rel=\"icon\" href=\"" + assets + "/favicon.png\" />\n\t\t<link\n\t\t\trel=\"preload\"\n\t\t\thref=\"" + assets + "/fonts/NationalPark/national-forest-print-regular/webfonts/national-forest-print-regular.ttf\"\n\t\t\tas=\"font\"\n\t\t\ttype=\"font/ttf\"\n\t\t\tcrossorigin\n\t\t/>\n\t\t<link rel=\"stylesheet\" href=\"" + assets + "/custom.css\" type=\"text/css\" />\n\t\t<meta name=\"viewport\" content=\"width=device-width\" />\n\t\t" + head + "\n\t</head>\n\t<body data-sveltekit-preload-data=\"hover\" data-theme=\"wedding-theme\">\n\t\t<div style=\"display: contents\" class=\"h-full overflow-hidden\">" + body + "</div>\n\t</body>\n</html>\n",
+		app: ({ head, body, assets, nonce, env }) => "<!doctype html>\n<html lang=\"en\" class=\"dark\">\n\t<head>\n\t\t<title>Brayden and Madeline wedding website</title>\n\t\t<meta charset=\"utf-8\" />\n\t\t<link rel=\"icon\" href=\"" + assets + "/favicon.png\" />\n\t\t<link\n\t\t\trel=\"preload\"\n\t\t\thref=\"" + assets + "/fonts/NationalPark/national-forest-print-regular/webfonts/national-forest-print-regular.ttf\"\n\t\t\tas=\"font\"\n\t\t\ttype=\"font/ttf\"\n\t\t\tcrossorigin\n\t\t/>\n\t\t<link rel=\"stylesheet\" href=\"" + assets + "/custom.css\" type=\"text/css\" />\n\t\t<meta name=\"viewport\" content=\"width=device-width\" />\n\t\t" + head + "\n\t</head>\n\t<body data-sveltekit-preload-data=\"hover\" data-theme=\"wedding-theme\">\n\t\t<div style=\"display: contents\" class=\"h-full overflow-hidden\">" + body + "</div>\n\t</body>\n</html>\n",
 		error: ({ status, message }) => "<!doctype html>\n<html lang=\"en\">\n\t<head>\n\t\t<meta charset=\"utf-8\" />\n\t\t<title>" + message + "</title>\n\n\t\t<style>\n\t\t\tbody {\n\t\t\t\t--bg: white;\n\t\t\t\t--fg: #222;\n\t\t\t\t--divider: #ccc;\n\t\t\t\tbackground: var(--bg);\n\t\t\t\tcolor: var(--fg);\n\t\t\t\tfont-family:\n\t\t\t\t\tsystem-ui,\n\t\t\t\t\t-apple-system,\n\t\t\t\t\tBlinkMacSystemFont,\n\t\t\t\t\t'Segoe UI',\n\t\t\t\t\tRoboto,\n\t\t\t\t\tOxygen,\n\t\t\t\t\tUbuntu,\n\t\t\t\t\tCantarell,\n\t\t\t\t\t'Open Sans',\n\t\t\t\t\t'Helvetica Neue',\n\t\t\t\t\tsans-serif;\n\t\t\t\tdisplay: flex;\n\t\t\t\talign-items: center;\n\t\t\t\tjustify-content: center;\n\t\t\t\theight: 100vh;\n\t\t\t\tmargin: 0;\n\t\t\t}\n\n\t\t\t.error {\n\t\t\t\tdisplay: flex;\n\t\t\t\talign-items: center;\n\t\t\t\tmax-width: 32rem;\n\t\t\t\tmargin: 0 1rem;\n\t\t\t}\n\n\t\t\t.status {\n\t\t\t\tfont-weight: 200;\n\t\t\t\tfont-size: 3rem;\n\t\t\t\tline-height: 1;\n\t\t\t\tposition: relative;\n\t\t\t\ttop: -0.05rem;\n\t\t\t}\n\n\t\t\t.message {\n\t\t\t\tborder-left: 1px solid var(--divider);\n\t\t\t\tpadding: 0 0 0 1rem;\n\t\t\t\tmargin: 0 0 0 1rem;\n\t\t\t\tmin-height: 2.5rem;\n\t\t\t\tdisplay: flex;\n\t\t\t\talign-items: center;\n\t\t\t}\n\n\t\t\t.message h1 {\n\t\t\t\tfont-weight: 400;\n\t\t\t\tfont-size: 1em;\n\t\t\t\tmargin: 0;\n\t\t\t}\n\n\t\t\t@media (prefers-color-scheme: dark) {\n\t\t\t\tbody {\n\t\t\t\t\t--bg: #222;\n\t\t\t\t\t--fg: #ddd;\n\t\t\t\t\t--divider: #666;\n\t\t\t\t}\n\t\t\t}\n\t\t</style>\n\t</head>\n\t<body>\n\t\t<div class=\"error\">\n\t\t\t<span class=\"status\">" + status + "</span>\n\t\t\t<div class=\"message\">\n\t\t\t\t<h1>" + message + "</h1>\n\t\t\t</div>\n\t\t</div>\n\t</body>\n</html>\n"
 	},
-	version_hash: "1mvatao"
+	version_hash: "hbxab7"
 };
 
 export async function get_hooks() {

diff --git a/.svelte-kit/types/route_meta_data.json b/.svelte-kit/types/route_meta_data.json
@@ -1,33 +1,34 @@
 {
-	"/(wedding)": [
-		"src/routes/(wedding)/+layout.ts",
-		"src/routes/(wedding)/+layout.server.ts"
+	"/(errors)": [
+		"src/routes/+layout.ts",
+		"src/routes/+layout.server.ts"
 	],
-	"/(errors)": [],
 	"/": [
-		"src/routes/+page.server.ts"
+		"src/routes/+layout.ts",
+		"src/routes/+layout.server.ts",
+		"src/routes/+layout.ts",
+		"src/routes/+layout.server.ts"
 	],
-	"/(errors)/404": [],
-	"/(wedding)/about": [
-		"src/routes/(wedding)/+layout.ts",
-		"src/routes/(wedding)/+layout.server.ts"
+	"/(errors)/404": [
+		"src/routes/+layout.ts",
+		"src/routes/+layout.server.ts"
 	],
-	"/(wedding)/home": [
-		"src/routes/(wedding)/+layout.ts",
-		"src/routes/(wedding)/+layout.server.ts"
+	"/about": [
+		"src/routes/+layout.ts",
+		"src/routes/+layout.server.ts"
 	],
-	"/(wedding)/links": [
-		"src/routes/(wedding)/+layout.ts",
-		"src/routes/(wedding)/+layout.server.ts"
+	"/links": [
+		"src/routes/+layout.ts",
+		"src/routes/+layout.server.ts"
 	],
-	"/(wedding)/memories": [
-		"src/routes/(wedding)/memories/+page.ts",
-		"src/routes/(wedding)/+layout.ts",
-		"src/routes/(wedding)/+layout.server.ts"
+	"/memories": [
+		"src/routes/memories/+page.ts",
+		"src/routes/+layout.ts",
+		"src/routes/+layout.server.ts"
 	],
-	"/(wedding)/rsvp": [
-		"src/routes/(wedding)/rsvp/+page.server.ts",
-		"src/routes/(wedding)/+layout.ts",
-		"src/routes/(wedding)/+layout.server.ts"
+	"/rsvp": [
+		"src/routes/rsvp/+page.server.ts",
+		"src/routes/+layout.ts",
+		"src/routes/+layout.server.ts"
 	]
 }
diff --git a/.svelte-kit/types/src/routes/$types.d.ts b/.svelte-kit/types/src/routes/$types.d.ts
@@ -11,19 +11,18 @@ type OutputDataShape<T> = MaybeWithVoid<Omit<App.PageData, RequiredKeys<T>> & Pa
 type EnsureDefined<T> = T extends null | undefined ? {} : T;
 type OptionalUnion<U extends Record<string, any>, A extends keyof U = U extends U ? keyof U : never> = U extends unknown ? { [P in Exclude<A, keyof U>]?: never } & U : never;
 export type Snapshot<T = any> = Kit.Snapshot<T>;
-type PageServerParentData = EnsureDefined<LayoutServerData>;
 type PageParentData = EnsureDefined<LayoutData>;
-type LayoutRouteId = RouteId | "/" | "/(errors)/404" | "/(wedding)/about" | "/(wedding)/home" | "/(wedding)/links" | "/(wedding)/memories" | "/(wedding)/rsvp" | null
+type LayoutRouteId = RouteId | "/" | "/(errors)/404" | "/about" | "/links" | "/memories" | "/rsvp" | null
 type LayoutParams = RouteParams & {  }
+type LayoutServerParentData = EnsureDefined<{}>;
 type LayoutParentData = EnsureDefined<{}>;
 
-export type PageServerLoad<OutputData extends OutputDataShape<PageServerParentData> = OutputDataShape<PageServerParentData>> = Kit.ServerLoad<RouteParams, PageServerParentData, OutputData, RouteId>;
-export type PageServerLoadEvent = Parameters<PageServerLoad>[0];
-export type ActionData = unknown;
-export type PageServerData = Expand<OptionalUnion<EnsureDefined<Kit.LoadProperties<Awaited<ReturnType<typeof import('../../../../src/routes/+page.server.js').load>>>>>>;
-export type PageData = Expand<Omit<PageParentData, keyof PageServerData> & EnsureDefined<PageServerData>>;
-export type Action<OutputData extends Record<string, any> | void = Record<string, any> | void> = Kit.Action<RouteParams, OutputData, RouteId>
-export type Actions<OutputData extends Record<string, any> | void = Record<string, any> | void> = Kit.Actions<RouteParams, OutputData, RouteId>
+export type PageServerData = null;
+export type PageData = Expand<PageParentData>;
+export type LayoutServerLoad<OutputData extends Partial<App.PageData> & Record<string, any> | void = Partial<App.PageData> & Record<string, any> | void> = Kit.ServerLoad<LayoutParams, LayoutServerParentData, OutputData, LayoutRouteId>;
+export type LayoutServerLoadEvent = Parameters<LayoutServerLoad>[0];
 export type LayoutServerData = null;
-export type LayoutData = Expand<LayoutParentData>;
+export type LayoutLoad<OutputData extends OutputDataShape<LayoutParentData> = OutputDataShape<LayoutParentData>> = Kit.Load<LayoutParams, LayoutServerData, LayoutParentData, OutputData, LayoutRouteId>;
+export type LayoutLoadEvent = Parameters<LayoutLoad>[0];
+export type LayoutData = Expand<Omit<LayoutParentData, keyof Kit.LoadProperties<Awaited<ReturnType<typeof import('../../../../src/routes/+layout.js').load>>>> & OptionalUnion<EnsureDefined<Kit.LoadProperties<Awaited<ReturnType<typeof import('../../../../src/routes/+layout.js').load>>>>>>;
 export type RequestEvent = Kit.RequestEvent<RouteParams, RouteId>;
diff --git a/src/app.html b/src/app.html
@@ -1,6 +1,7 @@
 <!doctype html>
 <html lang="en" class="dark">
 	<!--<head>
+		<title>Brayden and Madeline wedding website</title>
 		<meta charset="utf-8" />
 		<link rel="icon" href="%sveltekit.assets%/favicon.png" />
 		<link

diff --git a/src/routes/(wedding)/+layout.server.ts → src/lib/Success.svelte b/src/routes/(wedding)/+layout.server.ts → src/lib/Success.svelte
diff --git a/src/lib/firebase/database.ts b/src/lib/firebase/database.ts
@@ -4,20 +4,13 @@ import { collection, query, doc,
 import { fbDB } from './firebase.app';
 
 export type Reservation = {
-	date: number;
 	name: string;
 	email: string;
 	attendance: boolean;
 	guests: number;
 };
 
-let rsvp_list: Reservation[] = [];
-
-export function getRSVP() {
-	return rsvp_list;
-}
-
-export async function addRSVP(name: string, email: string, attendance: boolean, guests?: number): Promise<void> {
+export async function addRSVP(reservation: Reservation): Promise<void> {
 
 	try {
 
@@ -32,11 +25,11 @@ export async function addRSVP(name: string, email: string, attendance: boolean,
 		});*/
 
 		const item = await addDoc(collection(fbDB, "test_collection"), {
-			attending: attendance, 
 			date: Timestamp.fromDate(new Date(Date.now())),
-			name: name,
-			email: email,
-			guests: guests
+			attendance: reservation.attendance,
+			name: reservation.name,
+			email: reservation.email,
+			guests: reservation.guests,
 		});
 
 		console.log(item)
@@ -47,25 +40,5 @@ export async function addRSVP(name: string, email: string, attendance: boolean,
 	catch (e: any) {
 		console.error("Error with item: ", e.stack)
 	}
-
-	const rsvp: Reservation = {
-		date: Date.now(),
-		name: name,
-		email: email,
-		attendance: attendance,
-		guests: guests ? guests : 0
-	};
-	rsvp_list.push(rsvp);
 }
 
-export function clearRSVP() {
-	rsvp_list = [
-		{
-			date: Date.now(),
-			name: '',
-			email: '',
-			attendance: true,
-			guests: 0
-		}
-	];
-}
diff --git a/src/routes/(wedding)/links/registry.ts → src/routes/+layout.server.ts b/src/routes/(wedding)/links/registry.ts → src/routes/+layout.server.ts
diff --git a/src/routes/(wedding)/+layout.svelte → src/routes/+layout.svelte b/src/routes/(wedding)/+layout.svelte → src/routes/+layout.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-	import '../../app.postcss';
+	import '../app.postcss';
 	import { onNavigate } from '$app/navigation';
-	import { browser } from '$app/environment';
 	import {
 		initializeStores,
+		Modal,
 		Drawer,
 		getDrawerStore,
 	} from '@skeletonlabs/skeleton';
@@ -12,29 +12,21 @@
 	import { cubicIn, cubicOut } from 'svelte/easing';
 	import { fbApp } from '$lib/firebase/firebase.app';
 	import Navigation from '$lib/Navigation.svelte';
+	import bg_standard from '$lib/assets/bnm_bg.jpg';
+	import bg_mobile from '$lib/assets/bnm_bg_mobile.jpg';
 
-	$: currMode = 'fuck';
 	export let data;
 	$: pathname = data.pathname
 
 	let wedding_links: string[][] = [
-		['Home', '/home'],
+		['Home', '/'],
 		['About', '/about'],
 		['Reserve', '/rsvp'],
 		['Memories', '/memories'],
 		['Links', '/links']
 	];
 	// console.log(wedding_links);
 
-	function currModeChange() {
-		// This is pure jank..?
-		if (browser) {
-			let elem = document.getElementsByClassName('dark').item(0);
-			if (!elem) currMode = '';
-			else currMode = 'dark';
-		}
-	}
-
 	initializeStores();
 	const weddingDrawer = getDrawerStore();
 
@@ -63,7 +55,7 @@
 </script>
 <style lang="postcss">
 	:global(body){
-		@apply bg-bnm-mobile lg:bg-bnm-bg bg-cover;
+		@apply bg-cover bg-bnm-mobile lg:bg-bnm-bg;
 	}
 
 </style>
@@ -91,7 +83,7 @@
 		<Navigation links={wedding_links}/>
 	</div>
 </header>
-
+<main>
 <div>
 {#key pathname}
 	<div
@@ -101,4 +93,5 @@
 		<slot />
 	</div>
 {/key}
-</div>
+</div>
+</main>
diff --git a/src/routes/(wedding)/+layout.ts → src/routes/+layout.ts b/src/routes/(wedding)/+layout.ts → src/routes/+layout.ts
diff --git a/...tes/(wedding)/home/+page@(wedding).svelte → src/routes/+page.svelte b/...tes/(wedding)/home/+page@(wedding).svelte → src/routes/+page.svelte
diff --git a/...es/(wedding)/about/+page@(wedding).svelte → src/routes/about/+page.svelte b/...es/(wedding)/about/+page@(wedding).svelte → src/routes/about/+page.svelte
diff --git a/...es/(wedding)/links/+page@(wedding).svelte → src/routes/links/+page.svelte b/...es/(wedding)/links/+page@(wedding).svelte → src/routes/links/+page.svelte
diff --git a/src/routes/(wedding)/memories/+page.ts → src/routes/links/registry.ts b/src/routes/(wedding)/memories/+page.ts → src/routes/links/registry.ts
diff --git a/...(wedding)/memories/+page@(wedding).svelte → src/routes/memories/+page.svelte b/...(wedding)/memories/+page@(wedding).svelte → src/routes/memories/+page.svelte
diff --git a/src/routes/memories/+page.ts b/src/routes/memories/+page.ts
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export { default as component } from "../../../../src/routes/+page.svelte";
		export { default as component } from "../../../../src/routes/(errors)/404/+page.svelte";