Skip to content

Commit f41f91a

Browse files
committed
chore: Apply rebase develop
1 parent e577abf commit f41f91a

25 files changed

+710
-702
lines changed

app/Actions/Fortify/CreateNewUser.php

Lines changed: 0 additions & 53 deletions
This file was deleted.

app/Actions/Fortify/PasswordValidationRules.php

Lines changed: 0 additions & 26 deletions
This file was deleted.

app/Actions/Fortify/ResetUserPassword.php

Lines changed: 0 additions & 26 deletions
This file was deleted.

app/Actions/Fortify/UpdateUserPassword.php

Lines changed: 0 additions & 31 deletions
This file was deleted.

app/Actions/Fortify/UpdateUserProfileInformation.php

Lines changed: 0 additions & 48 deletions
This file was deleted.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?php
2+
3+
namespace App\Http\Controllers\Auth;
4+
5+
use App\Http\Controllers\Controller;
6+
use Illuminate\Auth\Events\Verified;
7+
use Illuminate\Foundation\Auth\EmailVerificationRequest;
8+
use Illuminate\Http\RedirectResponse;
9+
10+
class VerifyEmailController extends Controller
11+
{
12+
/**
13+
* Mark the authenticated user's email address as verified.
14+
*/
15+
public function __invoke(EmailVerificationRequest $request): RedirectResponse
16+
{
17+
if ($request->user()->hasVerifiedEmail()) {
18+
return redirect()->intended(route('dashboard', absolute: false).'?verified=1');
19+
}
20+
21+
if ($request->user()->markEmailAsVerified()) {
22+
event(new Verified($request->user()));
23+
}
24+
25+
return redirect()->intended(route('dashboard', absolute: false).'?verified=1');
26+
}
27+
}

app/Providers/FortifyServiceProvider.php

Lines changed: 0 additions & 47 deletions
This file was deleted.

app/Providers/VoltServiceProvider.php

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?php
2+
3+
namespace App\Providers;
4+
5+
use Illuminate\Support\ServiceProvider;
6+
use Livewire\Volt\Volt;
7+
8+
class VoltServiceProvider extends ServiceProvider
9+
{
10+
/**
11+
* Register services.
12+
*/
13+
public function register(): void
14+
{
15+
//
16+
}
17+
18+
/**
19+
* Bootstrap services.
20+
*/
21+
public function boot(): void
22+
{
23+
Volt::mount([
24+
config('livewire.view_path', resource_path('views/livewire')),
25+
resource_path('views/pages'),
26+
]);
27+
}
28+
}

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"jenssegers/agent": "^2.6.4",
2323
"laravel-notification-channels/telegram": "^4.0",
2424
"laravel-notification-channels/twitter": "^8.0",
25-
"laravel/fortify": "^1.17.4",
2625
"laravel/framework": "^10.0",
2726
"laravel/sanctum": "^3.2.5",
2827
"laravel/slack-notification-channel": "^2.5",
@@ -31,6 +30,7 @@
3130
"laravelcm/laravel-subscriptions": "^1.3",
3231
"laravelcm/livewire-slide-overs": "^1.0",
3332
"livewire/livewire": "^3.0",
33+
"livewire/volt": "^1.6",
3434
"mckenziearts/blade-untitledui-icons": "^1.3",
3535
"notchpay/notchpay-php": "^1.6",
3636
"qcod/laravel-gamify": "1.0.7",
@@ -54,11 +54,12 @@
5454
},
5555
"require-dev": {
5656
"fakerphp/faker": "^1.23.0",
57+
"larastan/larastan": "^2.8",
58+
"laravel/breeze": "^1.29",
5759
"laravel/pint": "^1.10.3",
5860
"laravel/sail": "^1.23.0",
5961
"mockery/mockery": "^1.6.2",
6062
"nunomaduro/collision": "^7.0",
61-
"larastan/larastan": "^2.8",
6263
"pestphp/pest": "^2.32",
6364
"pestphp/pest-plugin-laravel": "^2.1",
6465
"pestphp/pest-plugin-livewire": "^2.1",

0 commit comments

Comments
 (0)