chore/gui-v2-user-management-merge-conflict-resolved

packages/nc-gui-v2/components/tabs/Auth.vue

@@ -27,7 +27,7 @@ const selectedTab = $computed(() => tabsInfo[selectedTabKeys[0]])
 </script>
 
 <template>
-  <div>
+  <div class="mt-2">
     <a-menu v-model:selectedKeys="selectedTabKeys" :open-keys="[]" mode="horizontal">
       <a-menu-item v-for="(tab, key) of tabsInfo" :key="key" class="select-none">
         <div class="text-xs pb-2.5">

packages/nc-gui-v2/pages/nc/[projectId]/index.vue

@@ -3,15 +3,15 @@ import useTabs from '~/composables/useTabs'
 
 const route = useRoute()
 const { loadProject, loadTables } = useProject(route.params.projectId as string)
-const { clearTabs, addTab } = useTabs()
+const { addTab } = useTabs()
 const { $state } = useNuxtApp()
 
 if (!route.params.type) {
   addTab({ type: 'auth', title: 'Team & Auth' })
 }
 
-loadProject(route.params.projectId as string)
+await loadProject(route.params.projectId as string)
-loadTables()
+await loadTables()
 
 $state.sidebarOpen.value = true
 </script>

packages/nc-gui-v2/pages/nc/[projectId]/index/index/auth.vue

@@ -1,5 +1,7 @@
+<script lang="ts" setup>
+import Auth from '~~/components/tabs/Auth.vue'
+</script>
+
 <template>
-  <div>
+  <Auth />
-    <h2 class="text-3xl mt-3">Team & Auth</h2>
-  </div>
 </template>