From 6cc1a9a17439b0ced5d35401be7ae636acd93e6e Mon Sep 17 00:00:00 2001 From: Sybrand Hoeksma Date: Thu, 19 Sep 2024 13:50:17 +0200 Subject: [PATCH 1/2] Update templates for password reset --- _assets/_public/images/lara8-logo.svg | 35 ++++++++++ _assets/scss/components/_auth.scss | 11 ++++ views/_user/auth/login.blade.php | 19 ++++-- views/_user/auth/passwords/email.blade.php | 67 +++++++++++++++++++ views/_user/auth/passwords/reset.blade.php | 77 ++++++++++++++++++++++ 5 files changed, 204 insertions(+), 5 deletions(-) create mode 100644 _assets/_public/images/lara8-logo.svg create mode 100644 views/_user/auth/passwords/email.blade.php create mode 100644 views/_user/auth/passwords/reset.blade.php diff --git a/_assets/_public/images/lara8-logo.svg b/_assets/_public/images/lara8-logo.svg new file mode 100644 index 0000000..be470e9 --- /dev/null +++ b/_assets/_public/images/lara8-logo.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + L + + + 8 + + + + + + + + + + diff --git a/_assets/scss/components/_auth.scss b/_assets/scss/components/_auth.scss index d7eb60b..6616ee8 100644 --- a/_assets/scss/components/_auth.scss +++ b/_assets/scss/components/_auth.scss @@ -10,6 +10,17 @@ height: 100%; background-color: rgba($lara-primary-dark, 0.7); } + .alert { + font-size: 0.875rem; + ul { + list-style: none; + margin: 0; + padding: 0; + li { + font-size: 0.875rem; + } + } + } } .was-validated { .password-toggle { diff --git a/views/_user/auth/login.blade.php b/views/_user/auth/login.blade.php index d19351f..96b7813 100644 --- a/views/_user/auth/login.blade.php +++ b/views/_user/auth/login.blade.php @@ -6,9 +6,9 @@
- {!! Theme::img('images/lara-logo-2023.svg', 'Silicon', 'me-15', ['width' => '47']) !!} + {!! Theme::img('images/lara8-logo.svg', 'Lara CMS', 'me-16', ['width' => '48']) !!} - {!! _header('title', ucfirst(_lanq('lara-front::user.headers.login')), 'm-0', $data->htag->titleTag, $data->htag->id) !!} + {!! _header('title', ucfirst(_lanq('lara-front::user.headers.login')), 'h2 mb-0', $data->htag->titleTag, $data->htag->id) !!}
@@ -30,10 +30,9 @@ {!! csrf_field() !!}
-
@@ -41,7 +40,6 @@
-
+ + @if(config('lara.auth.can_reset_password')) +
+
+
+ + {{ _lanq('lara-common::auth.button.forgot_password') }} + +
+
+ @endif
diff --git a/views/_user/auth/passwords/email.blade.php b/views/_user/auth/passwords/email.blade.php new file mode 100644 index 0000000..6100a56 --- /dev/null +++ b/views/_user/auth/passwords/email.blade.php @@ -0,0 +1,67 @@ +@extends('layout_auth') + +@section('content') + +
+
+ +
+ {!! Theme::img('images/lara8-logo.svg', 'Lara CMS', 'me-16', ['width' => '48']) !!} +

+ {{ ucfirst(_lanq('lara-common::auth.passwordforgot.password_forgot_title')) }} +

+
+ +
+ + @if ($errors->any()) +
+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
+ @endif + + @if (session('status')) + + @endif + +
+ + {!! csrf_field() !!} + +
+ +
+ Please enter a valid email address! +
+
+ + + +
+
+
+ + {{ _lanq('lara-common::auth.button.back_to_login') }} + +
+
+ +
+ +
+
+
+ +@endsection diff --git a/views/_user/auth/passwords/reset.blade.php b/views/_user/auth/passwords/reset.blade.php new file mode 100644 index 0000000..b36740a --- /dev/null +++ b/views/_user/auth/passwords/reset.blade.php @@ -0,0 +1,77 @@ +@extends('layout_auth') + +@section('content') + +
+
+ +
+ {!! Theme::img('images/lara8-logo.svg', 'Lara CMS', 'me-16', ['width' => '48']) !!} +

+ {{ ucfirst(_lanq('lara-common::auth.passwordforgot.password_reset_title')) }} +

+
+ +
+ + @if ($errors->any()) +
+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
+ @endif + + @if (session('status')) + + @endif + + @if($email) + +
+ + {{ csrf_field() }} + + + + + +
+ + + +
+ +
+ + + +
+ +
+ +
+ +
+ @else +
+ {{ _lanq('lara-common::auth.field.email_not_found') }} +
+ @endif + +
+
+
+ +@endsection From 5ee5094c18b71d699cb23405faf82d36b017bd97 Mon Sep 17 00:00:00 2001 From: Sybrand Hoeksma Date: Thu, 19 Sep 2024 13:54:19 +0200 Subject: [PATCH 2/2] Bump version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 419dcea..dcea834 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "appdezign/lara-base-theme", "description": "Lara CMS Base Theme", - "version": "8.2.40", + "version": "8.2.41", "keywords": ["Lara", "CMS"], "license": "proprietary", "homepage": "https://firmaq.nl",