From 80ad425f43ac84619a242c36b1f85af6b7e46bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Tue, 19 Jan 2021 12:47:18 +0300 Subject: [PATCH] removed maintenance package --- app/Http/Kernel.php | 2 +- composer.json | 1 - composer.lock | 169 ++++++------------ public/css/maintenance.css | 32 ++++ resources/lang/en-GB/maintenance.php | 2 - resources/views/layouts/maintenance.blade.php | 7 + .../views/partials/maintenance/body.blade.php | 5 + .../views/partials/maintenance/head.blade.php | 29 +++ 8 files changed, 130 insertions(+), 117 deletions(-) create mode 100644 public/css/maintenance.css create mode 100644 resources/views/layouts/maintenance.blade.php create mode 100644 resources/views/partials/maintenance/body.blade.php create mode 100644 resources/views/partials/maintenance/head.blade.php diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 8c8f16d35..04ef72e94 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -17,7 +17,7 @@ class Kernel extends HttpKernel // \App\Http\Middleware\TrustHosts::class, \App\Http\Middleware\TrustProxies::class, \Fruitcake\Cors\HandleCors::class, - \MisterPhilip\MaintenanceMode\Http\Middleware\CheckForMaintenanceMode::class, + \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class, \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, \App\Http\Middleware\TrimStrings::class, \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, diff --git a/composer.json b/composer.json index c4c54c7ee..be1a1141b 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,6 @@ "livewire/livewire": "2.3.*", "lorisleiva/laravel-search-string": "1.0.*", "maatwebsite/excel": "3.1.*", - "misterphilip/maintenance-mode": "2.0.*", "monooso/unobserve": "^3.0", "plank/laravel-mediable": "4.4.*", "riverskies/laravel-mobile-detect": "^1.3", diff --git a/composer.lock b/composer.lock index 29b34f1f5..13039a26a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c59c83e6d4c1d7452f431316f064cb52", + "content-hash": "c1cf72b37303a856be87365ae1a5671d", "packages": [ { "name": "akaunting/firewall", @@ -1039,16 +1039,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.2.8", + "version": "1.2.9", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "8a7ecad675253e4654ea05505233285377405215" + "reference": "78a0e288fdcebf92aa2318a8d3656168da6ac1a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/8a7ecad675253e4654ea05505233285377405215", - "reference": "8a7ecad675253e4654ea05505233285377405215", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/78a0e288fdcebf92aa2318a8d3656168da6ac1a5", + "reference": "78a0e288fdcebf92aa2318a8d3656168da6ac1a5", "shasum": "" }, "require": { @@ -1057,14 +1057,15 @@ "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8", + "phpstan/phpstan": "^0.12.55", "psr/log": "^1.0", + "symfony/phpunit-bridge": "^4.2 || ^5", "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-main": "1.x-dev" } }, "autoload": { @@ -1094,7 +1095,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.2.8" + "source": "https://github.com/composer/ca-bundle/tree/1.2.9" }, "funding": [ { @@ -1110,7 +1111,7 @@ "type": "tidelift" } ], - "time": "2020-08-23T12:54:47+00:00" + "time": "2021-01-12T12:10:35+00:00" }, { "name": "composer/composer", @@ -4527,16 +4528,16 @@ }, { "name": "laravel/framework", - "version": "v8.21.0", + "version": "v8.22.1", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "a61cab167c35f465a923737ee6e6fb99cd5fde88" + "reference": "5c70991b96c5722afed541a996479b5112654c8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/a61cab167c35f465a923737ee6e6fb99cd5fde88", - "reference": "a61cab167c35f465a923737ee6e6fb99cd5fde88", + "url": "https://api.github.com/repos/laravel/framework/zipball/5c70991b96c5722afed541a996479b5112654c8b", + "reference": "5c70991b96c5722afed541a996479b5112654c8b", "shasum": "" }, "require": { @@ -4690,7 +4691,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2021-01-05T15:43:10+00:00" + "time": "2021-01-13T13:37:56+00:00" }, { "name": "laravel/tinker", @@ -5156,16 +5157,16 @@ }, { "name": "league/mime-type-detection", - "version": "1.5.1", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "353f66d7555d8a90781f6f5e7091932f9a4250aa" + "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/353f66d7555d8a90781f6f5e7091932f9a4250aa", - "reference": "353f66d7555d8a90781f6f5e7091932f9a4250aa", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3", + "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3", "shasum": "" }, "require": { @@ -5173,8 +5174,9 @@ "php": "^7.2 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^0.12.36", - "phpunit/phpunit": "^8.5.8" + "friendsofphp/php-cs-fixer": "^2.18", + "phpstan/phpstan": "^0.12.68", + "phpunit/phpunit": "^8.5.8 || ^9.3" }, "type": "library", "autoload": { @@ -5195,7 +5197,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.5.1" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.7.0" }, "funding": [ { @@ -5207,7 +5209,7 @@ "type": "tidelift" } ], - "time": "2020-10-18T11:50:25+00:00" + "time": "2021-01-18T20:58:21+00:00" }, { "name": "league/oauth2-client", @@ -5847,65 +5849,6 @@ }, "time": "2020-12-07T10:48:48+00:00" }, - { - "name": "misterphilip/maintenance-mode", - "version": "2.0.1", - "source": { - "type": "git", - "url": "https://github.com/MisterPhilip/maintenance-mode.git", - "reference": "13ddc22036078edef6f4e5d68b7fb73956451b66" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/MisterPhilip/maintenance-mode/zipball/13ddc22036078edef6f4e5d68b7fb73956451b66", - "reference": "13ddc22036078edef6f4e5d68b7fb73956451b66", - "shasum": "" - }, - "require": { - "illuminate/support": ">=5.5", - "nesbot/carbon": "^1.24 || ^2.0", - "php": ">=7.0.0" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "MisterPhilip\\MaintenanceMode\\MaintenanceModeServiceProvider", - "MisterPhilip\\MaintenanceMode\\MaintenanceCommandServiceProvider" - ] - } - }, - "autoload": { - "psr-0": { - "MisterPhilip\\MaintenanceMode": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Philip Lawrence", - "email": "philip@misterphilip.com", - "homepage": "http://misterphilip.com" - } - ], - "description": "An enhanced drop-in replacement for Laravel's maintenance mode", - "keywords": [ - "l5", - "l6", - "laravel", - "laravel5", - "laravel6", - "maintenance" - ], - "support": { - "issues": "https://github.com/MisterPhilip/maintenance-mode/issues", - "source": "https://github.com/MisterPhilip/maintenance-mode/tree/2.0.1" - }, - "time": "2019-09-06T07:59:28+00:00" - }, { "name": "mobiledetect/mobiledetectlib", "version": "2.8.34", @@ -7844,16 +7787,16 @@ }, { "name": "psy/psysh", - "version": "v0.10.5", + "version": "v0.10.6", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "7c710551d4a2653afa259c544508dc18a9098956" + "reference": "6f990c19f91729de8b31e639d6e204ea59f19cf3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/7c710551d4a2653afa259c544508dc18a9098956", - "reference": "7c710551d4a2653afa259c544508dc18a9098956", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/6f990c19f91729de8b31e639d6e204ea59f19cf3", + "reference": "6f990c19f91729de8b31e639d6e204ea59f19cf3", "shasum": "" }, "require": { @@ -7882,7 +7825,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "0.10.x-dev" + "dev-main": "0.10.x-dev" } }, "autoload": { @@ -7914,9 +7857,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.10.5" + "source": "https://github.com/bobthecow/psysh/tree/v0.10.6" }, - "time": "2020-12-04T02:51:30+00:00" + "time": "2021-01-18T15:53:43+00:00" }, { "name": "ralouphie/getallheaders", @@ -8708,16 +8651,16 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v6.2.4", + "version": "v6.2.5", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "56f0ab23f54c4ccbb0d5dcc67ff8552e0c98d59e" + "reference": "698a6a9f54d7eb321274de3ad19863802c879fb7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/56f0ab23f54c4ccbb0d5dcc67ff8552e0c98d59e", - "reference": "56f0ab23f54c4ccbb0d5dcc67ff8552e0c98d59e", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/698a6a9f54d7eb321274de3ad19863802c879fb7", + "reference": "698a6a9f54d7eb321274de3ad19863802c879fb7", "shasum": "" }, "require": { @@ -8767,7 +8710,7 @@ ], "support": { "issues": "https://github.com/swiftmailer/swiftmailer/issues", - "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.4" + "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.5" }, "funding": [ { @@ -8779,7 +8722,7 @@ "type": "tidelift" } ], - "time": "2020-12-08T18:02:06+00:00" + "time": "2021-01-12T09:35:59+00:00" }, { "name": "symfony/console", @@ -11972,16 +11915,16 @@ }, { "name": "nunomaduro/collision", - "version": "v5.1.0", + "version": "v5.2.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "7c2b95589bf81e274e61e47f7672a1b2c3e06eaa" + "reference": "aca954fd03414ba0dd85d7d8e42ba9b251893d1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/7c2b95589bf81e274e61e47f7672a1b2c3e06eaa", - "reference": "7c2b95589bf81e274e61e47f7672a1b2c3e06eaa", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/aca954fd03414ba0dd85d7d8e42ba9b251893d1f", + "reference": "aca954fd03414ba0dd85d7d8e42ba9b251893d1f", "shasum": "" }, "require": { @@ -11991,16 +11934,16 @@ "symfony/console": "^5.0" }, "require-dev": { - "fideloper/proxy": "^4.4.0", - "friendsofphp/php-cs-fixer": "^2.16.4", - "fruitcake/laravel-cors": "^2.0.1", - "laravel/framework": "^8.0", - "laravel/tinker": "^2.4.1", + "brianium/paratest": "^6.1", + "fideloper/proxy": "^4.4.1", + "friendsofphp/php-cs-fixer": "^2.17.3", + "fruitcake/laravel-cors": "^2.0.3", + "laravel/framework": "^9.0", "nunomaduro/larastan": "^0.6.2", "nunomaduro/mock-final-classes": "^1.0", - "orchestra/testbench": "^6.0", - "phpstan/phpstan": "^0.12.36", - "phpunit/phpunit": "^9.3.3" + "orchestra/testbench": "^7.0", + "phpstan/phpstan": "^0.12.64", + "phpunit/phpunit": "^9.5.0" }, "type": "library", "extra": { @@ -12056,7 +11999,7 @@ "type": "patreon" } ], - "time": "2020-10-29T14:50:40+00:00" + "time": "2021-01-13T10:00:08+00:00" }, { "name": "phar-io/manifest", @@ -12556,16 +12499,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.0", + "version": "9.5.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "8e16c225d57c3d6808014df6b1dd7598d0a5bbbe" + "reference": "e7bdf4085de85a825f4424eae52c99a1cec2f360" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8e16c225d57c3d6808014df6b1dd7598d0a5bbbe", - "reference": "8e16c225d57c3d6808014df6b1dd7598d0a5bbbe", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e7bdf4085de85a825f4424eae52c99a1cec2f360", + "reference": "e7bdf4085de85a825f4424eae52c99a1cec2f360", "shasum": "" }, "require": { @@ -12643,7 +12586,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.0" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.1" }, "funding": [ { @@ -12655,7 +12598,7 @@ "type": "github" } ], - "time": "2020-12-04T05:05:53+00:00" + "time": "2021-01-17T07:42:25+00:00" }, { "name": "sebastian/cli-parser", diff --git a/public/css/maintenance.css b/public/css/maintenance.css new file mode 100644 index 000000000..4f4c45020 --- /dev/null +++ b/public/css/maintenance.css @@ -0,0 +1,32 @@ +@charset "UTF-8"; + +html, body { + width: 100%; + height: 100%; + margin: 0; + padding: 0; + background-color: #333; + -webkit-transform-style: preserve-3d; + -moz-transform-style: preserve-3d; + transform-style: preserve-3d; + font-family: 'Open Sans', sans-serif; +} + +header { + color: #fff; + position: relative; + top: 50%; + transform: translateY(-50%); + text-align: center; + margin: 0 auto; +} + +header h1, header p { + margin: 0; + padding: .25em 0; +} + +header p { + color: #999; + font-size: .8em; +} diff --git a/resources/lang/en-GB/maintenance.php b/resources/lang/en-GB/maintenance.php index 514800dcd..49b62ed72 100644 --- a/resources/lang/en-GB/maintenance.php +++ b/resources/lang/en-GB/maintenance.php @@ -6,6 +6,4 @@ return [ 'message' => 'Sorry, we\'re down for maintenance. Please, try again later!', - 'last-updated' => 'This message was last updated :timestamp.', - ]; diff --git a/resources/views/layouts/maintenance.blade.php b/resources/views/layouts/maintenance.blade.php new file mode 100644 index 000000000..d9ba62ef5 --- /dev/null +++ b/resources/views/layouts/maintenance.blade.php @@ -0,0 +1,7 @@ + + + @include('partials.maintenance.head') + + @include('partials.maintenance.body') + + diff --git a/resources/views/partials/maintenance/body.blade.php b/resources/views/partials/maintenance/body.blade.php new file mode 100644 index 000000000..3a272a969 --- /dev/null +++ b/resources/views/partials/maintenance/body.blade.php @@ -0,0 +1,5 @@ + +
+

{{ trans('maintenance.message') }}

+
+ diff --git a/resources/views/partials/maintenance/head.blade.php b/resources/views/partials/maintenance/head.blade.php new file mode 100644 index 000000000..89036b3d6 --- /dev/null +++ b/resources/views/partials/maintenance/head.blade.php @@ -0,0 +1,29 @@ + + @stack('head_start') + + + + + + + + {{ trans('maintenance.title') }} + + + + + + + @stack('css') + + @stack('stylesheet') + + + + @stack('js') + + @stack('head_end') +