From 975fddac18c5c39841e211754123a1f8583119dc Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa010199@gmail.com>
Date: Fri, 29 Jul 2022 17:13:12 +0530
Subject: [PATCH] chore/gui-v2-user-management-merge-conflict-resolved

---
 packages/nc-gui-v2/components/tabs/Auth.vue               | 2 +-
 packages/nc-gui-v2/pages/nc/[projectId]/index.vue         | 6 +++---
 .../nc-gui-v2/pages/nc/[projectId]/index/index/auth.vue   | 8 +++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui-v2/components/tabs/Auth.vue b/packages/nc-gui-v2/components/tabs/Auth.vue
index 91f8c0fecc..0a467a52f4 100644
--- a/packages/nc-gui-v2/components/tabs/Auth.vue
+++ b/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">
diff --git a/packages/nc-gui-v2/pages/nc/[projectId]/index.vue b/packages/nc-gui-v2/pages/nc/[projectId]/index.vue
index 314a680511..d591dc85a3 100644
--- a/packages/nc-gui-v2/pages/nc/[projectId]/index.vue
+++ b/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)
-loadTables()
+await loadProject(route.params.projectId as string)
+await loadTables()
 
 $state.sidebarOpen.value = true
 </script>
diff --git a/packages/nc-gui-v2/pages/nc/[projectId]/index/index/auth.vue b/packages/nc-gui-v2/pages/nc/[projectId]/index/index/auth.vue
index 11a17bc2e2..b495a6da15 100644
--- a/packages/nc-gui-v2/pages/nc/[projectId]/index/index/auth.vue
+++ b/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>
-    <h2 class="text-3xl mt-3">Team & Auth</h2>
-  </div>
+  <Auth />
 </template>