Skip to content

Commit b1ddcb5

Browse files
committed
Merge branch 'main' into feat/two-factor-auth
# Conflicts: # package-lock.json # resources/js/pages/auth/ConfirmPassword.vue
2 parents c0ae075 + b3401e3 commit b1ddcb5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1778
-291
lines changed

.github/workflows/tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ jobs:
4343
- name: Generate Application Key
4444
run: php artisan key:generate
4545

46-
- name: Publish Ziggy Configuration
47-
run: php artisan ziggy:generate
48-
4946
- name: Build Assets
5047
run: npm run build
5148

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
/public/storage
77
/storage/*.key
88
/storage/pail
9+
/resources/js/actions
10+
/resources/js/routes
11+
/resources/js/wayfinder
912
/vendor
1013
.DS_Store
1114
.env

.prettierignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
resources/js/components/ui/*
2-
resources/js/ziggy.js
32
resources/views/mail/*

app/Http/Middleware/HandleInertiaRequests.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
use Illuminate\Foundation\Inspiring;
66
use Illuminate\Http\Request;
77
use Inertia\Middleware;
8-
use Tighten\Ziggy\Ziggy;
98

109
class HandleInertiaRequests extends Middleware
1110
{
@@ -46,10 +45,6 @@ public function share(Request $request): array
4645
'auth' => [
4746
'user' => $request->user(),
4847
],
49-
'ziggy' => [
50-
...(new Ziggy)->toArray(),
51-
'location' => $request->url(),
52-
],
5348
'sidebarOpen' => ! $request->hasCookie('sidebar_state') || $request->cookie('sidebar_state') === 'true',
5449
];
5550
}

app/Http/Requests/Auth/LoginRequest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use Illuminate\Foundation\Http\FormRequest;
88
use Illuminate\Support\Facades\Auth;
99
use Illuminate\Support\Facades\RateLimiter;
10-
use Illuminate\Support\Str;
1110
use Illuminate\Validation\ValidationException;
1211

1312
class LoginRequest extends FormRequest
@@ -86,6 +85,10 @@ public function ensureIsNotRateLimited(): void
8685
*/
8786
public function throttleKey(): string
8887
{
89-
return Str::transliterate(Str::lower($this->string('email')).'|'.$this->ip());
88+
return $this->string('email')
89+
->lower()
90+
->append('|'.$this->ip())
91+
->transliterate()
92+
->value();
9093
}
9194
}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"laravel/fortify": "^1.28",
1515
"laravel/framework": "^12.0",
1616
"laravel/tinker": "^2.10.1",
17-
"tightenco/ziggy": "^2.4"
17+
"laravel/wayfinder": "^0.1.9"
1818
},
1919
"require-dev": {
2020
"fakerphp/faker": "^1.23",

0 commit comments

Comments
 (0)