Prettier

Fixed `get-map.ts` selection Installed `@types/node` for `encode-doors.ts` and moved it to `$lib/server`
hopperelec · Feb 10, 2024 · c183f90 · c183f90
1 parent a6aca07
commit c183f90
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -29,6 +29,7 @@
     "@sveltejs/kit": "^2.5.0",
     "@sveltejs/vite-plugin-svelte": "^3.0.0",
     "@types/html-minifier-terser": "^7.0.2",
+    "@types/node": "^20.11.17",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
     "autoprefixer": "^10.4.17",
@@ -57,4 +58,4 @@
     "vitest": "^1.0.0"
   },
   "type": "module"
-}
+}
diff --git a/src/lib/SVGMap.svelte b/src/lib/SVGMap.svelte
@@ -137,7 +137,7 @@
 <div id="map-container"></div>
 
 <svelte:head>
-  <link as="fetch" crossorigin="anonymous" href="{imgURL}" rel="preload">
+  <link as="fetch" crossorigin="anonymous" href={imgURL} rel="preload" />
   <style>
     [data-room]:hover {
       filter: brightness(1.5);

diff --git a/src/lib/encode-doors.ts → src/lib/server/encode-doors.ts b/src/lib/encode-doors.ts → src/lib/server/encode-doors.ts
diff --git a/src/lib/server/get-map.ts b/src/lib/server/get-map.ts
@@ -8,8 +8,8 @@ export default async function getMap(schoolId: number, mapId: number) {
       creator: {
         schoolId: schoolId,
       },
-      select: { id: true },
     },
+    select: { id: true },
   });
   if (map) return map;
   error(403, "You do not have access to this map!");

diff --git a/src/routes/game/[gameId=id]/+page.svelte b/src/routes/game/[gameId=id]/+page.svelte
@@ -118,8 +118,13 @@
 />
 
 <svelte:head>
-  <link as="fetch" crossorigin="anonymous" href="/maps/{data.mapId}/doors" rel="preload">
-  <link as="image" href="{data.picture || '/default_pfp.svg'}" rel="preload">
+  <link
+    as="fetch"
+    crossorigin="anonymous"
+    href="/maps/{data.mapId}/doors"
+    rel="preload"
+  />
+  <link as="image" href={data.picture || "/default_pfp.svg"} rel="preload" />
   <style>
     [data-player] {
       clip-path: inset(0% round 50%);

diff --git a/src/routes/game/[gameId=id]/shop/+page.svelte b/src/routes/game/[gameId=id]/shop/+page.svelte
@@ -17,7 +17,11 @@
         <h3>{item.name}</h3>
         <p class="description">{item.description || ""}</p>
         <p>Cost: <span>{item.cost}</span> point{item.cost === 1 ? "" : "s"}</p>
-        <button type="button" on:click={() => buyItem(item.id)} disabled={item.cost > data.player.points}>Buy</button>
+        <button
+          type="button"
+          on:click={() => buyItem(item.id)}
+          disabled={item.cost > data.player.points}>Buy</button
+        >
       </li>
     {/each}
   </ul>

diff --git a/src/routes/maps/[mapId=id]/doors/+server.ts b/src/routes/maps/[mapId=id]/doors/+server.ts
@@ -1,6 +1,6 @@
 import prisma from "$lib/server/prisma";
 import { error } from "@sveltejs/kit";
-import encodeDoors from "$lib/encode-doors";
+import encodeDoors from "$lib/server/encode-doors";
 
 export const GET = async ({ params, locals }) => {
   const map = await prisma.map.findFirst({

diff --git a/src/routes/teacher/maps/[mapId=id]/doors/+page.svelte b/src/routes/teacher/maps/[mapId=id]/doors/+page.svelte
@@ -76,7 +76,12 @@
 />
 
 <svelte:head>
-  <link as="fetch" crossorigin="anonymous" href="/maps/{data.mapId}/doors" rel="preload">
+  <link
+    as="fetch"
+    crossorigin="anonymous"
+    href="/maps/{data.mapId}/doors"
+    rel="preload"
+  />
   <style>
     /* noinspection CssUnusedSymbol */
     .door-line {