diff --git a/Web-Application/Fortify/app/Providers/FortifyServiceProvider.php b/Web-Application/Fortify/app/Providers/FortifyServiceProvider.php index 2d741e3..aff0555 100644 --- a/Web-Application/Fortify/app/Providers/FortifyServiceProvider.php +++ b/Web-Application/Fortify/app/Providers/FortifyServiceProvider.php @@ -34,7 +34,7 @@ class FortifyServiceProvider extends ServiceProvider Fortify::resetUserPasswordsUsing(ResetUserPassword::class); RateLimiter::for('login', function (Request $request) { - $throttleKey = Str::transliterate(Str::lower($request->input(Fortify::username())).'|'.$request->ip()); + $throttleKey = Str::transliterate(Str::lower($request->input(Fortify::username())) . '|' . $request->ip()); return Limit::perMinute(5)->by($throttleKey); }); @@ -42,5 +42,14 @@ class FortifyServiceProvider extends ServiceProvider RateLimiter::for('two-factor', function (Request $request) { return Limit::perMinute(5)->by($request->session()->get('login.id')); }); + + // Custom routes defined specifically + Fortify::registerView(function () { + return view('auth.register'); + }); + + Fortify::loginView(function () { + return view('auth.login'); + }); } } diff --git a/Web-Application/Fortify/config/fortify.php b/Web-Application/Fortify/config/fortify.php index cfe8272..726d83b 100644 --- a/Web-Application/Fortify/config/fortify.php +++ b/Web-Application/Fortify/config/fortify.php @@ -73,7 +73,7 @@ return [ | */ - 'home' => '/home', + 'home' => '/dashboard', /* |-------------------------------------------------------------------------- diff --git a/Web-Application/Fortify/package-lock.json b/Web-Application/Fortify/package-lock.json index 6e10898..3ae359b 100644 --- a/Web-Application/Fortify/package-lock.json +++ b/Web-Application/Fortify/package-lock.json @@ -5,11 +5,11 @@ "packages": { "": { "devDependencies": { - "@tailwindcss/vite": "^4.0.0", + "@tailwindcss/vite": "^4.1.4", "axios": "^1.8.2", "concurrently": "^9.0.1", "laravel-vite-plugin": "^1.2.0", - "tailwindcss": "^4.0.0", + "tailwindcss": "^4.1.4", "vite": "^6.2.4" } }, diff --git a/Web-Application/Fortify/package.json b/Web-Application/Fortify/package.json index 4e4ab6f..dfa3ce8 100644 --- a/Web-Application/Fortify/package.json +++ b/Web-Application/Fortify/package.json @@ -6,11 +6,11 @@ "dev": "vite" }, "devDependencies": { - "@tailwindcss/vite": "^4.0.0", + "@tailwindcss/vite": "^4.1.4", "axios": "^1.8.2", "concurrently": "^9.0.1", "laravel-vite-plugin": "^1.2.0", - "tailwindcss": "^4.0.0", + "tailwindcss": "^4.1.4", "vite": "^6.2.4" } } diff --git a/Web-Application/Fortify/resources/css/app.css b/Web-Application/Fortify/resources/css/app.css index 3e6abea..12bc3c1 100644 --- a/Web-Application/Fortify/resources/css/app.css +++ b/Web-Application/Fortify/resources/css/app.css @@ -3,6 +3,8 @@ @source '../../vendor/laravel/framework/src/Illuminate/Pagination/resources/views/*.blade.php'; @source '../../storage/framework/views/*.php'; @source '../**/*.blade.php'; +@import "tailwindcss"; +@source "../views"; @source '../**/*.js'; @theme { diff --git a/Web-Application/Fortify/resources/views/app.blade.php b/Web-Application/Fortify/resources/views/app.blade.php new file mode 100644 index 0000000..d88b231 --- /dev/null +++ b/Web-Application/Fortify/resources/views/app.blade.php @@ -0,0 +1,15 @@ + + + + + + + @vite('resources/css/app.css') + Fortify Authentication + + + + @yield('content') + + + \ No newline at end of file diff --git a/Web-Application/Fortify/resources/views/auth/login.blade.php b/Web-Application/Fortify/resources/views/auth/login.blade.php new file mode 100644 index 0000000..90918d3 --- /dev/null +++ b/Web-Application/Fortify/resources/views/auth/login.blade.php @@ -0,0 +1,52 @@ +@extends('app') + +@section('content') +
+
+

Login Page

+ +
+
+ @csrf +
+ + +

@error('email') {{ $message }} @enderror

+
+
+ + +

@error('password') {{ $message }} @enderror

+
+
+ + +
+
+ Forgot + Password + Register +
+
+ +
+
+
+ + +
+
+
+
+@endsection \ No newline at end of file diff --git a/Web-Application/Fortify/resources/views/auth/register.blade.php b/Web-Application/Fortify/resources/views/auth/register.blade.php new file mode 100644 index 0000000..640af1a --- /dev/null +++ b/Web-Application/Fortify/resources/views/auth/register.blade.php @@ -0,0 +1,60 @@ +@extends('app') + +@section('content') +
+
+

Register Page

+ +
+
+ @csrf +
+ + +

@error('name') {{ $message }} @enderror

+
+
+ + +

@error('email') {{ $message }} @enderror

+
+
+ + +

@error('password') {{ $message }} @enderror

+
+
+ + +

@error('password_confirmation') {{ $message }} @enderror

+
+
+ +
+
+
+ + +
+
+ + Already have an account? + Login + +
+
+
+
+@endsection \ No newline at end of file diff --git a/Web-Application/Fortify/resources/views/dashboard.blade.php b/Web-Application/Fortify/resources/views/dashboard.blade.php new file mode 100644 index 0000000..bfc0aa8 --- /dev/null +++ b/Web-Application/Fortify/resources/views/dashboard.blade.php @@ -0,0 +1,36 @@ +@extends('app') + +@section('content') +
+ + + +
+
+

{{ auth()->user()->email }}

+
+ + +
+ +
+@endsection \ No newline at end of file diff --git a/Web-Application/Fortify/resources/views/welcome.blade.php b/Web-Application/Fortify/resources/views/welcome.blade.php index c893b80..58b8cab 100644 --- a/Web-Application/Fortify/resources/views/welcome.blade.php +++ b/Web-Application/Fortify/resources/views/welcome.blade.php @@ -1,277 +1,1980 @@ - - - - Laravel + + + + @vite('resources/css/app.css') + Laravel - - - + + + - - @if (file_exists(public_path('build/manifest.json')) || file_exists(public_path('hot'))) - @vite(['resources/css/app.css', 'resources/js/app.js']) - @else - - @endif - - -
- @if (Route::has('login')) -