From 3fe654a220c1a65c0e8ddf91d5d69beb6abdc793 Mon Sep 17 00:00:00 2001
From: Sam <sam@sam.wf>
Date: Sat, 3 Jun 2023 03:17:24 +0200
Subject: [PATCH] fix: svelte didn't work the way i thought it did

---
 frontend/src/routes/@[username]/+page.svelte              | 7 +++----
 frontend/src/routes/@[username]/[memberName]/+page.svelte | 7 +++----
 frontend/src/routes/edit/member/[id]/+page.svelte         | 6 +++---
 frontend/src/routes/edit/profile/+page.svelte             | 6 +++---
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/frontend/src/routes/@[username]/+page.svelte b/frontend/src/routes/@[username]/+page.svelte
index 15169a5..5b04ace 100644
--- a/frontend/src/routes/@[username]/+page.svelte
+++ b/frontend/src/routes/@[username]/+page.svelte
@@ -29,8 +29,7 @@
     type FieldEntry,
     type Pronoun,
   } from "$lib/api/entities";
-  import { PUBLIC_BASE_URL } from "$env/static/public";
-  import { env } from "$env/dynamic/public";
+  import { PUBLIC_BASE_URL, PUBLIC_SHORT_BASE } from "$env/static/public";
   import { apiFetchClient } from "$lib/api/fetch";
   import ErrorAlert from "$lib/components/ErrorAlert.svelte";
   import { goto } from "$app/navigation";
@@ -120,7 +119,7 @@
   };
 
   const copyShortURL = async () => {
-    const url = `${env.PUBLIC_SHORT_BASE}/${data.sid}`;
+    const url = `${PUBLIC_SHORT_BASE}/${data.sid}`;
     await navigator.clipboard.writeText(url);
     addToast({ body: "Copied the short link to your clipboard!", duration: 2000 });
   };
@@ -239,7 +238,7 @@
           <Button color="secondary" outline on:click={copyURL}>
             <Icon name="clipboard" /> Copy link
           </Button>
-          {#if env.PUBLIC_SHORT_BASE}
+          {#if PUBLIC_SHORT_BASE}
             <IconButton
               outline
               icon="link-45deg"
diff --git a/frontend/src/routes/@[username]/[memberName]/+page.svelte b/frontend/src/routes/@[username]/[memberName]/+page.svelte
index c421bc8..ddc5112 100644
--- a/frontend/src/routes/@[username]/[memberName]/+page.svelte
+++ b/frontend/src/routes/@[username]/[memberName]/+page.svelte
@@ -12,8 +12,7 @@
     type FieldEntry,
     type Pronoun,
   } from "$lib/api/entities";
-  import { PUBLIC_BASE_URL } from "$env/static/public";
-  import { env } from "$env/dynamic/public";
+  import { PUBLIC_BASE_URL, PUBLIC_SHORT_BASE } from "$env/static/public";
   import { userStore } from "$lib/store";
   import { renderMarkdown } from "$lib/utils";
   import ReportButton from "../ReportButton.svelte";
@@ -55,7 +54,7 @@
   };
 
   const copyShortURL = async () => {
-    const url = `${env.PUBLIC_SHORT_BASE}/${data.sid}`;
+    const url = `${PUBLIC_SHORT_BASE}/${data.sid}`;
     await navigator.clipboard.writeText(url);
     addToast({ body: "Copied the short link to your clipboard!", duration: 2000 });
   };
@@ -161,7 +160,7 @@
           <Button color="secondary" outline on:click={copyURL}>
             <Icon name="clipboard" /> Copy link
           </Button>
-          {#if env.PUBLIC_SHORT_BASE}
+          {#if PUBLIC_SHORT_BASE}
             <IconButton
               outline
               icon="link-45deg"
diff --git a/frontend/src/routes/edit/member/[id]/+page.svelte b/frontend/src/routes/edit/member/[id]/+page.svelte
index cfabcf6..1ab1819 100644
--- a/frontend/src/routes/edit/member/[id]/+page.svelte
+++ b/frontend/src/routes/edit/member/[id]/+page.svelte
@@ -31,7 +31,7 @@
   import { DateTime } from "luxon";
   import { encode } from "base64-arraybuffer";
   import prettyBytes from "pretty-bytes";
-  import { env } from "$env/dynamic/public";
+  import { PUBLIC_SHORT_BASE } from "$env/static/public";
   import { apiFetchClient, fastFetchClient } from "$lib/api/fetch";
   import IconButton from "$lib/components/IconButton.svelte";
   import EditableField from "../../EditableField.svelte";
@@ -392,7 +392,7 @@
   };
 
   const copyShortURL = async () => {
-    const url = `${env.PUBLIC_SHORT_BASE}/${data.member.sid}`;
+    const url = `${PUBLIC_SHORT_BASE}/${data.member.sid}`;
     await navigator.clipboard.writeText(url);
     addToast({ body: "Copied the short link to your clipboard!", duration: 2000 });
   };
@@ -779,7 +779,7 @@
           </strong>
         </p>
       </div>
-      {#if env.PUBLIC_SHORT_BASE}
+      {#if PUBLIC_SHORT_BASE}
         <div class="col-md">
           <p>
             Current short ID: <code>{data.member.sid}</code>
diff --git a/frontend/src/routes/edit/profile/+page.svelte b/frontend/src/routes/edit/profile/+page.svelte
index 8536898..da01fe3 100644
--- a/frontend/src/routes/edit/profile/+page.svelte
+++ b/frontend/src/routes/edit/profile/+page.svelte
@@ -30,7 +30,7 @@
   import { encode } from "base64-arraybuffer";
   import { DateTime } from "luxon";
   import { apiFetchClient } from "$lib/api/fetch";
-  import { env } from "$env/dynamic/public";
+  import { PUBLIC_SHORT_BASE } from "$env/static/public";
   import IconButton from "$lib/components/IconButton.svelte";
   import EditableField from "../EditableField.svelte";
   import EditableName from "../EditableName.svelte";
@@ -398,7 +398,7 @@
   };
 
   const copyShortURL = async () => {
-    const url = `${env.PUBLIC_SHORT_BASE}/${data.user.sid}`;
+    const url = `${PUBLIC_SHORT_BASE}/${data.user.sid}`;
     await navigator.clipboard.writeText(url);
     addToast({ body: "Copied the short link to your clipboard!", duration: 2000 });
   };
@@ -745,7 +745,7 @@
             will be used.
           </p>
         </FormGroup>
-        {#if env.PUBLIC_SHORT_BASE}
+        {#if PUBLIC_SHORT_BASE}
           <hr />
           <p>
             Current short ID: <code>{data.user.sid}</code>