Merge remote-tracking branch 'origin/master' into light

# Conflicts:
#	.env.testing
#	README.md
#	composer.json
#	composer.lock
#	config/language-translations.php
#	config/vuefilemanager.php
#	public/chunks/admin.js
#	public/chunks/database.js
#	public/chunks/demo.js
#	public/chunks/files.js
#	public/chunks/my-shared-items.js
#	public/chunks/platform.js
#	public/chunks/recent-uploads.js
#	public/chunks/settings-storage.js
#	public/chunks/settings.js
#	public/chunks/shared.js
#	public/chunks/shared/browser.js
#	public/chunks/shared/single-file.js
#	public/chunks/sign-in.js
#	public/chunks/status-check.js
#	public/chunks/trash.js
#	public/chunks/user-storage.js
#	public/css/tailwind.css
#	public/js/main.js
#	public/mix-manifest.json
#	resources/js/components/Subscription/UserFixedSubscriptionDetail.vue
#	resources/js/store/modules/userAuth.js
#	resources/js/views/Admin.vue
#	resources/js/views/Admin/PaymentSettings/PaymentSettingsTab/Payments.vue
#	resources/js/views/Admin/Plans.vue
#	resources/js/views/Admin/Plans/Create/CreateFixedPlan.vue
#	resources/js/views/Admin/Settings/AppSettingsTabs/SignInUp.vue
#	resources/js/views/Demo.vue
#	resources/js/views/Frontpage/Homepage.vue
#	resources/js/views/Platform.vue
#	resources/views/index.blade.php
#	src/App/Console/Commands/SetupWebsocketEnvironment.php
#	src/App/Users/Models/UserLimitation.php
#	src/Domain/RemoteUpload/Controllers/RemoteUploadFileController.php
#	src/Domain/RemoteUpload/Controllers/UploadFilesRemotelyForUploadRequestController.php
#	src/Domain/RemoteUpload/Controllers/VisitorRemoteUploadFileController.php
#	src/Domain/RemoteUpload/Requests/RemoteUploadRequest.php
#	src/Domain/Settings/Controllers/StoreBroadcastServiceCredentialsController.php
#	src/Domain/Settings/Controllers/StorePaymentServiceCredentialsController.php
#	src/Domain/SetupWizard/Controllers/StoreEnvironmentSettingsController.php
#	src/Domain/UploadRequest/Controllers/UploadFilesForUploadRequestController.php
#	src/Support/Upgrading/Controllers/UpgradingVersionsController.php

resources/js/views/Auth/SignIn.vue

@@ -1,5 +1,5 @@
 <template>
-    <AuthContentWrapper ref="auth" class="h-screen">
+    <AuthContentWrapper v-if="isVisible" ref="auth" class="h-screen">
         <!--Log In by Email-->
         <AuthContent name="log-in" :visible="true">
             <Headline :title="$t('welcome_back')" :description="$t('page_login.subtitle')" />
@@ -245,6 +245,7 @@ export default {
     },
     data() {
         return {
+			isVisible: false,
             isLoading: false,
             validSignIn: false,
             checkedAccount: undefined,
@@ -432,14 +433,20 @@ export default {
             }
         },
     },
-    created() {
-        this.$scrollTop()
-        this.$store.commit('PROCESSING_POPUP', undefined)
-
+	mounted() {
 		// Redirect if user is authenticated
 		if (this.$root.$data.config.isAuthenticated) {
 			this.$router.push({name: 'Files'})
 		}
+	},
+	created() {
+		// Show the page when user is not authenticated
+		if (! this.$root.$data.config.isAuthenticated) {
+			this.isVisible = true
+		}
+
+        this.$scrollTop()
+        this.$store.commit('PROCESSING_POPUP', undefined)
 
         if (this.config.isDemo || this.config.isDev) {
             this.loginEmail = 'howdy@hi5ve.digital'

resources/js/views/Auth/SignUp.vue

@@ -252,6 +252,12 @@ export default {
                                 'Your New Password': error.response.data.errors['password'],
                             })
                         }
+
+                        if (error.response.data.errors['reCaptcha']) {
+							events.$emit('alert:open', {
+								title: error.response.data.message,
+							})
+                        }
                     }
                 })
 				.finally(() => {

resources/js/views/Platform.vue

@@ -37,7 +37,7 @@
             <MobileToolbar />
 
             <!--File list & info sidebar-->
-            <div class="flex space-x-3 lg:overflow-hidden grow">
+            <div class="flex space-x-3 lg:overflow-hidden grow" @drop.stop.prevent="uploadDroppedItems($event)" @dragenter.prevent @dragover.prevent>
                 <router-view id="file-view" class="relative w-full" :key="$route.fullPath" />
 
                 <InfoSidebar v-if="isVisibleSidebar" />
@@ -91,7 +91,7 @@ export default {
         DragUI,
     },
     computed: {
-        ...mapGetters(['isVisibleSidebar', 'config']),
+        ...mapGetters(['isVisibleSidebar', 'config', 'currentFolder']),
     },
     data() {
         return {
@@ -99,6 +99,9 @@ export default {
         }
     },
     methods: {
+		uploadDroppedItems(event) {
+			this.$uploadDraggedFiles(event, this.currentFolder?.data.id)
+		},
         contextMenu(event, item) {
             events.$emit('context-menu:show', event, item)
         },

resources/js/views/SetupWizard/StatusCheck.vue

@@ -15,7 +15,7 @@
 
 			<!--<a href="https://codecanyon.net/item/vue-file-manager-with-laravel-backend/25815986">
 				<AlertBox color="rose" class="text-left">
-					<p class="text-rose-500">Please make sure you have only legal copy of VueFileManager <b class="text-rose-500 underline">purchased from CodeCanyon</b>. Any illegal copy can contain malicious software, bugs and others security issues which exposes your files to abuse.</p>
+					<p class="text-rose-500">Please make sure you have only legal copy of VueFileManager <b class="text-rose-500 underline">purchased from CodeCanyon</b>. Any illegal copy can contain malicious software, bugs and others security issues which exposes your files to data breach.</p>
 				</AlertBox>
 			</a>-->
 

resources/js/views/Shared.vue

@@ -31,7 +31,7 @@
             <MobileToolbar />
 
             <!--File list & info sidebar-->
-            <div class="flex space-x-3 lg:overflow-hidden grow">
+            <div class="flex space-x-3 lg:overflow-hidden grow" @drop.stop.prevent="uploadDroppedItems($event)" @dragenter.prevent @dragover.prevent>
                 <router-view id="file-view" class="relative w-full" :key="$route.fullPath" />
 
                 <InfoSidebar v-if="isVisibleSidebar" />
@@ -81,7 +81,7 @@ export default {
         Alert,
     },
     computed: {
-        ...mapGetters(['isVisibleSidebar', 'sharedDetail', 'config']),
+        ...mapGetters(['isVisibleSidebar', 'sharedDetail', 'config', 'currentFolder']),
     },
     data() {
         return {
@@ -89,6 +89,9 @@ export default {
         }
     },
     methods: {
+		uploadDroppedItems(event) {
+			this.$uploadDraggedFiles(event, this.currentFolder?.data.id)
+		},
         contextMenu(event, item) {
             events.$emit('context-menu:show', event, item)
         },

resources/js/views/UploadRequest.vue

@@ -27,7 +27,7 @@
             <MobileUploadRequestToolBar v-if="canShowUI" />
 
             <!--File list & info sidebar-->
-            <div class="flex space-x-3 lg:overflow-hidden grow">
+            <div class="flex space-x-3 lg:overflow-hidden grow" @drop.stop.prevent="uploadDroppedItems($event)" @dragenter.prevent @dragover.prevent>
                 <router-view id="file-view" class="relative w-full" :key="$route.fullPath" />
 
                 <InfoSidebarUploadRequest v-if="canShowUI && isVisibleSidebar" />
@@ -73,7 +73,7 @@ export default {
         DragUI,
     },
     computed: {
-        ...mapGetters(['isVisibleSidebar', 'config', 'uploadRequest', 'fileQueue']),
+        ...mapGetters(['isVisibleSidebar', 'config', 'uploadRequest', 'fileQueue', 'currentFolder']),
 		canShowUI() {
 			return (this.uploadRequest && this.uploadRequest.data.attributes.status === 'filling') || this.fileQueue.length > 0
 		}
@@ -84,6 +84,9 @@ export default {
         }
     },
     methods: {
+		uploadDroppedItems(event) {
+			this.$uploadDraggedFiles(event, this.currentFolder?.data.id)
+		},
         contextMenu(event, item) {
             events.$emit('context-menu:show', event, item)
         },