init admin page

client/package.json

@@ -15,6 +15,7 @@
     "axios": "^1.7.2",
     "core-js": "^3.33.2",
     "file-saver": "^2.0.5",
+    "javascript-time-ago": "^2.5.11",
     "jszip": "^3.10.1",
     "mosha-vue-toastify": "^1.0.23",
     "pinia": "^2.3.1",

client/src/components/TopupPayment.vue

@@ -14,7 +14,7 @@
           </div>
 
           <v-sheet class="d-flex flex-column pa-5 align-center" color="primary">
-            <p class="font-weight-bold">${{ balance }}</p>
+            <p class="font-weight-bold">${{ getTotalBalance }}</p>
             <span class="text-disabled text-capitalize mt-1"
               >current balance</span
             >
@@ -111,7 +111,7 @@
   </v-row>
 </template>
 <script setup>
-import { ref, watch } from "vue";
+import { ref } from "vue";
 import BaseInput from "./Form/BaseInput.vue";
 import BaseButton from "./Form/BaseButton.vue";
 import userService from "@/services/userService";
@@ -130,8 +130,7 @@ const loading = ref(false);
 const verifyVoucher = ref(false);
 const toast = ref(null);
 const store = useUserStore();
-const { user } = storeToRefs(store);
-const balance = ref(user.value.balance + user.value.voucher_balance);
+const { user, getTotalBalance } = storeToRefs(store);
 const defaultCard = ref(user.value.stripe_default_payment_id);
 const voucher = ref();
 const amount = ref(null);
@@ -187,14 +186,4 @@ async function chargeBalance() {
       await store.getUserInfo();
     });
 }
-
-watch(
-  user,
-  (newVal) => {
-    if (newVal) {
-      balance.value = newVal.balance;
-    }
-  },
-  { immediate: true }
-);
 </script>

client/src/layouts/default/AppBar.vue

@@ -43,7 +43,7 @@
           </v-btn>
         </v-toolbar-items>
         <v-btn class="text-capitalize" flat>
-          Balance: ${{ user?.balance }}
+          Balance: ${{ getTotalBalance }}
         </v-btn>
         <v-menu id="notifications" location="bottom">
           <template v-slot:activator="{ props }">
@@ -133,7 +133,7 @@ const drawer = ref(false);
 const isActive = ref(0);
 const toast = ref(null);
 const store = useUserStore();
-const { user, isLoading, notifications } = storeToRefs(store);
+const { user, isLoading, notifications, getTotalBalance } = storeToRefs(store);
 
 const navItems = ref([
   { title: "Home", path: "/" },

client/src/router/index.js

@@ -5,14 +5,16 @@ import Account from "@/views/Account.vue";
 import VM from "@/views/VM.vue";
 import Admin from "@/views/Admin.vue";
 import NewPassword from "@/views/Newpassword.vue";
-import ProfileTab from "@/views/tabs/Profile.vue";
-import PaymentsTab from "@/views/tabs/Payments.vue";
-import Invoices from "@/views/tabs/Invoices.vue";
-import ChangePassword from "@/views/tabs/ChangePassword.vue";
-import AuditLogs from "@/views/tabs/AuditLogs.vue";
-import DeleteAccount from "@/views/tabs/DeleteAccount.vue";
+import ProfileTab from "@/views/accManagemenTabs/Profile.vue";
+import PaymentsTab from "@/views/accManagemenTabs/Payments.vue";
+import Invoices from "@/views/accManagemenTabs/Invoices.vue";
+import ChangePassword from "@/views/accManagemenTabs/ChangePassword.vue";
+import AuditLogs from "@/views/accManagemenTabs/AuditLogs.vue";
+import DeleteAccount from "@/views/accManagemenTabs/DeleteAccount.vue";
 import Deploy from "@/views/Deploy.vue";
 import Home from "@/views/HomeWrapper.vue";
+import Requests from "@/views/adminTabs/Requests.vue";
+import History from "@/views/adminTabs/History.vue";
 
 const routes = [
   {
@@ -145,10 +147,28 @@ const routes = [
     path: "/admin",
     name: "Admin",
     component: Admin,
+    beforeEnter(to, from, next) {
+      const store = useUserStore();
+
+      if (!store.isAdmin) {
+        next("/");
+      }
+      next();
+    },
     meta: {
       layout: "Default",
       requiresAuth: true,
     },
+    children: [
+      {
+        path: "",
+        component: Requests,
+      },
+      {
+        path: "history",
+        component: History,
+      },
+    ],
   },
   {
     path: "/logout",
@@ -171,13 +191,13 @@ const router = createRouter({
 });
 
 router.beforeEach(async (to, from, next) => {
-  const isAuthenticated = localStorage.getItem("token") !== null;
   const store = useUserStore();
+  const { isAuthenticated, user } = store;
 
   if (to.meta.requiresAuth && !isAuthenticated) {
     next("/");
   } else {
-    if (!store.user && isAuthenticated) await store.getUserInfo();
+    if (!user && isAuthenticated) await store.getUserInfo();
     next();
   }
 });

client/src/services/userService.js

@@ -255,7 +255,7 @@ export default {
 
   // Deployments
   async getDeploymentsCount() {
-    return await authClient().get("/deployment/count");
+    return await authClient().get("/deployments/count");
   },
 
   // Vouchers
@@ -271,8 +271,8 @@ export default {
     return await authClient().put("/voucher");
   },
 
-  async generateVoucher(length, vms, public_ips) {
-    return await authClient().post("/voucher", { length, vms, public_ips });
+  async generateVoucher(balance, length) {
+    return await authClient().post("/voucher", { balance, length });
   },
 
   async getAuditEvents() {
@@ -323,8 +323,6 @@ export default {
 
   // setting next launch value
   async setNextLaunch(value) {
-    return await authClient().put("/nextlaunch", {
-      launched: value,
-    });
+    return await authClient().put("/nextlaunch", { launched: value });
   },
 };

client/src/store/UserStore.js

@@ -9,8 +9,7 @@ export const useUserStore = defineStore("userStore", {
     isLoaded: false,
     notifications: [],
     maintenance: false,
-    next_launch: false,
-    next_launch_admin: false,
+    next_launch_admin: true,
     isAuthenticated: localStorage.getItem("token"),
   }),
   actions: {
@@ -33,7 +32,7 @@ export const useUserStore = defineStore("userStore", {
       } catch (error) {
         if (error.response.status == 401) {
           localStorage.removeItem("token");
-          router.push("/login");
+          router.push("/");
           return error;
         }
         return error;
@@ -60,13 +59,21 @@ export const useUserStore = defineStore("userStore", {
       try {
         const response = await userService.nextLaunch();
         const { launched } = response.data.data;
-        this.next_launch = launched;
         this.next_launch_admin = launched;
       } catch (error) {
         return error;
       }
     },
 
+    async setNextLaunch(value) {
+      try {
+        const response = await userService.setNextLaunch(value);
+        return response;
+      } catch (error) {
+        return error;
+      }
+    },
+
     async checkMaintenance() {
       try {
         const response = await userService.maintenance();
@@ -79,5 +86,8 @@ export const useUserStore = defineStore("userStore", {
   },
   getters: {
     isUserLoaded: (state) => state.isLoaded,
+    isNextLaunchEnabled: (state) => state.next_launch_admin,
+    getTotalBalance: (state) => state.user? state.user.balance + state.user.voucher_balance : 0,
+    isAdmin: (state) => state.user.admin,
   },
 });