From 5d5eda6babc97637db339b57f90b534ac5f5eaa6 Mon Sep 17 00:00:00 2001
From: Lewin Kelly <heli@odex.cf>
Date: Fri, 15 Sep 2023 17:58:30 +0100
Subject: [PATCH] Replace mete0r.xyz URLs with URL loaded from .env file

---
 Back/.gitignore                                    |  1 +
 Back/docker-compose.yml                            | 14 +++++++++++++-
 Front/src/components/statusbubble.svelte           |  3 ++-
 Front/src/lib/auth.ts                              |  3 ++-
 Front/src/lib/url.ts                               |  3 ++-
 Front/src/routes/catalog/[slug]/+page.ts           |  3 ++-
 Front/src/routes/catalog/[slug]/[name]/+page.ts    |  7 +++++--
 Front/src/routes/catalog/[slug]/configure/+page.ts |  3 ++-
 Front/src/routes/develop/+page.svelte              |  2 +-
 Front/src/routes/friends/+page.ts                  |  3 ++-
 Front/src/routes/games/[slug]/+page.ts             |  3 ++-
 Front/src/routes/games/[slug]/[name]/+page.svelte  | 11 ++++++-----
 Front/src/routes/games/[slug]/[name]/+page.ts      |  3 ++-
 Front/src/routes/games/search/[slug]/+page.svelte  |  5 +++--
 Front/src/routes/users/[slug]/+page.ts             |  9 ++++++---
 15 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/Back/.gitignore b/Back/.gitignore
index 224bc27..a4d03bc 100644
--- a/Back/.gitignore
+++ b/Back/.gitignore
@@ -2,3 +2,4 @@ node_modules/
 assets/release.zip
 assets/hash.txt
 data/
+.env
diff --git a/Back/docker-compose.yml b/Back/docker-compose.yml
index 3f7f37d..b5cf852 100644
--- a/Back/docker-compose.yml
+++ b/Back/docker-compose.yml
@@ -6,9 +6,21 @@ version: "3"
 services:
     redis:
         container_name: meteoredis
-        image: redis
+        image: redis/redis-stack
         ports:
             - 6379:6379
         restart: unless-stopped
         volumes:
             - ./data/redis:/data
+
+    mongo:
+        image: mongo
+        ports:
+            - 27017:27017
+        restart: unless-stopped
+        volumes:
+            - ./data/mongo:/data/db
+        environment:
+            MONGO_INITDB_DATABASE: meteoritedb
+            MONGO_INITDB_ROOT_USERNAME: server
+            MONGO_INITDB_ROOT_PASSWORD: password
diff --git a/Front/src/components/statusbubble.svelte b/Front/src/components/statusbubble.svelte
index a9cb098..5a72ccd 100644
--- a/Front/src/components/statusbubble.svelte
+++ b/Front/src/components/statusbubble.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import { onMount } from "svelte"
+	import { PUBLIC_ORIGIN } from "$env/static/public"
 
 	export let size: string
 	export let status = "Offline"
@@ -21,7 +22,7 @@
 		class="{customclass} absolute bottom-2 right-5 w-{size} h-{size} bg-blue-500 rounded-full">
 	</div>
 {:else if status.includes("Playing") === true}
-	<a class="unstyled" href="http://mete0r.xyz/games/{gameid}">
+	<a class="unstyled" href="http://{PUBLIC_ORIGIN}/games/{gameid}">
 		<div
 			class="{customclass} absolute bottom-2 right-5 w-{size} h-{size} bg-green-500 rounded-full">
 		</div>
diff --git a/Front/src/lib/auth.ts b/Front/src/lib/auth.ts
index fb2bbd9..ba6b7fc 100644
--- a/Front/src/lib/auth.ts
+++ b/Front/src/lib/auth.ts
@@ -1,4 +1,5 @@
 import type { RequestEvent } from "@sveltejs/kit"
+import { PUBLIC_ORIGIN } from "$env/static/public"
 
 export const authenticateUser = async (event: RequestEvent) => {
 	// get the cookies from the request
@@ -13,7 +14,7 @@ export const authenticateUser = async (event: RequestEvent) => {
 	// if the user token is not valid, return null
 	// this is where you would check the user token against your database
 	// to see if it is valid and return the user object
-	const res = await fetch("http://mete0r.xyz/api/auth", {
+	const res = await fetch(`http://${PUBLIC_ORIGIN}/api/auth`, {
 		credentials: "include",
 		headers: { cookie: "jwt=" + userToken, route: route.id as string },
 	})
diff --git a/Front/src/lib/url.ts b/Front/src/lib/url.ts
index a4fbd93..589f1f8 100644
--- a/Front/src/lib/url.ts
+++ b/Front/src/lib/url.ts
@@ -1,3 +1,4 @@
 import { browser } from "$app/environment"
+import { PUBLIC_ORIGIN } from "$env/static/public"
 
-export const url = !browser ? "http://mete0r.xyz" : "" // if no browser return "http://mete0r.xyz" otherwise nothing
+export const url = !browser ? `http://${PUBLIC_ORIGIN}` : "" // if no browser return "http://mete0r.xyz" otherwise nothing
diff --git a/Front/src/routes/catalog/[slug]/+page.ts b/Front/src/routes/catalog/[slug]/+page.ts
index 2f301b6..70ae5eb 100644
--- a/Front/src/routes/catalog/[slug]/+page.ts
+++ b/Front/src/routes/catalog/[slug]/+page.ts
@@ -1,9 +1,10 @@
 import { error, redirect } from "@sveltejs/kit"
 import type { PageLoad } from "./$types"
+import { PUBLIC_ORIGIN } from "$env/static/public"
 
 export const load = (async ({ fetch, params }) => {
 	const res = await fetch(
-		`http://mete0r.xyz/api/catalog/iteminfo/${params.slug}`,
+		`http://${PUBLIC_ORIGIN}/api/catalog/iteminfo/${params.slug}`,
 	)
 	const data = await res.json()
 	if (data.error === false) {
diff --git a/Front/src/routes/catalog/[slug]/[name]/+page.ts b/Front/src/routes/catalog/[slug]/[name]/+page.ts
index eca1307..5c8c3ce 100644
--- a/Front/src/routes/catalog/[slug]/[name]/+page.ts
+++ b/Front/src/routes/catalog/[slug]/[name]/+page.ts
@@ -1,9 +1,10 @@
 import { error, redirect } from "@sveltejs/kit"
 import type { PageLoad } from "./$types"
+import { PUBLIC_ORIGIN } from "$env/static/public"
 
 export const load = (async ({ fetch, params }) => {
 	const res = await fetch(
-		`http://mete0r.xyz/api/catalog/iteminfo/${params.slug}`,
+		`http://${PUBLIC_ORIGIN}/api/catalog/iteminfo/${params.slug}`,
 	)
 	const data = await res.json()
 
@@ -25,7 +26,9 @@ export const load = (async ({ fetch, params }) => {
 
 	if (data.error === false) {
 		const creatorusernameresp = await fetch(
-			`http://mete0r.xyz/api/userinfo/${data.iteminfo.Creator ?? "0"}`,
+			`http://${PUBLIC_ORIGIN}/api/userinfo/${
+				data.iteminfo.Creator ?? "0"
+			}`,
 		)
 		const creatorusername = await creatorusernameresp.json()
 		return {
diff --git a/Front/src/routes/catalog/[slug]/configure/+page.ts b/Front/src/routes/catalog/[slug]/configure/+page.ts
index 06bd960..3e7cc14 100644
--- a/Front/src/routes/catalog/[slug]/configure/+page.ts
+++ b/Front/src/routes/catalog/[slug]/configure/+page.ts
@@ -1,9 +1,10 @@
 import { error, redirect } from "@sveltejs/kit"
 import type { PageLoad } from "./$types"
+import { PUBLIC_ORIGIN } from "$env/static/public"
 
 export const load = (async ({ parent, fetch, params }) => {
 	const res = await fetch(
-		`http://mete0r.xyz/api/catalog/iteminfo/${params.slug}`,
+		`http://${PUBLIC_ORIGIN}/api/catalog/iteminfo/${params.slug}`,
 	)
 	const data = await res.json()
 	let self = (await parent()).user
diff --git a/Front/src/routes/develop/+page.svelte b/Front/src/routes/develop/+page.svelte
index fe137e1..78d0bb1 100644
--- a/Front/src/routes/develop/+page.svelte
+++ b/Front/src/routes/develop/+page.svelte
@@ -159,5 +159,5 @@
 		<Accessories jwt={data.jwt} type={storeTab} />
 	{/if}
 
-	{#if storeTab === "userads"}{/if}
+	<!-- {#if storeTab === "userads"}{/if} -->
 </div>
diff --git a/Front/src/routes/friends/+page.ts b/Front/src/routes/friends/+page.ts
index 179d279..425c6c7 100644
--- a/Front/src/routes/friends/+page.ts
+++ b/Front/src/routes/friends/+page.ts
@@ -1,11 +1,12 @@
 import { error } from "@sveltejs/kit"
 import type { PageLoad } from "./$types"
+import { PUBLIC_ORIGIN } from "$env/static/public"
 
 export const load = (async ({ fetch, parent }) => {
 	let data = await parent()
 
 	const response = await fetch(
-		"http://mete0r.xyz/api/friends/friend-requests",
+		`http://${PUBLIC_ORIGIN}/api/friends/friend-requests`,
 		{
 			method: "POST",
 			headers: {
diff --git a/Front/src/routes/games/[slug]/+page.ts b/Front/src/routes/games/[slug]/+page.ts
index 77a55c9..52e6ade 100644
--- a/Front/src/routes/games/[slug]/+page.ts
+++ b/Front/src/routes/games/[slug]/+page.ts
@@ -1,8 +1,9 @@
 import { error, redirect } from "@sveltejs/kit"
 import type { PageLoad } from "./$types"
+import { PUBLIC_ORIGIN } from "$env/static/public"
 
 export const load = (async ({ fetch, params }) => {
-	const res = await fetch(`http://mete0r.xyz/games/gameinfo/${params.slug}`)
+	const res = await fetch(`http://${PUBLIC_ORIGIN}/games/gameinfo/${params.slug}`)
 	const data = await res.json()
 	if (data.error === false) {
 		throw redirect(
diff --git a/Front/src/routes/games/[slug]/[name]/+page.svelte b/Front/src/routes/games/[slug]/[name]/+page.svelte
index 2e216ef..766bf03 100644
--- a/Front/src/routes/games/[slug]/[name]/+page.svelte
+++ b/Front/src/routes/games/[slug]/[name]/+page.svelte
@@ -13,6 +13,7 @@
 	import Advertisemodal from "../../../../components/assets/advertisemodal.svelte"
 	import Itemcard from "../../../../components/itemcard.svelte"
 	import { MoreHorizontalIcon } from "lucide-svelte"
+	import { PUBLIC_ORIGIN } from "$env/static/public"
 	let storeTab = "About"
 
 	export let data: PageData
@@ -62,7 +63,7 @@
 	}
 
 	async function shutdown() {
-		const shutdownresp = await fetch("http://mete0r.xyz/games/shutdown", {
+		const shutdownresp = await fetch(`http://${PUBLIC_ORIGIN}/games/shutdown`, {
 			method: "POST",
 			headers: {
 				"Content-Type": "application/json",
@@ -78,7 +79,7 @@
 
 	async function evictplayer(userid: Number) {
 		const evictplayerresp = await fetch(
-			"http://mete0r.xyz/games/evictplayer",
+			`http://${PUBLIC_ORIGIN}/games/evictplayer`,
 			{
 				method: "POST",
 				headers: {
@@ -127,12 +128,12 @@
 		content="{data.game
 			.nameofgame} - Join others who are recreating the game world."
 		property="og:description" />
-	<meta content="https://mete0r.xyz" property="og:url" />
+	<meta content="https://{PUBLIC_ORIGIN}" property="og:url" />
 	<meta content="#6f00ff" data-react-helmet="true" name="theme-color" />
 
 	<meta
 		name="twitter:image:src"
-		content="https://mete0r.xyz/assets/gameassets/thumbnail-{data.game
+		content="https://{PUBLIC_ORIGIN}/assets/gameassets/thumbnail-{data.game
 			.idofgame}.png" />
 	<meta name="twitter:site" content="@Meteorite" />
 	<meta name="twitter:card" content="summary_large_image" />
@@ -150,7 +151,7 @@
 		<img
 			class="h-[360px] w-[640px] aspect-video m-auto"
 			alt={data.game.nameofgame}
-			src="http://mete0r.xyz/assets/gameassets/thumbnail-{data.game
+			src="http://{PUBLIC_ORIGIN}/assets/gameassets/thumbnail-{data.game
 				.idofgame}.png#"
 			style="height:360px;width:640px" />
 		<div class="grow">
diff --git a/Front/src/routes/games/[slug]/[name]/+page.ts b/Front/src/routes/games/[slug]/[name]/+page.ts
index 189da4c..2abfd14 100644
--- a/Front/src/routes/games/[slug]/[name]/+page.ts
+++ b/Front/src/routes/games/[slug]/[name]/+page.ts
@@ -1,8 +1,9 @@
 import { error, redirect } from "@sveltejs/kit"
 import type { PageLoad } from "./$types"
+import { PUBLIC_ORIGIN } from "$env/static/public"
 
 export const load = (async ({ fetch, params }) => {
-	const res = await fetch(`http://mete0r.xyz/games/gameinfo/${params.slug}`)
+	const res = await fetch(`http://${PUBLIC_ORIGIN}/games/gameinfo/${params.slug}`)
 	const data = await res.json()
 
 	if (
diff --git a/Front/src/routes/games/search/[slug]/+page.svelte b/Front/src/routes/games/search/[slug]/+page.svelte
index eef7391..3435cc7 100644
--- a/Front/src/routes/games/search/[slug]/+page.svelte
+++ b/Front/src/routes/games/search/[slug]/+page.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import Gamecard from "../../../../components/gamecard.svelte"
+	import { PUBLIC_ORIGIN } from "$env/static/public"
 	let gamearray: any[] = []
 	let currentcursor = 1
 	import type { PageData } from "./$types"
@@ -16,7 +17,7 @@
 	$: data, fetchfirst()
 
 	async function fetchfirst() {
-		const response = await fetch("http://mete0r.xyz/games/search", {
+		const response = await fetch(`http://${PUBLIC_ORIGIN}/games/search`, {
 			method: "POST",
 			body: JSON.stringify({ cursor: 0, searchquery: search }),
 			headers: { "content-type": "application/json" },
@@ -37,7 +38,7 @@
 	}
 
 	async function addToArray() {
-		const response = await fetch("http://mete0r.xyz/games/search", {
+		const response = await fetch(`http://${PUBLIC_ORIGIN}/games/search`, {
 			method: "POST",
 			body: JSON.stringify({
 				cursor: currentcursor,
diff --git a/Front/src/routes/users/[slug]/+page.ts b/Front/src/routes/users/[slug]/+page.ts
index d53720b..ac073ca 100644
--- a/Front/src/routes/users/[slug]/+page.ts
+++ b/Front/src/routes/users/[slug]/+page.ts
@@ -1,22 +1,25 @@
 import { error } from "@sveltejs/kit"
 import type { PageLoad } from "./$types"
 import { url } from "$lib/url"
+	import { PUBLIC_ORIGIN } from "$env/static/public"
 
 export const load = (async ({ fetch, params, parent }) => {
 	let data = await parent()
 	let alreadyFriends = false
 	let otherUserWantsToBeFriends = false
 	let wearingItems: Array<any> = []
-	const res = await fetch(`http://mete0r.xyz/api/userinfo/${params.slug}`)
+	const res = await fetch(
+		`http://${PUBLIC_ORIGIN}/api/userinfo/${params.slug}`,
+	)
 	const datauser = await res.json()
 
 	const resvisits = await fetch(
-		`http://mete0r.xyz/api/userinfo/${params.slug}/visits`,
+		`http://${PUBLIC_ORIGIN}/api/userinfo/${params.slug}/visits`,
 	)
 	const datavisits = await resvisits.json()
 
 	const result = await fetch(
-		"http://mete0r.xyz/api/friends/has-sent-request",
+		`http://${PUBLIC_ORIGIN}/api/friends/has-sent-request`,
 		{
 			method: "POST",
 			headers: {