Merge remote-tracking branch 'origin/main' into demo

.env.example

@@ -11,6 +11,13 @@ APP_PORT=80
 APP_SERVICE=app
 APP_TIMEZONE=UTC
 
+#
+# Security
+# Enable these settings after setting up an HTTPS connection.
+#
+
+# SESSION_SECURE_COOKIE=true
+
 #
 # Databases configuration.
 #
@@ -44,6 +51,7 @@ ELASTIC_PORT=9200
 #
 
 MEDIA_DISK=media
+QUEUE_CONVERSIONS_BY_DEFAULT=false
 
 #MEDIA_DISK=s3-public
 #AWS_ACCESS_KEY_ID=
@@ -51,6 +59,12 @@ MEDIA_DISK=media
 #AWS_DEFAULT_REGION=
 #AWS_BUCKET=
 
+#
+# Sail (local development).
+#
+
+#SAIL_XDEBUG_MODE=develop,debug
+
 #
 # Misc. drivers and configuration.
 #

.nvmrc

@@ -0,0 +1 @@
+14

.phpstorm.meta.php

@@ -41,8 +41,10 @@ namespace PHPSTORM_META {
             'Facade\Ignition\DumpRecorder\MultiDumpHandler' => \Facade\Ignition\DumpRecorder\MultiDumpHandler::class,
             'Facade\Ignition\ErrorPage\Renderer' => \Facade\Ignition\ErrorPage\Renderer::class,
             'Facade\Ignition\IgnitionConfig' => \Facade\Ignition\IgnitionConfig::class,
+            'Facade\Ignition\JobRecorder\JobRecorder' => \Facade\Ignition\JobRecorder\JobRecorder::class,
             'Facade\Ignition\LogRecorder\LogRecorder' => \Facade\Ignition\LogRecorder\LogRecorder::class,
             'Facade\Ignition\QueryRecorder\QueryRecorder' => \Facade\Ignition\QueryRecorder\QueryRecorder::class,
+            'Facade\Ignition\Support\SentReports' => \Facade\Ignition\Support\SentReports::class,
             'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
             'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
             'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
@@ -78,6 +80,7 @@ namespace PHPSTORM_META {
             'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
             'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
             'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
+            'Spatie\Csp\Nonce\NonceGenerator' => \Spatie\Csp\Nonce\RandomString::class,
             'Spatie\MediaLibrary\MediaCollections\Filesystem' => \Spatie\MediaLibrary\MediaCollections\Filesystem::class,
             'Spatie\MediaLibrary\MediaCollections\MediaRepository' => \Spatie\MediaLibrary\MediaCollections\MediaRepository::class,
             'Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\TinyPlaceholderGenerator' => \Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\Blurred::class,
@@ -102,6 +105,7 @@ namespace PHPSTORM_META {
             'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
             'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
             'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
+            'command.db.prune' => \Illuminate\Database\Console\PruneCommand::class,
             'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class,
             'command.down' => \Illuminate\Foundation\Console\DownCommand::class,
             'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
@@ -151,7 +155,9 @@ namespace PHPSTORM_META {
             'command.queue.flush' => \Illuminate\Queue\Console\FlushFailedCommand::class,
             'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
             'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
+            'command.queue.monitor' => \Illuminate\Queue\Console\MonitorCommand::class,
             'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
+            'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
             'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
             'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
             'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,
@@ -250,8 +256,10 @@ namespace PHPSTORM_META {
             'Facade\Ignition\DumpRecorder\MultiDumpHandler' => \Facade\Ignition\DumpRecorder\MultiDumpHandler::class,
             'Facade\Ignition\ErrorPage\Renderer' => \Facade\Ignition\ErrorPage\Renderer::class,
             'Facade\Ignition\IgnitionConfig' => \Facade\Ignition\IgnitionConfig::class,
+            'Facade\Ignition\JobRecorder\JobRecorder' => \Facade\Ignition\JobRecorder\JobRecorder::class,
             'Facade\Ignition\LogRecorder\LogRecorder' => \Facade\Ignition\LogRecorder\LogRecorder::class,
             'Facade\Ignition\QueryRecorder\QueryRecorder' => \Facade\Ignition\QueryRecorder\QueryRecorder::class,
+            'Facade\Ignition\Support\SentReports' => \Facade\Ignition\Support\SentReports::class,
             'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
             'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
             'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
@@ -287,6 +295,7 @@ namespace PHPSTORM_META {
             'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
             'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
             'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
+            'Spatie\Csp\Nonce\NonceGenerator' => \Spatie\Csp\Nonce\RandomString::class,
             'Spatie\MediaLibrary\MediaCollections\Filesystem' => \Spatie\MediaLibrary\MediaCollections\Filesystem::class,
             'Spatie\MediaLibrary\MediaCollections\MediaRepository' => \Spatie\MediaLibrary\MediaCollections\MediaRepository::class,
             'Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\TinyPlaceholderGenerator' => \Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\Blurred::class,
@@ -311,6 +320,7 @@ namespace PHPSTORM_META {
             'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
             'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
             'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
+            'command.db.prune' => \Illuminate\Database\Console\PruneCommand::class,
             'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class,
             'command.down' => \Illuminate\Foundation\Console\DownCommand::class,
             'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
@@ -360,7 +370,9 @@ namespace PHPSTORM_META {
             'command.queue.flush' => \Illuminate\Queue\Console\FlushFailedCommand::class,
             'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
             'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
+            'command.queue.monitor' => \Illuminate\Queue\Console\MonitorCommand::class,
             'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
+            'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
             'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
             'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
             'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,
@@ -459,8 +471,10 @@ namespace PHPSTORM_META {
             'Facade\Ignition\DumpRecorder\MultiDumpHandler' => \Facade\Ignition\DumpRecorder\MultiDumpHandler::class,
             'Facade\Ignition\ErrorPage\Renderer' => \Facade\Ignition\ErrorPage\Renderer::class,
             'Facade\Ignition\IgnitionConfig' => \Facade\Ignition\IgnitionConfig::class,
+            'Facade\Ignition\JobRecorder\JobRecorder' => \Facade\Ignition\JobRecorder\JobRecorder::class,
             'Facade\Ignition\LogRecorder\LogRecorder' => \Facade\Ignition\LogRecorder\LogRecorder::class,
             'Facade\Ignition\QueryRecorder\QueryRecorder' => \Facade\Ignition\QueryRecorder\QueryRecorder::class,
+            'Facade\Ignition\Support\SentReports' => \Facade\Ignition\Support\SentReports::class,
             'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
             'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
             'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
@@ -496,6 +510,7 @@ namespace PHPSTORM_META {
             'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
             'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
             'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
+            'Spatie\Csp\Nonce\NonceGenerator' => \Spatie\Csp\Nonce\RandomString::class,
             'Spatie\MediaLibrary\MediaCollections\Filesystem' => \Spatie\MediaLibrary\MediaCollections\Filesystem::class,
             'Spatie\MediaLibrary\MediaCollections\MediaRepository' => \Spatie\MediaLibrary\MediaCollections\MediaRepository::class,
             'Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\TinyPlaceholderGenerator' => \Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\Blurred::class,
@@ -520,6 +535,7 @@ namespace PHPSTORM_META {
             'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
             'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
             'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
+            'command.db.prune' => \Illuminate\Database\Console\PruneCommand::class,
             'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class,
             'command.down' => \Illuminate\Foundation\Console\DownCommand::class,
             'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
@@ -569,7 +585,9 @@ namespace PHPSTORM_META {
             'command.queue.flush' => \Illuminate\Queue\Console\FlushFailedCommand::class,
             'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
             'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
+            'command.queue.monitor' => \Illuminate\Queue\Console\MonitorCommand::class,
             'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
+            'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
             'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
             'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
             'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,
@@ -668,8 +686,10 @@ namespace PHPSTORM_META {
             'Facade\Ignition\DumpRecorder\MultiDumpHandler' => \Facade\Ignition\DumpRecorder\MultiDumpHandler::class,
             'Facade\Ignition\ErrorPage\Renderer' => \Facade\Ignition\ErrorPage\Renderer::class,
             'Facade\Ignition\IgnitionConfig' => \Facade\Ignition\IgnitionConfig::class,
+            'Facade\Ignition\JobRecorder\JobRecorder' => \Facade\Ignition\JobRecorder\JobRecorder::class,
             'Facade\Ignition\LogRecorder\LogRecorder' => \Facade\Ignition\LogRecorder\LogRecorder::class,
             'Facade\Ignition\QueryRecorder\QueryRecorder' => \Facade\Ignition\QueryRecorder\QueryRecorder::class,
+            'Facade\Ignition\Support\SentReports' => \Facade\Ignition\Support\SentReports::class,
             'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
             'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
             'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
@@ -705,6 +725,7 @@ namespace PHPSTORM_META {
             'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
             'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
             'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
+            'Spatie\Csp\Nonce\NonceGenerator' => \Spatie\Csp\Nonce\RandomString::class,
             'Spatie\MediaLibrary\MediaCollections\Filesystem' => \Spatie\MediaLibrary\MediaCollections\Filesystem::class,
             'Spatie\MediaLibrary\MediaCollections\MediaRepository' => \Spatie\MediaLibrary\MediaCollections\MediaRepository::class,
             'Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\TinyPlaceholderGenerator' => \Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\Blurred::class,
@@ -729,6 +750,7 @@ namespace PHPSTORM_META {
             'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
             'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
             'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
+            'command.db.prune' => \Illuminate\Database\Console\PruneCommand::class,
             'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class,
             'command.down' => \Illuminate\Foundation\Console\DownCommand::class,
             'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
@@ -778,7 +800,9 @@ namespace PHPSTORM_META {
             'command.queue.flush' => \Illuminate\Queue\Console\FlushFailedCommand::class,
             'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
             'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
+            'command.queue.monitor' => \Illuminate\Queue\Console\MonitorCommand::class,
             'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
+            'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
             'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
             'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
             'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,
@@ -877,8 +901,10 @@ namespace PHPSTORM_META {
             'Facade\Ignition\DumpRecorder\MultiDumpHandler' => \Facade\Ignition\DumpRecorder\MultiDumpHandler::class,
             'Facade\Ignition\ErrorPage\Renderer' => \Facade\Ignition\ErrorPage\Renderer::class,
             'Facade\Ignition\IgnitionConfig' => \Facade\Ignition\IgnitionConfig::class,
+            'Facade\Ignition\JobRecorder\JobRecorder' => \Facade\Ignition\JobRecorder\JobRecorder::class,
             'Facade\Ignition\LogRecorder\LogRecorder' => \Facade\Ignition\LogRecorder\LogRecorder::class,
             'Facade\Ignition\QueryRecorder\QueryRecorder' => \Facade\Ignition\QueryRecorder\QueryRecorder::class,
+            'Facade\Ignition\Support\SentReports' => \Facade\Ignition\Support\SentReports::class,
             'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
             'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
             'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
@@ -914,6 +940,7 @@ namespace PHPSTORM_META {
             'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
             'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
             'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
+            'Spatie\Csp\Nonce\NonceGenerator' => \Spatie\Csp\Nonce\RandomString::class,
             'Spatie\MediaLibrary\MediaCollections\Filesystem' => \Spatie\MediaLibrary\MediaCollections\Filesystem::class,
             'Spatie\MediaLibrary\MediaCollections\MediaRepository' => \Spatie\MediaLibrary\MediaCollections\MediaRepository::class,
             'Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\TinyPlaceholderGenerator' => \Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\Blurred::class,
@@ -938,6 +965,7 @@ namespace PHPSTORM_META {
             'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
             'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
             'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
+            'command.db.prune' => \Illuminate\Database\Console\PruneCommand::class,
             'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class,
             'command.down' => \Illuminate\Foundation\Console\DownCommand::class,
             'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
@@ -987,7 +1015,9 @@ namespace PHPSTORM_META {
             'command.queue.flush' => \Illuminate\Queue\Console\FlushFailedCommand::class,
             'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
             'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
+            'command.queue.monitor' => \Illuminate\Queue\Console\MonitorCommand::class,
             'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
+            'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
             'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
             'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
             'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,
@@ -1086,8 +1116,10 @@ namespace PHPSTORM_META {
             'Facade\Ignition\DumpRecorder\MultiDumpHandler' => \Facade\Ignition\DumpRecorder\MultiDumpHandler::class,
             'Facade\Ignition\ErrorPage\Renderer' => \Facade\Ignition\ErrorPage\Renderer::class,
             'Facade\Ignition\IgnitionConfig' => \Facade\Ignition\IgnitionConfig::class,
+            'Facade\Ignition\JobRecorder\JobRecorder' => \Facade\Ignition\JobRecorder\JobRecorder::class,
             'Facade\Ignition\LogRecorder\LogRecorder' => \Facade\Ignition\LogRecorder\LogRecorder::class,
             'Facade\Ignition\QueryRecorder\QueryRecorder' => \Facade\Ignition\QueryRecorder\QueryRecorder::class,
+            'Facade\Ignition\Support\SentReports' => \Facade\Ignition\Support\SentReports::class,
             'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
             'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
             'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
@@ -1123,6 +1155,7 @@ namespace PHPSTORM_META {
             'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
             'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
             'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
+            'Spatie\Csp\Nonce\NonceGenerator' => \Spatie\Csp\Nonce\RandomString::class,
             'Spatie\MediaLibrary\MediaCollections\Filesystem' => \Spatie\MediaLibrary\MediaCollections\Filesystem::class,
             'Spatie\MediaLibrary\MediaCollections\MediaRepository' => \Spatie\MediaLibrary\MediaCollections\MediaRepository::class,
             'Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\TinyPlaceholderGenerator' => \Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\Blurred::class,
@@ -1147,6 +1180,7 @@ namespace PHPSTORM_META {
             'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
             'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
             'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
+            'command.db.prune' => \Illuminate\Database\Console\PruneCommand::class,
             'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class,
             'command.down' => \Illuminate\Foundation\Console\DownCommand::class,
             'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
@@ -1196,7 +1230,9 @@ namespace PHPSTORM_META {
             'command.queue.flush' => \Illuminate\Queue\Console\FlushFailedCommand::class,
             'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
             'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
+            'command.queue.monitor' => \Illuminate\Queue\Console\MonitorCommand::class,
             'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
+            'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
             'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
             'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
             'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,
@@ -1295,8 +1331,10 @@ namespace PHPSTORM_META {
             'Facade\Ignition\DumpRecorder\MultiDumpHandler' => \Facade\Ignition\DumpRecorder\MultiDumpHandler::class,
             'Facade\Ignition\ErrorPage\Renderer' => \Facade\Ignition\ErrorPage\Renderer::class,
             'Facade\Ignition\IgnitionConfig' => \Facade\Ignition\IgnitionConfig::class,
+            'Facade\Ignition\JobRecorder\JobRecorder' => \Facade\Ignition\JobRecorder\JobRecorder::class,
             'Facade\Ignition\LogRecorder\LogRecorder' => \Facade\Ignition\LogRecorder\LogRecorder::class,
             'Facade\Ignition\QueryRecorder\QueryRecorder' => \Facade\Ignition\QueryRecorder\QueryRecorder::class,
+            'Facade\Ignition\Support\SentReports' => \Facade\Ignition\Support\SentReports::class,
             'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
             'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
             'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
@@ -1332,6 +1370,7 @@ namespace PHPSTORM_META {
             'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
             'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
             'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
+            'Spatie\Csp\Nonce\NonceGenerator' => \Spatie\Csp\Nonce\RandomString::class,
             'Spatie\MediaLibrary\MediaCollections\Filesystem' => \Spatie\MediaLibrary\MediaCollections\Filesystem::class,
             'Spatie\MediaLibrary\MediaCollections\MediaRepository' => \Spatie\MediaLibrary\MediaCollections\MediaRepository::class,
             'Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\TinyPlaceholderGenerator' => \Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\Blurred::class,
@@ -1356,6 +1395,7 @@ namespace PHPSTORM_META {
             'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
             'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
             'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
+            'command.db.prune' => \Illuminate\Database\Console\PruneCommand::class,
             'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class,
             'command.down' => \Illuminate\Foundation\Console\DownCommand::class,
             'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
@@ -1405,7 +1445,9 @@ namespace PHPSTORM_META {
             'command.queue.flush' => \Illuminate\Queue\Console\FlushFailedCommand::class,
             'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
             'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
+            'command.queue.monitor' => \Illuminate\Queue\Console\MonitorCommand::class,
             'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
+            'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
             'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
             'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
             'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,
@@ -1504,8 +1546,10 @@ namespace PHPSTORM_META {
             'Facade\Ignition\DumpRecorder\MultiDumpHandler' => \Facade\Ignition\DumpRecorder\MultiDumpHandler::class,
             'Facade\Ignition\ErrorPage\Renderer' => \Facade\Ignition\ErrorPage\Renderer::class,
             'Facade\Ignition\IgnitionConfig' => \Facade\Ignition\IgnitionConfig::class,
+            'Facade\Ignition\JobRecorder\JobRecorder' => \Facade\Ignition\JobRecorder\JobRecorder::class,
             'Facade\Ignition\LogRecorder\LogRecorder' => \Facade\Ignition\LogRecorder\LogRecorder::class,
             'Facade\Ignition\QueryRecorder\QueryRecorder' => \Facade\Ignition\QueryRecorder\QueryRecorder::class,
+            'Facade\Ignition\Support\SentReports' => \Facade\Ignition\Support\SentReports::class,
             'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
             'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
             'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
@@ -1541,6 +1585,7 @@ namespace PHPSTORM_META {
             'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
             'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
             'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
+            'Spatie\Csp\Nonce\NonceGenerator' => \Spatie\Csp\Nonce\RandomString::class,
             'Spatie\MediaLibrary\MediaCollections\Filesystem' => \Spatie\MediaLibrary\MediaCollections\Filesystem::class,
             'Spatie\MediaLibrary\MediaCollections\MediaRepository' => \Spatie\MediaLibrary\MediaCollections\MediaRepository::class,
             'Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\TinyPlaceholderGenerator' => \Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\Blurred::class,
@@ -1565,6 +1610,7 @@ namespace PHPSTORM_META {
             'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
             'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
             'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
+            'command.db.prune' => \Illuminate\Database\Console\PruneCommand::class,
             'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class,
             'command.down' => \Illuminate\Foundation\Console\DownCommand::class,
             'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
@@ -1614,7 +1660,9 @@ namespace PHPSTORM_META {
             'command.queue.flush' => \Illuminate\Queue\Console\FlushFailedCommand::class,
             'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
             'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
+            'command.queue.monitor' => \Illuminate\Queue\Console\MonitorCommand::class,
             'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
+            'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
             'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
             'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
             'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,
@@ -1713,8 +1761,10 @@ namespace PHPSTORM_META {
             'Facade\Ignition\DumpRecorder\MultiDumpHandler' => \Facade\Ignition\DumpRecorder\MultiDumpHandler::class,
             'Facade\Ignition\ErrorPage\Renderer' => \Facade\Ignition\ErrorPage\Renderer::class,
             'Facade\Ignition\IgnitionConfig' => \Facade\Ignition\IgnitionConfig::class,
+            'Facade\Ignition\JobRecorder\JobRecorder' => \Facade\Ignition\JobRecorder\JobRecorder::class,
             'Facade\Ignition\LogRecorder\LogRecorder' => \Facade\Ignition\LogRecorder\LogRecorder::class,
             'Facade\Ignition\QueryRecorder\QueryRecorder' => \Facade\Ignition\QueryRecorder\QueryRecorder::class,
+            'Facade\Ignition\Support\SentReports' => \Facade\Ignition\Support\SentReports::class,
             'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
             'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
             'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
@@ -1750,6 +1800,7 @@ namespace PHPSTORM_META {
             'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
             'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
             'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
+            'Spatie\Csp\Nonce\NonceGenerator' => \Spatie\Csp\Nonce\RandomString::class,
             'Spatie\MediaLibrary\MediaCollections\Filesystem' => \Spatie\MediaLibrary\MediaCollections\Filesystem::class,
             'Spatie\MediaLibrary\MediaCollections\MediaRepository' => \Spatie\MediaLibrary\MediaCollections\MediaRepository::class,
             'Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\TinyPlaceholderGenerator' => \Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\Blurred::class,
@@ -1774,6 +1825,7 @@ namespace PHPSTORM_META {
             'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
             'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
             'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
+            'command.db.prune' => \Illuminate\Database\Console\PruneCommand::class,
             'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class,
             'command.down' => \Illuminate\Foundation\Console\DownCommand::class,
             'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
@@ -1823,7 +1875,9 @@ namespace PHPSTORM_META {
             'command.queue.flush' => \Illuminate\Queue\Console\FlushFailedCommand::class,
             'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
             'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
+            'command.queue.monitor' => \Illuminate\Queue\Console\MonitorCommand::class,
             'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
+            'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
             'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
             'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
             'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,
@@ -1922,8 +1976,10 @@ namespace PHPSTORM_META {
             'Facade\Ignition\DumpRecorder\MultiDumpHandler' => \Facade\Ignition\DumpRecorder\MultiDumpHandler::class,
             'Facade\Ignition\ErrorPage\Renderer' => \Facade\Ignition\ErrorPage\Renderer::class,
             'Facade\Ignition\IgnitionConfig' => \Facade\Ignition\IgnitionConfig::class,
+            'Facade\Ignition\JobRecorder\JobRecorder' => \Facade\Ignition\JobRecorder\JobRecorder::class,
             'Facade\Ignition\LogRecorder\LogRecorder' => \Facade\Ignition\LogRecorder\LogRecorder::class,
             'Facade\Ignition\QueryRecorder\QueryRecorder' => \Facade\Ignition\QueryRecorder\QueryRecorder::class,
+            'Facade\Ignition\Support\SentReports' => \Facade\Ignition\Support\SentReports::class,
             'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
             'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
             'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
@@ -1959,6 +2015,7 @@ namespace PHPSTORM_META {
             'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
             'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
             'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
+            'Spatie\Csp\Nonce\NonceGenerator' => \Spatie\Csp\Nonce\RandomString::class,
             'Spatie\MediaLibrary\MediaCollections\Filesystem' => \Spatie\MediaLibrary\MediaCollections\Filesystem::class,
             'Spatie\MediaLibrary\MediaCollections\MediaRepository' => \Spatie\MediaLibrary\MediaCollections\MediaRepository::class,
             'Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\TinyPlaceholderGenerator' => \Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\Blurred::class,
@@ -1983,6 +2040,7 @@ namespace PHPSTORM_META {
             'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
             'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
             'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
+            'command.db.prune' => \Illuminate\Database\Console\PruneCommand::class,
             'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class,
             'command.down' => \Illuminate\Foundation\Console\DownCommand::class,
             'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
@@ -2032,7 +2090,9 @@ namespace PHPSTORM_META {
             'command.queue.flush' => \Illuminate\Queue\Console\FlushFailedCommand::class,
             'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
             'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
+            'command.queue.monitor' => \Illuminate\Queue\Console\MonitorCommand::class,
             'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
+            'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
             'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
             'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
             'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,
@@ -2131,8 +2191,10 @@ namespace PHPSTORM_META {
             'Facade\Ignition\DumpRecorder\MultiDumpHandler' => \Facade\Ignition\DumpRecorder\MultiDumpHandler::class,
             'Facade\Ignition\ErrorPage\Renderer' => \Facade\Ignition\ErrorPage\Renderer::class,
             'Facade\Ignition\IgnitionConfig' => \Facade\Ignition\IgnitionConfig::class,
+            'Facade\Ignition\JobRecorder\JobRecorder' => \Facade\Ignition\JobRecorder\JobRecorder::class,
             'Facade\Ignition\LogRecorder\LogRecorder' => \Facade\Ignition\LogRecorder\LogRecorder::class,
             'Facade\Ignition\QueryRecorder\QueryRecorder' => \Facade\Ignition\QueryRecorder\QueryRecorder::class,
+            'Facade\Ignition\Support\SentReports' => \Facade\Ignition\Support\SentReports::class,
             'Illuminate\Auth\Middleware\RequirePassword' => \Illuminate\Auth\Middleware\RequirePassword::class,
             'Illuminate\Broadcasting\BroadcastManager' => \Illuminate\Broadcasting\BroadcastManager::class,
             'Illuminate\Bus\BatchRepository' => \Illuminate\Bus\DatabaseBatchRepository::class,
@@ -2168,6 +2230,7 @@ namespace PHPSTORM_META {
             'NunoMaduro\Collision\Contracts\Provider' => \NunoMaduro\Collision\Provider::class,
             'Psr\Http\Message\ResponseInterface' => \Nyholm\Psr7\Response::class,
             'Psr\Http\Message\ServerRequestInterface' => \Nyholm\Psr7\ServerRequest::class,
+            'Spatie\Csp\Nonce\NonceGenerator' => \Spatie\Csp\Nonce\RandomString::class,
             'Spatie\MediaLibrary\MediaCollections\Filesystem' => \Spatie\MediaLibrary\MediaCollections\Filesystem::class,
             'Spatie\MediaLibrary\MediaCollections\MediaRepository' => \Spatie\MediaLibrary\MediaCollections\MediaRepository::class,
             'Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\TinyPlaceholderGenerator' => \Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\Blurred::class,
@@ -2192,6 +2255,7 @@ namespace PHPSTORM_META {
             'command.config.clear' => \Illuminate\Foundation\Console\ConfigClearCommand::class,
             'command.console.make' => \Illuminate\Foundation\Console\ConsoleMakeCommand::class,
             'command.controller.make' => \Illuminate\Routing\Console\ControllerMakeCommand::class,
+            'command.db.prune' => \Illuminate\Database\Console\PruneCommand::class,
             'command.db.wipe' => \Illuminate\Database\Console\WipeCommand::class,
             'command.down' => \Illuminate\Foundation\Console\DownCommand::class,
             'command.environment' => \Illuminate\Foundation\Console\EnvironmentCommand::class,
@@ -2241,7 +2305,9 @@ namespace PHPSTORM_META {
             'command.queue.flush' => \Illuminate\Queue\Console\FlushFailedCommand::class,
             'command.queue.forget' => \Illuminate\Queue\Console\ForgetFailedCommand::class,
             'command.queue.listen' => \Illuminate\Queue\Console\ListenCommand::class,
+            'command.queue.monitor' => \Illuminate\Queue\Console\MonitorCommand::class,
             'command.queue.prune-batches' => \Illuminate\Queue\Console\PruneBatchesCommand::class,
+            'command.queue.prune-failed-jobs' => \Illuminate\Queue\Console\PruneFailedJobsCommand::class,
             'command.queue.restart' => \Illuminate\Queue\Console\RestartCommand::class,
             'command.queue.retry' => \Illuminate\Queue\Console\RetryCommand::class,
             'command.queue.retry-batch' => \Illuminate\Queue\Console\RetryBatchCommand::class,

Dockerfile

@@ -1,6 +1,6 @@
 ARG MEDIA_LIBRARY_DEPS="jpegoptim optipng pngquant gifsicle"
 
-FROM php:8.0-fpm-alpine
+FROM php:8.0-fpm-alpine3.13
 ARG MEDIA_LIBRARY_DEPS
 
 RUN apk add --no-cache --virtual \

SECURITY.md

@@ -0,0 +1,19 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 0.x     | :white_check_mark: |
+
+## Reporting a Vulnerability
+
+
+Kcal's maintainers recommend huntr.dev as a platform for reporting
+vulnerabilities. Maintainers will do their best to verify, respond to
+and fix issues reported on the platform.
+
+[Disclose a Vulnerability on huntr.dev](https://huntr.dev/bounties/disclose/)

app/Http/Kernel.php

@@ -31,6 +31,8 @@ class Kernel extends HttpKernel
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            \Spatie\Csp\AddCspHeaders::class,
+            \App\Http\Middleware\DisableBrowserCache::class,
         ],
 
         'api' => [

app/Http/Middleware/DisableBrowserCache.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+
+class DisableBrowserCache
+{
+    /**
+     * Sets a cache control header to disable browser caching.
+     *
+     * For some reason `ResponseHeaderBag::computeCacheControlValue` insists on
+     * making changing to the `Cache-Control` header even though it is modified
+     * using the `cache.headers` middleware. This middleware removes the header
+     * entirely and sets it to a value to prevent browser caching.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @param  string|null  ...$guards
+     * @return mixed
+     *
+     * @see \Symfony\Component\HttpFoundation\ResponseHeaderBag::computeCacheControlValue()
+     */
+    public function handle(Request $request, Closure $next, ...$guards)
+    {
+        $response = $next($request);
+        $response->headers->set('Cache-Control', 'no-cache, no-store');
+        return $response;
+    }
+}

app/Http/Requests/UpdateUserRequest.php

@@ -16,8 +16,7 @@ class UpdateUserRequest extends FormRequest
         $rules = [
             'username' => ['required', 'string', Rule::unique('users')->ignore($this->user)],
             'name' => ['required', 'string'],
-            'password' => ['nullable', 'string', 'confirmed'],
+            'password' => ['nullable', 'string', 'min:8', 'confirmed'],
-            'password_confirmation' => ['nullable', 'string'],
             'admin' => ['nullable', 'boolean'],
             'image' => ['nullable', 'file', 'mimes:jpg,png,gif'],
             'remove_image' => ['nullable', 'boolean'],

app/Services/Csp/Policies/DefaultPolicy.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Services\Csp\Policies;
+
+use Spatie\Csp\Directive;
+use Spatie\Csp\Keyword;
+use Spatie\Csp\Policies\Policy;
+use Spatie\Csp\Scheme;
+
+/**
+ * Default CSP policy configuration for the application.
+ *
+ * @see \Spatie\Csp\Policies\Basic
+ */
+class DefaultPolicy extends Policy
+{
+    public function configure(): void
+    {
+        $this
+            ->addDirective(Directive::BASE, Keyword::SELF)
+            ->addDirective(Directive::CONNECT, Keyword::SELF)
+            ->addDirective(Directive::DEFAULT, Keyword::SELF)
+            ->addDirective(Directive::FORM_ACTION, Keyword::SELF)
+            ->addDirective(Directive::IMG, [Keyword::SELF, Keyword::UNSAFE_INLINE, Scheme::DATA])
+            ->addDirective(Directive::MEDIA, Keyword::SELF)
+            ->addDirective(Directive::OBJECT, Keyword::NONE)
+            ->addDirective(Directive::SCRIPT, [Keyword::SELF, Keyword::UNSAFE_EVAL, Keyword::UNSAFE_INLINE])
+            ->addDirective(Directive::STYLE, [Keyword::SELF, Keyword::UNSAFE_INLINE])
+            ->addDirective(Directive::FRAME, Keyword::NONE);
+    }
+}

composer.json

@@ -26,6 +26,7 @@
         "laravel/tinker": "^2.5",
         "league/flysystem-aws-s3-v3": "~1.0",
         "phospr/fraction": "^1.2",
+        "spatie/laravel-csp": "^2.6",
         "spatie/laravel-medialibrary": "^9.0.0",
         "spatie/laravel-tags": "^3.0"
     },
@@ -35,7 +36,7 @@
         "cloudcreativity/json-api-testing": "^3.2",
         "facade/ignition": "^2.5",
         "laravel/breeze": "^1.0",
-        "laravel/sail": "^0.0.5",
+        "laravel/sail": "^1.10",
         "mockery/mockery": "^1.4.2",
         "nunomaduro/collision": "^5.0",
         "nunomaduro/larastan": "^0.6.13",

config/csp.php

@@ -0,0 +1,34 @@
+<?php
+
+return [
+
+    /*
+     * A policy will determine which CSP headers will be set. A valid CSP policy is
+     * any class that extends `Spatie\Csp\Policies\Policy`
+     */
+    'policy' => App\Services\Csp\Policies\DefaultPolicy::class,
+
+    /*
+     * This policy which will be put in report only mode. This is great for testing out
+     * a new policy or changes to existing csp policy without breaking anything.
+     */
+    'report_only_policy' => '',
+
+    /*
+     * All violations against the policy will be reported to this url.
+     * A great service you could use for this is https://report-uri.com/
+     *
+     * You can override this setting by calling `reportTo` on your policy.
+     */
+    'report_uri' => env('CSP_REPORT_URI', ''),
+
+    /*
+     * Headers will only be added if this setting is set to true.
+     */
+    'enabled' => env('CSP_ENABLED', true),
+
+    /*
+     * The class responsible for generating the nonces used in inline tags and headers.
+     */
+    'nonce_generator' => Spatie\Csp\Nonce\RandomString::class,
+];

database/migrations/2021_10_31_193051_fix_decimal_fields_precision.php

@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class FixDecimalFieldsPrecision extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('foods', function (Blueprint $table) {
+            $table->decimal('serving_size', 14, 8)->unsigned()->change();
+        });
+        Schema::table('recipes', function (Blueprint $table) {
+            $table->decimal('volume', 14, 8)->unsigned()->nullable()->change();
+        });
+        Schema::table('ingredient_amounts', function (Blueprint $table) {
+            $table->decimal('amount', 14, 8)->unsigned()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('foods', function (Blueprint $table) {
+            $table->decimal('serving_size', 10, 8)->unsigned()->change();
+        });
+        Schema::table('recipes', function (Blueprint $table) {
+            $table->decimal('volume', 10, 8)->unsigned()->nullable()->change();
+        });
+        Schema::table('ingredient_amounts', function (Blueprint $table) {
+            $table->decimal('amount', 10, 8)->unsigned()->change();
+        });
+    }
+}

docker-compose.yml

@@ -8,11 +8,15 @@ services:
       args:
         WWWGROUP: '${WWWGROUP}'
     image: sail-8.0/app
+    extra_hosts:
+      - 'host.docker.internal:host-gateway'
     ports:
       - '${APP_PORT:-8080}:80'
     environment:
       WWWUSER: '${WWWUSER}'
       LARAVEL_SAIL: 1
+      XDEBUG_MODE: '${SAIL_XDEBUG_MODE:-off}'
+      XDEBUG_CONFIG: '${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}'
     volumes:
       - '.:/var/www/html'
     networks:
@@ -24,7 +28,7 @@ services:
   db:
     image: 'mysql:8.0'
     ports:
-      - '${DB_PORT:-3306}:3306'
+      - '${FORWARD_DB_PORT:-3306}:3306'
     environment:
       MYSQL_ROOT_PASSWORD: '${DB_PASSWORD:-kcal}'
       MYSQL_DATABASE: '${DB_DATABASE:-kcal}'
@@ -32,9 +36,13 @@ services:
       MYSQL_PASSWORD: '${DB_PASSWORD:-kcal}'
       MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
     volumes:
-      - 'mysql-data:/var/lib/mysql'
+      - 'db-data:/var/lib/mysql'
     networks:
       - sail
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-p${DB_PASSWORD}"]
+      retries: 3
+      timeout: 5s
   phpmyadmin:
     image: phpmyadmin
     ports:
@@ -47,7 +55,7 @@ services:
     depends_on:
       - db
   elasticsearch:
-    image: 'elasticsearch:7.12.0'
+    image: 'elasticsearch:7.14.1'
     environment:
       - xpack.security.enabled=false
       - discovery.type=single-node
@@ -64,6 +72,7 @@ services:
       - 'elasticsearch-data:/usr/share/elasticsearch/data'
     ports:
       - '${ELASTIC_PORT:-9200}:9200'
+      - '${ELASTIC_BIN_PORT:-9300}:9300'
     networks:
       - sail
   redis:
@@ -80,7 +89,7 @@ networks:
 volumes:
   elasticsearch-data:
     driver: local
-  mysql-data:
+  db-data:
     driver: local
   redis-data:
     driver: local

package.json

@@ -10,22 +10,21 @@
         "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --config=node_modules/laravel-mix/setup/webpack.config.js"
     },
     "devDependencies": {
-        "@tailwindcss/forms": "^0.3.2",
+        "@tailwindcss/forms": "^0.3.3",
         "@tailwindcss/typography": "^0.4.1",
-        "alpinejs": "^2.8.2",
+        "alpinejs": "^3.4.1",
-        "autoprefixer": "^10.2.6",
+        "autoprefixer": "^10.3.6",
-        "axios": "^0.21.1",
+        "axios": "^0.21.4",
         "cross-env": "^7.0",
-        "laravel-mix": "^6.0.19",
+        "laravel-mix": "^6.0.31",
         "lodash": "^4.17.21",
         "postcss-import": "^14.0.2",
         "quill": "^1.3.7",
         "resolve-url-loader": "^4.0.0",
-        "tailwindcss": "^2.1.2",
+        "tailwindcss": "^2.2.16",
-        "vue-template-compiler": "^2.6.12"
+        "vue-template-compiler": "^2.6.14"
     },
     "dependencies": {
-        "@shopify/draggable": "^1.0.0-beta.12",
+        "@shopify/draggable": "^1.0.0-beta.12"
-        "alpine-magic-helpers": "^1.2.2"
     }
 }

resources/js/app.js

@@ -1,4 +1 @@
 require('./bootstrap');
-
-require('alpine-magic-helpers');
-require('alpinejs');

resources/js/bootstrap.js

@@ -1,28 +1,11 @@
+// Load Lodash.
 window._ = require('lodash');
 
-/**
+// Load Axios.
- * We'll load the axios HTTP library which allows us to easily issue requests
- * to our Laravel back-end. This library automatically handles sending the
- * CSRF token as a header based on the value of the "XSRF" token cookie.
- */
-
 window.axios = require('axios');
-
 window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
 
-/**
+// Load AlpineJS.
- * Echo exposes an expressive API for subscribing to channels and listening
+import Alpine from 'alpinejs';
- * for events that are broadcast by Laravel. Echo and event broadcasting
+window.Alpine = Alpine;
- * allows your team to easily build robust real-time web applications.
+Alpine.start();
- */
-
-// import Echo from 'laravel-echo';
-
-// window.Pusher = require('pusher-js');
-
-// window.Echo = new Echo({
-//     broadcaster: 'pusher',
-//     key: process.env.MIX_PUSHER_APP_KEY,
-//     cluster: process.env.MIX_PUSHER_APP_CLUSTER,
-//     forceTLS: true
-// });

resources/views/components/dropdown.blade.php

@@ -21,7 +21,7 @@ switch ($width) {
 }
 @endphp
 
-<div class="relative" x-data="{ open: false }" @click.away="open = false" @close.stop="open = false">
+<div class="relative" x-data="{ open: false }" @click.outside="open = false" @close.stop="open = false">
     <div @click="open = ! open">
         {{ $trigger }}
     </div>

resources/views/components/ingredient-picker.blade.php

@@ -20,11 +20,11 @@
                             autocapitalize="none"
                             inputmode="search"
                             x-ref="ingredients_name"
-                            x-spread="search" />
+                            x-bind="search" />
         </div>
         <div x-show="searching" x-cloak>
             <div class="absolute border-2 border-gray-500 border-b-0 bg-white"
-                 x-spread="ingredient">
+                 x-bind="ingredient">
                 <template x-for="result in results" :key="result.id">
                     <div class="p-1 border-b-2 border-gray-500 hover:bg-yellow-300 cursor-pointer" x-bind:data-id="result.id">
                         <div class="pointer-events-none">

resources/views/components/search-view.blade.php

@@ -1,4 +1,4 @@
-<div x-data="searchView()" x-init="loadMore()">
+<div x-data="searchView">
     <div class="flex flex-col space-y-4 md:flex-row md:space-x-4 md:space-y-0">
         <nav class="md:w-1/4">
             <x-inputs.input name="search"
@@ -41,7 +41,7 @@
                 class="bg-blue-800 hover:bg-blue-700 active:bg-blue-900 focus:border-blue-900 ring-blue-300"
                 x-show="morePages"
                 x-cloak
-                @click.prevent="loadMore()">
+                @click.prevent="loadMore">
                 Load more
             </x-inputs.button>
         </section>
@@ -51,8 +51,8 @@
 @once
     @push('scripts')
         <script type="text/javascript">
-            let searchView = () => {
+            document.addEventListener('alpine:init', () => {
-                return {
+                Alpine.data('searchView', () => ({
                     results: [],
                     number: 1,
                     size: 12,
@@ -60,6 +60,9 @@
                     searchTerm: null,
                     searching: false,
                     filterTags: [],
+                    init() {
+                        this.loadMore();
+                    },
                     resetPagination() {
                         this.number = 1;
                         this.morePages = false;
@@ -109,8 +112,8 @@
                         }
                         this.loadMore();
                     }
-                }
+                }))
-            }
+            })
         </script>
     @endpush
 @endonce

resources/views/components/tagger.blade.php

@@ -1,5 +1,5 @@
 <div x-data data-tags="{{ $defaultTags ?? '[]' }}">
-    <div x-data="tagSelect()" x-init="init('parentEl')" @click.away="clearSearch()" @keydown.escape="clearSearch()">
+    <div x-data="tagSelect()" @click.outside="clearSearch()" @keydown.escape="clearSearch()">
         <div class="relative" @keydown.enter.prevent="addTag(searchTerm)">
             <x-inputs.input type="hidden"
                             name="tags"

resources/views/foods/index.blade.php

@@ -10,7 +10,7 @@
     </x-slot>
     <x-search-view :route="route('api:v1:foods.index')" :tags="$tags">
         <x-slot name="results">
-            <template x-for="food in results" :key="food">
+            <template x-for="food in results" :key="food.slug">
                 <article class="p-1 border-2 border-black font-sans">
                     <h1 class="text-2xl lowercase font-extrabold leading-none">
                         <a x-bind:href="food.showUrl"

resources/views/journal-entries/create.blade.php

@@ -10,14 +10,14 @@
     </x-slot>
     <form method="POST" action="{{ route('journal-entries.store') }}">
         @csrf
-        <div x-data x-init="initJournalEntries($el);" class="space-y-4">
+        <div x-data x-ref="root" x-init="initJournalEntries($refs.root)" class="space-y-4">
             @foreach($ingredients as $ingredient)
                 @include('journal-entries.partials.entry-item-input', $ingredient)
             @endforeach
             <div class="journal-entry-template hidden">
                 @include('journal-entries.partials.entry-item-input', ['default_date' => $default_date])
             </div>
-            <x-inputs.icon-green type="button" class="add-entry-item" x-on:click="addEntryNode($el);">
+            <x-inputs.icon-green type="button" class="add-entry-item" x-on:click="addEntryNode($refs.root);">
                 <svg class="h-10 w-10 pointer-events-none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
                     <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm1-11a1 1 0 10-2 0v2H7a1 1 0 100 2h2v2a1 1 0 102 0v-2h2a1 1 0 100-2h-2V7z" clip-rule="evenodd" />
                 </svg>
@@ -27,7 +27,7 @@
                     <x-inputs.input type="checkbox" name="group_entries" class="h-5 w-5" value="1" />
                     <span class="ml-2">Group entries by day and meal</span>
                 </x-inputs.label>
-                <x-inputs.button x-on:click="removeTemplate($el);">Add entries</x-inputs.button>
+                <x-inputs.button x-on:click="removeTemplate($refs.root);">Add entries</x-inputs.button>
             </div>
         </div>
     </form>

resources/views/journal-entries/index.blade.php

@@ -14,12 +14,12 @@
                         </a>
                     </div>
                     <div class="text-base text-gray-500">
-                        <form x-data method="GET" action="{{ route('journal-entries.index') }}">
+                        <form x-data x-ref="root" method="GET" action="{{ route('journal-entries.index') }}">
                             <x-inputs.input name="date"
                                             type="date"
                                             class="border-0 shadow-none p-0 text-center"
                                             :value="$date->toDateString()"
-                                            x-on:change="$el.submit();"
+                                            x-on:change="$refs.root.submit();"
                                             required />
                         </form>
                     </div>

resources/views/layouts/navigation.blade.php

@@ -35,9 +35,9 @@
                                 <x-dropdown-link :href="route('users.index')">Manage Users</x-dropdown-link>
                             @endcan
                             <hr />
-                            <form method="POST" action="{{ route('logout') }}" x-data>
+                            <form method="POST" action="{{ route('logout') }}" x-data x-ref="root">
                                 @csrf
-                                <x-dropdown-link :href="route('logout')" @click.prevent="$el.closest('form').submit();">Logout</x-dropdown-link>
+                                <x-dropdown-link :href="route('logout')" @click.prevent="$refs.root.closest('form').submit();">Logout</x-dropdown-link>
                             </form>
                         </div>
                     </x-slot>

resources/views/recipes/edit.blade.php

@@ -4,7 +4,7 @@
     <x-slot name="header">
         <h1 class="font-semibold text-xl text-gray-800 leading-tight">{{ $title }}</h1>
     </x-slot>
-    <form x-data method="POST" enctype="multipart/form-data" action="{{ ($recipe->exists ? route('recipes.update', $recipe) : route('recipes.store')) }}">
+    <form x-data x-ref="root" method="POST" enctype="multipart/form-data" action="{{ ($recipe->exists ? route('recipes.update', $recipe) : route('recipes.store')) }}">
         @if ($recipe->exists)@method('put')@endif
         @csrf
         <div class="flex flex-col space-y-4 md:flex-row md:space-x-4 md:space-y-0">
@@ -114,7 +114,7 @@
 
         <!-- Ingredients -->
         <h3 class="mt-6 mb-2 font-extrabold text-lg">Ingredients</h3>
-        <div x-data class="ingredients space-y-4">
+        <div x-data x-ref="ingredients" class="ingredients space-y-4">
             @forelse($ingredients_list->sortBy('weight') as $item)
                 @if($item['type'] === 'ingredient')
                     @include('recipes.partials.ingredient-input', $item)
@@ -134,19 +134,19 @@
             </div>
             <x-inputs.button type="button"
                              class="bg-green-800 hover:bg-green-700 active:bg-green-900 focus:border-green-900 ring-green-300"
-                             x-on:click="addNodeFromTemplate($el, 'ingredient');">
+                             x-on:click="addNodeFromTemplate($refs.ingredients, 'ingredient');">
                 Add Ingredient
             </x-inputs.button>
             <x-inputs.button type="button"
                              class="bg-blue-800 hover:bg-blue-700 active:bg-blue-900 focus:border-blue-900 ring-blue-300"
-                             x-on:click="addNodeFromTemplate($el, 'separator');">
+                             x-on:click="addNodeFromTemplate($refs.ingredients, 'separator');">
                 Add Separator
             </x-inputs.button>
         </div>
 
         <!-- Steps -->
         <h3 class="mt-6 mb-2 font-extrabold text-lg">Steps</h3>
-        <div x-data class="steps">
+        <div x-data x-ref="steps" class="steps">
             @forelse($steps as $step)
                 @include('recipes.partials.step-input', $step)
             @empty
@@ -159,13 +159,13 @@
             </div>
             <x-inputs.button type="button"
                              class="bg-green-800 hover:bg-green-700 active:bg-green-900 focus:border-green-900 ring-green-300"
-                             x-on:click="addNodeFromTemplate($el, 'step');">
+                             x-on:click="addNodeFromTemplate($refs.steps, 'step');">
                 Add Step
             </x-inputs.button>
         </div>
 
         <div class="flex items-center justify-end mt-4">
-            <x-inputs.button x-on:click="prepareForm($el);" class="ml-3">
+            <x-inputs.button x-on:click="prepareForm($refs.root);" class="ml-3">
                 {{ ($recipe->exists ? 'Save' : 'Add') }}
             </x-inputs.button>
         </div>

resources/views/recipes/index.blade.php

@@ -10,7 +10,7 @@
     </x-slot>
     <x-search-view :route="route('api:v1:recipes.index')" :tags="$tags">
         <x-slot name="results">
-            <template x-for="recipe in results" :key="recipe">
+            <template x-for="recipe in results" :key="recipe.slug">
                 <article class="p-1 border-2 border-black font-sans">
                     <h1 class="text-2xl font-extrabold">
                         <a x-bind:href="recipe.showUrl"

resources/views/recipes/show.blade.php

@@ -9,7 +9,7 @@
         </h1>
     </x-slot>
     <div class="flex flex-col-reverse justify-between md:flex-row md:space-x-4">
-        <div class="flex-1" x-data="{showNutrientsSummary: false}">
+        <div class="flex-1" x-data="{ showNutrientsSummary: false }">
             @if($recipe->time_total > 0)
                 <section class="flex justify-between mb-2 p-2 bg-gray-100 rounded max-w-3xl">
                     <div>
@@ -31,7 +31,7 @@
                     {!! $recipe->description !!}
                 </section>
             @endif
-            <section x-data="{showNutrientsSummary: false}">
+            <section x-data="{ showNutrientsSummary: false }">
                 <h1 class="mb-2 font-bold text-2xl">
                     Ingredients
                     <span class="text-sm text-gray-500 hover:text-gray-700 hover:border-gray-300 font-normal cursor-pointer"