diff --git a/app/Console/Commands/Environment/AppSettingsCommand.php b/app/Console/Commands/Environment/AppSettingsCommand.php index 58404884d..3d8e8b1ed 100644 --- a/app/Console/Commands/Environment/AppSettingsCommand.php +++ b/app/Console/Commands/Environment/AppSettingsCommand.php @@ -35,7 +35,6 @@ class AppSettingsCommand extends Command {--new-salt : Whether or not to generate a new salt for Hashids.} {--author= : The email that services created on this instance should be linked to.} {--url= : The URL that this Panel is running on.} - {--timezone= : The timezone to use for Panel times.} {--cache= : The cache driver backend to use.} {--session= : The session driver backend to use.} {--queue= : The queue driver backend to use.} @@ -61,6 +60,8 @@ class AppSettingsCommand extends Command */ public function handle(): int { + $this->variables['APP_TIMEZONE'] = 'UTC'; + if (empty(config('hashids.salt')) || $this->option('new-salt')) { $this->variables['HASHIDS_SALT'] = str_random(20); } @@ -83,12 +84,6 @@ class AppSettingsCommand extends Command config('app.url', 'https://example.com') ); - $this->output->comment(__('commands.appsettings.comment.timezone')); - $this->variables['APP_TIMEZONE'] = $this->option('timezone') ?? $this->anticipate( - 'Application Timezone', - \DateTimeZone::listIdentifiers(), - config('app.timezone') - ); $selected = config('cache.default', 'file'); $this->variables['CACHE_STORE'] = $this->option('cache') ?? $this->choice( diff --git a/app/Console/Commands/InfoCommand.php b/app/Console/Commands/InfoCommand.php index a774c032b..d84b477a7 100644 --- a/app/Console/Commands/InfoCommand.php +++ b/app/Console/Commands/InfoCommand.php @@ -38,7 +38,6 @@ class InfoCommand extends Command ['Debug Mode', $this->formatText(config('app.debug') ? 'Yes' : 'No', !config('app.debug') ?: 'bg=red')], ['Installation URL', config('app.url')], ['Installation Directory', base_path()], - ['Timezone', config('app.timezone')], ['Cache Driver', config('cache.default')], ['Queue Driver', config('queue.default')], ['Session Driver', config('session.driver')], diff --git a/app/Providers/BladeServiceProvider.php b/app/Providers/BladeServiceProvider.php deleted file mode 100644 index cf5997971..000000000 --- a/app/Providers/BladeServiceProvider.php +++ /dev/null @@ -1,19 +0,0 @@ -app->make('blade.compiler') - ->directive('datetimeHuman', function ($expression) { - return "setTimezone(config('app.timezone'))->toDateTimeString(); ?>"; - }); - } -} diff --git a/bootstrap/providers.php b/bootstrap/providers.php index 6db6fe18f..04b20a98c 100644 --- a/bootstrap/providers.php +++ b/bootstrap/providers.php @@ -4,7 +4,6 @@ return [ App\Providers\ActivityLogServiceProvider::class, App\Providers\AppServiceProvider::class, App\Providers\BackupsServiceProvider::class, - App\Providers\BladeServiceProvider::class, App\Providers\EventServiceProvider::class, App\Providers\Filament\AdminPanelProvider::class, App\Providers\HashidsServiceProvider::class, diff --git a/resources/views/admin/api/index.blade.php b/resources/views/admin/api/index.blade.php index d863c5779..8d848d403 100644 --- a/resources/views/admin/api/index.blade.php +++ b/resources/views/admin/api/index.blade.php @@ -37,12 +37,12 @@