Merge branch 'release/v8.2.41' into main

appdezign · Sep 19, 2024 · df8c5a7 · df8c5a7
2 parents afab37b + 5ee5094
commit df8c5a7
Show file tree

Hide file tree

Showing 6 changed files with 205 additions and 6 deletions.
diff --git a/_assets/_public/images/lara8-logo.svg b/_assets/_public/images/lara8-logo.svg
diff --git 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/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",

diff --git a/views/_user/auth/login.blade.php b/views/_user/auth/login.blade.php
@@ -6,9 +6,9 @@
  <div class="card shadow-sm" style="width: 360px; max-width: 100%;">
  <div class="card-header d-flex justify-content-start ">
 
- {!! 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) !!}
 
  </div>
  <div class="card-body">
@@ -30,18 +30,16 @@
  {!! csrf_field() !!}
 
  <div class="position-relative mb-24">
- <label for="email" class="form-label fs-base">Email</label>
  <input id="email" type="text" class="form-control" name="email"
  value="{{ old('email') }}"
- placeholder="{{ _lanq('lara-common::auth.loginform.placeholder_email') }}"
+ placeholder="{{ _lanq('lara-common::auth.loginform.placeholder_username') }}"
  required
  autofocus>
  <div class="invalid-feedback position-absolute start-0 top-100">
  Please enter a valid email address!
  </div>
  </div>
  <div class="mb-24">
- <label for="password" class="form-label fs-base">Password</label>
  <div class="password-toggle">
  <input id="password" type="password" class="form-control" name="password"
  placeholder="{{ _lanq('lara-common::auth.loginform.placeholder_password') }}"
@@ -56,6 +54,17 @@
  </div>
  </div>
  <button type="submit" class="btn btn-primary shadow-primary btn-lg w-100">Login</button>
+
+ @if(config('lara.auth.can_reset_password'))
+ <hr class="my-24">
+ <div class="row mt-24">
+ <div class="col-sm-12">
+ <a href="{{ route('password.request') }}" class="fs-14">
+ {{ _lanq('lara-common::auth.button.forgot_password') }}
+ </a>
+ </div>
+ </div>
+ @endif
  </form>
 
  </div>

diff --git a/views/_user/auth/passwords/email.blade.php b/views/_user/auth/passwords/email.blade.php
@@ -0,0 +1,67 @@
+@extends('layout_auth')
+
+@section('content')
+
+ <div class="d-flex h-100 justify-content-center align-items-center">
+ <div class="card shadow-sm" style="width: 360px; max-width: 100%;">
+
+ <div class="card-header d-flex justify-content-start ">
+ {!! Theme::img('images/lara8-logo.svg', 'Lara CMS', 'me-16', ['width' => '48']) !!}
+ <h1 class="fs-18 mt-12">
+ {{ ucfirst(_lanq('lara-common::auth.passwordforgot.password_forgot_title')) }}
+ </h1>
+ </div>
+
+ <div class="card-body">
+
+ @if ($errors->any())
+ <div class="alert alert-danger">
+ <ul class="">
+ @foreach ($errors->all() as $error)
+ <li>{{ $error }}</li>
+ @endforeach
+ </ul>
+ </div>
+ @endif
+
+ @if (session('status'))
+ <div class="alert alert-success alert-important mb-6" role="alert">
+ {{ session('status') }}
+ </div>
+ @endif
+
+ <form method="POST" action="{{ route('password.email') }}" class="needs-validation mb-2" novalidate="">
+
+ {!! csrf_field() !!}
+
+ <div class="position-relative mb-24">
+ <input id="email" type="text" class="form-control" name="email"
+ value="{{ old('email') }}"
+ placeholder="{{ _lanq('lara-common::auth.passwordforgot.placeholder_email') }}"
+ required
+ autofocus>
+ <div class="invalid-feedback position-absolute start-0 top-100">
+ Please enter a valid email address!
+ </div>
+ </div>
+
+ <button type="submit" class="btn btn-primary shadow-primary btn-lg w-100">
+ {{ _lanq('lara-common::auth.button.send_password_reset_link') }}
+ </button>
+
+ <hr class="my-24">
+ <div class="row mt-24">
+ <div class="col-sm-12">
+ <a href="{{ route('login') }}" class="fs-14">
+ {{ _lanq('lara-common::auth.button.back_to_login') }}
+ </a>
+ </div>
+ </div>
+
+ </form>
+
+ </div>
+ </div>
+ </div>
+
+@endsection
diff --git a/views/_user/auth/passwords/reset.blade.php b/views/_user/auth/passwords/reset.blade.php
@@ -0,0 +1,77 @@
+@extends('layout_auth')
+
+@section('content')
+
+ <div class="d-flex h-100 justify-content-center align-items-center">
+ <div class="card shadow-sm" style="width: 360px; max-width: 100%;">
+
+ <div class="card-header d-flex justify-content-start ">
+ {!! Theme::img('images/lara8-logo.svg', 'Lara CMS', 'me-16', ['width' => '48']) !!}
+ <h1 class="fs-18 mt-12">
+ {{ ucfirst(_lanq('lara-common::auth.passwordforgot.password_reset_title')) }}
+ </h1>
+ </div>
+
+ <div class="card-body">
+
+ @if ($errors->any())
+ <div class="alert alert-danger">
+ <ul class="">
+ @foreach ($errors->all() as $error)
+ <li>{{ $error }}</li>
+ @endforeach
+ </ul>
+ </div>
+ @endif
+
+ @if (session('status'))
+ <div class="alert alert-success alert-important mb-6" role="alert">
+ {{ session('status') }}
+ </div>
+ @endif
+
+ @if($email)
+
+ <form class="form-horizontal" role="form" method="POST"
+ action="{{ route('password.request') }}">
+
+ {{ csrf_field() }}
+
+ <input type="hidden" name="token" value="{{ $token }}">
+
+ <input id="email" type="hidden" name="email" value="{{ $email }}">
+
+ <div class="fv-row mb-24">
+ <label for="password">{{ _lanq('lara-common::auth.field.password') }}</label>
+
+ <input id="password" type="password" class="form-control" name="password"
+ required>
+ </div>
+
+ <div class="fv-row mb-24">
+ <label for="password-confirm">{{ _lanq('lara-common::auth.field.confirm_password') }}</label>
+ <input id="password-confirm" type="password" class="form-control"
+ name="password_confirmation" required>
+
+ </div>
+
+ <div class="d-grid">
+ <button type="submit" id="kt_sign_in_submit" class="btn btn-primary">
+ <span class="indicator-label">
+ {{ _lanq('lara-common::auth.button.reset_password') }}
+ </span>
+ </button>
+ </div>
+
+ </form>
+ @else
+ <div class="alert alert-warning">
+ {{ _lanq('lara-common::auth.field.email_not_found') }}
+ </div>
+ @endif
+
+ </div>
+ </div>
+ </div>
+
+@endsection