From efba3dff84d14c98875fd2b0d9809322ef95f36b Mon Sep 17 00:00:00 2001
From: Paul Couture <paul@paulcouture.com>
Date: Fri, 15 Dec 2023 00:53:04 -0600
Subject: [PATCH] fix: fixing login and forgot password

---
 site/resources/scss/components/_auth.scss     |  6 ++
 .../views/auth/forgot-password.blade.php      | 14 ++--
 site/resources/views/auth/login.blade.php     | 50 +++++------
 site/resources/views/layouts/guest.blade.php  | 84 +++++++++----------
 .../views/partials/nav/head.blade.php         |  2 +-
 5 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/site/resources/scss/components/_auth.scss b/site/resources/scss/components/_auth.scss
index 56dd5ea..c2b2bf6 100644
--- a/site/resources/scss/components/_auth.scss
+++ b/site/resources/scss/components/_auth.scss
@@ -8,3 +8,9 @@
         background: $color-primary;
     }
 }
+.theme-light {
+    .authbox {
+        background: $body-bg-light;
+        border-color: darken($body-bg-light, 10%);
+    }
+}
diff --git a/site/resources/views/auth/forgot-password.blade.php b/site/resources/views/auth/forgot-password.blade.php
index 3c70788..67df741 100644
--- a/site/resources/views/auth/forgot-password.blade.php
+++ b/site/resources/views/auth/forgot-password.blade.php
@@ -2,23 +2,19 @@
     <div class="mb-4 text-sm text-gray-600 dark:text-gray-400">
         {{ __('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.') }}
     </div>
-
-    <!-- Session Status -->
+    {{-- Session Status --}}
     <x-auth-session-status class="mb-4" :status="session('status')" />
-
     <form method="POST" action="{{ route('password.email') }}">
         @csrf
-
-        <!-- Email Address -->
+        {{-- Email Address --}}
         <div>
             <x-input-label for="email" :value="__('Email')" />
             <x-text-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email')" required autofocus />
             <x-input-error :messages="$errors->get('email')" class="mt-2" />
         </div>
-
-        <div class="flex items-center justify-end mt-4">
-            <x-primary-button>
-                {{ __('Email Password Reset Link') }}
+        <div class="flex items-center justify-end mt-4 mb-4">
+            <x-primary-button class="btn btn-gradient btn-medium">
+                <span>{{ __('Email Password Reset Link') }}</span>
             </x-primary-button>
         </div>
     </form>
diff --git a/site/resources/views/auth/login.blade.php b/site/resources/views/auth/login.blade.php
index 7edaaba..1422fe4 100644
--- a/site/resources/views/auth/login.blade.php
+++ b/site/resources/views/auth/login.blade.php
@@ -1,51 +1,53 @@
 <x-guest-layout>
-    <!-- Session Status -->
+        <div class="row mt-4 gutter-0">
+            <div class="col">
+                <div class="signin-content">
+                    <div class="mb-6">
+                        <h2 class="mb-2">Sign in with your existing account</h2>
+                        <p class="normal">Welcome back! Please enter your credentials to sign in.</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+    {{-- Session Status --}}
     <x-auth-session-status class="mb-4" :status="session('status')" />
-
     <form method="POST" action="{{ route('login') }}">
         @csrf
-
-        <!-- Email Address -->
+        {{-- Email Address --}}
         <div>
             <x-input-label for="email" :value="__('Email')" />
             <x-text-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email')" required autofocus autocomplete="username" />
             <x-input-error :messages="$errors->get('email')" class="mt-2" />
         </div>
-
-        <!-- Password -->
+        {{-- Password --}}
         <div class="mt-4">
             <x-input-label for="password" :value="__('Password')" />
-
             <x-text-input id="password" class="block mt-1 w-full"
-                            type="password"
-                            name="password"
-                            required autocomplete="current-password" />
-
+                type="password"
+                name="password"
+                required autocomplete="current-password" />
             <x-input-error :messages="$errors->get('password')" class="mt-2" />
         </div>
-
-        <!-- Remember Me -->
-        <div class="block mt-4">
-            <label for="remember_me" class="inline-flex items-center">
-                <input id="remember_me" type="checkbox" class="rounded dark:bg-gray-900 border-gray-300 dark:border-gray-700 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800" name="remember">
-                <span class="ml-2 text-sm text-gray-600 dark:text-gray-400">{{ __('Remember me') }}</span>
+        {{-- Remember Me --}}
+        <div class="block mt-4 form-check">
+            <input id="remember_me" type="checkbox" class="form-check-input" name="remember">
+            <label for="remember_me" class="form-check-label">
+                {{ __('Remember me') }}
             </label>
         </div>
-
-        <div class="flex items-center justify-end mt-4 mb-4">
+        <div class="justify-content-end mt-4 mb-4">
             @if (Route::has('password.request'))
-                <a class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800" href="{{ route('password.request') }}">
+                <a class="" href="{{ route('password.request') }}">
                     {{ __('Forgot your password?') }}
                 </a>
             @endif
-
             <x-primary-button class="ml-3 btn btn-gradient" style="background:#ff512f;">
                 <span>{{ __('Log in') }}</span>
             </x-primary-button>
         </div>
     </form>
-    <hr>
-    <div class="flex items-center justify-center mt-4 text-grey-600 text-sm dark:text-grey-400">
-        Not registered yet? <a href="/register" class="ml-3 underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800">Register Now</a>
+    <hr class="mb-4">
+    <div class="">
+        Not registered yet? <a href="/register" class="">Register Now</a>
     </div>
 </x-guest-layout>
diff --git a/site/resources/views/layouts/guest.blade.php b/site/resources/views/layouts/guest.blade.php
index ca21c44..0442ab0 100644
--- a/site/resources/views/layouts/guest.blade.php
+++ b/site/resources/views/layouts/guest.blade.php
@@ -1,49 +1,45 @@
-<!DOCTYPE html>
-<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="csrf-token" content="{{ csrf_token() }}">
+@extends('layouts.master')
 
-        <title>{{ config('app.name', 'Laravel') }}</title>
-        @include('partials/favicon')
-        @vite(['resources/scss/app.scss'])
-        @livewireStyles
-        @yield('additional_headers')
-        <!-- Fonts -->
-        <link rel="preconnect" href="https://fonts.bunny.net">
-        <link href="https://fonts.bunny.net/css?family=figtree:400,500,600&display=swap" rel="stylesheet" />
+@section('page-title', 'Account')
 
-        <!-- Scripts -->
-        @vite(['resources/css/app.css', 'resources/js/app.js'])
-    </head>
-    <body class="antialiased">
-        @include('partials/preloader')
-        <div class="min-h-screen flex flex-col sm:justify-center items-center pt-6 sm:pt-0">
-            <div>
-                <a href="/">
-                    <x-application-logo class="w-20 h-20 fill-current" />
-                </a>
-            </div>
+@section('page-top')
+<section class="inner-page-banner bg-2 bg-image">
+    <div class="container">
+        <div class="inner text-center">
+            <h1 class="title">Sign In</h1>
+            <nav class="mt-4">
+                <ol class="breadcrumb justify-content-center">
+                    <li class="breadcrumb-item"><a href="/">Home</a></li>
+                    <li class="breadcrumb-item active">Account</li>
+                </ol>
+            </nav>
+        </div>
+    </div>
+</section>
+@endsection
 
-            <div class="authbox w-full sm:max-w-md mt-6 px-6 py-4 shadow-md overflow-hidden sm:rounded-lg">
-                {{ $slot }}
+@section('page-content')
+<section class="signup-wrapper signin-wrapper ptb-120">
+    <div class="container">
+        {{--
+        <div class="row align-items-center gutter-0">
+            <div class="col-xl-6 offset-xl-3 col-lg-12 ">
+                <div class="signin-content">
+                    <div class="mb-6">
+                        <h2 class="mb-2">Sign in with your existing account</h2>
+                        <p class="normal">Welcome back! Please enter your credentials to sign in.</p>
+                    </div>
+                </div>
             </div>
         </div>
-        <script src="{{ config('app.static_asset_url') }}/v3/dist/vendor/js/jquery.js"></script>
-        <script src="{{ config('app.static_asset_url') }}/v3/dist/vendor/js/jquery.nice-select.min.js"></script>
-        <script src="{{ config('app.static_asset_url') }}/v3/dist/vendor/js/modernizer.min.js"></script>
-        <script src="{{ config('app.static_asset_url') }}/v3/dist/vendor/js/slick.min.js"></script>
-        <script src="{{ config('app.static_asset_url') }}/v3/dist/vendor/js/bootstrap.min.js"></script>
-        <script src="{{ config('app.static_asset_url') }}/v3/dist/vendor/js/waypoint.js"></script>
-        <script src="{{ config('app.static_asset_url') }}/v3/dist/vendor/js/js.cookie.js"></script>
-        <script src="{{ config('app.static_asset_url') }}/v3/dist/vendor/js/count-down.js"></script>
-        <script src="{{ config('app.static_asset_url') }}/v3/dist/vendor/js/counter-up.js"></script>
-        <script src="{{ config('app.static_asset_url') }}/v3/dist/vendor/js/isotop.js"></script>
-        <script src="{{ config('app.static_asset_url') }}/v3/dist/vendor/js/imageloaded.js"></script>
-        <script src="{{ config('app.static_asset_url') }}/v3/dist/vendor/js/aos.js"></script>
-        <script src="{{ config('app.static_asset_url') }}/v3/dist/vendor/js/jquery.custom-file-input.js"></script>
-        @livewireScriptConfig
-        @vite(['resources/js/app.js'])
-    </body>
-</html>
+        --}}
+        <div class="row">
+            <div class="col-xl-6 offset-xl-3 col-lg-12">
+                <div class="authbox">
+                    {{ $slot }}
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+@endsection
diff --git a/site/resources/views/partials/nav/head.blade.php b/site/resources/views/partials/nav/head.blade.php
index 35967a9..41fed53 100644
--- a/site/resources/views/partials/nav/head.blade.php
+++ b/site/resources/views/partials/nav/head.blade.php
@@ -51,7 +51,7 @@
                 --}}
                 @if (!Auth::user())
                     <li class="wallet-button"> <a href="/login" class="btn btn-gradient btn-small">
-                        <span><i class="ri-wallet-3-line"></i>Join In</span></a>
+                        <span><i class="ri-account-circle-line"></i>Join In</span></a>
                     </li>
                 @else
                 <li class="avatar-info"> <a href="#"><img