Merge branch 'main' into feature-whiteboards-recent-and-history
# Conflicts: # front/src/App.vue
This commit is contained in:
@@ -1,7 +1,8 @@
|
||||
<script setup lang="ts">
|
||||
|
||||
import { onMounted } from 'vue'
|
||||
import { RouterView } from 'vue-router'
|
||||
import { RouterView, useRoute } from 'vue-router'
|
||||
import { computed } from 'vue'
|
||||
import AppTopBar from './components/AppTopBar.vue'
|
||||
import { useAuthStore } from '@/stores/auth'
|
||||
|
||||
@@ -11,12 +12,20 @@ onMounted(() => {
|
||||
auth.initialize()
|
||||
})
|
||||
|
||||
|
||||
const route = useRoute()
|
||||
const hideTopBar = computed(() => route.meta.hideTopBar === true)
|
||||
</script>
|
||||
|
||||
|
||||
<template>
|
||||
<AppTopBar />
|
||||
<main class="container py-4">
|
||||
<template v-if="hideTopBar">
|
||||
<RouterView />
|
||||
</main>
|
||||
</template>
|
||||
<template v-else>
|
||||
<AppTopBar />
|
||||
<main class="container py-4">
|
||||
<RouterView />
|
||||
</main>
|
||||
</template>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user