From 64be911517b48b3363003ba90d08da4805f37647 Mon Sep 17 00:00:00 2001
From: Patrick Hatsune <hatsunepatrick@gmail.com>
Date: Wed, 2 Oct 2024 00:30:03 -0700
Subject: [PATCH] Added QoS, Added file RouterConfig.vue, optimized stuff

---
 src/components/dashboard/DeviceList.vue    |  5 +++-
 src/components/dashboard/Template.vue      | 10 +++++--
 src/data/QoS.ts                            | 25 +++++++++++++++++
 src/pages/BasicDashboard.vue               |  3 +-
 src/pages/basicDashboard/DeviceList.vue    | 13 +--------
 src/pages/basicDashboard/InternetSetup.vue | 21 +-------------
 src/pages/basicDashboard/Overview.vue      |  2 +-
 src/pages/basicDashboard/QoS.vue           | 16 +++++++++--
 src/pages/basicDashboard/RouterConfig.vue  |  7 +++++
 src/pages/basicDashboard/Wireless.vue      | 20 +-------------
 src/routes/router.ts                       | 32 +++++++++++++---------
 src/styles/basicDashboard.css              | 22 ++++++++++++++-
 12 files changed, 102 insertions(+), 74 deletions(-)
 create mode 100644 src/data/QoS.ts
 create mode 100644 src/pages/basicDashboard/RouterConfig.vue

diff --git a/src/components/dashboard/DeviceList.vue b/src/components/dashboard/DeviceList.vue
index 1375e2b..4dfbe3f 100755
--- a/src/components/dashboard/DeviceList.vue
+++ b/src/components/dashboard/DeviceList.vue
@@ -32,7 +32,10 @@
         <p>MAC Address</p>
       </div>
       <div class="seperator"></div>
-      <form v-if="section.devices" v-for="device in section.devices">
+      <form 
+        v-if="section.devices" 
+        v-for="device in section.devices"
+      >
         <div id="device">
           <p>{{ device.name }}</p>
           <p>{{ device.ip }}</p>
diff --git a/src/components/dashboard/Template.vue b/src/components/dashboard/Template.vue
index bae94cb..df1fc38 100644
--- a/src/components/dashboard/Template.vue
+++ b/src/components/dashboard/Template.vue
@@ -15,6 +15,7 @@
       option: string,
       label?: string,
       dropdown?: string[],
+      buttons?: string[],
       subOptions?: {
         name?: string,
         class: string,
@@ -48,12 +49,15 @@
             :key="form.name"
           >
           <template v-else/>
-          <select 
-            v-if="form.dropdown"
-          >
+          <select v-if="form.dropdown">
             <option v-for="option in form.dropdown">{{ option }}</option>
           </select>
           <template v-else/>
+          <button 
+            v-if="form.buttons" 
+            v-for="button in form.buttons"
+          >{{ button }}</button>
+          <template v-else/>
           <label
             :class="subform.class"
             v-if="form.subOptions" 
diff --git a/src/data/QoS.ts b/src/data/QoS.ts
new file mode 100644
index 0000000..6f46247
--- /dev/null
+++ b/src/data/QoS.ts
@@ -0,0 +1,25 @@
+const qos = [{
+  id: "qosGeneral",
+  forms: [
+    {
+      name: "qosEnable",
+      class: "selectOption",
+      option: "checkbox",
+      label: "Enable QoS",
+    },
+    {
+      name: "optimizeDatabase",
+      class: "selectOption",
+      option: "checkbox",
+      label: "Automically update performance optizimiation database"
+    },
+    {
+      name: "optimizeDatabase",
+      class: "buttonOption",
+      option: "hidden",
+      buttons: ["Update Now"]
+    }
+  ]
+}]
+
+export default qos;
\ No newline at end of file
diff --git a/src/pages/BasicDashboard.vue b/src/pages/BasicDashboard.vue
index 72405ec..40072b5 100644
--- a/src/pages/BasicDashboard.vue
+++ b/src/pages/BasicDashboard.vue
@@ -14,7 +14,8 @@
     { name: "Device List", link: "/basic/devices" },
     { name: "QoS", link: "/basic/qos" },
     { name: "File Sharing", link: "/basic/fileshare" },
-    { name: "Guest Network", link: "/basic/guestnetwork" }
+    { name: "Guest Network", link: "/basic/guestnetwork" },
+    { name: "Router Configuration", link: "/basic/routerconfig" },
   ];
 
 </script>
diff --git a/src/pages/basicDashboard/DeviceList.vue b/src/pages/basicDashboard/DeviceList.vue
index dd414fd..96320a9 100644
--- a/src/pages/basicDashboard/DeviceList.vue
+++ b/src/pages/basicDashboard/DeviceList.vue
@@ -5,18 +5,7 @@
   const pageTitle="Device List"
   const pageID="deviceList"
 
-  interface Sections {
-    title: string,
-    id: string,
-    devices?: {
-      connection: string,
-      name?: string,
-      ip: string,
-      mac: string,
-    }[]
-  }
-
-  const sections = shallowRef<Sections[]>([]);
+  const sections = shallowRef([] as typeof deviceListData);
 
   sections.value = deviceListData;
 </script>
diff --git a/src/pages/basicDashboard/InternetSetup.vue b/src/pages/basicDashboard/InternetSetup.vue
index c2c900a..f79acf6 100644
--- a/src/pages/basicDashboard/InternetSetup.vue
+++ b/src/pages/basicDashboard/InternetSetup.vue
@@ -5,26 +5,7 @@
   const pageTitle="Internet Setup"
   const pageID="internetSetupComponent"
 
-  interface Sections {
-    title?: string,
-    id: string,
-    selectedRadio?: number,
-    forms?: {
-      name?: string,
-      class: string,
-      option: string,
-      label?: string,
-      dropdown?: string[],
-      subOptions?: {
-        name?: string,
-        class: string,
-        option: string,
-        label?: string,
-      }[]
-    }[]
-  }
-
-  const sections = shallowRef<Sections[]>([]);
+  const sections = shallowRef([] as typeof internetSetup);
 
   sections.value = internetSetup;
 </script>
diff --git a/src/pages/basicDashboard/Overview.vue b/src/pages/basicDashboard/Overview.vue
index 91ddf45..90839c2 100644
--- a/src/pages/basicDashboard/Overview.vue
+++ b/src/pages/basicDashboard/Overview.vue
@@ -35,7 +35,7 @@
 
   const fetchOverviewItems = async () => {
     try {
-      const response = await axios.get('http://localhost:8080/overviewItems');
+      const response = await axios.get('http://192.168.122.1:8080/overviewItems');
 
       overviewItems.value = [
       {
diff --git a/src/pages/basicDashboard/QoS.vue b/src/pages/basicDashboard/QoS.vue
index 1b28292..7a8af61 100644
--- a/src/pages/basicDashboard/QoS.vue
+++ b/src/pages/basicDashboard/QoS.vue
@@ -1,7 +1,17 @@
+<script lang="ts" setup>
+  import { shallowRef } from 'vue'
+  import BasicDashboard from '@/components/dashboard/Template.vue';
+  import qos from '@/data/QoS.ts';
+  const pageTitle="QoS Settings"
+  const pageID="qosComponent"
+
+  const sections = shallowRef([] as typeof qos);
+
+  sections.value = qos;
+</script>
+
 <template>
-  <div>
-    <h2 class="title">QoS</h2>
-  </div>
+  <BasicDashboard :pageTitle="pageTitle" :pageID="pageID" :sections="sections"/>
 </template>
 
 <style src="@/styles/basicDashboard.css" scoped></style>
\ No newline at end of file
diff --git a/src/pages/basicDashboard/RouterConfig.vue b/src/pages/basicDashboard/RouterConfig.vue
new file mode 100644
index 0000000..e1ca802
--- /dev/null
+++ b/src/pages/basicDashboard/RouterConfig.vue
@@ -0,0 +1,7 @@
+<template>
+  <div>
+    <h2 class="title">Router Configuration</h2>
+  </div>
+</template>
+
+<style src="@/styles/basicDashboard.css" scoped></style>
\ No newline at end of file
diff --git a/src/pages/basicDashboard/Wireless.vue b/src/pages/basicDashboard/Wireless.vue
index ff3ba5c..b58ff77 100644
--- a/src/pages/basicDashboard/Wireless.vue
+++ b/src/pages/basicDashboard/Wireless.vue
@@ -5,26 +5,8 @@
   const pageTitle="Wireless Settings"
   const pageID="wirelessSettingsComponent"
 
-  interface Sections {
-    title?: string,
-    id: string,
-    selectedRadio?: number,
-    forms?: {
-      name?: string,
-      class: string,
-      option: string,
-      label?: string,
-      dropdown?: string[],
-      subOptions?: {
-        name?: string,
-        class: string,
-        option: string,
-        label?: string,
-      }[]
-    }[]
-  }
+  const sections = shallowRef([] as typeof wirelessSettings);
 
-  const sections = shallowRef<Sections[]>([]);
 
   sections.value = wirelessSettings;
 </script>
diff --git a/src/routes/router.ts b/src/routes/router.ts
index 5e1839a..d800463 100644
--- a/src/routes/router.ts
+++ b/src/routes/router.ts
@@ -1,16 +1,17 @@
 import { createRouter, createWebHistory } from "vue-router";
-import AdvanceDashboard from '../pages/AdvancedDashboard.vue';
-import BasicDashboard from "../pages/BasicDashboard.vue";
-import LoginPage from "../pages/LoginPage.vue";
-import RegisterPage from "../pages/RegisterPage.vue";
+import AdvanceDashboard from '@/pages/AdvancedDashboard.vue';
+import BasicDashboard from "@/pages/BasicDashboard.vue";
+import LoginPage from "@/pages/LoginPage.vue";
+import RegisterPage from "@/pages/RegisterPage.vue";
 
-import BasicOverview from "../pages/basicDashboard/Overview.vue"
-import BasicInternetSetup from "../pages/basicDashboard/InternetSetup.vue"
-import BasicWireless from "../pages/basicDashboard/Wireless.vue"
-import BasicDevicesList from "../pages/basicDashboard/DeviceList.vue"
-import BasicQoS from "../pages/basicDashboard/QoS.vue"
-import BasicFileShare from "../pages/basicDashboard/FileShare.vue"
-import BasicGuestNetwork from "../pages/basicDashboard/GuestNetwork.vue"
+import BasicOverview from "@/pages/basicDashboard/Overview.vue"
+import BasicInternetSetup from "@/pages/basicDashboard/InternetSetup.vue"
+import BasicWireless from "@/pages/basicDashboard/Wireless.vue"
+import BasicDevicesList from "@/pages/basicDashboard/DeviceList.vue"
+import BasicQoS from "@/pages/basicDashboard/QoS.vue"
+import BasicFileShare from "@/pages/basicDashboard/FileShare.vue"
+import BasicGuestNetwork from "@/pages/basicDashboard/GuestNetwork.vue"
+import RouterConfig from "@/pages/basicDashboard/RouterConfig.vue";
 
 const routes = [
   {
@@ -48,10 +49,15 @@ const routes = [
       {
         path: 'fileshare',
         component: BasicFileShare,
-      }, {
+      }, 
+      {
         path: 'guestnetwork',
         component: BasicGuestNetwork,
-      }
+      },
+      {
+        path: 'routerconfig',
+        component: RouterConfig,
+      },
     ]
   },
   {
diff --git a/src/styles/basicDashboard.css b/src/styles/basicDashboard.css
index bfa30bc..51f6d80 100644
--- a/src/styles/basicDashboard.css
+++ b/src/styles/basicDashboard.css
@@ -109,7 +109,7 @@
   }
 }
 
-#internetSetupComponent, #wirelessSettingsComponent {
+#internetSetupComponent, #wirelessSettingsComponent, #qosComponent {
   display: flex;
   flex-direction: column;
   gap: 20px;
@@ -129,6 +129,23 @@
     flex-direction: column;
     gap: 10px;
   }
+  label {
+    background-color: transparent;
+  }
+  button {
+    color: inherit;
+    background-color: var(--dark-bg-alt-2-color);
+    border: none;
+    height: 50px;
+    min-width: 110px;
+    border-radius: 5px;
+    transition: 0.3s background-color;
+    cursor: pointer;
+    font-size: 1rem;
+  }
+  button:hover {
+    background-color: var(--dark-highlight-color);
+  }
 
   .seperator {
     margin-top: 20px;
@@ -179,6 +196,9 @@
       color: #fff;
     }
   }
+  .buttonOption {
+    width: fit-content
+  }
   .subSelect {
     display: flex;
     flex-direction: column-reverse;