Merge branch 'main' into sonar

This commit is contained in:
Cindy Chang
2024-08-09 13:52:13 +08:00
5 changed files with 8 additions and 8 deletions

View File

@@ -1,5 +1,5 @@
<template>
<header>
<header id="authcontainer_header_navbar_container">
<Header />
<Navbar />
</header>

View File

@@ -1,10 +1,10 @@
<template>
<ModalContainer/>
<header class="sticky inset-x-0 top-0 w-full bg-neutral-10 z-10">
<header id='header_inside_maincontainer' class="sticky inset-x-0 top-0 w-full bg-neutral-10 z-10">
<Header/>
<Navbar/>
</header>
<main class="w-full">
<main id='loading_and_router_view_container_in_maincontainer' class="w-full">
<Loading v-if="loadingStore.isLoading" />
<router-view></router-view>
</main>

View File

@@ -1,5 +1,5 @@
<template>
<header>
<header id="notfound_404">
<Header/>
<Navbar/>
</header>