Skip to content

Commit 071e299

Browse files
authored
Merge pull request #140 from intentuilabs/upgrade
refactor
2 parents 8d081df + ad9e280 commit 071e299

26 files changed

+2046
-1999
lines changed

app/Http/Controllers/Auth/AuthenticatedSessionController.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use Illuminate\Http\Request;
99
use Illuminate\Support\Facades\Auth;
1010
use Illuminate\Support\Facades\Route;
11-
use Inertia\Inertia;
1211
use Inertia\Response;
1312

1413
class AuthenticatedSessionController extends Controller
@@ -18,7 +17,7 @@ class AuthenticatedSessionController extends Controller
1817
*/
1918
public function create(Request $request): Response
2019
{
21-
return Inertia::render('auth/login', [
20+
return inertia('auth/login', [
2221
'canResetPassword' => Route::has('password.request'),
2322
'status' => $request->session()->get('status'),
2423
]);
@@ -33,6 +32,8 @@ public function store(LoginRequest $request): RedirectResponse
3332

3433
$request->session()->regenerate();
3534

35+
flash('Welcome back!');
36+
3637
return redirect()->intended(route('dashboard', absolute: false));
3738
}
3839

app/Http/Controllers/Auth/RegisteredUserController.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use Illuminate\Support\Facades\Auth;
1111
use Illuminate\Support\Facades\Hash;
1212
use Illuminate\Validation\Rules;
13-
use Inertia\Inertia;
1413
use Inertia\Response;
1514

1615
class RegisteredUserController extends Controller
@@ -20,7 +19,7 @@ class RegisteredUserController extends Controller
2019
*/
2120
public function create(): Response
2221
{
23-
return Inertia::render('auth/register');
22+
return inertia('auth/register');
2423
}
2524

2625
/**
@@ -46,6 +45,8 @@ public function store(Request $request): RedirectResponse
4645

4746
Auth::login($user);
4847

48+
flash('Your account has been successfully created.');
49+
4950
return to_route('dashboard');
5051
}
5152
}

app/Http/Controllers/HomeController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ class HomeController extends Controller
1111
*/
1212
public function __invoke(Request $request)
1313
{
14-
return inertia('home');
14+
return inertia('home/page');
1515
}
1616
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
3+
namespace App\Http\Controllers\Settings;
4+
5+
use App\Http\Controllers\Controller;
6+
7+
class AppearanceController extends Controller
8+
{
9+
public function __invoke()
10+
{
11+
return inertia('settings/appearance');
12+
}
13+
}
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?php
2+
3+
namespace App\Http\Controllers\Settings;
4+
5+
use App\Http\Controllers\Controller;
6+
use Illuminate\Http\RedirectResponse;
7+
use Illuminate\Http\Request;
8+
use Illuminate\Support\Facades\Auth;
9+
10+
class DeleteAccountController extends Controller
11+
{
12+
public function index()
13+
{
14+
return inertia('settings/delete-account');
15+
}
16+
17+
/**
18+
* Delete the user's account.
19+
*/
20+
public function destroy(Request $request): RedirectResponse
21+
{
22+
$request->validate([
23+
'password' => ['required', 'current_password'],
24+
]);
25+
26+
$user = $request->user();
27+
28+
Auth::logout();
29+
30+
$user->delete();
31+
32+
$request->session()->invalidate();
33+
$request->session()->regenerateToken();
34+
35+
flash(
36+
__('Your account has been successfully deleted.'),
37+
);
38+
39+
return redirect('/');
40+
}
41+
}

app/Http/Controllers/Settings/ProfileController.php

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
use Illuminate\Contracts\Auth\MustVerifyEmail;
88
use Illuminate\Http\RedirectResponse;
99
use Illuminate\Http\Request;
10-
use Illuminate\Support\Facades\Auth;
11-
use Inertia\Inertia;
1210
use Inertia\Response;
1311

1412
class ProfileController extends Controller
@@ -18,7 +16,7 @@ class ProfileController extends Controller
1816
*/
1917
public function edit(Request $request): Response
2018
{
21-
return Inertia::render('settings/profile', [
19+
return inertia('settings/profile', [
2220
'mustVerifyEmail' => $request->user() instanceof MustVerifyEmail,
2321
'status' => $request->session()->get('status'),
2422
]);
@@ -39,25 +37,4 @@ public function update(ProfileUpdateRequest $request): RedirectResponse
3937

4038
return to_route('profile.edit');
4139
}
42-
43-
/**
44-
* Delete the user's account.
45-
*/
46-
public function destroy(Request $request): RedirectResponse
47-
{
48-
$request->validate([
49-
'password' => ['required', 'current_password'],
50-
]);
51-
52-
$user = $request->user();
53-
54-
Auth::logout();
55-
56-
$user->delete();
57-
58-
$request->session()->invalidate();
59-
$request->session()->regenerateToken();
60-
61-
return redirect('/');
62-
}
6340
}

app/Providers/AppServiceProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
namespace App\Providers;
44

5-
use Illuminate\Support\Facades\Vite;
65
use Illuminate\Http\Resources\Json\JsonResource;
6+
use Illuminate\Support\Facades\Vite;
77
use Illuminate\Support\ServiceProvider;
88

99
class AppServiceProvider extends ServiceProvider

0 commit comments

Comments
 (0)