updates

Bump laravel/framework from 10.30.0 to 10.30.1

.env.example

@@ -3,7 +3,6 @@ APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost
-APP_URL_API="${APP_URL}/api/"
 
 LOG_CHANNEL=stack
 LOG_DEPRECATIONS_CHANNEL=null
@@ -30,7 +29,7 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 MAIL_MAILER=smtp
-MAIL_HOST=mailhog
+MAIL_HOST=mailpit
 MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
@@ -52,6 +51,7 @@ PUSHER_PORT=443
 PUSHER_SCHEME=https
 PUSHER_APP_CLUSTER=mt1
 
+VITE_APP_NAME="${APP_NAME}"
 VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 VITE_PUSHER_HOST="${PUSHER_HOST}"
 VITE_PUSHER_PORT="${PUSHER_PORT}"

.eslintrc.js

@@ -1,21 +0,0 @@
-module.exports = {
-    env: {
-        node: true,
-    },
-    extends: [
-        "eslint:recommended",
-        "plugin:vue/vue3-recommended",
-        "prettier",
-        "plugin:jsdoc/recommended",
-        "plugin:@typescript-eslint/recommended",
-    ],
-    rules: {
-        "vue/multi-word-component-names": "off",
-        indent: ["error", 4],
-    },
-    plugins: ["jsdoc", "@typescript-eslint"],
-    parser: "vue-eslint-parser",
-    parserOptions: {
-        parser: "@typescript-eslint/parser",
-    },
-};

.gitattributes

@@ -1,4 +1,4 @@
-* text=auto
+* text=auto eol=lf
 
 *.blade.php diff=html
 *.css diff=css

.gitignore

@@ -1,240 +1,20 @@
-### Composer ###
+/.phpunit.cache
-composer.phar
+/node_modules
-/vendor/
+/public/build
-
+/public/hot
-# composer.lock
+/public/storage
-
+/storage/*.key
-### Laravel ###
+/vendor
-node_modules/
+.env
+.env.backup
+.env.production
+.phpunit.result.cache
+Homestead.json
+Homestead.yaml
+auth.json
 npm-debug.log
 yarn-error.log
-
+/.fleet
-# Laravel 4 specific
+/.idea
-bootstrap/compiled.php
+/.vscode
-app/storage/
-
-# Laravel 5 & Lumen specific
-public/storage
-public/hot
-
-# Laravel 5 & Lumen specific with changed public path
-public_html/storage
-public_html/hot
-
-storage/*.key
-.env
-Homestead.yaml
-Homestead.json
-/.vagrant
-.phpunit.result.cache
-
-### macOS ###
-# General
 .DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-### macOS Patch ###
-# iCloud generated files
-*.icloud
-
-### Node ###
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-.pnpm-debug.log*
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-*.lcov
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-jspm_packages/
-
-# Snowpack dependency directory (https://snowpack.dev/)
-web_modules/
-
-# TypeScript cache
-*.tsbuildinfo
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional stylelint cache
-.stylelintcache
-
-# Microbundle cache
-.rpt2_cache/
-.rts2_cache_cjs/
-.rts2_cache_es/
-.rts2_cache_umd/
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variable files
-.env.development.local
-.env.test.local
-.env.production.local
-.env.local
-
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-.parcel-cache
-
-# Next.js build output
-.next
-out
-
-# Nuxt.js build / generate output
-.nuxt
-dist
-
-# Gatsby files
-.cache/
-# Comment in the public line in if your project uses Gatsby and not Next.js
-# https://nextjs.org/blog/next-9-1#public-directory-support
-# public
-
-# vuepress build output
-.vuepress/dist
-
-# vuepress v2.x temp and cache directory
-.temp
-
-# Docusaurus cache and generated files
-.docusaurus
-
-# Serverless directories
-.serverless/
-
-# FuseBox cache
-.fusebox/
-
-# DynamoDB Local files
-.dynamodb/
-
-# TernJS port file
-.tern-port
-
-# Stores VSCode versions used for testing VSCode extensions
-.vscode-test
-
-# yarn v2
-.yarn/cache
-.yarn/unplugged
-.yarn/build-state.yml
-.yarn/install-state.gz
-.pnp.*
-
-### Node Patch ###
-# Serverless Webpack directories
-.webpack/
-
-# Optional stylelint cache
-
-# SvelteKit build / generate output
-.svelte-kit
-
-### VisualStudioCode ###
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-!.vscode/*.code-snippets
-
-# Local History for Visual Studio Code
-.history/
-
-# Built Visual Studio Code Extensions
-*.vsix
-
-### VisualStudioCode Patch ###
-# Ignore all local history of files
-.history
-.ionide
-
-### Vue ###
-# gitignore template for Vue.js projects
-#
-# Recommended template: Node.gitignore
-
-# TODO: where does this rule come from?
-docs/_book
-
-# TODO: where does this rule come from?
-test/
-
-### Vuejs ###
-# Recommended template: Node.gitignore
-
-dist/
-
-### This Project ###
-/public/uploads
-/public/build
-*.key

.prettierrc.json

@@ -1,4 +0,0 @@
-{
-    "bracketSameLine": true,
-    "tabWidth": 4
-}

.vscode/settings.json

@@ -1,18 +1,5 @@
 {
-    "editor.formatOnType": true,
+    "files.associations": {
-    "editor.formatOnSave": true,
+        "*.css": "tailwindcss"
-    "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
-    },
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "[vue]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "[javascript]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "[php]": {
-        // "editor.defaultFormatter": "bmewburn.vscode-intelephense-client"
-        "editor.defaultFormatter": "wongjn.php-sniffer"
     }
 }

README.md

@@ -1,7 +1,7 @@
 <p align="center"><a href="https://laravel.com" target="_blank"><img src="https://raw.githubusercontent.com/laravel/art/master/logo-lockup/5%20SVG/2%20CMYK/1%20Full%20Color/laravel-logolockup-cmyk-red.svg" width="400" alt="Laravel Logo"></a></p>
 
 <p align="center">
-<a href="https://travis-ci.org/laravel/framework"><img src="https://travis-ci.org/laravel/framework.svg" alt="Build Status"></a>
+<a href="https://github.com/laravel/framework/actions"><img src="https://github.com/laravel/framework/workflows/tests/badge.svg" alt="Build Status"></a>
 <a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/dt/laravel/framework" alt="Total Downloads"></a>
 <a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/v/laravel/framework" alt="Latest Stable Version"></a>
 <a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/l/laravel/framework" alt="License"></a>
@@ -31,23 +31,23 @@ If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Lar
 
 ## Laravel Sponsors
 
-We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell).
+We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the [Laravel Partners program](https://partners.laravel.com).
 
 ### Premium Partners
 
 - **[Vehikl](https://vehikl.com/)**
 - **[Tighten Co.](https://tighten.co)**
+- **[WebReinvent](https://webreinvent.com/)**
 - **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)**
 - **[64 Robots](https://64robots.com)**
-- **[Cubet Techno Labs](https://cubettech.com)**
-- **[Cyber-Duck](https://cyber-duck.co.uk)**
-- **[Many](https://www.many.co.uk)**
-- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)**
-- **[DevSquad](https://devsquad.com)**
 - **[Curotec](https://www.curotec.com/services/technologies/laravel/)**
+- **[Cyber-Duck](https://cyber-duck.co.uk)**
+- **[DevSquad](https://devsquad.com/hire-laravel-developers)**
+- **[Jump24](https://jump24.co.uk)**
+- **[Redberry](https://redberry.international/laravel/)**
+- **[Active Logic](https://activelogic.com)**
+- **[byte5](https://byte5.de)**
 - **[OP.GG](https://op.gg)**
-- **[WebReinvent](https://webreinvent.com/?utm_source=laravel&utm_medium=github&utm_campaign=patreon-sponsors)**
-- **[Lendio](https://lendio.com)**
 
 ## Contributing
 

app/Console/Kernel.php

@@ -9,23 +9,18 @@ class Kernel extends ConsoleKernel
 {
     /**
      * Define the application's command schedule.
-     *
-     * @param  \Illuminate\Console\Scheduling\Schedule $schedule The schedule.
-     * @return void
      */
-    protected function schedule(Schedule $schedule)
+    protected function schedule(Schedule $schedule): void
     {
         // $schedule->command('inspire')->hourly();
     }
 
     /**
      * Register the commands for the application.
-     *
-     * @return void
      */
-    protected function commands()
+    protected function commands(): void
     {
-        $this->load(__DIR__ . '/Commands');
+        $this->load(__DIR__.'/Commands');
 
         require base_path('routes/console.php');
     }

app/Enum/Enum.php

@@ -1,50 +0,0 @@
-<?php
-
-namespace App\Enum;
-
-use ReflectionClass;
-
-class Enum
-{
-    /**
-     * Caches reflections of enum subclasses.
-     *
-     * @var array<class-string<static>, ReflectionClass<static>>
-     */
-    public static $reflectionCache = [];
-
-
-    /**
-     * Returns a reflection of the enum subclass.
-     *
-     * @return ReflectionClass<static>
-     */
-    public static function getReflection(): ReflectionClass
-    {
-        $class = static::class;
-
-        return static::$reflectionCache[$class] ??= new ReflectionClass($class);
-    }
-
-
-    /**
-     * Returns the constants in the enum subclass
-     *
-     * @return array<static>
-     */
-    public static function getConstants(): array
-    {
-        return static::getReflection()->getConstants();
-    }
-
-
-    /**
-     * Returns the constants values in the enum subclass
-     *
-     * @return array<static>
-     */
-    public static function getConstantValues(): array
-    {
-        return array_values(static::getReflection()->getConstants());
-    }
-}

app/Enum/HttpResponseCodes.php

@@ -1,165 +0,0 @@
-<?php
-
-namespace App\Enum;
-
-class HttpResponseCodes extends Enum
-{
-    public const HTTP_CONTINUE                      = 100;
-    public const HTTP_SWITCHING_PROTOCOLS           = 101;
-    public const HTTP_PROCESSING                    = 102;
-
-    public const HTTP_OK                            = 200;
-    public const HTTP_CREATED                       = 201;
-    public const HTTP_ACCEPTED                      = 202;
-    public const HTTP_NON_AUTHORITATIVE_INFORMATION = 203;
-    public const HTTP_NO_CONTENT                    = 204;
-    public const HTTP_RESET_CONTENT                 = 205;
-    public const HTTP_PARTIAL_CONTENT               = 206;
-    public const HTTP_MULTI_STATUS                  = 207;
-
-    public const HTTP_ALREADY_REPORTED              = 208;
-
-    public const HTTP_IM_USED                       = 226;
-
-    public const HTTP_MULTIPLE_CHOICES              = 300;
-    public const HTTP_MOVED_PERMANENTLY             = 301;
-    public const HTTP_FOUND                         = 302;
-    public const HTTP_SEE_OTHER                     = 303;
-    public const HTTP_NOT_MODIFIED                  = 304;
-    public const HTTP_USE_PROXY                     = 305;
-    public const HTTP_RESERVED                      = 306;
-    public const HTTP_TEMPORARY_REDIRECT            = 307;
-    public const HTTP_PERMANENTLY_REDIRECT          = 308;
-
-    public const HTTP_BAD_REQUEST                   = 400;
-    public const HTTP_UNAUTHORIZED                  = 401;
-    public const HTTP_PAYMENT_REQUIRED              = 402;
-    public const HTTP_FORBIDDEN                     = 403;
-    public const HTTP_NOT_FOUND                     = 404;
-    public const HTTP_METHOD_NOT_ALLOWED            = 405;
-    public const HTTP_NOT_ACCEPTABLE                = 406;
-    public const HTTP_PROXY_AUTHENTICATION_REQUIRED = 407;
-    public const HTTP_REQUEST_TIMEOUT               = 408;
-    public const HTTP_CONFLICT                      = 409;
-    public const HTTP_GONE                          = 410;
-    public const HTTP_LENGTH_REQUIRED               = 411;
-    public const HTTP_PRECONDITION_FAILED           = 412;
-    public const HTTP_REQUEST_ENTITY_TOO_LARGE      = 413;
-    public const HTTP_REQUEST_URI_TOO_LONG          = 414;
-    public const HTTP_UNSUPPORTED_MEDIA_TYPE        = 415;
-    public const HTTP_REQUESTED_RANGE_NOT_SATISFIABLE   = 416;
-    public const HTTP_EXPECTATION_FAILED            = 417;
-    public const HTTP_I_AM_A_TEAPOT                 = 418;
-
-    public const HTTP_MISDIRECTED_REQUEST           = 421;
-    public const HTTP_UNPROCESSABLE_ENTITY          = 422;
-    public const HTTP_LOCKED                        = 423;
-    public const HTTP_FAILED_DEPENDENCY             = 424;
-    public const HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL = 425;
-    public const HTTP_UPGRADE_REQUIRED              = 426;
-    public const HTTP_PRECONDITION_REQUIRED         = 428;
-    public const HTTP_TOO_MANY_REQUESTS             = 429;
-    public const HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
-    public const HTTP_UNAVAILABLE_FOR_LEGAL_REASONS = 451;
-
-    public const HTTP_INTERNAL_SERVER_ERROR         = 500;
-    public const HTTP_NOT_IMPLEMENTED               = 501;
-    public const HTTP_BAD_GATEWAY                   = 502;
-    public const HTTP_SERVICE_UNAVAILABLE           = 503;
-    public const HTTP_GATEWAY_TIMEOUT               = 504;
-    public const HTTP_VERSION_NOT_SUPPORTED         = 505;
-    public const HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL  = 506;
-    public const HTTP_INSUFFICIENT_STORAGE          = 507;
-    public const HTTP_LOOP_DETECTED                 = 508;
-    public const HTTP_NOT_EXTENDED                  = 510;
-    public const HTTP_NETWORK_AUTHENTICATION_REQUIRED   = 511;
-
-    /**
-     * HTTP Response Messages
-     * @var string[]
-     */
-    public static $statusTexts = [
-        100 => 'Continue.',
-        101 => 'Switching Protocols.',
-        102 => 'Processing.',
-    // RFC2518
-        200 => 'OK.',
-        201 => 'Created.',
-        202 => 'Accepted.',
-        203 => 'Non-Authoritative Information.',
-        204 => 'No Content.',
-        205 => 'Reset Content.',
-        206 => 'Partial Content.',
-        207 => 'Multi-Status.',
-    // RFC4918
-        208 => 'Already Reported.',
-    // RFC5842
-        226 => 'IM Used.',
-    // RFC3229
-        300 => 'Multiple Choices.',
-        301 => 'Moved Permanently.',
-        302 => 'Found.',
-        303 => 'See Other.',
-        304 => 'Not Modified.',
-        305 => 'Use Proxy.',
-        307 => 'Temporary Redirect.',
-        308 => 'Permanent Redirect.',
-    // RFC7238
-        400 => 'Bad Request.',
-        401 => 'Unauthorized.',
-        402 => 'Payment Required.',
-        403 => 'Forbidden.',
-        404 => 'Not Found.',
-        405 => 'Method Not Allowed.',
-        406 => 'Not Acceptable.',
-        407 => 'Proxy Authentication Required.',
-        408 => 'Request Timeout.',
-        409 => 'Conflict.',
-        410 => 'Gone.',
-        411 => 'Length Required.',
-        412 => 'Precondition Failed.',
-        413 => 'Payload Too Large.',
-        414 => 'URI Too Long.',
-        415 => 'Unsupported Media Type.',
-        416 => 'Range Not Satisfiable.',
-        417 => 'Expectation Failed.',
-        418 => 'I\'m a teapot.',
-    // RFC2324
-        421 => 'Misdirected Request.',
-    // RFC7540
-        422 => 'Unprocessable Entity.',
-    // RFC4918
-        423 => 'Locked.',
-    // RFC4918
-        424 => 'Failed Dependency.',
-    // RFC4918
-        425 => 'Reserved for WebDAV advanced collections expired proposal.',
-    // RFC2817
-        426 => 'Upgrade Required.',
-    // RFC2817
-        428 => 'Precondition Required.',
-    // RFC6585
-        429 => 'Too Many Requests.',
-    // RFC6585
-        431 => 'Request Header Fields Too Large.',
-    // RFC6585
-        451 => 'Unavailable For Legal Reasons.',
-    // RFC7725
-        500 => 'Internal Server Error.',
-        501 => 'Not Implemented.',
-        502 => 'Bad Gateway.',
-        503 => 'Service Unavailable.',
-        504 => 'Gateway Timeout.',
-        505 => 'HTTP Version Not Supported.',
-        506 => 'Variant Also Negotiates.',
-    // RFC2295
-        507 => 'Insufficient Storage.',
-    // RFC4918
-        508 => 'Loop Detected.',
-    // RFC5842
-        510 => 'Not Extended.',
-    // RFC2774
-        511 => 'Network Authentication Required.',
-    // RFC6585
-    ];
-}

app/Exceptions/Handler.php

@@ -2,36 +2,13 @@
 
 namespace App\Exceptions;
 
-use App\Enum\HttpResponseCodes;
-use Exception;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Throwable;
-use PDOException;
-use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class Handler extends ExceptionHandler
 {
     /**
-     * A list of exception types with their corresponding custom log levels.
+     * The list of the inputs that are never flashed to the session on validation exceptions.
-     *
-     * @var array<class-string<\Throwable>, \Psr\Log\LogLevel::*>
-     */
-    protected $levels = [
-        //
-    ];
-
-    /**
-     * A list of the exception types that are not reported.
-     *
-     * @var array<int, class-string<\Throwable>>
-     */
-    protected $dontReport = [
-        //
-    ];
-
-    /**
-     * A list of the inputs that are never flashed to the session on validation exceptions.
      *
      * @var array<int, string>
      */
@@ -41,43 +18,11 @@ class Handler extends ExceptionHandler
         'password_confirmation',
     ];
 
-
     /**
      * Register the exception handling callbacks for the application.
-     *
-     * @return void
      */
-    public function register()
+    public function register(): void
     {
-        // $this->renderable(function (HttpException $e, $request) {
-        //     if ($request->is('api/*')) {
-        //         $message = $e->getMessage();
-        //         if ($message === '') {
-        //             $message = HttpResponseCodes::$statusTexts[$e->getStatusCode()];
-        //         }
-
-        //         return response()->json([
-        //             'message' => $message
-        //         ], $e->getStatusCode());
-        //     }
-        // });
-
-        $this->renderable(function (NotFoundHttpException $e, $request) {
-            if ($request->is('api/*') === true) {
-                return response()->json([
-                    'message' => 'Resource not found'
-                ], 404);
-            }
-        });
-
-        $this->renderable(function (PDOException $e, $request) {
-            if ($request->is('api/*') === true) {
-                return response()->json([
-                    'message' => 'The server is currently unavailable'
-                ], 503);
-            }
-        });
-
         $this->reportable(function (Throwable $e) {
             //
         });

app/Filters/AuditFilter.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Filters;
-
-use Illuminate\Support\Collection;
-
-class AuditFilter
-{
-    // public static function filter(Collection $collection): array
-    // {
-    //     $collection->transform(function ($item, $key) {
-    //         $row = $item->toArray();
-
-    //         unset($row['user_type']);
-    //         unset($row['auditable_type']);
-
-    //         if (array_key_exists('password', $row['old_values'])) {
-    //             $row['old_values']['password'] = '###';
-    //         }
-    //         if (array_key_exists('password', $row['new_values'])) {
-    //             $row['new_values']['password'] = '###';
-    //         }
-
-    //         return $row;
-    //     });
-
-    //     return $collection->toArray();
-    // }
-}

app/Filters/EventFilter.php

@@ -1,65 +0,0 @@
-<?php
-
-namespace App\Filters;
-
-use App\Models\Event;
-use Carbon\Carbon;
-use Illuminate\Contracts\Database\Eloquent\Builder;
-
-class EventFilter extends FilterAbstract
-{
-    /**
-     * Class name of Model
-     * @var string
-     */
-    protected $class = '\App\Models\Event';
-
-    /**
-     * Default column sorting (prefix with - for descending)
-     *
-     * @var string|array
-     */
-    protected $defaultSort = '-start_at';
-
-    /**
-     * Filter columns for q param
-     *
-     * @var string|array
-     */
-    protected $q = [
-        '_' => ['title','content'],
-        'location' => ['location','address'],
-    ];
-
-
-    /**
-     * Determine if the user can view the media model
-     *
-     * @param Event $event The event instance.
-     * @param mixed $user  The current logged in user.
-     * @return boolean
-     */
-    protected function viewable(Event $event, mixed $user)
-    {
-        return (strcasecmp($event->status, 'draft') !== 0 && $event->publish_at <= now())
-            || $user?->hasPermission('admin/events') === true;
-    }
-
-    /**
-     * Determine the prebuild query to limit results
-     *
-     * @param EloquentBuilder $builder The builder instance.
-     * @param mixed           $user    The current logged in user.
-     * @return EloquentBuilder|null
-     */
-    protected function prebuild(Builder $builder, mixed $user)
-    {
-        if (
-            $user?->hasPermission('admin/events') !== true
-        ) {
-            return $builder
-                ->where('status', '!=', 'draft')
-                ->where('publish_at', '<=', now());
-        }
-    }
-}

app/Filters/FilterAbstract.php

@@ -1,596 +0,0 @@
-<?php
-
-namespace App\Filters;
-
-use Doctrine\DBAL\Exception;
-use Doctrine\DBAL\Schema\SchemaException;
-use ReflectionClass;
-use RuntimeException;
-use InvalidArgumentException;
-use Illuminate\Http\Request;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Str;
-use Schema;
-
-abstract class FilterAbstract
-{
-    /**
-     * The model class to filter
-     *
-     * @var mixed
-     */
-    protected $class;
-
-    /**
-     * The filter request
-     *
-     * @var \Illuminate\Http\Request
-     */
-    protected $request;
-
-    /**
-     * The models table
-     *
-     * @var string
-     */
-    protected $table = '';
-
-    /**
-     * Array of columns that can be filtered by the api
-     *
-     * @var array
-     */
-    protected $filterable = null;
-
-    /**
-     * Default column sorting (prefix with - for descending)
-     *
-     * @var string|array
-     */
-    protected $defaultSort = 'id';
-
-    /**
-     * Default collection result limit
-     *
-     * @var integer
-     */
-    protected $defaultLimit = 50;
-
-    /**
-     * Found records from query
-     * @var integer
-     */
-    protected $foundTotal = 0;
-
-    /**
-     * Maximum collection result limit
-     *
-     * @var integer
-     */
-    protected $maxLimit = 100;
-
-    /**
-     * Only return these attributes in the results
-     * (minus any excludes)
-     *
-     * @var array
-     */
-    protected $only = [];
-
-    /**
-     * Exclude these attributes from the results
-     *
-     * @var array
-     */
-    protected $exclude = [];
-
-    /**
-     * Filter columns for q param
-     *
-     * @var string|array
-     */
-    protected $q = [];
-
-
-    /**
-     * Filter constructor.
-     *
-     * @param \Illuminate\Http\Request $request Request object.
-     */
-    public function __construct(Request $request)
-    {
-        $this->request = $request;
-    }
-
-    /**
-     * Only include the specified attributes in the results.
-     *
-     * @param string|array $only Only return these attributes.
-     * @return void
-     */
-    public function only(mixed $only)
-    {
-        if (is_array($only) === true) {
-            $this->only = $only;
-        } else {
-            $this->only = [$only];
-        }
-    }
-
-    /**
-     * Exclude the specified attributes in the results.
-     *
-     * @param string|array $exclude Attributes to exclude.
-     * @return void
-     */
-    public function exclude(mixed $exclude)
-    {
-        if (is_array($exclude) === true) {
-            $this->exclude = $exclude;
-        } else {
-            $this->exclude = [$exclude];
-        }
-    }
-
-    /**
-     * Check if the model is viewable by the user
-     *
-     * @param mixed $model Model instance.
-     * @param mixed $user  Current user.
-     * @return boolean
-     */
-    // protected function viewable(mixed $model, mixed $user)
-    // {
-    //     return true;
-    // }
-
-    /**
-     * Prepend action to the builder to limit the results
-     *
-     * @param Builder $builder Builder instance.
-     * @param mixed   $user    Current user.
-     * @return Builder|null
-     */
-    // protected function prebuild(Builder $builder, mixed $user)
-    // {
-    //     return $builder;
-    // }
-
-
-    /**
-     * Return an array of attributes visible in the results
-     *
-     * @param array     $attributes Attributes currently visible.
-     * @param User|null $user       Current logged in user or null.
-     * @return mixed
-     */
-    protected function seeAttributes(array $attributes, mixed $user)
-    {
-        return $attributes;
-    }
-
-    /**
-     * Apply all the requested filters if available.
-     *
-     * @param Model $model Model object to filter. If null create query.
-     * @return Builder|Model
-     */
-    public function filter(Model $model = null)
-    {
-        $this->foundTotal = 0;
-
-        $builder = $this->class::query();
-
-        /* Get the related model */
-        $classModel = $model;
-        if ($model === null) {
-            $classModel = $builder->getModel();
-        }
-
-        /* Get table name */
-        if ($this->table === '') {
-            if ($model === null) {
-                $this->table = $classModel->getTable();
-            } else {
-                $this->table = $model->getTable();
-            }
-        }
-
-        /* Run query prebuilder or viewable */
-        if ($model === null) {
-            if (method_exists($this, 'prebuild') === true) {
-                $prebuilder = $this->prebuild($builder, $this->request->user());
-                if ($prebuilder instanceof Builder) {
-                    $builder = $prebuilder;
-                }
-            }
-        } else {
-            if (method_exists($this, 'viewable') === true) {
-                if ($this->viewable($model, $this->request->user()) === false) {
-                    return null;
-                }
-            }
-        }
-
-        /* Get attributes from table or use 'only' */
-        $attributes = [];
-        if (is_array($this->only) === true && count($this->only) > 0) {
-            $attributes = $this->only;
-        } else {
-            $attributes = Schema::getColumnListing($this->table);
-        }
-
-        /* Run attribute modifiers*/
-        $modifiedAttribs = $this->seeAttributes($attributes, $this->request->user());
-        if (is_array($modifiedAttribs) === true) {
-            $attributes = $modifiedAttribs;
-        }
-
-        foreach ($attributes as $key => $column) {
-            $method = 'see' . Str::studly($column) . 'Attribute';
-            if (
-                method_exists($this, $method) === true &&
-                $this->$method($this->request->user()) === false
-            ) {
-                unset($attributes[$key]);
-            }
-        }
-
-        if (is_array($this->exclude) === true && count($this->exclude) > 0) {
-            $attributes = array_diff($attributes, $this->exclude);
-        }
-
-        /* Setup attributes and appends */
-        // $attributesAppends = array_merge($attributes, $classModel->getAppends());
-
-        /* Apply ?fields= request to attributes */
-        if ($this->request->has('fields') === true) {
-            $attributes = array_intersect($attributes, explode(',', $this->request->fields));
-        }
-
-        /* Hide remaining attributes in model (if present) and return */
-        if ($model !== null) {
-            // TODO: Also show $this->request->fields that are appends
-
-            $model->makeHidden(array_diff(Schema::getColumnListing($this->table), $attributes));
-            return $model;
-        }
-
-        /* Are there attributes left? */
-        if (count($attributes) === 0) {
-            $this->foundTotal = 0;
-            return new Collection();
-        }
-
-        /* apply select! */
-        $builder->select($attributes);
-
-        /* Setup filterables if not present */
-        if ($this->filterable === null) {
-            $this->filterable = $attributes;
-        }
-
-        /* Filter values */
-        $filterRequest = array_filter($this->request->only(array_intersect($attributes, $this->filterable)));
-        $this->builderArrayFilter($builder, $filterRequest);
-
-        if (is_array($this->q) === true && count($this->q) > 0) {
-            $qQueries = [];
-            foreach ($this->q as $key => $value) {
-                if (is_array($value) === true) {
-                    $qKey = $key === '_' ? '' : $key;
-                    foreach ($value as $subvalue) {
-                        $qQueries[$key][$subvalue] = $this->request->get("q" . $qKey);
-                    }
-                } elseif ($this->request->has("q") === true) {
-                    $qQueries['_'][$value] = $this->request->get("q");
-                }
-            }
-
-            foreach ($qQueries as $key => $value) {
-                $builder->where(function ($query) use ($value) {
-                    $this->builderArrayFilter($query, $value, 'or');
-                });
-            }
-        }//end if
-
-        /* Apply sorting */
-        $sortList = $this->defaultSort;
-        if ($this->request->has('sort') === true) {
-            $sortList = explode(',', $this->request->sort);
-        }
-
-        /* Transform sort list to array */
-        if (is_array($sortList) === false) {
-            if (strlen($sortList) > 0) {
-                $sortList = [$sortList];
-            } else {
-                $sortList = [];
-            }
-        }
-
-        /* Remove non-viewable attributes from sort list */
-        if (count($sortList) > 0) {
-            $sortList = array_filter($sortList, function ($item) use ($attributes) {
-                $parsedItem = $item;
-                if (substr($parsedItem, 0, 1) === '-') {
-                    $parsedItem = substr($parsedItem, 1);
-                }
-
-                return in_array($parsedItem, $attributes);
-            });
-        }
-
-        /* Do we have any sort element left? */
-        if (count($sortList) > 0) {
-            foreach ($sortList as $sortAttribute) {
-                $prefix = substr($sortAttribute, 0, 1);
-                $direction = 'asc';
-
-                if (in_array($prefix, ['-', '+']) === true) {
-                    $sortAttribute = substr($sortAttribute, 1);
-                    if ($prefix === '-') {
-                        $direction = 'desc';
-                    }
-                }
-
-                $builder->orderBy($sortAttribute, $direction);
-            }//end foreach
-        }//end if
-
-        /* save found count */
-        $this->foundTotal = $builder->count();
-
-        /* Apply result limit */
-        $limit = $this->defaultLimit;
-        if ($this->request->has('limit') === true) {
-            $limit = intval($this->request->limit);
-        }
-        if ($limit < 1) {
-            $limit = 1;
-        }
-        if ($limit > $this->maxLimit && $this->maxLimit !== 0) {
-            $limit = $this->maxLimit;
-        }
-
-        $builder->limit($limit);
-
-        /* Apply page offset */
-        if ($this->request->has('page') === true) {
-            $page = intval($this->request->page);
-            if ($page < 1) {
-                $page = 1;
-            }
-
-            $builder->offset((intval($this->request->page) - 1) * $limit);
-        }
-
-        /* run spot run */
-        $collection = $builder->get();
-
-        return $collection;
-    }
-
-    /**
-     * Filter content based on the filterRequest
-     * @param mixed  $builder        Builder object
-     * @param array  $filterRequest  Filter key/value
-     * @param string $defaultBoolean Default where boolean
-     * @return void
-     */
-    protected function builderArrayFilter(mixed $builder, array $filterRequest, string $defaultBoolean = 'and')
-    {
-        foreach ($filterRequest as $filterAttribute => $filterValue) {
-            $tags = [];
-            $boolean = $defaultBoolean;
-
-            $matches = preg_split('/(?<!\\\\)"/', $filterValue, -1, PREG_SPLIT_OFFSET_CAPTURE);
-            foreach ($matches as $idx => $match_info) {
-                if (($idx % 2) === true) {
-                    if (substr($filterValue, ($match_info[1] - 2), 1) === ',') {
-                        $tags[] = ['operator' => '', 'tag' => stripslashes(trim($match_info[0]))];
-                    } else {
-                        $tags[(count($tags) - 1)]['tag'] .= stripslashes(trim($match_info[0]));
-                    }
-                } else {
-                    $innerTags = [$match_info[0]];
-                    if (strpos($match_info[0], ',') !== false) {
-                        $innerTags = preg_split('/(?<!\\\\),/', $match_info[0]);
-                    }
-
-                    foreach ($innerTags as $tag) {
-                        $tag = stripslashes(trim($tag));
-                        if (strlen($tag) > 0) {
-                            $operator = '=';
-
-                            $single = substr($tag, 0, 1);
-                            $double = substr($tag . ' ', 0, 2); // add empty space incase len $tag < 2
-
-                            // check for operators at start
-                            if (in_array($double, ['!=', '<>', '><', '>=', '<=', '=>', '=<']) === true) {
-                                if ($double === '<>' || $double === '><') {
-                                    $double = '!=';
-                                } elseif ($double === '=>') {
-                                    $double = '>=';
-                                } elseif ($double === '=<') {
-                                    $double == '>=';
-                                }
-
-                                $operator = $double;
-                                $tag = substr($tag, 2);
-                            } else {
-                                if (in_array($single, ['=', '!', '>', '<', '~', '%']) === true) {
-                                    if ($single === '=') {
-                                        $single = '=='; // a single '=' is actually a double '=='
-                                    }
-
-                                    $operator = $single;
-                                    $tag = substr($tag, 1);
-                                }
-                            }//end if
-
-                            $tags[] = ['operator' => $operator, 'tag' => $tag];
-                        }//end if
-                    }//end foreach
-                }//end if
-            }//end foreach
-
-            if (count($tags) > 1) {
-                $boolean = 'or';
-            }
-
-            foreach ($tags as $tag_data) {
-                $operator = $tag_data['operator'];
-                $value = $tag_data['tag'];
-                $table = $this->table;
-                $column = $filterAttribute;
-
-                if (($dotPos = strpos($filterAttribute, '.')) !== false) {
-                    $table = substr($filterAttribute, 0, $dotPos);
-                    $column = substr($filterAttribute, ($dotPos + 1));
-                }
-
-                $columnType = DB::getSchemaBuilder()->getColumnType($table, $column);
-
-                if (
-                    in_array($columnType, ['tinyint', 'smallint', 'mediumint', 'int', 'integer', 'bigint',
-                        'decimal', 'float', 'double', 'real', 'double precision'
-                    ]) === true
-                ) {
-                    if (in_array($operator, ['=', '>', '<', '>=', '<=', '%', '!']) === false) {
-                        continue;
-                    }
-
-                    $columnType = 'numeric';
-                } elseif (in_array($columnType, ['date', 'time', 'datetime', 'timestamp', 'year']) === true) {
-                    if (in_array($operator, ['=', '>', '<', '>=', '<=', '!']) === false) {
-                        continue;
-                    }
-
-                    $columnType = 'datetime';
-                } elseif (
-                    in_array($columnType, ['string', 'char', 'varchar', 'timeblob', 'blob', 'mediumblob',
-                        'longblob', 'tinytext', 'text', 'mediumtext', 'longtext', 'enum'
-                    ]) === true
-                ) {
-                    if (in_array($operator, ['=', '==', '!', '!=', '~']) === false) {
-                        continue;
-                    }
-
-                    $columnType = 'text';
-
-                    if ($value === "''" || $value === '""') {
-                        $value = '';
-                    } elseif (strcasecmp($value, 'null') !== 0) {
-                        if ($operator === '!') {
-                            $operator = 'NOT LIKE';
-                            $value = '%' . $value . '%';
-                        } elseif ($operator === '=') {
-                            $operator = 'LIKE';
-                            $value = '%' . $value . '%';
-                        } elseif ($operator === '~') {
-                            $operator = 'SOUNDS LIKE';
-                        } elseif ($operator === '==') {
-                            $operator = '=';
-                        }
-                    }
-                } elseif ($columnType === 'boolean') {
-                    if (in_array($operator, ['=', '!']) === false) {
-                        continue;
-                    }
-
-                    if (strtolower($value) === 'true') {
-                        $value = 1;
-                    } elseif (strtolower($value) === 'false') {
-                        $value = 0;
-                    }
-                }//end if
-
-                $betweenSeperator = strpos($value, '<>');
-                if (
-                    $operator === '=' && $betweenSeperator !== false && in_array($columnType, ['numeric',
-                        'datetime'
-                    ]) === true
-                ) {
-                    $value = explode('<>', $value);
-                    $operator = '<>';
-                }
-
-                if ($operator !== '') {
-                    $this->builderWhere($builder, $table, $column, $operator, $value, $boolean);
-                }
-            }//end foreach
-        }//end foreach
-    }
-
-    /**
-     * Insert a where statement into the builder, taking the filter map into consideration
-     *
-     * @param Builder $builder  Builder instance.
-     * @param string  $table    Table name.
-     * @param string  $column   Column name.
-     * @param string  $operator Where operator.
-     * @param mixed   $value    Value to test.
-     * @param string  $boolean  Use Or comparison.
-     * @return void
-     * @throws RuntimeException Error applying statement.
-     * @throws InvalidArgumentException Error applying statement.
-     */
-    protected function builderWhere(
-        Builder &$builder,
-        string $table,
-        string $column,
-        string $operator,
-        mixed $value,
-        string $boolean
-    ) {
-        if (
-            (is_string($value) === true && $operator !== '<>') || (is_array($value) === true && count($value) === 2 &&
-            $operator === '<>')
-        ) {
-            if ($table !== '' && $table !== $this->table) {
-                $builder->whereHas($table, function ($query) use ($column, $operator, $value, $boolean) {
-                    if ($operator !== '<>') {
-                        if (strcasecmp($value, 'null') === 0) {
-                            if ($operator === '!') {
-                                $query->whereNotNull($column, $boolean);
-                            } else {
-                                $query->whereNull($column, $boolean);
-                            }
-                        } else {
-                            $query->where($column, $operator, $value, $boolean);
-                        }
-                    } else {
-                        $query->whereBetween($column, $value, $boolean);
-                    }
-                });
-            } else {
-                if ($operator !== '<>') {
-                    if (strcasecmp($value, 'null') === 0) {
-                        if ($operator === '!') {
-                            $builder->whereNotNull($column, $boolean);
-                        } else {
-                            $builder->whereNull($column, $boolean);
-                        }
-                    } else {
-                        $builder->where($column, $operator, $value, $boolean);
-                    }
-                } else {
-                    $builder->whereBetween($column, $value, $boolean);
-                }
-            }//end if
-        }//end if
-    }
-
-    /**
-     * Return the found total of items
-     * @return integer
-     */
-    public function foundTotal()
-    {
-        return $this->foundTotal;
-    }
-}

app/Filters/MediaFilter.php

@@ -1,58 +0,0 @@
-<?php
-
-namespace App\Filters;
-
-use App\Models\Media;
-use Illuminate\Contracts\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
-
-class MediaFilter extends FilterAbstract
-{
-    /**
-     * Class name of Model
-     * @var string
-     */
-    protected $class = '\App\Models\Media';
-
-
-    /**
-     * Determine if the user can view the media model
-     *
-     * @param Media $media The media instance.
-     * @param mixed $user  The current logged in user.
-     * @return boolean
-     */
-    protected function viewable(Media $media, mixed $user)
-    {
-        if (empty($media->permission) === false) {
-            return ($user?->hasPermission('admin/media') || $user?->hasPermission($media->permission));
-        }
-
-        return true;
-    }
-
-    /**
-     * Determine the prebuild query to limit results
-     *
-     * @param EloquentBuilder $builder The builder instance.
-     * @param mixed           $user    The current logged in user.
-     * @return EloquentBuilder|null
-     */
-    protected function prebuild(Builder $builder, mixed $user)
-    {
-        if ($user === null) {
-            return $builder->whereNull('permission');
-        }
-    }
-
-    /**
-     * Show the permission attribute in the results
-     *
-     * @param User|null $user Current logged in user or null.
-     * @return boolean
-     */
-    protected function seePermissionAttribute(mixed $user)
-    {
-        return ($user?->hasPermission('admin/media'));
-    }
-}

app/Filters/PostFilter.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Filters;
-
-use App\Models\Post;
-use Carbon\Carbon;
-use Illuminate\Contracts\Database\Eloquent\Builder;
-
-class PostFilter extends FilterAbstract
-{
-    /**
-     * Class name of Model
-     * @var string
-     */
-    protected $class = '\App\Models\Post';
-
-    /**
-     * Default column sorting (prefix with - for descending)
-     *
-     * @var string|array
-     */
-    protected $defaultSort = '-publish_at';
-
-
-    /**
-     * Determine if the user can view the media model
-     *
-     * @param Post  $post The post instance.
-     * @param mixed $user The current logged in user.
-     * @return boolean
-     */
-    protected function viewable(Post $post, mixed $user)
-    {
-        if ($user?->hasPermission('admin/posts') !== true) {
-            return ($post->publish_at <= now());
-        }
-
-        return true;
-    }
-
-    /**
-     * Determine the prebuild query to limit results
-     *
-     * @param EloquentBuilder $builder The builder instance.
-     * @param mixed           $user    The current logged in user.
-     * @return EloquentBuilder|null
-     */
-    protected function prebuild(Builder $builder, mixed $user)
-    {
-        if ($user?->hasPermission('admin/posts') !== true) {
-            return $builder->where('publish_at', '<=', Carbon::now());
-        }
-    }
-}

app/Filters/SubscriptionFilter.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Filters;
-
-use App\Models\Subscriber;
-
-class SubscriptionFilter extends FilterAbstract
-{
-    /**
-     * The model class to filter
-     *
-     * @var mixed
-     */
-    protected $class = '\App\Models\Subscription';
-
-
-    /**
-     * Return an array of attributes visible in the results
-     *
-     * @param array     $attributes Attributes currently visible.
-     * @param User|null $user       Current logged in user or null.
-     * @return mixed
-     */
-    protected function seeAttributes(array $attributes, mixed $user)
-    {
-        if ($user?->hasPermission('admin/users') !== true) {
-            return ['id', 'email', 'confirmed_at'];
-        }
-    }
-}

app/Filters/UserFilter.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Filters;
-
-use App\Models\User;
-
-class UserFilter extends FilterAbstract
-{
-    /**
-     * The model class to filter
-     *
-     * @var mixed
-     */
-    protected $class = '\App\Models\User';
-
-
-    /**
-     * Return an array of attributes visible in the results
-     *
-     * @param array     $attributes Attributes currently visible.
-     * @param User|null $user       Current logged in user or null.
-     * @return mixed
-     */
-    protected function seeAttributes(array $attributes, mixed $user)
-    {
-        if ($user?->hasPermission('admin/users') !== true) {
-            return ['id', 'username'];
-        }
-    }
-}

app/Http/Controllers/Api/ApiController.php

@@ -1,172 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Enum\HttpResponseCodes;
-use App\Http\Controllers\Controller;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Str;
-
-class ApiController extends Controller
-{
-    /**
-     * Resource name
-     * @var string
-     */
-    protected $resourceName = '';
-
-
-    /**
-     * Return generic json response with the given data.
-     *
-     * @param array   $data        Response data.
-     * @param integer $respondCode Response status code.
-     * @param array   $headers     Response headers.
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function respondJson(array $data, int $respondCode = HttpResponseCodes::HTTP_OK, array $headers = [])
-    {
-        return response()->json($data, $respondCode, $headers);
-    }
-
-    /**
-     * Return forbidden message
-     *
-     * @param string $message Response message.
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function respondForbidden(string $message = 'You do not have permission to access the resource.')
-    {
-        return response()->json(['message' => $message], HttpResponseCodes::HTTP_FORBIDDEN);
-    }
-
-    /**
-     * Return forbidden message
-     *
-     * @param string $message Response message.
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function respondNotFound(string $message = 'The resource was not found.')
-    {
-        return response()->json(['message' => $message], HttpResponseCodes::HTTP_NOT_FOUND);
-    }
-
-    /**
-     * Return too large message
-     *
-     * @param string $message Response message.
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function respondTooLarge(string $message = 'The request entity is too large.')
-    {
-        return response()->json(['message' => $message], HttpResponseCodes::HTTP_REQUEST_ENTITY_TOO_LARGE);
-    }
-
-    /**
-     * Return no content
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function respondNoContent()
-    {
-        return response()->json([], HttpResponseCodes::HTTP_NO_CONTENT);
-    }
-
-    /**
-     * Return created
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function respondCreated()
-    {
-        return response()->json([], HttpResponseCodes::HTTP_CREATED);
-    }
-
-    /**
-     * Return single error message
-     *
-     * @param string  $message      Error message.
-     * @param integer $responseCode Resource code.
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function respondError(string $message, int $responseCode = HttpResponseCodes::HTTP_UNPROCESSABLE_ENTITY)
-    {
-        return response()->json([
-            'message' => $message
-        ], $responseCode);
-    }
-
-    /**
-     * Return formatted errors
-     *
-     * @param array   $errors       Error messages.
-     * @param integer $responseCode Resource code.
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function respondWithErrors(array $errors, int $responseCode = HttpResponseCodes::HTTP_UNPROCESSABLE_ENTITY)
-    {
-        $keys = array_keys($errors);
-        $error = $errors[$keys[0]];
-
-        if (count($keys) > 1) {
-            $additional_errors = (count($keys) - 1);
-            $error .= sprintf(' (and %d more %s', $additional_errors, Str::plural('error', $additional_errors));
-        }
-
-        return response()->json([
-            'message' => $error,
-            'errors' => $errors
-        ], $responseCode);
-    }
-
-    /**
-     * Return resource data
-     *
-     * @param array|Model|Collection $data        Resource data.
-     * @param array|null             $appendData  Data to append to response.
-     * @param integer                $respondCode Resource code.
-     * @return \Illuminate\Http\JsonResponse
-     */
-    protected function respondAsResource(
-        mixed $data,
-        mixed $appendData = null,
-        int $respondCode = HttpResponseCodes::HTTP_OK
-    ) {
-        if ($data === null || ($data instanceof Collection && $data->count() === 0)) {
-            return $this->respondNotFound();
-        }
-
-        $resourceName = $this->resourceName;
-
-        if ($this->resourceName === '') {
-            $resourceName = get_class($this);
-            $resourceName = substr($resourceName, (strrpos($resourceName, '\\') + 1));
-            $resourceName = substr($resourceName, 0, strpos($resourceName, 'Controller'));
-            $resourceName = strtolower($resourceName);
-        }
-
-        $is_multiple = true;
-
-        $dataArray = [];
-        if ($data instanceof Collection) {
-            $dataArray = $data->toArray();
-        } elseif (is_array($data) === true) {
-            $dataArray = $data;
-        } elseif ($data instanceof Model) {
-            $is_multiple = false;
-            $dataArray = $data->toArray();
-        }
-
-        $resource = [];
-        if ($is_multiple === true) {
-            $resource = [Str::plural($resourceName) => $dataArray];
-        } else {
-            $resource = [Str::singular($resourceName) => $dataArray];
-        }
-
-        if ($appendData !== null) {
-            $resource += $appendData;
-        }
-
-        return response()->json($resource, $respondCode);
-    }
-}

app/Http/Controllers/Api/AuthController.php

@@ -1,101 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Enum\HttpResponseCodes;
-use App\Http\Requests\AuthLoginRequest;
-use App\Models\User;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Http\JsonResponse;
-
-class AuthController extends ApiController
-{
-    /**
-     * Resource name
-     * @var string
-     */
-    protected $resourceName = 'user';
-
-
-    /**
-     * ApplicationController constructor.
-     */
-    public function __construct()
-    {
-        // $this->middleware('auth:sanctum')
-        //     ->only(['me']);
-    }
-
-    /**
-     * Current User details
-     *
-     * @param Request $request Current request data.
-     * @return JsonResponse
-     */
-    public function me(Request $request)
-    {
-        $user = $request->user()->makeVisible(['permissions']);
-        return $this->respondAsResource($user);
-    }
-
-    /**
-     * Login user with supplied creditials
-     *
-     * @param App\Http\Controllers\Api\AuthLoginRequest $request Created request data.
-     * @return JsonResponse|void
-     */
-    public function login(AuthLoginRequest $request)
-    {
-        $user = User::where('username', '=', $request->input('username'))->first();
-
-        if ($user !== null && Hash::check($request->input('password'), $user->password) === true) {
-            if ($user->email_verified_at === null) {
-                return $this->respondWithErrors([
-                    'username' => 'Email address has not been verified.'
-                ]);
-            }
-
-            if ($user->disabled === true) {
-                return $this->respondWithErrors([
-                    'username' => 'Account has been disabled.'
-                ]);
-            }
-
-            $token = $user->createToken('user_token')->plainTextToken;
-
-            $user->logins()->create([
-                'token' => $token,
-                'login' => now(),
-                'ip_address' => $request->ip(),
-                'user_agent' => $request->userAgent()
-            ]);
-
-            return $this->respondAsResource(
-                $user->makeVisible(['permissions']),
-                ['token' => $token]
-            );
-        }//end if
-
-        return $this->respondWithErrors([
-            'username' => 'Invalid username or password',
-            'password' => 'Invalid username or password',
-        ]);
-    }
-
-    /**
-     * Logout current user
-     *
-     * @param Request $request Current request data.
-     * @return JsonResponse
-     */
-    public function logout(Request $request)
-    {
-        $user = $request->user();
-
-        $user->logins()->where('token', $user->currentAccessToken())->update(['logout' => now()]);
-        $user->currentAccessToken()->delete();
-
-        return $this->respondNoContent();
-    }
-}

app/Http/Controllers/Api/ContactController.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Http\Requests\ContactSendRequest;
-use App\Jobs\SendEmailJob;
-use App\Mail\Contact;
-
-class ContactController extends ApiController
-{
-    /**
-     * Send the request to the site admin by email
-     *
-     * @param  \App\Http\Requests\User\ContactSendRequest $request Request data.
-     * @return \Illuminate\Http\Response
-     */
-    public function send(ContactSendRequest $request)
-    {
-        dispatch((new SendEmailJob(
-            config('contact.contact_address'),
-            new Contact(
-                $request->input('name'),
-                $request->input('email'),
-                $request->input('content')
-            )
-        )))->onQueue('mail');
-
-        return $this->respondCreated();
-    }
-}

app/Http/Controllers/Api/EventController.php

@@ -1,88 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Enum\HttpResponseCodes;
-use App\Filters\EventFilter;
-use App\Http\Requests\EventRequest;
-use App\Models\Event;
-use Illuminate\Http\Request;
-
-class EventController extends ApiController
-{
-    /**
-     * ApplicationController constructor.
-     */
-    public function __construct()
-    {
-        $this->middleware('auth:sanctum')
-        ->only(['store','update','destroy']);
-    }
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @param  EventFilter $filter The event filter.
-     * @return \Illuminate\Http\Response
-     */
-    public function index(EventFilter $filter)
-    {
-        return $this->respondAsResource(
-            $filter->filter(),
-            ['total' => $filter->foundTotal()]
-        );
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  EventRequest $request The event store request.
-     * @return \Illuminate\Http\Response
-     */
-    public function store(EventRequest $request)
-    {
-        $event = Event::create($request->all());
-        return $this->respondAsResource(
-            (new EventFilter($request))->filter($event),
-            null,
-            HttpResponseCodes::HTTP_CREATED
-        );
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  EventFilter       $filter The event filter.
-     * @param  \App\Models\Event $event  The specified event.
-     * @return \Illuminate\Http\Response
-     */
-    public function show(EventFilter $filter, Event $event)
-    {
-        return $this->respondAsResource($filter->filter($event));
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  EventRequest      $request The event update request.
-     * @param  \App\Models\Event $event   The specified event.
-     * @return \Illuminate\Http\Response
-     */
-    public function update(EventRequest $request, Event $event)
-    {
-        $event->update($request->all());
-        return $this->respondAsResource((new EventFilter($request))->filter($event));
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  \App\Models\Event $event The specified event.
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy(Event $event)
-    {
-        $event->delete();
-        return $this->respondNoContent();
-    }
-}

app/Http/Controllers/Api/MediaController.php

@@ -1,247 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Enum\HttpResponseCodes;
-use App\Filters\MediaFilter;
-use App\Http\Requests\MediaStoreRequest;
-use App\Http\Requests\MediaUpdateRequest;
-use App\Models\Media;
-use Illuminate\Http\Request;
-use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\Storage;
-use Laravel\Sanctum\PersonalAccessToken;
-
-class MediaController extends ApiController
-{
-    /**
-     * ApplicationController constructor.
-     */
-    public function __construct()
-    {
-        $this->middleware('auth:sanctum')
-        ->only(['store','update','destroy']);
-    }
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @param \App\Filters\MediaFilter $filter Created filter object.
-     * @return \Illuminate\Http\Response
-     */
-    public function index(MediaFilter $filter)
-    {
-        return $this->respondAsResource(
-            $filter->filter(),
-            ['total' => $filter->foundTotal()]
-        );
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  MediaFilter $filter The request filter.
-     * @param  Media       $medium The request media.
-     * @return \Illuminate\Http\Response
-     */
-    public function show(MediaFilter $filter, Media $medium)
-    {
-        return $this->respondAsResource($filter->filter($medium));
-    }
-
-    /**
-     * Store a new media resource
-     *
-     * @param  MediaStoreRequest $request The uploaded media.
-     * @return \Illuminate\Http\Response
-     */
-    public function store(MediaStoreRequest $request)
-    {
-        $file = $request->file('file');
-        if ($file === null) {
-            return $this->respondError(['file' => 'An error occurred uploading the file to the server.']);
-        }
-
-        if ($file->isValid() !== true) {
-            switch ($file->getError()) {
-                case UPLOAD_ERR_INI_SIZE:
-                case UPLOAD_ERR_FORM_SIZE:
-                    return $this->respondTooLarge();
-                case UPLOAD_ERR_PARTIAL:
-                    return $this->respondError(['file' => 'The file upload was interrupted.']);
-                default:
-                    return $this->respondError(['file' => 'An error occurred uploading the file to the server.']);
-            }
-        }
-
-        if ($file->getSize() > Media::maxUploadSize()) {
-            return $this->respondTooLarge();
-        }
-
-        $title = $file->getClientOriginalName();
-        $mime = $file->getMimeType();
-        $fileInfo = Media::store($file, empty($request->input('permission')));
-        if ($fileInfo === null) {
-            return $this->respondError(
-                ['file' => 'The file could not be stored on the server'],
-                HttpResponseCodes::HTTP_INTERNAL_SERVER_ERROR
-            );
-        }
-
-        $request->merge([
-            'title' => $title,
-            'mime' => $mime,
-            'name' => $fileInfo['name'],
-            'size' => filesize($fileInfo['path'])
-        ]);
-
-        $media = $request->user()->media()->create($request->all());
-        return $this->respondAsResource((new MediaFilter($request))->filter($media));
-    }
-
-    /**
-     * Update the media resource in storage.
-     *
-     * @param  MediaUpdateRequest $request The update request.
-     * @param  \App\Models\Media  $medium  The specified media.
-     * @return \Illuminate\Http\Response
-     */
-    public function update(MediaUpdateRequest $request, Media $medium)
-    {
-        if ((new MediaFilter($request))->filter($medium) === null) {
-            return $this->respondNotFound();
-        }
-
-        $file = $request->file('file');
-        if ($file !== null) {
-            if ($file->getSize() > Media::maxUploadSize()) {
-                return $this->respondTooLarge();
-            }
-
-            $oldPath = $medium->path();
-            $fileInfo = Media::store($file, empty($request->input('permission')));
-            if ($fileInfo === null) {
-                return $this->respondError(
-                    ['file' => 'The file could not be stored on the server'],
-                    HttpResponseCodes::HTTP_INTERNAL_SERVER_ERROR
-                );
-            }
-
-            if (file_exists($oldPath) === true) {
-                unlink($oldPath);
-            }
-
-            $request->merge([
-                'title' => $file->getClientOriginalName(),
-                'mime' => $file->getMimeType(),
-                'name' => $fileInfo['name'],
-                'size' => filesize($fileInfo['path'])
-            ]);
-        }//end if
-
-        $medium->update($request->all());
-        return $this->respondWithTransformer($file);
-    }
-
-
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param Request           $request Request instance.
-     * @param  \App\Models\Media $medium  Specified media file.
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy(Request $request, Media $medium)
-    {
-        if ((new MediaFilter($request))->filter($medium) !== null) {
-            if (file_exists($medium->path()) === true) {
-                unlink($medium->path());
-            }
-
-            $medium->delete();
-            return $this->respondNoContent();
-        }
-
-        return $this->respondNotFound();
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  Request           $request Request instance.
-     * @param  \App\Models\Media $medium  Specified media.
-     * @return \Illuminate\Http\Response
-     */
-    public function download(Request $request, Media $medium)
-    {
-        $respondJson = in_array('application/json', explode(',', $request->header('Accept', 'application/json')));
-
-        $headers = [];
-        $path = $medium->path();
-
-        /* File exists */
-        if (file_exists($path) === false) {
-            if ($respondJson === false) {
-                return redirect('/not-found');
-            } else {
-                return $this->respondNotFound();
-            }
-        }
-
-        $updated_at = Carbon::parse(filemtime($path));
-
-        $headerPragma = 'no-cache';
-        $headerCacheControl = 'max-age=0, must-revalidate';
-        $headerExpires = $updated_at->toRfc2822String();
-
-        if (empty($medium->permission) === true) {
-            if ($request->user() === null && $request->has('token') === true) {
-                $accessToken = PersonalAccessToken::findToken(urldecode($request->input('token')));
-
-                if (
-                    $accessToken !== null && (config('sanctum.expiration') === null ||
-                    $accessToken->created_at->lte(now()->subMinutes(config('sanctum.expiration'))) === false)
-                ) {
-                    $user = $accessToken->tokenable;
-                }
-            }
-            if ($request->user() === null || $user->hasPermission($medium->permission) === false) {
-                if ($respondJson === false) {
-                    return redirect('/login?redirect=' . $request->path());
-                } else {
-                    return $this->respondForbidden();
-                }
-            }
-        } else {
-            $headerPragma = 'public';
-            $headerExpires = $updated_at->addMonth()->toRfc2822String();
-        }//end if
-
-        $headerEtag = md5($updated_at->format('U'));
-        $headerLastModified = $updated_at->toRfc2822String();
-
-        $headers = [
-            'Cache-Control' => $headerCacheControl,
-            'Content-Disposition' => sprintf('inline; filename="%s"', basename($path)),
-            'Etag' => $headerEtag,
-            'Expires' => $headerExpires,
-            'Last-Modified' => $headerLastModified,
-            'Pragma' => $headerPragma,
-        ];
-
-        $server = request()->server;
-
-        $requestModifiedSince = $server->has('HTTP_IF_MODIFIED_SINCE') &&
-        $server->get('HTTP_IF_MODIFIED_SINCE') === $headerLastModified;
-
-        $requestNoneMatch = $server->has('HTTP_IF_NONE_MATCH') &&
-        $server->get('HTTP_IF_NONE_MATCH') === $headerEtag;
-
-        if ($requestModifiedSince === true || $requestNoneMatch === true) {
-            return response()->make('', 304, $headers);
-        }
-
-        return response()->file($path, $headers);
-    }
-}

app/Http/Controllers/Api/PostController.php

@@ -1,93 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Enum\HttpResponseCodes;
-use App\Filters\PostFilter;
-use App\Http\Requests\PostStoreRequest;
-use App\Http\Requests\PostUpdateRequest;
-use App\Models\Post;
-use Illuminate\Http\Request;
-
-class PostController extends ApiController
-{
-    /**
-     * ApplicationController constructor.
-     */
-    public function __construct()
-    {
-        $this->middleware('auth:sanctum')
-            ->only([
-                'store',
-                'update',
-                'delete'
-            ]);
-    }
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @param \App\Filters\PostFilter $filter Post filter request.
-     * @return \Illuminate\Http\Response
-     */
-    public function index(PostFilter $filter)
-    {
-        return $this->respondAsResource(
-            $filter->filter(),
-            ['total' => $filter->foundTotal()]
-        );
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  PostFilter       $filter The filter request.
-     * @param  \App\Models\Post $post   The post model.
-     * @return \Illuminate\Http\Response
-     */
-    public function show(PostFilter $filter, Post $post)
-    {
-        return $this->respondAsResource($filter->filter($post));
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  PostStoreRequest $request The post store request.
-     * @return \Illuminate\Http\Response
-     */
-    public function store(PostStoreRequest $request)
-    {
-        $post = Post::create($request->all());
-        return $this->respondAsResource(
-            (new PostFilter($request))->filter($post),
-            null,
-            HttpResponseCodes::HTTP_CREATED
-        );
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  PostUpdateRequest $request The post update request.
-     * @param  \App\Models\Post  $post    The specified post.
-     * @return \Illuminate\Http\Response
-     */
-    public function update(PostUpdateRequest $request, Post $post)
-    {
-        $post->update($request->all());
-        return $this->respondAsResource((new PostFilter($request))->filter($post));
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  \App\Models\Post $post The specified post.
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy(Post $post)
-    {
-        $post->delete();
-        return $this->respondNoContent();
-    }
-}

app/Http/Controllers/Api/SubscriptionController.php

@@ -1,132 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Models\Subscription;
-use App\Filters\SubscriptionFilter;
-use App\Http\Requests\SubscriptionRequest;
-use App\Jobs\SendEmailJob;
-use App\Mail\SubscriptionConfirm;
-use App\Mail\SubscriptionUnsubscribed;
-
-class SubscriptionController extends ApiController
-{
-    /**
-     * ApplicationController constructor.
-     */
-    public function __construct()
-    {
-        $this->middleware('auth:sanctum')
-        ->except(['store', 'destroyByEmail']);
-    }
-
-    /**
-     * Display a listing of subscribers.
-     *
-     * @param \App\Filters\SubscriptionFilter $filter Filter object.
-     * @return \Illuminate\Http\Response
-     */
-    public function index(SubscriptionFilter $filter)
-    {
-        $collection = $filter->filter();
-        return $this->respondAsResource(
-            $collection,
-            ['total' => $filter->foundTotal()]
-        );
-    }
-
-    /**
-     * Store a subscriber email in the database.
-     *
-     * @param  SubscriptionRequest $request The subscriber update request.
-     * @return \Illuminate\Http\Response
-     */
-    public function store(SubscriptionRequest $request)
-    {
-        if (Subscription::where('email', $request->email)->first() !== null) {
-            return $this->respondWithErrors(['email' => 'This email address has already subscribed']);
-        }
-
-        Subscription::create($request->all());
-        dispatch((new SendEmailJob($request->email, new SubscriptionConfirm($request->email))))->onQueue('mail');
-
-        return $this->respondCreated();
-    }
-
-
-    /**
-     * Display the specified user.
-     *
-     * @param  SubscriptionFilter $filter       The subscription filter.
-     * @param  Subscription       $subscription The subscription model.
-     * @return \Illuminate\Http\Response
-     */
-    public function show(SubscriptionFilter $filter, Subscription $subscription)
-    {
-        return $this->respondAsResource($filter->filter($subscription));
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  SubscriptionRequest $request      The subscription update request.
-     * @param  Subscription        $subscription The specified subscription.
-     * @return \Illuminate\Http\Response
-     */
-    public function update(SubscriptionRequest $request, Subscription $subscription)
-    {
-        // $input = [];
-        // $updatable = ['username', 'first_name', 'last_name', 'email', 'phone', 'password'];
-
-        // if ($request->user()->hasPermission('admin/user') === true) {
-        //     $updatable = array_merge($updatable, ['email_verified_at']);
-        // } elseif ($request->user()->is($user) !== true) {
-        //     return $this->respondForbidden();
-        // }
-
-        // $input = $request->only($updatable);
-        // if (array_key_exists('password', $input) === true) {
-        //     $input['password'] = Hash::make($request->input('password'));
-        // }
-
-        // $user->update($input);
-
-        // return $this->respondAsResource((new UserFilter($request))->filter($user));
-    }
-
-
-    /**
-     * Remove the user from the database.
-     *
-     * @param  Subscription $subscription The specified subscription.
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy(Subscription $subscription)
-    {
-        // if ($user->hasPermission('admin/user') === false) {
-        //     return $this->respondForbidden();
-        // }
-
-        $email = $subscription->email;
-
-        $subscription->delete();
-        return $this->respondNoContent();
-    }
-
-    /**
-     * Remove the user from the database.
-     *
-     * @param  SubscriptionRequest $request The specified subscription.
-     * @return \Illuminate\Http\Response
-     */
-    public function destroyByEmail(SubscriptionRequest $request)
-    {
-        $subscription = Subscription::where('email', $request->email)->first();
-        if ($subscription !== null) {
-            $subscription->delete();
-            dispatch((new SendEmailJob($request->email, new SubscriptionUnsubscribed($request->email))))->onQueue('mail');
-        }
-
-        return $this->respondNoContent();
-    }
-}

app/Http/Controllers/Api/UserController.php

@@ -1,337 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Enum\HttpResponseCodes;
-use App\Filters\UserFilter;
-use App\Http\Requests\UserUpdateRequest;
-use App\Http\Requests\UserStoreRequest;
-use App\Http\Requests\UserForgotPasswordRequest;
-use App\Http\Requests\UserForgotUsernameRequest;
-use App\Http\Requests\UserRegisterRequest;
-use App\Http\Requests\UserResendVerifyEmailRequest;
-use App\Http\Requests\UserResetPasswordRequest;
-use App\Http\Requests\UserVerifyEmailRequest;
-use App\Jobs\SendEmailJob;
-use App\Mail\ChangedEmail;
-use App\Mail\ChangedPassword;
-use App\Mail\ChangeEmailVerify;
-use App\Mail\ForgotUsername;
-use App\Mail\ForgotPassword;
-use App\Mail\EmailVerify;
-use App\Models\User;
-use App\Models\UserCode;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Hash;
-
-class UserController extends ApiController
-{
-    /**
-     * ApplicationController constructor.
-     */
-    public function __construct()
-    {
-        $this->middleware('auth:sanctum')
-        ->except([
-            'index',
-            'show',
-            'register',
-            'exists',
-            'forgotPassword',
-            'forgotUsername',
-            'resetPassword',
-            'verifyEmail',
-            'resendVerifyEmailCode'
-        ]);
-    }
-
-    /**
-     * Display a listing of the resource.
-     *
-     * @param \App\Filters\UserFilter $filter Filter object.
-     * @return \Illuminate\Http\Response
-     */
-    public function index(UserFilter $filter)
-    {
-        $collection = $filter->filter();
-        return $this->respondAsResource(
-            $collection,
-            ['total' => $filter->foundTotal()]
-        );
-    }
-
-    /**
-     * Store a newly created user in the database.
-     *
-     * @param  UserStoreRequest $request The user update request.
-     * @return \Illuminate\Http\Response
-     */
-    public function store(UserStoreRequest $request)
-    {
-        if ($request->user()->hasPermission('admin/user') !== true) {
-            return $this->respondForbidden();
-        }
-
-        $user = User::create($request->all());
-        return $this->respondAsResource((new UserFilter($request))->filter($user), [], HttpResponseCodes::HTTP_CREATED);
-    }
-
-
-    /**
-     * Display the specified user.
-     *
-     * @param  UserFilter $filter The user filter.
-     * @param  User       $user   The user model.
-     * @return \Illuminate\Http\Response
-     */
-    public function show(UserFilter $filter, User $user)
-    {
-        return $this->respondAsResource($filter->filter($user));
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  UserUpdateRequest $request The user update request.
-     * @param  User              $user    The specified user.
-     * @return \Illuminate\Http\Response
-     */
-    public function update(UserUpdateRequest $request, User $user)
-    {
-        $input = [];
-        $updatable = ['username', 'first_name', 'last_name', 'email', 'phone', 'password'];
-
-        if ($request->user()->hasPermission('admin/user') === true) {
-            $updatable = array_merge($updatable, ['email_verified_at']);
-        } elseif ($request->user()->is($user) !== true) {
-            return $this->respondForbidden();
-        }
-
-        $input = $request->only($updatable);
-        if (array_key_exists('password', $input) === true) {
-            $input['password'] = Hash::make($request->input('password'));
-        }
-
-        $user->update($input);
-
-        return $this->respondAsResource((new UserFilter($request))->filter($user));
-    }
-
-
-    /**
-     * Remove the user from the database.
-     *
-     * @param  User $user The specified user.
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy(User $user)
-    {
-        if ($user->hasPermission('admin/user') === false) {
-            return $this->respondForbidden();
-        }
-
-        $user->delete();
-        return $this->respondNoContent();
-    }
-
-    /**
-     * Register a new user
-     *
-     * @param UserRegisterRequest $request The register user request.
-     * @return \Illuminate\Http\Response
-     */
-    public function register(UserRegisterRequest $request)
-    {
-        try {
-            $user = User::create([
-                'first_name' => $request->input('first_name'),
-                'last_name' => $request->input('last_name'),
-                'username' => $request->input('username'),
-                'email' => $request->input('email'),
-                'phone' => $request->input('phone'),
-                'password' => Hash::make($request->input('password'))
-            ]);
-
-            $code = $user->codes()->create([
-                'action' => 'verify-email',
-            ]);
-
-            dispatch((new SendEmailJob($user->email, new EmailVerify($user, $code->code))))->onQueue('mail');
-
-            return response()->json([
-                'message' => 'Check your email for a welcome code.'
-            ]);
-        } catch (\Exception $e) {
-            return response()->json([
-                'message' => 'A server error occurred. Please try again later' . $e
-            ], 500);
-        }//end try
-    }
-
-    /**
-     * Sends an email with all the usernames registered at that address
-     *
-     * @param UserForgotUsernameRequest $request The forgot username request.
-     * @return \Illuminate\Http\Response
-     */
-    public function forgotUsername(UserForgotUsernameRequest $request)
-    {
-        $users = User::where('email', $request->input('email'))->whereNotNull('email_verified_at')->get();
-        if ($users->count() > 0) {
-            dispatch((new SendEmailJob(
-                $users->first()->email,
-                new ForgotUsername($users->pluck('username')->toArray())
-            )))->onQueue('mail');
-            return $this->respondNoContent();
-        }
-
-        return $this->respondJson(['message' => 'Username send to the email address if registered']);
-    }
-
-    /**
-     * Generates a new reset password code
-     *
-     * @param UserForgotPasswordRequest $request The reset password request.
-     * @return \Illuminate\Http\Response
-     */
-    public function forgotPassword(UserForgotPasswordRequest $request)
-    {
-        $user = User::where('username', $request->input('username'))->first();
-        if ($user !== null) {
-            $user->codes()->where('action', 'reset-password')->delete();
-            $code = $user->codes()->create([
-                'action' => 'reset-password'
-            ]);
-
-            dispatch((new SendEmailJob($user->email, new ForgotPassword($user, $code->code))))->onQueue('mail');
-            return $this->respondNoContent();
-        }
-
-        return $this->respondNotFound();
-    }
-
-    /**
-     * Resets a user password
-     *
-     * @param UserResetPasswordRequest $request The reset password request.
-     * @return \Illuminate\Http\Response
-     */
-    public function resetPassword(UserResetPasswordRequest $request)
-    {
-        UserCode::clearExpired();
-
-        $code = UserCode::where('code', $request->input('code'))->where('action', 'reset-password')->first();
-        if ($code !== null) {
-            $user = $code->user()->first();
-
-            $code->delete();
-            $user->codes()->where('action', 'verify-email')->delete();
-
-            $user->password = Hash::make($request->input('password'));
-
-            if ($user->email_verified_at === null) {
-                $user->email_verified_at = now();
-            }
-
-            $user->save();
-
-            dispatch((new SendEmailJob($user->email, new ChangedPassword($user))))->onQueue('mail');
-            return $this->respondNoContent();
-        }
-
-        return $this->respondError([
-            'code' => 'The code was not found or has expired'
-        ]);
-    }
-
-    /**
-     * Verify an email code
-     *
-     * @param UserVerifyEmailRequest $request The verify email request.
-     * @return \Illuminate\Http\Response
-     */
-    public function verifyEmail(UserVerifyEmailRequest $request)
-    {
-        UserCode::clearExpired();
-
-        $code = UserCode::where('code', $request->input('code'))->where('action', 'verify-email')->first();
-        if ($code !== null) {
-            $user = $code->user()->first();
-            $new_email = $code->data;
-
-            if ($new_email === null) {
-                if ($user->email_verified_at === null) {
-                    $user->email_verified_at = now();
-                }
-            } else {
-                dispatch((new SendEmailJob($user->email, new ChangedEmail($user, $user->email, $new_email))))
-                    ->onQueue('mail');
-
-                $user->email = $new_email;
-                $user->email_verified_at = now();
-            }
-
-            $code->delete();
-            $user->save();
-
-            return $this->respondNoContent();
-        }//end if
-
-        return $this->respondWithErrors([
-            'code' => 'The code was not found or has expired'
-        ]);
-    }
-
-    /**
-     * Resend a new verify email
-     *
-     * @param UserResendVerifyEmailRequest $request The resend verify email request.
-     * @return \Illuminate\Http\Response
-     */
-    public function resendVerifyEmail(UserResendVerifyEmailRequest $request)
-    {
-        UserCode::clearExpired();
-
-        $user = User::where('username', $request->input('username'))->first();
-        if ($user !== null) {
-            $code = $user->codes()->where('action', 'verify-email')->first();
-            $code->regenerate();
-            $code->save();
-
-            if ($code->data === null) {
-                dispatch((new SendEmailJob($user->email, new EmailVerify($user, $code->code))))->onQueue('mail');
-            } else {
-                dispatch((new SendEmailJob($user->email, new ChangeEmailVerify($user, $code->code, $code->data))))
-                    ->onQueue('mail');
-            }
-        }
-
-        return response()->json(['message' => 'Verify email sent if user registered and required']);
-    }
-
-    /**
-     * Resend verification email
-     *
-     * @param UserResendVerifyEmailRequest $request The resend user request.
-     * @return \Illuminate\Http\Response
-     */
-    public function resendVerifyEmailCode(UserResendVerifyEmailRequest $request)
-    {
-        $user = User::where('username', $request->input('username'))->first();
-        if ($user !== null) {
-            $user->codes()->where('action', 'verify-email')->delete();
-
-            if ($user->email_verified_at === null) {
-                $code = $user->codes()->create([
-                    'action' => 'verify-email'
-                ]);
-
-                dispatch((new SendEmailJob($user->email, new EmailVerify($user, $code->code))))->onQueue('mail');
-            }
-
-            return $this->respondNoContent();
-        }
-
-        return $this->respondNotFound();
-    }
-}

app/Http/Controllers/Controller.php

@@ -3,13 +3,10 @@
 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
 {
-    use AuthorizesRequests;
+    use AuthorizesRequests, ValidatesRequests;
-    use DispatchesJobs;
-    use ValidatesRequests;
 }

app/Http/Kernel.php

@@ -19,8 +19,8 @@ class Kernel extends HttpKernel
         \Illuminate\Http\Middleware\HandleCors::class,
         \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
-        // \App\Http\Middleware\TrimStrings::class,
+        \App\Http\Middleware\TrimStrings::class,
-        // \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
     ];
 
     /**
@@ -40,22 +40,19 @@ class Kernel extends HttpKernel
 
         'api' => [
             // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
-            'throttle:api',
+            \Illuminate\Routing\Middleware\ThrottleRequests::class.':api',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            // \App\Http\Middleware\ForceJsonResponse::class,
-            'useSanctumGuard',
-            \App\Http\Middleware\LogRequest::class,
         ],
     ];
 
     /**
-     * The application's route middleware.
+     * The application's middleware aliases.
      *
-     * These middleware may be assigned to groups or used individually.
+     * Aliases may be used instead of class names to conveniently assign middleware to routes and groups.
      *
      * @var array<string, class-string|string>
      */
-    protected $routeMiddleware = [
+    protected $middlewareAliases = [
         'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class,
@@ -63,9 +60,9 @@ class Kernel extends HttpKernel
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
         'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
+        'precognitive' => \Illuminate\Foundation\Http\Middleware\HandlePrecognitiveRequests::class,
         'signed' => \App\Http\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
-        'useSanctumGuard' => \App\Http\Middleware\UseSanctumGuard::class
     ];
 }

app/Http/Middleware/Authenticate.php

@@ -3,19 +3,15 @@
 namespace App\Http\Middleware;
 
 use Illuminate\Auth\Middleware\Authenticate as Middleware;
+use Illuminate\Http\Request;
 
 class Authenticate extends Middleware
 {
     /**
      * Get the path the user should be redirected to when they are not authenticated.
-     *
-     * @param  mixed $request Request.
-     * @return string|null
      */
-    protected function redirectTo(mixed $request)
+    protected function redirectTo(Request $request): ?string
     {
-        if ($request->expectsJson() === false) {
+        return $request->expectsJson() ? null : route('login');
-            return route('login');
-        }
     }
 }

app/Http/Middleware/ForceJsonResponse.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-
-class ForceJsonResponse
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
-     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
-     */
-    public function handle(Request $request, Closure $next)
-    {
-        $request->headers->set('Accept', 'application/json');
-        return $next($request);
-    }
-}

app/Http/Middleware/LogRequest.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-use App\Models\Analytics;
-
-class LogRequest
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request                                                                          $request
-     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
-     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
-     */
-    public function handle(Request $request, Closure $next)
-    {
-        // Make it an after middleware
-        $response = $next($request);
-
-        try {
-            Analytics::create([
-                'type' => 'pageview',
-                'attribute' => $request->path(),
-                'useragent' => $request->userAgent(),
-                'ip' => $request->ip(),
-            ]);
-
-            return $response;
-        } catch (\Error $e) {
-            report($e);
-            return $response;
-        }
-    }
-}

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -6,23 +6,21 @@ use App\Providers\RouteServiceProvider;
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Symfony\Component\HttpFoundation\Response;
 
 class RedirectIfAuthenticated
 {
     /**
      * Handle an incoming request.
      *
-     * @param  Request                                       $request   Request.
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
-     * @param  Closure(Request): (Response|RedirectResponse) $next      Next.
-     * @param  string|null                                   ...$guards Guards.
-     * @return Response|RedirectResponse
      */
-    public function handle(Request $request, Closure $next, ...$guards)
+    public function handle(Request $request, Closure $next, string ...$guards): Response
     {
-        $guards = empty($guards) === true ? [null] : $guards;
+        $guards = empty($guards) ? [null] : $guards;
 
         foreach ($guards as $guard) {
-            if (Auth::guard($guard)->check() === true) {
+            if (Auth::guard($guard)->check()) {
                 return redirect(RouteServiceProvider::HOME);
             }
         }

app/Http/Middleware/TrustHosts.php

@@ -11,7 +11,7 @@ class TrustHosts extends Middleware
      *
      * @return array<int, string|null>
      */
-    public function hosts()
+    public function hosts(): array
     {
         return [
             $this->allSubdomainsOfApplicationUrl(),

app/Http/Middleware/TrustProxies.php

@@ -17,9 +17,12 @@ class TrustProxies extends Middleware
     /**
      * The headers that should be used to detect proxies.
      *
-     * @var integer
+     * @var int
      */
-    // @codingStandardsIgnoreStart
+    protected $headers =
-    protected $headers = (Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_AWS_ELB);
+        Request::HEADER_X_FORWARDED_FOR |
-    // @codingStandardsIgnoreEnd
+        Request::HEADER_X_FORWARDED_HOST |
+        Request::HEADER_X_FORWARDED_PORT |
+        Request::HEADER_X_FORWARDED_PROTO |
+        Request::HEADER_X_FORWARDED_AWS_ELB;
 }

app/Http/Middleware/UseSanctumGuard.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class UseSanctumGuard
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request                                                                          $request
-     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
-     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
-     */
-    public function handle(Request $request, Closure $next)
-    {
-        Auth::shouldUse('sanctum');
-        return $next($request);
-    }
-}

app/Http/Requests/AuthLoginRequest.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class AuthLoginRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        return [
-            'username' => 'required|string|min:6|max:255',
-            'password' => 'required|string|min:6',
-        ];
-    }
-}

app/Http/Requests/BaseRequest.php

@@ -1,97 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-
-class BaseRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return boolean
-     */
-    public function authorize()
-    {
-        if (method_exists($this, 'postAuthorize') === true && request()->isMethod('post') === true) {
-            return $this->postAuthorize();
-        } elseif (method_exists($this, 'putAuthorize') === true && request()->isMethod('put') === true) {
-            return $this->putAuthorize();
-        }
-
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        $rules = [];
-
-        if (method_exists($this, 'baseRules') === true) {
-            $rules = $this->baseRules();
-        }
-
-        if (method_exists($this, 'postRules') === true && request()->isMethod('post') === true) {
-            $rules = $this->mergeRules($rules, $this->postRules());
-        } elseif (method_exists($this, 'putRules') === true && request()->isMethod('put') === true) {
-            $rules = $this->mergeRules($rules, $this->postRules());
-        } elseif (method_exists($this, 'destroyRules') === true && request()->isMethod('delete') === true) {
-            $rules = $this->mergeRules($rules, $this->destroyRules());
-        }
-
-        return $rules;
-    }
-
-    /**
-     * Merge two collections of rules.
-     *
-     * @param array $collection1 The first collection of rules.
-     * @param array $collection2 The second collection of rules to merge.
-     * @return array
-     */
-    private function mergeRules(array $collection1, array $collection2)
-    {
-        $rules = [];
-
-        foreach ($collection1 as $key => $ruleset) {
-            if (array_key_exists($key, $collection2) === true) {
-                if (is_string($collection1[$key]) === true && is_string($collection2[$key]) === true) {
-                    $rules[$key] = $collection1[$key] . '|' . $collection2[$key];
-                } else {
-                    $key_ruleset = [];
-
-                    if (is_array($collection1[$key]) === true) {
-                        $key_ruleset = $collection1[$key];
-                    } elseif (is_string($collection1[$key]) === true) {
-                        $key_ruleset = explode('|', $collection1[$key]);
-                    }
-
-                    if (is_array($collection2[$key]) === true) {
-                        $key_ruleset = array_merge($key_ruleset, $collection2[$key]);
-                    } elseif (is_string($collection1[$key]) === true) {
-                        $key_ruleset = array_merge($key_ruleset, explode('|', $collection1[$key]));
-                    }
-
-                    if (count($key_ruleset) > 0) {
-                        $rules[$key] = $key_ruleset;
-                    }
-                }//end if
-            } else {
-                $rules[$key] = $ruleset;
-            }//end if
-        }//end foreach
-
-        foreach ($collection2 as $key => $ruleset) {
-            if (array_key_exists($key, $rules) === false) {
-                $rules[$key] = $collection2[$key];
-            }
-        }
-
-        return $rules;
-    }
-}

app/Http/Requests/ContactSendRequest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use App\Rules\Recaptcha;
-use Illuminate\Foundation\Http\FormRequest;
-
-class ContactSendRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        return [
-            'name' => 'required|max:255',
-            'email' => 'required|email|max:255',
-            'content' => 'required|max:2000',
-            'captcha_token' => [new Recaptcha()],
-        ];
-    }
-}

app/Http/Requests/EventRequest.php

@@ -1,78 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-
-class EventRequest extends BaseRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return boolean
-     */
-    public function postAuthorize()
-    {
-        return $this->user()?->hasPermission('admin/events');
-    }
-
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return boolean
-     */
-    public function putAuthorize()
-    {
-        return $this->user()?->hasPermission('admin/events');
-    }
-
-    /**
-     * Apply the base rules to this request
-     *
-     * @return array<string, mixed>
-     */
-    public function baseRules()
-    {
-        return [
-            'title'             => 'min:6',
-            'location' => [
-                Rule::in(['online', 'physical']),
-            ],
-            'address'           => 'string|nullable',
-            'start_at'          => 'date',
-            'end_at'            => 'date|after:start_date',
-            'publish_at'        => 'date|nullable',
-            'status' => [
-                Rule::in(['draft', 'open', 'closed', 'cancelled']),
-            ],
-            'registration_type' => [
-                Rule::in(['none', 'email', 'link']),
-            ],
-            'registration_data' => [
-                Rule::when(strcasecmp('email', $this->attributes->get('registration_type')) == 0, 'required|email'),
-                Rule::when(strcasecmp('link', $this->attributes->get('registration_type')) == 0, 'required|url')
-            ],
-            'hero'              => 'uuid|exists:media,id',
-        ];
-    }
-
-    /**
-     * Apply the additional POST base rules to this request
-     *
-     * @return array<string, mixed>
-     */
-    protected function postRules()
-    {
-        return [
-            'title'             => 'required',
-            'location'          => 'required',
-            'address'           => 'required_if:location,physical',
-            'start_at'          => 'required',
-            'end_at'            => 'required',
-            'status'            => 'required',
-            'registration_type' => 'required',
-            'hero'              => 'required',
-        ];
-    }
-}

app/Http/Requests/MediaStoreRequest.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class MediaStoreRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        return [
-            //
-        ];
-    }
-}

app/Http/Requests/MediaUpdateRequest.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class MediaUpdateRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        return [
-            //
-        ];
-    }
-}

app/Http/Requests/PostStoreRequest.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class PostStoreRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        return [
-            'slug' => 'string|min:6|unique:posts',
-            'title' => 'string|min:6|max:255',
-            'publish_at' => 'date',
-            'user_id' => 'uuid|exists:users,id',
-        ];
-    }
-}

app/Http/Requests/PostUpdateRequest.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-
-class PostUpdateRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        return [
-            'slug' => [
-                'string',
-                'min:6',
-                Rule::unique('posts')->ignoreModel($this->post),
-            ],
-            'title' => 'string|min:6|max:255',
-            'publish_at' => 'date',
-            'user_id' => 'uuid|exists:users,id',
-        ];
-    }
-}

app/Http/Requests/SubscriptionRequest.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use App\Rules\Recaptcha;
-
-class SubscriptionRequest extends BaseRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function postRules()
-    {
-        return [
-            'email' => 'required|email',
-            'captcha_token' => [new Recaptcha()],
-        ];
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function destroyRules()
-    {
-        return [
-            'email' => 'required|email',
-            'captcha_token' => [new Recaptcha()],
-        ];
-    }
-}

app/Http/Requests/UserForgotPasswordRequest.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use App\Rules\Recaptcha;
-use Illuminate\Foundation\Http\FormRequest;
-
-class UserForgotPasswordRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        return [
-            'username' => 'required|exists:users,username',
-            'captcha_token' => [new Recaptcha()],
-        ];
-    }
-}

app/Http/Requests/UserForgotUsernameRequest.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use App\Rules\Recaptcha;
-use Illuminate\Foundation\Http\FormRequest;
-
-class UserForgotUsernameRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        return [
-            'email' => 'required|email|max:255',
-            'captcha_token' => [new Recaptcha()],
-        ];
-    }
-}

app/Http/Requests/UserRegisterRequest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class UserRegisterRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        return [
-            'first_name' => 'required|string|max:255',
-            'last_name' => 'required|string|max:255',
-            'email' => 'required|string|email|max:255',
-            'username' => 'required|string|min:4|max:255|unique:users',
-            'password' => 'required|string|min:8',
-        ];
-    }
-}

app/Http/Requests/UserResendVerifyEmailRequest.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use App\Rules\Recaptcha;
-use Illuminate\Foundation\Http\FormRequest;
-
-class UserResendVerifyEmailRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        return [
-            'username' => 'required|exists:users,username',
-            'captcha_token' => [new Recaptcha()],
-        ];
-    }
-}

app/Http/Requests/UserResetPasswordRequest.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use App\Rules\Recaptcha;
-use Illuminate\Foundation\Http\FormRequest;
-
-class UserResetPasswordRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        return [
-            'code' => 'required|digits:6',
-            'password' => 'required|string|min:8',
-            'captcha_token' => [new Recaptcha()],
-        ];
-    }
-}

app/Http/Requests/UserStoreRequest.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class UserStoreRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        return [
-            'username' => 'required|string|max:255|min:4|unique:users',
-            'first_name' => 'required|string|max:255|min:2',
-            'last_name' => 'required|string|max:255|min:2',
-            'email' => 'required|string|email|max:255',
-            'phone' => ['string', 'regex:/^(\+|00)?[0-9][0-9 \-\(\)\.]{7,32}$/'],
-            'email_verified_at' => 'date'
-        ];
-    }
-}

app/Http/Requests/UserUpdateRequest.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class UserUpdateRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        return [
-            'username' => 'string|max:255|min:6|unique:users',
-            'first_name' => 'string|max:255|min:2',
-            'last_name' => 'string|max:255|min:2',
-            'email' => 'string|email|max:255',
-            'phone' => ['nullable','regex:/^(\+|00)?[0-9][0-9 \-\(\)\.]{7,32}$/'],
-            'password' => 'string|min:8'
-        ];
-    }
-}

app/Http/Requests/UserVerifyEmailRequest.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use App\Rules\Recaptcha;
-use Illuminate\Foundation\Http\FormRequest;
-
-class UserVerifyEmailRequest extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
-    public function rules()
-    {
-        return [
-            'code' => 'required|digits:6',
-            'captcha_token' => [new Recaptcha()],
-        ];
-    }
-}

app/Jobs/SendEmailJob.php

@@ -1,57 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Mail\Mailable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Mail;
-
-class SendEmailJob implements ShouldQueue
-{
-    use Dispatchable;
-    use InteractsWithQueue;
-    use Queueable;
-    use SerializesModels;
-
-    /**
-     * Mail to receipt
-     *
-     * @var string
-     */
-    public $to;
-
-    /**
-     * Mailable item
-     *
-     * @var Mailable
-     */
-    public $mailable;
-
-
-    /**
-     * Create a new job instance.
-     *
-     * @param string   $to       The email receipient.
-     * @param Mailable $mailable The mailable.
-     * @return void
-     */
-    public function __construct(string $to, Mailable $mailable)
-    {
-        $this->to       = $to;
-        $this->mailable = $mailable;
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        Mail::to($this->to)->send($this->mailable);
-    }
-}

app/Mail/ChangeEmailVerify.php

@@ -1,79 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use App\Models\User;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Queue\SerializesModels;
-
-class ChangeEmailVerify extends Mailable
-{
-    use Queueable;
-    use SerializesModels;
-
-    /**
-     * The user instance.
-     *
-     * @var \App\Models\User
-     */
-    public $user;
-
-    /**
-     * The registration code.
-     *
-     * @var integer
-     */
-    public $code;
-
-    /**
-     * The new email address.
-     *
-     * @var string
-     */
-    public $new_email;
-
-
-    /**
-     * Create a new message instance.
-     *
-     * @param User    $user      The user the email applies to.
-     * @param integer $code      The action code.
-     * @param string  $new_email The new email address.
-     * @return void
-     */
-    public function __construct(User $user, int $code, string $new_email)
-    {
-        $this->user = $user;
-        $this->code = $code;
-        $this->new_email = $new_email;
-    }
-
-    /**
-     * Get the message envelope.
-     *
-     * @return \Illuminate\Mail\Mailables\Envelope
-     */
-    public function envelope()
-    {
-        return new Envelope(
-            subject: '👋🏻 Lets change your email!',
-        );
-    }
-
-    /**
-     * Get the message content definition.
-     *
-     * @return \Illuminate\Mail\Mailables\Content
-     */
-    public function content()
-    {
-        return new Content(
-            view: 'emails.user.change_email_verify',
-            text: 'emails.user.change_email_verify_plain',
-        );
-    }
-}

app/Mail/ChangedEmail.php

@@ -1,79 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use App\Models\User;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Queue\SerializesModels;
-
-class ChangedEmail extends Mailable
-{
-    use Queueable;
-    use SerializesModels;
-
-    /**
-     * The user instance.
-     *
-     * @var \App\Models\User
-     */
-    public $user;
-
-    /**
-     * The old email.
-     *
-     * @var string
-     */
-    public $old_email;
-
-    /**
-     * The new email.
-     *
-     * @var string
-     */
-    public $new_email;
-
-
-    /**
-     * Create a new message instance.
-     *
-     * @param User   $user      The user the email applies to.
-     * @param string $old_email The previous email address.
-     * @param string $new_email The new email address.
-     * @return void
-     */
-    public function __construct(User $user, string $old_email, string $new_email)
-    {
-        $this->user = $user;
-        $this->old_email = $old_email;
-        $this->new_email = $new_email;
-    }
-
-    /**
-     * Get the message envelope.
-     *
-     * @return \Illuminate\Mail\Mailables\Envelope
-     */
-    public function envelope()
-    {
-        return new Envelope(
-            subject: '👍 Your email has been changed!',
-        );
-    }
-
-    /**
-     * Get the message content definition.
-     *
-     * @return \Illuminate\Mail\Mailables\Content
-     */
-    public function content()
-    {
-        return new Content(
-            view: 'emails.user.changed_email',
-            text: 'emails.user.changed_email_plain',
-        );
-    }
-}

app/Mail/ChangedPassword.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use App\Models\User;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Queue\SerializesModels;
-
-class ChangedPassword extends Mailable
-{
-    use Queueable;
-    use SerializesModels;
-
-    /**
-     * The user instance.
-     *
-     * @var \App\Models\User
-     */
-    public $user;
-
-
-    /**
-     * Create a new message instance.
-     *
-     * @param User $user The user the email applies to.
-     * @return void
-     */
-    public function __construct(User $user)
-    {
-        $this->user = $user;
-    }
-
-    /**
-     * Get the message envelope.
-     *
-     * @return \Illuminate\Mail\Mailables\Envelope
-     */
-    public function envelope()
-    {
-        return new Envelope(
-            subject: '👍 Your password has been changed!',
-        );
-    }
-
-    /**
-     * Get the message content definition.
-     *
-     * @return \Illuminate\Mail\Mailables\Content
-     */
-    public function content()
-    {
-        return new Content(
-            view: 'emails.user.changed_password',
-            text: 'emails.user.changed_password_plain',
-        );
-    }
-}

app/Mail/Contact.php

@@ -1,78 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Queue\SerializesModels;
-
-class Contact extends Mailable
-{
-    use Queueable;
-    use SerializesModels;
-
-    /**
-     * The contact name.
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * The contact email.
-     *
-     * @var string
-     */
-    public $email;
-
-    /**
-     * The contact content.
-     *
-     * @var string
-     */
-    public $content;
-
-
-    /**
-     * Create a new message instance.
-     *
-     * @param string $name    The contact name.
-     * @param string $email   The contact email.
-     * @param string $content The contact content.
-     * @return void
-     */
-    public function __construct(string $name, string $email, string $content)
-    {
-        $this->name = $name;
-        $this->email = $email;
-        $this->content = $content;
-    }
-
-    /**
-     * Get the message envelope.
-     *
-     * @return \Illuminate\Mail\Mailables\Envelope
-     */
-    public function envelope()
-    {
-        return new Envelope(
-            subject: config('contact.contact_subject'),
-        );
-    }
-
-    /**
-     * Get the message content definition.
-     *
-     * @return \Illuminate\Mail\Mailables\Content
-     */
-    public function content()
-    {
-        return new Content(
-            view: 'emails.user.contact',
-            text: 'emails.user.contact_plain',
-        );
-    }
-}

app/Mail/EmailVerify.php

@@ -1,70 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use App\Models\User;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Queue\SerializesModels;
-
-class EmailVerify extends Mailable
-{
-    use Queueable;
-    use SerializesModels;
-
-    /**
-     * The user instance.
-     *
-     * @var \App\Models\User
-     */
-    public $user;
-
-    /**
-     * The registration code.
-     *
-     * @var integer
-     */
-    public $code;
-
-
-    /**
-     * Create a new message instance.
-     *
-     * @param User    $user The user the email applies to.
-     * @param integer $code The action code.
-     * @return void
-     */
-    public function __construct(User $user, int $code)
-    {
-        $this->user = $user;
-        $this->code = $code;
-    }
-
-    /**
-     * Get the message envelope.
-     *
-     * @return \Illuminate\Mail\Mailables\Envelope
-     */
-    public function envelope()
-    {
-        return new Envelope(
-            subject: '👋🏻 Welcome to STEMMechanics!',
-        );
-    }
-
-    /**
-     * Get the message content definition.
-     *
-     * @return \Illuminate\Mail\Mailables\Content
-     */
-    public function content()
-    {
-        return new Content(
-            view: 'emails.user.email_verify',
-            text: 'emails.user.email_verify_plain',
-        );
-    }
-}

app/Mail/ForgotPassword.php

@@ -1,70 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use App\Models\User;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Queue\SerializesModels;
-
-class ForgotPassword extends Mailable
-{
-    use Queueable;
-    use SerializesModels;
-
-    /**
-     * The user
-     *
-     * @var \App\Models\User
-     */
-    public $user;
-
-    /**
-     * The reset code
-     *
-     * @var integer
-     */
-    public $code;
-
-
-    /**
-     * Create a new message instance.
-     *
-     * @param User    $user The user the email applies to.
-     * @param integer $code The action code.
-     * @return void
-     */
-    public function __construct(User $user, int $code)
-    {
-        $this->user = $user;
-        $this->code = $code;
-    }
-
-    /**
-     * Get the message envelope.
-     *
-     * @return \Illuminate\Mail\Mailables\Envelope
-     */
-    public function envelope()
-    {
-        return new Envelope(
-            subject: '🤦 Forgot your password?',
-        );
-    }
-
-    /**
-     * Get the message content definition.
-     *
-     * @return \Illuminate\Mail\Mailables\Content
-     */
-    public function content()
-    {
-        return new Content(
-            view: 'emails.user.forgot_password',
-            text: 'emails.user.forgot_password_plain',
-        );
-    }
-}

app/Mail/ForgotUsername.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Queue\SerializesModels;
-
-class ForgotUsername extends Mailable
-{
-    use Queueable;
-    use SerializesModels;
-
-    /**
-     * The list of usernames
-     *
-     * @var string[]
-     */
-    public $usernames;
-
-
-    /**
-     * Create a new message instance.
-     *
-     * @param array $usernames The usernames.
-     * @return void
-     */
-    public function __construct(array $usernames)
-    {
-        $this->usernames = $usernames;
-    }
-
-    /**
-     * Get the message envelope.
-     *
-     * @return \Illuminate\Mail\Mailables\Envelope
-     */
-    public function envelope()
-    {
-        return new Envelope(
-            subject: '🤦 Forgot your username?',
-        );
-    }
-
-    /**
-     * Get the message content definition.
-     *
-     * @return \Illuminate\Mail\Mailables\Content
-     */
-    public function content()
-    {
-        return new Content(
-            view: 'emails.user.forgot_username',
-            text: 'emails.user.forgot_username_plain',
-        );
-    }
-}

app/Mail/SubscriptionConfirm.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use App\Models\User;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Queue\SerializesModels;
-
-class SubscriptionConfirm extends Mailable
-{
-    use Queueable;
-    use SerializesModels;
-
-    /**
-     * The email address.
-     *
-     * @var string
-     */
-    public $email;
-
-
-    /**
-     * Create a new message instance.
-     *
-     * @param string $email The email address.
-     * @return void
-     */
-    public function __construct(string $email)
-    {
-        $this->email = $email;
-    }
-
-    /**
-     * Get the message envelope.
-     *
-     * @return \Illuminate\Mail\Mailables\Envelope
-     */
-    public function envelope()
-    {
-        return new Envelope(
-            subject: '🗞️ You\'re on the mailing list!',
-        );
-    }
-
-    /**
-     * Get the message content definition.
-     *
-     * @return \Illuminate\Mail\Mailables\Content
-     */
-    public function content()
-    {
-        return new Content(
-            view: 'emails.user.subscription_confirm',
-            text: 'emails.user.subscription_confirm_plain',
-        );
-    }
-}

app/Mail/SubscriptionUnsubscribed.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Mail;
-
-use App\Models\User;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
-use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
-use Illuminate\Queue\SerializesModels;
-
-class SubscriptionUnsubscribed extends Mailable
-{
-    use Queueable;
-    use SerializesModels;
-
-    /**
-     * The email address.
-     *
-     * @var string
-     */
-    public $email;
-
-
-    /**
-     * Create a new message instance.
-     *
-     * @param string $email The email address.
-     * @return void
-     */
-    public function __construct(string $email)
-    {
-        $this->email = $email;
-    }
-
-    /**
-     * Get the message envelope.
-     *
-     * @return \Illuminate\Mail\Mailables\Envelope
-     */
-    public function envelope()
-    {
-        return new Envelope(
-            subject: 'You have been unsubscribed',
-        );
-    }
-
-    /**
-     * Get the message content definition.
-     *
-     * @return \Illuminate\Mail\Mailables\Content
-     */
-    public function content()
-    {
-        return new Content(
-            view: 'emails.user.subscription_unsubscribed',
-            text: 'emails.user.subscription_unsubscribed_plain',
-        );
-    }
-}

app/Models/Analytics.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-class Analytics extends Model
-{
-    use HasFactory;
-
-    /**
-     * The attributes that aren't mass assignable.
-     *
-     * @var array
-     */
-    protected $guarded = [];
-}

app/Models/Event.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Traits\Uuids;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-class Event extends Model
-{
-    use HasFactory;
-    use Uuids;
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array<int, string>
-     */
-    protected $fillable = [
-        'title',
-        'location',
-        'address',
-        'start_at',
-        'end_at',
-        'publish_at',
-        'status',
-        'registration_type',
-        'registration_data',
-        'hero',
-        'content'
-    ];
-}

app/Models/Media.php

@@ -1,276 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Traits\Uuids;
-use Illuminate\Contracts\Container\BindingResolutionException;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Http\UploadedFile;
-use Illuminate\Support\Facades\Storage;
-
-class Media extends Model
-{
-    use HasFactory;
-    use Uuids;
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array<int, string>
-     */
-    protected $fillable = [
-        'title',
-        'name',
-        'mime',
-        'user_id',
-        'size',
-        'permission'
-    ];
-
-    /**
-     * The attributes that are hidden.
-     *
-     * @var array<int, string>
-     */
-    protected $hidden = [
-        'path',
-    ];
-
-    /**
-     * The attributes that are appended.
-     *
-     * @var array<string>
-     */
-    protected $appends = [
-        'url',
-    ];
-
-
-    /**
-     * Model Boot
-     *
-     * @return void
-     */
-    protected static function boot()
-    {
-        parent::boot();
-
-        static::updating(function ($media) {
-            if (array_key_exists('permission', $media->getChanges()) === true) {
-                $origPermission = $media->getOriginal()['permission'];
-                $newPermission = $media->permission;
-
-                $origPath = Storage::disk(Media::getStorageId(empty($origPermission)))->path($media->name);
-                $newPath = Storage::disk(Media::getStorageId(empty($newPermission)))->path($media->name);
-
-                if ($origPath !== $newPath) {
-                    if (file_exists($origPath) === true) {
-                        if (file_exists($newPath) === true) {
-                            $fileParts = pathinfo($newPath);
-                            $newName = '';
-
-                            // need a new name!
-                            $tmpPath = $newPath;
-                            while (file_exists($tmpPath) === true) {
-                                $newName = uniqid('', true) . $fileParts['extension'];
-                                $tmpPath = $fileParts['dirname'] . '/' . $newName;
-                            }
-
-                            $media->name = $newName;
-                        }
-
-                        rename($origPath, $newPath);
-                    }//end if
-                }//end if
-            }//end if
-        });
-    }
-
-    /**
-     * Return the file URL
-     *
-     * @return string
-     */
-    public function getUrlAttribute()
-    {
-        $url = config('filesystems.disks.' . Media::getStorageId($this) . '.url');
-        if (empty($url) === false) {
-            $replace = [
-                'id'    => $this->id,
-                'name'  => $this->name
-            ];
-
-            $url = str_ireplace(array_map(function ($item) {
-                return '%' . $item . '%';
-            }, array_keys($replace)), array_values($replace), $url);
-
-            return $url;
-        }//end if
-
-        return '';
-    }
-
-    /**
-     * Return the file owner
-     *
-     * @return BelongsTo
-     */
-    public function user()
-    {
-        return $this->belongsTo(User::class);
-    }
-
-    /**
-     * Get the file full local path
-     *
-     * @return string
-     */
-    public function path()
-    {
-        return Storage::disk(Media::getStorageId($this))->path($this->name);
-    }
-
-    /**
-     * Get Storage ID
-     *
-     * @param mixed $mediaOrPublic Media object or if file is public.
-     * @return string
-     */
-    public static function getStorageId(mixed $mediaOrPublic)
-    {
-        $isPublic = true;
-
-        if ($mediaOrPublic instanceof Media) {
-            $isPublic = empty($mediaOrPublic->permission);
-        } else {
-            $isPublic = boolval($mediaOrPublic);
-        }
-
-        return $isPublic === true ? 'public' : 'local';
-    }
-
-    /**
-     * Place uploaded file into storage. Return full path or null
-     *
-     * @param UploadedFile $file   File to put into storage.
-     * @param boolean      $public Is the file available to the public.
-     * @return array|null
-     */
-    public static function store(UploadedFile $file, bool $public = true)
-    {
-        $storage = Media::getStorageId($public);
-        $name = $file->store('', ['disk' => $storage]);
-
-        if ($name === false) {
-            return null;
-        }
-
-        $path = Storage::disk($storage)->path($name);
-        return [
-            'name' => $name,
-            'path' => $path
-        ];
-    }
-
-    /**
-     * Get the server maximum upload size
-     *
-     * @return integer
-     */
-    public static function maxUploadSize()
-    {
-        $sizes = [
-            ini_get('upload_max_filesize'),
-            ini_get('post_max_size'),
-            ini_get('memory_limit')
-        ];
-
-        foreach ($sizes as &$size) {
-            $size = trim($size);
-            $last = strtolower($size[(strlen($size) - 1)]);
-            switch ($last) {
-                case 'g':
-                    $size = (intval($size) * 1024);
-                    // Size is in MB - fallthrough
-                case 'm':
-                    $size = (intval($size) * 1024);
-                    // Size is in KB - fallthrough
-                case 'k':
-                    $size = (intval($size) * 1024);
-                    // Size is in B - fallthrough
-            }
-        }
-
-        return min($sizes);
-    }
-
-    /**
-     * Sanitize filename for upload
-     *
-     * @param string $filename Filename to sanitize.
-     * @return string
-     */
-    public static function sanitizeFilename(string $filename)
-    {
-        /*
-            # file system reserved https://en.wikipedia.org/wiki/Filename#Reserved_characters_and_words
-                [<>:"/\\\|?*]|
-
-            # control characters http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247%28v=vs.85%29.aspx
-                [\x00-\x1F]|
-
-            # non-printing characters DEL, NO-BREAK SPACE, SOFT HYPHEN
-                [\x7F\xA0\xAD]|
-
-            # URI reserved https://www.rfc-editor.org/rfc/rfc3986#section-2.2
-                [#\[\]@!$&\'()+,;=]|
-
-            # URL unsafe characters https://www.ietf.org/rfc/rfc1738.txt
-                [{}^\~`]
-        */
-
-        $filename = preg_replace(
-            '~
-            [<>:"/\\\|?*]|
-            [\x00-\x1F]|
-            [\x7F\xA0\xAD]|
-            [#\[\]@!$&\'()+,;=]|
-            [{}^\~`]
-            ~x',
-            '-',
-            $filename
-        );
-
-        $filename = ltrim($filename, '.-');
-
-        $filename = preg_replace([
-            // "file   name.zip" becomes "file-name.zip"
-            '/ +/',
-            // "file___name.zip" becomes "file-name.zip"
-            '/_+/',
-            // "file---name.zip" becomes "file-name.zip"
-            '/-+/'
-        ], '-', $filename);
-        $filename = preg_replace([
-            // "file--.--.-.--name.zip" becomes "file.name.zip"
-            '/-*\.-*/',
-            // "file...name..zip" becomes "file.name.zip"
-            '/\.{2,}/'
-        ], '.', $filename);
-        // lowercase for windows/unix interoperability http://support.microsoft.com/kb/100625
-        $filename = mb_strtolower($filename, mb_detect_encoding($filename));
-        // ".file-name.-" becomes "file-name"
-        $filename = trim($filename, '.-');
-
-        $ext = pathinfo($filename, PATHINFO_EXTENSION);
-        $filename = mb_strcut(
-            pathinfo($filename, PATHINFO_FILENAME),
-            0,
-            (255 - ($ext !== '' ? strlen($ext) + 1 : 0)),
-            mb_detect_encoding($filename)
-        ) . ($ext !== '' ? '.' . $ext : '');
-        return $filename;
-    }
-}

app/Models/Permission.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Traits\Uuids;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-class Permission extends Model
-{
-    use HasFactory;
-    use Uuids;
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array<int, string>
-     */
-    protected $fillable = [
-        'permission',
-        'user',
-    ];
-
-
-    /**
-     * Get the User associated with this model
-     *
-     * @return BelongsTo
-     */
-    public function user()
-    {
-        return $this->belongsTo(User::class);
-    }
-}

app/Models/Post.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Traits\Uuids;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-class Post extends Model
-{
-    use HasFactory;
-    use Uuids;
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array<int, string>
-     */
-    protected $fillable = [
-        'title',
-        'slug',
-        'publish_at',
-        'content',
-        'user_id',
-        'hero'
-    ];
-
-
-    /**
-     * Get the file user
-     *
-     * @return BelongsTo
-     */
-    public function user()
-    {
-        return $this->belongsTo(User::class);
-    }
-}

app/Models/Subscription.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Traits\Uuids;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-class Subscription extends Model
-{
-    use HasFactory;
-    use Uuids;
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array<int, string>
-     */
-    protected $fillable = [
-        'email',
-    ];
-}

app/Models/User.php

@@ -3,21 +3,14 @@
 namespace App\Models;
 
 // use Illuminate\Contracts\Auth\MustVerifyEmail;
-
-use App\Traits\Uuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Laravel\Sanctum\HasApiTokens;
-use OwenIt\Auditing\Contracts\Auditable;
 
-class User extends Authenticatable implements Auditable
+class User extends Authenticatable
 {
-    use HasApiTokens;
+    use HasApiTokens, HasFactory, Notifiable;
-    use HasFactory;
-    use Notifiable;
-    use Uuids;
-    use \OwenIt\Auditing\Auditable;
 
     /**
      * The attributes that are mass assignable.
@@ -25,11 +18,8 @@ class User extends Authenticatable implements Auditable
      * @var array<int, string>
      */
     protected $fillable = [
-        'username',
+        'name',
-        'first_name',
-        'last_name',
         'email',
-        'phone',
         'password',
     ];
 
@@ -41,7 +31,6 @@ class User extends Authenticatable implements Auditable
     protected $hidden = [
         'password',
         'remember_token',
-        'permissions'
     ];
 
     /**
@@ -51,95 +40,6 @@ class User extends Authenticatable implements Auditable
      */
     protected $casts = [
         'email_verified_at' => 'datetime',
+        'password' => 'hashed',
     ];
-
-    // protected $hidden = [
-    //     'permissions'
-    // ];
-
-    /**
-     * The attributes to append.
-     *
-     * @var string[]
-     */
-    protected $appends = [
-        'permissions'
-    ];
-
-
-    // public function getPermissionsAttribute() {
-    //     return $this->permissions()->pluck('permission')->toArray();
-    // }
-
-
-    /**
-     * Get the list of files of the user
-     *
-     * @return HasMany
-     */
-    public function permissions()
-    {
-        return $this->hasMany(Permission::class);
-    }
-
-    /**
-     * Get the permission attribute
-     *
-     * @return array
-     */
-    public function getPermissionsAttribute()
-    {
-        return $this->permissions()->pluck('permission')->toArray();
-    }
-
-    /**
-     * Test if user has permission
-     *
-     * @param string $permission Permission to test.
-     * @return boolean
-     */
-    public function hasPermission(string $permission)
-    {
-        return ($this->permissions()->where('permission', $permission)->first() !== null);
-    }
-
-    /**
-     * Get the list of files of the user
-     *
-     * @return HasMany
-     */
-    public function media()
-    {
-        return $this->hasMany(Media::class);
-    }
-
-    /**
-     * Get the list of files of the user
-     *
-     * @return HasMany
-     */
-    public function posts()
-    {
-        return $this->hasMany(Post::class);
-    }
-
-    /**
-     * Get associated user codes
-     *
-     * @return HasMany
-     */
-    public function codes()
-    {
-        return $this->hasMany(UserCode::class);
-    }
-
-    /**
-     * Get the list of logins of the user
-     *
-     * @return HasMany
-     */
-    public function logins()
-    {
-        return $this->hasMany(UserLogins::class);
-    }
 }

app/Models/UserCode.php

@@ -1,82 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-class UserCode extends Model
-{
-    use HasFactory;
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array<int, string>
-     */
-    protected $fillable = [
-        'action',
-        'user_id',
-        'data',
-    ];
-
-
-    /**
-     * Boot function from Laravel.
-     *
-     * @return void
-     */
-    protected static function boot()
-    {
-        parent::boot();
-        static::creating(function ($model) {
-            UserCode::clearExpired();
-
-            if (empty($model->{'code'}) === true) {
-                while (true) {
-                    $code = random_int(100000, 999999);
-                    if (UserCode::where('code', $code)->count() === 0) {
-                        $model->{'code'} = $code;
-                        break;
-                    }
-                }
-            }
-        });
-    }
-
-    /**
-     * Generate new code
-     *
-     * @return void
-     */
-    public function regenerate()
-    {
-        while (true) {
-            $code = random_int(100000, 999999);
-            if (UserCode::where('code', $code)->count() === 0) {
-                $this->code = $code;
-                break;
-            }
-        }
-    }
-
-    /**
-     * Clear expired user codes
-     *
-     * @return void
-     */
-    public static function clearExpired()
-    {
-        UserCode::where('updated_at', '<=', now()->subDays(5))->delete();
-    }
-
-    /**
-     * Get associated user
-     *
-     * @return BelongsTo
-     */
-    public function user()
-    {
-        return $this->belongsTo(User::class);
-    }
-}

app/Models/UserLogins.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Traits\Uuids;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-class UserLogins extends Model
-{
-    use HasFactory;
-    use Uuids;
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array<int, string>
-     */
-    protected $fillable = [
-        'user_id',
-        'token',
-        'login',
-        'logout',
-        'ip_address',
-        'user_agent',
-    ];
-
-
-    /**
-     * Get the file user
-     *
-     * @return BelongsTo
-     */
-    public function user()
-    {
-        return $this->belongsTo(User::class);
-    }
-}

app/Providers/AppServiceProvider.php

@@ -3,28 +3,21 @@
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
-use Exception;
-use Illuminate\Support\Facades\DB;
-use PDOException;
 
 class AppServiceProvider extends ServiceProvider
 {
     /**
      * Register any application services.
-     *
-     * @return void
      */
-    public function register()
+    public function register(): void
     {
         //
     }
 
     /**
      * Bootstrap any application services.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         //
     }

app/Providers/AuthServiceProvider.php

@@ -13,19 +13,14 @@ class AuthServiceProvider extends ServiceProvider
      * @var array<class-string, class-string>
      */
     protected $policies = [
-        // 'App\Models\Model' => 'App\Policies\ModelPolicy',
+        //
     ];
 
-
     /**
      * Register any authentication / authorization services.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
-        $this->registerPolicies();
-
         //
     }
 }

app/Providers/BroadcastServiceProvider.php

@@ -9,10 +9,8 @@ class BroadcastServiceProvider extends ServiceProvider
 {
     /**
      * Bootstrap any application services.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         Broadcast::routes();
 

app/Providers/EventServiceProvider.php

@@ -5,10 +5,7 @@ namespace App\Providers;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-use Illuminate\Queue\Events\JobProcessed;
-use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\Facades\Event;
-use Illuminate\Support\Facades\Log;
 
 class EventServiceProvider extends ServiceProvider
 {
@@ -23,38 +20,18 @@ class EventServiceProvider extends ServiceProvider
         ],
     ];
 
-
     /**
      * Register any events for your application.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
-        Queue::after(function (JobProcessed $event) {
+        //
-            // Log::info($event->connectionName);
-            // Log::info('ID: ' . $event->job->getJobId());
-            // Log::info('Attempts: ' . $event->job->attempts());
-            // Log::info('Name: ' . $event->job->getName());
-            // Log::info('ResolveNAme: ' . $event->job->resolveName());
-            // Log::info('Queue: ' . $event->job->getQueue());
-            // Log::info('Body: ' . $event->job->getRawBody());
-            // Log::info(print_r($event->job->payload(), true));
-
-            // $payload = $event->job->payload();
-            // $data = unserialize($payload['data']['command']);
-
-            // Log::info('MAIL: ' . $data->to);
-            // Log::info('MAIL: ' . get_class($data->mailable));
-        });
     }
 
     /**
      * Determine if events and listeners should be automatically discovered.
-     *
-     * @return boolean
      */
-    public function shouldDiscoverEvents()
+    public function shouldDiscoverEvents(): bool
     {
         return false;
     }

app/Providers/RouteServiceProvider.php

@@ -11,7 +11,7 @@ use Illuminate\Support\Facades\Route;
 class RouteServiceProvider extends ServiceProvider
 {
     /**
-     * The path to the "home" route for your application.
+     * The path to your application's "home" route.
      *
      * Typically, users are redirected here after authentication.
      *
@@ -19,15 +19,14 @@ class RouteServiceProvider extends ServiceProvider
      */
     public const HOME = '/home';
 
-
     /**
      * Define your route model bindings, pattern filters, and other route configuration.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
-        $this->configureRateLimiting();
+        RateLimiter::for('api', function (Request $request) {
+            return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
+        });
 
         $this->routes(function () {
             Route::middleware('api')
@@ -38,16 +37,4 @@ class RouteServiceProvider extends ServiceProvider
                 ->group(base_path('routes/web.php'));
         });
     }
-
-    /**
-     * Configure the rate limiters for the application.
-     *
-     * @return void
-     */
-    protected function configureRateLimiting()
-    {
-        RateLimiter::for('api', function (Request $request) {
-            return Limit::perMinute(60)->by($request->user()?->id !== null ?: $request->ip());
-        });
-    }
 }

app/Rules/Recaptcha.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Rules;
-
-use Illuminate\Support\Facades\Http;
-use Illuminate\Contracts\Validation\Rule;
-
-class Recaptcha implements Rule
-{
-    /**
-     * Create a new rule instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        //
-    }
-
-    /**
-     * Determine if the validation rule passes.
-     *
-     * @param  mixed $attribute Attribute name.
-     * @param  mixed $value     Attribute value.
-     * @return boolean
-     */
-    public function passes(mixed $attribute, mixed $value)
-    {
-        $endpoint = config('services.google_recaptcha');
-
-        $response = Http::asForm()->post($endpoint['url'], [
-            'secret' => $endpoint['secret_key'],
-            'response' => $value,
-        ])->json();
-
-        if ($response['success'] === true && $response['score'] > 0.5) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the validation error message.
-     *
-     * @return string
-     */
-    public function message()
-    {
-        return 'Captcha failed. Refresh the page and try again';
-    }
-}

app/Services/ImageService.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Services;
-
-use ImageIntervention;
-
-class ImageService
-{
-}

app/Traits/Uuids.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Traits;
-
-use Illuminate\Support\Str;
-
-trait Uuids
-{
-    /**
-     * Boot function from Laravel.
-     *
-     * @return void
-     */
-    protected static function bootUuids()
-    {
-        static::creating(function ($model) {
-            if (empty($model->{$model->getKeyName()}) === true) {
-                $model->{$model->getKeyName()} = Str::uuid()->toString();
-            }
-        });
-    }
-
-    /**
-     * Get the value indicating whether the IDs are incrementing.
-     *
-     * @return boolean
-     */
-    public function getIncrementing()
-    {
-        return false;
-    }
-
-    /**
-     * Get the auto-incrementing key type.
-     *
-     * @return string
-     */
-    public function getKeyType()
-    {
-        return 'string';
-    }
-}

composer.json

@@ -1,27 +1,25 @@
 {
     "name": "laravel/laravel",
     "type": "project",
-    "description": "The Laravel Framework.",
+    "description": "The skeleton application for the Laravel framework.",
-    "keywords": ["framework", "laravel"],
+    "keywords": ["laravel", "framework"],
     "license": "MIT",
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.1",
-        "doctrine/dbal": "^3.5",
         "guzzlehttp/guzzle": "^7.2",
-        "intervention/image": "^2.7",
+        "itsgoingd/clockwork": "^5.1",
-        "laravel/framework": "^9.19",
+        "laravel/framework": "^10.10",
-        "laravel/sanctum": "^3.0",
+        "laravel/sanctum": "^3.3",
-        "laravel/tinker": "^2.7",
+        "laravel/tinker": "^2.8"
-        "owen-it/laravel-auditing": "^13.0"
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",
         "laravel/pint": "^1.0",
-        "laravel/sail": "^1.0.1",
+        "laravel/sail": "^1.18",
         "mockery/mockery": "^1.4.4",
-        "nunomaduro/collision": "^6.1",
+        "nunomaduro/collision": "^7.0",
-        "phpunit/phpunit": "^9.5.10",
+        "phpunit/phpunit": "^10.1",
-        "spatie/laravel-ignition": "^1.0"
+        "spatie/laravel-ignition": "^2.0"
     },
     "autoload": {
         "psr-4": {
@@ -60,9 +58,10 @@
         "preferred-install": "dist",
         "sort-packages": true,
         "allow-plugins": {
-            "pestphp/pest-plugin": true
+            "pestphp/pest-plugin": true,
+            "php-http/discovery": true
         }
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "prefer-stable": true
 }

config/app.php

@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Support\Facades\Facade;
+use Illuminate\Support\ServiceProvider;
 
 return [
 
@@ -69,7 +70,7 @@ return [
     |
     */
 
-    'timezone' => env('APP_TIMEZONE', 'UTC'),
+    'timezone' => 'UTC',
 
     /*
     |--------------------------------------------------------------------------
@@ -140,7 +141,7 @@ return [
 
     'maintenance' => [
         'driver' => 'file',
-        // 'store'  => 'redis',
+        // 'store' => 'redis',
     ],
 
     /*
@@ -154,39 +155,10 @@ return [
     |
     */
 
-    'providers' => [
+    'providers' => ServiceProvider::defaultProviders()->merge([
-
-        /*
-         * 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...
          */
-        Intervention\Image\ImageServiceProvider::class,
-        OwenIt\Auditing\AuditingServiceProvider::class,
 
         /*
          * Application Service Providers...
@@ -196,8 +168,7 @@ return [
         // App\Providers\BroadcastServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
-
+    ])->toArray(),
-    ],
 
     /*
     |--------------------------------------------------------------------------
@@ -211,7 +182,7 @@ return [
     */
 
     'aliases' => Facade::defaultAliases()->merge([
-        'ImageIntervention' => Intervention\Image\Facades\Image::class,
+        // 'Example' => App\Facades\Example::class,
     ])->toArray(),
 
 ];

config/audit.php

@@ -1,169 +0,0 @@
-<?php
-
-return [
-
-    'enabled' => env('AUDITING_ENABLED', true),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Audit Implementation
-    |--------------------------------------------------------------------------
-    |
-    | Define which Audit model implementation should be used.
-    |
-    */
-
-    'implementation' => OwenIt\Auditing\Models\Audit::class,
-
-    /*
-    |--------------------------------------------------------------------------
-    | User Morph prefix & Guards
-    |--------------------------------------------------------------------------
-    |
-    | Define the morph prefix and authentication guards for the User resolver.
-    |
-    */
-
-    'user'      => [
-        'morph_prefix' => 'user',
-        'guards'       => [
-            'web',
-            'api'
-        ],
-        'resolver'     => OwenIt\Auditing\Resolvers\UserResolver::class
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Audit Resolvers
-    |--------------------------------------------------------------------------
-    |
-    | Define the User, IP Address, User Agent and URL resolver implementations.
-    |
-    */
-    'resolvers' => [
-        'ip_address' => OwenIt\Auditing\Resolvers\IpAddressResolver::class,
-        'user_agent' => OwenIt\Auditing\Resolvers\UserAgentResolver::class,
-        'url'        => OwenIt\Auditing\Resolvers\UrlResolver::class,
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Audit Events
-    |--------------------------------------------------------------------------
-    |
-    | The Eloquent events that trigger an Audit.
-    |
-    */
-
-    'events' => [
-        'created',
-        'updated',
-        'deleted',
-        'restored'
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Strict Mode
-    |--------------------------------------------------------------------------
-    |
-    | Enable the strict mode when auditing?
-    |
-    */
-
-    'strict' => false,
-
-    /*
-    |--------------------------------------------------------------------------
-    | Global exclude
-    |--------------------------------------------------------------------------
-    |
-    | Have something you always want to exclude by default? - add it here.
-    | Note that this is overwritten (not merged) with local exclude
-    |
-    */
-
-    'exclude' => [],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Empty Values
-    |--------------------------------------------------------------------------
-    |
-    | Should Audit records be stored when the recorded old_values & new_values
-    | are both empty?
-    |
-    | Some events may be empty on purpose. Use allowed_empty_values to exclude
-    | those from the empty values check. For example when auditing
-    | model retrieved events which will never have new and old values.
-    |
-    |
-    */
-
-    'empty_values'         => true,
-    'allowed_empty_values' => [
-        'retrieved'
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Audit Timestamps
-    |--------------------------------------------------------------------------
-    |
-    | Should the created_at, updated_at and deleted_at timestamps be audited?
-    |
-    */
-
-    'timestamps' => false,
-
-    /*
-    |--------------------------------------------------------------------------
-    | Audit Threshold
-    |--------------------------------------------------------------------------
-    |
-    | Specify a threshold for the amount of Audit records a model can have.
-    | Zero means no limit.
-    |
-    */
-
-    'threshold' => 0,
-
-    /*
-    |--------------------------------------------------------------------------
-    | Audit Driver
-    |--------------------------------------------------------------------------
-    |
-    | The default audit driver used to keep track of changes.
-    |
-    */
-
-    'driver' => 'database',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Audit Driver Configurations
-    |--------------------------------------------------------------------------
-    |
-    | Available audit drivers and respective configurations.
-    |
-    */
-
-    'drivers' => [
-        'database' => [
-            'table'      => 'audits',
-            'connection' => null,
-        ],
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Audit Console
-    |--------------------------------------------------------------------------
-    |
-    | Whether console events should be audited (eg. php artisan db:seed).
-    |
-    */
-
-    'console' => false,
-];

config/auth.php

@@ -80,16 +80,20 @@ return [
     | 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 each reset token will be
+    | 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' => [
             'provider' => 'users',
-            'table' => 'password_resets',
+            'table' => 'password_reset_tokens',
             'expire' => 60,
             'throttle' => 60,
         ],

config/broadcasting.php

@@ -36,7 +36,8 @@ return [
             'secret' => env('PUSHER_APP_SECRET'),
             'app_id' => env('PUSHER_APP_ID'),
             'options' => [
-                'host' => env('PUSHER_HOST') === true ?: 'api-' . env('PUSHER_APP_CLUSTER', 'mt1') . '.pusher.com',
+                'cluster' => env('PUSHER_APP_CLUSTER'),
+                'host' => env('PUSHER_HOST') ?: 'api-'.env('PUSHER_APP_CLUSTER', 'mt1').'.pusher.com',
                 'port' => env('PUSHER_PORT', 443),
                 'scheme' => env('PUSHER_SCHEME', 'https'),
                 'encrypted' => true,

config/cache.php

@@ -52,6 +52,7 @@ return [
         'file' => [
             'driver' => 'file',
             'path' => storage_path('framework/cache/data'),
+            'lock_path' => storage_path('framework/cache/data'),
         ],
 
         'memcached' => [
@@ -105,6 +106,6 @@ return [
     |
     */
 
-    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_cache_'),
+    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache_'),
 
 ];

config/contact.php

@@ -1,6 +0,0 @@
-<?php
-
-return [
-    'contact_address' => env('CONTACT_ADDRESS'),
-    'contact_subject'    => env('CONTACT_SUBJECT'),
-];

config/database.php

@@ -58,7 +58,7 @@ return [
             'prefix_indexes' => true,
             'strict' => true,
             'engine' => null,
-            'options' => extension_loaded('pdo_mysql') === true ? array_filter([
+            'options' => extension_loaded('pdo_mysql') ? array_filter([
                 PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
             ]) : [],
         ],
@@ -125,7 +125,7 @@ return [
 
         'options' => [
             'cluster' => env('REDIS_CLUSTER', 'redis'),
-            'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_database_'),
+            'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'),
         ],
 
         'default' => [

config/filesystems.php

@@ -32,16 +32,16 @@ return [
 
         'local' => [
             'driver' => 'local',
-            'root' => storage_path('app/uploads'),
+            'root' => storage_path('app'),
             'throw' => false,
-            'url' => env('STORAGE_LOCAL_URL'),
         ],
 
         'public' => [
             'driver' => 'local',
-            'root' => public_path('uploads'),
+            'root' => storage_path('app/public'),
+            'url' => env('APP_URL').'/storage',
+            'visibility' => 'public',
             'throw' => false,
-            'url' => env('STORAGE_PUBLIC_URL'),
         ],
 
         's3' => [

config/hashing.php

@@ -29,7 +29,8 @@ return [
     */
 
     'bcrypt' => [
-        'rounds' => env('BCRYPT_ROUNDS', 10),
+        'rounds' => env('BCRYPT_ROUNDS', 12),
+        'verify' => true,
     ],
 
     /*
@@ -47,6 +48,7 @@ return [
         'memory' => 65536,
         'threads' => 1,
         'time' => 4,
+        'verify' => true,
     ],
 
 ];

config/image.php

@@ -1,20 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Image Driver
-    |--------------------------------------------------------------------------
-    |
-    | Intervention Image supports "GD Library" and "Imagick" to process images
-    | internally. You may choose one of them according to your PHP
-    | configuration. By default PHP's "GD Library" implementation is used.
-    |
-    | Supported: "gd", "imagick"
-    |
-    */
-
-    'driver' => 'gd'
-
-];

config/logging.php

@@ -3,6 +3,7 @@
 use Monolog\Handler\NullHandler;
 use Monolog\Handler\StreamHandler;
 use Monolog\Handler\SyslogUdpHandler;
+use Monolog\Processor\PsrLogMessageProcessor;
 
 return [
 
@@ -61,6 +62,7 @@ return [
             'driver' => 'single',
             'path' => storage_path('logs/laravel.log'),
             'level' => env('LOG_LEVEL', 'debug'),
+            'replace_placeholders' => true,
         ],
 
         'daily' => [
@@ -68,6 +70,7 @@ return [
             'path' => storage_path('logs/laravel.log'),
             'level' => env('LOG_LEVEL', 'debug'),
             'days' => 14,
+            'replace_placeholders' => true,
         ],
 
         'slack' => [
@@ -76,6 +79,7 @@ return [
             'username' => 'Laravel Log',
             'emoji' => ':boom:',
             'level' => env('LOG_LEVEL', 'critical'),
+            'replace_placeholders' => true,
         ],
 
         'papertrail' => [
@@ -85,8 +89,9 @@ return [
             'handler_with' => [
                 'host' => env('PAPERTRAIL_URL'),
                 'port' => env('PAPERTRAIL_PORT'),
-                'connectionString' => 'tls://' . env('PAPERTRAIL_URL') . ':' . env('PAPERTRAIL_PORT'),
+                'connectionString' => 'tls://'.env('PAPERTRAIL_URL').':'.env('PAPERTRAIL_PORT'),
             ],
+            'processors' => [PsrLogMessageProcessor::class],
         ],
 
         'stderr' => [
@@ -97,16 +102,20 @@ return [
             'with' => [
                 'stream' => 'php://stderr',
             ],
+            'processors' => [PsrLogMessageProcessor::class],
         ],
 
         'syslog' => [
             'driver' => 'syslog',
             'level' => env('LOG_LEVEL', 'debug'),
+            'facility' => LOG_USER,
+            'replace_placeholders' => true,
         ],
 
         'errorlog' => [
             'driver' => 'errorlog',
             'level' => env('LOG_LEVEL', 'debug'),
+            'replace_placeholders' => true,
         ],
 
         'null' => [

config/mail.php

@@ -28,7 +28,7 @@ return [
     | sending an e-mail. You will specify which one you are using for your
     | mailers below. You are free to add additional mailers as required.
     |
-    | Supported: "smtp", "sendmail", "mailgun", "ses",
+    | Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2",
     |            "postmark", "log", "array", "failover"
     |
     */
@@ -36,6 +36,7 @@ return [
     'mailers' => [
         'smtp' => [
             'transport' => 'smtp',
+            'url' => env('MAIL_URL'),
             'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
             'port' => env('MAIL_PORT', 587),
             'encryption' => env('MAIL_ENCRYPTION', 'tls'),
@@ -51,10 +52,17 @@ return [
 
         'mailgun' => [
             'transport' => 'mailgun',
+            // 'client' => [
+            //     'timeout' => 5,
+            // ],
         ],
 
         'postmark' => [
             'transport' => 'postmark',
+            // 'message_stream_id' => null,
+            // 'client' => [
+            //     'timeout' => 5,
+            // ],
         ],
 
         'sendmail' => [
@@ -78,10 +86,6 @@ return [
                 'log',
             ],
         ],
-
-        'office365mail' => [
-            'transport' => 'office365mail',
-        ],
     ],
 
     /*

config/purify.php

@@ -1,87 +0,0 @@
-<?php
-
-use Stevebauman\Purify\Definitions\Html5Definition;
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Default Config
-    |--------------------------------------------------------------------------
-    |
-    | This option defines the default config that are provided to HTMLPurifier.
-    |
-    */
-
-    'default' => 'default',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Config sets
-    |--------------------------------------------------------------------------
-    |
-    | Here you may configure various sets of configuration for differentiated use of HTMLPurifier.
-    | A specific set of configuration can be applied by calling the "config($name)" method on
-    | a Purify instance. Feel free to add/remove/customize these attributes as you wish.
-    |
-    | Documentation: http://htmlpurifier.org/live/configdoc/plain.html
-    |
-    |   Core.Encoding               The encoding to convert input to.
-    |   HTML.Doctype                Doctype to use during filtering.
-    |   HTML.Allowed                The allowed HTML Elements with their allowed attributes.
-    |   HTML.ForbiddenElements      The forbidden HTML elements. Elements that are listed in this
-    |                               string will be removed, however their content will remain.
-    |   CSS.AllowedProperties       The Allowed CSS properties.
-    |   AutoFormat.AutoParagraph    Newlines are converted in to paragraphs whenever possible.
-    |   AutoFormat.RemoveEmpty      Remove empty elements that contribute no semantic information to the document.
-    |
-    */
-
-    'configs' => [
-        // @codingStandardsIgnoreStart
-        'default' => [
-            'Core.Encoding' => 'utf-8',
-            'HTML.Doctype' => 'HTML 4.01 Transitional',
-            'HTML.Allowed' => 'h1,h2,h3,h4,h5,h6,b,strong,i,em,s,del,a[href|title],ul,ol,li,p[style],br,span,img[width|height|alt|src]',
-            'HTML.ForbiddenElements' => '',
-            'CSS.AllowedProperties' => 'font,font-size,font-weight,font-style,font-family,text-decoration,padding-left,color,background-color,text-align',
-            'AutoFormat.AutoParagraph' => false,
-            'AutoFormat.RemoveEmpty' => false,
-        ],
-        // @codingStandardsIgnoreEnd
-
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | HTMLPurifier definitions
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify a class that augments the HTML definitions used by
-    | HTMLPurifier. Additional HTML5 definitions are provided out of the box.
-    | When specifying a custom class, make sure it implements the interface:
-    |
-    |   \Stevebauman\Purify\Definitions\Definition
-    |
-    | Note that these definitions are applied to every Purifier instance.
-    |
-    | Documentation: http://htmlpurifier.org/docs/enduser-customize.html
-    |
-    */
-
-    'definitions' => Html5Definition::class,
-
-    /*
-    |--------------------------------------------------------------------------
-    | Serializer location
-    |--------------------------------------------------------------------------
-    |
-    | The location where HTMLPurifier can store its temporary serializer files.
-    | The filepath should be accessible and writable by the web server.
-    | A good place for this is in the framework's own storage path.
-    |
-    */
-
-    'serializer' => storage_path('app/purify'),
-
-];

config/queue.php

@@ -73,6 +73,22 @@ return [
 
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | 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', 'mysql'),
+        'table' => 'job_batches',
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Failed Queue Jobs

config/sanctum.php

@@ -41,12 +41,27 @@ return [
     |--------------------------------------------------------------------------
     |
     | This value controls the number of minutes until an issued token will be
-    | considered expired. If this value is null, personal access tokens do
+    | considered expired. This will override any values set in the token's
-    | not expire. This won't tweak the lifetime of first-party sessions.
+    | "expires_at" attribute, but first-party sessions are not affected.
     |
     */
 
-    'expiration' => 40320,  // 28 days
+    'expiration' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Token Prefix
+    |--------------------------------------------------------------------------
+    |
+    | Sanctum can prefix new tokens in order to take advantage of numerous
+    | security scanning initiatives maintained by open source platforms
+    | that notify developers if they commit tokens into repositories.
+    |
+    | See: https://docs.github.com/en/code-security/secret-scanning/about-secret-scanning
+    |
+    */
+
+    'token_prefix' => env('SANCTUM_TOKEN_PREFIX', ''),
 
     /*
     |--------------------------------------------------------------------------
@@ -60,8 +75,9 @@ return [
     */
 
     'middleware' => [
-        'verify_csrf_token' => App\Http\Middleware\VerifyCsrfToken::class,
+        'authenticate_session' => Laravel\Sanctum\Http\Middleware\AuthenticateSession::class,
         'encrypt_cookies' => App\Http\Middleware\EncryptCookies::class,
+        'verify_csrf_token' => App\Http\Middleware\VerifyCsrfToken::class,
     ],
 
 ];

config/services.php

@@ -31,9 +31,4 @@ return [
         'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
     ],
 
-    'google_recaptcha' => [
-        'url' => 'https://www.google.com/recaptcha/api/siteverify',
-        'site_key' => env('GOOGLE_RECAPTCHA_SITE_KEY'),
-        'secret_key' => env('GOOGLE_RECAPTCHA_SECRET_SITE_KEY'),
-    ],
 ];

config/session.php

@@ -128,7 +128,7 @@ return [
 
     'cookie' => env(
         'SESSION_COOKIE',
-        Str::slug(env('APP_NAME', 'laravel'), '_') . '_session'
+        Str::slug(env('APP_NAME', 'laravel'), '_').'_session'
     ),
 
     /*

database/factories/UserFactory.php

@@ -3,6 +3,7 @@
 namespace Database\Factories;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
 
 /**
@@ -10,31 +11,28 @@ use Illuminate\Support\Str;
  */
 class UserFactory extends Factory
 {
+    protected static ?string $password;
+
     /**
      * Define the model's default state.
      *
      * @return array<string, mixed>
      */
-    public function definition()
+    public function definition(): array
     {
         return [
-            'username' => fake()->unique()->userName(),
+            'name' => fake()->name(),
-            'first_name' => fake()->firstName(),
+            'email' => fake()->unique()->safeEmail(),
-            'last_name' => fake()->lastName(),
-            'email' => fake()->safeEmail(),
             'email_verified_at' => now(),
-            'phone' => fake()->phoneNumber(),
+            'password' => static::$password ??= Hash::make('password'),
-            'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
             'remember_token' => Str::random(10),
         ];
     }
 
     /**
      * Indicate that the model's email address should be unverified.
-     *
-     * @return static
      */
-    public function unverified()
+    public function unverified(): static
     {
         return $this->state(fn (array $attributes) => [
             'email_verified_at' => null,

database/migrations/2014_10_12_000000_create_users_table.php

@@ -8,21 +8,15 @@ return new class extends Migration
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('users', function (Blueprint $table) {
-            $table->uuid('id')->primary();
+            $table->id();
-            $table->string('username')->unique();
+            $table->string('name');
-            $table->string('password')->nullable();
+            $table->string('email')->unique();
-            $table->boolean('enabled')->default(true);
-            $table->string('first_name');
-            $table->string('last_name');
-            $table->string('email');
             $table->timestamp('email_verified_at')->nullable();
-            $table->string('phone')->nullable();
+            $table->string('password');
             $table->rememberToken();
             $table->timestamps();
         });
@@ -30,10 +24,8 @@ return new class extends Migration
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('users');
     }