From 9324de4e7490521e42ff9b84fd25f5c0010811a8 Mon Sep 17 00:00:00 2001
From: Bradley Shellnut <bradleyshellnut@protonmail.com>
Date: Sat, 2 Mar 2024 15:53:02 -0800
Subject: [PATCH] Adding favicon, restrict signup for now, fix seed and
 migration, and do not set email to empty string on signup.

---
 drizzle.config.ts                         |  3 ++-
 src/app.html                              |  2 +-
 src/lib/drizzle.ts                        | 11 +++++++++--
 src/migrate.ts                            |  2 +-
 src/routes/(auth)/sign-up/+page.server.ts |  6 +++---
 src/routes/(auth)/sign-up/+page.svelte    |  2 +-
 src/seed.ts                               |  3 ++-
 static/favicon-bored-game.svg             | 13 +++++++++++++
 8 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 static/favicon-bored-game.svg

diff --git a/drizzle.config.ts b/drizzle.config.ts
index 45e37e5..dd39ff9 100644
--- a/drizzle.config.ts
+++ b/drizzle.config.ts
@@ -10,7 +10,8 @@ export default defineConfig({
 		port: Number(process.env.DATABASE_PORT) || 5432,
 		user: process.env.DATABASE_USER,
 		password: process.env.DATABASE_PASSWORD,
-		database: process.env.DATABASE || 'boredgame'
+		database: process.env.DATABASE || 'boredgame',
+		ssl: true
 	},
 	// Print all statements
 	verbose: true,
diff --git a/src/app.html b/src/app.html
index 82131dd..936b6ea 100644
--- a/src/app.html
+++ b/src/app.html
@@ -4,7 +4,7 @@
 		<meta name="robots" content="noindex, nofollow" />
 		<meta charset="utf-8" />
 		<meta name="description" content="Bored? Find a game! Bored Game!" />
-		<link rel="icon" href="%sveltekit.assets%/favicon-bored.png" />
+		<link rel="icon" href="%sveltekit.assets%/favicon-bored-game.svg" />
 		<meta name="viewport" content="width=device-width" />
 		<script>
 			// const htmlElement = document.documentElement;
diff --git a/src/lib/drizzle.ts b/src/lib/drizzle.ts
index ae61e1a..08339c6 100644
--- a/src/lib/drizzle.ts
+++ b/src/lib/drizzle.ts
@@ -5,7 +5,7 @@ import {
 	DATABASE_PASSWORD,
 	DATABASE_HOST,
 	DATABASE_DB,
-	DATABASE_PORT
+	DATABASE_PORT,
 } from '$env/static/private';
 import * as schema from '../schema';
 
@@ -15,9 +15,16 @@ const pool = new pg.Pool({
 	password: DATABASE_PASSWORD,
 	host: DATABASE_HOST,
 	port: Number(DATABASE_PORT).valueOf(),
-	database: DATABASE_DB
+	database: DATABASE_DB,
+	ssl: true,
 });
 
+// user: DATABASE_USER,
+// 	password: DATABASE_PASSWORD,
+// 	host: DATABASE_HOST,
+// 	port: Number(DATABASE_PORT).valueOf(),
+// 	database: DATABASE_DB
+
 const db = drizzle(pool, { schema });
 
 export default db;
diff --git a/src/migrate.ts b/src/migrate.ts
index 43d6f83..aca9daf 100644
--- a/src/migrate.ts
+++ b/src/migrate.ts
@@ -5,7 +5,7 @@ import { migrate } from 'drizzle-orm/postgres-js/migrator';
 
 const connection = postgres({
 	host: process.env.DATABASE_HOST || 'localhost',
-	port: 3306,
+	port: 5432,
 	user: process.env.DATABASE_USER || 'root',
 	password: process.env.DATABASE_PASSWORD || '',
 	database: process.env.DATABASE_DB || 'boredgame',
diff --git a/src/routes/(auth)/sign-up/+page.server.ts b/src/routes/(auth)/sign-up/+page.server.ts
index f01dd99..808915a 100644
--- a/src/routes/(auth)/sign-up/+page.server.ts
+++ b/src/routes/(auth)/sign-up/+page.server.ts
@@ -23,7 +23,7 @@ const signUpDefaults = {
 };
 
 export const load: PageServerLoad = async (event) => {
-	// redirect(302, '/waitlist', { type: 'error', message: 'Sign-up not yet available. Please add your email to the waitlist!' }, event);
+	redirect(302, '/waitlist', { type: 'error', message: 'Sign-up not yet available. Please add your email to the waitlist!' }, event);
 
 	if (event.locals.user) {
 		const message = { type: 'success', message: 'You are already signed in' } as const;
@@ -39,7 +39,7 @@ export const load: PageServerLoad = async (event) => {
 
 export const actions: Actions = {
 	default: async (event) => {
-		// fail(401, { message: 'Sign-up not yet available. Please add your email to the waitlist!' });
+		fail(401, { message: 'Sign-up not yet available. Please add your email to the waitlist!' });
 		const form = await superValidate(event, zod(signUpSchema));
 		if (!form.valid) {
 			form.data.password = '';
@@ -70,7 +70,7 @@ export const actions: Actions = {
 			.values({
 				username: form.data.username,
 				hashed_password: hashedPassword,
-				email: form.data.email || '',
+				email: form.data.email,
 				first_name: form.data.firstName || '',
 				last_name: form.data.lastName || '',
 				verified: false,
diff --git a/src/routes/(auth)/sign-up/+page.svelte b/src/routes/(auth)/sign-up/+page.svelte
index 4332b7c..2f99bfa 100644
--- a/src/routes/(auth)/sign-up/+page.svelte
+++ b/src/routes/(auth)/sign-up/+page.svelte
@@ -8,7 +8,7 @@
 	import { Button } from '$components/ui/button';
 	import { Label } from '$components/ui/label';
 	import { Input } from '$components/ui/input';
-	import { signUpSchema } from '$lib/validations/zod-schemas.js';
+	import { signUpSchema } from '$lib/validations/auth';
 	import * as Collapsible from '$lib/components/ui/collapsible';
 	import * as Alert from '$lib/components/ui/alert';
 	import { boredState } from '$lib/stores/boredState.js';
diff --git a/src/seed.ts b/src/seed.ts
index 3d51106..2606719 100644
--- a/src/seed.ts
+++ b/src/seed.ts
@@ -9,7 +9,8 @@ const pool = new pg.Pool({
 	password: process.env.DATABASE_PASSWORD,
 	host: process.env.DATABASE_HOST,
 	port: new Number(process.env.DATABASE_PORT).valueOf(),
-	database: process.env.DATABASE_DB
+	database: process.env.DATABASE_DB,
+	ssl: true,
 });
 
 const db = drizzle(pool, { schema: schema });
diff --git a/static/favicon-bored-game.svg b/static/favicon-bored-game.svg
new file mode 100644
index 0000000..9c7dbd4
--- /dev/null
+++ b/static/favicon-bored-game.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-go-game" width="24" height="24" viewBox="0 0 24 24" stroke-width="1" stroke="#ffff" fill="none" stroke-linecap="round" stroke-linejoin="round">
+    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+    <path d="M6 6m-2 0a2 2 0 1 0 4 0a2 2 0 1 0 -4 0" />
+    <path d="M12 12m-2 0a2 2 0 1 0 4 0a2 2 0 1 0 -4 0" />
+    <path d="M6 18m-2 0a2 2 0 1 0 4 0a2 2 0 1 0 -4 0" />
+    <path d="M18 18m-2 0a2 2 0 1 0 4 0a2 2 0 1 0 -4 0" />
+    <path d="M3 12h7m4 0h7" />
+    <path d="M3 6h1m4 0h13" />
+    <path d="M3 18h1m4 0h8m4 0h1" />
+    <path d="M6 3v1m0 4v8m0 4v1" />
+    <path d="M12 3v7m0 4v7" />
+    <path d="M18 3v13m0 4v1" />
+</svg>
\ No newline at end of file