Add log page, update database schema, and API endpoint for user visits

migrations/0009_spotty_madame_web.sql

@@ -0,0 +1,5 @@
+ALTER TABLE "userVisitedAdventures" RENAME COLUMN "adventure_visited" TO "adventure_id";--> statement-breakpoint
+ALTER TABLE "userVisitedAdventures" ADD PRIMARY KEY ("adventure_id");--> statement-breakpoint
+ALTER TABLE "userVisitedAdventures" ALTER COLUMN "adventure_id" SET DATA TYPE serial;--> statement-breakpoint
+ALTER TABLE "userVisitedAdventures" ALTER COLUMN "adventure_id" SET NOT NULL;--> statement-breakpoint
+ALTER TABLE "userVisitedAdventures" ADD COLUMN "visited_date" text;

migrations/meta/0009_snapshot.json

@@ -0,0 +1,201 @@
+{
+  "id": "1d83805d-6ee2-4dae-87a6-5af6f2d5add3",
+  "prevId": "ec5af5e4-8522-4383-af47-412fb43c7cc3",
+  "version": "5",
+  "dialect": "pg",
+  "tables": {
+    "featuredAdventures": {
+      "name": "featuredAdventures",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "location": {
+          "name": "location",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "session": {
+      "name": "session",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "session_user_id_user_id_fk": {
+          "name": "session_user_id_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "sharedAdventures": {
+      "name": "sharedAdventures",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "data": {
+          "name": "data",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "user": {
+      "name": "user",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "first_name": {
+          "name": "first_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "last_name": {
+          "name": "last_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "hashed_password": {
+          "name": "hashed_password",
+          "type": "varchar",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "userVisitedAdventures": {
+      "name": "userVisitedAdventures",
+      "schema": "",
+      "columns": {
+        "adventure_id": {
+          "name": "adventure_id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "adventure_name": {
+          "name": "adventure_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "location": {
+          "name": "location",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "visited_date": {
+          "name": "visited_date",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "userVisitedAdventures_user_id_user_id_fk": {
+          "name": "userVisitedAdventures_user_id_user_id_fk",
+          "tableFrom": "userVisitedAdventures",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {},
+  "schemas": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}

migrations/meta/_journal.json

@@ -64,6 +64,13 @@
       "when": 1712186591227,
       "tag": "0008_romantic_maria_hill",
       "breakpoints": true
+    },
+    {
+      "idx": 9,
+      "version": "5",
+      "when": 1712407140727,
+      "tag": "0009_spotty_madame_web",
+      "breakpoints": true
     }
   ]
 }

src/lib/components/Navbar.svelte

@@ -43,10 +43,12 @@
       class="btn btn-primary my-2 md:my-0 md:mr-4 md:ml-2"
       on:click={goHome}>Home</button
     >
+    {#if user}
       <button
         class="btn btn-primary my-2 md:my-0 md:mr-4 md:ml-2"
         on:click={goToLog}>My Log</button
       >
+    {/if}
     <button class="btn btn-primary my-2 md:my-0" on:click={goToFeatured}
       >Featured</button
     >

src/lib/db/schema.ts

@@ -40,10 +40,11 @@ export const sessionTable = pgTable("session", {
 });
 
 export const userVisitedAdventures = pgTable("userVisitedAdventures", {
+  adventureID: serial("adventure_id").primaryKey(),
   userId: text("user_id")
     .notNull()
     .references(() => userTable.id),
   adventureName: text("adventure_name").notNull(),
   location: text("location"),
-  adventureVistied: text("adventure_visited"),
+  visitedDate: text("visited_date"),
 });

src/routes/api/visits/+server.ts

@@ -3,6 +3,7 @@ import type { RequestEvent } from "@sveltejs/kit";
 import { userVisitedAdventures } from "$lib/db/schema";
 import { db } from "$lib/db/db.server";
 import { eq } from "drizzle-orm";
+import type { Adventure } from "$lib/utils/types";
 
 // Gets all the adventures that the user has visited
 export async function GET(event: RequestEvent): Promise<Response> {
@@ -14,16 +15,19 @@ export async function GET(event: RequestEvent): Promise<Response> {
       },
     });
   }
-
   let result = await db
     .select()
     .from(userVisitedAdventures)
     .where(eq(userVisitedAdventures.userId, event.locals.user.id))
     .execute();
-
   return new Response(
     JSON.stringify({
-      result: result,
+      adventures: result.map((item) => ({
+        id: item.adventureID,
+        name: item.adventureName,
+        location: item.location,
+        created: item.visitedDate,
+      })),
     }),
     {
       status: 200,

src/routes/log/+page.server.ts

@@ -0,0 +1,13 @@
+import { redirect } from "@sveltejs/kit";
+import type { PageServerLoad } from "./$types";
+
+export const load: PageServerLoad = async (event) => {
+  if (!event.locals.user) {
+    return redirect(302, "/login");
+  }
+  const response = await event.fetch("/api/visits");
+  const result = await response.json();
+  return {
+    result,
+  };
+};

src/routes/log/+page.svelte

@@ -1,4 +1,6 @@
 <script lang="ts">
+  let adventures: Adventure[] = [];
+  export let data;
   import AdventureCard from "$lib/components/AdventureCard.svelte";
   import type { Adventure } from "$lib/utils/types";
   import {
@@ -27,8 +29,6 @@
   let editLocation: string = "";
   let editCreated: string = "";
 
-  let adventures: Adventure[] = [];
-
   let isShowingToast: boolean = false;
   let toastAction: string = "";
 
@@ -62,6 +62,7 @@
 
   onMount(async () => {
     adventures = getAdventures();
+    console.log(data.result);
   });
 
   function triggerRemoveAdventure(event: { detail: number }) {
@@ -177,7 +178,7 @@
 <div
   class="grid xl:grid-cols-3 lg:grid-cols-3 md:grid-cols-2 sm:grid-cols-1 gap-4 mt-4 content-center auto-cols-auto ml-6 mr-6"
 >
-  {#each adventures as adventure (adventure.id)}
+  {#each data.result.adventures as adventure (adventure.id)}
     <AdventureCard
       type="mylog"
       id={adventure.id}