Get repo up to date with changes in laravel/laravel (issue #95)

Squashed commit of the following:

commit 850a0dfe70412f0851d1f40fe96c7afdc8348aab
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sun Jan 27 13:42:09 2019 +0000

    Persist data cache

commit fc80710c96b33bf387e346f97a58ed3965520427
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sun Jan 27 13:15:10 2019 +0000

    Added another laravel dependency

commit 1a9ed1bc71e3a11624e4924ae75c4284e6071f6d
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sun Jan 27 13:14:50 2019 +0000

    Fix trailing comma

commit 81f31ae7116146b073c8f886cb74e32d806eba60
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 19:07:55 2019 +0000

    Add Laravel’s illustration SVGs

commit d1f99e4ec2b39d0159689f586f37465cbf867c2b
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 19:07:34 2019 +0000

    Add the dump-server

commit 28a09927a32d20510f6bc236d14daf948c5dd547
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 18:58:27 2019 +0000

    Add mailgin endpoint

commit e80e3a9d53852d5f137918d79969f5a3a93fad81
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 18:55:11 2019 +0000

    Update cache config

commit 3db2f952d420be7e49041d495db6ee59ee310841
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 18:50:02 2019 +0000

    Update session config

commit 0b431150616cb15f17b571e9340e6805723344d6
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 18:46:05 2019 +0000

    Add faker locale setting

commit 048e8ee0c7969ed9b2251f270aea8fee25b3bf98
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 18:44:09 2019 +0000

    Add new Stripe webhook config values

commit 18ce7bee19fca7f920fdcca72049108fd5a7a9b6
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 18:42:57 2019 +0000

    Add Authenticate to middleware

commit 05007f1f038cac4453e4b5d82cb04d6f0820606c
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 18:34:28 2019 +0000

    Update phpunit config

commit 5c033735fbe148b3f3e3950ae97a21977895eeb7
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 18:32:18 2019 +0000

    Update queue config

commit fe92a6f2896a52ab1486288878055cd81abe28e7
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 18:27:22 2019 +0000

    Update database config

commit 19036d7cb1ffc583a571451a7ea00fb421beef8f
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 18:22:41 2019 +0000

    Add asset_url config option

commit ce4b1e3195a6c43fdc4f6fabb2a41b68344220fc
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 18:20:40 2019 +0000

    Allow custom compiled views path

commit b503bca8c6a27fef44d34b826c75a2ee68e0a178
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 18:20:18 2019 +0000

    Add mail logging setting

commit 2988ba197bbd1b0ac78a17ad796f31cc0bb803df
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 18:17:41 2019 +0000

    normalize composer.json

commit a1ff37d716c68f1dedec9644e9fe6f3a7a5ad04f
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 18:11:58 2019 +0000

    Allow env for defining app base

commit e662de24e3a2b7f170c6fb0860c6c16f192aa642
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 18:10:17 2019 +0000

    Get kernel/middleware upto date

commit 2f8c9de52bec8a54fa6745a42c9a8974de0a1467
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 18:04:44 2019 +0000

    Update validation lang file

commit 8f6bf24eec602b21d28b0b6bae6e274c175ff643
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 18:02:28 2019 +0000

    Update .gitignore

commit e219cc454f3e77b822fe761c672bf24824c06d0c
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 17:59:32 2019 +0000

    Update logging.php config file

commit 5a13e1b89f9311918f3f9756d9607424f42e72c5
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 17:56:36 2019 +0000

    Remove extra whitespace

commit 68edee0a9dca0d11d18964329d7f0ec49d32c6e8
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 17:53:30 2019 +0000

    Recompile assets from new resources folder structure

commit 7ec8441a802cb1385fb40cdd22b2398180287512
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 17:44:56 2019 +0000

    Change reference to assets files in various scripts

commit c2f6dfccf2843b25038475d2a5f492decc9e8124
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Jan 26 17:42:25 2019 +0000

    Flatten assets directory

.gitignore

@@ -3,15 +3,13 @@
 /public/storage
 /storage/*.key
 /vendor
-/.idea
+.env
-/.vagrant
+.phpunit.result.cache
-Homestead.yaml
 Homestead.json
+Homestead.yaml
 npm-debug.log
 yarn-error.log
-.env
+# Custom paths in /public
+/public/coverage
 /public/files
 /public/keybase.txt
-/coverage
-/public/coverage
-/LegacyTests

app/Http/Kernel.php

@@ -14,7 +14,7 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
-        \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
+        \App\Http\Middleware\CheckForMaintenanceMode::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
@@ -58,11 +58,30 @@ class Kernel extends HttpKernel
         'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
         'micropub.token' => \App\Http\Middleware\VerifyMicropubToken::class,
         'myauth' => \App\Http\Middleware\MyAuthMiddleware::class,
         'cors' => \App\Http\Middleware\CorsHeaders::class,
     ];
+
+    /**
+     * The priority-sorted list of middleware.
+     *
+     * This forces non-global middleware to always be in the given order.
+     *
+     * @var array
+     */
+    protected $middlewarePriority = [
+        \Illuminate\Session\Middleware\StartSession::class,
+        \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+        \App\Http\Middleware\Authenticate::class,
+        \Illuminate\Session\Middleware\AuthenticateSession::class,
+        \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        \Illuminate\Auth\Middleware\Authorize::class,
+    ];
 }

app/Http/Middleware/Authenticate.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Auth\Middleware\Authenticate as Middleware;
+
+class Authenticate extends Middleware
+{
+    /**
+     * Get the path the user should be redirected to when they are not authenticated.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return string
+     */
+    protected function redirectTo($request)
+    {
+        if (! $request->expectsJson()) {
+            return route('login');
+        }
+    }
+}

app/Http/Middleware/CheckForMaintenanceMode.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode as Middleware;
+
+class CheckForMaintenanceMode extends Middleware
+{
+    /**
+     * The URIs that should be reachable while maintenance mode is enabled.
+     *
+     * @var array
+     */
+    protected $except = [
+        //
+    ];
+}

bootstrap/app.php

@@ -12,7 +12,7 @@
 */
 
 $app = new Illuminate\Foundation\Application(
-    realpath(__DIR__.'/../')
+    $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
 );
 
 /*

composer.json

@@ -1,9 +1,13 @@
 {
     "name": "jonnybarnes/jonnybarnes.uk",
-    "description": "The code for jonnybanres.uk, based on Laravel 5.4",
-    "keywords": ["framework", "laravel", "indieweb"],
-    "license": "CC0-1.0",
     "type": "project",
+    "description": "The code for jonnybanres.uk, based on Laravel 5.4",
+    "keywords": [
+        "framework",
+        "laravel",
+        "indieweb"
+    ],
+    "license": "CC0-1.0",
     "require": {
         "php": ">=7.2.0",
         "cviebrock/eloquent-sluggable": "~4.3",
@@ -34,6 +38,7 @@
         "thujohn/twitter": "~2.0"
     },
     "require-dev": {
+        "beyondcode/laravel-dump-server": "^1.0",
         "barryvdh/laravel-debugbar": "~3.0",
         "codedungeon/phpunit-result-printer": "^0.24.0",
         "filp/whoops": "~2.0",
@@ -44,14 +49,24 @@
         "phpunit/phpunit": "~7.0",
         "symfony/thanks": "~1.0"
     },
+    "config": {
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
+        "sort-packages": true
+    },
+    "extra": {
+        "laravel": {
+            "dont-discover": []
+        }
+    },
     "autoload": {
+        "psr-4": {
+            "App\\": "app/"
+        },
         "classmap": [
             "database/seeds",
             "database/factories"
         ],
-        "psr-4": {
-            "App\\": "app/"
-        },
         "files": [
             "helpers.php"
         ]
@@ -61,29 +76,18 @@
             "Tests\\": "tests"
         }
     },
-    "extra": {
+    "minimum-stability": "dev",
-        "laravel": {
+    "prefer-stable": true,
-            "dont-discover": [
-            ]
-        }
-    },
     "scripts": {
+        "post-autoload-dump": [
+            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+            "@php artisan package:discover --ansi"
+        ],
         "post-root-package-install": [
             "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
         ],
         "post-create-project-cmd": [
-            "@php artisan key:generate"
+            "@php artisan key:generate --ansi"
-        ],
-        "post-autoload-dump": [
-            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-            "@php artisan package:discover"
         ]
-    },
+    }
-    "config": {
-        "preferred-install": "dist",
-        "sort-packages": true,
-        "optimize-autoloader": true
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
 }

composer.lock

@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7b2e4aa6adaf2233e1a256802d898d0f",
+    "content-hash": "ea5648b9a59275e4094e5231477396d0",
     "packages": [
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.87.1",
+            "version": "3.87.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "80b7978ac0cabcf1a7ee6456e8d8ac714e836c4c"
+                "reference": "7c00779a343c9b813628bf6a27b94945272ced93"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/80b7978ac0cabcf1a7ee6456e8d8ac714e836c4c",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7c00779a343c9b813628bf6a27b94945272ced93",
-                "reference": "80b7978ac0cabcf1a7ee6456e8d8ac714e836c4c",
+                "reference": "7c00779a343c9b813628bf6a27b94945272ced93",
                 "shasum": ""
             },
             "require": {
@@ -87,7 +87,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2019-01-24T23:01:13+00:00"
+            "time": "2019-01-25T22:29:49+00:00"
         },
         {
             "name": "bosnadev/database",
@@ -4111,16 +4111,16 @@
         },
         {
             "name": "spatie/image",
-            "version": "1.5.3",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/image.git",
-                "reference": "086bf7c6598ccaf8a0fdee2dcdcfc3637fe8a9eb"
+                "reference": "e2abb144195aab37f023efbe69a0491f0524a7af"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/image/zipball/086bf7c6598ccaf8a0fdee2dcdcfc3637fe8a9eb",
+                "url": "https://api.github.com/repos/spatie/image/zipball/e2abb144195aab37f023efbe69a0491f0524a7af",
-                "reference": "086bf7c6598ccaf8a0fdee2dcdcfc3637fe8a9eb",
+                "reference": "e2abb144195aab37f023efbe69a0491f0524a7af",
                 "shasum": ""
             },
             "require": {
@@ -4160,7 +4160,7 @@
                 "image",
                 "spatie"
             ],
-            "time": "2019-01-10T09:02:14+00:00"
+            "time": "2019-01-26T09:48:17+00:00"
         },
         {
             "name": "spatie/image-optimizer",
@@ -5672,6 +5672,67 @@
             ],
             "time": "2018-11-09T08:37:55+00:00"
         },
+        {
+            "name": "beyondcode/laravel-dump-server",
+            "version": "1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/beyondcode/laravel-dump-server.git",
+                "reference": "8864b9efcb48e0a79e83014dd7f0a5481f5c808f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/beyondcode/laravel-dump-server/zipball/8864b9efcb48e0a79e83014dd7f0a5481f5c808f",
+                "reference": "8864b9efcb48e0a79e83014dd7f0a5481f5c808f",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/console": "5.6.*|5.7.*|5.8.*",
+                "illuminate/http": "5.6.*|5.7.*|5.8.*",
+                "illuminate/support": "5.6.*|5.7.*|5.8.*",
+                "php": "^7.1",
+                "symfony/var-dumper": "^4.1.1"
+            },
+            "require-dev": {
+                "larapack/dd": "^1.0",
+                "phpunit/phpunit": "^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "BeyondCode\\DumpServer\\DumpServerServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "BeyondCode\\DumpServer\\": "src"
+                },
+                "files": [
+                    "helpers.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marcel Pociot",
+                    "email": "marcel@beyondco.de",
+                    "homepage": "https://beyondcode.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Symfony Var-Dump Server for Laravel",
+            "homepage": "https://github.com/beyondcode/laravel-dump-server",
+            "keywords": [
+                "beyondcode",
+                "laravel-dump-server"
+            ],
+            "time": "2018-10-04T07:22:24+00:00"
+        },
         {
             "name": "codedungeon/php-cli-colors",
             "version": "1.10.7",

config/app.php

@@ -54,6 +54,8 @@ return [
 
     'url' => env('APP_URL', 'http://localhost'),
 
+    'asset_url' => env('ASSET_URL', null),
+
     /*
     |--------------------------------------------------------------------------
     | Application Long URL
@@ -126,6 +128,19 @@ return [
 
     'fallback_locale' => 'en',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Faker Locale
+    |--------------------------------------------------------------------------
+    |
+    | This locale will be used by the Faker PHP library when generating fake
+    | data for your database seeds. For example, this will be used to get
+    | localized telephone numbers, street address information and more.
+    |
+    */
+
+    'faker_locale' => 'en_US',
+
     /*
     |--------------------------------------------------------------------------
     | Encryption Key

config/cache.php

@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Str;
+
 return [
 
     /*
@@ -57,7 +59,7 @@ return [
                 env('MEMCACHED_PASSWORD'),
             ],
             'options' => [
-                // Memcached::OPT_CONNECT_TIMEOUT  => 2000,
+                // Memcached::OPT_CONNECT_TIMEOUT => 2000,
             ],
             'servers' => [
                 [
@@ -86,6 +88,6 @@ return [
     |
     */
 
-    'prefix' => 'laravel',
+    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),
 
 ];

config/database.php

@@ -37,6 +37,7 @@ return [
             'driver' => 'sqlite',
             'database' => env('DB_DATABASE', database_path('database.sqlite')),
             'prefix' => '',
+            'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
         ],
 
         'mysql' => [
@@ -50,6 +51,7 @@ return [
             'charset' => 'utf8mb4',
             'collation' => 'utf8mb4_unicode_ci',
             'prefix' => '',
+            'prefix_indexes' => true,
             'strict' => true,
             'engine' => null,
         ],
@@ -63,6 +65,7 @@ return [
             'password' => env('DB_PASSWORD', ''),
             'charset' => 'utf8',
             'prefix' => '',
+            'prefix_indexes' => true,
             'schema' => 'public',
             'sslmode' => 'prefer',
         ],
@@ -76,6 +79,7 @@ return [
             'password' => env('DB_PASSWORD', ''),
             'charset' => 'utf8',
             'prefix' => '',
+            'prefix_indexes' => true,
         ],
 
         'travis' => [
@@ -110,7 +114,7 @@ return [
     |--------------------------------------------------------------------------
     |
     | Redis is an open source, fast, and advanced key-value store that also
-    | provides a richer set of commands than a typical key-value systems
+    | provides a richer body of commands than a typical key-value system
     | such as APC or Memcached. Laravel makes it easy to dig right in.
     |
     */
@@ -120,10 +124,17 @@ return [
         'client' => 'predis',
 
         'default' => [
-            'host' => env('REDIS_HOST', 'localhost'),
+            'host' => env('REDIS_HOST', '127.0.0.1'),
             'password' => env('REDIS_PASSWORD', null),
             'port' => env('REDIS_PORT', 6379),
-            'database' => 0,
+            'database' => env('REDIS_DB', 0),
+        ],
+
+        'cache' => [
+            'host' => env('REDIS_HOST', '127.0.0.1'),
+            'password' => env('REDIS_PASSWORD', null),
+            'port' => env('REDIS_PORT', 6379),
+            'database' => env('REDIS_CACHE_DB', 1),
         ],
 
     ],

config/logging.php

@@ -1,5 +1,8 @@
 <?php
 
+use Monolog\Handler\StreamHandler;
+use Monolog\Handler\SyslogUdpHandler;
+
 return [
 
     /*
@@ -25,7 +28,8 @@ return [
     | you a variety of powerful log handlers / formatters to utilize.
     |
     | Available Drivers: "single", "daily", "slack", "syslog",
-    |                    "errorlog", "custom", "stack"
+    |                    "errorlog", "monolog",
+    |                    "custom", "stack"
     |
     */
 
@@ -45,7 +49,7 @@ return [
             'driver' => 'daily',
             'path' => storage_path('logs/laravel.log'),
             'level' => 'debug',
-            'days' => 7,
+            'days' => 14,
         ],
 
         'slack' => [
@@ -56,6 +60,25 @@ return [
             'level' => 'critical',
         ],
 
+        'papertrail' => [
+            'driver' => 'monolog',
+            'level' => 'debug',
+            'handler' => SyslogUdpHandler::class,
+            'handler_with' => [
+                'host' => env('PAPERTRAIL_URL'),
+                'port' => env('PAPERTRAIL_PORT'),
+            ],
+        ],
+
+        'stderr' => [
+            'driver' => 'monolog',
+            'handler' => StreamHandler::class,
+            'formatter' => env('LOG_STDERR_FORMATTER'),
+            'with' => [
+                'stream' => 'php://stderr',
+            ],
+        ],
+
         'syslog' => [
             'driver' => 'syslog',
             'level' => 'debug',

config/mail.php

@@ -119,4 +119,17 @@ return [
         ],
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Log Channel
+    |--------------------------------------------------------------------------
+    |
+    | If you are using the "log" driver, you may specify the logging channel
+    | if you prefer to keep mail messages separate from other log entries
+    | for simpler reading. Otherwise, the default channel will be used.
+    |
+    */
+
+    'log_channel' => env('MAIL_LOG_CHANNEL'),
+
 ];

config/queue.php

@@ -4,18 +4,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Default Queue Driver
+    | Default Queue Connection Name
     |--------------------------------------------------------------------------
     |
     | Laravel's queue API supports an assortment of back-ends via a single
     | API, giving you convenient access to each back-end using the same
-    | syntax for each one. Here you may set the default queue driver.
+    | syntax for every one. Here you may define a default connection.
-    |
-    | Supported: "sync", "database", "beanstalkd", "sqs", "redis", "null"
     |
     */
 
-    'default' => env('QUEUE_DRIVER', 'sync'),
+    'default' => env('QUEUE_CONNECTION', 'sync'),
 
     /*
     |--------------------------------------------------------------------------
@@ -26,6 +24,8 @@ return [
     | is used by your application. A default configuration has been added
     | for each back-end shipped with Laravel. You are free to add more.
     |
+    | Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
+    |
     */
 
     'connections' => [
@@ -50,18 +50,19 @@ return [
 
         'sqs' => [
             'driver' => 'sqs',
-            'key' => 'your-public-key',
+            'key' => env('SQS_KEY', 'your-public-key'),
-            'secret' => 'your-secret-key',
+            'secret' => env('SQS_SECRET', 'your-secret-key'),
-            'prefix' => 'https://sqs.us-east-1.amazonaws.com/your-account-id',
+            'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
-            'queue' => 'your-queue-name',
+            'queue' => env('SQS_QUEUE', 'your-queue-name'),
-            'region' => 'us-east-1',
+            'region' => env('SQS_REGION', 'us-east-1'),
         ],
 
         'redis' => [
             'driver' => 'redis',
             'connection' => 'default',
-            'queue' => 'default',
+            'queue' => env('REDIS_QUEUE', 'default'),
             'retry_after' => 90,
+            'block_for' => null,
         ],
 
     ],

config/services.php

@@ -17,6 +17,7 @@ return [
     'mailgun' => [
         'domain' => env('MAILGUN_DOMAIN'),
         'secret' => env('MAILGUN_SECRET'),
+        'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
     ],
 
     'ses' => [
@@ -33,6 +34,10 @@ return [
         'model' => App\User::class,
         'key' => env('STRIPE_KEY'),
         'secret' => env('STRIPE_SECRET'),
+        'webhook' => [
+            'secret' => env('STRIPE_WEBHOOK_SECRET'),
+            'tolerance' => env('STRIPE_WEBHOOK_TOLERANCE', 300),
+        ],
     ],
 
 ];

config/session.php

@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Str;
+
 return [
 
     /*
@@ -70,7 +72,7 @@ return [
     |
     */
 
-    'connection' => null,
+    'connection' => env('SESSION_CONNECTION', null),
 
     /*
     |--------------------------------------------------------------------------
@@ -96,7 +98,7 @@ return [
     |
     */
 
-    'store' => null,
+    'store' => env('SESSION_STORE', null),
 
     /*
     |--------------------------------------------------------------------------
@@ -124,7 +126,7 @@ return [
 
     'cookie' => env(
         'SESSION_COOKIE',
-        str_slug(env('APP_NAME', 'laravel'), '_').'_session'
+        Str::slug(env('APP_NAME', 'laravel'), '_').'_session'
     ),
 
     /*

config/view.php

@@ -28,6 +28,9 @@ return [
     |
     */
 
-    'compiled' => realpath(storage_path('framework/views')),
+    'compiled' => env(
+        'VIEW_COMPILED_PATH',
+        realpath(storage_path('framework/views'))
+    ),
 
 ];

package.json

@@ -45,13 +45,13 @@
     "scripts": {
         "compress": "scripts/compress",
         "copy-dist": "cp ./node_modules/mapbox-gl/dist/mapbox-gl.css ./public/assets/frontend/ && cp ./node_modules/alertify.js/dist/css/alertify.css ./public/assets/frontend/ && cp ./node_modules/normalize.css/normalize.css ./public/assets/frontend/ && cp ./node_modules/a11y.css/css/*.css ./public/assets/frontend/a11y.css/",
-        "lint:es6": "eslint resources/assets/es6/*.js",
+        "lint:es6": "eslint resources/es6/*.js",
-        "lint:sass": "stylelint --syntax=scss resources/assets/sass/**/*.scss",
+        "lint:sass": "stylelint --syntax=scss resources/sass/**/*.scss",
         "make": "npm run make:css && npm run make:js",
         "make:css": "npm run lint:sass && npm run sass && npm run postcss",
         "make:js": "npm run lint:es6 && npm run webpack && npm run uglifyjs",
         "postcss": "postcss public/assets/css/app.css --use autoprefixer --autoprefixer.browsers \"> 5%\" --replace --map",
-        "sass": "sassc --style compressed --sourcemap resources/assets/sass/app.scss public/assets/css/app.css",
+        "sass": "sassc --style compressed --sourcemap resources/sass/app.scss public/assets/css/app.css",
         "uglifyjs": "scripts/uglifyjs",
         "webpack": "webpack --progress --colors"
     },
@@ -61,7 +61,7 @@
         }
     },
     "lint-staged": {
-        "./resources/assets/es6/*.js": [
+        "./resources/es6/*.js": [
             "eslint --fix",
             "git add"
         ],

phpunit.xml

@@ -10,12 +10,13 @@
          stopOnFailure="false"
          printerClass="Codedungeon\PHPUnitPrettyResultPrinter\Printer">
     <testsuites>
-        <testsuite name="Feature">
-            <directory suffix="Test.php">./tests/Feature</directory>
-        </testsuite>
         <testsuite name="Unit">
             <directory suffix="Test.php">./tests/Unit</directory>
         </testsuite>
+
+        <testsuite name="Feature">
+            <directory suffix="Test.php">./tests/Feature</directory>
+        </testsuite>
     </testsuites>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
@@ -27,8 +28,10 @@
     </listeners>
     <php>
         <env name="APP_ENV" value="testing"/>
+        <env name="BCRYPT_ROUNDS" value="4"/>
         <env name="CACHE_DRIVER" value="array"/>
+        <env name="MAIL_DRIVER" value="array"/>
+        <env name="QUEUE_CONNECTION" value="sync"/>
         <env name="SESSION_DRIVER" value="array"/>
-        <env name="QUEUE_DRIVER" value="sync"/>
     </php>
 </phpunit>

public/assets/css/app.css.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../resources/assets/sass/_border-box.scss","../../../resources/assets/sass/_base-font.scss","../../../resources/assets/sass/_header.scss","../../../resources/assets/sass/_variables.scss","../../../resources/assets/sass/_main.scss","../../../resources/assets/sass/_articles.scss","../../../resources/assets/sass/_hovercard.scss","../../../resources/assets/sass/_notes.scss","../../../resources/assets/sass/_pagination.scss","../../../resources/assets/sass/_contacts-page.scss","../../../resources/assets/sass/_projects.scss","../../../resources/assets/sass/_footer.scss","../../../resources/assets/sass/_admin-form.scss","../../../resources/assets/sass/_form.scss","../../../resources/assets/sass/_likes.scss","../../../resources/assets/sass/_bridgy-links.scss","../../../resources/assets/sass/_emoji.scss","../../../resources/assets/sass/_mapbox.scss","../../../resources/assets/sass/_colors.scss","../../../resources/assets/sass/_styles.scss","../../../resources/assets/sass/_tags.scss"],"names":[],"mappings":"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","file":"app.css"}
+{"version":3,"sources":["../../../resources/sass/_border-box.scss","../../../resources/sass/_base-font.scss","../../../resources/sass/_header.scss","../../../resources/sass/_variables.scss","../../../resources/sass/_main.scss","../../../resources/sass/_articles.scss","../../../resources/sass/_hovercard.scss","../../../resources/sass/_notes.scss","../../../resources/sass/_pagination.scss","../../../resources/sass/_contacts-page.scss","../../../resources/sass/_projects.scss","../../../resources/sass/_footer.scss","../../../resources/sass/_admin-form.scss","../../../resources/sass/_form.scss","../../../resources/sass/_likes.scss","../../../resources/sass/_bridgy-links.scss","../../../resources/sass/_emoji.scss","../../../resources/sass/_mapbox.scss","../../../resources/sass/_colors.scss","../../../resources/sass/_styles.scss","../../../resources/sass/_tags.scss"],"names":[],"mappings":"AAKA,KACI,qBAAsB,CACzB,qBAKG,kBAAmB,CACtB,KCVG,cAAe,CACf,gCAAiC,CACpC,gBAGG,oBAAqB,CACxB,WCNG,YAAa,CACb,aAAc,CACd,kBAAmB,CACnB,UAAW,CACX,eCJgB,CDKnB,cAGG,cAAe,CACf,cAAe,CAClB,eAGG,cAAe,CAClB,KEdG,YAAa,CACb,qBAAsB,CACtB,mBAAoB,CACpB,eDJc,CCKd,aAAc,CACd,gBAAiB,CACjB,cAAe,CAClB,WAIG,gBAAiB,CACpB,kBCZG,mBAAoB,CACpB,iBAAkB,CACrB,aCFG,iBAAkB,CACrB,qBAGG,iBAAkB,CACrB,2BAGG,WAAY,CACf,WAGG,iBAAkB,CAClB,kBAAmB,CACnB,6BAA8B,CAC9B,oBAAqB,CACrB,gBAAiB,CACjB,WAAY,CACZ,UAAW,CACX,SAAU,CACV,UAAW,CACX,sBAAuB,CACvB,iBAAkB,CAClB,kCAAiD,CACjD,YAAa,CAChB,8BAGG,YAAa,CAChB,0BAGG,UAAW,CACX,WAAY,CACf,sBAGG,YAAa,CCnCjB,MACI,YAAa,CACb,qBAAsB,CACtB,cAAe,CAClB,UAGG,cAAe,CACf,eAAgB,CACnB,eAGG,YAAa,CACb,kBAAmB,CACnB,6BAA8B,CACjC,MAGG,UAAW,CACX,UAAW,CACd,eAGG,mBAAoB,CACpB,iBAAkB,CACrB,YC3BG,YAAa,CACb,kBAAmB,CACnB,4BAA6B,CAC7B,cAAe,CACf,oBAAqB,CACxB,cCLG,cAAe,CACf,YAAa,CACb,0BAA2B,CAC3B,6BAA8B,CAC9B,eAAgB,CACnB,kBAGG,UAAW,CACX,WAAY,CACf,UCVG,cAAe,CAClB,gBCDG,eRDc,CQEd,aAAc,CACd,gBAAiB,CACpB,OAGG,eRPc,CQQd,aAAc,CACd,YAAa,CACb,qBAAsB,CACtB,kBAAmB,CACtB,YCXG,eAAgB,CAChB,kBAAmB,CACtB,MCFG,YAAa,CACb,qBAAsB,CACzB,UAGG,YAAa,CACb,qBAAsB,CACzB,aAGG,kBAAmB,CACtB,WCXG,eAAgB,CACnB,qDCAG,YAAa,CAChB,2BCAG,iBAAkB,CACrB,gFAIG,iBAAkB,CAClB,aAAc,CACd,SAAU,CACV,YAAa,CACb,MAAO,CACP,aAAc,CACd,oBAAqB,CACrB,wBAA2C,CAC3C,mBAAoB,CACpB,mCAAgD,CAChD,wBAAyB,CACzB,iCAAqC,CACrC,UAA6B,CAC7B,aAAc,CACd,yCAAW,CAAX,iCAAkC,CACrC,2BAGG,KACI,YAAa,CACb,8BAAkC,CAClC,uCAA2C,CAC3C,yBAA6B,CAC7B,qBAAkC,CAGtC,GACI,YAAa,CACb,iCAAqC,CACrC,wBAA2C,CAC3C,UAA6B,CAC7B,mCAAgD,CAAA,CAhBvD,mBAGG,KACI,YAAa,CACb,8BAAkC,CAClC,uCAA2C,CAC3C,yBAA6B,CAC7B,qBAAkC,CAGtC,GACI,YAAa,CACb,iCAAqC,CACrC,wBAA2C,CAC3C,UAA6B,CAC7B,mCAAgD,CAAA,CAIxD,aACI,kCACI,kCAAmC,CACtC,CC9CL,KACI,YAAa,CAChB,oBAGG,kBAAmB,CACtB,QAGG,w4HAAy4H,CACz4H,uBAAwB,CACxB,UAAW,CACX,WAAY,CACf,UAGG,iBAAkB,CAClB,KAAM,CACN,MAAO,CACP,gBAAiB,CACjB,cAAe,CAClB,gBAGG,eAAgB,CAChB,gBAAiB,CACpB,KCzBG,+BAAgC,CAChC,kBAAmB,CACtB,WAGG,6BAA8B,CAC9B,kBAAmB,CACtB,YAIG,iBAAkB,CACrB,KCZG,iCAAkC,CAElC,wBAAyB,CACzB,2BAAc,CAAd,mBAAoB,CACvB,KAGG,oBAAqB,CACxB,aAGG,oBAAqB,CACxB,MCVG,QAAS,CACT,eAAgB,CAChB,SAAU,CACb,SAGG,UAAW,CACX,oBAAqB,CACxB,kBAIG,uBAAwB,CACxB,yBAA0B,CAC1B,kBAAmB,CACnB,oBAAqB,CACrB,aAAc,CACd,kBAAmB,CACnB,qBAAsB,CACtB,iBAAkB,CAClB,oBAAqB,CACrB,oBAAqB,CACrB,qBAAsB,CACzB,YAGG,yBAA0B,CAC1B,sCAAuC,CACvC,mCAAoC,CACpC,mCAAoC,CACpC,UAAW,CACX,iBAAkB,CAClB,OAAQ,CACR,KAAM,CACT,WAGG,2BAA4B,CAC5B,kBAAmB,CACtB,kBAGG,4BAA6B","file":"app.css"}

public/svg/404.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1024 1024"><defs><linearGradient id="a" x1="50.31%" x2="50%" y1="74.74%" y2="0%"><stop offset="0%" stop-color="#FFE98A"/><stop offset="67.7%" stop-color="#B63E59"/><stop offset="100%" stop-color="#68126F"/></linearGradient><circle id="c" cx="603" cy="682" r="93"/><filter id="b" width="203.2%" height="203.2%" x="-51.6%" y="-51.6%" filterUnits="objectBoundingBox"><feOffset in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="32"/><feColorMatrix in="shadowBlurOuter1" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/></filter><linearGradient id="d" x1="49.48%" x2="49.87%" y1="11.66%" y2="77.75%"><stop offset="0%" stop-color="#F7EAB9"/><stop offset="100%" stop-color="#E5765E"/></linearGradient><linearGradient id="e" x1="91.59%" x2="66.97%" y1="5.89%" y2="100%"><stop offset="0%" stop-color="#A22A50"/><stop offset="100%" stop-color="#EE7566"/></linearGradient><linearGradient id="f" x1="49.48%" x2="49.61%" y1="11.66%" y2="98.34%"><stop offset="0%" stop-color="#F7EAB9"/><stop offset="100%" stop-color="#E5765E"/></linearGradient><linearGradient id="g" x1="78.5%" x2="36.4%" y1="106.76%" y2="26.41%"><stop offset="0%" stop-color="#A22A50"/><stop offset="100%" stop-color="#EE7566"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><rect width="1024" height="1024" fill="url(#a)"/><use fill="black" filter="url(#b)" xlink:href="#c"/><use fill="#FFF6CB" xlink:href="#c"/><g fill="#FFFFFF" opacity=".3" transform="translate(14 23)"><circle cx="203" cy="255" r="3" fill-opacity=".4"/><circle cx="82" cy="234" r="2"/><circle cx="22" cy="264" r="2" opacity=".4"/><circle cx="113" cy="65" r="3"/><circle cx="202" cy="2" r="2"/><circle cx="2" cy="114" r="2"/><circle cx="152" cy="144" r="2"/><circle cx="362" cy="224" r="2"/><circle cx="453" cy="65" r="3" opacity=".4"/><circle cx="513" cy="255" r="3"/><circle cx="593" cy="115" r="3"/><circle cx="803" cy="5" r="3" opacity=".4"/><circle cx="502" cy="134" r="2"/><circle cx="832" cy="204" r="2"/><circle cx="752" cy="114" r="2"/><circle cx="933" cy="255" r="3" opacity=".4"/><circle cx="703" cy="225" r="3"/><circle cx="903" cy="55" r="3"/><circle cx="982" cy="144" r="2"/><circle cx="632" cy="14" r="2"/></g><g transform="translate(0 550)"><path fill="#8E2C15" d="M259 5.47c0 5.33 3.33 9.5 10 12.5s9.67 9.16 9 18.5h1c.67-6.31 1-11.8 1-16.47 8.67 0 13.33-1.33 14-4 .67 4.98 1.67 8.3 3 9.97 1.33 1.66 2 5.16 2 10.5h1c0-5.65.33-9.64 1-11.97 1-3.5 4-10.03-1-14.53S295 7 290 3c-5-4-10-3-13 2s-5 7-9 7-5-3.53-5-5.53c0-2 2-5-1.5-5s-7.5 0-7.5 2c0 1.33 1.67 2 5 2z"/><path fill="url(#d)" d="M1024 390H0V105.08C77.3 71.4 155.26 35 297.4 35c250 0 250.76 125.25 500 125 84.03-.08 160.02-18.2 226.6-40.93V390z"/><path fill="url(#d)" d="M1024 442H0V271.82c137.51-15.4 203.1-50.49 356.67-60.1C555.24 199.3 606.71 86.59 856.74 86.59c72.78 0 124.44 10.62 167.26 25.68V442z"/><path fill="url(#e)" d="M1024 112.21V412H856.91c99.31-86.5 112.63-140.75 39.97-162.78C710.24 192.64 795.12 86.58 856.9 86.58c72.7 0 124.3 10.6 167.09 25.63z"/><path fill="url(#e)" d="M1024 285.32V412H857c99.31-86.6 112.63-140.94 39.97-163L1024 285.32z"/><path fill="url(#f)" d="M0 474V223.93C67.12 190.69 129.55 155 263 155c250 0 331.46 162.6 530 175 107.42 6.71 163-26.77 231-58.92V474H0z"/><path fill="url(#e)" d="M353.02 474H0V223.93C67.12 190.69 129.55 155 263 155c71.14 0 151.5 12.76 151.5 70.5 0 54.5-45.5 79.72-112.5 109-82.26 35.95-54.57 111.68 51.02 139.5z"/><path fill="url(#g)" d="M353.02 474H0v-14.8l302-124.7c-82.26 35.95-54.57 111.68 51.02 139.5z"/></g><g fill="#FFFFFF" opacity=".2" transform="translate(288 523)"><circle cx="250" cy="110" r="110"/><circle cx="420" cy="78" r="60"/><circle cx="70" cy="220" r="70"/></g><g fill="#FFFFFF" fill-rule="nonzero" opacity=".08" transform="translate(135 316)"><path d="M10 80.22a14.2 14.2 0 0 1 20 0 14.2 14.2 0 0 0 20 0l20-19.86a42.58 42.58 0 0 1 60 0l15 14.9a21.3 21.3 0 0 0 30 0 21.3 21.3 0 0 1 30 0l.9.9A47.69 47.69 0 0 1 220 110H0v-5.76c0-9.02 3.6-17.67 10-24.02zm559.1-66.11l5.9-5.86c11.07-11 28.93-11 40 0l10 9.94a14.19 14.19 0 0 0 20 0 14.19 14.19 0 0 1 20 0 16.36 16.36 0 0 0 21.3 1.5l8.7-6.47a33.47 33.47 0 0 1 40 0l4.06 3.03A39.6 39.6 0 0 1 755 48H555a47.77 47.77 0 0 1 14.1-33.89z"/></g></g></svg>

resources/lang/en/validation.php

@@ -13,80 +13,108 @@ return [
     |
     */
 
-    'accepted'             => 'The :attribute must be accepted.',
+    'accepted' => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
+    'active_url' => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
+    'after' => 'The :attribute must be a date after :date.',
-    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
+    'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
+    'alpha' => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
+    'alpha_dash' => 'The :attribute may only contain letters, numbers, dashes and underscores.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
+    'alpha_num' => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
+    'array' => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
+    'before' => 'The :attribute must be a date before :date.',
-    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
+    'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
-    'between'              => [
+    'between' => [
         'numeric' => 'The :attribute must be between :min and :max.',
-        'file'    => 'The :attribute must be between :min and :max kilobytes.',
+        'file' => 'The :attribute must be between :min and :max kilobytes.',
-        'string'  => 'The :attribute must be between :min and :max characters.',
+        'string' => 'The :attribute must be between :min and :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
+        'array' => 'The :attribute must have between :min and :max items.',
     ],
-    'boolean'              => 'The :attribute field must be true or false.',
+    'boolean' => 'The :attribute field must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
+    'confirmed' => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
+    'date' => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
+    'date_equals' => 'The :attribute must be a date equal to :date.',
-    'different'            => 'The :attribute and :other must be different.',
+    'date_format' => 'The :attribute does not match the format :format.',
-    'digits'               => 'The :attribute must be :digits digits.',
+    'different' => 'The :attribute and :other must be different.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
+    'digits' => 'The :attribute must be :digits digits.',
-    'dimensions'           => 'The :attribute has invalid image dimensions.',
+    'digits_between' => 'The :attribute must be between :min and :max digits.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
+    'dimensions' => 'The :attribute has invalid image dimensions.',
-    'email'                => 'The :attribute must be a valid email address.',
+    'distinct' => 'The :attribute field has a duplicate value.',
-    'exists'               => 'The selected :attribute is invalid.',
+    'email' => 'The :attribute must be a valid email address.',
-    'file'                 => 'The :attribute must be a file.',
+    'exists' => 'The selected :attribute is invalid.',
-    'filled'               => 'The :attribute field must have a value.',
+    'file' => 'The :attribute must be a file.',
-    'image'                => 'The :attribute must be an image.',
+    'filled' => 'The :attribute field must have a value.',
-    'in'                   => 'The selected :attribute is invalid.',
+    'gt' => [
-    'in_array'             => 'The :attribute field does not exist in :other.',
+        'numeric' => 'The :attribute must be greater than :value.',
-    'integer'              => 'The :attribute must be an integer.',
+        'file' => 'The :attribute must be greater than :value kilobytes.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
+        'string' => 'The :attribute must be greater than :value characters.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
+        'array' => 'The :attribute must have more than :value items.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
+    ],
-    'json'                 => 'The :attribute must be a valid JSON string.',
+    'gte' => [
-    'max'                  => [
+        'numeric' => 'The :attribute must be greater than or equal :value.',
+        'file' => 'The :attribute must be greater than or equal :value kilobytes.',
+        'string' => 'The :attribute must be greater than or equal :value characters.',
+        'array' => 'The :attribute must have :value items or more.',
+    ],
+    'image' => 'The :attribute must be an image.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field does not exist in :other.',
+    'integer' => 'The :attribute must be an integer.',
+    'ip' => 'The :attribute must be a valid IP address.',
+    'ipv4' => 'The :attribute must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute must be a valid IPv6 address.',
+    'json' => 'The :attribute must be a valid JSON string.',
+    'lt' => [
+        'numeric' => 'The :attribute must be less than :value.',
+        'file' => 'The :attribute must be less than :value kilobytes.',
+        'string' => 'The :attribute must be less than :value characters.',
+        'array' => 'The :attribute must have less than :value items.',
+    ],
+    'lte' => [
+        'numeric' => 'The :attribute must be less than or equal :value.',
+        'file' => 'The :attribute must be less than or equal :value kilobytes.',
+        'string' => 'The :attribute must be less than or equal :value characters.',
+        'array' => 'The :attribute must not have more than :value items.',
+    ],
+    'max' => [
         'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
+        'file' => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
+        'string' => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
+        'array' => 'The :attribute may not have more than :max items.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
+    'mimes' => 'The :attribute must be a file of type: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
+    'mimetypes' => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
+    'min' => [
         'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
+        'file' => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
+        'string' => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
+        'array' => 'The :attribute must have at least :min items.',
     ],
-    'not_in'               => 'The selected :attribute is invalid.',
+    'not_in' => 'The selected :attribute is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
+    'not_regex' => 'The :attribute format is invalid.',
-    'present'              => 'The :attribute field must be present.',
+    'numeric' => 'The :attribute must be a number.',
-    'regex'                => 'The :attribute format is invalid.',
+    'present' => 'The :attribute field must be present.',
-    'required'             => 'The :attribute field is required.',
+    'regex' => 'The :attribute format is invalid.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
+    'required' => 'The :attribute field is required.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
+    'required_with' => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
     'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
+    'same' => 'The :attribute and :other must match.',
-    'size'                 => [
+    'size' => [
         'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
+        'file' => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
+        'string' => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
+        'array' => 'The :attribute must contain :size items.',
     ],
-    'string'               => 'The :attribute must be a string.',
+    'starts_with' => 'The :attribute must start with one of the following: :values',
-    'timezone'             => 'The :attribute must be a valid zone.',
+    'string' => 'The :attribute must be a string.',
-    'unique'               => 'The :attribute has already been taken.',
+    'timezone' => 'The :attribute must be a valid zone.',
-    'uploaded'             => 'The :attribute failed to upload.',
+    'unique' => 'The :attribute has already been taken.',
-    'url'                  => 'The :attribute format is invalid.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'url' => 'The :attribute format is invalid.',
+    'uuid' => 'The :attribute must be a valid UUID.',
 
     /*
     |--------------------------------------------------------------------------
@@ -110,9 +138,9 @@ return [
     | Custom Validation Attributes
     |--------------------------------------------------------------------------
     |
-    | The following language lines are used to swap attribute place-holders
+    | The following language lines are used to swap our attribute placeholder
-    | with something more reader friendly such as E-Mail Address instead
+    | with something more reader friendly such as "E-Mail Address" instead
-    | of "email". This simply helps us make messages a little cleaner.
+    | of "email". This simply helps us make our message more expressive.
     |
     */
 

storage/framework/cache/.gitignore

@@ -1,2 +1,3 @@
 *
+!data/
 !.gitignore

storage/framework/cache/data/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

webpack.config.js

@@ -2,7 +2,7 @@ const webpack = require('webpack');
 const Dotenv = require('dotenv-webpack');
 
 const config = {
-  context: __dirname + '/resources/assets/es6',
+  context: __dirname + '/resources/es6',
   entry: {
     a11y: './a11y.js',
     colours: './colours.js',