From 30ae2c0a54623cfe991b6014e3739d50f3b81cef Mon Sep 17 00:00:00 2001
From: Peter Papp <peterpapp@makingcg.com>
Date: Wed, 7 Apr 2021 07:48:07 +0200
Subject: [PATCH] - fixes

---
 app/Http/Resources/InvoiceAdminResource.php   |   4 +-
 app/Http/Resources/LanguageResource.php       |   8 +-
 app/Notifications/SharedSendViaEmail.php      |  12 +-
 public/mix-manifest.json                      | 204 +++++++++++-------
 resources/js/App.vue                          |  15 +-
 .../js/components/FilesView/ContextMenu.vue   |   8 +-
 resources/js/components/Others/ShareEdit.vue  |   2 +-
 resources/js/components/Sidebar/MenuBar.vue   |   2 +-
 resources/js/helpers.js                       |   8 +-
 resources/js/store/modules/userAuth.js        |   4 -
 resources/js/views/Admin/Users.vue            |   2 +-
 .../views/vendor/mail/html/message.blade.php  |   2 +-
 .../views/vendor/mail/text/message.blade.php  |   6 +-
 13 files changed, 163 insertions(+), 114 deletions(-)

diff --git a/app/Http/Resources/InvoiceAdminResource.php b/app/Http/Resources/InvoiceAdminResource.php
index fb20fb3a..d6b8d1c6 100644
--- a/app/Http/Resources/InvoiceAdminResource.php
+++ b/app/Http/Resources/InvoiceAdminResource.php
@@ -52,8 +52,8 @@ class InvoiceAdminResource extends JsonResource
                                     'id'         => $user->id,
                                     'type'       => 'user',
                                     'attributes' => [
-                                        'name'   => $user->name,
-                                        'avatar' => $user->avatar,
+                                        'name'   => $user->settings->name,
+                                        'avatar' => $user->settings->avatar,
                                     ]
                                 ]
                             ]
diff --git a/app/Http/Resources/LanguageResource.php b/app/Http/Resources/LanguageResource.php
index 03e7da34..0d2f5a08 100644
--- a/app/Http/Resources/LanguageResource.php
+++ b/app/Http/Resources/LanguageResource.php
@@ -19,11 +19,11 @@ class LanguageResource extends JsonResource
                 'id'         => $this->id,
                 'type'       => 'languages',
                 'attributes' => [
-                    'name'        => $this->name,
-                    'locale'      => $this->locale,
+                    'name'         => $this->name,
+                    'locale'       => $this->locale,
                     'translations' => map_language_translations($this->languageTranslations),
-                    'updated_at'  => $this->updated_at,
-                    'created_at'  => $this->created_at,
+                    'updated_at'   => $this->updated_at,
+                    'created_at'   => $this->created_at,
                 ]
             ],
         ];
diff --git a/app/Notifications/SharedSendViaEmail.php b/app/Notifications/SharedSendViaEmail.php
index adb8f9a2..3c710fd7 100644
--- a/app/Notifications/SharedSendViaEmail.php
+++ b/app/Notifications/SharedSendViaEmail.php
@@ -26,7 +26,7 @@ class SharedSendViaEmail extends Notification
     /**
      * Get the notification's delivery channels.
      *
-     * @param  mixed  $notifiable
+     * @param mixed $notifiable
      * @return array
      */
     public function via($notifiable)
@@ -37,23 +37,23 @@ class SharedSendViaEmail extends Notification
     /**
      * Get the mail representation of the notification.
      *
-     * @param  mixed  $notifiable
+     * @param mixed $notifiable
      * @return \Illuminate\Notifications\Messages\MailMessage
      */
     public function toMail($notifiable)
     {
         return (new MailMessage)
-            ->subject(__t('shared_link_email_subject', ['user' => $this->user->name]))
+            ->subject(__t('shared_link_email_subject', ['user' => $this->user->settings->name]))
             ->greeting(__t('shared_link_email_greeting'))
-            ->line(__t('shared_link_email_user', ['user' => $this->user->name, 'email' => $this->user->email]))
-            ->action(__t('shared_link_email_link'), url('/shared', ['token' => $this->token]))
+            ->line(__t('shared_link_email_user', ['user' => $this->user->settings->name, 'email' => $this->user->email]))
+            ->action(__t('shared_link_email_link'), url('/share', ['token' => $this->token]))
             ->salutation(__t('shared_link_email_salutation', ['app_name' => get_setting('app_title') ?? 'VueFileManager']));
     }
 
     /**
      * Get the array representation of the notification.
      *
-     * @param  mixed  $notifiable
+     * @param mixed $notifiable
      * @return array
      */
     public function toArray($notifiable)
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 9b26311f..9ba7ff93 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,78 +1,130 @@
 {
-    "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~2fac28cc.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~2fac28cc.js?id=d8dac775684711abc6e2",
-    "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~5f8db287.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~5f8db287.js?id=d85e8bc2bb4fc4b9cd7e",
-    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js?id=c66284153aad2ded9e76",
-    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/user-invoices.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/user-invoices.js?id=b86bb5ed5ed6e0f6370d",
-    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.js?id=5d75a1ca01c66121cef0",
-    "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.js?id=9796817971074f2a6e88",
-    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.js?id=d94cae0a0542a998533f",
-    "/chunks/not-found.js": "/chunks/not-found.js?id=fc2ff097020968f2d5cd",
-    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=6d8001036a283c172421",
-    "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=f22ae13b0fab3649ab82",
-    "/vendors~chunks/platform~chunks/shared.js": "/vendors~chunks/platform~chunks/shared.js?id=0a546ed495f1f5583815",
-    "/js/main.js": "/js/main.js?id=cb0e31856b4eebfc2c63",
-    "/css/app.css": "/css/app.css?id=5ef36155a311dd4539c1",
-    "/chunks/admin.js": "/chunks/admin.js?id=4a4642b1449b12938647",
-    "/chunks/admin-account.js": "/chunks/admin-account.js?id=6a4ef801ae913dd1ee7b",
-    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=6d124dd0271313a2515d",
-    "/chunks/app-billings.js": "/chunks/app-billings.js?id=704306133eaf1b421f16",
-    "/chunks/app-email.js": "/chunks/app-email.js?id=f8efc9f7b0b1df0525ff",
-    "/chunks/app-index.js": "/chunks/app-index.js?id=3798e9618b0564fa0ea2",
-    "/chunks/app-language.js": "/chunks/app-language.js?id=c3232b185e629c7b2aa6",
-    "/chunks/app-others.js": "/chunks/app-others.js?id=39985ccbe8f39fe9a083",
-    "/chunks/app-payments.js": "/chunks/app-payments.js?id=1029b1747dfde91b953a",
-    "/chunks/app-settings.js": "/chunks/app-settings.js?id=d692adc91ca095f94fc8",
-    "/chunks/app-setup.js": "/chunks/app-setup.js?id=5d4e744e69e891d78bbd",
-    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=2eb0c661606bf16e1082",
-    "/chunks/contact-us.js": "/chunks/contact-us.js?id=cb8fae04b6f621bb6f28",
-    "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=4fbe3bbb9686d4458890",
-    "/chunks/dashboard.js": "/chunks/dashboard.js?id=259c9566cfd1b9335ee1",
-    "/chunks/database.js": "/chunks/database.js?id=6dd9f7c9b08855f76b03",
-    "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=2e798773dca85163b635",
-    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=ea40a677e31359cad35b",
-    "/chunks/files.js": "/chunks/files.js?id=b38b95a7e3858280da4d",
-    "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=87fa0dea6e278f0d9fa6",
-    "/chunks/homepage.js": "/chunks/homepage.js?id=5dd65053e0e8343414ce",
-    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=d3b0e6721ec5b11740ac",
-    "/chunks/invoices.js": "/chunks/invoices.js?id=d2e470345a746663791a",
-    "/chunks/page-edit.js": "/chunks/page-edit.js?id=bc5165077353a132abc4",
-    "/chunks/pages.js": "/chunks/pages.js?id=1d7aafd7cf6bfe11b164",
-    "/chunks/plan.js": "/chunks/plan.js?id=903644fc6c27057eb2f3",
-    "/chunks/plan-create.js": "/chunks/plan-create.js?id=b933b9e49481af032098",
-    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=50baf5cf629ee3903fd0",
-    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=c781eb6d899da8e57aa0",
-    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=33d0c89b8430649273d1",
-    "/chunks/plans.js": "/chunks/plans.js?id=e778c331d11dc43866ff",
-    "/chunks/platform.js": "/chunks/platform.js?id=917d0d1b352dc6272b89",
-    "/chunks/profile.js": "/chunks/profile.js?id=ab1995eb9d97ec2cb784",
-    "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=b9a343b2984e16cfae87",
-    "/chunks/settings.js": "/chunks/settings.js?id=29e314ebc4f9491b7756",
-    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=be52c8a193616c779879",
-    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=38572f09dcd45b8c4dcf",
-    "/chunks/settings-password.js": "/chunks/settings-password.js?id=7f7f80bc81b73590e280",
-    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=7e21528c745de0d6f2c2",
-    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=bbbe5dd6a91923608287",
-    "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=ee691ad5fe2498f10993",
-    "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=105acf51fb151cabf487",
-    "/chunks/shared.js": "/chunks/shared.js?id=5497376628e7d35fbf69",
-    "/chunks/shared-files.js": "/chunks/shared-files.js?id=6af59dbf40d0bbefdc96",
-    "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=b1dda61a10d9cea61781",
-    "/chunks/shared/file-browser.js": "/chunks/shared/file-browser.js?id=d6f83795a0b88ab97818",
-    "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=7ab003bd006e1bd72980",
-    "/chunks/sign-in.js": "/chunks/sign-in.js?id=04eeeda33ed232828a33",
-    "/chunks/sign-up.js": "/chunks/sign-up.js?id=671720eed6e61187be2f",
-    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=95aff9048c0efb23f1a5",
-    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=3de434fc34d74946362d",
-    "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=1e3bb2d63a37223ac6ca",
-    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=067706d17434c26e0528",
-    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=b1febc87df1b7bd4a788",
-    "/chunks/user.js": "/chunks/user.js?id=161a09a030c697aa1033",
-    "/chunks/user-create.js": "/chunks/user-create.js?id=30c323ebdadb7971c6d0",
-    "/chunks/user-delete.js": "/chunks/user-delete.js?id=93f3915b2f23f42fdf65",
-    "/chunks/user-detail.js": "/chunks/user-detail.js?id=c935dff42d02409deddc",
-    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=30f659c7c2b525ebf5c4",
-    "/chunks/user-password.js": "/chunks/user-password.js?id=0fdaeab06a9ed470f998",
-    "/chunks/user-storage.js": "/chunks/user-storage.js?id=eb781736774421190277",
-    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=48913987b99e2b46132d",
-    "/chunks/users.js": "/chunks/users.js?id=5e74be652815d373a9b8"
+    "/js/main.js": "/js/main.js",
+    "/css/app.css": "/css/app.css",
+    "/chunks/admin.js": "/chunks/admin.js?id=f3df96ed0302c713ab20",
+    "/chunks/admin-account.js": "/chunks/admin-account.js?id=3036df3e72596fabc42e",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js?id=62b552a0492fe95b2223",
+    "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~cf616679.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~cf616679.js?id=fd241499c4e3b6a88840",
+    "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~eeab5771.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~eeab5771.js?id=99dbb760d4e3dd0acdbf",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared/file-browser.js?id=9b66c2dab4c6103bb53c",
+    "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=3d9f93a03cb1ffa61d01",
+    "/chunks/admin~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/shared.js?id=12f0aaeb615c37d0515d",
+    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=b4e2d99a172f06a1d312",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js?id=1ae1e65bb6a5ed7c3e10",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js?id=7702f37f277478ad66c6",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js?id=04f0cd9719723459b685",
+    "/chunks/app-billings.js": "/chunks/app-billings.js?id=82133cc16f55222bbbe6",
+    "/chunks/app-email.js": "/chunks/app-email.js?id=c578a85112c6a4b1ed0e",
+    "/chunks/app-index.js": "/chunks/app-index.js?id=7f07dceace5c9c8255bb",
+    "/chunks/app-language.js": "/chunks/app-language.js?id=4cecb39459ed4cd51ce5",
+    "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/s~38c276fc.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/s~38c276fc.js?id=e4abf38870f961cb6979",
+    "/chunks/app-others.js": "/chunks/app-others.js?id=9156adba3b1697a8bf3e",
+    "/chunks/app-payments.js": "/chunks/app-payments.js?id=7e1a982c90174f568fb2",
+    "/chunks/app-settings.js": "/chunks/app-settings.js?id=bbf2a2e436d939f7fc07",
+    "/chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~8a0e1d25.js": "/chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~8a0e1d25.js?id=e71bb0286189734a8aec",
+    "/chunks/app-setup.js": "/chunks/app-setup.js?id=d0e3e046e147ca928f34",
+    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=d0ade32264f71dd7a2af",
+    "/chunks/contact-us.js": "/chunks/contact-us.js?id=f5276b101b2e0c97d6d1",
+    "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js": "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js?id=22bd5db44c72e8de5f5b",
+    "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=48dc53ccbd502c2739ec",
+    "/chunks/dashboard.js": "/chunks/dashboard.js?id=0abeb3fe810c2c05c2d3",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js?id=7540af768b1cfda01a13",
+    "/chunks/database.js": "/chunks/database.js?id=7374830dc3cbddf41abb",
+    "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=6dccc2158cc6278f683d",
+    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=208de84df68177288a2a",
+    "/chunks/files.js": "/chunks/files.js?id=40b4464ce393cb112111",
+    "/chunks/files~chunks/platform~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/platform~chunks/shared-files~chunks/shared/file-browser.js?id=39233d603662ca3738e8",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.js?id=7a7569217b7d3f4f511d",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~chunks/sha~8510f6c9.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~chunks/sha~8510f6c9.js?id=b4ccb4a816e5c72a0b85",
+    "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared/file-browser~chunks/user~9058a49f.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared/file-browser~chunks/user~9058a49f.js?id=31a17ad1d2536342abbe",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.js?id=b40f3da5c48a325d2b60",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.js?id=9b875b7ea10b575524e6",
+    "/chunks/files~chunks/shared/file-browser.js": "/chunks/files~chunks/shared/file-browser.js?id=a67929ed0c257f501268",
+    "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=877a9289b77ac3885042",
+    "/chunks/homepage.js": "/chunks/homepage.js?id=48e0e9b3c870c46218ce",
+    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=c523e816ae410f52d767",
+    "/chunks/invoices.js": "/chunks/invoices.js?id=c3c3720fa6e90bf84d06",
+    "/chunks/not-found.js": "/chunks/not-found.js?id=7204a74c2db0ab70149c",
+    "/chunks/page-edit.js": "/chunks/page-edit.js?id=6d9402b916f354371bff",
+    "/chunks/pages.js": "/chunks/pages.js?id=57ab427168a4b5ea8459",
+    "/chunks/plan.js": "/chunks/plan.js?id=fc2627f965c0f7440b1b",
+    "/chunks/plan-create.js": "/chunks/plan-create.js?id=92ca81965dc17b3ec7a3",
+    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=f193816778245ea66d02",
+    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=66123f72696b47a986a2",
+    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=08e2056bc3744b2ea8f9",
+    "/chunks/plans.js": "/chunks/plans.js?id=5cd276d44056394e6031",
+    "/chunks/platform.js": "/chunks/platform.js?id=974f472fe6b22609fa68",
+    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=3d5804463c897995e9d1",
+    "/chunks/profile.js": "/chunks/profile.js?id=1c1c666004fb44b1c404",
+    "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=d448806bfefc6cc43f0d",
+    "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=e00ee12cde704060e15b",
+    "/chunks/settings.js": "/chunks/settings.js?id=acab97600f2c73dc8035",
+    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=88849e6ddce9226d49a5",
+    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=444b9bbc310647ddd297",
+    "/chunks/settings-password.js": "/chunks/settings-password.js?id=46961d5c0fc91f4ad638",
+    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=3bc709a228c0849a6f62",
+    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=ced13fc6a34233fb53aa",
+    "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=22e5c49d5b0a154e1a28",
+    "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=c6b88005b133268ed88f",
+    "/chunks/shared.js": "/chunks/shared.js?id=2c38f535d52e0e448846",
+    "/chunks/shared-files.js": "/chunks/shared-files.js?id=cde3c7a58d2da0015555",
+    "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=3d5c7754d438830a4204",
+    "/chunks/shared/file-browser.js": "/chunks/shared/file-browser.js?id=3127fab4cfd3d5f00a72",
+    "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=e8aedb75df7fe227d693",
+    "/chunks/sign-in.js": "/chunks/sign-in.js?id=61e5b97e8273aec430ad",
+    "/chunks/sign-up.js": "/chunks/sign-up.js?id=ce15b1156cf37c0a9703",
+    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=1acdec3a157c8943a88d",
+    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=a843f8cf90ff1e3168e8",
+    "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=90c1aa9431689a89eb3d",
+    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=b06efc03a40bcba2bdad",
+    "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=bd0ea4ed873b1ed8f6f7",
+    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=35179531a8241da128e9",
+    "/chunks/user.js": "/chunks/user.js?id=d847904844fc76c1652e",
+    "/chunks/user-create.js": "/chunks/user-create.js?id=0ede0db725f2c822c336",
+    "/chunks/user-delete.js": "/chunks/user-delete.js?id=5af2fc09b4b639452756",
+    "/chunks/user-detail.js": "/chunks/user-detail.js?id=b9b70e43cf551a574443",
+    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=6c4d0e9e058be11dc1f7",
+    "/chunks/user-password.js": "/chunks/user-password.js?id=a4b4ab4f4af11533eb4d",
+    "/chunks/user-storage.js": "/chunks/user-storage.js?id=4aec2d7b60ec0bc35fb9",
+    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=99efdd410910267db66e",
+    "/chunks/users.js": "/chunks/users.js?id=01bfb9246730f3586f29",
+    "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~2fac28cc.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~2fac28cc.js?id=57c854adb91ed9a9d088",
+    "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~d5e36d91.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~d5e36d91.js?id=170765b4fd923b62195c",
+    "/vendors~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~ch~52c14f2e.js": "/vendors~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~ch~52c14f2e.js?id=66afa0e341251a68c3d3",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.d1c4278d07311f1b0de2.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.d1c4278d07311f1b0de2.hot-update.js",
+    "/js/main.a41bb052f7b6c50309be.hot-update.js": "/js/main.a41bb052f7b6c50309be.hot-update.js",
+    "/chunks/users.e009d73120176bfd575b.hot-update.js": "/chunks/users.e009d73120176bfd575b.hot-update.js",
+    "/chunks/platform.679e5b78be08be00b456.hot-update.js": "/chunks/platform.679e5b78be08be00b456.hot-update.js",
+    "/js/main.26c236a3e4651b9372bf.hot-update.js": "/js/main.26c236a3e4651b9372bf.hot-update.js",
+    "/js/main.07f7c31b5d396b12b5b8.hot-update.js": "/js/main.07f7c31b5d396b12b5b8.hot-update.js",
+    "/js/main.5c76647b0e017eaab734.hot-update.js": "/js/main.5c76647b0e017eaab734.hot-update.js",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.5c76647b0e017eaab734.hot-update.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.5c76647b0e017eaab734.hot-update.js",
+    "/chunks/app-language.5c76647b0e017eaab734.hot-update.js": "/chunks/app-language.5c76647b0e017eaab734.hot-update.js",
+    "/chunks/dashboard.5c76647b0e017eaab734.hot-update.js": "/chunks/dashboard.5c76647b0e017eaab734.hot-update.js",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.5c76647b0e017eaab734.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.5c76647b0e017eaab734.hot-update.js",
+    "/chunks/homepage.5c76647b0e017eaab734.hot-update.js": "/chunks/homepage.5c76647b0e017eaab734.hot-update.js",
+    "/chunks/installation-disclaimer.5c76647b0e017eaab734.hot-update.js": "/chunks/installation-disclaimer.5c76647b0e017eaab734.hot-update.js",
+    "/chunks/invoices.5c76647b0e017eaab734.hot-update.js": "/chunks/invoices.5c76647b0e017eaab734.hot-update.js",
+    "/chunks/page-edit.5c76647b0e017eaab734.hot-update.js": "/chunks/page-edit.5c76647b0e017eaab734.hot-update.js",
+    "/chunks/pages.5c76647b0e017eaab734.hot-update.js": "/chunks/pages.5c76647b0e017eaab734.hot-update.js",
+    "/chunks/plan.5c76647b0e017eaab734.hot-update.js": "/chunks/plan.5c76647b0e017eaab734.hot-update.js",
+    "/chunks/plans.5c76647b0e017eaab734.hot-update.js": "/chunks/plans.5c76647b0e017eaab734.hot-update.js",
+    "/chunks/settings.5c76647b0e017eaab734.hot-update.js": "/chunks/settings.5c76647b0e017eaab734.hot-update.js",
+    "/chunks/upgrade-billing~chunks/upgrade-plan.5c76647b0e017eaab734.hot-update.js": "/chunks/upgrade-billing~chunks/upgrade-plan.5c76647b0e017eaab734.hot-update.js",
+    "/chunks/user.5c76647b0e017eaab734.hot-update.js": "/chunks/user.5c76647b0e017eaab734.hot-update.js",
+    "/chunks/users.5c76647b0e017eaab734.hot-update.js": "/chunks/users.5c76647b0e017eaab734.hot-update.js",
+    "/js/main.844f624f247515289c02.hot-update.js": "/js/main.844f624f247515289c02.hot-update.js",
+    "/js/main.7e86ff928328fca2c702.hot-update.js": "/js/main.7e86ff928328fca2c702.hot-update.js",
+    "/js/main.e456cbd528bca91f48a6.hot-update.js": "/js/main.e456cbd528bca91f48a6.hot-update.js",
+    "/chunks/admin~chunks/platform.ff2f47a2fcf634fb6996.hot-update.js": "/chunks/admin~chunks/platform.ff2f47a2fcf634fb6996.hot-update.js",
+    "/js/main.c01ab0c5b71f7999980d.hot-update.js": "/js/main.c01ab0c5b71f7999980d.hot-update.js",
+    "/chunks/admin~chunks/platform.ff841aad86b0e94b8055.hot-update.js": "/chunks/admin~chunks/platform.ff841aad86b0e94b8055.hot-update.js",
+    "/js/main.a43fd27afa3d129fab29.hot-update.js": "/js/main.a43fd27afa3d129fab29.hot-update.js",
+    "/js/main.08259350560c643add38.hot-update.js": "/js/main.08259350560c643add38.hot-update.js",
+    "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~eeab5771.72f5bef15d6e81b04f0f.hot-update.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~eeab5771.72f5bef15d6e81b04f0f.hot-update.js",
+    "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~eeab5771.925c0dd3d2550d1eabab.hot-update.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~eeab5771.925c0dd3d2550d1eabab.hot-update.js",
+    "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~eeab5771.d010b8f6819834422ff0.hot-update.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~eeab5771.d010b8f6819834422ff0.hot-update.js",
+    "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~eeab5771.a06576ed51205a993112.hot-update.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~eeab5771.a06576ed51205a993112.hot-update.js",
+    "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~eeab5771.5b1c19c5f32462447e05.hot-update.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~eeab5771.5b1c19c5f32462447e05.hot-update.js",
+    "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~eeab5771.510df2af06c4e4dba50e.hot-update.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~eeab5771.510df2af06c4e4dba50e.hot-update.js"
 }
diff --git a/resources/js/App.vue b/resources/js/App.vue
index d2f93d17..1c3bd5dd 100644
--- a/resources/js/App.vue
+++ b/resources/js/App.vue
@@ -1,18 +1,24 @@
 <template>
     <div id="vuefilemanager" @click="unClick" v-cloak>
+
+        <!--UI components-->
         <Alert />
         <ToastrWrapper />
-
-        <router-view v-if="isLoadedTranslations" />
-
         <CookieDisclaimer />
         <Vignette />
+
+        <!--Show spinner before translations is loaded-->
+        <Spinner v-if="! isLoadedTranslations"/>
+
+        <!--App view-->
+        <router-view v-if="isLoadedTranslations" />
     </div>
 </template>
 
 <script>
 import ToastrWrapper from '@/components/Others/Notifications/ToastrWrapper'
 import CookieDisclaimer from '@/components/Others/CookieDisclaimer'
+import Spinner from '@/components/FilesView/Spinner'
 import Vignette from '@/components/Others/Vignette'
 import Alert from '@/components/FilesView/Alert'
 import {events} from './bus'
@@ -23,6 +29,7 @@ export default {
         CookieDisclaimer,
         ToastrWrapper,
         Vignette,
+        Spinner,
         Alert
     },
     data() {
@@ -39,7 +46,7 @@ export default {
 
         // Get language translations
         this.$store.dispatch('getLanguageTranslations', this.$root.$data.config.language)
-            .then(response => {
+            .then(() => {
                 this.isLoadedTranslations = true
 
                 // Store config to vuex
diff --git a/resources/js/components/FilesView/ContextMenu.vue b/resources/js/components/FilesView/ContextMenu.vue
index ddabb744..0edc5be2 100644
--- a/resources/js/components/FilesView/ContextMenu.vue
+++ b/resources/js/components/FilesView/ContextMenu.vue
@@ -96,7 +96,6 @@
                 <Option @click.native="addToFavourites" :title="isInFavourites ? $t('context_menu.remove_from_favourites') : $t('context_menu.add_to_favourites')" icon="favourites" />
             </OptionGroup>
 
-
             <OptionGroup v-if="item && isMultiSelectContextMenu">
                 <Option @click.native="renameItem" :title="$t('context_menu.rename')" icon="rename" />
                 <Option @click.native="moveItem" v-if="!$isThisLocation(['latest'])" :title="$t('context_menu.move')" icon="move-item" />
@@ -106,7 +105,6 @@
                 <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" />
             </OptionGroup>
 
-
             <OptionGroup v-if="item && isMultiSelectContextMenu ">
                 <Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail" />
                 <Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download" />
@@ -139,7 +137,6 @@
             </OptionGroup>
 
             <!-- Single options -->
-
             <OptionGroup v-if="item && isMultiSelectContextMenu">
                 <Option @click.native="renameItem" :title=" $t('context_menu.rename')" icon="rename" />
                 <Option @click.native="moveItem" :title="$t('context_menu.move')" icon="move-item" />
@@ -153,7 +150,6 @@
             </OptionGroup>
 
             <!-- Multi options -->
-
             <OptionGroup v-if="item && !isMultiSelectContextMenu">
                 <Option @click.native="moveItem" :title="$t('context_menu.move')" icon="move-item" />
                 <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" />
@@ -323,7 +319,9 @@ export default {
             }
         },
         createFolder() {
-            this.$store.dispatch('createFolder', this.$t('popup_create_folder.folder_default_name'))
+            this.$store.dispatch('createFolder', {
+                name: this.$t('popup_create_folder.folder_default_name')
+            })
         },
         closeAndResetContextMenu() {
             // Close context menu
diff --git a/resources/js/components/Others/ShareEdit.vue b/resources/js/components/Others/ShareEdit.vue
index ac7a22c2..422115fa 100644
--- a/resources/js/components/Others/ShareEdit.vue
+++ b/resources/js/components/Others/ShareEdit.vue
@@ -207,7 +207,7 @@
                 this.isLoading = true
 
                 axios.
-                    post(`/api/share/${this.shareOptions.token}/send-email`, {
+                    post(`/api/share/${this.shareOptions.token}/email`, {
                         emails: this.emails
                     })
                     .catch(() => {
diff --git a/resources/js/components/Sidebar/MenuBar.vue b/resources/js/components/Sidebar/MenuBar.vue
index 843ea13e..14dc5b7b 100644
--- a/resources/js/components/Sidebar/MenuBar.vue
+++ b/resources/js/components/Sidebar/MenuBar.vue
@@ -33,7 +33,7 @@
             </router-link>
         </div>
 
-        <!--User avatar & Logout-->
+        <!--Logout-->
         <ul class="icon-navigation logout">
             <li @click="$store.dispatch('logOut')" :title="$t('locations.logout')" class="icon-navigation-item">
                 <div class="button-icon">
diff --git a/resources/js/helpers.js b/resources/js/helpers.js
index 04d0cca6..2f6f4ae8 100644
--- a/resources/js/helpers.js
+++ b/resources/js/helpers.js
@@ -12,10 +12,10 @@ const Helpers = {
 
             let enableEmptyInput = ['mimetypes_blacklist', 'google_analytics', 'upload_limit']
 
-            if (value === '' && !enableEmptyInput.includes(name)) return
+            if (value === '' || value === ' ' && !enableEmptyInput.includes(name)) return
 
             axios.post(this.$store.getters.api + route, {name, value, _method: 'patch'})
-                .catch(error => {
+                .catch(() => {
                     events.$emit('alert:open', {
                         title: this.$t('popup_error.title'),
                         message: this.$t('popup_error.message'),
@@ -90,10 +90,6 @@ const Helpers = {
             win.focus()
         }
 
-        Vue.prototype.$createFolder = function (folderName) {
-            this.$store.dispatch('createFolder', folderName)
-        }
-
         Vue.prototype.$uploadFiles = async function (files) {
 
             if (files.length == 0) return
diff --git a/resources/js/store/modules/userAuth.js b/resources/js/store/modules/userAuth.js
index e414b5a9..447c82d1 100644
--- a/resources/js/store/modules/userAuth.js
+++ b/resources/js/store/modules/userAuth.js
@@ -16,10 +16,6 @@ const actions = {
                 .then((response) => {
                     resolve(response)
 
-                    // Redirect user if is logged
-                    if (router.currentRoute.name === 'SignIn')
-                        router.push({name: 'Files'})
-
                     commit('RETRIEVE_USER', response.data)
 
                 }).catch((error) => {
diff --git a/resources/js/views/Admin/Users.vue b/resources/js/views/Admin/Users.vue
index ed8aa37f..81c4e483 100644
--- a/resources/js/views/Admin/Users.vue
+++ b/resources/js/views/Admin/Users.vue
@@ -139,7 +139,7 @@
             this.columns = [
                 {
                     label: this.$t('admin_page_user.table.name'),
-                    field: 'name',
+                    field: 'email',
                     sortable: true
                 },
                 {
diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php
index 1a980860..441ba544 100644
--- a/resources/views/vendor/mail/html/message.blade.php
+++ b/resources/views/vendor/mail/html/message.blade.php
@@ -2,7 +2,7 @@
 @component('mail::layout')
 {{-- Header --}}
 @slot('header')
-@component('mail::header', ['url' => config('app.url')])
+@component('mail::header', ['url' => url('/')])
 {{ get_setting('app_title') ?? 'VueFileManager' }}
 @endcomponent
 @endslot
diff --git a/resources/views/vendor/mail/text/message.blade.php b/resources/views/vendor/mail/text/message.blade.php
index 1ae9ed8f..c02aa5f6 100644
--- a/resources/views/vendor/mail/text/message.blade.php
+++ b/resources/views/vendor/mail/text/message.blade.php
@@ -1,8 +1,8 @@
 @component('mail::layout')
     {{-- Header --}}
     @slot('header')
-        @component('mail::header', ['url' => config('app.url')])
-            {{ config('app.name') }}
+        @component('mail::header', ['url' => url('/')])
+            {{ get_setting('app_title') }}
         @endcomponent
     @endslot
 
@@ -21,7 +21,7 @@
     {{-- Footer --}}
     @slot('footer')
         @component('mail::footer')
-            © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
+            © {{ date('Y') }} {{ get_setting('app_title') }}. @lang('All rights reserved.')
         @endcomponent
     @endslot
 @endcomponent