From 44225b006220caf475309a0a15757976ac17a864 Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Sat, 26 Nov 2022 21:25:27 +0800
Subject: [PATCH] Fix redirect auth

---
 app/Http/Controllers/Auth/LoginController.php |  5 ++++
 app/Http/Middleware/Authenticate.php          |  2 +-
 resources/views/includes/head.blade.php       | 26 +++++++++++++++++
 resources/views/layouts/app.blade.php         | 29 ++-----------------
 resources/views/lelong/showlelong.blade.php   |  4 +--
 5 files changed, 36 insertions(+), 30 deletions(-)
 create mode 100644 resources/views/includes/head.blade.php

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index ee04aa70..5ef14149 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -42,4 +42,9 @@ class LoginController extends Controller
     {
         return 'username';
     }
+
+    public function redirectLogin()
+    {
+        return redirect()->route('login');
+    }
 }
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index 73edac06..704089a7 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -15,7 +15,7 @@ class Authenticate extends Middleware
     protected function redirectTo($request)
     {
         if (! $request->expectsJson()) {
-            return route('loginUser');
+            return route('login');
         }
     }
 }
diff --git a/resources/views/includes/head.blade.php b/resources/views/includes/head.blade.php
new file mode 100644
index 00000000..2fe0c5a0
--- /dev/null
+++ b/resources/views/includes/head.blade.php
@@ -0,0 +1,26 @@
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+
+<!-- CSRF Token -->
+<meta name="csrf-token" content="{{ csrf_token() }}">
+
+<title>{{ config('app.name') }}</title>
+
+<link rel="icon" href="{{asset('img/arrahn_favicon.ico')}}">
+
+<!-- Scripts -->
+<script src="{{ asset('js/app.js') }}"></script>
+<script src="{{ asset('js/jquery-confirm.min.js') }}"></script>
+<script src="{{ asset('js/dataTables.buttons.min.js') }}"></script>
+
+{{-- <script src="{{ asset('js/dataTables.select.min.js') }}" ></script> --}}
+
+<!-- Fonts -->
+<link rel="dns-prefetch" href="//fonts.gstatic.com">
+<link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet">
+<link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Rounded" rel="stylesheet" />
+
+<!-- Styles -->
+<link href="{{ asset('css/app.css') }}" rel="stylesheet">
+<link href="{{ asset('css/jquery-confirm.min.css') }}" rel="stylesheet">
+<link href="{{ asset('css/buttons.dataTables.min.css') }}" rel="stylesheet">
\ No newline at end of file
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index d6a8b9aa..b5159981 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -2,33 +2,8 @@
 <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
 
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <!-- CSRF Token -->
-    <meta name="csrf-token" content="{{ csrf_token() }}">
-
-    <title>{{ config('app.name', 'ArrahnBid') }}</title>
-
-    <link rel="icon" href="{{asset('img/arrahn_favicon.ico')}}">
-
-    <!-- Scripts -->
-    <script src="{{ asset('js/app.js') }}"></script>
-    <script src="{{ asset('js/jquery-confirm.min.js') }}"></script>
-    <script src="{{ asset('js/dataTables.buttons.min.js') }}"></script>
-
-    {{-- <script src="{{ asset('js/dataTables.select.min.js') }}" ></script> --}}
-
-    <!-- Fonts -->
-    <link rel="dns-prefetch" href="//fonts.gstatic.com">
-    <link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Rounded" rel="stylesheet" />
-
-    <!-- Styles -->
-    <link href="{{ asset('css/app.css') }}" rel="stylesheet">
-    <link href="{{ asset('css/jquery-confirm.min.css') }}" rel="stylesheet">
-    <link href="{{ asset('css/buttons.dataTables.min.css') }}" rel="stylesheet">
-
+    @include('includes.head')
+    
     <script type="text/javascript">
         $(document).ready(function() {
             $('#sidebarCollapse').on('click', function() {
diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php
index 8059da67..91b2054e 100644
--- a/resources/views/lelong/showlelong.blade.php
+++ b/resources/views/lelong/showlelong.blade.php
@@ -102,10 +102,10 @@
                         <div class="col-lg-1"></div>
                         <div class="col-md-12 col-lg">
                             <div class="form-group row">
-                                <div class="col-6">
+                                <div class="col-12 col-form-label">
                                     <div class="input-group">
                                         @if($kemaskini == $today) 
-                                        <button class="btn btn-success btn-sm" disabled>Harga Telah Dikemaskini Pada {{date('d-m-Y', strtotime($tarikhkemaskini->updated_at))}}</button>
+                                        <button class="btn btn-success btn-sm" disabled>Harga Emas Lelong Telah Dikemaskini Pada {{date('d-m-Y', strtotime($tarikhkemaskini->updated_at))}}</button>
                                         {{-- Harga Emas Per Gram (916) : RM{{$simulasi->harga_emas_asas}} --}}
                                         @else
                                         <button class="btn btn-danger btn-sm" disabled>Harga Emas Lelong Belum Dikemaskini Hari Ini</button>