From 159d7c1d8fddbdaf69ac655758a4d3c8316fc3a0 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 25 Oct 2022 12:26:27 +0530
Subject: [PATCH] refactor(gui): move app store to account page

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/account/AppStore.vue       |  9 +++++++++
 packages/nc-gui/components/account/License.vue        |  2 +-
 packages/nc-gui/layouts/base.vue                      | 11 -----------
 .../nc-gui/pages/[projectType]/[projectId]/index.vue  |  2 +-
 packages/nc-gui/pages/account/index.vue               | 11 +++++++++++
 packages/nc-gui/pages/account/index/[page].vue        |  1 +
 6 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 packages/nc-gui/components/account/AppStore.vue

diff --git a/packages/nc-gui/components/account/AppStore.vue b/packages/nc-gui/components/account/AppStore.vue
new file mode 100644
index 0000000000..79761674eb
--- /dev/null
+++ b/packages/nc-gui/components/account/AppStore.vue
@@ -0,0 +1,9 @@
+<template>
+  <div class="h-full overflow-y-scroll scrollbar-thin-dull pt-2">
+    <div class="text-xl mt-4">{{ $t('title.appStore') }}</div>
+    <a-divider class="!my-3" />
+    <div>
+      <LazyDashboardSettingsAppStore />
+    </div>
+  </div>
+</template>
diff --git a/packages/nc-gui/components/account/License.vue b/packages/nc-gui/components/account/License.vue
index efe399cb59..3d9a001da3 100644
--- a/packages/nc-gui/components/account/License.vue
+++ b/packages/nc-gui/components/account/License.vue
@@ -36,7 +36,7 @@ loadLicense()
   <div class="h-full overflow-y-scroll scrollbar-thin-dull">
     <div class="text-xl mt-4">License</div>
     <a-divider class="!my-3" />
-    <div class="">
+    <div>
       <a-textarea v-model:value="key" placeholder="License key" class="!mt-2 !max-w-[600px]"></a-textarea>
     </div>
     <a-button class="mt-4" @click="setLicense" type="primary">Save license key</a-button>
diff --git a/packages/nc-gui/layouts/base.vue b/packages/nc-gui/layouts/base.vue
index 959e013d49..6e5e36b2ef 100644
--- a/packages/nc-gui/layouts/base.vue
+++ b/packages/nc-gui/layouts/base.vue
@@ -95,17 +95,6 @@ hooks.hook('page:finish', () => {
                 </a-menu-item>
 
                 <a-menu-divider class="!m-0" />
-                <a-menu-item v-if="isUIAllowed('appStore')" key="0" class="!rounded-t">
-                  <nuxt-link
-                    v-e="['c:settings:appstore', { page: true }]"
-                    class="nc-project-menu-item group !no-underline"
-                    to="/apps"
-                  >
-                    <MdiStorefrontOutline class="mt-1 group-hover:text-accent" />&nbsp;
-
-                    <span class="prose group-hover:text-primary">{{ $t('title.appStore') }}</span>
-                  </nuxt-link>
-                </a-menu-item>
                 <a-menu-divider class="!m-0" />
                 <!--                <a-menu-item v-if="isUIAllowed('appStore')" key="0" class="!rounded-t">
                   <nuxt-link
diff --git a/packages/nc-gui/pages/[projectType]/[projectId]/index.vue b/packages/nc-gui/pages/[projectType]/[projectId]/index.vue
index cb6af41964..1259660192 100644
--- a/packages/nc-gui/pages/[projectType]/[projectId]/index.vue
+++ b/packages/nc-gui/pages/[projectType]/[projectId]/index.vue
@@ -458,7 +458,7 @@ onBeforeUnmount(reset)
                       <template #expandIcon></template>
 
                       <a-menu-item key="0" class="!rounded-t">
-                        <nuxt-link v-e="['c:navbar:user:email']" class="nc-project-menu-item group !no-underline" to="/user">
+                        <nuxt-link v-e="['c:navbar:user:email']" class="nc-project-menu-item group !no-underline" to="/account">
                           <MdiAt class="mt-1 group-hover:text-accent" />&nbsp;
 
                           <span class="prose-sm">{{ email }}</span>
diff --git a/packages/nc-gui/pages/account/index.vue b/packages/nc-gui/pages/account/index.vue
index ad363d4947..5148f233dd 100644
--- a/packages/nc-gui/pages/account/index.vue
+++ b/packages/nc-gui/pages/account/index.vue
@@ -35,6 +35,17 @@ const selectedTabKeys = computed(() => [$route.params.page])
                 <div class="select-none">Tokens</div>
               </div>
             </a-menu-item>
+            <a-menu-item
+              key="apps"
+              class="group active:(!ring-0) hover:(!bg-primary !bg-opacity-25)"
+              @click="navigateTo('/account/apps')"
+            >
+              <div class="flex items-center space-x-2">
+                <MdiStorefrontOutline />
+
+                <div class="select-none">App Store</div>
+              </div>
+            </a-menu-item>
           </a-menu>
         </div>
       </a-layout-sider>
diff --git a/packages/nc-gui/pages/account/index/[page].vue b/packages/nc-gui/pages/account/index/[page].vue
index 997af0064b..cd4c698ad8 100644
--- a/packages/nc-gui/pages/account/index/[page].vue
+++ b/packages/nc-gui/pages/account/index/[page].vue
@@ -1,5 +1,6 @@
 <template>
   <AccountUserManagement v-if="$route.params.page === 'users'" />
   <AccountToken v-else-if="$route.params.page === 'tokens'" />
+  <AccountAppStore v-else-if="$route.params.page === 'apps'" />
   <span v-else></span>
 </template>