Skip to content

Commit 0731723

Browse files
committed
refactor: remove data and replace with laravel resource
1 parent ce6993a commit 0731723

34 files changed

+2410
-4201
lines changed

app/Data/AuthData.php

-12
This file was deleted.

app/Data/AuthenticatedUserData.php

-16
This file was deleted.

app/Data/FlashMessageData.php

-13
This file was deleted.

app/Data/PagePropsData.php

-13
This file was deleted.

app/Http/Controllers/Auth/AuthenticatedSessionController.php

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ public function store(LoginRequest $request): RedirectResponse
3333

3434
$request->session()->regenerate();
3535

36+
flash('Welcome back!.');
37+
3638
return redirect()->intended(route('dashboard', absolute: false));
3739
}
3840

app/Http/Controllers/Auth/RegisteredUserController.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use Illuminate\Support\Facades\Hash;
1212
use Illuminate\Validation\Rules;
1313
use Illuminate\Validation\ValidationException;
14-
use Inertia\Inertia;
1514
use Inertia\Response;
1615

1716
class RegisteredUserController extends Controller
@@ -21,7 +20,7 @@ class RegisteredUserController extends Controller
2120
*/
2221
public function create(): Response
2322
{
24-
return Inertia::render('auth/register');
23+
return inertia('auth/register');
2524
}
2625

2726
/**

app/Http/Controllers/ProfileController.php

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public function edit(Request $request): Response
2121
return Inertia::render('profile/edit', [
2222
'mustVerifyEmail' => $request->user() instanceof MustVerifyEmail,
2323
'status' => session('status'),
24+
'user' => $request->user(),
2425
]);
2526
}
2627

app/Http/Middleware/HandleInertiaRequests.php

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace App\Http\Middleware;
44

5-
use App\Data\AuthenticatedUserData;
5+
use App\Http\Resources\AuthenticatedUserResource;
66
use Illuminate\Http\Request;
77
use Inertia\Middleware;
88

@@ -33,15 +33,16 @@ public function share(Request $request): array
3333
return [
3434
...parent::share($request),
3535
'auth' => [
36-
'user' => $request->user() ? AuthenticatedUserData::from($request->user()) : null,
36+
'user' => $request->user() ? AuthenticatedUserResource::make($request->user()) : null,
3737
],
3838
'ziggy' => fn () => [
3939
'location' => $request->url(),
4040
'query' => $request->query(),
4141
],
42-
'flash_message' => fn () => [
43-
'type' => $request->session()->get('type') ?? 'success',
42+
'flash' => fn () => [
4443
'message' => $request->session()->get('message'),
44+
'type' => $request->session()->get('type') ?? 'success',
45+
'data' => $request->session()->get('data'),
4546
],
4647
];
4748
}

app/Providers/AppServiceProvider.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Providers;
44

5+
use Illuminate\Http\Resources\Json\JsonResource;
56
use Illuminate\Support\ServiceProvider;
67

78
class AppServiceProvider extends ServiceProvider
@@ -19,6 +20,6 @@ public function register(): void
1920
*/
2021
public function boot(): void
2122
{
22-
//
23+
JsonResource::withoutWrapping();
2324
}
2425
}

app/helpers.php

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
<?php
22

3-
if (! function_exists('flashMessage')) {
4-
function flashMessage($type, $message): void
3+
if (! function_exists('flash')) {
4+
function flash($message, array $data = [], $type = 'success'): void
55
{
6-
session()->flash('type', $type);
76
session()->flash('message', $message);
7+
session()->flash('type', $type);
8+
if (is_array($data)) {
9+
session()->flash('data', $data);
10+
}
811
}
912
}

bun.lockb

0 Bytes
Binary file not shown.

composer.json

-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
"laravel/framework": "^12.0",
1515
"laravel/sanctum": "^4.0",
1616
"laravel/tinker": "^2.10",
17-
"spatie/laravel-data": "^4.7",
18-
"spatie/laravel-typescript-transformer": "^2.4",
1917
"tightenco/ziggy": "^2.0"
2018
},
2119
"require-dev": {

0 commit comments

Comments
 (0)