From d6059b5469a36108f602b4c5f81f9168e8b31710 Mon Sep 17 00:00:00 2001
From: Braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Mon, 4 Jul 2022 13:13:21 +0200
Subject: [PATCH] feat(gui-v2): move header and sidebar to default layout

---
 packages/nc-gui-v2/app.vue                  |  7 ++--
 packages/nc-gui-v2/composables/user.ts      |  4 +-
 packages/nc-gui-v2/layouts/default.vue      | 27 ++++--------
 packages/nc-gui-v2/pages/projects/index.vue | 46 +++++++++------------
 4 files changed, 33 insertions(+), 51 deletions(-)

diff --git a/packages/nc-gui-v2/app.vue b/packages/nc-gui-v2/app.vue
index 5ce991fd0f..f8eacfa737 100644
--- a/packages/nc-gui-v2/app.vue
+++ b/packages/nc-gui-v2/app.vue
@@ -1,6 +1,5 @@
 <template>
-  <!--  <NuxtLayout> -->
-  <!--    <NuxtPage /> -->
-  <!--  </NuxtLayout> -->
-  <NuxtPage />
+  <NuxtLayout>
+    <NuxtPage />
+  </NuxtLayout>
 </template>
diff --git a/packages/nc-gui-v2/composables/user.ts b/packages/nc-gui-v2/composables/user.ts
index e77e2429bb..f20732c1e8 100644
--- a/packages/nc-gui-v2/composables/user.ts
+++ b/packages/nc-gui-v2/composables/user.ts
@@ -13,13 +13,11 @@ export const useUser = () => {
   const { $api } = useNuxtApp()
 
   const getUser = async (args = {}) => {
-    const userInfo = await $api.auth.me(args, {
+    user.user = await $api.auth.me(args, {
       headers: {
         'xc-auth': user.value.token,
       },
     })
-
-    user.user = userInfo
   }
 
   const setToken = (token) => {
diff --git a/packages/nc-gui-v2/layouts/default.vue b/packages/nc-gui-v2/layouts/default.vue
index 6e96535dd3..96a329f34c 100644
--- a/packages/nc-gui-v2/layouts/default.vue
+++ b/packages/nc-gui-v2/layouts/default.vue
@@ -5,22 +5,13 @@ export default {
 </script>
 
 <template>
-  <div class="">
-    <!--    <div class="topbar"> -->
-    <!--    </div> -->
-    <!--    <div class="sidebar"> -->
-    <!--    </div> -->
-    <!--    <div class="content"> -->
-
-    <v-layout>
-      <v-app-bar color="" />
-      <slot />
-    </v-layout>
-
-    <!--    </div> -->
-  </div>
+  <v-layout>
+    <v-app-bar color="" />
+    <v-navigation-drawer :permanent="true" />
+    <v-main>
+      <v-container>
+        <slot />
+      </v-container>
+    </v-main>
+  </v-layout>
 </template>
-
-<style scoped>
-
-</style>
diff --git a/packages/nc-gui-v2/pages/projects/index.vue b/packages/nc-gui-v2/pages/projects/index.vue
index 951c18a26c..54bc1910c1 100644
--- a/packages/nc-gui-v2/pages/projects/index.vue
+++ b/packages/nc-gui-v2/pages/projects/index.vue
@@ -27,30 +27,24 @@ onMounted(async () => {
 </script>
 
 <template>
-  <NuxtLayout>
-    <v-navigation-drawer :permanent="true" />
-    <v-main>
-      <v-container>
-        <div class="pa-2 d-flex mb-10">
-          <v-spacer />
-          <v-btn size="small" class="caption text-capitalize mr-2" color="primary" @click="router.push('/projects/create')">
-            Create Project
-          </v-btn>
-          <v-btn size="small" class="caption text-capitalize mr-2" color="primary" @click="router.push('/projects/create')">
-            Create External Project
-          </v-btn>
-        </div><v-row>
-          <v-col v-for="project in projects" :key="project.id" cols="4">
-            <v-card @click="navigateToDashboard(project)">
-              <v-card-title>
-                <div class="text-center">
-                  <h3>{{ project.title }}</h3>
-                </div>
-              </v-card-title>
-            </v-card>
-          </v-col>
-        </v-row>
-      </v-container>
-    </v-main>
-  </NuxtLayout>
+  <div class="pa-2 d-flex mb-10">
+    <v-spacer />
+    <v-btn size="small" class="caption text-capitalize mr-2" color="primary" @click="router.push('/projects/create')">
+      Create Project
+    </v-btn>
+    <v-btn size="small" class="caption text-capitalize mr-2" color="primary" @click="router.push('/projects/create')">
+      Create External Project
+    </v-btn>
+  </div>
+  <v-row>
+    <v-col v-for="project in projects" :key="project.id" cols="4">
+      <v-card @click="navigateToDashboard(project)">
+        <v-card-title>
+          <div class="text-center">
+            <h3>{{ project.title }}</h3>
+          </div>
+        </v-card-title>
+      </v-card>
+    </v-col>
+  </v-row>
 </template>