diff --git a/webapp/src/App.vue b/webapp/src/App.vue index cb194d4..8e1acd5 100644 --- a/webapp/src/App.vue +++ b/webapp/src/App.vue @@ -2,6 +2,7 @@ import { RouterView } from 'vue-router' import { ref, watch } from 'vue' import { useTheme } from 'vuetify'; +import { useRouter } from 'vue-router'; import { useAuth0 } from '@auth0/auth0-vue'; const { isAuthenticated, user, isLoading, loginWithRedirect, logout } = useAuth0(); @@ -10,6 +11,7 @@ const logoutParams = { }; const theme = useTheme(); +const router = useRouter(); function toggleTheme() { const newTheme = theme.global.name.value === 'dark' ? 'light' : 'dark'; @@ -55,7 +57,7 @@ watch(() => theme.global.name.value, (newTheme) => { - + @@ -65,12 +67,17 @@ watch(() => theme.global.name.value, (newTheme) => { - - - Log Out + + + mdi-map-marker-plusReport - - Log In + + mdi-logoutLog Out + + + + + mdi-loginLog In diff --git a/webapp/src/router/index.ts b/webapp/src/router/index.ts index 67b8d41..09ce8a2 100644 --- a/webapp/src/router/index.ts +++ b/webapp/src/router/index.ts @@ -63,7 +63,7 @@ const router = createRouter({ path: '/upload', name: 'upload', component: () => import('../views/ReportPhoto.vue'), - beforeEnter: routeGuard + // beforeEnter: routeGuard }, { path: '/dashboard', diff --git a/webapp/src/views/Dashboard.vue b/webapp/src/views/Dashboard.vue index abbdbba..1f2acb1 100644 --- a/webapp/src/views/Dashboard.vue +++ b/webapp/src/views/Dashboard.vue @@ -1,6 +1,6 @@