From 4f33346a30fb163fa5e9f3d701a492ba04232c06 Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Fri, 5 Aug 2022 17:45:31 +0200
Subject: [PATCH] feat(gui-v2): add header

---
 packages/nc-gui-v2/app.vue                    | 141 ++++++++++--------
 packages/nc-gui-v2/assets/style-v2.scss       |   2 +-
 .../components/smartsheet/sidebar/index.vue   |  11 +-
 .../nc-gui-v2/components/tabs/Smartsheet.vue  |   2 +-
 .../nc-gui-v2/composables/useSidebar/index.ts |   5 +-
 packages/nc-gui-v2/nuxt.config.ts             |   5 +
 .../nc-gui-v2/pages/nc/[projectId]/index.vue  |   4 +-
 7 files changed, 101 insertions(+), 69 deletions(-)

diff --git a/packages/nc-gui-v2/app.vue b/packages/nc-gui-v2/app.vue
index 123f9c6c6d..2fc8e64796 100644
--- a/packages/nc-gui-v2/app.vue
+++ b/packages/nc-gui-v2/app.vue
@@ -1,14 +1,18 @@
 <script lang="ts" setup>
 import { breakpointsTailwind } from '@vueuse/core'
 import { navigateTo } from '#app'
-import { computed, provideSidebar, ref, useBreakpoints, useGlobal } from '#imports'
+import { computed, provideSidebar, ref, useBreakpoints, useGlobal, useProject, useRouter } from '#imports'
 
 /** get current breakpoints (for enabling sidebar) */
 const breakpoints = useBreakpoints(breakpointsTailwind)
 
 const { signOut, signedIn, isLoading, user } = $(useGlobal())
 
-const { isOpen, toggle, hasSidebar } = provideSidebar({ isOpen: signedIn && breakpoints.greater('md').value })
+const { project } = useProject()
+
+const { isOpen } = provideSidebar({ isOpen: signedIn && breakpoints.greater('md').value })
+
+const router = useRouter()
 
 const sidebar = ref<HTMLDivElement>()
 
@@ -22,72 +26,87 @@ const logout = () => {
 
 <template>
   <a-layout>
-    <a-layout-header class="flex !bg-primary items-center text-white px-4 shadow-md">
-      <material-symbols-menu v-if="signedIn && hasSidebar" class="text-xl cursor-pointer" @click="toggle" />
+    <a-layout-sider
+      :collapsed="!isOpen"
+      width="50"
+      collapsed-width="0"
+      class="!bg-primary h-full"
+      :trigger="null"
+      collapsible
+      theme="light"
+    >
+      <a-dropdown :trigger="['click']">
+        <div class="transition-all duration-200 p-2 cursor-pointer transform hover:scale-105">
+          <img width="35" alt="NocoDB" src="~/assets/img/icons/512x512-trans.png" />
+        </div>
+
+        <template v-if="signedIn" #overlay>
+          <a-menu class="!py-0 nc-user-menu min-w-32 dark:(!bg-gray-800) leading-8 !rounded">
+            <a-menu-item key="0" class="!rounded-t">
+              <nuxt-link v-t="['c:navbar:user:email']" class="group flex items-center no-underline py-2" to="/user">
+                <MdiAt class="mt-1 group-hover:text-success" />&nbsp;
+                <span class="prose group-hover:text-black nc-user-menu-email">{{ email }}</span>
+              </nuxt-link>
+            </a-menu-item>
+
+            <a-menu-divider class="!m-0" />
+
+            <a-menu-item key="1" class="!rounded-b">
+              <div v-t="['a:navbar:user:sign-out']" class="group flex items-center py-2" @click="logout">
+                <mdi-logout class="dark:text-white group-hover:(!text-red-500)" />&nbsp;
+                <span class="prose font-semibold text-gray-500 group-hover:text-black nc-user-menu-signout">
+                  {{ $t('general.signOut') }}
+                </span>
+              </div>
+            </a-menu-item>
+          </a-menu>
+        </template>
+      </a-dropdown>
+
+      <div id="sidebar" ref="sidebar" class="w-full p-2" />
+    </a-layout-sider>
 
-      <div class="flex-1" />
+    <a-layout class="!flex-col">
+      <a-layout-header class="flex !bg-primary items-center text-white px-1">
+        <div v-if="project" class="w-[250px] text-xl px-4">{{ project.title }}</div>
 
-      <div class="ml-4 flex justify-center shrink">
-        <div class="flex items-center gap-2 cursor-pointer nc-noco-brand-icon" @click="navigateTo('/')">
-          <img width="35" src="~/assets/img/icons/512x512-trans.png" />
-          <span class="prose-xl">NocoDB</span>
+        <div class="hidden flex justify-center">
+          <div v-show="isLoading" class="flex items-center gap-2 ml-3">
+            {{ $t('general.loading') }}
+            <MdiReload :class="{ 'animate-infinite animate-spin': isLoading }" />
+          </div>
         </div>
-      </div>
 
-      <div class="flex-1 text-left">
-        <div v-show="isLoading" class="flex items-center gap-2 ml-3">
-          {{ $t('general.loading') }}
-          <mdi-reload :class="{ 'animate-infinite animate-spin': isLoading }" />
+        <div class="flex-1 text-white">
+          <div class="flex items-center w-1/2 mx-auto gap-4">
+            <a-tooltip placement="bottom">
+              <template #title> Go back </template>
+
+              <MaterialSymbolsArrowBackRounded
+                class="cursor-pointer transform hover:(scale-115 text-pink-500) text-xl"
+                @click="router.go(-1)"
+              />
+            </a-tooltip>
+
+            <a-tooltip placement="bottom">
+              <template #title>Go forward</template>
+
+              <MaterialSymbolsArrowForwardRounded
+                class="cursor-pointer transform hover:(scale-115 text-pink-500) text-xl"
+                @click="router.go(+1)"
+              />
+            </a-tooltip>
+          </div>
         </div>
-      </div>
 
-      <div class="flex justify-end gap-4">
-        <general-language class="mr-3" />
-
-        <template v-if="signedIn">
-          <a-dropdown :trigger="['click']">
-            <mdi-dots-vertical class="md:text-xl cursor-pointer nc-user-menu" @click.prevent />
-
-            <template #overlay>
-              <a-menu class="!py-0 nc-user-menu min-w-32 dark:(!bg-gray-800) leading-8 !rounded">
-                <a-menu-item key="0" class="!rounded-t">
-                  <nuxt-link v-t="['c:navbar:user:email']" class="group flex items-center no-underline py-2" to="/user">
-                    <MdiAt class="mt-1 group-hover:text-success" />&nbsp;
-                    <span class="prose group-hover:text-black nc-user-menu-email">{{ email }}</span>
-                  </nuxt-link>
-                </a-menu-item>
-
-                <a-menu-divider class="!m-0" />
-
-                <a-menu-item key="1" class="!rounded-b">
-                  <div v-t="['a:navbar:user:sign-out']" class="group flex items-center py-2" @click="logout">
-                    <mdi-logout class="dark:text-white group-hover:(!text-red-500)" />&nbsp;
-
-                    <span class="prose font-semibold text-gray-500 group-hover:text-black nc-user-menu-signout">
-                      {{ $t('general.signOut') }}
-                    </span>
-                  </div>
-                </a-menu-item>
-              </a-menu>
-            </template>
-          </a-dropdown>
-        </template>
+        <div class="flex justify-end gap-4">
+          <general-language class="mr-3" />
+        </div>
+      </a-layout-header>
+
+      <div class="w-full h-full">
+        <NuxtPage />
       </div>
-    </a-layout-header>
-
-    <a-layout>
-      <a-layout-sider
-        :collapsed="!isOpen"
-        width="300"
-        collapsed-width="0"
-        class="bg-white dark:!bg-gray-800 border-r-1 border-gray-200 dark:!border-gray-600 h-full"
-        :trigger="null"
-        collapsible
-      >
-        <div id="sidebar" ref="sidebar" class="w-full h-full" />
-      </a-layout-sider>
-
-      <NuxtPage />
     </a-layout>
   </a-layout>
 </template>
diff --git a/packages/nc-gui-v2/assets/style-v2.scss b/packages/nc-gui-v2/assets/style-v2.scss
index 462ee5f05b..67f121e5e3 100644
--- a/packages/nc-gui-v2/assets/style-v2.scss
+++ b/packages/nc-gui-v2/assets/style-v2.scss
@@ -2,7 +2,7 @@
 @import 'ant-design-vue/dist/antd.min.css';
 
 :root {
-  --header-height: 56px;
+  --header-height: 50px;
 }
 
 .ant-layout-header {
diff --git a/packages/nc-gui-v2/components/smartsheet/sidebar/index.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/index.vue
index 514fb37397..1f0e604cca 100644
--- a/packages/nc-gui-v2/components/smartsheet/sidebar/index.vue
+++ b/packages/nc-gui-v2/components/smartsheet/sidebar/index.vue
@@ -75,21 +75,22 @@ function onCreate(view: GridType | FormType | KanbanType | GalleryType) {
     collapsiple
     collapsed-width="50"
     width="250"
+    :class="[sidebarCollapsed ? 'collapsed !bg-primary' : '!bg-white']"
     class="relative shadow h-full"
     theme="light"
   >
     <div
-      class="group color-transition cursor-pointer hover:ring active:ring-pink-500 z-1 flex items-center p-[1px] absolute top-9 left-[-0.75rem] shadow bg-gray-100 rounded-full"
+      class="group color-transition cursor-pointer hover:ring active:ring-pink-500 z-1 flex items-center p-[1px] absolute top-9 left-[-1rem] shadow bg-gray-100 rounded-full"
     >
       <MaterialSymbolsChevronRightRounded
         v-if="sidebarOpen"
-        class="transform group-hover:(scale-115 text-pink-500) text-xl text-gray-400"
+        class="toggle transform group-hover:(scale-115 text-pink-500) text-xl text-gray-400"
         @click="sidebarOpen = false"
       />
 
       <MaterialSymbolsChevronLeftRounded
         v-else
-        class="transform group-hover:(scale-115 text-pink-500) text-xl text-gray-400"
+        class="toggle transform group-hover:(scale-115 text-pink-500) text-xl text-gray-400"
         @click="sidebarOpen = true"
       />
     </div>
@@ -133,6 +134,10 @@ function onCreate(view: GridType | FormType | KanbanType | GalleryType) {
 </template>
 
 <style scoped>
+.collapsed :deep(.nc-icon:not(.toggle)) {
+  @apply !text-white;
+}
+
 :deep(.ant-menu-title-content) {
   @apply w-full;
 }
diff --git a/packages/nc-gui-v2/components/tabs/Smartsheet.vue b/packages/nc-gui-v2/components/tabs/Smartsheet.vue
index 7882ed2a5f..744559aa1a 100644
--- a/packages/nc-gui-v2/components/tabs/Smartsheet.vue
+++ b/packages/nc-gui-v2/components/tabs/Smartsheet.vue
@@ -60,7 +60,7 @@ watch(tabMeta, async (newTabMeta, oldTabMeta) => {
           </div>
         </div>
 
-        <teleport to="#sidebar-right">
+        <teleport to="#content">
           <SmartsheetSidebar />
         </teleport>
       </template>
diff --git a/packages/nc-gui-v2/composables/useSidebar/index.ts b/packages/nc-gui-v2/composables/useSidebar/index.ts
index 17b5801b3d..e56904168c 100644
--- a/packages/nc-gui-v2/composables/useSidebar/index.ts
+++ b/packages/nc-gui-v2/composables/useSidebar/index.ts
@@ -6,7 +6,10 @@ interface UseSidebarProps {
 }
 
 /**
- * Injection state for the left sidebar
+ * Injection state for sidebars
+ *
+ * Use `provideSidebar` to provide the injection state on current component level (will affect all childrens injection)
+ * Use `useSidebar` to use the injection state on current component level
  */
 const [setup, use] = useInjectionState((props: UseSidebarProps = {}) => {
   const [isOpen, toggle] = useToggle(props.isOpen ?? false)
diff --git a/packages/nc-gui-v2/nuxt.config.ts b/packages/nc-gui-v2/nuxt.config.ts
index c2060d7c0b..beb16b80f2 100644
--- a/packages/nc-gui-v2/nuxt.config.ts
+++ b/packages/nc-gui-v2/nuxt.config.ts
@@ -101,4 +101,9 @@ export default defineNuxtConfig({
       },
     },
   },
+
+  image: {
+    dir: 'assets/',
+    presets,
+  },
 })
diff --git a/packages/nc-gui-v2/pages/nc/[projectId]/index.vue b/packages/nc-gui-v2/pages/nc/[projectId]/index.vue
index 632474ecd4..cee9171295 100644
--- a/packages/nc-gui-v2/pages/nc/[projectId]/index.vue
+++ b/packages/nc-gui-v2/pages/nc/[projectId]/index.vue
@@ -25,12 +25,12 @@ await loadTables()
 </script>
 
 <template>
-  <NuxtLayout id="sidebar-right" class="flex">
+  <NuxtLayout id="content" class="flex">
     <a-layout-sider
       :collapsed="!isOpen"
       width="250"
       collapsed-width="0"
-      class="relative bg-white dark:!bg-gray-800 border-r-1 border-gray-200 dark:!border-gray-600 h-full"
+      class="relative shadow h-full"
       :trigger="null"
       collapsible
       theme="light"