add dev auth and account page (#54)

* add dev login * refresh migrations * add account page placeholder * chore: Update dev-login page to use window.location instead of goto() since csr doesnt update with session * Update header link to "My Account" instead of "About" * make one button for dev login * use only email field
SCE-Development · May 25, 2024 · fe846cd · fe846cd
1 parent ff4c870
commit fe846cd
Show file tree

Hide file tree

Showing 15 changed files with 146 additions and 357 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,6 +35,8 @@ jobs:
         uses: oven-sh/setup-bun@v1
       - name: Install dependencies
         run: bun install
+      - name: Remove dev-login route
+        run: rm -rf src/routes/dev-login
       - name: Build
         run: bun run build
       - name: Format

diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -56,6 +56,7 @@
     "lucide-svelte": "^0.359.0",
     "oslo": "^1.1.3",
     "postgres": "^3.4.3",
+    "svelte-sonner": "^0.3.24",
     "tailwind-variants": "^0.2.0"
   }
 }
diff --git a/src/lib/components/Header.svelte b/src/lib/components/Header.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
 	import { Menu } from 'lucide-svelte';
-
 	import Login from '$lib/components/Login.svelte';
 	import Logout from '$lib/components/Logout.svelte';
 	import Search, { type Course } from '$lib/components/Search.svelte';
 	import type { User } from 'lucia';
 	import type { Infer, SuperValidated } from 'sveltekit-superforms';
 	import type { SearchSchema } from '$lib/forms/schema';
 	import { page } from '$app/stores';
+	import { dev } from '$app/environment';
 
 	type Props = {
 		user: User | undefined;
@@ -25,9 +25,11 @@
 		<Search {courses} {formData} />
 	{/if}
 	<div class="menu menu-horizontal hidden gap-x-4 lg:flex">
-		<a href="/about" class="btn btn-ghost btn-sm text-lg">About</a>
+		<a href="/account" class="btn btn-ghost btn-sm text-lg">My Account</a>
 		{#if user}
 			<Logout><button type="submit" class="btn btn-accent btn-sm text-lg">Log Out</button></Logout>
+		{:else if dev}
+			<a href="/dev-login" class="btn btn-ghost btn-sm text-lg">Dev Login</a>
 		{:else}
 			<Login><button type="submit" class="btn btn-ghost btn-sm text-lg">Log In</button></Login>
 			<Login><button type="submit" class="btn btn-accent btn-sm text-lg">Sign Up</button></Login>
@@ -44,6 +46,8 @@
 				<li><a href="/about" class="text-lg">About</a></li>
 				{#if user}
 					<li><Logout><button type="submit" class="text-lg">Log Out</button></Logout></li>
+				{:else if dev}
+					<a href="/dev-login" class="btn btn-ghost btn-sm text-lg">Dev Login</a>
 				{:else}
 					<div>
 						<li>

diff --git a/...b/db/migrations/0000_steady_ken_ellis.sql → ...lib/db/migrations/0000_wise_amphibian.sql b/...b/db/migrations/0000_steady_ken_ellis.sql → ...lib/db/migrations/0000_wise_amphibian.sql
@@ -19,6 +19,7 @@ CREATE TABLE IF NOT EXISTS "professors" (
 );
 --> statement-breakpoint
 CREATE TABLE IF NOT EXISTS "reviews" (
+	"id" serial PRIMARY KEY NOT NULL,
 	"userId" varchar NOT NULL,
 	"professor_id" integer NOT NULL,
 	"rating" integer NOT NULL,
@@ -37,42 +38,43 @@ CREATE TABLE IF NOT EXISTS "users" (
 	"id" varchar(15) PRIMARY KEY NOT NULL,
 	"username" text NOT NULL,
 	"email" text NOT NULL,
-	"googleId" varchar(21) NOT NULL,
-	"createdAt" timestamp NOT NULL
+	"googleId" varchar(21),
+	"createdAt" timestamp NOT NULL,
+	CONSTRAINT "users_username_unique" UNIQUE("username")
 );
 --> statement-breakpoint
 DO $$ BEGIN
- ALTER TABLE "professors_courses" ADD CONSTRAINT "professors_courses_professor_id_professors_id_fk" FOREIGN KEY ("professor_id") REFERENCES "professors"("id") ON DELETE no action ON UPDATE no action;
+ ALTER TABLE "professors_courses" ADD CONSTRAINT "professors_courses_professor_id_professors_id_fk" FOREIGN KEY ("professor_id") REFERENCES "public"."professors"("id") ON DELETE no action ON UPDATE no action;
 EXCEPTION
  WHEN duplicate_object THEN null;
 END $$;
 --> statement-breakpoint
 DO $$ BEGIN
- ALTER TABLE "professors_courses" ADD CONSTRAINT "professors_courses_course_id_courses_id_fk" FOREIGN KEY ("course_id") REFERENCES "courses"("id") ON DELETE no action ON UPDATE no action;
+ ALTER TABLE "professors_courses" ADD CONSTRAINT "professors_courses_course_id_courses_id_fk" FOREIGN KEY ("course_id") REFERENCES "public"."courses"("id") ON DELETE no action ON UPDATE no action;
 EXCEPTION
  WHEN duplicate_object THEN null;
 END $$;
 --> statement-breakpoint
 DO $$ BEGIN
- ALTER TABLE "reviews" ADD CONSTRAINT "reviews_userId_users_id_fk" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE no action ON UPDATE no action;
+ ALTER TABLE "reviews" ADD CONSTRAINT "reviews_userId_users_id_fk" FOREIGN KEY ("userId") REFERENCES "public"."users"("id") ON DELETE no action ON UPDATE no action;
 EXCEPTION
  WHEN duplicate_object THEN null;
 END $$;
 --> statement-breakpoint
 DO $$ BEGIN
- ALTER TABLE "reviews" ADD CONSTRAINT "reviews_professor_id_professors_id_fk" FOREIGN KEY ("professor_id") REFERENCES "professors"("id") ON DELETE no action ON UPDATE no action;
+ ALTER TABLE "reviews" ADD CONSTRAINT "reviews_professor_id_professors_id_fk" FOREIGN KEY ("professor_id") REFERENCES "public"."professors"("id") ON DELETE no action ON UPDATE no action;
 EXCEPTION
  WHEN duplicate_object THEN null;
 END $$;
 --> statement-breakpoint
 DO $$ BEGIN
- ALTER TABLE "reviews" ADD CONSTRAINT "reviews_course_id_courses_id_fk" FOREIGN KEY ("course_id") REFERENCES "courses"("id") ON DELETE no action ON UPDATE no action;
+ ALTER TABLE "reviews" ADD CONSTRAINT "reviews_course_id_courses_id_fk" FOREIGN KEY ("course_id") REFERENCES "public"."courses"("id") ON DELETE no action ON UPDATE no action;
 EXCEPTION
  WHEN duplicate_object THEN null;
 END $$;
 --> statement-breakpoint
 DO $$ BEGIN
- ALTER TABLE "sessions" ADD CONSTRAINT "sessions_userId_users_id_fk" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE no action ON UPDATE no action;
+ ALTER TABLE "sessions" ADD CONSTRAINT "sessions_userId_users_id_fk" FOREIGN KEY ("userId") REFERENCES "public"."users"("id") ON DELETE no action ON UPDATE no action;
 EXCEPTION
  WHEN duplicate_object THEN null;
 END $$;
diff --git a/src/lib/db/migrations/0001_nebulous_wrecker.sql b/src/lib/db/migrations/0001_nebulous_wrecker.sql
diff --git a/src/lib/db/migrations/meta/0000_snapshot.json b/src/lib/db/migrations/meta/0000_snapshot.json
@@ -1,10 +1,10 @@
 {
-  "id": "87a17e63-1308-43ff-bbc8-da953cd416c7",
+  "id": "5e051c57-44aa-47d6-9896-44fc4180217e",
   "prevId": "00000000-0000-0000-0000-000000000000",
-  "version": "5",
-  "dialect": "pg",
+  "version": "6",
+  "dialect": "postgresql",
   "tables": {
-    "courses": {
+    "public.courses": {
       "name": "courses",
       "schema": "",
       "columns": {
@@ -44,7 +44,7 @@
       "compositePrimaryKeys": {},
       "uniqueConstraints": {}
     },
-    "professors_courses": {
+    "public.professors_courses": {
       "name": "professors_courses",
       "schema": "",
       "columns": {
@@ -101,7 +101,7 @@
       },
       "uniqueConstraints": {}
     },
-    "professors": {
+    "public.professors": {
       "name": "professors",
       "schema": "",
       "columns": {
@@ -129,10 +129,16 @@
       "compositePrimaryKeys": {},
       "uniqueConstraints": {}
     },
-    "reviews": {
+    "public.reviews": {
       "name": "reviews",
       "schema": "",
       "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
         "userId": {
           "name": "userId",
           "type": "varchar",
@@ -215,7 +221,7 @@
       "compositePrimaryKeys": {},
       "uniqueConstraints": {}
     },
-    "sessions": {
+    "public.sessions": {
       "name": "sessions",
       "schema": "",
       "columns": {
@@ -257,7 +263,7 @@
       "compositePrimaryKeys": {},
       "uniqueConstraints": {}
     },
-    "users": {
+    "public.users": {
       "name": "users",
       "schema": "",
       "columns": {
@@ -283,7 +289,7 @@
           "name": "googleId",
           "type": "varchar(21)",
           "primaryKey": false,
-          "notNull": true
+          "notNull": false
         },
         "createdAt": {
           "name": "createdAt",
@@ -295,7 +301,15 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {
+        "users_username_unique": {
+          "name": "users_username_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "username"
+          ]
+        }
+      }
     }
   },
   "enums": {},