Initial v3 changes, change log to follow.

Author: dcblogdev

composer.json

@@ -11,9 +11,9 @@
     ],
     "homepage": "https://github.com/dcblogdev/laravel-admintw",
     "require": {
-        "php": "^8.0",
-        "illuminate/filesystem": "^9.0|^10.0",
-        "illuminate/support": "^9.0|^10.0"
+        "php": "^8.1",
+        "illuminate/filesystem": "^10.0",
+        "illuminate/support": "^10.0"
     },
     "autoload": {
         "psr-4": {

src/Console/InstallCommand.php

@@ -30,27 +30,23 @@ public function handle(): void
     {
         //copy folders
         (new Filesystem)->copyDirectory(__DIR__.'/../../stubs/app', base_path('app'));
+        (new Filesystem)->copyDirectory(__DIR__.'/../../stubs/config', base_path('config'));
         (new Filesystem)->copyDirectory(__DIR__.'/../../stubs/database', base_path('database'));
-        (new Filesystem)->copyDirectory(__DIR__.'/../../stubs/public', base_path('public'));
         (new Filesystem)->copyDirectory(__DIR__.'/../../stubs/resources', base_path('resources'));
         (new Filesystem)->copyDirectory(__DIR__.'/../../stubs/routes', base_path('routes'));
         (new Filesystem)->copyDirectory(__DIR__.'/../../stubs/stubs', base_path('stubs'));
         (new Filesystem)->copyDirectory(__DIR__.'/../../stubs/tests', base_path('tests'));
 
+        copy(__DIR__.'/../../stubs/.env.example', base_path('.env.example'));
         copy(__DIR__.'/../../stubs/composer.json', base_path('composer.json'));
-        copy(__DIR__.'/../../stubs/phpunit.xml', base_path('phpunit.xml'));
         copy(__DIR__.'/../../stubs/package.json', base_path('package.json'));
+        copy(__DIR__.'/../../stubs/phpunit.xml', base_path('phpunit.xml'));
+        copy(__DIR__.'/../../stubs/pint.json', base_path('pint.json'));
         copy(__DIR__.'/../../stubs/postcss.config.js', base_path('postcss.config.js'));
         copy(__DIR__.'/../../stubs/tailwind.config.js', base_path('tailwind.config.js'));
         copy(__DIR__.'/../../stubs/vite.config.js', base_path('vite.config.js'));
 
-        if (file_exists(base_path('resources/views/welcome.blade.php'))) {
-            unlink(base_path('resources/views/welcome.blade.php'));
-        }
-
-        if (file_exists(base_path('resources/css/app.css'))) {
-            unlink(base_path('resources/css/app.css'));
-        }
+        (new Filesystem)->deleteDirectory('resources/css');
 
         $this->info('Admin theme installed successfully.');
         $this->info('Please run "composer update" then "npm install && npm run build" command to build your assets.');

stubs/.env.example

@@ -0,0 +1,58 @@
+APP_NAME=Laravel
+APP_ENV=local
+APP_KEY=
+APP_DEBUG=true
+APP_URL=http://localhost
+
+LOG_CHANNEL=stack
+LOG_DEPRECATIONS_CHANNEL=null
+LOG_LEVEL=debug
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=base
+DB_USERNAME=root
+DB_PASSWORD=
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+FILESYSTEM_DISK=local
+QUEUE_CONNECTION=sync
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+
+MEMCACHED_HOST=127.0.0.1
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_MAILER=smtp
+MAIL_HOST=127.0.0.1
+MAIL_PORT=2525
+MAIL_USERNAME="${APP_NAME}"
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS="hello@example.com"
+MAIL_FROM_NAME="${APP_NAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+AWS_USE_PATH_STYLE_ENDPOINT=false
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_HOST=
+PUSHER_PORT=443
+PUSHER_SCHEME=https
+PUSHER_APP_CLUSTER=mt1
+
+VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+VITE_PUSHER_HOST="${PUSHER_HOST}"
+VITE_PUSHER_PORT="${PUSHER_PORT}"
+VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
+VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

stubs/app/Http/Controllers/Auth/AuthenticatedSessionController.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests\Auth\LoginRequest;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\View\View;
+
+class AuthenticatedSessionController extends Controller
+{
+    /**
+     * Display the login view.
+     */
+    public function create(): View
+    {
+        return view('auth.login');
+    }
+
+    /**
+     * Handle an incoming authentication request.
+     */
+    public function store(LoginRequest $request): RedirectResponse
+    {
+        $request->authenticate();
+
+        $request->session()->regenerate();
+
+        return redirect()->intended(route('dashboard'));
+    }
+
+    /**
+     * Destroy an authenticated session.
+     */
+    public function destroy(Request $request): RedirectResponse
+    {
+        Auth::guard('web')->logout();
+
+        $request->session()->invalidate();
+
+        $request->session()->regenerateToken();
+
+        return redirect('/');
+    }
+}

stubs/app/Http/Controllers/Auth/ConfirmablePasswordController.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Validation\ValidationException;
+use Illuminate\View\View;
+
+class ConfirmablePasswordController extends Controller
+{
+    /**
+     * Show the confirm password view.
+     */
+    public function show(): View
+    {
+        return view('auth.confirm-password');
+    }
+
+    /**
+     * Confirm the user's password.
+     */
+    public function store(Request $request): RedirectResponse
+    {
+        if (! Auth::guard('web')->validate([
+            'email' => $request->user()->email,
+            'password' => $request->password,
+        ])) {
+            throw ValidationException::withMessages([
+                'password' => __('auth.password'),
+            ]);
+        }
+
+        $request->session()->put('auth.password_confirmed_at', time());
+
+        return redirect()->intended(route('dashboard'));
+    }
+}

stubs/app/Http/Controllers/Auth/EmailVerificationNotificationController.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+
+class EmailVerificationNotificationController extends Controller
+{
+    /**
+     * Send a new email verification notification.
+     */
+    public function store(Request $request): RedirectResponse
+    {
+        if ($request->user()->hasVerifiedEmail()) {
+            return redirect()->intended(route('dashboard'));
+        }
+
+        $request->user()->sendEmailVerificationNotification();
+
+        return back()->with('status', 'verification-link-sent');
+    }
+}

stubs/app/Http/Controllers/Auth/EmailVerificationPromptController.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\View\View;
+
+class EmailVerificationPromptController extends Controller
+{
+    /**
+     * Display the email verification prompt.
+     */
+    public function __invoke(Request $request): RedirectResponse|View
+    {
+        return $request->user()->hasVerifiedEmail()
+                    ? redirect()->intended(route('dashboard'))
+                    : view('auth.verify-email');
+    }
+}

stubs/app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -29,29 +29,25 @@ public function update(Request $request, $id): Redirector|RedirectResponse
         $user = User::findOrFail($id);
 
         $request->validate([
-            'newPassword'     => [
+            'newPassword' => [
                 'required',
                 'string',
-                Password::min(8)
-                    ->mixedCase()
-                    ->letters()
-                    ->numbers()
-                    ->uncompromised()
+                Password::default(),
             ],
-            'confirmPassword' => 'required|same:newPassword'
+            'confirmPassword' => 'required|same:newPassword',
         ], [
-            'newPassword.required'      => 'New password is required',
+            'newPassword.required' => 'New password is required',
             'newPassword.uncompromised' => 'The given new password has appeared in a data leak by https://haveibeenpwned.com please choose a different new password. ',
-            'confirmPassword.required'  => 'Confirm password is required',
-            'confirmPassword.same'      => 'Confirm password and new password must match',
+            'confirmPassword.required' => 'Confirm password is required',
+            'confirmPassword.same' => 'Confirm password and new password must match',
         ]);
 
-        $user->name              = $request->input('name');
-        $user->password          = Hash::make($request->input('newPassword'));
-        $user->is_active         = 1;
-        $user->invite_token      = null;
+        $user->name = $request->input('name');
+        $user->password = Hash::make($request->input('newPassword'));
+        $user->is_active = 1;
+        $user->invite_token = null;
         $user->last_logged_in_at = now();
-        $user->joined_at         = now();
+        $user->joined_at = now();
         $user->save();
 
         $isForced2Fa = Setting::where('key', 'is_forced_2fa')->value('value');
@@ -60,15 +56,15 @@ public function update(Request $request, $id): Redirector|RedirectResponse
         }
 
         AuditTrail::create([
-            'user_id'      => $user->id,
+            'user_id' => $user->id,
             'reference_id' => $user->id,
-            'title'        => "Joined completed",
-            'section'      => 'Auth',
-            'type'         => 'join'
+            'title' => 'Joined completed',
+            'section' => 'Auth',
+            'type' => 'join',
         ]);
 
         auth()->loginUsingId($user->id, true);
 
-        return redirect('admin');
+        return redirect(route('dashboard'));
     }
 }