diff --git a/.env.example b/.env.example index f1f505ed..06632793 100644 --- a/.env.example +++ b/.env.example @@ -11,7 +11,6 @@ SCOUT_DRIVER=tntsearch SCOUT_QUEUE=true FILESYSTEM_DISK=local -CHUNK_SIZE=128 DB_CONNECTION=mysql DB_HOST=127.0.0.1 diff --git a/config/language-translations.php b/config/language-translations.php index 25d1e8ea..ad1cf7a4 100644 --- a/config/language-translations.php +++ b/config/language-translations.php @@ -339,7 +339,7 @@ return [ 'clear_cache' => 'Clear Cache', 'admin_settings.others.contact_email' => 'Contact Email', 'admin_settings.others.contact_email_plac' => 'Type your contact email', - 'admin_settings.others.default_storage' => 'Default Storage Space for User Accounts', + 'admin_settings.others.default_storage' => 'Default Storage Space for User Accounts (in MB)', 'admin_settings.others.default_storage_plac' => 'Set default storage space in GB', 'admin_settings.others.google_analytics' => 'Google Analytics Code (optional)', 'admin_settings.others.google_analytics_plac' => 'Paste your Google Analytics Code', @@ -348,7 +348,7 @@ return [ 'admin_settings.others.mimetypes_blacklist_plac' => 'Add mimetypes to Blacklist', 'admin_settings.others.storage_limit' => 'Storage Limitation', 'admin_settings.others.storage_limit_help' => "If this value is off, all users will have infinity storage capacity and you won't be able to charge your users for storage plan.", - 'admin_settings.others.upload_limit' => 'Upload Limit', + 'admin_settings.others.upload_limit' => 'Upload Limit (in MB)', 'admin_settings.others.upload_limit_help' => 'If you want to set max file size limit on single upload, add size of your limit in MB. E.g. 100 means 100 MB and 2 000 means 2 000 MB limit.', 'admin_settings.others.upload_limit_plac' => 'Type your upload limit in MB', 'appearance' => 'Appearance', diff --git a/config/vuefilemanager.php b/config/vuefilemanager.php index 146dc624..e2eb39c3 100644 --- a/config/vuefilemanager.php +++ b/config/vuefilemanager.php @@ -9,10 +9,6 @@ return [ 'is_setup_wizard_debug' => env('IS_SETUP_WIZARD_DEBUG', false), 'is_admin_vuefilemanager_bar' => env('IS_ADMIN_VUEFILEMANAGER_BAR', true), - // Define size of chunk uploaded by MB. - // E.g. integer 128 means chunk size will be 128 MB. - 'chunk_size' => env('CHUNK_SIZE', '128'), - 'colors' => [ '#9ad2bf', '#9ad2cd', diff --git a/public/mix-manifest.json b/public/mix-manifest.json index f7bf9c94..cec71849 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -9,7 +9,7 @@ "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=e1ad83583367917a", "/chunks/app-setup.js": "/chunks/app-setup.js?id=288594cd7f628cf8", "/chunks/admin-account.js": "/chunks/admin-account.js?id=916450217130f3b8", - "/chunks/shared.js": "/chunks/shared.js?id=11da834fce6ab9c3", + "/chunks/shared.js": "/chunks/shared.js?id=2574e8abb4cfadca", "/chunks/shared/browser.js": "/chunks/shared/browser.js?id=6b2316ea14852488", "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=70ee7ce098c77d54", "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=672e931a9fb0b672", @@ -43,7 +43,7 @@ "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=a694a01f3641712c", "/chunks/app-index.js": "/chunks/app-index.js?id=efdbfa062749ca00", "/chunks/app-environment.js": "/chunks/app-environment.js?id=9632034e8ded7d34", - "/chunks/app-others.js": "/chunks/app-others.js?id=0f84e2ed1230558e", + "/chunks/app-others.js": "/chunks/app-others.js?id=16dc948aa2205189", "/chunks/app-sign-in-out.js": "/chunks/app-sign-in-out.js?id=1cfffc99465b9a7a", "/chunks/app-adsense.js": "/chunks/app-adsense.js?id=a5dc9e715f8561bd", "/chunks/app-server.js": "/chunks/app-server.js?id=4510d63685353c68", @@ -62,7 +62,7 @@ "/chunks/settings-password.js": "/chunks/settings-password.js?id=11d4331650cac280", "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=994b669a56fd417b", "/chunks/billing.js": "/chunks/billing.js?id=40e758c87bcf6e89", - "/chunks/platform.js": "/chunks/platform.js?id=018b4aa10f3627f8", + "/chunks/platform.js": "/chunks/platform.js?id=12b02f5e6ea383fa", "/chunks/files.js": "/chunks/files.js?id=bed8debe238dd68f", "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=a27d80d1e54995ca", "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=c1379a64bd5fa0d3", diff --git a/resources/js/components/FilesView/InfoSidebar.vue b/resources/js/components/FilesView/InfoSidebar.vue index 875569e5..6c6bf97b 100644 --- a/resources/js/components/FilesView/InfoSidebar.vue +++ b/resources/js/components/FilesView/InfoSidebar.vue @@ -158,9 +158,10 @@ export default { }, canShowAuthor() { return ( - this.$isThisRoute(this.$route, ['SharedWithMe', 'TeamFolders']) && - this.clipboard[0].data.type !== 'folder' && - this.user.data.id !== this.clipboard[0].data.relationships.creator.data.id + this.$isThisRoute(this.$route, ['SharedWithMe', 'TeamFolders']) + && this.clipboard[0].data.type !== 'folder' + && this.clipboard[0].data.relationships.creator + && this.user.data.id !== this.clipboard[0].data.relationships.creator.data.id ) }, isTeamsHomepage() { diff --git a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue index 25de0d62..750e3e61 100644 --- a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue +++ b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue @@ -49,6 +49,21 @@ /> + + + + -
+
{{ $t('Upgrade your License') }} @@ -409,7 +424,7 @@ export default { axios .get('/api/admin/settings', { params: { - column: 'contact_email|google_analytics|default_max_storage_amount|storage_limitation|mimetypes_blacklist|upload_limit|subscriptionType', + column: 'contact_email|google_analytics|default_max_storage_amount|storage_limitation|mimetypes_blacklist|upload_limit|subscriptionType|chunk_size', }, }) .then((response) => { @@ -423,6 +438,7 @@ export default { mimetypesBlacklist: response.data.mimetypes_blacklist, uploadLimit: response.data.upload_limit, subscriptionType: response.data.subscriptionType, + chunkSize: response.data.chunk_size, } }) }, diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index a9a93617..8177679c 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -102,7 +102,7 @@ mimetypesBlacklist: '{{ isset($settings->mimetypes_blacklist) ? $settings->mimetypes_blacklist: null}}', uploadLimit: {{ isset($settings->upload_limit) ? format_bytes($settings->upload_limit) : 'undefined' }}, uploadLimitFormatted: '{{ isset($settings->upload_limit) ? format_megabytes($settings->upload_limit) : null }}', - chunkSize: {{ format_bytes(config('vuefilemanager.chunk_size')) }}, + chunkSize: {{ isset($settings->chunk_size) ? format_bytes($settings->chunk_size) : format_bytes(64) }}, isAuthenticated: {{ $isUser ? 1 : 0 }}, isSaaS: {{ $settings && optional($settings)->license === 'extended' ? 1 : 0 }},