Merge pull request #57 from irsyadadl/bump

Bump scaffolding to the newest laravel

.env.example

@@ -1,10 +1,21 @@
-APP_NAME="Inertia.ts"
+APP_NAME=Laravel
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
-APP_URL=http://localhost:8000
+APP_TIMEZONE=UTC
+APP_URL=http://localhost
+
+APP_LOCALE=en
+APP_FALLBACK_LOCALE=en
+APP_FAKER_LOCALE=en_US
+
+APP_MAINTENANCE_DRIVER=file
+APP_MAINTENANCE_STORE=database
+
+BCRYPT_ROUNDS=12
 
 LOG_CHANNEL=stack
+LOG_STACK=single
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
@@ -15,22 +26,29 @@ DB_DATABASE=inertia
 DB_USERNAME=root
 DB_PASSWORD=
 
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-FILESYSTEM_DISK=local
-QUEUE_CONNECTION=sync
-SESSION_DRIVER=file
+SESSION_DRIVER=database
 SESSION_LIFETIME=120
+SESSION_ENCRYPT=false
+SESSION_PATH=/
+SESSION_DOMAIN=null
+
+BROADCAST_CONNECTION=log
+FILESYSTEM_DISK=local
+QUEUE_CONNECTION=database
+
+CACHE_STORE=database
+CACHE_PREFIX=
 
 MEMCACHED_HOST=127.0.0.1
 
+REDIS_CLIENT=phpredis
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-MAIL_MAILER=smtp
-MAIL_HOST=mailhog
-MAIL_PORT=1025
+MAIL_MAILER=log
+MAIL_HOST=127.0.0.1
+MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
@@ -43,18 +61,5 @@ 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}"
-
-FEATURE_TERMS_AND_PRIVACY_POLICY=true
+VITE_APP_NAME="${APP_NAME}"
+TERMS_AND_POLICY=true

.gitignore

@@ -6,7 +6,6 @@
 /storage/*.key
 /.phpunit.cache
 /vendor
-bun.lockb
 .env
 .env.backup
 .env.production

app/Clara/Clara.php

@@ -20,6 +20,6 @@ public static function localizedMarkdownPath($name)
 
     public static function hasTermsAndPrivacyPolicyFeature(): bool
     {
-        return config('features.terms_and_privacy_policy');
+        return config('app.terms_and_policy');
     }
 }

app/Http/Controllers/Auth/AuthenticatedSessionController.php

@@ -4,9 +4,9 @@
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Auth\LoginRequest;
-use App\Providers\RouteServiceProvider;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Route;
 use Inertia\Inertia;
 use Inertia\Response;
@@ -33,15 +33,15 @@ public function store(LoginRequest $request): RedirectResponse
 
         $request->session()->regenerate();
 
-        return redirect()->intended(RouteServiceProvider::HOME);
+        return redirect()->intended(route('dashboard', absolute: false));
     }
 
     /**
      * Destroy an authenticated session.
      */
     public function destroy(Request $request): RedirectResponse
     {
-        auth()->guard('web')->logout();
+        Auth::guard('web')->logout();
 
         $request->session()->invalidate();
 

app/Http/Controllers/Auth/ConfirmablePasswordController.php

@@ -3,9 +3,9 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use App\Providers\RouteServiceProvider;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Validation\ValidationException;
 use Inertia\Inertia;
 use Inertia\Response;
@@ -25,7 +25,7 @@ public function show(): Response
      */
     public function store(Request $request): RedirectResponse
     {
-        if (! auth()->guard('web')->validate([
+        if (! Auth::guard('web')->validate([
             'email' => $request->user()->email,
             'password' => $request->password,
         ])) {
@@ -36,6 +36,6 @@ public function store(Request $request): RedirectResponse
 
         $request->session()->put('auth.password_confirmed_at', time());
 
-        return redirect()->intended(RouteServiceProvider::HOME);
+        return redirect()->intended(route('dashboard', absolute: false));
     }
 }

app/Http/Controllers/Auth/EmailVerificationNotificationController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use App\Providers\RouteServiceProvider;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 
@@ -15,7 +14,7 @@ class EmailVerificationNotificationController extends Controller
     public function store(Request $request): RedirectResponse
     {
         if ($request->user()->hasVerifiedEmail()) {
-            return redirect()->intended(RouteServiceProvider::HOME);
+            return redirect()->intended(route('dashboard', absolute: false));
         }
 
         $request->user()->sendEmailVerificationNotification();

app/Http/Controllers/Auth/EmailVerificationPromptController.php

@@ -3,10 +3,8 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use App\Providers\RouteServiceProvider;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Inertia\Inertia;
 use Inertia\Response;
 
 class EmailVerificationPromptController extends Controller
@@ -17,7 +15,7 @@ class EmailVerificationPromptController extends Controller
     public function __invoke(Request $request): RedirectResponse|Response
     {
         return $request->user()->hasVerifiedEmail()
-                    ? redirect()->intended(RouteServiceProvider::HOME)
-                    : Inertia::render('auth/verify-email', ['status' => session('status')]);
+            ? redirect()->intended(route('dashboard', absolute: false))
+            : inertia('auth/verify-email', ['status' => session('status')]);
     }
 }

app/Http/Controllers/Auth/NewPasswordController.php

@@ -30,7 +30,7 @@ public function create(Request $request): Response
     /**
      * Handle an incoming new password request.
      *
-     * @throws \Illuminate\Validation\ValidationException
+     * @throws ValidationException
      */
     public function store(Request $request): RedirectResponse
     {

app/Http/Controllers/Auth/PasswordResetLinkController.php

@@ -25,7 +25,7 @@ public function create(): Response
     /**
      * Handle an incoming password reset link request.
      *
-     * @throws \Illuminate\Validation\ValidationException
+     * @throws ValidationException
      */
     public function store(Request $request): RedirectResponse
     {

app/Http/Controllers/Auth/RegisteredUserController.php

@@ -2,16 +2,14 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\Clara\Clara;
 use App\Http\Controllers\Controller;
 use App\Models\User;
-use App\Providers\RouteServiceProvider;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Validation\Rules;
-use Illuminate\Validation\ValidationException;
 use Inertia\Inertia;
 use Inertia\Response;
 
@@ -28,15 +26,14 @@ public function create(): Response
     /**
      * Handle an incoming registration request.
      *
-     * @throws ValidationException
+     * @throws \Illuminate\Validation\ValidationException
      */
     public function store(Request $request): RedirectResponse
     {
         $request->validate([
             'name' => 'required|string|max:255',
-            'email' => 'required|string|email|max:255|unique:' . User::class,
+            'email' => 'required|string|lowercase|email|max:255|unique:' . User::class,
             'password' => ['required', 'confirmed', Rules\Password::defaults()],
-            'terms' => Clara::hasTermsAndPrivacyPolicyFeature() ? ['accepted', 'required'] : '',
         ]);
 
         $user = User::create([
@@ -47,8 +44,8 @@ public function store(Request $request): RedirectResponse
 
         event(new Registered($user));
 
-        auth()->login($user);
+        Auth::login($user);
 
-        return redirect(RouteServiceProvider::HOME);
+        return redirect(route('dashboard', absolute: false));
     }
 }

app/Http/Controllers/Auth/VerifyEmailController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use App\Providers\RouteServiceProvider;
 use Illuminate\Auth\Events\Verified;
 use Illuminate\Foundation\Auth\EmailVerificationRequest;
 use Illuminate\Http\RedirectResponse;
@@ -16,13 +15,13 @@ class VerifyEmailController extends Controller
     public function __invoke(EmailVerificationRequest $request): RedirectResponse
     {
         if ($request->user()->hasVerifiedEmail()) {
-            return redirect()->intended(RouteServiceProvider::HOME . '?verified=1');
+            return redirect()->intended(route('dashboard', absolute: false) . '?verified=1');
         }
 
         if ($request->user()->markEmailAsVerified()) {
             event(new Verified($request->user()));
         }
 
-        return redirect()->intended(RouteServiceProvider::HOME . '?verified=1');
+        return redirect()->intended(route('dashboard', absolute: false) . '?verified=1');
     }
 }

app/Http/Middleware/HandleInertiaRequests.php

@@ -3,7 +3,7 @@
 namespace App\Http\Middleware;
 
 use App\Clara\Clara;
-use App\Http\Resources\UserResource;
+use App\Http\Resources\AuthenticatedUserResource;
 use Illuminate\Http\Request;
 use Inertia\Middleware;
 use Tighten\Ziggy\Ziggy;
@@ -21,14 +21,13 @@ public function share(Request $request): array
     {
         return array_merge(parent::share($request), [
             'auth' => [
-                'user' => $request->user() ? UserResource::make($request->user()) : null,
+                'user' => $request->user() ? AuthenticatedUserResource::make($request->user()) : null,
             ],
             'ziggy' => fn () => [
                 ...(new Ziggy)->toArray(), ...[
                     'location' => $request->url(),
                 ],
             ],
-
             'hasTermsAndPrivacyPolicyFeature' => Clara::hasTermsAndPrivacyPolicyFeature(),
         ]);
     }

app/Http/Resources/AuthenticatedUserResource.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class AuthenticatedUserResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'avatar' => $this->avatar(),
+            'acronym' => $this->createAcronym($request->user()->name),
+            'id' => $this->id,
+            'username' => $this->username,
+            'name' => $this->name,
+            'email' => $this->email,
+            'status' => $this->hasVerifiedEmail() ? 'Verified' : 'Unverified',
+            'joined' => $this->created_at->format('j M Y, g:i a'),
+        ];
+    }
+
+    protected function createAcronym($string): ?string
+    {
+        $output = null;
+        $token = strtok($string, ' ');
+        while ($token !== false) {
+            $output .= $token[0];
+            $token = strtok(' ');
+        }
+
+        return $output;
+    }
+}

app/Http/Resources/UserResource.php

@@ -15,26 +15,11 @@ class UserResource extends JsonResource
     public function toArray(Request $request): array
     {
         return [
-            'avatar' => $this->avatar(),
-            'acronym' => $this->createAcronym($request->user()->name),
             'id' => $this->id,
-            'username' => $this->username,
             'name' => $this->name,
             'email' => $this->email,
-            'status' => $this->hasVerifiedEmail() ? 'Verified' : 'Unverified',
-            'joined' => $this->created_at->format('j M Y, g:i a'),
+            'joined' => $this->created_at->format('d F Y h:i A'),
+            'status' => $this->email_verified_at !== null ? 'verified' : 'not_verified',
         ];
     }
-
-    protected function createAcronym($string): ?string
-    {
-        $output = null;
-        $token = strtok($string, ' ');
-        while ($token !== false) {
-            $output .= $token[0];
-            $token = strtok(' ');
-        }
-
-        return $output;
-    }
 }