diff --git a/config/language-translations.php b/config/language-translations.php index f9c3dabc..56426210 100644 --- a/config/language-translations.php +++ b/config/language-translations.php @@ -1,7 +1,7 @@ [ + 'regular' => [ 'type' => 'Type', 'cancel' => 'Cancel', 'close' => 'Close', @@ -61,7 +61,7 @@ return [ 'admin_settings.email.port' => 'Mail Port', 'admin_settings.email.save_button' => 'Save Email Settings', 'clear_cache' => 'Clear Cache', - 'admin_settings.others.default_storage' => 'Default Storage Space for User Accounts (in GB)', + 'admin_settings.others.default_storage' => 'Default Storage Space for New User Accounts (in GB)', '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', @@ -523,5 +523,6 @@ return [ 'set_up_2fa_app' => 'Set up Your Authenticator App', 'confirm_your_code' => 'Confirm Your Code', 'paste_code_from_2fa_app' => 'Paste the latest code from 2fa app...', + 'configure_your_credentials' => 'Configure Your Credentials', ], ]; diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 10b34363..ee90c723 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,7 +1,7 @@ { "/js/main.js": "/js/main.js", "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=19a0784e59d768ec", - "/chunks/status-check.js": "/chunks/status-check.js?id=951b690c573510e5", + "/chunks/status-check.js": "/chunks/status-check.js?id=1cf200b6f9e74a09", "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=ba76b9a8adbfdc0b", "/chunks/database.js": "/chunks/database.js?id=a44a44e6daa14a92", "/chunks/environment.js": "/chunks/environment.js?id=00bcaa788b606272", @@ -19,13 +19,13 @@ "/chunks/user-create.js": "/chunks/user-create.js?id=40254ae98547761e", "/chunks/user.js": "/chunks/user.js?id=052364b014015a4d", "/chunks/user-detail.js": "/chunks/user-detail.js?id=fc5475489f0cec6a", - "/chunks/user-storage.js": "/chunks/user-storage.js?id=cd17c66dc9a7bf78", + "/chunks/user-storage.js": "/chunks/user-storage.js?id=fe30d57494062cf1", "/chunks/user-password.js": "/chunks/user-password.js?id=900ae71c3d4199ea", "/chunks/user-delete.js": "/chunks/user-delete.js?id=a3091617207684e5", "/chunks/app-settings.js": "/chunks/app-settings.js?id=4ff5c1e5bbb0aed8", "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=8ba3feb2cc81a2c3", "/chunks/app-environment.js": "/chunks/app-environment.js?id=d5fbb0ea9249ce7f", - "/chunks/app-others.js": "/chunks/app-others.js?id=f2141c08fb258235", + "/chunks/app-others.js": "/chunks/app-others.js?id=fd8b52f1581e3cdf", "/chunks/app-server.js": "/chunks/app-server.js?id=ff66d34e90ff98a0", "/chunks/app-language.js": "/chunks/app-language.js?id=041070825d222906", "/chunks/successfully-email-send.js": "/chunks/successfully-email-send.js?id=b11c04d73c59a232", @@ -35,7 +35,7 @@ "/chunks/settings.js": "/chunks/settings.js?id=3b8e3ced294dc6b2", "/chunks/profile.js": "/chunks/profile.js?id=5f1e6f1817817716", "/chunks/settings-password.js": "/chunks/settings-password.js?id=d00bf503d8126dc4", - "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=092e324aad54656b", + "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=9da75055197ac23c", "/chunks/platform.js": "/chunks/platform.js?id=9dfb7ec9acf3fade", "/chunks/files.js": "/chunks/files.js?id=05a249346211c989", "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=ca1063798b010a2d", diff --git a/resources/js/views/Admin/Settings/AppSettingsTabs/Others.vue b/resources/js/views/Admin/Settings/AppSettingsTabs/Others.vue index 6ce501bf..f22a3e7d 100644 --- a/resources/js/views/Admin/Settings/AppSettingsTabs/Others.vue +++ b/resources/js/views/Admin/Settings/AppSettingsTabs/Others.vue @@ -61,6 +61,7 @@ {{ $t('total_of', {capacity: storage.data.attributes.capacity}) }} diff --git a/resources/js/views/SetupWizard/StatusCheck.vue b/resources/js/views/SetupWizard/StatusCheck.vue index a7142394..172eaa1c 100644 --- a/resources/js/views/SetupWizard/StatusCheck.vue +++ b/resources/js/views/SetupWizard/StatusCheck.vue @@ -247,7 +247,8 @@ export default { ) if (writeCheck && modulesCheck && iniCheck && this.apiRunning && this.phpVersion.acceptable) { - this.$router.push({ name: 'PurchaseCode' }) + //this.$router.push({ name: 'PurchaseCode' }) + this.$router.push({ name: 'Database' }) } else { this.isError = true } diff --git a/resources/js/views/User/Storage.vue b/resources/js/views/User/Storage.vue index 5300536d..b450bbd2 100644 --- a/resources/js/views/User/Storage.vue +++ b/resources/js/views/User/Storage.vue @@ -10,9 +10,7 @@ {{ $t('total_of', {capacity: storage.data.attributes.capacity}) }} diff --git a/src/Domain/Admin/Controllers/Users/UserController.php b/src/Domain/Admin/Controllers/Users/UserController.php index 26f89440..7c3afd0f 100644 --- a/src/Domain/Admin/Controllers/Users/UserController.php +++ b/src/Domain/Admin/Controllers/Users/UserController.php @@ -52,16 +52,10 @@ class UserController extends Controller ]); // Register user - try { - $user = ($this->createNewUser)($data); - } catch (MeteredBillingPlanDoesntExist $e) { - return response([ - 'type' => 'error', - 'message' => 'User registrations are temporarily disabled', - ], 409); - } + $user = ($this->createNewUser)($data); // Update user data + $user->role = $data->role; $user->email_verified_at = now(); $user->save(); diff --git a/webpack.mix.js b/webpack.mix.js index 14c468f9..5fa9da97 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -25,10 +25,10 @@ mix chunkFilename: '[name].js?id=[chunkhash]', } }) - /*.options({ + .options({ hmrOptions: { host: '192.168.1.112', port: '8080' }, - })*/ + }) .disableNotifications();