From 71b303c05caffe9dac4c2e2f801fcf5b2c966adb Mon Sep 17 00:00:00 2001 From: David Carr Date: Fri, 29 Mar 2024 23:30:55 +0000 Subject: [PATCH] tweaked auth views --- README.md | 4 +-- .../Auth/RegisteredUserController.php | 7 ---- .../views/auth/confirm-password.blade.php | 21 ++++++------ .../views/auth/forgot-password.blade.php | 21 ++++++------ resources/views/auth/join.blade.php | 22 ++++++------ resources/views/auth/login.blade.php | 33 +++++++++--------- resources/views/auth/register.blade.php | 28 ++++++++------- resources/views/auth/reset-password.blade.php | 20 ++++++----- resources/views/auth/twofa.blade.php | 21 ++++++------ resources/views/auth/twofasetup.blade.php | 24 +++++++------ resources/views/auth/verify-email.blade.php | 34 ++++++++++--------- resources/views/layouts/guest.blade.php | 2 +- resources/views/welcome.blade.php | 6 ++-- 13 files changed, 126 insertions(+), 117 deletions(-) diff --git a/README.md b/README.md index 223a90b..5d9a16b 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ ## Laravel AdminTW -> From version 5 AdminTW is a complete project rather than a package. If you are looking for the package version, please use version 4.0.0. +> From version 5 AdminTW is a complete project rather than a package. If you are looking for the package version, please use version 4. Laravel AdminTW is a Laravel Starter Kit | TALL admin theme. -

+

AdminTw is built on top of Laravel, Livewire, and Tailwind CSS. diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php index 834f04d..4cf3623 100644 --- a/app/Http/Controllers/Auth/RegisteredUserController.php +++ b/app/Http/Controllers/Auth/RegisteredUserController.php @@ -54,13 +54,6 @@ public function store(RegisterRequest $request): RedirectResponse event(new Registered($user)); - add_user_log([ - 'title' => 'registered '.$user->name, - 'reference_id' => $user->id, - 'section' => 'Auth', - 'type' => 'Register', - ]); - $user->sendEmailVerificationNotification(); flash('Please check your email for a verification link.')->info(); diff --git a/resources/views/auth/confirm-password.blade.php b/resources/views/auth/confirm-password.blade.php index 99389d3..348ac4e 100644 --- a/resources/views/auth/confirm-password.blade.php +++ b/resources/views/auth/confirm-password.blade.php @@ -1,17 +1,18 @@ +@section('title', __('Confirm Password')) + - @section('title', __('Confirm Password')) -
- {{ __('This is a secure area of the application. Please confirm your password before continuing.') }} -
+
+ {{ __('This is a secure area of the application. Please confirm your password before continuing.') }} +
- @include('errors.messages') + @include('errors.messages') - - - {{ __('Confirm') }} - - + + + {{ __('Confirm') }} + + diff --git a/resources/views/auth/forgot-password.blade.php b/resources/views/auth/forgot-password.blade.php index 670b877..9499236 100644 --- a/resources/views/auth/forgot-password.blade.php +++ b/resources/views/auth/forgot-password.blade.php @@ -1,17 +1,18 @@ +@section('title', __('Forgot Password')) + - @section('title', __('Forgot Password')) -
- {{ __('Forgot your password? No problem. Just let us know your email address and we will email you a password reset link that will allow you to choose a new one.') }} -
+
+ {{ __('Forgot your password? No problem. Just let us know your email address and we will email you a password reset link that will allow you to choose a new one.') }} +
- @include('errors.messages') + @include('errors.messages') - - {{ old('email') }} - {{ __('Email Password Reset Link') }} - - + + {{ old('email') }} + {{ __('Email Password Reset Link') }} + + diff --git a/resources/views/auth/join.blade.php b/resources/views/auth/join.blade.php index 5911cd4..17e0f01 100644 --- a/resources/views/auth/join.blade.php +++ b/resources/views/auth/join.blade.php @@ -1,20 +1,22 @@ +@section('title', __('Join')) + - @section('title', __('Join')) - @include('errors.success') + @include('errors.success') + +

{{ $user->invite->name }} {{ __('has invited you to join') }} {{ config('app.name') }}.

-

{{ $user->invite->name }} {{ __('has invited you to join') }} {{ config('app.name') }}.

+ - + {{ $user->name }} + {{ $user->email }} + + - {{ $user->name }} - {{ $user->email }} - - + {{ __('Save Password') }} - {{ __('Save Password') }} + - diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 56875e3..35ec33f 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -1,26 +1,27 @@ +@section('title', __('Login')) + - @section('title', __('Login')) - + - @include('errors.messages') + @include('errors.messages') - {{ old('email') }} - + {{ old('email') }} + -
-

{{ __('Forgot your password?') }}

- @if (Route::has('register')) -

{{ __('Register') }}

- @endif -
+
+

{{ __('Forgot your password?') }}

+ @if (Route::has('register')) +

{{ __('Register') }}

+ @endif +
-

- Login -

+

+ Login +

- - + + diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index dd9f0b1..36a4640 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -1,18 +1,22 @@ +@section('title', __('Register')) + - @section('title', __('Register')) - @include('errors.messages') + @include('errors.messages') + + + {{ old('name') }} + {{ old('email') }} + + + +
+

{{ __('Already registered?') }}

+ {{ __('Register') }} +
+ + - - {{ old('name') }} - {{ old('email') }} - - -
-

{{ __('Already registered?') }}

- {{ __('Register') }} -
- diff --git a/resources/views/auth/reset-password.blade.php b/resources/views/auth/reset-password.blade.php index 9d07134..c3df898 100644 --- a/resources/views/auth/reset-password.blade.php +++ b/resources/views/auth/reset-password.blade.php @@ -1,17 +1,19 @@ +@section('title', __('Reset Password')) + - @section('title', __('Reset Password')) - + + + @include('errors.messages') - @include('errors.messages') + + {{ $request->input('email') }} + + + {{ __('Reset Password') }} - - {{ $request->input('email') }} - - - {{ __('Reset Password') }} + - diff --git a/resources/views/auth/twofa.blade.php b/resources/views/auth/twofa.blade.php index 9b1e25e..2291c46 100644 --- a/resources/views/auth/twofa.blade.php +++ b/resources/views/auth/twofa.blade.php @@ -1,20 +1,21 @@ +@section('title', __('2FA')) + - @section('title', __('2FA')) -

{{ __('Please open your authenticator mobile app and enter the code below') }}.

+

{{ __('Please open your authenticator mobile app and enter the code below') }}.

+ + - + {{ old('code') }} - {{ old('code') }} +

-

+ - + +

+ - -

-

- diff --git a/resources/views/auth/twofasetup.blade.php b/resources/views/auth/twofasetup.blade.php index 70c3e33..3eba128 100644 --- a/resources/views/auth/twofasetup.blade.php +++ b/resources/views/auth/twofasetup.blade.php @@ -1,25 +1,27 @@ +@section('title', '2FA') + - @section('title', '2FA')

{{ __('Please open your authenticator mobile app and enter the code below') }}.

-

{{ __('Authenticator apps generate random codes that you can use to sign in. They do not have access to your password or account information') }}.

-

{{ __('We recommend using 1Password') }}.

+

{{ __('Authenticator apps generate random codes that you can use to sign in. They do not have access to your password or account information') }}.

+

{{ __('We recommend using 1Password') }}.

+ +

-

+

{{ __('Scan bar code in your authenticator app or manually enter this key') }} {{ $secretKey }}

-

{{ __('Scan bar code in your authenticator app or manually enter this key') }} {{ $secretKey }}

+ - + {{ $secretKey }} - {{ $secretKey }} + {{ old('code') }} - {{ old('code') }} +

-

+

{{ __('Logout') }}

-

{{ __('Logout') }}

+ - diff --git a/resources/views/auth/verify-email.blade.php b/resources/views/auth/verify-email.blade.php index 0385820..ad16e92 100644 --- a/resources/views/auth/verify-email.blade.php +++ b/resources/views/auth/verify-email.blade.php @@ -1,25 +1,27 @@ - +@section('title', __('Verify Email')) - @section('title', __('Verify Email')) + +
{{ __('Thanks for signing up! Before getting started, could you verify your email address by clicking on the link we just emailed to you? If you didn\'t receive the email, we will gladly send you another.') }} -
- - @if (session('status') == 'verification-link-sent') -
- {{ __('A new verification link has been sent to the email address you provided during registration.') }}
- @endif -
- - {{ __('Resend Verification Email') }} - + @if (session('status') === 'verification-link-sent') +
+ {{ __('A new verification link has been sent to the email address you provided during registration.') }} +
+ @endif + +
+ + {{ __('Resend Verification Email') }} + + + + {{ __('Log Out') }} + +
- - {{ __('Log Out') }} - -
diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php index 987eadd..9a71deb 100644 --- a/resources/views/layouts/guest.blade.php +++ b/resources/views/layouts/guest.blade.php @@ -7,7 +7,7 @@ @yield('title') - {{ config('app.name', 'Laravel') }} @vite(['resources/sass/app.scss', 'resources/js/app.js']) - +
{{ $slot }} diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index 29aa124..b764eb6 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -2,9 +2,9 @@
-

- {{ config('app.name') }} -

+

+ {{ config('app.name') }} +