From cbfd13ffceb71ea24242cc08a7f6fbd102ebc77f Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Sun, 5 Dec 2021 16:24:56 +1100
Subject: [PATCH] Minor changes to architect theme

---
 .../architect/views/auth/login.blade.php      | 114 ++++++++++++++++++
 .../views/auth/partials/scripts.blade.php     |   0
 .../architect/views/layouts/app.blade.php     |  26 ++--
 .../architect/views/layouts/auth.blade.php    |  21 ++++
 .../layouts/partials/contentfooter.blade.php  |   6 +-
 .../layouts/partials/contentheader.blade.php  |  65 +++++-----
 .../views/layouts/partials/topmenu.blade.php  |   4 +-
 7 files changed, 189 insertions(+), 47 deletions(-)
 create mode 100644 resources/themes/architect/views/auth/login.blade.php
 create mode 100644 resources/themes/architect/views/auth/partials/scripts.blade.php
 create mode 100644 resources/themes/architect/views/layouts/auth.blade.php

diff --git a/resources/themes/architect/views/auth/login.blade.php b/resources/themes/architect/views/auth/login.blade.php
new file mode 100644
index 0000000..648c704
--- /dev/null
+++ b/resources/themes/architect/views/auth/login.blade.php
@@ -0,0 +1,114 @@
+@extends('architect::layouts.auth')
+
+@section('htmlheader_title')
+	Log in
+@endsection
+
+@section('content')
+	<!-- /.login-logo -->
+	<div class="app-container app-theme-white body-tabs-shadow">
+		<div class="app-container">
+			<div class="h-100 bg-animation">
+				<div class="d-flex h-100 justify-content-center align-items-center">
+					<div class="mx-auto app-login-box col-md-8">
+						@if(file_exists('login-note.html'))
+							<div class="mx-auto card text-white card-body bg-primary w-50">
+								<h5 class="text-white card-title"><i class="icon fa-2x fas fa-info pr-3"></i><span class="font-size-xlg">NOTE</span></h5>
+								<span class="w-100 pb-0">
+									{!! file_get_contents('login-note.html') !!}
+								</span>
+							</div>
+						@endif
+
+						<div class="modal-dialog w-100 mx-auto">
+							<div class="modal-content">
+								<form class="needs-validation" novalidate method="post">
+									{{ csrf_field() }}
+
+									<div class="modal-body">
+										<div class="h5 modal-title text-center">
+											<h4 class="mt-2">
+												<div class="app-logo mx-auto mb-3"><img class="w-75" src="{{ url('img/logo-h-lg.png') }}"></div>
+												<small>@lang('Sign in to <strong>:server</strong>',['server'=>'Foo'])</small>
+											</h4>
+										</div>
+
+										<div class="form-row">
+											<div class="col-md-12 mt-3">
+												<label class="mb-1">Email</label>
+												<input name="email" id="user" placeholder="" type="email" class="form-control" required="">
+												<div class="invalid-feedback">
+													@lang('Please enter your email')
+												</div>
+											</div>
+
+											<div class="col-md-12 mt-2">
+												<label class="mb-1">@lang('Password')</label>
+												<input name="password" id="password" placeholder="" type="password" class="form-control" required>
+												<div class="invalid-feedback">
+													@lang('Please enter your password')
+												</div>
+											</div>
+										</div>
+									</div>
+
+									<div class="modal-footer">
+										@if (count($errors) > 0)
+											<div class="alert alert-danger w-100">
+												<strong>Whoops!</strong> Something went wrong?<br><br>
+												<ul>
+													@foreach ($errors->all() as $error)
+														<li>{{ $error }}</li>
+													@endforeach
+												</ul>
+											</div>
+										@endif
+										<div class="float-right">
+											<button class="btn btn-primary btn-lg">Login</button>
+										</div>
+									</div>
+								</form>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+@endsection
+
+@section('page-scripts')
+	<style>
+		label {
+			text-transform: uppercase;
+			letter-spacing: 0.05em;
+			font-size: 85%;
+			font-weight: bold;
+		}
+
+		table.table tr:last-child {
+			border-bottom: 1px solid #e9ecef;
+		}
+	</style>
+
+	<script>
+		// Example starter JavaScript for disabling form submissions if there are invalid fields
+		(function () {
+			'use strict';
+			window.addEventListener('load',function () {
+				// Fetch all the forms we want to apply custom Bootstrap validation styles to
+				var forms = document.getElementsByClassName('needs-validation');
+				// Loop over them and prevent submission
+				var validation = Array.prototype.filter.call(forms, function (form) {
+					form.addEventListener('submit', function (event) {
+						if (form.checkValidity() === false) {
+							event.preventDefault();
+							event.stopPropagation();
+						}
+						form.classList.add('was-validated');
+					}, false);
+				});
+			}, false);
+		})();
+	</script>
+@append
diff --git a/resources/themes/architect/views/auth/partials/scripts.blade.php b/resources/themes/architect/views/auth/partials/scripts.blade.php
new file mode 100644
index 0000000..e69de29
diff --git a/resources/themes/architect/views/layouts/app.blade.php b/resources/themes/architect/views/layouts/app.blade.php
index 2d83dd6..21f6c0e 100644
--- a/resources/themes/architect/views/layouts/app.blade.php
+++ b/resources/themes/architect/views/layouts/app.blade.php
@@ -1,5 +1,5 @@
-<!doctype html>
-<html lang="en">
+<!DOCTYPE html>
+<html>
 	@section('htmlheader')
 		@include('architect::layouts.partials.htmlheader')
 	@show
@@ -8,22 +8,24 @@
 		<div class="app-container app-theme-white body-tabs-shadow fixed-sidebar">
 			@include('architect::layouts.partials.topmenu')
 
-			{{--
-			@include('architect::layouts.partials.controlsidebar')
-			--}}
+			@includeIf('architect::layouts.partials.controlsidebar')
 
 			<div class="app-main">
 				@include('architect::layouts.partials.sidebarmenu')
 
 				<div class="app-main__outer">
 					<div class="app-main__inner">
-						@include('architect::layouts.partials.contentheader')
+						<div class="main-content">
+							@if (trim($__env->yieldContent('page_title')))
+								@include('architect::layouts.partials.contentheader')
+							@endif
 
-						<!-- Main content -->
-						<div class="row">
-							<div class="col-12">
-								<!-- Your Page Content Here -->
-								@yield('main-content')
+							<!-- Main content -->
+							<div class="row">
+								<div class="col-12">
+									<!-- Your Page Content Here -->
+									@yield('main-content')
+								</div>
 							</div>
 						</div>
 					</div>
@@ -42,4 +44,4 @@
 			@yield('page-scripts')
 		@show
 	</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/resources/themes/architect/views/layouts/auth.blade.php b/resources/themes/architect/views/layouts/auth.blade.php
new file mode 100644
index 0000000..29bdda9
--- /dev/null
+++ b/resources/themes/architect/views/layouts/auth.blade.php
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+	@section('htmlheader')
+		@include('architect::layouts.partials.htmlheader')
+	@show
+
+	<body class="hold-transition login-page">
+		<div id="app">
+			@yield('content')
+		</div>
+
+		@section('scripts')
+			@include('architect::auth.partials.scripts')
+
+			{{-- Scripts --}}
+			{!! Asset::scripts() !!}
+
+			@yield('page-scripts')
+		@show
+	</body>
+</html>
\ No newline at end of file
diff --git a/resources/themes/architect/views/layouts/partials/contentfooter.blade.php b/resources/themes/architect/views/layouts/partials/contentfooter.blade.php
index e7799c4..ef32cd3 100644
--- a/resources/themes/architect/views/layouts/partials/contentfooter.blade.php
+++ b/resources/themes/architect/views/layouts/partials/contentfooter.blade.php
@@ -5,7 +5,7 @@
 				<ul class="nav">
 					{{--
 					<li class="nav-item">
-						<a href="javascript:void(0);" class="nav-link">Footer Link 1</a>
+						<a href="javascript:void(0);" class="nav-link">Footer Link</a>
 					</li>
 					--}}
 				</ul>
@@ -18,7 +18,7 @@
 							<div class="badge badge-success mr-1 ml-0">
 								<small>NEW</small>
 							</div>
-							Footer Link 4
+							Footer Link
 						</a>
 					</li>
 					--}}
@@ -26,4 +26,4 @@
 			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/themes/architect/views/layouts/partials/contentheader.blade.php b/resources/themes/architect/views/layouts/partials/contentheader.blade.php
index 16feb61..46f456c 100644
--- a/resources/themes/architect/views/layouts/partials/contentheader.blade.php
+++ b/resources/themes/architect/views/layouts/partials/contentheader.blade.php
@@ -1,44 +1,49 @@
 <div class="app-page-title">
 	<div class="page-title-wrapper">
 		<div class="page-title-heading">
-			<div class="page-title-icon">
-				<i class="@yield('page_icon','pe-7s-car')"></i>
-			</div>
+			@if (trim($__env->yieldContent('page_icon')))
+				<div class="page-title-icon f32">
+					<i class="@yield('page_icon','')"></i>
+				</div>
+			@endif
 			<div>
 				@yield('page_title','Page Title')
 				<div class="page-title-subheading">
-					@yield('page_subtitle','Page Sub Title')
+					@yield('page_subtitle','')
 				</div>
 			</div>
 		</div>
-		<div class="page-title-actions">
-			{{--
-			<button type="button" data-toggle="tooltip" title="Example Tooltip" data-placement="bottom" class="btn-shadow mr-3 btn btn-dark">
-				<i class="fas fa-star"></i>
-			</button>
-			--}}
-			<div class="d-inline-block dropdown">
-				<button type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn-shadow dropdown-toggle btn btn-info">
-					<span class="btn-icon-wrapper pr-2 opacity-7">
-						<i class="fas fa-business-time fa-w-20"></i>
-					</span>
-					Item Menu
-				</button>
 
-				<div tabindex="-1" role="menu" aria-hidden="true" class="dropdown-menu dropdown-menu-right">
-					<ul class="nav flex-column">
-						{{--
-						<li class="nav-item">
-							<a href="javascript:void(0);" class="nav-link">
-								<i class="nav-link-icon lnr-inbox"></i>
-								<span>Inbox</span>
-								<div class="ml-auto badge badge-pill badge-secondary">86</div>
-							</a>
-						</li>
-						--}}
-					</ul>
+		@isset($page_actions)
+			<div class="page-title-actions">
+				{{--
+				<button type="button" data-toggle="tooltip" title="Example Tooltip" data-placement="bottom" class="btn-shadow mr-3 btn btn-dark">
+					<i class="fa fa-star"></i>
+				</button>
+				--}}
+				<div class="d-inline-block dropdown">
+					<button type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn-shadow dropdown-toggle btn btn-info">
+						<span class="btn-icon-wrapper pr-2 opacity-7">
+							<i class="fa fa-business-time fa-w-20"></i>
+						</span>
+						Item Menu
+					</button>
+
+					<div tabindex="-1" role="menu" aria-hidden="true" class="dropdown-menu dropdown-menu-right">
+						<ul class="nav flex-column">
+							{{--
+							<li class="nav-item">
+								<a href="javascript:void(0);" class="nav-link">
+									<i class="nav-link-icon lnr-inbox"></i>
+									<span>Inbox</span>
+									<div class="ml-auto badge badge-pill badge-secondary">86</div>
+								</a>
+							</li>
+							--}}
+						</ul>
+					</div>
 				</div>
 			</div>
-		</div>
+		@endif
 	</div>
 </div>
diff --git a/resources/themes/architect/views/layouts/partials/topmenu.blade.php b/resources/themes/architect/views/layouts/partials/topmenu.blade.php
index 7a63997..11f7e98 100644
--- a/resources/themes/architect/views/layouts/partials/topmenu.blade.php
+++ b/resources/themes/architect/views/layouts/partials/topmenu.blade.php
@@ -43,7 +43,7 @@
 				{{--
 				<li class="nav-item">
 					<a href="javascript:void(0);" class="nav-link">
-						<i class="nav-link-icon fas fa-database"></i> Statistics
+						<i class="nav-link-icon fas fa-database"></i> Link
 					</a>
 				</li>
 				--}}
@@ -70,7 +70,7 @@
 								</div>
 							</div>
 						</div>
-						<div class="widget-content-left  ml-3 header-user-info">
+						<div class="widget-content-left ml-3 header-user-info">
 							<div class="widget-heading">
 								{{ $user->name ?? 'John Smith' }}
 							</div>