Bug fixes

.gitignore

@@ -21,6 +21,8 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
+*.mk
+
 
 # Yarn
 .yarn/*

package.json

@@ -3,15 +3,18 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "start": "vue-cli-service serve",
+    "start": "vue-cli-service serve --port 9001",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint",
     "serve:standalone": "vue-cli-service serve --mode standalone"
   },
   "dependencies": {
+    "click-outside-vue3": "4.0.1",
     "core-js": "^3.6.5",
     "single-spa-vue": "^2.1.0",
-    "vue": "^3.0.0"
+    "v-calendar": "^3.0.0-alpha.8",
+    "vue": "^3.0.0",
+    "vue-router": "^4.1.5"
   },
   "devDependencies": {
     "@babel/core": "^7.12.16",

src/App.vue

@@ -1,46 +1,30 @@
 <template>
   <div>
-    <navbar-component @route="path_change" :mobile="isMobile()" />
-    <appbar-component v-if="show_appbar" :mobile="isMobile()" />
-    <app-menu @route="capture_navigation" v-if="show_appmenu" :mobile="isMobile()"></app-menu>
+    <navbar-top />
+    <navbar-main :mobile="isMobile()" @navigate-url="
+    (newPath, oldPath) => {
+      capture_navigation(oldPath, newPath);
+    }" />
   </div>
 </template>
 
 <script>
-import NavbarComponent from "@/components/Navbar";
-import AppbarComponent from "@/components/Appbar";
-import AppMenu from "@/components/AppMenu";
-
-export default {
-  components: {
-    NavbarComponent,
-    AppbarComponent,
-    AppMenu,
-  },
-  data() {
-    return {
-      show_appbar: false,
-    };
-  },
+import NavbarMain from "./components/NavbarMain.vue";
+import NavbarTop from "./components/NavbarTop.vue"; export
+default {
+  components: { NavbarTop, NavbarMain },
+  data() { return { show_appbar: false, }; },
   methods: {
     isMobile() {
-      if (
-        /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(
-          navigator.userAgent
-        )
-      ) {
+      if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) {
         return true;
-      } else {
-        return false;
-      }
+      } else { return false; }
     },
-    capture_navigation(from, to) {
+    async capture_navigation(from, to) {
       if (from === to) return;
       try {
         fetch(`${process.env.VUE_APP_API_MARKETING}/action`, {
-          method: "POST",
-          cache: "no-cache",
-          redirect: "follow",
+          method: "POST", cache: "no-cache", redirect: "follow",
           headers: { "Content-Type": "application/json" },
           body: JSON.stringify({
             user_id: localStorage.getItem("marketing-id"),
@@ -50,17 +34,8 @@ export default {
           }),
         });
       } catch {
-        // Failed, skips
+        //Failed, skips
       }
     },
-    path_change(to) {
-      this.capture_navigation(window.location.pathname, to);
-      this.show_appbar = to.includes("/timetable") ? false : true;
-      this.show_appmenu = to.includes("/apps") ? true : false;
-    },
-  },
-  beforeMount() {
-    this.path_change(window.location.pathname);
-  },
-};
-</script>
+  }, beforeMount() { },
+}; </script>