From 399ce3b0447073a20d8164fbf5e0edad125ceafe Mon Sep 17 00:00:00 2001
From: Harvey Tindall <hrfee@protonmail.ch>
Date: Wed, 28 Aug 2024 15:42:54 +0100
Subject: [PATCH] activity: Just use window.URLBase

instead of figuring out the full URL. URLs are definitely the most
fragmented and annoying thing about this software.
---
 html/admin.html        | 20 +++++++++++---------
 ts/modules/activity.ts | 12 +++++++-----
 2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/html/admin.html b/html/admin.html
index f7e46b5..80cdd70 100644
--- a/html/admin.html
+++ b/html/admin.html
@@ -27,16 +27,18 @@
     <body class="max-w-full overflow-x-hidden section">
         {{ template "login-modal.html" . }}
         <div id="modal-add-user" class="modal">
-            <form class="card relative mx-auto my-[10%] w-11/12 sm:w-4/5 lg:w-1/3" id="form-add-user" href="">
+            <form class="card relative mx-auto my-[10%] w-11/12 sm:w-4/5 lg:w-1/3 flex flex-col gap-2" id="form-add-user" href="">
                 <span class="heading">{{ .strings.newUser }} <span class="modal-close">&times;</span></span>
-                <input type="text" class="field input ~neutral @high mt-4 mb-2" placeholder="{{ .strings.username }}" id="add-user-user">
-                <input type="email" class="field input ~neutral @high mt-4 mb-2" placeholder="{{ .strings.emailAddress }}">
-                <input type="password" class="field input ~neutral @high mb-4" placeholder="{{ .strings.password }}" id="add-user-password">
-                <label class="label supra">{{ .strings.profile }}</label>
-                <div class="select ~neutral @low mb-2 mt-4">
-                    <select id="add-user-profile">
-                    </select>
-                </div>
+                <input type="text" class="field input ~neutral @high" placeholder="{{ .strings.username }}" id="add-user-user">
+                <input type="email" class="field input ~neutral @high" placeholder="{{ .strings.emailAddress }}">
+                <input type="password" class="field input ~neutral @high" placeholder="{{ .strings.password }}" id="add-user-password">
+                <label class="label flex flex-col gap-2">
+                    <span class="supra">{{ .strings.profile }}</span>
+                    <div class="select ~neutral @low">
+                        <select id="add-user-profile">
+                        </select>
+                    </div>
+                </label>
                 <label>
                     <input type="submit" class="unfocused">
                     <span class="button ~urge @low full-width center supra submit">{{ .strings.create }}</span>
diff --git a/ts/modules/activity.ts b/ts/modules/activity.ts
index 48a2cc6..d54972f 100644
--- a/ts/modules/activity.ts
+++ b/ts/modules/activity.ts
@@ -46,14 +46,16 @@ export class Activity implements activity, SearchableItem {
     private _delete: HTMLElement;
     private _ip: HTMLElement;
     private _act: activity;
-    private _urlBase: string = ((): string => {
+    /* private _urlBase: string = ((): string => {
         let link = window.location.href;
         for (let split of ["#", "?", "/activity"]) {
             link = link.split(split)[0];
         }
         if (link.slice(-1) != "/") { link += "/"; }
+        // FIXME: I should probably just be using window.URLBase, but incase thats not right, i'll put this warning here
+        if (link != window.URLBase) console.error(`URL Bases don't match: "${link}" != "${window.URLBase}"`);
         return link;
-    })();
+    })(); */
 
     _genUserText = (): string => {
         return `<span class="font-medium">${this._act.username || this._act.user_id.substring(0, 5)}</span>`;
@@ -64,17 +66,17 @@ export class Activity implements activity, SearchableItem {
     }
 
     _genUserLink = (): string => {
-        return `<a role="link" tabindex="0" class="hover:underline cursor-pointer activity-pseudo-link-user" data-id="${this._act.user_id}" href="${this._urlBase}accounts?user=${this._act.user_id}">${this._genUserText()}</a>`;
+        return `<a role="link" tabindex="0" class="hover:underline cursor-pointer activity-pseudo-link-user" data-id="${this._act.user_id}" href="${window.URLBase}/accounts?user=${this._act.user_id}">${this._genUserText()}</a>`;
     }
         
     _genSrcUserLink = (): string => {
-        return `<a role="link" tabindex="0" class="hover:underline cursor-pointer activity-pseudo-link-user" data-id="${this._act.user_id}" href="${this._urlBase}accounts?user=${this._act.source}">${this._genSrcUserText()}</a>`;
+        return `<a role="link" tabindex="0" class="hover:underline cursor-pointer activity-pseudo-link-user" data-id="${this._act.user_id}" href="${window.URLBase}/accounts?user=${this._act.source}">${this._genSrcUserText()}</a>`;
     }
 
     private _renderInvText = (): string => { return `<span class="font-medium font-mono">${this.value || this.invite_code || "???"}</span>`; }
 
     private _genInvLink = (): string => {
-        return `<a role="link" tabindex="0" class="hover:underline cursor-pointer activity-pseudo-link-invite" data-id="${this.invite_code}" href="${this._urlBase}?invite=${this.invite_code}">${this._renderInvText()}</a>`;
+        return `<a role="link" tabindex="0" class="hover:underline cursor-pointer activity-pseudo-link-invite" data-id="${this.invite_code}" href="${window.URLBase}/?invite=${this.invite_code}">${this._renderInvText()}</a>`;
     }
 
 
