update closing alerts

Sun-Mountain · Jun 14, 2023 · 722a26d · 722a26d
1 parent cff807c
commit 722a26d
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 21 deletions.
diff --git a/frontend/src/components/auth/LoginForm.vue b/frontend/src/components/auth/LoginForm.vue
@@ -1,8 +1,5 @@
 <template>
   <v-container>
-    <v-container>
-      <Alert />
-    </v-container>
     <v-card
       class="form-container"
       title="Login"
@@ -40,7 +37,6 @@
 import { Form, Field } from 'vee-validate';
 import * as Yup from 'yup';
 
-import { Alert } from '@/components';
 import { useAuthStore } from '@/store';
 import { getSubmitFn } from '@/helpers';
 import { Login } from "@/models/user.model";

diff --git a/frontend/src/components/auth/UserForm.vue b/frontend/src/components/auth/UserForm.vue
@@ -1,8 +1,5 @@
 <template>
   <v-container>
-    <v-container>
-      <Alert />
-    </v-container>
     <v-card
       class="form-container"
       :title="formTitle"
@@ -94,7 +91,6 @@ import { PropType, toRefs } from 'vue';
 import { Form, Field } from 'vee-validate';
 import * as Yup from 'yup';
 
-import { Alert } from '@/components';
 import { getSubmitFn } from '@/helpers';
 import { User } from "@/models/user.model";
 import { useAuthStore, useUsersStore } from "@/store"

diff --git a/frontend/src/components/shared/AlertItem.vue b/frontend/src/components/shared/AlertItem.vue
@@ -1,4 +1,4 @@
-<template>
+<template v-slot:close="{toggle}">
   <v-alert
     v-if="alert"
     border="start"
@@ -9,7 +9,15 @@
     :text="alert?.message"
     :type="alert?.type"
     :icon="alert?.icon"
-  />
+  >
+    <!--  Close slot for custom close behavior -->
+    <template v-slot:close="{toggle}">
+      <v-btn @click="closeAlert(toggle)">
+        <v-icon size="22px" icon="mdi:mdiClose" />
+      </v-btn>
+    </template>
+    <!--    -->
+  </v-alert>
 </template>
 
 <script lang="ts" setup>
@@ -18,4 +26,8 @@ import { useAlertStore } from "@/store";
 
 const alertStore = useAlertStore();
 const { alert } = storeToRefs(alertStore);
+
+const closeAlert = (toggle) => {
+  alertStore.clear();
+}
 </script>
diff --git a/frontend/src/layouts/Event.vue b/frontend/src/layouts/Event.vue
@@ -1,15 +1,20 @@
 <template>
-  <v-container class="layout-with-subnav main-content-container">
-    <EventSubNav />
-    <div class="sub-content-container">
-      <EventHeader />
-      <v-container>
-        <router-view />
-      </v-container>
+  <v-container>
+    <v-container>
+      <Alert />
+    </v-container>
+    <div class="layout-with-subnav main-content-container">
+      <EventSubNav />
+      <div class="sub-content-container">
+        <EventHeader />
+        <v-container>
+          <router-view />
+        </v-container>
+      </div>
     </div>
   </v-container>
 </template>
 
 <script lang="ts" setup>
-import { EventHeader, EventSubNav } from '@/components';
+import { Alert, EventHeader, EventSubNav } from '@/components';
 </script>
diff --git a/frontend/src/layouts/View.vue b/frontend/src/layouts/View.vue
@@ -1,9 +1,12 @@
 <template>
   <v-container>
+    <v-container>
+      <Alert />
+    </v-container>
     <router-view />
   </v-container>
 </template>
 
 <script lang="ts" setup>
-  //
+import { Alert } from '@/components';
 </script>
diff --git a/frontend/src/store/users.store.ts b/frontend/src/store/users.store.ts
@@ -27,6 +27,7 @@ export const useUsersStore = defineStore({
       }
     },
     async updateAccount(user: User, userId: number) {
+      const alertStore = useAlertStore();
       const authStore = useAuthStore();
       const updates = { user };
       const currentUser = authStore.currentUser;
@@ -35,13 +36,15 @@ export const useUsersStore = defineStore({
         if (currentUser.id === userId) {
           const response = await fetchWrapper.put(`${BASE_URL}signup`, updates);
           authStore.updateCurrentUser(response.data);
+          alertStore.success("Your account was successfully updated.")
           router.push("/account");
         }
       } catch (err) {
-        console.log(err);
+        alertStore.error(err);
       }
     },
     async deleteAccount(value: string) {
+      const alertStore = useAlertStore();
       const authStore = useAuthStore();
       const currentUser = authStore.currentUser;
 
@@ -53,8 +56,9 @@ export const useUsersStore = defineStore({
         });
         authStore.logout();
         router.push("/login")
+        alertStore.success("Your account was successfully deleted.")
       } catch (err) {
-        console.log(err);
+        alertStore.error(err);
       }
     }
   }