From cbc63b048eeb0049afe407ee98ab16b1abfa6efd Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 13 Feb 2020 21:04:40 -0700 Subject: [PATCH 1/5] Update mail panel blade view, fix markdown bug --- .../views/vendor/mail/html/panel.blade.php | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/resources/views/vendor/mail/html/panel.blade.php b/resources/views/vendor/mail/html/panel.blade.php index 783af16ce..0b72ec45a 100644 --- a/resources/views/vendor/mail/html/panel.blade.php +++ b/resources/views/vendor/mail/html/panel.blade.php @@ -1,13 +1,13 @@ - - - + + + From 923dbcb6606f3d4e40c74f15bcf440820a5f7926 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 13 Feb 2020 21:05:40 -0700 Subject: [PATCH 2/5] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aebbd60a1..34e39eed3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Updated lexer autolinker and extractor, add support for mentioned usernames containing dashes, periods and underscore characters ([f911c96d](https://github.com/pixelfed/pixelfed/commit/f911c96d)) - Updated Story apis, move FE to v0 and add v1 for oauth clients ([92654fab](https://github.com/pixelfed/pixelfed/commit/92654fab)) - Updated robots.txt ([25101901](https://github.com/pixelfed/pixelfed/commit/25101901)) +- Updated mail panel blade view, fix markdown bug ([cbc63b04](https://github.com/pixelfed/pixelfed/commit/cbc63b04)) ## [v0.10.8 (2020-01-29)](https://github.com/pixelfed/pixelfed/compare/v0.10.7...v0.10.8) ### Added From ebbbb4f9e640ecda5c7ff1422cb661eb1619cc3c Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 13 Feb 2020 21:10:55 -0700 Subject: [PATCH 3/5] Update mail blade views, fix markdown bug --- .../views/vendor/mail/html/button.blade.php | 34 ++++++------- .../views/vendor/mail/html/footer.blade.php | 18 +++---- .../views/vendor/mail/html/header.blade.php | 10 ++-- .../views/vendor/mail/html/message.blade.php | 50 +++++++++---------- .../vendor/mail/html/promotion.blade.php | 10 ++-- .../views/vendor/mail/html/subcopy.blade.php | 10 ++-- 6 files changed, 66 insertions(+), 66 deletions(-) diff --git a/resources/views/vendor/mail/html/button.blade.php b/resources/views/vendor/mail/html/button.blade.php index 512c1d8c7..d760329c1 100644 --- a/resources/views/vendor/mail/html/button.blade.php +++ b/resources/views/vendor/mail/html/button.blade.php @@ -1,19 +1,19 @@ - - - + + + diff --git a/resources/views/vendor/mail/html/footer.blade.php b/resources/views/vendor/mail/html/footer.blade.php index 33f7dad76..3ff41f89c 100644 --- a/resources/views/vendor/mail/html/footer.blade.php +++ b/resources/views/vendor/mail/html/footer.blade.php @@ -1,11 +1,11 @@ - - - - - - - + + + + + + + diff --git a/resources/views/vendor/mail/html/header.blade.php b/resources/views/vendor/mail/html/header.blade.php index eefabab92..79971d9e8 100644 --- a/resources/views/vendor/mail/html/header.blade.php +++ b/resources/views/vendor/mail/html/header.blade.php @@ -1,7 +1,7 @@ - - - {{ $slot }} - - + + +{{ $slot }} + + diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php index 1ae9ed8f1..deec4a1f4 100644 --- a/resources/views/vendor/mail/html/message.blade.php +++ b/resources/views/vendor/mail/html/message.blade.php @@ -1,27 +1,27 @@ @component('mail::layout') - {{-- Header --}} - @slot('header') - @component('mail::header', ['url' => config('app.url')]) - {{ config('app.name') }} - @endcomponent - @endslot - - {{-- Body --}} - {{ $slot }} - - {{-- Subcopy --}} - @isset($subcopy) - @slot('subcopy') - @component('mail::subcopy') - {{ $subcopy }} - @endcomponent - @endslot - @endisset - - {{-- Footer --}} - @slot('footer') - @component('mail::footer') - © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.') - @endcomponent - @endslot +{{-- Header --}} +@slot('header') +@component('mail::header', ['url' => config('app.url')]) +{{ config('app.name') }} +@endcomponent +@endslot + +{{-- Body --}} +{{ $slot }} + +{{-- Subcopy --}} +@isset($subcopy) +@slot('subcopy') +@component('mail::subcopy') +{{ $subcopy }} +@endcomponent +@endslot +@endisset + +{{-- Footer --}} +@slot('footer') +@component('mail::footer') +© {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.') +@endcomponent +@endslot @endcomponent diff --git a/resources/views/vendor/mail/html/promotion.blade.php b/resources/views/vendor/mail/html/promotion.blade.php index f78b358c3..8fef44c97 100644 --- a/resources/views/vendor/mail/html/promotion.blade.php +++ b/resources/views/vendor/mail/html/promotion.blade.php @@ -1,7 +1,7 @@ - - - + + + diff --git a/resources/views/vendor/mail/html/subcopy.blade.php b/resources/views/vendor/mail/html/subcopy.blade.php index f559e8f1b..790ce6c24 100644 --- a/resources/views/vendor/mail/html/subcopy.blade.php +++ b/resources/views/vendor/mail/html/subcopy.blade.php @@ -1,7 +1,7 @@ - - - + + + From 03f808c7446d38b3e417dfcd0920fc9edb43700c Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 14 Feb 2020 20:48:35 -0700 Subject: [PATCH 4/5] Update self-diagnosis checks --- config/self-diagnosis.php | 103 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 config/self-diagnosis.php diff --git a/config/self-diagnosis.php b/config/self-diagnosis.php new file mode 100644 index 000000000..e9b12dba6 --- /dev/null +++ b/config/self-diagnosis.php @@ -0,0 +1,103 @@ + [ + 'prod' => 'production', + 'live' => 'production', + 'local' => 'development', + ], + + /* + * Common checks that will be performed on all environments. + */ + 'checks' => [ + \BeyondCode\SelfDiagnosis\Checks\AppKeyIsSet::class, + \BeyondCode\SelfDiagnosis\Checks\CorrectPhpVersionIsInstalled::class, + \BeyondCode\SelfDiagnosis\Checks\DatabaseCanBeAccessed::class => [ + 'default_connection' => true, + 'connections' => [], + ], + \BeyondCode\SelfDiagnosis\Checks\DirectoriesHaveCorrectPermissions::class => [ + 'directories' => [ + storage_path(), + base_path('bootstrap/cache'), + ], + ], + \BeyondCode\SelfDiagnosis\Checks\EnvFileExists::class, + \BeyondCode\SelfDiagnosis\Checks\LocalesAreInstalled::class => [ + 'required_locales' => [ + 'en_US', + PHP_OS === 'Darwin' ? 'en_US.UTF-8' : 'en_US.utf8', + ], + ], + \BeyondCode\SelfDiagnosis\Checks\MaintenanceModeNotEnabled::class, + \BeyondCode\SelfDiagnosis\Checks\MigrationsAreUpToDate::class, + \BeyondCode\SelfDiagnosis\Checks\PhpExtensionsAreInstalled::class => [ + 'extensions' => [ + 'openssl', + 'PDO', + 'mbstring', + 'tokenizer', + 'xml', + 'ctype', + 'json', + 'redis', + 'bcmath', + 'curl', + 'exif', + 'iconv', + 'intl', + 'zip' + ], + 'include_composer_extensions' => true, + ], + \BeyondCode\SelfDiagnosis\Checks\RedisCanBeAccessed::class => [ + 'default_connection' => true, + 'connections' => [], + ], + \BeyondCode\SelfDiagnosis\Checks\StorageDirectoryIsLinked::class, + ], + + /* + * Environment specific checks that will only be performed for the corresponding environment. + */ + 'environment_checks' => [ + 'development' => [ + \BeyondCode\SelfDiagnosis\Checks\ComposerWithDevDependenciesIsUpToDate::class, + \BeyondCode\SelfDiagnosis\Checks\ConfigurationIsNotCached::class, + \BeyondCode\SelfDiagnosis\Checks\RoutesAreNotCached::class, + \BeyondCode\SelfDiagnosis\Checks\ExampleEnvironmentVariablesAreUpToDate::class, + ], + 'production' => [ + \BeyondCode\SelfDiagnosis\Checks\ComposerWithoutDevDependenciesIsUpToDate::class, + \BeyondCode\SelfDiagnosis\Checks\ConfigurationIsCached::class, + \BeyondCode\SelfDiagnosis\Checks\DebugModeIsNotEnabled::class, + \BeyondCode\SelfDiagnosis\Checks\PhpExtensionsAreDisabled::class => [ + 'extensions' => [ + 'xdebug', + ], + ], + \BeyondCode\SelfDiagnosis\Checks\RoutesAreCached::class, + //\BeyondCode\SelfDiagnosis\Checks\ServersArePingable::class => [ + // 'servers' => [ + // 'www.google.com', + // ['host' => 'www.google.com', 'port' => 8080], + // '8.8.8.8', + // ['host' => '8.8.8.8', 'port' => 8080, 'timeout' => 5], + // ], + //], + //\BeyondCode\SelfDiagnosis\Checks\SupervisorProgramsAreRunning::class => [ + // 'programs' => [ + // 'horizon', + // ], + // 'restarted_within' => 300, + //], + //\BeyondCode\SelfDiagnosis\Checks\HorizonIsRunning::class, + ], + ], + +]; From b796bcc7a71574b2330e6c409d3df8a5fb335d2c Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 14 Feb 2020 20:49:32 -0700 Subject: [PATCH 5/5] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34e39eed3..88df28cc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Updated Story apis, move FE to v0 and add v1 for oauth clients ([92654fab](https://github.com/pixelfed/pixelfed/commit/92654fab)) - Updated robots.txt ([25101901](https://github.com/pixelfed/pixelfed/commit/25101901)) - Updated mail panel blade view, fix markdown bug ([cbc63b04](https://github.com/pixelfed/pixelfed/commit/cbc63b04)) +- Updated self-diagnosis checks ([03f808c7](https://github.com/pixelfed/pixelfed/commit/03f808c7)) ## [v0.10.8 (2020-01-29)](https://github.com/pixelfed/pixelfed/compare/v0.10.7...v0.10.8) ### Added