From 34992cd179fe35743dd96765a2e8c61535dcbf8c Mon Sep 17 00:00:00 2001
From: Amir Hamzan <62345746+amirhamzan@users.noreply.github.com>
Date: Tue, 18 Jan 2022 22:02:32 +0800
Subject: [PATCH] fix forget password ui

---
 .../views/auth/passwords/email.blade.php      | 189 +++++++-----------
 .../views/auth/passwords/email1.blade.php     | 137 +++++++++++++
 ...{email.blade copy.php => email2.blade.php} |   0
 .../includes/bayaran/pembayaransag.blade.php  |   4 +-
 .../pembayaran/result/gagalportal.blade.php   |   2 +
 5 files changed, 210 insertions(+), 122 deletions(-)
 create mode 100644 resources/views/auth/passwords/email1.blade.php
 rename resources/views/auth/passwords/{email.blade copy.php => email2.blade.php} (100%)

diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index 169cd6c..46a8581 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -1,137 +1,86 @@
-@extends('layouts.app', ['class' => 'bg-white'])
+@extends('includes.login.index')
 
 @section('content')
-{{-- @include('layouts.headers.guest') --}}
 
-<div class="user-login-5 ">
-    <div class="row h-100 w-100 d-flex justify-content-center mx-auto">
-        <div class="col-md-6 col-xl-6">
-            <div class="container text-center mt-7">
-                <img class="login-logo login-6" src="{{ asset('argon') }}/login/logo_arrahn_baru.png">
-                <div class="container mt-5">
+<title>Lupa Kata Laluan | Customer Portal</title>
 
-                    @if (session('status'))
-                    {{-- <div class="alert alert-success" role="alert">
+<h6 style="text-align: center; margin-bottom: 10%;">Lupa Kata Laluan</h6>
+
+@if (session('status'))
+{{-- <div class="alert alert-success" role="alert">
                                 {{ session('status') }}
-                </div> --}}
-                <script>
-                    var status = "{{ session('status') }}";
-                    $.notify({
-                        icon: 'far fa-check-circle fa-2x',
-                        newest_on_top: true,
-                        message: "<strong class='text-center' style='font-size:15px;'>" + status + "</strong>"
-                    }, {
-                        type: 'success',
-                        allow_dismiss: false,
-                        placement: {
-                            align: 'center',
-                            from: 'bottom'
-                        },
-                        animate: {
-                            enter: 'animate__animated animate__bounce',
+</div> --}}
+<script>
+    var status = "{{ session('status') }}";
+    $.notify({
+        icon: 'far fa-check-circle fa-2x',
+        newest_on_top: true,
+        message: "<strong class='text-center' style='font-size:15px; color: #ffff;'>" + status + "</strong>"
+    }, {
+        type: 'success',
+        allow_dismiss: false,
+        placement: {
+            align: 'center',
+            from: 'bottom'
+        },
+        animate: {
+            enter: 'animate__animated animate__bounce',
 
-                            exit: 'animate__animated animate__bounceOutDown'
-                        }
-                    });
-                </script>
-                @endif
+            exit: 'animate__animated animate__bounceOutDown'
+        }
+    });
+</script>
+@endif
 
-                @if (session('info'))
-                {{-- <div class="alert alert-info" role="alert">
+@if (session('info'))
+{{-- <div class="alert alert-info" role="alert">
                                 {{ session('info') }}
-            </div> --}}
-            <script>
-                var status = "{{ session('info') }}";
-                $.notify({
-                    icon: 'fas fa-info fa-2x',
-                    newest_on_top: true,
-                    message: "<strong style='font-size:15px;'>" + status + "</strong>"
-                }, {
-                    type: 'info',
-                    allow_dismiss: false,
-                    placement: {
-                        align: 'center',
-                        from: 'bottom'
-                    },
-                    animate: {
-                        enter: 'animate__animated animate__bounce',
+</div> --}}
+<script>
+    var status = "{{ session('info') }}";
+    $.notify({
+        icon: 'fas fa-info fa-2x',
+        newest_on_top: true,
+        message: "<strong style='font-size:15px;'>" + status + "</strong>"
+    }, {
+        type: 'info',
+        allow_dismiss: false,
+        placement: {
+            align: 'center',
+            from: 'bottom'
+        },
+        animate: {
+            enter: 'animate__animated animate__bounce',
 
-                        exit: 'animate__animated animate__bounceOutDown'
-                    }
-                });
-            </script>
-            @endif
+            exit: 'animate__animated animate__bounceOutDown'
+        }
+    });
+</script>
+@endif
 
-            <form role="form" method="POST" action="{{ route('password.email') }}">
-                @csrf
-                <div class="row d-flex justify-content-center">
-                    <div class="col-xs-5 col-xl-5 ">
-                        <div class="form-group {{ $errors->has('email') ? ' has-danger' : '' }}">
-                            <input placeholder="Emel" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" placeholder="{{ __('Email') }}" type="email" name="email" value="{{ old('email') }}" id="login-username" required autofocus aria-required="true">
-                        </div>
-                        @if ($errors->has('email'))
-                        <span class="invalid-feedback" style="display: block;margin-top:-10px !important;" role="alert">
-                            <strong>{{ $errors->first('email') }}</strong>
-                        </span>
-                        @endif
-                    </div>
-                </div>
+<form role="form" method="POST" action="{{ route('password.email') }}">
+    @csrf
+    <p>Sila masukkan emel</p>
+    <div class="input-group input-group-outline my-3">
 
-                <div class="text-center">
-                    <button type="submit" class="btn btn-success my-4">{{ __('Tetap Semula Katalaluan') }}</button>
-                </div>
-
-                <br>
-                <div class="row">
-                    <div class="col-sm-12 col-xs-12 forgetpassword">
-                        <center>
-                            <div class="forgot-password">
-                                <a href="{{ route('auth.registerfirst') }}" class="text-light">
-                                    <font color="#3598dc">Pertama Kali</font>
-                                </a> |@if (Route::has('password.request')) <a href="#" class="text-light">
-                                    <font color="#3598dc">Lupa Katalaluan</font>
-                                </a>@endif
-                                {{-- <a href="{{ route('auth.registerfirst') }}" class="text-light"><font color="#3598dc">Pertama Kali</font></a> |@if (Route::has('password.request')) <a href="{{ route('password.request') }}" class="text-light">
-                                    <font color="#3598dc">Lupa Katalaluan</font>
-                                </a>@endif --}}
-                            </div>
-                            <div style="font-size: 10px;"><br><br>Paparan terbaik menggunakan Mozilla Firefox, Google Chrome & Internet Explorer 9.0 ke atas dengan resolusi 1920 x 1080</div>
-                        </center>
-                    </div>
-
-                </div>
-            </form>
-
-        </div>
+        <input placeholder="Emel" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" id="login-username">
     </div>
 
+    @if ($errors->has('email'))
+    <span class="invalid-feedback" style="display: block;margin-top:-10px !important;" role="alert">
+        <strong>{{ $errors->first('email') }}</strong>
+    </span>
+    @endif
 
-    <br>
-</div>
-<div class="col-md-6 col-xl-6 py-0 px-0">
+    <div class="text-center">
+        <button type="submit" class="btn bg-gradient-dark w-100 my-4 mb-2" style="background: #4A4E59;">Tetap Semula Kata Laluan</button>
+    </div>
+    <p class="mt-6 text-sm text-center">
 
-    @include('auth.slides.slidespage')
+        <a href="{{ route('auth.registerfirst') }}">Pertama Kali</a>
+        <a href="#" class="text-dark text-gradient font-weight-bold"> | </a>
+        <a href="{{ route('login') }}">Log-Masuk</a>
+    </p>
+</form>
 
-</div>
-</div>
-</div>
-
-<script>
-    var slideIndex = 0;
-    showSlides();
-
-    function showSlides() {
-        var i;
-        var slides = document.getElementsByClassName("mySlides");
-        for (i = 0; i < slides.length; i++) {
-            slides[i].style.display = "none";
-        }
-        slideIndex++;
-        if (slideIndex > slides.length) {
-            slideIndex = 1
-        }
-        slides[slideIndex - 1].style.display = "block";
-        setTimeout(showSlides, 10000); // Change image every 2 seconds
-    }
-</script>
 @endsection
\ No newline at end of file
diff --git a/resources/views/auth/passwords/email1.blade.php b/resources/views/auth/passwords/email1.blade.php
new file mode 100644
index 0000000..169cd6c
--- /dev/null
+++ b/resources/views/auth/passwords/email1.blade.php
@@ -0,0 +1,137 @@
+@extends('layouts.app', ['class' => 'bg-white'])
+
+@section('content')
+{{-- @include('layouts.headers.guest') --}}
+
+<div class="user-login-5 ">
+    <div class="row h-100 w-100 d-flex justify-content-center mx-auto">
+        <div class="col-md-6 col-xl-6">
+            <div class="container text-center mt-7">
+                <img class="login-logo login-6" src="{{ asset('argon') }}/login/logo_arrahn_baru.png">
+                <div class="container mt-5">
+
+                    @if (session('status'))
+                    {{-- <div class="alert alert-success" role="alert">
+                                {{ session('status') }}
+                </div> --}}
+                <script>
+                    var status = "{{ session('status') }}";
+                    $.notify({
+                        icon: 'far fa-check-circle fa-2x',
+                        newest_on_top: true,
+                        message: "<strong class='text-center' style='font-size:15px;'>" + status + "</strong>"
+                    }, {
+                        type: 'success',
+                        allow_dismiss: false,
+                        placement: {
+                            align: 'center',
+                            from: 'bottom'
+                        },
+                        animate: {
+                            enter: 'animate__animated animate__bounce',
+
+                            exit: 'animate__animated animate__bounceOutDown'
+                        }
+                    });
+                </script>
+                @endif
+
+                @if (session('info'))
+                {{-- <div class="alert alert-info" role="alert">
+                                {{ session('info') }}
+            </div> --}}
+            <script>
+                var status = "{{ session('info') }}";
+                $.notify({
+                    icon: 'fas fa-info fa-2x',
+                    newest_on_top: true,
+                    message: "<strong style='font-size:15px;'>" + status + "</strong>"
+                }, {
+                    type: 'info',
+                    allow_dismiss: false,
+                    placement: {
+                        align: 'center',
+                        from: 'bottom'
+                    },
+                    animate: {
+                        enter: 'animate__animated animate__bounce',
+
+                        exit: 'animate__animated animate__bounceOutDown'
+                    }
+                });
+            </script>
+            @endif
+
+            <form role="form" method="POST" action="{{ route('password.email') }}">
+                @csrf
+                <div class="row d-flex justify-content-center">
+                    <div class="col-xs-5 col-xl-5 ">
+                        <div class="form-group {{ $errors->has('email') ? ' has-danger' : '' }}">
+                            <input placeholder="Emel" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" placeholder="{{ __('Email') }}" type="email" name="email" value="{{ old('email') }}" id="login-username" required autofocus aria-required="true">
+                        </div>
+                        @if ($errors->has('email'))
+                        <span class="invalid-feedback" style="display: block;margin-top:-10px !important;" role="alert">
+                            <strong>{{ $errors->first('email') }}</strong>
+                        </span>
+                        @endif
+                    </div>
+                </div>
+
+                <div class="text-center">
+                    <button type="submit" class="btn btn-success my-4">{{ __('Tetap Semula Katalaluan') }}</button>
+                </div>
+
+                <br>
+                <div class="row">
+                    <div class="col-sm-12 col-xs-12 forgetpassword">
+                        <center>
+                            <div class="forgot-password">
+                                <a href="{{ route('auth.registerfirst') }}" class="text-light">
+                                    <font color="#3598dc">Pertama Kali</font>
+                                </a> |@if (Route::has('password.request')) <a href="#" class="text-light">
+                                    <font color="#3598dc">Lupa Katalaluan</font>
+                                </a>@endif
+                                {{-- <a href="{{ route('auth.registerfirst') }}" class="text-light"><font color="#3598dc">Pertama Kali</font></a> |@if (Route::has('password.request')) <a href="{{ route('password.request') }}" class="text-light">
+                                    <font color="#3598dc">Lupa Katalaluan</font>
+                                </a>@endif --}}
+                            </div>
+                            <div style="font-size: 10px;"><br><br>Paparan terbaik menggunakan Mozilla Firefox, Google Chrome & Internet Explorer 9.0 ke atas dengan resolusi 1920 x 1080</div>
+                        </center>
+                    </div>
+
+                </div>
+            </form>
+
+        </div>
+    </div>
+
+
+    <br>
+</div>
+<div class="col-md-6 col-xl-6 py-0 px-0">
+
+    @include('auth.slides.slidespage')
+
+</div>
+</div>
+</div>
+
+<script>
+    var slideIndex = 0;
+    showSlides();
+
+    function showSlides() {
+        var i;
+        var slides = document.getElementsByClassName("mySlides");
+        for (i = 0; i < slides.length; i++) {
+            slides[i].style.display = "none";
+        }
+        slideIndex++;
+        if (slideIndex > slides.length) {
+            slideIndex = 1
+        }
+        slides[slideIndex - 1].style.display = "block";
+        setTimeout(showSlides, 10000); // Change image every 2 seconds
+    }
+</script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/auth/passwords/email.blade copy.php b/resources/views/auth/passwords/email2.blade.php
similarity index 100%
rename from resources/views/auth/passwords/email.blade copy.php
rename to resources/views/auth/passwords/email2.blade.php
diff --git a/resources/views/includes/bayaran/pembayaransag.blade.php b/resources/views/includes/bayaran/pembayaransag.blade.php
index 89487b9..37c9e1d 100644
--- a/resources/views/includes/bayaran/pembayaransag.blade.php
+++ b/resources/views/includes/bayaran/pembayaransag.blade.php
@@ -261,8 +261,8 @@
                 </div>
 
 
-                <div class="d-flex justify-content-between col-12 mt-3 align-self-end">
-                    <button type="button" class="btn btn-danger">Batal</button>
+                <div class="d-flex justify-content-end col-12 mt-3 align-self-end">
+                    <!-- <button type="button" class="btn btn-danger">Batal</button> -->
                     <button type="submit" id="bayarsbmt" class="btn btn-primary" disabled onclick="loadingbtn();">Bayar</button>
                 </div>
             </div>
diff --git a/resources/views/pembayaran/result/gagalportal.blade.php b/resources/views/pembayaran/result/gagalportal.blade.php
index 281d5ea..feebf20 100644
--- a/resources/views/pembayaran/result/gagalportal.blade.php
+++ b/resources/views/pembayaran/result/gagalportal.blade.php
@@ -2,6 +2,8 @@
 
 @section('content')
 
+<title>Pembayaran Tidak Berjaya | Customer Portal</title>
+
 <div class="container mt-6">
     <div class="row">
         <div class="col">