From c10484f073f5b794e09d3892256841673cd5ba31 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa010199@gmail.com>
Date: Wed, 17 Aug 2022 10:24:09 +0530
Subject: [PATCH] fix/Fixed redirection issues and added project title

---
 packages/nc-gui-v2/app.vue                        | 10 +++++++++-
 packages/nc-gui-v2/layouts/shared-view.vue        | 15 +++++++++++++++
 packages/nc-gui-v2/middleware/auth.global.ts      |  2 ++
 .../pages/[projectType]/view/[viewId].vue         |  1 +
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui-v2/app.vue b/packages/nc-gui-v2/app.vue
index 28c63b040c..567b5be46a 100644
--- a/packages/nc-gui-v2/app.vue
+++ b/packages/nc-gui-v2/app.vue
@@ -1,5 +1,13 @@
+<script setup lang="ts">
+const route = useRoute()
+
+const disableBaseLayout = $computed(() => {
+  return route.path.startsWith('/nc/view') || route.path.startsWith('/nc/form')
+})
+</script>
+
 <template>
-  <NuxtLayout name="base">
+  <NuxtLayout :name="disableBaseLayout ? false : 'base'">
     <NuxtPage />
   </NuxtLayout>
 </template>
diff --git a/packages/nc-gui-v2/layouts/shared-view.vue b/packages/nc-gui-v2/layouts/shared-view.vue
index a6d2aef876..e055129757 100644
--- a/packages/nc-gui-v2/layouts/shared-view.vue
+++ b/packages/nc-gui-v2/layouts/shared-view.vue
@@ -1,5 +1,7 @@
 <script lang="ts" setup>
 import { navigateTo } from '#app'
+const { isLoading } = useGlobal()
+const { sharedView } = useSharedView()
 </script>
 
 <script lang="ts">
@@ -15,7 +17,20 @@ export default {
         <div class="transition-all duration-200 p-2 cursor-pointer transform hover:scale-105" @click="navigateTo('/')">
           <img width="35" alt="NocoDB" src="~/assets/img/icons/512x512-trans.png" />
         </div>
+        <div>
+          <div class="flex justify-center items-center">
+            <div class="flex items-center gap-2 ml-3">
+              <template v-if="isLoading">
+                {{ $t('general.loading') }}
 
+                <MdiReload :class="{ 'animate-infinite animate-spin': isLoading }" />
+              </template>
+              <div v-else class="text-xl font-semibold truncate">
+                {{ sharedView.title }}
+              </div>
+            </div>
+          </div>
+        </div>
         <div class="flex-1" />
       </a-layout-header>
 
diff --git a/packages/nc-gui-v2/middleware/auth.global.ts b/packages/nc-gui-v2/middleware/auth.global.ts
index 740514cbb2..e323e0fd26 100644
--- a/packages/nc-gui-v2/middleware/auth.global.ts
+++ b/packages/nc-gui-v2/middleware/auth.global.ts
@@ -26,6 +26,8 @@ export default defineNuxtRouteMiddleware((to, from) => {
   /** if shred base allow without validating */
   if (to.params?.projectType === 'base') return
 
+  if (to.meta.isSharedView) return
+
   /** if auth is required or unspecified (same as required) and user is not signed in, redirect to signin page */
   if ((to.meta.requiresAuth || typeof to.meta.requiresAuth === 'undefined') && !state.signedIn.value) {
     return navigateTo('/signin')
diff --git a/packages/nc-gui-v2/pages/[projectType]/view/[viewId].vue b/packages/nc-gui-v2/pages/[projectType]/view/[viewId].vue
index 753950cd3b..1904c57d1c 100644
--- a/packages/nc-gui-v2/pages/[projectType]/view/[viewId].vue
+++ b/packages/nc-gui-v2/pages/[projectType]/view/[viewId].vue
@@ -14,6 +14,7 @@ definePageMeta({
   public: true,
   requiresAuth: false,
   layout: 'shared-view',
+  isSharedView: true,
 })
 
 const route = useRoute()