Fix fossasia#36 404 page (fossasia#37)

* fix fossasia#14 Password Prompt added * Update NavBar.vue * Update App.vue * Renamed and Relocated Modal Files * Update SearchAttendee.vue * Flex UI fixed * Update SearchAttendee.vue * FIx fossasia#9 * Codacy Fix * Fix fossasia#30 * Codacy Fix * useApiStore comment fix * fossasia#33 Fix * Not Found page added * Resolved comment * Remove commented out code
PiyushThapaa · Jul 15, 2023 · da992f6 · da992f6
1 parent 9e7ab0e
commit da992f6
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 24 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -1,13 +1,14 @@
 <script setup>
 import { RouterView } from 'vue-router'
-import NavBar from '@/components/NavBar.vue'
+import { useLoadingStore } from '@/stores/loading'
+import LoadingView from '@/components/Utilities/LoadingView.vue'
 </script>
 
 <template>
  <div class="flex flex-col h-screen">
- <NavBar />
  <div class="mx-3 grow flex">
  <RouterView class="grow flex flex-col" />
  </div>
  </div>
+ <LoadingView v-if="useLoadingStore().show"></LoadingView>
 </template>
diff --git a/src/AuthTemplate.vue b/src/AuthTemplate.vue
@@ -0,0 +1,14 @@
+<script setup>
+import NavBar from '@/components/NavBar.vue'
+import { useLoadingStore } from '@/stores/loading'
+import LoadingView from '@/components/Utilities/LoadingView.vue'
+</script>
+<template>
+ <div class="flex flex-col h-screen w-full">
+ <NavBar />
+ <div class="mx-3 grow flex">
+ <RouterView class="grow flex flex-col" />
+ </div>
+ </div>
+ <LoadingView v-if="useLoadingStore().show"></LoadingView>
+</template>
diff --git a/src/router/index.js b/src/router/index.js
@@ -8,6 +8,7 @@ import RegistrationKiosk from '@/components/Registration/Kiosk/ScannerCamera.vue
 //import RegistrationStats from '@/components/Registration/Manual/RegistrationStats.vue'
 import RegistrationManual from '@/components/Registration/Manual/ScanSearch.vue'
 import NotFound from '@/views/NotFound.vue'
+import AuthTemplate from '@/AuthTemplate.vue'
 
 const router = createRouter({
  history: createWebHistory(import.meta.env.BASE_URL),
@@ -18,34 +19,40 @@ const router = createRouter({
  component: UserAuth
  },
  {
- path: '/station-selector',
- name: 'stationSelector',
- component: StationSelector
- },
- {
- path: '/:eventId/registration/:registrationType',
- name: 'registration',
- redirect: { name: 'registerKiosk' },
- component: Registration,
+ path: '/auth',
+ name: 'auth',
+ component: AuthTemplate,
  children: [
  {
- path: 'kiosk',
- name: 'registerKiosk',
- component: RegistrationKiosk
+ path: 'station-selector',
+ name: 'stationSelector',
+ component: StationSelector
+ },
+ {
+ path: ':eventId/registration/:registrationType',
+ name: 'registration',
+ redirect: { name: 'registerKiosk' },
+ component: Registration,
+ children: [
+ {
+ path: 'kiosk',
+ name: 'registerKiosk',
+ component: RegistrationKiosk
+ },
+ {
+ path: 'manual',
+ name: 'registerHybrid',
+ component: RegistrationManual
+ }
+ ]
  },
- // out of kiosk mode
  {
- path: 'manual',
- name: 'registerHybrid',
- component: RegistrationManual
- }
+ path: ':eventId/scanner/:scannerType',
+ name: 'scanner',
+ component: QRScannerCamera
+ },
  ]
  },
- {
- path: '/:eventId/scanner/:scannerType',
- name: 'scanner',
- component: QRScannerCamera
- },
  { path: '/:pathMatch(.*)*', name: 'NotFound', component: NotFound }
  ]
 })