From 30646ebca212a8d418b23ac6cf3052d700c6ece3 Mon Sep 17 00:00:00 2001
From: Lewin Kelly <heli@odex.cf>
Date: Tue, 12 Sep 2023 23:41:56 +0100
Subject: [PATCH] Fix some SvelteKit errors and add docker compose file for
 Redis

---
 Back/.gitignore                               |  1 +
 Back/docker-compose.yml                       | 14 ++++++++++
 Back/server.mjs                               |  2 +-
 Front/src/components/admin/logs.svelte        |  4 ---
 Front/src/components/admin/lookupdone.svelte  |  3 +--
 Front/src/components/develop/clothing.svelte  |  3 +--
 .../components/develop/createditems.svelte    |  2 +-
 Front/src/components/develop/games.svelte     |  3 +--
 .../develop/modals/editgamemodal.svelte       |  3 +--
 Front/src/components/groups/groupbar.svelte   |  1 -
 Front/src/components/statusbubble.svelte      |  2 +-
 .../catalog/[slug]/configure/+page.svelte     |  5 ++--
 .../routes/games/[slug]/[name]/+page.svelte   |  6 +++++
 Front/src/routes/groups/create/+page.svelte   |  3 +--
 Front/src/routes/groupss/create/+page.svelte  |  3 +--
 Front/src/routes/settings/+page.svelte        | 27 ++++++++-----------
 16 files changed, 43 insertions(+), 39 deletions(-)
 create mode 100644 Back/docker-compose.yml

diff --git a/Back/.gitignore b/Back/.gitignore
index ff5b1b0..224bc27 100644
--- a/Back/.gitignore
+++ b/Back/.gitignore
@@ -1,3 +1,4 @@
 node_modules/
 assets/release.zip
 assets/hash.txt
+data/
diff --git a/Back/docker-compose.yml b/Back/docker-compose.yml
new file mode 100644
index 0000000..3f7f37d
--- /dev/null
+++ b/Back/docker-compose.yml
@@ -0,0 +1,14 @@
+version: "3"
+
+# Config file for compose, a tool that allows for easily managing multiple docker containers.
+# https://docs.docker.com/compose/
+
+services:
+    redis:
+        container_name: meteoredis
+        image: redis
+        ports:
+            - 6379:6379
+        restart: unless-stopped
+        volumes:
+            - ./data/redis:/data
diff --git a/Back/server.mjs b/Back/server.mjs
index 662e09e..c3c6d8a 100644
--- a/Back/server.mjs
+++ b/Back/server.mjs
@@ -27,7 +27,7 @@ require("dotenv").config()
 const https = require("https")
 const PROD = process.env.PROD
 const client = require("prom-client")
-const { handler } = await import("../meteoriterewrite/build/handler.js")
+const { handler } = await import("../Front/build/handler.js")
 
 app.use((req, res, next) => {
 	const allowedOrigins = [
diff --git a/Front/src/components/admin/logs.svelte b/Front/src/components/admin/logs.svelte
index dc70df1..9399cda 100644
--- a/Front/src/components/admin/logs.svelte
+++ b/Front/src/components/admin/logs.svelte
@@ -1,7 +1,3 @@
-<script lang="ts">
-	export let jwt: string
-</script>
-
 <div class="grow">
 	<h2 class="">Admin Logs</h2>
 	<table
diff --git a/Front/src/components/admin/lookupdone.svelte b/Front/src/components/admin/lookupdone.svelte
index e370a49..3ccbe28 100644
--- a/Front/src/components/admin/lookupdone.svelte
+++ b/Front/src/components/admin/lookupdone.svelte
@@ -100,8 +100,7 @@
 		<h5>Moderator Note:</h5>
 		<textarea
 			bind:value={banreason}
-			class="input input-bordered input-primary w-full rounded-md h-32">
-		</textarea>
+			class="input input-bordered input-primary w-full rounded-md h-32" />
 		<div
 			class="!text-xs mt-6 {message.error === true
 				? 'text-error-600'
diff --git a/Front/src/components/develop/clothing.svelte b/Front/src/components/develop/clothing.svelte
index c0ff4d7..09beef9 100644
--- a/Front/src/components/develop/clothing.svelte
+++ b/Front/src/components/develop/clothing.svelte
@@ -105,8 +105,7 @@
 		<textarea
 			bind:value={itemdesc}
 			class="input input-bordered input-primary w-full max-w-md rounded-md"
-			required>
-		</textarea>
+			required />
 	</label>
 
 	<label class="input-label gap-8">
diff --git a/Front/src/components/develop/createditems.svelte b/Front/src/components/develop/createditems.svelte
index f85b6a9..d6f8696 100644
--- a/Front/src/components/develop/createditems.svelte
+++ b/Front/src/components/develop/createditems.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	export let itemname: string
 	export let itemid: string
-	export let type = ""
+	export const type = ""
 </script>
 
 <div class="flex flex-row gap-4 justify-around w-full">
diff --git a/Front/src/components/develop/games.svelte b/Front/src/components/develop/games.svelte
index ef4a769..96e728a 100644
--- a/Front/src/components/develop/games.svelte
+++ b/Front/src/components/develop/games.svelte
@@ -104,8 +104,7 @@
 		<textarea
 			bind:value={itemdesc}
 			class="input input-bordered input-primary w-full max-w-md rounded-md"
-			required>
-		</textarea>
+			required />
 	</label>
 
 	<label class="input-label gap-14">
diff --git a/Front/src/components/develop/modals/editgamemodal.svelte b/Front/src/components/develop/modals/editgamemodal.svelte
index 4c73802..7f13f3e 100644
--- a/Front/src/components/develop/modals/editgamemodal.svelte
+++ b/Front/src/components/develop/modals/editgamemodal.svelte
@@ -138,8 +138,7 @@
 				<textarea
 					bind:value={description}
 					class="input input-bordered input-primary w-full rounded-md"
-					required>
-				</textarea>
+					required />
 			</label>
 			<!-- svelte-ignore a11y-label-has-associated-control -->
 			<label class="label">
diff --git a/Front/src/components/groups/groupbar.svelte b/Front/src/components/groups/groupbar.svelte
index b3bfaf1..b10f4e5 100644
--- a/Front/src/components/groups/groupbar.svelte
+++ b/Front/src/components/groups/groupbar.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
 	import { Avatar } from "@skeletonlabs/skeleton"
-	export let selectedgroup: string
 	export let grouplist: array
 </script>
 
diff --git a/Front/src/components/statusbubble.svelte b/Front/src/components/statusbubble.svelte
index f2c7ae4..a9cb098 100644
--- a/Front/src/components/statusbubble.svelte
+++ b/Front/src/components/statusbubble.svelte
@@ -3,7 +3,7 @@
 
 	export let size: string
 	export let status = "Offline"
-	export let userid = "0"
+	export const userid = "0"
 	export let gameid = "0"
 	export let offline = false
 	export let customclass = ""
diff --git a/Front/src/routes/catalog/[slug]/configure/+page.svelte b/Front/src/routes/catalog/[slug]/configure/+page.svelte
index 3fe2aa0..39229f7 100644
--- a/Front/src/routes/catalog/[slug]/configure/+page.svelte
+++ b/Front/src/routes/catalog/[slug]/configure/+page.svelte
@@ -29,7 +29,7 @@
 					description,
 					price,
 				}),
-			},
+			}
 		)
 		const saveJson = await save.json()
 		if (!saveJson.error) {
@@ -93,8 +93,7 @@
 				<span>Description</span>
 				<textarea
 					bind:value={description}
-					class="input input-bordered input-primary w-full rounded-md">
-				</textarea>
+					class="input input-bordered input-primary w-full rounded-md" />
 			</label>
 
 			<div
diff --git a/Front/src/routes/games/[slug]/[name]/+page.svelte b/Front/src/routes/games/[slug]/[name]/+page.svelte
index 568d038..2e216ef 100644
--- a/Front/src/routes/games/[slug]/[name]/+page.svelte
+++ b/Front/src/routes/games/[slug]/[name]/+page.svelte
@@ -228,6 +228,9 @@
 							on:mouseover={() => {
 								likefill = "lime"
 							}}
+							on:focus={() => {
+								likefill = "lime"
+							}}
 							on:mouseleave={() => {
 								likefill = "none"
 							}}
@@ -254,6 +257,9 @@
 							on:mouseover={() => {
 								dislikefill = "red"
 							}}
+							on:focus={() => {
+								dislikefill = "red"
+							}}
 							on:mouseleave={() => {
 								dislikefill = "none"
 							}}
diff --git a/Front/src/routes/groups/create/+page.svelte b/Front/src/routes/groups/create/+page.svelte
index 0ea359c..a48b784 100644
--- a/Front/src/routes/groups/create/+page.svelte
+++ b/Front/src/routes/groups/create/+page.svelte
@@ -79,8 +79,7 @@
 				maxlength={500}
 				class="input input-bordered input-primary w-full h-64 rounded-md"
 				placeholder="Description"
-				required>
-			</textarea>
+				required />
 		</label>
 
 		<label>
diff --git a/Front/src/routes/groupss/create/+page.svelte b/Front/src/routes/groupss/create/+page.svelte
index 0ea359c..a48b784 100644
--- a/Front/src/routes/groupss/create/+page.svelte
+++ b/Front/src/routes/groupss/create/+page.svelte
@@ -79,8 +79,7 @@
 				maxlength={500}
 				class="input input-bordered input-primary w-full h-64 rounded-md"
 				placeholder="Description"
-				required>
-			</textarea>
+				required />
 		</label>
 
 		<label>
diff --git a/Front/src/routes/settings/+page.svelte b/Front/src/routes/settings/+page.svelte
index 10755be..8fe8f7f 100644
--- a/Front/src/routes/settings/+page.svelte
+++ b/Front/src/routes/settings/+page.svelte
@@ -205,11 +205,9 @@
 					stroke-linejoin="round"
 					class="feather feather-edit shrink">
 					<path
-						d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7">
-					</path>
+						d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7" />
 					<path
-						d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z">
-					</path>
+						d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z" />
 				</svg>
 			</div>
 
@@ -221,6 +219,7 @@
 
 				<svg
 					on:click={passwordchange}
+					on:keypress={passwordchange}
 					xmlns="http://www.w3.org/2000/svg"
 					width="16"
 					height="16"
@@ -232,11 +231,9 @@
 					stroke-linejoin="round"
 					class="feather feather-edit shrink">
 					<path
-						d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7">
-					</path>
+						d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7" />
 					<path
-						d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z">
-					</path>
+						d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z" />
 				</svg>
 			</div>
 
@@ -272,11 +269,9 @@
 							stroke-linejoin="round"
 							class="feather feather-edit shrink">
 							<path
-								d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7">
-							</path>
+								d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7" />
 							<path
-								d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z">
-							</path>
+								d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z" />
 						</svg>
 					</a>
 				{/if}
@@ -308,8 +303,7 @@
 					maxlength={5000}
 					placeholder={"Custom CSS"}
 					class="input h-64 input-bordered input-primary rounded-md grow"
-					required>
-				</textarea>
+					required />
 
 				<button
 					on:click={csschange}
@@ -342,8 +336,9 @@
 					</h5>
 				</div>
 
-				<SlideToggle active="bg-success-600" bind:checked={_2faenabled}
-				></SlideToggle>
+				<SlideToggle
+					active="bg-success-600"
+					bind:checked={_2faenabled} />
 			</div>
 		</div>
 	{/if}