From e240ce7736bcb23f074a09b13378841f776cb476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Thu, 7 Apr 2022 11:18:47 +0200
Subject: [PATCH] dashboard app bar refactored

---
 config/vuefilemanager.php                     |  3 +-
 public/mix-manifest.json                      |  2 +-
 .../js/components/Admin/AppSpecification.vue  | 75 +++++++++++++++++++
 resources/js/views/Admin/Dashboard.vue        | 64 ++--------------
 .../UpgradingVersionsController.php           |  9 +++
 5 files changed, 94 insertions(+), 59 deletions(-)
 create mode 100644 resources/js/components/Admin/AppSpecification.vue

diff --git a/config/vuefilemanager.php b/config/vuefilemanager.php
index b852136a..4992ae7f 100644
--- a/config/vuefilemanager.php
+++ b/config/vuefilemanager.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'version' => '2.0.15',
+    'version' => '2.0.16',
 
     'is_demo' => env('APP_DEMO', false),
 
@@ -62,5 +62,6 @@ return [
         '2_0_10',
         '2_0_13',
         '2_0_14',
+        '2_0_16',
     ],
 ];
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 155c1c52..23dc4b38 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -16,7 +16,7 @@
     "/chunks/not-found.js": "/chunks/not-found.js?id=9f6ce23ce5d969f1",
     "/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=f564565faa09d6d6",
     "/chunks/admin.js": "/chunks/admin.js?id=c83d81218bbc5798",
-    "/chunks/dashboard.js": "/chunks/dashboard.js?id=eecbbc0bbffd5a37",
+    "/chunks/dashboard.js": "/chunks/dashboard.js?id=d2cfb9504b3e1c88",
     "/chunks/invoices.js": "/chunks/invoices.js?id=1416cbf6d1a593ac",
     "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=5bf6704f5b599f36",
     "/chunks/pages.js": "/chunks/pages.js?id=c8380d571e91e8be",
diff --git a/resources/js/components/Admin/AppSpecification.vue b/resources/js/components/Admin/AppSpecification.vue
new file mode 100644
index 00000000..8b7fc63d
--- /dev/null
+++ b/resources/js/components/Admin/AppSpecification.vue
@@ -0,0 +1,75 @@
+<template>
+    <div class="mb-4 items-center justify-between md:mb-6">
+        <!--VueFileManager logo-->
+        <a href="https://vuefilemanager.com" target="_blank">
+            <img
+                :src="
+                    isDarkMode
+                        ? '/assets/images/vuefilemanager-horizontal-logo-dark.svg'
+                        : '/assets/images/vuefilemanager-horizontal-logo.svg'
+                "
+                alt="VueFileManager"
+                class="light-mode"
+            />
+        </a>
+
+        <!--App Info-->
+        <div class="mt-4 flex items-center lg:mt-0">
+            <a
+                href="https://gist.github.com/MakingCG/9c07f8af392081ae5d5290d920a79b5d"
+                target="_blank"
+                class="mr-4 inline-block"
+            >
+                <span class="text-sm font-bold"> {{ $t('version') }}: </span>
+                <ColorLabel color="purple">
+                    {{ data.app.version }}
+                </ColorLabel>
+            </a>
+            <a
+                href="https://codecanyon.net/item/vue-file-manager-with-laravel-backend/25815986"
+                target="_blank"
+                class="mr-4 inline-block"
+            >
+                <span class="text-sm font-bold"> {{ $t('license') }}: </span>
+                <ColorLabel color="purple">
+                    {{ data.app.license }}
+                </ColorLabel>
+            </a>
+            <b v-if="data.app.license === 'extended'" class="mr-4 inline-block">
+                <span class="text-sm font-bold"> {{ $t('subscription') }}: </span>
+                <ColorLabel color="purple">
+                    {{ config.subscriptionType }}
+                </ColorLabel>
+            </b>
+            <a
+                href="https://bit.ly/VueFileManager-survey"
+                target="_blank"
+                class="bg-theme-100 ml-8 hidden items-center whitespace-nowrap rounded-lg py-1.5 px-3 lg:flex lg:ml-4"
+            >
+                <thumbs-up-icon size="15" class="vue-feather text-theme mr-2.5" />
+                <span class="text-theme text-sm font-bold">
+                    {{ $t('write_feedback') }}
+                </span>
+            </a>
+        </div>
+    </div>
+</template>
+<script>
+import {ThumbsUpIcon} from 'vue-feather-icons'
+import ColorLabel from '../Others/ColorLabel'
+import {mapGetters} from "vuex";
+
+export default {
+    name: 'AppSpecification',
+    components: {
+		ThumbsUpIcon,
+		ColorLabel,
+	},
+    props: {
+        data: {},
+    },
+	computed: {
+		...mapGetters(['config', 'isDarkMode']),
+	},
+}
+</script>
diff --git a/resources/js/views/Admin/Dashboard.vue b/resources/js/views/Admin/Dashboard.vue
index a9798119..0f051927 100644
--- a/resources/js/views/Admin/Dashboard.vue
+++ b/resources/js/views/Admin/Dashboard.vue
@@ -1,57 +1,10 @@
 <template>
     <div>
         <div id="page-content" v-if="!isLoading && data">
-            <!--Headline-->
-            <div v-if="config.isAdminVueFileManagerBar" class="mb-4 hidden justify-between items-center md:mb-6 md:block md:flex">
-                <!--VueFileManager logo-->
-                <a href="https://vuefilemanager.com" target="_blank">
-                    <img
-                        :src="isDarkMode ? '/assets/images/vuefilemanager-horizontal-logo-dark.svg' : '/assets/images/vuefilemanager-horizontal-logo.svg'"
-                        alt="VueFileManager"
-                        class="light-mode"
-                    />
-                </a>
 
-                <!--App Info-->
-                <div class="mt-4 flex items-center md:mt-0">
-                    <a
-                        href="https://gist.github.com/MakingCG/9c07f8af392081ae5d5290d920a79b5d"
-                        target="_blank"
-                        class="mr-4 inline-block"
-                    >
-                        <span class="text-sm font-bold"> {{ $t('version') }}: </span>
-                        <ColorLabel color="purple">
-                            {{ data.app.version }}
-                        </ColorLabel>
-                    </a>
-                    <a
-                        href="https://codecanyon.net/item/vue-file-manager-with-laravel-backend/25815986"
-                        target="_blank"
-                        class="mr-4 inline-block"
-                    >
-                        <span class="text-sm font-bold"> {{ $t('license') }}: </span>
-                        <ColorLabel color="purple">
-                            {{ data.app.license }}
-                        </ColorLabel>
-                    </a>
-                    <b v-if="data.app.license === 'extended'" class="mr-4 inline-block">
-                        <span class="text-sm font-bold"> {{ $t('subscription') }}: </span>
-                        <ColorLabel color="purple">
-                            {{ config.subscriptionType }}
-                        </ColorLabel>
-                    </b>
-                    <a
-                        href="https://bit.ly/VueFileManager-survey"
-                        target="_blank"
-                        class="bg-theme-100 ml-8 inline-block hidden items-center rounded-lg py-1.5 px-3 md:flex lg:ml-4"
-                    >
-                        <thumbs-up-icon size="15" class="vue-feather text-theme mr-2.5" />
-                        <span class="text-theme text-sm font-bold">
-                            {{ $t('write_feedback') }}
-                        </span>
-                    </a>
-                </div>
-            </div>
+            <!--Headline-->
+            <AppSpecification v-if="config.isAdminVueFileManagerBar" :data="data" class="hidden lg:flex" />
+            <AppSpecification v-if="config.isAdminVueFileManagerBar" :data="data" class="card shadow-card lg:hidden" />
 
             <!--Create metered plan alert-->
 			<AlertBox v-if="config.subscriptionType === 'metered' && config.isEmptyPlans" color="rose">
@@ -178,33 +131,30 @@
 
 <script>
 import WidgetLatestRegistrations from '../../components/Admin/WidgetLatestRegistrations'
-import ColorLabel from '../../components/Others/ColorLabel'
-import {AlertOctagonIcon, ChevronRightIcon, ThumbsUpIcon} from 'vue-feather-icons'
+import {ChevronRightIcon} from 'vue-feather-icons'
 import Spinner from '../../components/FilesView/Spinner'
 import FormLabel from '../../components/Others/Forms/FormLabel'
 import BarChart from '../../components/UI/BarChart'
 import {mapGetters} from 'vuex'
 import axios from 'axios'
 import WidgetLatestTransactions from '../../components/Admin/WidgetLatestTransactions'
-import {events} from "../../bus";
 import AlertBox from "../../components/Admin/AlertBox";
+import AppSpecification from "../../components/Admin/AppSpecification";
 
 export default {
     name: 'Dashboard',
     components: {
+		AppSpecification,
 		AlertBox,
         WidgetLatestTransactions,
         WidgetLatestRegistrations,
         ChevronRightIcon,
-        AlertOctagonIcon,
-        ThumbsUpIcon,
-        ColorLabel,
         FormLabel,
         BarChart,
         Spinner,
     },
     computed: {
-        ...mapGetters(['config', 'isDarkMode']),
+        ...mapGetters(['config']),
     },
     data() {
         return {
diff --git a/src/Support/Upgrading/Controllers/UpgradingVersionsController.php b/src/Support/Upgrading/Controllers/UpgradingVersionsController.php
index f531110c..ee3bc4c2 100644
--- a/src/Support/Upgrading/Controllers/UpgradingVersionsController.php
+++ b/src/Support/Upgrading/Controllers/UpgradingVersionsController.php
@@ -117,4 +117,13 @@ class UpgradingVersionsController
 
         Artisan::call('cache:clear');
     }
+
+    public function upgrade_to_2_0_16(): void
+    {
+        ($this->updateLanguageStrings)([
+            'write_feedback'      => 'Help Us Improve',
+        ]);
+
+        Artisan::call('cache:clear');
+    }
 }