From 7f648eabab75fca3c39bbde7dd52c06e8929e894 Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Tue, 2 Aug 2022 09:09:51 +0200
Subject: [PATCH 1/3] refactor(gui-v2): remove success color from global
loading spinner
---
packages/nc-gui-v2/app.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/packages/nc-gui-v2/app.vue b/packages/nc-gui-v2/app.vue
index d56cfb3174..9ca0b862d5 100644
--- a/packages/nc-gui-v2/app.vue
+++ b/packages/nc-gui-v2/app.vue
@@ -41,9 +41,9 @@ const toggleSidebar = () => {
NocoDB
-
+
{{ $t('general.loading') }}
-
+
From 638e304db0e53a7ce0a240bae9668db442f6d643 Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Tue, 2 Aug 2022 09:10:30 +0200
Subject: [PATCH 2/3] refactor(gui-v2): move sidebar toolbar items to separate
directory
---
.../components/smartsheet/sidebar/index.vue | 4 ++--
.../sidebar/toolbar}/AddRow.vue | 0
.../sidebar/toolbar}/DeleteTable.vue | 0
.../sidebar/toolbar}/LockMenu.vue | 1 +
.../sidebar/toolbar}/Reload.vue | 0
.../sidebar/toolbar}/ToggleDrawer.vue | 0
.../sidebar/{Toolbar.vue => toolbar/index.vue} | 18 +++++++++++++-----
7 files changed, 16 insertions(+), 7 deletions(-)
rename packages/nc-gui-v2/components/{smartsheet-toolbar => smartsheet/sidebar/toolbar}/AddRow.vue (100%)
rename packages/nc-gui-v2/components/{smartsheet-toolbar => smartsheet/sidebar/toolbar}/DeleteTable.vue (100%)
rename packages/nc-gui-v2/components/{smartsheet-toolbar => smartsheet/sidebar/toolbar}/LockMenu.vue (99%)
rename packages/nc-gui-v2/components/{smartsheet-toolbar => smartsheet/sidebar/toolbar}/Reload.vue (100%)
rename packages/nc-gui-v2/components/{smartsheet-toolbar => smartsheet/sidebar/toolbar}/ToggleDrawer.vue (100%)
rename packages/nc-gui-v2/components/smartsheet/sidebar/{Toolbar.vue => toolbar/index.vue} (53%)
diff --git a/packages/nc-gui-v2/components/smartsheet/sidebar/index.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/index.vue
index e4e800d936..6f8de8eac4 100644
--- a/packages/nc-gui-v2/components/smartsheet/sidebar/index.vue
+++ b/packages/nc-gui-v2/components/smartsheet/sidebar/index.vue
@@ -2,8 +2,8 @@
import type { FormType, GalleryType, GridType, KanbanType, ViewTypes } from 'nocodb-sdk'
import MenuTop from './MenuTop.vue'
import MenuBottom from './MenuBottom.vue'
-import Toolbar from './Toolbar.vue'
-import { computed, inject, provide, ref, useApi, useViews, watch } from '#imports'
+import Toolbar from './toolbar/index.vue'
+import { computed, inject, provide, ref, useApi, useRoute, useViews, watch } from '#imports'
import { ActiveViewInj, MetaInj, RightSidebarInj, ViewListInj } from '~/context'
import MdiXml from '~icons/mdi/xml'
import MdiHook from '~icons/mdi/hook'
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/AddRow.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/AddRow.vue
similarity index 100%
rename from packages/nc-gui-v2/components/smartsheet-toolbar/AddRow.vue
rename to packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/AddRow.vue
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/DeleteTable.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/DeleteTable.vue
similarity index 100%
rename from packages/nc-gui-v2/components/smartsheet-toolbar/DeleteTable.vue
rename to packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/DeleteTable.vue
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/LockMenu.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/LockMenu.vue
similarity index 99%
rename from packages/nc-gui-v2/components/smartsheet-toolbar/LockMenu.vue
rename to packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/LockMenu.vue
index 2a216287fd..cfa3b57038 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/LockMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/LockMenu.vue
@@ -54,6 +54,7 @@ const Icon = computed(() => {
+