From d620e109edeac986cbccd5648bb923202b7bc13a Mon Sep 17 00:00:00 2001
From: Saurabh Singh <saurabhsingh72487@gmail.com>
Date: Tue, 26 May 2026 19:38:43 +0530
Subject: [PATCH 1/2] fux(ui): retain previous page in AuthWrapper and redirect
 back

---
 ui/src/components/AuthWrapper.vue |  20 +++---
 ui/src/views/LoginView.vue        | 113 +++++++++++++++++++++---------
 2 files changed, 89 insertions(+), 44 deletions(-)

diff --git a/ui/src/components/AuthWrapper.vue b/ui/src/components/AuthWrapper.vue
index d51feb9..5b9face 100644
--- a/ui/src/components/AuthWrapper.vue
+++ b/ui/src/components/AuthWrapper.vue
@@ -1,13 +1,15 @@
-<!--
-SPDX-FileCopyrightText: 2023 froggie <legal@frogg.ie>
-
-SPDX-License-Identifier: OSL-3.0
--->
-
 <template>
   <slot v-if="store.activeSession" />
+
   <div v-else-if="store.updatedPreviously" v-show="false">
-    {{ router.push('/login') }}
+    {{
+      router.push({
+        path: "/login",
+        query: {
+          redirect: router.currentRoute.value.fullPath
+        }
+      })
+    }}
   </div>
 </template>
 
@@ -21,6 +23,6 @@ export default {
 import { inject } from "vue";
 import { useSessionStore } from "@/assets/lib/sessionstore";
 
-const router = inject('router')
+const router = inject("router");
 const store = useSessionStore();
-</script>
+</script>
\ No newline at end of file
diff --git a/ui/src/views/LoginView.vue b/ui/src/views/LoginView.vue
index f628bcc..4f390ce 100644
--- a/ui/src/views/LoginView.vue
+++ b/ui/src/views/LoginView.vue
@@ -7,36 +7,48 @@ SPDX-License-Identifier: OSL-3.0
 <template>
   <div class="login">
     <div v-if="!store.activeSession" class="no-session">
-      <h1 class="--tr-header-h1">Login to your
+      <h1 class="--tr-header-h1">
+        Login to your
         <subjective-report-link/>
         account ✨
       </h1>
 
       <div class="DefaultView__form">
-        <FormKit type="form" @submit="submitForm" #default="{ state: { errors } }" :actions="false">
+        <FormKit
+          type="form"
+          @submit="submitForm"
+          #default="{ state: { errors } }"
+          :actions="false"
+        >
           <FormKit
-              type="text"
-              name="username"
-              id="username"
-              label="Username"
-              validation="required"
-              placeholder="lyv76"
-              :value="store.lastUsername"
+            type="text"
+            name="username"
+            id="username"
+            label="Username"
+            validation="required"
+            placeholder="lyv76"
+            :value="store.lastUsername"
           />
 
           <FormKit
-              type="password"
-              name="password"
-              id="password"
-              label="Password"
-              validation="required"
-              placeholder="----------"
+            type="password"
+            name="password"
+            id="password"
+            label="Password"
+            validation="required"
+            placeholder="----------"
           />
 
-          <FormKit type="submit" label="Login" data-next="true" :disabled="errors && submitting"/>
+          <FormKit
+            type="submit"
+            label="Login"
+            data-next="true"
+            :disabled="errors && submitting"
+          />
         </FormKit>
       </div>
     </div>
+
     <div v-else>
       <already-logged-in/>
     </div>
@@ -49,45 +61,76 @@ import LayoutDefault from "@/layouts/LayoutDefault.vue";
 export default {
   name: "LoginView",
   created() {
-    this.$emit('update:layout', LayoutDefault);
+    this.$emit("update:layout", LayoutDefault);
   }
 }
 </script>
 
 <script setup>
-import { inject, ref } from 'vue'
-import { handleMessageError, setMessage } from '@/assets/lib/message_util';
-import { useSessionStore } from '@/assets/lib/sessionstore'
+import { inject, ref } from "vue";
+import { useRoute } from "vue-router";
+
+import { handleMessageError, setMessage } from "@/assets/lib/message_util";
+import { useSessionStore } from "@/assets/lib/sessionstore";
+
 import AlreadyLoggedIn from "@/components/AlreadyLoggedIn.vue";
 import SubjectiveReportLink from "@/components/SubjectiveReportLink.vue";
 
-const axios = inject('axios')
+const axios = inject("axios");
+const router = inject("router");
+
+const route = useRoute();
+
 const store = useSessionStore();
 
 const messageSuccess = "Successfully logged in!";
+
 let success = ref(false);
 let submitting = ref(false);
 
 const submitForm = async (fields) => {
   store.lastUsername = fields.username;
+
   submitting.value = true;
 
-  // router is intentionally undefined here, because we don't actually want to redirect but do want a location set for hiding success message
-  await axios.post('/account/login', fields).then(function (response) {
-    success.value = response.status === 200;
-    submitting.value = false;
-    setMessage(response.data.msg, messageSuccess, success.value, undefined, "/login");
-  }).catch(function (error) {
-    success.value = error.response.status === 200;
-    submitting.value = false;
-    setMessage(error.response.data.msg, messageSuccess, success.value, undefined, "/login");
-    handleMessageError(error);
-  })
+  await axios.post("/account/login", fields)
+    .then(function (response) {
+      success.value = response.status === 200;
+      submitting.value = false;
+
+      setMessage(
+        response.data.msg,
+        messageSuccess,
+        success.value,
+        undefined,
+        "/login"
+      );
+    })
+    .catch(function (error) {
+      success.value = error.response.status === 200;
+
+      submitting.value = false;
+
+      setMessage(
+        error.response.data.msg,
+        messageSuccess,
+        success.value,
+        undefined,
+        "/login"
+      );
+
+      handleMessageError(error);
+    });
 
   if (success.value) {
-    store.updateSession(axios); // TODO: Make login UX less confusing
+    await store.updateSession(axios);
+
+    const redirect =
+      route.query.redirect || "/";
+
+    router.push(redirect);
   }
-}
+};
 </script>
 
 <style>
@@ -96,4 +139,4 @@ const submitForm = async (fields) => {
 
 <style scoped>
 @import url(@/assets/css/message_util.css);
-</style>
+</style>
\ No newline at end of file

From dded4103d9a7097cd64b7598fe7a621ca4549fdd Mon Sep 17 00:00:00 2001
From: Saurabh Singh <saurabhsingh72487@gmail.com>
Date: Tue, 26 May 2026 21:19:59 +0530
Subject: [PATCH 2/2] refactor(types): simplify error and message handling

---
 package-lock.json                |   2 +-
 types/errors.go                  |  14 +-
 ui/src/components/AccountBox.vue | 261 ++++++++++++++++---------------
 3 files changed, 146 insertions(+), 131 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c1e8bfd..10fd034 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "effectIndex-tripreporter",
+  "name": "tripreporter",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {}
diff --git a/types/errors.go b/types/errors.go
index 0d781b4..aa1816b 100644
--- a/types/errors.go
+++ b/types/errors.go
@@ -77,12 +77,18 @@ func (e ErrorString) PrefixedError(s string) error {
 }
 
 // PrefixedError will return e with any "String" prefix removed and s prefixed instead. TODO: #107
-func PrefixedError(e error, s string) error {
+func PrefixedError(e error, prefix string) error {
 	if e == nil {
 		return nil
 	}
 
-	return errors.New(s + strings.TrimPrefix(e.Error(), "String"))
+	msg := strings.TrimPrefix(e.Error(), "String")
+
+	if !strings.HasSuffix(prefix, " ") {
+		prefix += " "
+	}
+
+	return errors.New(prefix + strings.ToLower(msg))
 }
 
 func (e ErrorString) ContextError(ctx ...any) error {
@@ -94,8 +100,8 @@ func (e ErrorString) ContextError(ctx ...any) error {
 	// Make the error singular if context is 1.
 	err := strings.TrimSuffix(e.Error(), ".")
 	if strings.HasSuffix(err, "s") && len(ctx) == 1 {
-		strings.TrimSuffix(err, "s")
-	}
+	err = strings.TrimSuffix(err, "s")
+}
 
 	fmtSpace := func(s string) string {
 		if s == " " {
diff --git a/ui/src/components/AccountBox.vue b/ui/src/components/AccountBox.vue
index ce86541..19aaada 100644
--- a/ui/src/components/AccountBox.vue
+++ b/ui/src/components/AccountBox.vue
@@ -16,36 +16,36 @@ SPDX-License-Identifier: OSL-3.0
             <div class="LayoutAccount__info_entry">
               <!-- TODO: Add edit buttons -->
               <header-row-box
-                  class="LayoutAccount__info_entry_box"
-                  style="margin-left: 0;"
-                  header="Account"
-                  icon="user"
-                  :columns="['Profile', 'Username', 'Email']"
-                  :rows="{
-                    'Profile': getStore().accountJson.default_name,
-                    'Username': getStore().accountJson.username,
-                    'Email': getStore().accountJson.email,
-                  }"
-                  :links="{
-                    'Profile': `/profile/${getStore().accountJson.id}`
-                  }"
+                class="LayoutAccount__info_entry_box"
+                style="margin-left: 0"
+                header="Account"
+                icon="user"
+                :columns="['Profile', 'Username', 'Email']"
+                :rows="{
+                  Profile: getStore().accountJson.default_name,
+                  Username: getStore().accountJson.username,
+                  Email: getStore().accountJson.email,
+                }"
+                :links="{
+                  Profile: `/profile/${getStore().accountJson.id}`,
+                }"
               />
 
               <div class="LayoutAccount_buttons">
                 <FormKit
-                    type="button"
-                    class="LayoutAccount__buttons_button"
-                    label="Logout"
-                    @click="logOut"
-                    :disabled="getSession().activeSession === false"
+                  type="button"
+                  class="LayoutAccount__buttons_button"
+                  label="Logout"
+                  @click="logOut"
+                  :disabled="getSession().activeSession === false"
                 />
                 <FormKit
-                    type="button"
-                    style="background-color: var(--tr-error)"
-                    class="LayoutAccount__buttons_button"
-                    label="Delete Account"
-                    @click="showDeleteForm"
-                    :disabled="getSession().activeSession === false"
+                  type="button"
+                  style="background-color: var(--tr-error)"
+                  class="LayoutAccount__buttons_button"
+                  label="Delete Account"
+                  @click="showDeleteForm"
+                  :disabled="getSession().activeSession === false"
                 />
               </div>
             </div>
@@ -54,44 +54,44 @@ SPDX-License-Identifier: OSL-3.0
       </div>
     </div>
     <div v-show="getStore().showDeleteForm">
-
       <div class="DefaultView__form">
         <FormKit type="form" @submit="submitForm" #default="{ state: { valid } }" :actions="false">
           <FormKit
-              type="email"
-              name="email"
-              id="email"
-              label="Email address"
-              help="The email associated with your account."
-              validation="required|email"
-              placeholder="lyv@effectindex.com"
+            type="email"
+            name="email"
+            id="email"
+            label="Email address"
+            help="The email associated with your account."
+            validation="required|email"
+            validation-visibility="live"
+            placeholder="lyv@effectindex.com"
           />
-
           <FormKit
-              type="password"
-              name="password"
-              id="password"
-              label="Password"
-              help="The password associated with your account."
-              validation="required|length:8,32"
-              placeholder="----------"
+            type="password"
+            name="password"
+            id="password"
+            label="Password"
+            help="The password associated with your account."
+            validation="required|length:8,32"
+            validation-visibility="live"
+            placeholder="----------"
           />
 
           <div class="LayoutAccount_buttons">
             <FormKit
-                type="button"
-                class="LayoutAccount__buttons_button"
-                label="Back"
-                @click="hideDeleteForm"
-                :disabled="getSession().activeSession === false"
+              type="button"
+              class="LayoutAccount__buttons_button"
+              label="Back"
+              @click="hideDeleteForm"
+              :disabled="getSession().activeSession === false"
             />
             <FormKit
-                type="submit"
-                style="background-color: var(--tr-error)"
-                class="LayoutAccount__buttons_button"
-                label="Delete Account"
-                data-next="true"
-                :disabled="!valid || getSession().activeSession === false"
+              type="submit"
+              style="background-color: var(--tr-error)"
+              class="LayoutAccount__buttons_button"
+              label="Delete Account"
+              data-next="true"
+              :disabled="!valid || getSession().activeSession === false"
             />
           </div>
         </FormKit>
@@ -113,16 +113,16 @@ export default {
   components: { HeaderRowBox },
   methods: {
     getStore() {
-      return store
+      return store;
     },
     getSession() {
-      return sessionStore
+      return sessionStore;
     },
     isLoaded() {
-      return store.isLoaded()
-    }
-  }
-}
+      return store.isLoaded();
+    },
+  },
+};
 </script>
 
 <script async setup>
@@ -130,8 +130,8 @@ import { inject, ref } from "vue";
 import { handleMessageError, setMessage } from "@/assets/lib/message_util";
 import log from "@/assets/lib/logger";
 
-const router = inject('router')
-const axios = inject('axios')
+const router = inject("router");
+const axios = inject("axios");
 
 const messageSuccess = "Account successfully deleted!<br>You will be redirected to the home page in 3 seconds.";
 const messageLoggedOut = "Logged out successfully!<br>You will be redirected to login in 3 seconds.";
@@ -141,101 +141,110 @@ let submitting = ref(false);
 let ranSetup = false;
 
 const submitForm = async (fields) => {
-  log("submitForm", fields)
+  log("submitForm", fields);
 
   submitting.value = true;
 
-  axios.delete('/account', { data: fields }).then(function (response) {
-    success.value = response.status === 200;
-    submitting.value = false;
-    if (success.value === true) {
-      store.showDeleteForm = false;
-      sessionStore.invalidateSession();
-    }
-    setMessage(response.data.msg, messageSuccess, success.value, router, '/', 3000);
-  }).catch(function (error) {
-    success.value = error.response.status === 200;
-    submitting.value = false;
-    if (success.value === true) {
-      store.showDeleteForm = false;
-      sessionStore.invalidateSession();
-    }
-    setMessage(error.response.data.msg, messageSuccess, success.value, router, '/', 3000);
-    handleMessageError(error);
-  })
-}
+  axios
+    .delete("/account", { data: fields })
+    .then(function (response) {
+      success.value = response.status === 200;
+      submitting.value = false;
+      if (success.value === true) {
+        store.showDeleteForm = false;
+        sessionStore.invalidateSession();
+      }
+      setMessage(response.data.msg, messageSuccess, success.value, router, "/", 3000);
+    })
+    .catch(function (error) {
+      success.value = error.response.status === 200;
+      submitting.value = false;
+      if (success.value === true) {
+        store.showDeleteForm = false;
+        sessionStore.invalidateSession();
+      }
+      setMessage(error.response.data.msg, messageSuccess, success.value, router, "/", 3000);
+      handleMessageError(error);
+    });
+};
 
 const showDeleteForm = (e) => {
-  store.showDeleteForm = true
-}
+  store.showDeleteForm = true;
+};
 
 const hideDeleteForm = (e) => {
-  store.showDeleteForm = false
-}
+  store.showDeleteForm = false;
+};
 
 const logOut = (e) => {
-  submitting.value = true
-
-  axios.delete('/session').then(function (response) {
-    loggedOut.value = response.status === 200;
-    submitting.value = false;
-    if (loggedOut.value === true) {
-      store.showDeleteForm = false;
-      sessionStore.invalidateSession();
-    }
-    setMessage(response.data.msg, messageLoggedOut, loggedOut.value, router, '/login', 3000);
-  }).catch(function (error) {
-    loggedOut.value = error.response.status === 200;
-    submitting.value = false;
-    if (loggedOut.value === true) {
-      store.showDeleteForm = false;
-      sessionStore.invalidateSession();
-    }
-    setMessage(error.response.data.msg, messageLoggedOut, loggedOut.value, router, '/login', 3000);
-    handleMessageError(error);
-  })
-}
+  submitting.value = true;
+
+  axios
+    .delete("/session")
+    .then(function (response) {
+      loggedOut.value = response.status === 200;
+      submitting.value = false;
+      if (loggedOut.value === true) {
+        store.showDeleteForm = false;
+        sessionStore.invalidateSession();
+      }
+      setMessage(response.data.msg, messageLoggedOut, loggedOut.value, router, "/login", 3000);
+    })
+    .catch(function (error) {
+      loggedOut.value = error.response.status === 200;
+      submitting.value = false;
+      if (loggedOut.value === true) {
+        store.showDeleteForm = false;
+        sessionStore.invalidateSession();
+      }
+      setMessage(error.response.data.msg, messageLoggedOut, loggedOut.value, router, "/login", 3000);
+      handleMessageError(error);
+    });
+};
 
 if (ranSetup !== true) {
-  ranSetup = true
-
-  await axios.get('/account').then(function (response) {
-    store.updateData(response.status, response.data)
-    setMessage(response.data.msg, "", store.apiSuccess);
-  }).catch(function (error) {
-    log("error", error)
-    store.updateData(error.response.status, error.response.data)
-    setMessage(error.response.data.msg, "", store.apiSuccess);
-    handleMessageError(error);
-  })
+  ranSetup = true;
+
+  await axios
+    .get("/account")
+    .then(function (response) {
+      store.updateData(response.status, response.data);
+      setMessage(response.data.msg, "", store.apiSuccess);
+    })
+    .catch(function (error) {
+      log("error", error);
+      store.updateData(error.response.status, error.response.data);
+      setMessage(error.response.data.msg, "", store.apiSuccess);
+      handleMessageError(error);
+    });
 }
 </script>
 <style scoped>
 .LayoutAccount__main {
-    text-align: left;
+  text-align: left;
 }
 
 .LayoutAccount__main h1 {
-    text-align: center;
+  text-align: center;
 }
 
 .LayoutAccount__account {
-    max-width: 25em;
-    margin: auto;
+  max-width: 25em;
+  margin: auto;
 }
 
 .LayoutAccount__info_entry_box {
-    margin-bottom: 1em;
+  margin-bottom: 1em;
 }
 
 .LayoutAccount_buttons {
-    display: flex;
-    flex-wrap: wrap;
-    flex-direction: row;
-    justify-content: left;
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: row;
+  justify-content: left;
 }
 
 .LayoutAccount__buttons_button {
-    flex-grow: 1;
+  flex-grow: 1;
 }
-</style>
\ No newline at end of file
+</style>