Framework update

.editorconfig

@@ -13,3 +13,6 @@ trim_trailing_whitespace = false
 
 [*.{yml,yaml}]
 indent_size = 2
+
+[docker-compose.yml]
+indent_size = 4

.env.example

@@ -1,22 +1,25 @@
+APP_ADMIN=
 APP_NAME=Laravel
 APP_NAME_HTML_LONG="<b>Laravel</b>Application"
 APP_ENV=local
 APP_KEY=
-APP_DEBUG=true
+APP_DEBUG=false
+APP_TIMEZONE=Australia/Melbourne
 APP_URL=http://localhost
 
-LOG_CHANNEL=stack
+LOG_CHANNEL=daily
 
-DB_CONNECTION=mysql
+DB_CONNECTION=pgsql
-DB_HOST=database
+DB_HOST=postgres
-DB_PORT=3306
+DB_PORT=5432
-DB_DATABASE=database
+DB_DATABASE=photo
-DB_USERNAME=web
+DB_USERNAME=photo
 DB_PASSWORD=
+#DB_SCHEMA=photo
 
 BROADCAST_DRIVER=log
-CACHE_DRIVER=file
+CACHE_STORE=file
-QUEUE_CONNECTION=database
+QUEUE_DRIVER=database
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
 
@@ -24,9 +27,9 @@ REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-MAIL_DRIVER=smtp
+MAIL_MAILER=smtp
-MAIL_HOST=smtp.mailtrap.io
+MAIL_HOST=
-MAIL_PORT=2525
+MAIL_PORT=
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null

app/Console/Kernel.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Console;
-
-use Illuminate\Console\Scheduling\Schedule;
-use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
-
-class Kernel extends ConsoleKernel
-{
-    /**
-     * The Artisan commands provided by your application.
-     *
-     * @var array
-     */
-    protected $commands = [
-        //
-    ];
-
-    /**
-     * Define the application's command schedule.
-     *
-     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
-     * @return void
-     */
-    protected function schedule(Schedule $schedule)
-    {
-        // $schedule->command('inspire')
-        //          ->hourly();
-    }
-
-    /**
-     * Register the commands for the application.
-     *
-     * @return void
-     */
-    protected function commands()
-    {
-        $this->load(__DIR__.'/Commands');
-
-        require base_path('routes/console.php');
-    }
-}

app/Exceptions/Handler.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-
-class Handler extends ExceptionHandler
-{
-    /**
-     * A list of the exception types that are not reported.
-     *
-     * @var array
-     */
-    protected $dontReport = [
-        //
-    ];
-
-    /**
-     * A list of the inputs that are never flashed for validation exceptions.
-     *
-     * @var array
-     */
-    protected $dontFlash = [
-        'password',
-        'password_confirmation',
-    ];
-
-    /**
-     * Report or log an exception.
-     *
-     * @param  \Exception  $exception
-     * @return void
-     */
-    public function report(Exception $exception)
-    {
-        parent::report($exception);
-    }
-
-    /**
-     * Render an exception into an HTTP response.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
-     * @return \Illuminate\Http\Response
-     */
-    public function render($request, Exception $exception)
-    {
-        return parent::render($request, $exception);
-    }
-}

app/Http/Controllers/Auth/ConfirmPasswordController.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\ConfirmsPasswords;
-
-class ConfirmPasswordController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Confirm Password Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller is responsible for handling password confirmations and
-    | uses a simple trait to include the behavior. You're free to explore
-    | this trait and override any functions that require customization.
-    |
-    */
-
-    use ConfirmsPasswords;
-
-    /**
-     * Where to redirect users when the intended url fails.
-     *
-     * @var string
-     */
-    protected $redirectTo = '/home';
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('auth');
-    }
-}

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
-
-class ForgotPasswordController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Password Reset Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller is responsible for handling password reset emails and
-    | includes a trait which assists in sending these notifications from
-    | your application to your users. Feel free to explore this trait.
-    |
-    */
-
-    use SendsPasswordResetEmails;
-}

app/Http/Controllers/Auth/LoginController.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\AuthenticatesUsers;
-
-class LoginController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Login Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller handles authenticating users for the application and
-    | redirecting them to your home screen. The controller uses a trait
-    | to conveniently provide its functionality to your applications.
-    |
-    */
-
-    use AuthenticatesUsers;
-
-    /**
-     * Where to redirect users after login.
-     *
-     * @var string
-     */
-    protected $redirectTo = '/home';
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('guest')->except('logout');
-    }
-
-	/**
-	 * Show our themed login page
-	 */
-	public function showLoginForm()
-	{
-		$login_note = '';
-
-		if (file_exists('login_note.txt'))
-			$login_note = file_get_contents('login_note.txt');
-
-		return view('adminlte::auth.login')->with('login_note',$login_note);
-	}
-}

app/Http/Controllers/Auth/RegisterController.php

@@ -1,72 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use App\User;
-use Illuminate\Foundation\Auth\RegistersUsers;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Validator;
-
-class RegisterController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Register Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller handles the registration of new users as well as their
-    | validation and creation. By default this controller uses a trait to
-    | provide this functionality without requiring any additional code.
-    |
-    */
-
-    use RegistersUsers;
-
-    /**
-     * Where to redirect users after registration.
-     *
-     * @var string
-     */
-    protected $redirectTo = '/home';
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('guest');
-    }
-
-    /**
-     * Get a validator for an incoming registration request.
-     *
-     * @param  array  $data
-     * @return \Illuminate\Contracts\Validation\Validator
-     */
-    protected function validator(array $data)
-    {
-        return Validator::make($data, [
-            'name' => ['required', 'string', 'max:255'],
-            'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
-            'password' => ['required', 'string', 'min:8', 'confirmed'],
-        ]);
-    }
-
-    /**
-     * Create a new user instance after a valid registration.
-     *
-     * @param  array  $data
-     * @return \App\User
-     */
-    protected function create(array $data)
-    {
-        return User::create([
-            'name' => $data['name'],
-            'email' => $data['email'],
-            'password' => Hash::make($data['password']),
-        ]);
-    }
-}

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\ResetsPasswords;
-
-class ResetPasswordController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Password Reset Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller is responsible for handling password reset requests
-    | and uses a simple trait to include this behavior. You're free to
-    | explore this trait and override any methods you wish to tweak.
-    |
-    */
-
-    use ResetsPasswords;
-
-    /**
-     * Where to redirect users after resetting their password.
-     *
-     * @var string
-     */
-    protected $redirectTo = '/home';
-}

app/Http/Controllers/Auth/VerificationController.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\VerifiesEmails;
-
-class VerificationController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Email Verification Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller is responsible for handling email verification for any
-    | user that recently registered with the application. Emails may also
-    | be re-sent if the user didn't receive the original email message.
-    |
-    */
-
-    use VerifiesEmails;
-
-    /**
-     * Where to redirect users after verification.
-     *
-     * @var string
-     */
-    protected $redirectTo = '/home';
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('auth');
-        $this->middleware('signed')->only('verify');
-        $this->middleware('throttle:6,1')->only('verify', 'resend');
-    }
-}

app/Http/Controllers/Controller.php

@@ -3,11 +3,9 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Routing\Controller as BaseController;
 
-class Controller extends BaseController
+abstract class Controller extends \Illuminate\Routing\Controller
 {
-    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+	use AuthorizesRequests, ValidatesRequests;
-}
+}

app/Http/Controllers/HomeController.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-class HomeController extends Controller
-{
-	public function __construct()
-	{
-		//$this->middleware('guest');
-	}
-
-	public function home() {
-		return view('home');
-	}
-}

app/Http/Controllers/PhotoController.php

@@ -12,16 +12,6 @@ class PhotoController extends Controller
 	protected $list_duplicates = 20;
 	protected $list_deletes = 50;
 
-	/**
-	 * Create a new controller instance.
-	 *
-	 * @return void
-	 */
-	public function __construct()
-	{
-		$this->middleware('guest');
-	}
-
 	public function delete(Photo $o)
 	{
 		$o->remove = TRUE;

app/Http/Controllers/VideoController.php

@@ -13,16 +13,6 @@ class VideoController extends Controller
 	protected $list_duplicates = 20;
 	protected $list_deletes = 50;
 
-	/**
-	 * Create a new controller instance.
-	 *
-	 * @return void
-	 */
-	public function __construct()
-	{
-		$this->middleware('guest');
-	}
-
 	public function delete(Video $o)
 	{
 		$o->remove = TRUE;

app/Http/Kernel.php

@@ -1,82 +0,0 @@
-<?php
-
-namespace App\Http;
-
-use Illuminate\Foundation\Http\Kernel as HttpKernel;
-
-class Kernel extends HttpKernel
-{
-    /**
-     * The application's global HTTP middleware stack.
-     *
-     * These middleware are run during every request to your application.
-     *
-     * @var array
-     */
-    protected $middleware = [
-        \App\Http\Middleware\TrustProxies::class,
-        \App\Http\Middleware\CheckForMaintenanceMode::class,
-        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
-        \App\Http\Middleware\TrimStrings::class,
-        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-    ];
-
-    /**
-     * The application's route middleware groups.
-     *
-     * @var array
-     */
-    protected $middlewareGroups = [
-        'web' => [
-            \App\Http\Middleware\EncryptCookies::class,
-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Session\Middleware\StartSession::class,
-            // \Illuminate\Session\Middleware\AuthenticateSession::class,
-            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \App\Http\Middleware\VerifyCsrfToken::class,
-            \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        ],
-
-        'api' => [
-            'throttle:60,1',
-            'bindings',
-        ],
-    ];
-
-    /**
-     * The application's route middleware.
-     *
-     * These middleware may be assigned to groups or used individually.
-     *
-     * @var array
-     */
-    protected $routeMiddleware = [
-        '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,
-        'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
-        'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::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\Routing\Middleware\ThrottleRequests::class,
-        \Illuminate\Session\Middleware\AuthenticateSession::class,
-        \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        \Illuminate\Auth\Middleware\Authorize::class,
-    ];
-}

app/Http/Middleware/Authenticate.php

@@ -1,21 +0,0 @@
-<?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

@@ -1,17 +0,0 @@
-<?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 = [
-        //
-    ];
-}

app/Http/Middleware/EncryptCookies.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;
-
-class EncryptCookies extends Middleware
-{
-    /**
-     * The names of the cookies that should not be encrypted.
-     *
-     * @var array
-     */
-    protected $except = [
-        //
-    ];
-}

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Support\Facades\Auth;
-
-class RedirectIfAuthenticated
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @param  string|null  $guard
-     * @return mixed
-     */
-    public function handle($request, Closure $next, $guard = null)
-    {
-        if (Auth::guard($guard)->check()) {
-            return redirect('/home');
-        }
-
-        return $next($request);
-    }
-}

app/Http/Middleware/TrimStrings.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;
-
-class TrimStrings extends Middleware
-{
-    /**
-     * The names of the attributes that should not be trimmed.
-     *
-     * @var array
-     */
-    protected $except = [
-        'password',
-        'password_confirmation',
-    ];
-}

app/Http/Middleware/TrustProxies.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Fideloper\Proxy\TrustProxies as Middleware;
-use Illuminate\Http\Request;
-
-class TrustProxies extends Middleware
-{
-    /**
-     * The trusted proxies for this application.
-     *
-     * @var array|string
-     */
-    protected $proxies;
-
-    /**
-     * The headers that should be used to detect proxies.
-     *
-     * @var int
-     */
-    protected $headers = Request::HEADER_X_FORWARDED_ALL;
-}

app/Http/Middleware/VerifyCsrfToken.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
-
-class VerifyCsrfToken extends Middleware
-{
-    /**
-     * Indicates whether the XSRF-TOKEN cookie should be set on the response.
-     *
-     * @var bool
-     */
-    protected $addHttpCookie = true;
-
-    /**
-     * The URIs that should be excluded from CSRF verification.
-     *
-     * @var array
-     */
-    protected $except = [
-        //
-    ];
-}

app/Jobs/Job.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use Illuminate\Bus\Queueable;
-
-abstract class Job
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Queueable Jobs
-    |--------------------------------------------------------------------------
-    |
-    | This job base class provides a central location to place any logic that
-    | is shared across all of your jobs. The trait included with the class
-    | provides access to the "onQueue" and "delay" queue helper methods.
-    |
-    */
-
-    use Queueable;
-}

app/Providers/AppServiceProvider.php

@@ -11,25 +11,25 @@ use App\Jobs\{PhotoMove,VideoMove};
 
 class AppServiceProvider extends ServiceProvider
 {
-    use DispatchesJobs;
+	use DispatchesJobs;
 
-    /**
+	/**
-     * Register any application services.
+	 * Register any application services.
-     *
+	 *
-     * @return void
+	 * @return void
-     */
+	 */
-    public function register()
+	public function register(): void
-    {
+	{
-        //
+		//
-    }
+	}
 
-    /**
+	/**
-     * Bootstrap any application services.
+	 * Bootstrap any application services.
-     *
+	 *
-     * @return void
+	 * @return void
-     */
+	 */
-    public function boot()
+	public function boot(): void
-    {
+	{
 		// Any photo saved, queue it to be moved.
 		Photo::saved(function($photo) {
 			if ($photo->scanned AND ! $photo->duplicate AND ! $photo->remove AND ($x=$photo->moveable()) === TRUE) {
@@ -47,5 +47,5 @@ class AppServiceProvider extends ServiceProvider
 				$this->dispatch((new VideoMove($video))->onQueue('move'));
 			}
 		});
-    }
+	}
 }

app/Providers/AuthServiceProvider.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
-use Illuminate\Support\Facades\Gate;
-
-class AuthServiceProvider extends ServiceProvider
-{
-    /**
-     * The policy mappings for the application.
-     *
-     * @var array
-     */
-    protected $policies = [
-        // 'App\Model' => 'App\Policies\ModelPolicy',
-    ];
-
-    /**
-     * Register any authentication / authorization services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->registerPolicies();
-
-        //
-    }
-}

app/Providers/BroadcastServiceProvider.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use Illuminate\Support\Facades\Broadcast;
-use Illuminate\Support\ServiceProvider;
-
-class BroadcastServiceProvider extends ServiceProvider
-{
-    /**
-     * Bootstrap any application services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        Broadcast::routes();
-
-        require base_path('routes/channels.php');
-    }
-}

app/Providers/EventServiceProvider.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use Illuminate\Auth\Events\Registered;
-use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
-use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-use Illuminate\Support\Facades\Event;
-
-class EventServiceProvider extends ServiceProvider
-{
-    /**
-     * The event listener mappings for the application.
-     *
-     * @var array
-     */
-    protected $listen = [
-        Registered::class => [
-            SendEmailVerificationNotification::class,
-        ],
-    ];
-
-    /**
-     * Register any events for your application.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        parent::boot();
-
-        //
-    }
-}

app/Providers/RouteServiceProvider.php

@@ -1,73 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
-use Illuminate\Support\Facades\Route;
-
-class RouteServiceProvider extends ServiceProvider
-{
-    /**
-     * This namespace is applied to your controller routes.
-     *
-     * In addition, it is set as the URL generator's root namespace.
-     *
-     * @var string
-     */
-    protected $namespace = 'App\Http\Controllers';
-
-    /**
-     * Define your route model bindings, pattern filters, etc.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        //
-
-        parent::boot();
-    }
-
-    /**
-     * Define the routes for the application.
-     *
-     * @return void
-     */
-    public function map()
-    {
-        $this->mapApiRoutes();
-
-        $this->mapWebRoutes();
-
-        //
-    }
-
-    /**
-     * Define the "web" routes for the application.
-     *
-     * These routes all receive session state, CSRF protection, etc.
-     *
-     * @return void
-     */
-    protected function mapWebRoutes()
-    {
-        Route::middleware('web')
-             ->namespace($this->namespace)
-             ->group(base_path('routes/web.php'));
-    }
-
-    /**
-     * Define the "api" routes for the application.
-     *
-     * These routes are typically stateless.
-     *
-     * @return void
-     */
-    protected function mapApiRoutes()
-    {
-        Route::prefix('api')
-             ->middleware('api')
-             ->namespace($this->namespace)
-             ->group(base_path('routes/api.php'));
-    }
-}

application/classes/Model/People.php

@@ -1,17 +0,0 @@
-<?php defined('SYSPATH') or die('No direct access allowed.');
-
-/**
- * This class supports People.
- *
- * @package    Photo
- * @category   Models
- * @author     Deon George
- * @copyright  (c) 2014 Deon George
- * @license    http://dev.leenooks.net/license.html
- */
-class Model_People extends ORM {
-	public function age($x=NULL) {
-		return sprintf('%02s',date_diff(new DateTime(date('Y-m-d',is_null($x) ? time() : $x)),new DateTime(date('Y-m-d',$this->date_birth)))->y);
-	}
-}
-?>

application/classes/Task/Photo/Stat.php

@@ -1,32 +0,0 @@
-<?php defined('SYSPATH') or die('No direct access allowed.');
-
-/**
- * Find photos that dont match their database entries.
- *
- * @package    Photo
- * @category   Tasks
- * @author     Deon George
- * @copyright  (c) 2014 Deon George
- * @license    http://dev.leenooks.net/license.html
- */
-class Task_Photo_Stat extends Minion_Task {
-	protected $_options = array(
-	);
-
-	protected function _execute(array $params) {
-		$p = ORM::factory('Photo')->find_all();
-
-		foreach ($p as $po) {
-			if (! file_exists($po->file_path())) {
-				printf("ID [%s] doesnt exist (%s)?\n",$po->id,$po->file_path());
-				continue;
-			}
-
-			if (($x=$po->io()->getImageSignature()) !== $po->signature) {
-				printf("ID [%s] signature doesnt match (%s) [%s != %s]?\n",$po->id,$po->file_path(),$po->signature,$x);
-				continue;
-			}
-		}
-	}
-}
-?>

artisan

@@ -1,53 +1,15 @@
 #!/usr/bin/env php
 <?php
 
+use Symfony\Component\Console\Input\ArgvInput;
+
 define('LARAVEL_START', microtime(true));
 
-/*
+// Register the Composer autoloader...
-|--------------------------------------------------------------------------
-| Register The Auto Loader
-|--------------------------------------------------------------------------
-|
-| Composer provides a convenient, automatically generated class loader
-| for our application. We just need to utilize it! We'll require it
-| into the script here so that we do not have to worry about the
-| loading of any our classes "manually". Feels great to relax.
-|
-*/
-
 require __DIR__.'/vendor/autoload.php';
 
-$app = require_once __DIR__.'/bootstrap/app.php';
+// Bootstrap Laravel and handle the command...
-
+$status = (require_once __DIR__.'/bootstrap/app.php')
-/*
+    ->handleCommand(new ArgvInput);
-|--------------------------------------------------------------------------
-| Run The Artisan Application
-|--------------------------------------------------------------------------
-|
-| When we run the console application, the current CLI command will be
-| executed in this console and the response sent back to a terminal
-| or another output device for the developers. Here goes nothing!
-|
-*/
-
-$kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
-
-$status = $kernel->handle(
-    $input = new Symfony\Component\Console\Input\ArgvInput,
-    new Symfony\Component\Console\Output\ConsoleOutput
-);
-
-/*
-|--------------------------------------------------------------------------
-| Shutdown The Application
-|--------------------------------------------------------------------------
-|
-| Once Artisan has finished running, we will fire off the shutdown events
-| so that any final work may be done by the application before we shut
-| down the process. This is the last thing to happen to the request.
-|
-*/
-
-$kernel->terminate($input, $status);
 
 exit($status);

bootstrap/app.php

@@ -1,55 +1,18 @@
 <?php
 
-/*
+use Illuminate\Foundation\Application;
-|--------------------------------------------------------------------------
+use Illuminate\Foundation\Configuration\Exceptions;
-| Create The Application
+use Illuminate\Foundation\Configuration\Middleware;
-|--------------------------------------------------------------------------
-|
-| The first thing we will do is create a new Laravel application instance
-| which serves as the "glue" for all the components of Laravel, and is
-| the IoC container for the system binding all of the various parts.
-|
-*/
 
-$app = new Illuminate\Foundation\Application(
+return Application::configure(basePath: dirname(__DIR__))
-    $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
+    ->withRouting(
-);
+        web: __DIR__.'/../routes/web.php',
-
+        commands: __DIR__.'/../routes/console.php',
-/*
+        health: '/up',
-|--------------------------------------------------------------------------
+    )
-| Bind Important Interfaces
+    ->withMiddleware(function (Middleware $middleware) {
-|--------------------------------------------------------------------------
+        //
-|
+    })
-| Next, we need to bind some important interfaces into the container so
+    ->withExceptions(function (Exceptions $exceptions) {
-| we will be able to resolve them when needed. The kernels serve the
+        //
-| incoming requests to this application from both the web and CLI.
+    })->create();
-|
-*/
-
-$app->singleton(
-    Illuminate\Contracts\Http\Kernel::class,
-    App\Http\Kernel::class
-);
-
-$app->singleton(
-    Illuminate\Contracts\Console\Kernel::class,
-    App\Console\Kernel::class
-);
-
-$app->singleton(
-    Illuminate\Contracts\Debug\ExceptionHandler::class,
-    App\Exceptions\Handler::class
-);
-
-/*
-|--------------------------------------------------------------------------
-| Return The Application
-|--------------------------------------------------------------------------
-|
-| This script returns the application instance. The instance is given to
-| the calling script so we can separate the building of the instances
-| from the actual running of the application and sending responses.
-|
-*/
-
-return $app;

composer.json

@@ -2,64 +2,48 @@
     "name": "laravel/laravel",
     "type": "project",
     "description": "The Laravel Framework.",
-    "keywords": [
+    "keywords": ["laravel", "framework"],
-        "framework",
-        "laravel"
-    ],
     "license": "MIT",
     "require": {
-        "php": "^7.2",
+        "php": "^8.3",
-        "barryvdh/laravel-debugbar": "^3.2",
+        "ext-pdo": "*",
-        "fideloper/proxy": "^4.0",
         "james-heinrich/getid3": "^1.9",
-        "laravel/framework": "^6.4",
+        "laravel/framework": "^11.0",
-        "laravel/socialite": "^4.2",
+        "laravel/ui": "^4.5",
-        "laravel/tinker": "^1.0",
+        "leenooks/laravel": "^11.1",
-        "leenooks/laravel": "^6.0"
+        "leenooks/passkey": "^0.2"
     },
     "require-dev": {
-        "facade/ignition": "1.11.1",
+        "barryvdh/laravel-debugbar": "^3.6",
-        "fzaninotto/faker": "^1.4",
+        "fakerphp/faker": "^1.23",
-        "mockery/mockery": "^1.0",
+        "laravel/tinker": "^2.9",
-        "nunomaduro/collision": "^3.0",
+        "mockery/mockery": "^1.6",
-        "phpunit/phpunit": "^8.0"
+        "nunomaduro/collision": "^8.0",
-    },
+        "phpunit/phpunit": "^11.0.1",
-    "config": {
+        "spatie/laravel-ignition": "^2.4"
-        "optimize-autoloader": true,
-        "preferred-install": "dist",
-        "sort-packages": true
-    },
-    "extra": {
-        "laravel": {
-            "dont-discover": []
-        }
     },
     "autoload": {
         "psr-4": {
-            "App\\": "app/"
+            "App\\": "app/",
-        },
+            "Database\\Factories\\": "database/factories/",
-        "classmap": [
+            "Database\\Seeders\\": "database/seeders/"
-            "database/seeds",
+        }
-            "database/factories"
-        ]
     },
     "autoload-dev": {
         "psr-4": {
             "Tests\\": "tests/"
         }
     },
-    "repositories": [
+    "repositories": {
-        {
+        "leenooks": {
             "type": "vcs",
-            "url": "https://dev.leenooks.net/leenooks/laravel"
+            "url": "https://gitea.dege.au/laravel/leenooks.git"
         },
-        {
+        "passkey": {
             "type": "vcs",
-            "url": "https://github.com/leenooks/laravel-theme"
+            "url": "https://gitea.dege.au/laravel/passkey.git"
         }
-    ],
+    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "scripts": {
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
@@ -71,5 +55,17 @@
         "post-create-project-cmd": [
             "@php artisan key:generate --ansi"
         ]
-    }
+    },
+    "extra": {
+        "laravel": {
+            "dont-discover": []
+        }
+    },
+    "config": {
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
+        "sort-packages": true
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

config/app.php

@@ -7,13 +7,15 @@ return [
     | Application Name
     |--------------------------------------------------------------------------
     |
-    | This value is the name of your application. This value is used when the
+    | This value is the name of your application, which will be used when the
     | framework needs to place the application's name in a notification or
-    | any other location as required by the application or its packages.
+    | other UI elements where an application name needs to be displayed.
     |
     */
 
     'name' => env('APP_NAME', 'Laravel'),
+    'name_html_long' => env('APP_NAME_HTML_LONG', '<b>Laravel</b>Application'),
+    'admins' => env('APP_ADMINS',[]) ? explode(';',env('APP_ADMINS')) : [],
 
     /*
     |--------------------------------------------------------------------------
@@ -39,7 +41,7 @@ return [
     |
     */
 
-    'debug' => env('APP_DEBUG', false),
+    'debug' => (bool) env('APP_DEBUG', false),
 
     /*
     |--------------------------------------------------------------------------
@@ -48,26 +50,24 @@ return [
     |
     | This URL is used by the console to properly generate URLs when using
     | the Artisan command line tool. You should set this to the root of
-    | your application so that it is used when running Artisan tasks.
+    | the application so that it's available within Artisan commands.
     |
     */
 
     'url' => env('APP_URL', 'http://localhost'),
 
-    'asset_url' => env('ASSET_URL', null),
-
     /*
     |--------------------------------------------------------------------------
     | Application Timezone
     |--------------------------------------------------------------------------
     |
     | Here you may specify the default timezone for your application, which
-    | will be used by the PHP date and date-time functions. We have gone
+    | will be used by the PHP date and date-time functions. The timezone
-    | ahead and set this to a sensible default for you out of the box.
+    | is set to "UTC" by default as it is suitable for most use cases.
     |
     */
 
-    'timezone' => 'Australia/Melbourne',
+    'timezone' => env('APP_TIMEZONE', 'UTC'),
 
     /*
     |--------------------------------------------------------------------------
@@ -75,165 +75,54 @@ return [
     |--------------------------------------------------------------------------
     |
     | The application locale determines the default locale that will be used
-    | by the translation service provider. You are free to set this value
+    | by Laravel's translation / localization methods. This option can be
-    | to any of the locales which will be supported by the application.
+    | set to any locale for which you plan to have translation strings.
     |
     */
 
-    'locale' => 'en',
+    'locale' => env('APP_LOCALE', 'en'),
 
-    /*
+    'fallback_locale' => env('APP_FALLBACK_LOCALE', 'en'),
-    |--------------------------------------------------------------------------
-    | Application Fallback Locale
-    |--------------------------------------------------------------------------
-    |
-    | The fallback locale determines the locale to use when the current one
-    | is not available. You may change the value to correspond to any of
-    | the language folders that are provided through your application.
-    |
-    */
 
-    'fallback_locale' => 'en',
+    'faker_locale' => env('APP_FAKER_LOCALE', 'en_US'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | 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
     |--------------------------------------------------------------------------
     |
-    | This key is used by the Illuminate encrypter service and should be set
+    | This key is utilized by Laravel's encryption services and should be set
-    | to a random, 32 character string, otherwise these encrypted strings
+    | to a random, 32 character string to ensure that all encrypted values
-    | will not be safe. Please do this before deploying an application!
+    | are secure. You should do this prior to deploying the application.
     |
     */
 
-    'key' => env('APP_KEY'),
-
     'cipher' => 'AES-256-CBC',
 
-    /*
+    'key' => env('APP_KEY'),
-    |--------------------------------------------------------------------------
-    | Autoloaded Service Providers
-    |--------------------------------------------------------------------------
-    |
-    | The service providers listed here will be automatically loaded on the
-    | request to your application. Feel free to add your own services to
-    | this array to grant expanded functionality to your applications.
-    |
-    */
-
-    'providers' => [
-
-        /*
-         * Laravel Framework Service Providers...
-         */
-        Illuminate\Auth\AuthServiceProvider::class,
-        Illuminate\Broadcasting\BroadcastServiceProvider::class,
-        Illuminate\Bus\BusServiceProvider::class,
-        Illuminate\Cache\CacheServiceProvider::class,
-        Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
-        Illuminate\Cookie\CookieServiceProvider::class,
-        Illuminate\Database\DatabaseServiceProvider::class,
-        Illuminate\Encryption\EncryptionServiceProvider::class,
-        Illuminate\Filesystem\FilesystemServiceProvider::class,
-        Illuminate\Foundation\Providers\FoundationServiceProvider::class,
-        Illuminate\Hashing\HashServiceProvider::class,
-        Illuminate\Mail\MailServiceProvider::class,
-        Illuminate\Notifications\NotificationServiceProvider::class,
-        Illuminate\Pagination\PaginationServiceProvider::class,
-        Illuminate\Pipeline\PipelineServiceProvider::class,
-        Illuminate\Queue\QueueServiceProvider::class,
-        Illuminate\Redis\RedisServiceProvider::class,
-        Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
-        Illuminate\Session\SessionServiceProvider::class,
-        Illuminate\Translation\TranslationServiceProvider::class,
-        Illuminate\Validation\ValidationServiceProvider::class,
-        Illuminate\View\ViewServiceProvider::class,
-
-        /*
-         * Package Service Providers...
-         */
-
-        /*
-         * Application Service Providers...
-         */
-        App\Providers\AppServiceProvider::class,
-        App\Providers\AuthServiceProvider::class,
-        // App\Providers\BroadcastServiceProvider::class,
-        App\Providers\EventServiceProvider::class,
-        App\Providers\RouteServiceProvider::class,
-
-        /*
-         * Other Service Providers...
-         */
-        Orchestra\Asset\AssetServiceProvider::class,
-        Collective\Html\HtmlServiceProvider::class,
-        //\SocialiteProviders\Manager\ServiceProvider::class,
 
+    'previous_keys' => [
+        ...array_filter(
+            explode(',', env('APP_PREVIOUS_KEYS', ''))
+        ),
     ],
 
     /*
     |--------------------------------------------------------------------------
-    | Class Aliases
+    | Maintenance Mode Driver
     |--------------------------------------------------------------------------
     |
-    | This array of class aliases will be registered when this application
+    | These configuration options determine the driver used to determine and
-    | is started. However, feel free to register as many as you wish as
+    | manage Laravel's "maintenance mode" status. The "cache" driver will
-    | the aliases are "lazy" loaded so they don't hinder performance.
+    | allow maintenance mode to be controlled across multiple machines.
+    |
+    | Supported drivers: "file", "cache"
     |
     */
 
-    'aliases' => [
+    'maintenance' => [
-
+        'driver' => env('APP_MAINTENANCE_DRIVER', 'file'),
-        'App' => Illuminate\Support\Facades\App::class,
+        'store' => env('APP_MAINTENANCE_STORE', 'database'),
-        'Arr' => Illuminate\Support\Arr::class,
-        'Artisan' => Illuminate\Support\Facades\Artisan::class,
-        'Asset' => Orchestra\Support\Facades\Asset::class,
-        'Auth' => Illuminate\Support\Facades\Auth::class,
-        'Blade' => Illuminate\Support\Facades\Blade::class,
-        'Broadcast' => Illuminate\Support\Facades\Broadcast::class,
-        'Bus' => Illuminate\Support\Facades\Bus::class,
-        'Cache' => Illuminate\Support\Facades\Cache::class,
-        'Config' => Illuminate\Support\Facades\Config::class,
-        'Cookie' => Illuminate\Support\Facades\Cookie::class,
-        'Crypt' => Illuminate\Support\Facades\Crypt::class,
-        'DB' => Illuminate\Support\Facades\DB::class,
-        'Eloquent' => Illuminate\Database\Eloquent\Model::class,
-        'Event' => Illuminate\Support\Facades\Event::class,
-        'File' => Illuminate\Support\Facades\File::class,
-        'Gate' => Illuminate\Support\Facades\Gate::class,
-        'Hash' => Illuminate\Support\Facades\Hash::class,
-        'Lang' => Illuminate\Support\Facades\Lang::class,
-        'Log' => Illuminate\Support\Facades\Log::class,
-        'Mail' => Illuminate\Support\Facades\Mail::class,
-        'Notification' => Illuminate\Support\Facades\Notification::class,
-        'Password' => Illuminate\Support\Facades\Password::class,
-        'Queue' => Illuminate\Support\Facades\Queue::class,
-        'Redirect' => Illuminate\Support\Facades\Redirect::class,
-        'Redis' => Illuminate\Support\Facades\Redis::class,
-        'Request' => Illuminate\Support\Facades\Request::class,
-        'Response' => Illuminate\Support\Facades\Response::class,
-        'Route' => Illuminate\Support\Facades\Route::class,
-        'Schema' => Illuminate\Support\Facades\Schema::class,
-        'Session' => Illuminate\Support\Facades\Session::class,
-        'Storage' => Illuminate\Support\Facades\Storage::class,
-        'Str' => Illuminate\Support\Str::class,
-        'URL' => Illuminate\Support\Facades\URL::class,
-        'Validator' => Illuminate\Support\Facades\Validator::class,
-        'View' => Illuminate\Support\Facades\View::class,
-
     ],
 
 ];

config/auth.php

@@ -2,115 +2,128 @@
 
 return [
 
-    /*
+	/*
-    |--------------------------------------------------------------------------
+	|--------------------------------------------------------------------------
-    | Authentication Defaults
+	| Authentication Defaults
-    |--------------------------------------------------------------------------
+	|--------------------------------------------------------------------------
-    |
+	|
-    | This option controls the default authentication "guard" and password
+	| This option defines the default authentication "guard" and password
-    | reset options for your application. You may change these defaults
+	| reset "broker" for your application. You may change these values
-    | as required, but they're a perfect start for most applications.
+	| as required, but they're a perfect start for most applications.
-    |
+	|
-    */
+	*/
 
-    'defaults' => [
+	'defaults' => [
-        'guard' => 'web',
+		'guard' => env('AUTH_GUARD', 'web'),
-        'passwords' => 'users',
+		'passwords' => env('AUTH_PASSWORD_BROKER', 'users'),
-    ],
+	],
 
-    /*
+	/*
-    |--------------------------------------------------------------------------
+	|--------------------------------------------------------------------------
-    | Authentication Guards
+	| Authentication Guards
-    |--------------------------------------------------------------------------
+	|--------------------------------------------------------------------------
-    |
+	|
-    | Next, you may define every authentication guard for your application.
+	| Next, you may define every authentication guard for your application.
-    | Of course, a great default configuration has been defined for you
+	| Of course, a great default configuration has been defined for you
-    | here which uses session storage and the Eloquent user provider.
+	| which utilizes session storage plus the Eloquent user provider.
-    |
+	|
-    | All authentication drivers have a user provider. This defines how the
+	| All authentication guards have a user provider, which defines how the
-    | users are actually retrieved out of your database or other storage
+	| users are actually retrieved out of your database or other storage
-    | mechanisms used by this application to persist your user's data.
+	| system used by the application. Typically, Eloquent is utilized.
-    |
+	|
-    | Supported: "session", "token"
+	| Supported: "session"
-    |
+	|
-    */
+	*/
 
-    'guards' => [
+	'guards' => [
-        'web' => [
+		'web' => [
-            'driver' => 'session',
+			'driver' => 'session',
-            'provider' => 'users',
+			'provider' => 'users',
-        ],
+		],
 
-        'api' => [
+		'api' => [
-            'driver' => 'token',
+			'driver' => 'passport',
-            'provider' => 'users',
+			'provider' => 'users',
-            'hash' => false,
+		],
-        ],
-    ],
 
-    /*
+	],
-    |--------------------------------------------------------------------------
-    | User Providers
-    |--------------------------------------------------------------------------
-    |
-    | All authentication drivers have a user provider. This defines how the
-    | users are actually retrieved out of your database or other storage
-    | mechanisms used by this application to persist your user's data.
-    |
-    | If you have multiple user tables or models you may configure multiple
-    | sources which represent each model / table. These sources may then
-    | be assigned to any extra authentication guards you have defined.
-    |
-    | Supported: "database", "eloquent"
-    |
-    */
 
-    'providers' => [
+	/*
-        'users' => [
+	|--------------------------------------------------------------------------
-            'driver' => 'eloquent',
+	| User Providers
-            'model' => App\User::class,
+	|--------------------------------------------------------------------------
-        ],
+	|
+	| All authentication guards have a user provider, which defines how the
+	| users are actually retrieved out of your database or other storage
+	| system used by the application. Typically, Eloquent is utilized.
+	|
+	| If you have multiple user tables or models you may configure multiple
+	| providers to represent the model / table. These providers may then
+	| be assigned to any extra authentication guards you have defined.
+	|
+	| Supported: "database", "eloquent"
+	|
+	*/
 
-        // 'users' => [
+	'providers' => [
-        //     'driver' => 'database',
+		'users' => [
-        //     'table' => 'users',
+			'driver' => 'eloquent',
-        // ],
+			'model' => env('AUTH_MODEL', App\Models\User::class),
-    ],
+		],
 
-    /*
+		// 'users' => [
-    |--------------------------------------------------------------------------
+		//	 'driver' => 'database',
-    | Resetting Passwords
+		//	 'table' => 'users',
-    |--------------------------------------------------------------------------
+		// ],
-    |
+	],
-    | You may specify multiple password reset configurations if you have more
-    | than one user table or model in the application and you want to have
-    | separate password reset settings based on the specific user types.
-    |
-    | The expire time is the number of minutes that the reset token should be
-    | considered valid. This security feature keeps tokens short-lived so
-    | they have less time to be guessed. You may change this as needed.
-    |
-    */
 
-    'passwords' => [
+	/*
-        'users' => [
+	|--------------------------------------------------------------------------
-            'provider' => 'users',
+	| Resetting Passwords
-            'table' => 'password_resets',
+	|--------------------------------------------------------------------------
-            'expire' => 60,
+	|
-        ],
+	| These configuration options specify the behavior of Laravel's password
-    ],
+	| reset functionality, including the table utilized for token storage
+	| and the user provider that is invoked to actually retrieve users.
+	|
+	| The expiry time is the number of minutes that each reset token will be
+	| considered valid. This security feature keeps tokens short-lived so
+	| they have less time to be guessed. You may change this as needed.
+	|
+	| The throttle setting is the number of seconds a user must wait before
+	| generating more password reset tokens. This prevents the user from
+	| quickly generating a very large amount of password reset tokens.
+	|
+	*/
 
-    /*
+	'passwords' => [
-    |--------------------------------------------------------------------------
+		'users' => [
-    | Password Confirmation Timeout
+			'provider' => 'users',
-    |--------------------------------------------------------------------------
+			'table' => env('AUTH_PASSWORD_RESET_TOKEN_TABLE', 'password_reset_tokens'),
-    |
+			'expire' => 60,
-    | Here you may define the amount of seconds before a password confirmation
+			'throttle' => 60,
-    | times out and the user is prompted to re-enter their password via the
+		],
-    | confirmation screen. By default, the timeout lasts for three hours.
+	],
-    |
-    */
 
-    'password_timeout' => 10800,
+	/*
+	|--------------------------------------------------------------------------
+	| Password Confirmation Timeout
+	|--------------------------------------------------------------------------
+	|
+	| Here you may define the amount of seconds before a password confirmation
+	| window expires and users are asked to re-enter their password via the
+	| confirmation screen. By default, the timeout lasts for three hours.
+	|
+	*/
 
-];
+	'password_timeout' => env('AUTH_PASSWORD_TIMEOUT', 10800),
+
+	'social' => [
+		'google' => [
+			'name' => 'Google',
+			'id' => 'google',
+			'class' => 'btn-danger',
+			'icon' => 'fab fa-google',
+		],
+	],
+];

config/broadcasting.php

@@ -1,59 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Default Broadcaster
-    |--------------------------------------------------------------------------
-    |
-    | This option controls the default broadcaster that will be used by the
-    | framework when an event needs to be broadcast. You may set this to
-    | any of the connections defined in the "connections" array below.
-    |
-    | Supported: "pusher", "redis", "log", "null"
-    |
-    */
-
-    'default' => env('BROADCAST_DRIVER', 'null'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Broadcast Connections
-    |--------------------------------------------------------------------------
-    |
-    | Here you may define all of the broadcast connections that will be used
-    | to broadcast events to other systems or over websockets. Samples of
-    | each available type of connection are provided inside this array.
-    |
-    */
-
-    'connections' => [
-
-        'pusher' => [
-            'driver' => 'pusher',
-            'key' => env('PUSHER_APP_KEY'),
-            'secret' => env('PUSHER_APP_SECRET'),
-            'app_id' => env('PUSHER_APP_ID'),
-            'options' => [
-                'cluster' => env('PUSHER_APP_CLUSTER'),
-                'useTLS' => true,
-            ],
-        ],
-
-        'redis' => [
-            'driver' => 'redis',
-            'connection' => 'default',
-        ],
-
-        'log' => [
-            'driver' => 'log',
-        ],
-
-        'null' => [
-            'driver' => 'null',
-        ],
-
-    ],
-
-];

config/cache.php

@@ -9,16 +9,13 @@ return [
     | Default Cache Store
     |--------------------------------------------------------------------------
     |
-    | This option controls the default cache connection that gets used while
+    | This option controls the default cache store that will be used by the
-    | using this caching library. This connection is used when another is
+    | framework. This connection is utilized if another isn't explicitly
-    | not explicitly specified when executing a given caching function.
+    | specified when running a cache operation inside the application.
-    |
-    | Supported: "apc", "array", "database", "file",
-    |            "memcached", "redis", "dynamodb"
     |
     */
 
-    'default' => env('CACHE_DRIVER', 'file'),
+    'default' => env('CACHE_STORE', 'database'),
 
     /*
     |--------------------------------------------------------------------------
@@ -29,27 +26,30 @@ return [
     | well as their drivers. You may even define multiple stores for the
     | same cache driver to group types of items stored in your caches.
     |
+    | Supported drivers: "array", "database", "file", "memcached",
+    |                    "redis", "dynamodb", "octane", "null"
+    |
     */
 
     'stores' => [
 
-        'apc' => [
-            'driver' => 'apc',
-        ],
-
         'array' => [
             'driver' => 'array',
+            'serialize' => false,
         ],
 
         'database' => [
             'driver' => 'database',
-            'table' => 'cache',
+            'connection' => env('DB_CACHE_CONNECTION'),
-            'connection' => null,
+            'table' => env('DB_CACHE_TABLE', 'cache'),
+            'lock_connection' => env('DB_CACHE_LOCK_CONNECTION'),
+            'lock_table' => env('DB_CACHE_LOCK_TABLE'),
         ],
 
         'file' => [
             'driver' => 'file',
             'path' => storage_path('framework/cache/data'),
+            'lock_path' => storage_path('framework/cache/data'),
         ],
 
         'memcached' => [
@@ -73,7 +73,8 @@ return [
 
         'redis' => [
             'driver' => 'redis',
-            'connection' => 'cache',
+            'connection' => env('REDIS_CACHE_CONNECTION', 'cache'),
+            'lock_connection' => env('REDIS_CACHE_LOCK_CONNECTION', 'default'),
         ],
 
         'dynamodb' => [
@@ -85,6 +86,10 @@ return [
             'endpoint' => env('DYNAMODB_ENDPOINT'),
         ],
 
+        'octane' => [
+            'driver' => 'octane',
+        ],
+
     ],
 
     /*
@@ -92,12 +97,12 @@ return [
     | Cache Key Prefix
     |--------------------------------------------------------------------------
     |
-    | When utilizing a RAM based store such as APC or Memcached, there might
+    | When utilizing the APC, database, memcached, Redis, and DynamoDB cache
-    | be other applications utilizing the same cache. So, we'll specify a
+    | stores, there might be other applications using the same cache. For
-    | value to get prefixed to all our keys so we can avoid collisions.
+    | that reason, you may prefix every cache key to avoid collisions.
     |
     */
 
-    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),
+    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache_'),
 
 ];

config/database.php

@@ -10,26 +10,22 @@ return [
     |--------------------------------------------------------------------------
     |
     | Here you may specify which of the database connections below you wish
-    | to use as your default connection for all database work. Of course
+    | to use as your default connection for database operations. This is
-    | you may use many connections at once using the Database library.
+    | the connection which will be utilized unless another connection
+    | is explicitly specified when you execute a query / statement.
     |
     */
 
-    'default' => env('DB_CONNECTION', 'mysql'),
+    'default' => env('DB_CONNECTION', 'sqlite'),
 
     /*
     |--------------------------------------------------------------------------
     | Database Connections
     |--------------------------------------------------------------------------
     |
-    | Here are each of the database connections setup for your application.
+    | Below are all of the database connections defined for your application.
-    | Of course, examples of configuring each database platform that is
+    | An example configuration is provided for each database system which
-    | supported by Laravel is shown below to make development simple.
+    | is supported by Laravel. You're free to add / remove connections.
-    |
-    |
-    | All database work in Laravel is done through the PHP PDO facilities
-    | so make sure you have the driver for your particular database of
-    | choice installed on your machine before you begin development.
     |
     */
 
@@ -37,7 +33,7 @@ return [
 
         'sqlite' => [
             'driver' => 'sqlite',
-            'url' => env('DATABASE_URL'),
+            'url' => env('DB_URL'),
             'database' => env('DB_DATABASE', database_path('database.sqlite')),
             'prefix' => '',
             'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
@@ -45,15 +41,35 @@ return [
 
         'mysql' => [
             'driver' => 'mysql',
-            'url' => env('DATABASE_URL'),
+            'url' => env('DB_URL'),
             'host' => env('DB_HOST', '127.0.0.1'),
             'port' => env('DB_PORT', '3306'),
-            'database' => env('DB_DATABASE', 'forge'),
+            'database' => env('DB_DATABASE', 'laravel'),
-            'username' => env('DB_USERNAME', 'forge'),
+            'username' => env('DB_USERNAME', 'root'),
             'password' => env('DB_PASSWORD', ''),
             'unix_socket' => env('DB_SOCKET', ''),
-            'charset' => 'utf8mb4',
+            'charset' => env('DB_CHARSET', 'utf8mb4'),
-            'collation' => 'utf8mb4_unicode_ci',
+            'collation' => env('DB_COLLATION', 'utf8mb4_unicode_ci'),
+            'prefix' => '',
+            'prefix_indexes' => true,
+            'strict' => true,
+            'engine' => null,
+            'options' => extension_loaded('pdo_mysql') ? array_filter([
+                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+            ]) : [],
+        ],
+
+        'mariadb' => [
+            'driver' => 'mariadb',
+            'url' => env('DB_URL'),
+            'host' => env('DB_HOST', '127.0.0.1'),
+            'port' => env('DB_PORT', '3306'),
+            'database' => env('DB_DATABASE', 'laravel'),
+            'username' => env('DB_USERNAME', 'root'),
+            'password' => env('DB_PASSWORD', ''),
+            'unix_socket' => env('DB_SOCKET', ''),
+            'charset' => env('DB_CHARSET', 'utf8mb4'),
+            'collation' => env('DB_COLLATION', 'utf8mb4_unicode_ci'),
             'prefix' => '',
             'prefix_indexes' => true,
             'strict' => true,
@@ -65,30 +81,32 @@ return [
 
         'pgsql' => [
             'driver' => 'pgsql',
-            'url' => env('DATABASE_URL'),
+            'url' => env('DB_URL'),
             'host' => env('DB_HOST', '127.0.0.1'),
             'port' => env('DB_PORT', '5432'),
-            'database' => env('DB_DATABASE', 'forge'),
+            'database' => env('DB_DATABASE', 'laravel'),
-            'username' => env('DB_USERNAME', 'forge'),
+            'username' => env('DB_USERNAME', 'root'),
             'password' => env('DB_PASSWORD', ''),
-            'charset' => 'utf8',
+            'charset' => env('DB_CHARSET', 'utf8'),
             'prefix' => '',
             'prefix_indexes' => true,
-            'schema' => 'public',
+            'search_path' => env('DB_SCHEMA', 'public'),
             'sslmode' => 'prefer',
         ],
 
         'sqlsrv' => [
             'driver' => 'sqlsrv',
-            'url' => env('DATABASE_URL'),
+            'url' => env('DB_URL'),
             'host' => env('DB_HOST', 'localhost'),
             'port' => env('DB_PORT', '1433'),
-            'database' => env('DB_DATABASE', 'forge'),
+            'database' => env('DB_DATABASE', 'laravel'),
-            'username' => env('DB_USERNAME', 'forge'),
+            'username' => env('DB_USERNAME', 'root'),
             'password' => env('DB_PASSWORD', ''),
-            'charset' => 'utf8',
+            'charset' => env('DB_CHARSET', 'utf8'),
             'prefix' => '',
             'prefix_indexes' => true,
+            // 'encrypt' => env('DB_ENCRYPT', 'yes'),
+            // 'trust_server_certificate' => env('DB_TRUST_SERVER_CERTIFICATE', 'false'),
         ],
 
     ],
@@ -100,11 +118,14 @@ return [
     |
     | This table keeps track of all the migrations that have already run for
     | your application. Using this information, we can determine which of
-    | the migrations on disk haven't actually been run in the database.
+    | the migrations on disk haven't actually been run on the database.
     |
     */
 
-    'migrations' => 'migrations',
+    'migrations' => [
+        'table' => 'migrations',
+        'update_date_on_publish' => true,
+    ],
 
     /*
     |--------------------------------------------------------------------------
@@ -113,7 +134,7 @@ return [
     |
     | Redis is an open source, fast, and advanced key-value store that also
     | 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.
+    | such as Memcached. You may define your connection settings here.
     |
     */
 
@@ -129,17 +150,19 @@ return [
         'default' => [
             'url' => env('REDIS_URL'),
             'host' => env('REDIS_HOST', '127.0.0.1'),
-            'password' => env('REDIS_PASSWORD', null),
+            'username' => env('REDIS_USERNAME'),
-            'port' => env('REDIS_PORT', 6379),
+            'password' => env('REDIS_PASSWORD'),
-            'database' => env('REDIS_DB', 0),
+            'port' => env('REDIS_PORT', '6379'),
+            'database' => env('REDIS_DB', '0'),
         ],
 
         'cache' => [
             'url' => env('REDIS_URL'),
             'host' => env('REDIS_HOST', '127.0.0.1'),
-            'password' => env('REDIS_PASSWORD', null),
+            'username' => env('REDIS_USERNAME'),
-            'port' => env('REDIS_PORT', 6379),
+            'password' => env('REDIS_PASSWORD'),
-            'database' => env('REDIS_CACHE_DB', 1),
+            'port' => env('REDIS_PORT', '6379'),
+            'database' => env('REDIS_CACHE_DB', '1'),
         ],
 
     ],

config/filesystems.php

@@ -9,35 +9,22 @@ return [
     |
     | Here you may specify the default filesystem disk that should be used
     | by the framework. The "local" disk, as well as a variety of cloud
-    | based disks are available to your application. Just store away!
+    | based disks are available to your application for file storage.
     |
     */
 
-    'default' => env('FILESYSTEM_DRIVER', 'local'),
+    'default' => env('FILESYSTEM_DISK', 'local'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Default Cloud Filesystem Disk
-    |--------------------------------------------------------------------------
-    |
-    | Many applications store files both locally and in the cloud. For this
-    | reason, you may specify a default "cloud" driver here. This driver
-    | will be bound as the Cloud disk implementation in the container.
-    |
-    */
-
-    'cloud' => env('FILESYSTEM_CLOUD', 's3'),
 
     /*
     |--------------------------------------------------------------------------
     | Filesystem Disks
     |--------------------------------------------------------------------------
     |
-    | Here you may configure as many filesystem "disks" as you wish, and you
+    | Below you may configure as many filesystem disks as necessary, and you
-    | may even configure multiple disks of the same driver. Defaults have
+    | may even configure multiple disks for the same driver. Examples for
-    | been setup for each driver as an example of the required options.
+    | most supported storage drivers are configured here for reference.
     |
-    | Supported Drivers: "local", "ftp", "sftp", "s3"
+    | Supported drivers: "local", "ftp", "sftp", "s3"
     |
     */
 
@@ -46,6 +33,7 @@ return [
         'local' => [
             'driver' => 'local',
             'root' => storage_path('app'),
+            'throw' => false,
         ],
 
         'public' => [
@@ -53,6 +41,7 @@ return [
             'root' => storage_path('app/public'),
             'url' => env('APP_URL').'/storage',
             'visibility' => 'public',
+            'throw' => false,
         ],
 
         's3' => [
@@ -62,8 +51,26 @@ return [
             'region' => env('AWS_DEFAULT_REGION'),
             'bucket' => env('AWS_BUCKET'),
             'url' => env('AWS_URL'),
+            'endpoint' => env('AWS_ENDPOINT'),
+            'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
+            'throw' => false,
         ],
 
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Symbolic Links
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure the symbolic links that will be created when the
+    | `storage:link` Artisan command is executed. The array keys should be
+    | the locations of the links and the values should be their targets.
+    |
+    */
+
+    'links' => [
+        public_path('storage') => storage_path('app/public'),
+    ],
+
 ];

config/logging.php

@@ -3,98 +3,138 @@
 use Monolog\Handler\NullHandler;
 use Monolog\Handler\StreamHandler;
 use Monolog\Handler\SyslogUdpHandler;
+use Monolog\Processor\PsrLogMessageProcessor;
 
 return [
 
-    /*
+	/*
-    |--------------------------------------------------------------------------
+	|--------------------------------------------------------------------------
-    | Default Log Channel
+	| Default Log Channel
-    |--------------------------------------------------------------------------
+	|--------------------------------------------------------------------------
-    |
+	|
-    | This option defines the default log channel that gets used when writing
+	| This option defines the default log channel that is utilized to write
-    | messages to the logs. The name specified in this option should match
+	| messages to your logs. The value provided here should match one of
-    | one of the channels defined in the "channels" configuration array.
+	| the channels present in the list of "channels" configured below.
-    |
+	|
-    */
+	*/
 
-    'default' => env('LOG_CHANNEL', 'stack'),
+	'default' => env('LOG_CHANNEL', 'stack'),
 
-    /*
+	/*
-    |--------------------------------------------------------------------------
+	|--------------------------------------------------------------------------
-    | Log Channels
+	| Deprecations Log Channel
-    |--------------------------------------------------------------------------
+	|--------------------------------------------------------------------------
-    |
+	|
-    | Here you may configure the log channels for your application. Out of
+	| This option controls the log channel that should be used to log warnings
-    | the box, Laravel uses the Monolog PHP logging library. This gives
+	| regarding deprecated PHP and library features. This allows you to get
-    | you a variety of powerful log handlers / formatters to utilize.
+	| your application ready for upcoming major versions of dependencies.
-    |
+	|
-    | Available Drivers: "single", "daily", "slack", "syslog",
+	*/
-    |                    "errorlog", "monolog",
-    |                    "custom", "stack"
-    |
-    */
 
-    'channels' => [
+	'deprecations' => [
-        'stack' => [
+		'channel' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
-            'driver' => 'stack',
+		'trace' => env('LOG_DEPRECATIONS_TRACE', false),
-            'channels' => ['daily'],
+	],
-            'ignore_exceptions' => false,
-        ],
 
-        'single' => [
+	/*
-            'driver' => 'single',
+	|--------------------------------------------------------------------------
-            'path' => storage_path('logs/laravel.log'),
+	| Log Channels
-            'level' => 'debug',
+	|--------------------------------------------------------------------------
-        ],
+	|
+	| Here you may configure the log channels for your application. Laravel
+	| utilizes the Monolog PHP logging library, which includes a variety
+	| of powerful log handlers and formatters that you're free to use.
+	|
+	| Available drivers: "single", "daily", "slack", "syslog",
+	|					"errorlog", "monolog", "custom", "stack"
+	|
+	*/
 
-        'daily' => [
+	'channels' => [
-            'driver' => 'daily',
-            'path' => storage_path('logs/laravel.log'),
-            'level' => 'debug',
-            'days' => 14,
-        ],
 
-        'slack' => [
+		'stack' => [
-            'driver' => 'slack',
+			'driver' => 'stack',
-            'url' => env('LOG_SLACK_WEBHOOK_URL'),
+			'channels' => explode(',', env('LOG_STACK', 'daily')),
-            'username' => 'Laravel Log',
+			'ignore_exceptions' => false,
-            'emoji' => ':boom:',
+		],
-            'level' => 'critical',
-        ],
 
-        'papertrail' => [
+		'single' => [
-            'driver' => 'monolog',
+			'driver' => 'single',
-            'level' => 'debug',
+			'path' => storage_path('logs/laravel.log'),
-            'handler' => SyslogUdpHandler::class,
+			'level' => env('LOG_LEVEL', 'debug'),
-            'handler_with' => [
+			'replace_placeholders' => true,
-                'host' => env('PAPERTRAIL_URL'),
+		],
-                'port' => env('PAPERTRAIL_PORT'),
-            ],
-        ],
 
-        'stderr' => [
+		'daily' => [
-            'driver' => 'monolog',
+			'driver' => 'daily',
-            'handler' => StreamHandler::class,
+			'path' => storage_path('logs/laravel.log'),
-            'formatter' => env('LOG_STDERR_FORMATTER'),
+			'level' => env('LOG_LEVEL', 'debug'),
-            'with' => [
+			'days' => env('LOG_DAILY_DAYS', 14),
-                'stream' => 'php://stderr',
+			'replace_placeholders' => true,
-            ],
+		],
-        ],
 
-        'syslog' => [
+		'webhook' => [
-            'driver' => 'syslog',
+			'driver' => 'daily',
-            'level' => 'debug',
+			'path' => storage_path('logs/webhook.log'),
-        ],
+			'level' => env('LOG_LEVEL', 'debug'),
+			'days' => env('LOG_DAILY_DAYS', 14),
+			'replace_placeholders' => true,
+		],
 
-        'errorlog' => [
+		'slack' => [
-            'driver' => 'errorlog',
+			'driver' => 'slack',
-            'level' => 'debug',
+			'url' => env('LOG_SLACK_WEBHOOK_URL'),
-        ],
+			'username' => env('LOG_SLACK_USERNAME', 'Laravel Log'),
+			'emoji' => env('LOG_SLACK_EMOJI', ':boom:'),
+			'level' => env('LOG_LEVEL', 'critical'),
+			'replace_placeholders' => true,
+		],
 
-        'null' => [
+		'papertrail' => [
-            'driver' => 'monolog',
+			'driver' => 'monolog',
-            'handler' => NullHandler::class,
+			'level' => env('LOG_LEVEL', 'debug'),
-        ],
+			'handler' => env('LOG_PAPERTRAIL_HANDLER', SyslogUdpHandler::class),
-    ],
+			'handler_with' => [
+				'host' => env('PAPERTRAIL_URL'),
+				'port' => env('PAPERTRAIL_PORT'),
+				'connectionString' => 'tls://'.env('PAPERTRAIL_URL').':'.env('PAPERTRAIL_PORT'),
+			],
+			'processors' => [PsrLogMessageProcessor::class],
+		],
 
-];
+		'stderr' => [
+			'driver' => 'monolog',
+			'level' => env('LOG_LEVEL', 'debug'),
+			'handler' => StreamHandler::class,
+			'formatter' => env('LOG_STDERR_FORMATTER'),
+			'with' => [
+				'stream' => 'php://stderr',
+			],
+			'processors' => [PsrLogMessageProcessor::class],
+		],
+
+		'syslog' => [
+			'driver' => 'syslog',
+			'level' => env('LOG_LEVEL', 'debug'),
+			'facility' => env('LOG_SYSLOG_FACILITY', LOG_USER),
+			'replace_placeholders' => true,
+		],
+
+		'errorlog' => [
+			'driver' => 'errorlog',
+			'level' => env('LOG_LEVEL', 'debug'),
+			'replace_placeholders' => true,
+		],
+
+		'null' => [
+			'driver' => 'monolog',
+			'handler' => NullHandler::class,
+		],
+
+		'emergency' => [
+			'path' => storage_path('logs/laravel.log'),
+		],
+
+	],
+
+];

config/mail.php

@@ -4,54 +4,108 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Mail Driver
+    | Default Mailer
     |--------------------------------------------------------------------------
     |
-    | Laravel supports both SMTP and PHP's "mail" function as drivers for the
+    | This option controls the default mailer that is used to send all email
-    | sending of e-mail. You may specify which one you're using throughout
+    | messages unless another mailer is explicitly specified when sending
-    | your application here. By default, Laravel is setup for SMTP mail.
+    | the message. All additional mailers can be configured within the
-    |
+    | "mailers" array. Examples of each type of mailer are provided.
-    | Supported: "smtp", "sendmail", "mailgun", "ses",
-    |            "postmark", "log", "array"
     |
     */
 
-    'driver' => env('MAIL_DRIVER', 'smtp'),
+    'default' => env('MAIL_MAILER', 'log'),
 
     /*
     |--------------------------------------------------------------------------
-    | SMTP Host Address
+    | Mailer Configurations
     |--------------------------------------------------------------------------
     |
-    | Here you may provide the host address of the SMTP server used by your
+    | Here you may configure all of the mailers used by your application plus
-    | applications. A default option is provided that is compatible with
+    | their respective settings. Several examples have been configured for
-    | the Mailgun mail service which will provide reliable deliveries.
+    | you and you are free to add your own as your application requires.
+    |
+    | Laravel supports a variety of mail "transport" drivers that can be used
+    | when delivering an email. You may specify which one you're using for
+    | your mailers below. You may also add additional mailers if needed.
+    |
+    | Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2",
+    |            "postmark", "resend", "log", "array",
+    |            "failover", "roundrobin"
     |
     */
 
-    'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
+    'mailers' => [
 
-    /*
+        'smtp' => [
-    |--------------------------------------------------------------------------
+            'transport' => 'smtp',
-    | SMTP Host Port
+            'url' => env('MAIL_URL'),
-    |--------------------------------------------------------------------------
+            'host' => env('MAIL_HOST', '127.0.0.1'),
-    |
+            'port' => env('MAIL_PORT', 2525),
-    | This is the SMTP port used by your application to deliver e-mails to
+            'encryption' => env('MAIL_ENCRYPTION', 'tls'),
-    | users of the application. Like the host we have set this value to
+            'username' => env('MAIL_USERNAME'),
-    | stay compatible with the Mailgun e-mail application by default.
+            'password' => env('MAIL_PASSWORD'),
-    |
+            'timeout' => null,
-    */
+            'local_domain' => env('MAIL_EHLO_DOMAIN', parse_url(env('APP_URL', 'http://localhost'), PHP_URL_HOST)),
+            'verify_peer' => false,
+        ],
 
-    'port' => env('MAIL_PORT', 587),
+        'ses' => [
+            'transport' => 'ses',
+        ],
+
+        'postmark' => [
+            'transport' => 'postmark',
+            // 'message_stream_id' => env('POSTMARK_MESSAGE_STREAM_ID'),
+            // 'client' => [
+            //     'timeout' => 5,
+            // ],
+        ],
+
+        'resend' => [
+            'transport' => 'resend',
+        ],
+
+        'sendmail' => [
+            'transport' => 'sendmail',
+            'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -bs -i'),
+        ],
+
+        'log' => [
+            'transport' => 'log',
+            'channel' => env('MAIL_LOG_CHANNEL'),
+        ],
+
+        'array' => [
+            'transport' => 'array',
+        ],
+
+        'failover' => [
+            'transport' => 'failover',
+            'mailers' => [
+                'smtp',
+                'log',
+            ],
+        ],
+
+        'roundrobin' => [
+            'transport' => 'roundrobin',
+            'mailers' => [
+                'ses',
+                'postmark',
+            ],
+        ],
+
+    ],
 
     /*
     |--------------------------------------------------------------------------
     | Global "From" Address
     |--------------------------------------------------------------------------
     |
-    | You may wish for all e-mails sent by your application to be sent from
+    | You may wish for all emails sent by your application to be sent from
-    | the same address. Here, you may specify a name and address that is
+    | the same address. Here you may specify a name and address that is
-    | used globally for all e-mails that are sent by your application.
+    | used globally for all emails that are sent by your application.
     |
     */
 
@@ -60,77 +114,4 @@ return [
         'name' => env('MAIL_FROM_NAME', 'Example'),
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | E-Mail Encryption Protocol
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify the encryption protocol that should be used when
-    | the application send e-mail messages. A sensible default using the
-    | transport layer security protocol should provide great security.
-    |
-    */
-
-    'encryption' => env('MAIL_ENCRYPTION', 'tls'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | SMTP Server Username
-    |--------------------------------------------------------------------------
-    |
-    | If your SMTP server requires a username for authentication, you should
-    | set it here. This will get used to authenticate with your server on
-    | connection. You may also set the "password" value below this one.
-    |
-    */
-
-    'username' => env('MAIL_USERNAME'),
-
-    'password' => env('MAIL_PASSWORD'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Sendmail System Path
-    |--------------------------------------------------------------------------
-    |
-    | When using the "sendmail" driver to send e-mails, we will need to know
-    | the path to where Sendmail lives on this server. A default path has
-    | been provided here, which will work well on most of your systems.
-    |
-    */
-
-    'sendmail' => '/usr/sbin/sendmail -bs',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Markdown Mail Settings
-    |--------------------------------------------------------------------------
-    |
-    | If you are using Markdown based email rendering, you may configure your
-    | theme and component paths here, allowing you to customize the design
-    | of the emails. Or, you may simply stick with the Laravel defaults!
-    |
-    */
-
-    'markdown' => [
-        'theme' => 'default',
-
-        'paths' => [
-            resource_path('views/vendor/mail'),
-        ],
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | 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

@@ -7,22 +7,22 @@ return [
     | Default Queue Connection Name
     |--------------------------------------------------------------------------
     |
-    | Laravel's queue API supports an assortment of back-ends via a single
+    | Laravel's queue supports a variety of backends via a single, unified
-    | API, giving you convenient access to each back-end using the same
+    | API, giving you convenient access to each backend using identical
-    | syntax for every one. Here you may define a default connection.
+    | syntax for each. The default queue connection is defined below.
     |
     */
 
-    'default' => env('QUEUE_CONNECTION', 'sync'),
+    'default' => env('QUEUE_CONNECTION', 'database'),
 
     /*
     |--------------------------------------------------------------------------
     | Queue Connections
     |--------------------------------------------------------------------------
     |
-    | Here you may configure the connection information for each server that
+    | Here you may configure the connection options for every queue backend
-    | is used by your application. A default configuration has been added
+    | used by your application. An example configuration is provided for
-    | for each back-end shipped with Laravel. You are free to add more.
+    | each backend supported by Laravel. You're also free to add more.
     |
     | Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
     |
@@ -36,17 +36,20 @@ return [
 
         'database' => [
             'driver' => 'database',
-            'table' => 'jobs',
+            'connection' => env('DB_QUEUE_CONNECTION'),
-            'queue' => 'default',
+            'table' => env('DB_QUEUE_TABLE', 'jobs'),
-            'retry_after' => 90,
+            'queue' => env('DB_QUEUE', 'default'),
+            'retry_after' => (int) env('DB_QUEUE_RETRY_AFTER', 90),
+            'after_commit' => false,
         ],
 
         'beanstalkd' => [
             'driver' => 'beanstalkd',
-            'host' => 'localhost',
+            'host' => env('BEANSTALKD_QUEUE_HOST', 'localhost'),
-            'queue' => 'default',
+            'queue' => env('BEANSTALKD_QUEUE', 'default'),
-            'retry_after' => 90,
+            'retry_after' => (int) env('BEANSTALKD_QUEUE_RETRY_AFTER', 90),
             'block_for' => 0,
+            'after_commit' => false,
         ],
 
         'sqs' => [
@@ -54,34 +57,55 @@ return [
             'key' => env('AWS_ACCESS_KEY_ID'),
             'secret' => env('AWS_SECRET_ACCESS_KEY'),
             'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
-            'queue' => env('SQS_QUEUE', 'your-queue-name'),
+            'queue' => env('SQS_QUEUE', 'default'),
+            'suffix' => env('SQS_SUFFIX'),
             'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
+            'after_commit' => false,
         ],
 
         'redis' => [
             'driver' => 'redis',
-            'connection' => 'default',
+            'connection' => env('REDIS_QUEUE_CONNECTION', 'default'),
             'queue' => env('REDIS_QUEUE', 'default'),
-            'retry_after' => 90,
+            'retry_after' => (int) env('REDIS_QUEUE_RETRY_AFTER', 90),
             'block_for' => null,
+            'after_commit' => false,
         ],
 
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Job Batching
+    |--------------------------------------------------------------------------
+    |
+    | The following options configure the database and table that store job
+    | batching information. These options can be updated to any database
+    | connection and table which has been defined by your application.
+    |
+    */
+
+    'batching' => [
+        'database' => env('DB_CONNECTION', 'sqlite'),
+        'table' => 'job_batches',
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Failed Queue Jobs
     |--------------------------------------------------------------------------
     |
     | These options configure the behavior of failed queue job logging so you
-    | can control which database and table are used to store the jobs that
+    | can control how and where failed jobs are stored. Laravel ships with
-    | have failed. You may change them to any database / table you wish.
+    | support for storing failed jobs in a simple file or in a database.
+    |
+    | Supported drivers: "database-uuids", "dynamodb", "file", "null"
     |
     */
 
     'failed' => [
-        'driver' => env('QUEUE_FAILED_DRIVER', 'database'),
+        'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'),
-        'database' => env('DB_CONNECTION', 'mysql'),
+        'database' => env('DB_CONNECTION', 'sqlite'),
         'table' => 'failed_jobs',
     ],
 

config/session.php

@@ -9,16 +9,16 @@ return [
     | Default Session Driver
     |--------------------------------------------------------------------------
     |
-    | This option controls the default session "driver" that will be used on
+    | This option determines the default session driver that is utilized for
-    | requests. By default, we will use the lightweight native driver but
+    | incoming requests. Laravel supports a variety of storage options to
-    | you may specify any of the other wonderful drivers provided here.
+    | persist session data. Database storage is a great default choice.
     |
     | Supported: "file", "cookie", "database", "apc",
     |            "memcached", "redis", "dynamodb", "array"
     |
     */
 
-    'driver' => env('SESSION_DRIVER', 'file'),
+    'driver' => env('SESSION_DRIVER', 'database'),
 
     /*
     |--------------------------------------------------------------------------
@@ -27,13 +27,14 @@ return [
     |
     | Here you may specify the number of minutes that you wish the session
     | to be allowed to remain idle before it expires. If you want them
-    | to immediately expire on the browser closing, set that option.
+    | to expire immediately when the browser is closed then you may
+    | indicate that via the expire_on_close configuration option.
     |
     */
 
     'lifetime' => env('SESSION_LIFETIME', 120),
 
-    'expire_on_close' => false,
+    'expire_on_close' => env('SESSION_EXPIRE_ON_CLOSE', false),
 
     /*
     |--------------------------------------------------------------------------
@@ -41,21 +42,21 @@ return [
     |--------------------------------------------------------------------------
     |
     | This option allows you to easily specify that all of your session data
-    | should be encrypted before it is stored. All encryption will be run
+    | should be encrypted before it's stored. All encryption is performed
-    | automatically by Laravel and you can use the Session like normal.
+    | automatically by Laravel and you may use the session like normal.
     |
     */
 
-    'encrypt' => false,
+    'encrypt' => env('SESSION_ENCRYPT', false),
 
     /*
     |--------------------------------------------------------------------------
     | Session File Location
     |--------------------------------------------------------------------------
     |
-    | When using the native session driver, we need a location where session
+    | When utilizing the "file" session driver, the session files are placed
-    | files may be stored. A default has been set for you but a different
+    | on disk. The default storage location is defined here; however, you
-    | location may be specified. This is only needed for file sessions.
+    | are free to provide another location where they should be stored.
     |
     */
 
@@ -72,33 +73,35 @@ return [
     |
     */
 
-    'connection' => env('SESSION_CONNECTION', null),
+    'connection' => env('SESSION_CONNECTION'),
 
     /*
     |--------------------------------------------------------------------------
     | Session Database Table
     |--------------------------------------------------------------------------
     |
-    | When using the "database" session driver, you may specify the table we
+    | When using the "database" session driver, you may specify the table to
-    | should use to manage the sessions. Of course, a sensible default is
+    | be used to store sessions. Of course, a sensible default is defined
-    | provided for you; however, you are free to change this as needed.
+    | for you; however, you're welcome to change this to another table.
     |
     */
 
-    'table' => 'sessions',
+    'table' => env('SESSION_TABLE', 'sessions'),
 
     /*
     |--------------------------------------------------------------------------
     | Session Cache Store
     |--------------------------------------------------------------------------
     |
-    | When using the "apc", "memcached", or "dynamodb" session drivers you may
+    | When using one of the framework's cache driven session backends, you may
-    | list a cache store that should be used for these sessions. This value
+    | define the cache store which should be used to store the session data
-    | must match with one of the application's configured cache "stores".
+    | between requests. This must match one of your defined cache stores.
+    |
+    | Affects: "apc", "dynamodb", "memcached", "redis"
     |
     */
 
-    'store' => env('SESSION_STORE', null),
+    'store' => env('SESSION_STORE'),
 
     /*
     |--------------------------------------------------------------------------
@@ -118,9 +121,9 @@ return [
     | Session Cookie Name
     |--------------------------------------------------------------------------
     |
-    | Here you may change the name of the cookie used to identify a session
+    | Here you may change the name of the session cookie that is created by
-    | instance by ID. The name specified here will get used every time a
+    | the framework. Typically, you should not need to change this value
-    | new session cookie is created by the framework for every driver.
+    | since doing so does not grant a meaningful security improvement.
     |
     */
 
@@ -136,24 +139,24 @@ return [
     |
     | The session cookie path determines the path for which the cookie will
     | be regarded as available. Typically, this will be the root path of
-    | your application but you are free to change this when necessary.
+    | your application, but you're free to change this when necessary.
     |
     */
 
-    'path' => '/',
+    'path' => env('SESSION_PATH', '/'),
 
     /*
     |--------------------------------------------------------------------------
     | Session Cookie Domain
     |--------------------------------------------------------------------------
     |
-    | Here you may change the domain of the cookie used to identify a session
+    | This value determines the domain and subdomains the session cookie is
-    | in your application. This will determine which domains the cookie is
+    | available to. By default, the cookie will be available to the root
-    | available to in your application. A sensible default has been set.
+    | domain and all subdomains. Typically, this shouldn't be changed.
     |
     */
 
-    'domain' => env('SESSION_DOMAIN', null),
+    'domain' => env('SESSION_DOMAIN'),
 
     /*
     |--------------------------------------------------------------------------
@@ -162,11 +165,11 @@ return [
     |
     | By setting this option to true, session cookies will only be sent back
     | to the server if the browser has a HTTPS connection. This will keep
-    | the cookie from being sent to you if it can not be done securely.
+    | the cookie from being sent to you when it can't be done securely.
     |
     */
 
-    'secure' => env('SESSION_SECURE_COOKIE', false),
+    'secure' => env('SESSION_SECURE_COOKIE'),
 
     /*
     |--------------------------------------------------------------------------
@@ -175,11 +178,11 @@ return [
     |
     | Setting this value to true will prevent JavaScript from accessing the
     | value of the cookie and the cookie will only be accessible through
-    | the HTTP protocol. You are free to modify this option if needed.
+    | the HTTP protocol. It's unlikely you should disable this option.
     |
     */
 
-    'http_only' => true,
+    'http_only' => env('SESSION_HTTP_ONLY', true),
 
     /*
     |--------------------------------------------------------------------------
@@ -188,12 +191,27 @@ return [
     |
     | This option determines how your cookies behave when cross-site requests
     | take place, and can be used to mitigate CSRF attacks. By default, we
-    | do not enable this as other CSRF protection services are in place.
+    | will set this value to "lax" to permit secure cross-site requests.
     |
-    | Supported: "lax", "strict"
+    | See: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#samesitesamesite-value
+    |
+    | Supported: "lax", "strict", "none", null
     |
     */
 
-    'same_site' => null,
+    'same_site' => env('SESSION_SAME_SITE', 'lax'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Partitioned Cookies
+    |--------------------------------------------------------------------------
+    |
+    | Setting this value to true will tie the cookie to the top-level site for
+    | a cross-site context. Partitioned cookies are accepted by the browser
+    | when flagged "secure" and the Same-Site attribute is set to "none".
+    |
+    */
+
+    'partitioned' => env('SESSION_PARTITIONED_COOKIE', false),
 
 ];

database/migrations/2019_08_19_000000_create_failed_jobs_table.php

@@ -4,17 +4,18 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateFailedJobsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
      *
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('failed_jobs', function (Blueprint $table) {
-            $table->bigIncrements('id');
+            $table->id();
+			$table->string('uuid')->unique();
             $table->text('connection');
             $table->text('queue');
             $table->longText('payload');
@@ -28,8 +29,8 @@ class CreateFailedJobsTable extends Migration
      *
      * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('failed_jobs');
     }
-}
+};

database/migrations/2019_11_10_120537_create_jobs_table.php

@@ -4,14 +4,14 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateJobsTable extends Migration
+return new class extends Migration
 {
     /**
      * Run the migrations.
      *
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('jobs', function (Blueprint $table) {
             $table->bigIncrements('id');
@@ -29,8 +29,8 @@ class CreateJobsTable extends Migration
      *
      * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('jobs');
     }
-}
+};

package.json

@@ -1,21 +1,13 @@
 {
     "private": true,
+    "type": "module",
     "scripts": {
-        "dev": "npm run development",
+        "dev": "vite",
-        "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "build": "vite build"
-        "watch": "npm run development -- --watch",
-        "watch-poll": "npm run watch -- --watch-poll",
-        "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "prod": "npm run production",
-        "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
     },
     "devDependencies": {
-        "axios": "^0.19",
+        "axios": "^1.6.4",
-        "cross-env": "^5.1",
+        "laravel-vite-plugin": "^1.0",
-        "laravel-mix": "^4.0.7",
+        "vite": "^5.0"
-        "lodash": "^4.17.13",
-        "resolve-url-loader": "^2.3.1",
-        "sass": "^1.15.2",
-        "sass-loader": "^7.1.0"
     }
 }

phpunit.xml

@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         backupStaticAttributes="false"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          colors="true"
-         convertErrorsToExceptions="true"
+>
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
     <testsuites>
         <testsuite name="Unit">
-            <directory suffix="Test.php">./tests/Unit</directory>
+            <directory>tests/Unit</directory>
         </testsuite>
-
         <testsuite name="Feature">
-            <directory suffix="Test.php">./tests/Feature</directory>
+            <directory>tests/Feature</directory>
         </testsuite>
     </testsuites>
-    <filter>
+    <source>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+        <include>
-            <directory suffix=".php">./app</directory>
+            <directory>app</directory>
-        </whitelist>
+        </include>
-    </filter>
+    </source>
     <php>
-        <server name="APP_ENV" value="testing"/>
+        <env name="APP_ENV" value="testing"/>
-        <server name="BCRYPT_ROUNDS" value="4"/>
+        <env name="APP_MAINTENANCE_DRIVER" value="file"/>
-        <server name="CACHE_DRIVER" value="array"/>
+        <env name="BCRYPT_ROUNDS" value="4"/>
-        <server name="MAIL_DRIVER" value="array"/>
+        <env name="CACHE_STORE" value="array"/>
-        <server name="QUEUE_CONNECTION" value="sync"/>
+        <!-- <env name="DB_CONNECTION" value="sqlite"/> -->
-        <server name="SESSION_DRIVER" value="array"/>
+        <!-- <env name="DB_DATABASE" value=":memory:"/> -->
+        <env name="MAIL_MAILER" value="array"/>
+        <env name="PULSE_ENABLED" value="false"/>
+        <env name="QUEUE_CONNECTION" value="sync"/>
+        <env name="SESSION_DRIVER" value="array"/>
+        <env name="TELESCOPE_ENABLED" value="false"/>
     </php>
 </phpunit>

public/index.php

@@ -1,60 +1,17 @@
 <?php
 
-/**
+use Illuminate\Http\Request;
- * Laravel - A PHP Framework For Web Artisans
- *
- * @package  Laravel
- * @author   Taylor Otwell <taylor@laravel.com>
- */
 
 define('LARAVEL_START', microtime(true));
 
-/*
+// Determine if the application is in maintenance mode...
-|--------------------------------------------------------------------------
+if (file_exists($maintenance = __DIR__.'/../storage/framework/maintenance.php')) {
-| Register The Auto Loader
+    require $maintenance;
-|--------------------------------------------------------------------------
+}
-|
-| Composer provides a convenient, automatically generated class loader for
-| our application. We just need to utilize it! We'll simply require it
-| into the script here so that we don't have to worry about manual
-| loading any of our classes later on. It feels great to relax.
-|
-*/
 
+// Register the Composer autoloader...
 require __DIR__.'/../vendor/autoload.php';
 
-/*
+// Bootstrap Laravel and handle the request...
-|--------------------------------------------------------------------------
+(require_once __DIR__.'/../bootstrap/app.php')
-| Turn On The Lights
+    ->handleRequest(Request::capture());
-|--------------------------------------------------------------------------
-|
-| We need to illuminate PHP development, so let us turn on the lights.
-| This bootstraps the framework and gets it ready for use, then it
-| will load up this application so that we can run it and send
-| the responses back to the browser and delight our users.
-|
-*/
-
-$app = require_once __DIR__.'/../bootstrap/app.php';
-
-/*
-|--------------------------------------------------------------------------
-| Run The Application
-|--------------------------------------------------------------------------
-|
-| Once we have the application, we can handle the incoming request
-| through the kernel, and send the associated response back to
-| the client's browser allowing them to enjoy the creative
-| and wonderful application we have prepared for them.
-|
-*/
-
-$kernel = $app->make(Illuminate\Contracts\Http\Kernel::class);
-
-$response = $kernel->handle(
-    $request = Illuminate\Http\Request::capture()
-);
-
-$response->send();
-
-$kernel->terminate($request, $response);

resources/views/home.blade.php

@@ -17,21 +17,4 @@
 	<div class="row">
 		@include('widgets.summary.boxes')
 	</div>
-
-	{{--
-	<div class="row">
-		<div class="col-12">
-			<div class="card">
-				<div class="card-header">
-					<h3 class="card-title"></h3>
-				</div>
-
-				<!-- /.card-header -->
-				<div class="card-body">
-
-				</div>
-			</div>
-		</div>
-	</div>
-	--}}
 @endsection

resources/views/vendor/adminlte/layouts/partials/sidebarmenu.blade.php

@@ -2,26 +2,26 @@
 
 <li class="nav-item">
 	<a href="{{ url('home') }}" class="nav-link @if(preg_match('#^home/[0-9]+$#',request()->path()))active @endif">
-		<i class="nav-icon fa fa-home"></i> <p>Home</p>
+		<i class="nav-icon fas fa-home"></i> <p>Home</p>
 	</a>
 </li>
 
 <li class="pt-3 nav-item has-treeview @if(preg_match('#^p/(duplicate|delete)s#',request()->path()))menu-open @else menu-closed @endif">
 	<a href="#" class="nav-link @if(preg_match('#^/(duplicate|delete)s/[0-9]+#',request()->path())) active @endif">
-		<i class="nav-icon fa fa-camera"></i> <p>PHOTOS<i class="fa fa-angle-left right"></i></p>
+		<i class="nav-icon fas fa-camera"></i> <p>PHOTOS<i class="fas fa-angle-left right"></i></p>
 	</a>
 
 	<ul class="nav nav-treeview">
 		<li class="nav-item">
 			<a href="{{ url('p/duplicates') }}" class="nav-link @if(preg_match('#^p/duplicates$#',request()->path())) active @endif">
-				<i class="fa fa-link nav-icon"></i> <p>Duplicate</p>
+				<i class="fas fa-link nav-icon"></i> <p>Duplicate</p>
 				<span class="badge badge-warning right">{{ \App\Models\Photo::duplicates()->count() }}</span>
 			</a>
 		</li>
 
 		<li class="nav-item">
 			<a href="{{ url('p/deletes') }}" class="nav-link @if(preg_match('#^p/deletes$#',request()->path())) active @endif">
-				<i class="fa fa-calendar nav-icon"></i> <p>Delete</p>
+				<i class="fas fa-calendar nav-icon"></i> <p>Delete</p>
 				<span class="badge badge-danger right">{{ \App\Models\Photo::where('remove',TRUE)->count() }}</span>
 			</a>
 		</li>
@@ -30,20 +30,20 @@
 
 <li class="pt-3 nav-item has-treeview @if(preg_match('#^v/(duplicate|delete)s#',request()->path()))menu-open @else menu-closed @endif">
 	<a href="#" class="nav-link @if(preg_match('#^/(duplicate|delete)s/[0-9]+#',request()->path())) active @endif">
-		<i class="nav-icon fa fa-video-camera"></i> <p>VIDEOS<i class="fa fa-angle-left right"></i></p>
+		<i class="nav-icon fas fa-video"></i> <p>VIDEOS<i class="fas fa-angle-left right"></i></p>
 	</a>
 
 	<ul class="nav nav-treeview">
 		<li class="nav-item">
 			<a href="{{ url('v/duplicates') }}" class="nav-link @if(preg_match('#^v/duplicates$#',request()->path())) active @endif">
-				<i class="fa fa-link nav-icon"></i> <p>Duplicate</p>
+				<i class="fas fa-link nav-icon"></i> <p>Duplicate</p>
 				<span class="badge badge-warning right">{{ \App\Models\Video::duplicates()->count() }}</span>
 			</a>
 		</li>
 
 		<li class="nav-item">
 			<a href="{{ url('v/deletes') }}" class="nav-link @if(preg_match('#^v/deletes$#',request()->path())) active @endif">
-				<i class="fa fa-calendar nav-icon"></i> <p>Delete</p>
+				<i class="fas fa-calendar nav-icon"></i> <p>Delete</p>
 				<span class="badge badge-danger right">{{ \App\Models\Video::where('remove',TRUE)->count() }}</span>
 			</a>
 		</li>

resources/views/widgets/summary/boxes.blade.php

@@ -1,6 +1,6 @@
 <div class="col-12 col-sm-6 col-md-3">
 	<div class="info-box bg-gradient-info">
-		<span class="info-box-icon bg-info elevation-1"><i class="fa fa-camera"></i></span>
+		<span class="info-box-icon bg-info elevation-1"><i class="fas fa-camera"></i></span>
 
 		<div class="info-box-content">
 			<span class="info-box-text">Photos</span>
@@ -23,7 +23,7 @@
 
 <div class="col-12 col-sm-6 col-md-3">
 	<div class="info-box bg-gradient-info">
-		<span class="info-box-icon bg-info elevation-1"><i class="fa fa-video-camera"></i></span>
+		<span class="info-box-icon bg-info elevation-1"><i class="fas fa-video"></i></span>
 
 		<div class="info-box-content">
 			<span class="info-box-text">Videos</span>

routes/api.php

@@ -1,18 +0,0 @@
-<?php
-
-use Illuminate\Http\Request;
-
-/*
-|--------------------------------------------------------------------------
-| API Routes
-|--------------------------------------------------------------------------
-|
-| Here is where you can register API routes for your application. These
-| routes are loaded by the RouteServiceProvider within a group which
-| is assigned the "api" middleware group. Enjoy building your API!
-|
-*/
-
-#Route::middleware('auth:api')->get('/user', function (Request $request) {
-#    return $request->user();
-#});

routes/console.php

@@ -1,18 +1,8 @@
 <?php
 
 use Illuminate\Foundation\Inspiring;
-
+use Illuminate\Support\Facades\Artisan;
-/*
-|--------------------------------------------------------------------------
-| Console Routes
-|--------------------------------------------------------------------------
-|
-| This file is where you may define all of your Closure based console
-| commands. Each Closure is bound to a command instance allowing a
-| simple approach to interacting with each command's IO methods.
-|
-*/
 
 Artisan::command('inspire', function () {
     $this->comment(Inspiring::quote());
-})->describe('Display an inspiring quote');
+})->purpose('Display an inspiring quote')->hourly();

routes/web.php

@@ -1,33 +1,45 @@
 <?php
 
-/*
+use Illuminate\Support\Facades\Route;
-|--------------------------------------------------------------------------
-| Web Routes
-|--------------------------------------------------------------------------
-|
-| Here is where you can register web routes for your application. These
-| routes are loaded by the RouteServiceProvider within a group which
-| contains the "web" middleware group. Now create something great!
-|
-*/
 
-Route::get('/home','HomeController@home');
+use App\Http\Controllers\{PhotoController,VideoController};
-Route::get('/p/deletes/{id?}','PhotoController@deletes')->where('id','[0-9]+');
+use App\Http\Controllers\Auth\LoginController;
-Route::get('/v/deletes/{id?}','VideoController@deletes')->where('id','[0-9]+');
-Route::get('/p/duplicates/{id?}','PhotoController@duplicates')->where('id','[0-9]+');
-Route::get('/v/duplicates/{id?}','VideoController@duplicates')->where('id','[0-9]+');
 
-Route::get('/p/info/{o}','PhotoController@info')->where('o','[0-9]+');
+Route::view('/home','home');
-Route::get('/v/info/{o}','VideoController@info')->where('o','[0-9]+');
+Route::get('/p/deletes/{id?}',[PhotoController::class,'deletes'])
-Route::get('/p/thumbnail/{o}','PhotoController@thumbnail')->where('o','[0-9]+');
+	->where('id','[0-9]+');
-Route::get('/p/view/{o}','PhotoController@view')->where('o','[0-9]+');
+Route::get('/v/deletes/{id?}',[VideoController::class,'deletes'])
-Route::get('/v/view/{o}','VideoController@view')->where('o','[0-9]+');
+	->where('id','[0-9]+');
+Route::get('/p/duplicates/{id?}',[PhotoController::class,'duplicates'])
+	->where('id','[0-9]+');
+Route::get('/v/duplicates/{id?}',[VideoController::class,'duplicates'])
+	->where('id','[0-9]+');
 
-Route::post('/p/delete/{o}','PhotoController@delete')->where('o','[0-9]+');
+Route::get('/p/info/{o}',[PhotoController::class,'info'])
-Route::post('/v/delete/{o}','VideoController@delete')->where('o','[0-9]+');
+	->where('o','[0-9]+');
-Route::post('/p/duplicates','PhotoController@duplicatesUpdate');
+Route::get('/v/info/{o}',[VideoController::class,'info'])
-Route::post('/v/duplicates','VideoController@duplicatesUpdate');
+	->where('o','[0-9]+');
-Route::post('/p/deletes','PhotoController@deletesUpdate');
+Route::get('/p/thumbnail/{o}',[PhotoController::class,'thumbnail'])
-Route::post('/v/deletes','VideoController@deletesUpdate');
+	->where('o','[0-9]+');
-Route::post('/p/undelete/{o}','PhotoController@undelete')->where('o','[0-9]+');
+Route::get('/p/view/{o}',[PhotoController::class,'view'])
-Route::post('/v/undelete/{o}','VideoController@undelete')->where('o','[0-9]+');
+	->where('o','[0-9]+');
+Route::get('/v/view/{o}',[VideoController::class,'view'])
+	->where('o','[0-9]+');
+
+Route::post('/p/delete/{o}',[PhotoController::class,'delete'])
+	->where('o','[0-9]+');
+Route::post('/v/delete/{o}',[VideoController::class,'delete'])
+	->where('o','[0-9]+');
+Route::post('/p/duplicates',[PhotoController::class,'duplicatesUpdate']);
+Route::post('/v/duplicates',[VideoController::class,'duplicatesUpdate']);
+Route::post('/p/deletes',[PhotoController::class,'deletesUpdate']);
+Route::post('/v/deletes',[VideoController::class,'deletesUpdate']);
+Route::post('/p/undelete/{o}',[PhotoController::class,'undelete'])
+	->where('o','[0-9]+');
+Route::post('/v/undelete/{o}',[VideoController::class,'undelete'])
+	->where('o','[0-9]+');
+
+Route::redirect('/','login');
+
+Route::get('/login',[LoginController::class,'showLoginForm'])
+	->name('login');

server.php

@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Laravel - A PHP Framework For Web Artisans
- *
- * @package  Laravel
- * @author   Taylor Otwell <taylor@laravel.com>
- */
-
-$uri = urldecode(
-    parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
-);
-
-// This file allows us to emulate Apache's "mod_rewrite" functionality from the
-// built-in PHP web server. This provides a convenient way to test a Laravel
-// application without having installed a "real" web server software here.
-if ($uri !== '/' && file_exists(__DIR__.'/public'.$uri)) {
-    return false;
-}
-
-require_once __DIR__.'/public/index.php';

webpack.mix.js

@@ -1,15 +0,0 @@
-const mix = require('laravel-mix');
-
-/*
- |--------------------------------------------------------------------------
- | Mix Asset Management
- |--------------------------------------------------------------------------
- |
- | Mix provides a clean, fluent API for defining some Webpack build steps
- | for your Laravel application. By default, we are compiling the Sass
- | file for the application as well as bundling up all the JS files.
- |
- */
-
-mix.js('resources/js/app.js', 'public/js')
-    .sass('resources/sass/app.scss', 'public/css');