From 9503ecbd79ed3fc4da71ed04ea9b0eed4cf3d147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Wed, 24 Nov 2021 18:06:11 +0100
Subject: [PATCH] labels fix

---
 public/mix-manifest.json                       | 18 ++++++++++++++----
 .../js/components/Admin/WidgetWrapper.vue      |  5 +----
 resources/js/views/Admin/Dashboard.vue         | 14 +++++++-------
 resources/js/views/Admin/Users.vue             | 11 ++++-------
 resources/js/views/Profile.vue                 |  8 ++++++--
 .../Dashboard/GetWidgetsValuesController.php   |  2 ++
 6 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index a5b39fd7..7ccaf708 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -33,7 +33,7 @@
     "/chunks/contact-us.js": "/chunks/contact-us.js?id=3d0bbcd0c36d74bf739a",
     "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js": "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js?id=65ee559ca803555be568",
     "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=55135fff8801bdf735c4",
-    "/chunks/dashboard.js": "/chunks/dashboard.js?id=27638c489fec8b00d89a",
+    "/chunks/dashboard.js": "/chunks/dashboard.js?id=6215349bfe593c9d97e0",
     "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~5475de6f.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~5475de6f.js?id=c5c36cfe8a9f7e56aa25",
     "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans.js?id=d62ce026c0c13d14242f",
     "/chunks/dashboard~chunks/invoices~chunks/plan-subscribers~chunks/users.js": "/chunks/dashboard~chunks/invoices~chunks/plan-subscribers~chunks/users.js?id=7c627ccb1eb284aee632",
@@ -67,7 +67,7 @@
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=c0dbc21fb8c789f0144a",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=f8b2619e393a5823bf29",
     "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=22f629caf127051898e9",
-    "/chunks/settings.js": "/chunks/settings.js?id=ea0ccd8555552cf4abfd",
+    "/chunks/settings.js": "/chunks/settings.js?id=2a9be45c14b5a06144d9",
     "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=cacac1c92fcaa4f21f69",
     "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=9f573ab4cc1c42f36e06",
     "/chunks/settings-password.js": "/chunks/settings-password.js?id=4ed19fa578c63c0c50ce",
@@ -102,7 +102,7 @@
     "/chunks/user-password.js": "/chunks/user-password.js?id=ce6c12a5b038f5481bd1",
     "/chunks/user-storage.js": "/chunks/user-storage.js?id=71b90f0987d1ebe7ead6",
     "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=e0a857f37b2bc6df43ca",
-    "/chunks/users.js": "/chunks/users.js?id=a63b7c2a75ff7b4801f6",
+    "/chunks/users.js": "/chunks/users.js?id=f725bb798eb8da710ca7",
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~24b428d3.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~24b428d3.js?id=ee89932f7ee76e74483e",
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~b505e62a.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~b505e62a.js?id=8163e0eab55c50f8afb8",
     "/vendors~chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunk~40ccbae3.js": "/vendors~chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunk~40ccbae3.js?id=37ce1e1ab9968c100712",
@@ -195,5 +195,15 @@
     "/chunks/admin~chunks/platform~chunks/shared.82750ae460fffd42ab7b.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.82750ae460fffd42ab7b.hot-update.js",
     "/chunks/admin~chunks/platform~chunks/shared.07b8d9256f564f443260.hot-update.js": "/chunks/admin~chunks/platform~chunks/shared.07b8d9256f564f443260.hot-update.js",
     "/js/main.a547c65fd7f667ff4889.hot-update.js": "/js/main.a547c65fd7f667ff4889.hot-update.js",
-    "/js/main.6574ea9964b2612a9717.hot-update.js": "/js/main.6574ea9964b2612a9717.hot-update.js"
+    "/js/main.6574ea9964b2612a9717.hot-update.js": "/js/main.6574ea9964b2612a9717.hot-update.js",
+    "/chunks/settings.ffb033a2cece3ef58ca3.hot-update.js": "/chunks/settings.ffb033a2cece3ef58ca3.hot-update.js",
+    "/chunks/settings.605668fa7dfae51fcd5d.hot-update.js": "/chunks/settings.605668fa7dfae51fcd5d.hot-update.js",
+    "/chunks/users.e813bd2844c3cadd64f0.hot-update.js": "/chunks/users.e813bd2844c3cadd64f0.hot-update.js",
+    "/chunks/users.98cad3b9bf78dd457e46.hot-update.js": "/chunks/users.98cad3b9bf78dd457e46.hot-update.js",
+    "/chunks/users.444cf93ee1d49b529172.hot-update.js": "/chunks/users.444cf93ee1d49b529172.hot-update.js",
+    "/chunks/dashboard.f675bd148389138634f9.hot-update.js": "/chunks/dashboard.f675bd148389138634f9.hot-update.js",
+    "/chunks/dashboard.e7304e9e581382d2a2d0.hot-update.js": "/chunks/dashboard.e7304e9e581382d2a2d0.hot-update.js",
+    "/chunks/dashboard.34f0d33cbf27abd0fa14.hot-update.js": "/chunks/dashboard.34f0d33cbf27abd0fa14.hot-update.js",
+    "/chunks/dashboard.26ef1092b34800d94481.hot-update.js": "/chunks/dashboard.26ef1092b34800d94481.hot-update.js",
+    "/chunks/dashboard.ddcecfbaab20cb8f9517.hot-update.js": "/chunks/dashboard.ddcecfbaab20cb8f9517.hot-update.js"
 }
diff --git a/resources/js/components/Admin/WidgetWrapper.vue b/resources/js/components/Admin/WidgetWrapper.vue
index 7ceb790f..2d28e7fb 100644
--- a/resources/js/components/Admin/WidgetWrapper.vue
+++ b/resources/js/components/Admin/WidgetWrapper.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="widget">
-        <div class="widget-content bg-white">
+        <div class="widget-content dark:bg-dark-foreground bg-white">
             <div class="headline">
                 <div class="icon">
                     <users-icon v-if="icon === 'users'" size="19" class="text-theme dark-text-theme"/>
@@ -59,9 +59,6 @@
     }
 
     .dark {
-        .widget-content {
-            background: $dark_mode_foreground;
-        }
 
         .headline {
             .title {
diff --git a/resources/js/views/Admin/Dashboard.vue b/resources/js/views/Admin/Dashboard.vue
index 3eb24688..734904b9 100644
--- a/resources/js/views/Admin/Dashboard.vue
+++ b/resources/js/views/Admin/Dashboard.vue
@@ -33,11 +33,11 @@
             </div>
 
             <!--Stripe notice-->
-            <InfoBox v-if="config.isSaaS && ! config.stripe_public_key" class="dashboard-notice">
+<!--            <InfoBox v-if="config.isSaaS && ! config.stripe_public_key" class="dashboard-notice">
                 <i18n path="notice.stripe_activation">
                     <router-link :to="{name: 'AppPayments'}">{{ $t('notice.stripe_activation_button') }}</router-link>
                 </i18n>
-            </InfoBox>
+            </InfoBox>-->
 
             <div class="widgets-total" :class="{'widgets-coll-3': config.isSaaS, 'widgets-coll-2': ! config.isSaaS}">
                 <WidgetTotals
@@ -47,7 +47,7 @@
                         :value="data.total_users"
                         link-route="Users"
                         :link-name="$t('admin_page_dashboard.w_total_users.link')"
-                ></WidgetTotals>
+                />
                 <WidgetTotals
                         class="widget"
                         icon="hard-drive"
@@ -55,7 +55,7 @@
                         :value="data.total_used_space"
                         link-route="Users"
                         :link-name="$t('admin_page_dashboard.w_total_space.link')"
-                ></WidgetTotals>
+                />
                 <WidgetTotals
                         v-if="config.isSaaS"
                         class="widget"
@@ -64,15 +64,15 @@
                         :value="data.total_premium_users"
                         link-route="Plans"
                         :link-name="$t('admin_page_dashboard.w_total_premium.link')"
-                ></WidgetTotals>
+                />
             </div>
-            <div class="widget-users">
+<!--            <div class="widget-users">
                 <WidgetLatestRegistrations
                         class="widget"
                         icon="users"
                         :title="$t('admin_page_dashboard.w_latest_users.title')"
                 />
-            </div>
+            </div>-->
         </div>
         <div id="loader" v-if="isLoading">
             <Spinner></Spinner>
diff --git a/resources/js/views/Admin/Users.vue b/resources/js/views/Admin/Users.vue
index b32aab7a..201fe9f6 100644
--- a/resources/js/views/Admin/Users.vue
+++ b/resources/js/views/Admin/Users.vue
@@ -37,18 +37,15 @@
                             </ColorLabel>
                         </td>
                         <td v-if="config.isSaaS">
-                            <span class="text-sm font-bold" v-if="row.data.attributes.subscription">
-                            	{{ $t('global.premium') }}
-                            </span>
-                            <span class="text-sm font-bold" v-else>
-                            	{{ $t('global.free') }}
+                            <span class="text-sm font-bold">
+                            	{{ row.data.relationships.subscription ? $t('global.premium') : $t('global.free') }}
                             </span>
                         </td>
                         <td>
                             <span v-if="row.data.attributes.storage.capacity !== 0" class="text-sm font-bold">
                             	{{ row.data.attributes.storage.used_formatted }}
                             </span>
-                            <span v-if="row.data.attributes.storage.capacity == 0" class="text-sm font-bold">
+                            <span v-if="row.data.attributes.storage.capacity === 0" class="text-sm font-bold">
                             	-
                             </span>
                         </td>
@@ -56,7 +53,7 @@
                             <span v-if="row.data.attributes.storage.capacity !== 0" class="text-sm font-bold">
                             	{{ row.data.attributes.storage.capacity_formatted }}
                             </span>
-                            <span v-if="row.data.attributes.storage.capacity == 0" class="text-sm font-bold">
+                            <span v-if="row.data.attributes.storage.capacity === 0" class="text-sm font-bold">
                             	-
                             </span>
                         </td>
diff --git a/resources/js/views/Profile.vue b/resources/js/views/Profile.vue
index 674387a0..dd024171 100644
--- a/resources/js/views/Profile.vue
+++ b/resources/js/views/Profile.vue
@@ -107,10 +107,14 @@
 				'config'
 			]),
             subscriptionStatus() {
-                return this.user.data.attributes.subscription ? this.$t('global.premium') : this.$t('global.free')
+                return this.user.data.relationships.subscription
+					? this.$t('global.premium')
+					: this.$t('global.free')
             },
             subscriptionColor() {
-                return this.user.data.attributes.subscription ? 'green' : 'purple'
+                return this.user.data.relationships.subscription
+					? 'green'
+					: 'purple'
             },
             canShowUpgradeWarning() {
                 return this.config.storageLimit && this.user.data.attributes.storage.used > 95
diff --git a/src/Domain/Admin/Controllers/Dashboard/GetWidgetsValuesController.php b/src/Domain/Admin/Controllers/Dashboard/GetWidgetsValuesController.php
index 2d46240c..aad4484a 100644
--- a/src/Domain/Admin/Controllers/Dashboard/GetWidgetsValuesController.php
+++ b/src/Domain/Admin/Controllers/Dashboard/GetWidgetsValuesController.php
@@ -4,6 +4,7 @@ namespace Domain\Admin\Controllers\Dashboard;
 use ByteUnits\Metric;
 use App\Users\Models\User;
 use App\Http\Controllers\Controller;
+use VueFileManager\Subscription\Domain\Subscriptions\Models\Subscription;
 
 class GetWidgetsValuesController extends Controller
 {
@@ -19,6 +20,7 @@ class GetWidgetsValuesController extends Controller
             'app_version'         => config('vuefilemanager.version'),
             'total_users'         => User::count(),
             'total_used_space'    => $storage_usage,
+            'total_premium_users'    => Subscription::count(),
         ];
     }
 }