From 29a707831e176c7d7bf9a40bc9845f574cdc878e Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Sat, 24 Jul 2021 14:12:10 +1000
Subject: [PATCH] CSS fixes, BS5 doesnt have ml/mr,pl/pr. Fix remember me.
 Style consistencies. Added Error 500 page.

---
 app/Http/Controllers/Auth/LoginController.php |  2 +-
 resources/views/auth/login.blade.php          |  2 +-
 .../views/auth/passwords/email.blade.php      |  2 +-
 .../views/auth/passwords/reset.blade.php      |  2 +-
 resources/views/auth/register.blade.php       |  2 +-
 resources/views/domain/addedit.blade.php      |  2 +-
 resources/views/errors/500.blade.php          | 18 +++++++++++++
 .../views/layouts/partials/topmenu.blade.php  |  2 +-
 resources/views/pkt/debug.blade.php           |  4 +--
 resources/views/setup.blade.php               | 27 ++++++++++++-------
 resources/views/system/form-address.blade.php | 12 ++++-----
 resources/views/system/form-session.blade.php |  4 +--
 resources/views/system/form-system.blade.php  |  2 +-
 resources/views/user/addedit.blade.php        |  2 +-
 resources/views/zone/addedit.blade.php        |  2 +-
 15 files changed, 55 insertions(+), 30 deletions(-)
 create mode 100644 resources/views/errors/500.blade.php

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 60ed36f..bb9d032 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -45,7 +45,7 @@ class LoginController extends Controller
 	{
 		$this->validateLogin($request);
 
-		if (Auth::attempt(array_merge($this->credentials($request),['active'=>TRUE]))) {
+		if (Auth::attempt(array_merge($this->credentials($request),['active'=>TRUE]),TRUE)) {
 			$request->session()->regenerate();
 
 			return $this->sendLoginResponse($request);
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 77351db..f6f95b6 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -67,7 +67,7 @@
 					<div class="row">
 						<div class="col-12">
 							<a href="{{ url('/') }}" class="btn btn-danger">Cancel</a>
-							<button type="submit" name="submit" class="btn btn-success mr-0 float-end">Sign In</button>
+							<button type="submit" name="submit" class="btn btn-success float-end">Sign In</button>
 						</div>
 					</div>
 				</form>
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index f0d60ca..f7d195a 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -43,7 +43,7 @@
 					<div class="row">
 						<div class="col-12">
 							<a href="{{ url('/') }}" class="btn btn-danger">Cancel</a>
-							<button type="submit" name="submit" class="btn btn-success mr-0 float-end">Reset</button>
+							<button type="submit" name="submit" class="btn btn-success float-end">Reset</button>
 						</div>
 					</div>
 
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index ab5b7c3..2628b20 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -74,7 +74,7 @@
 					<div class="row">
 						<div class="col-12">
 							<a href="{{ url('/') }}" class="btn btn-danger">Cancel</a>
-							<button type="submit" name="submit" class="btn btn-success mr-0 float-end">Sign In</button>
+							<button type="submit" name="submit" class="btn btn-success float-end">Sign In</button>
 						</div>
 					</div>
 				</form>
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index 00f0aed..544b5b8 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -79,7 +79,7 @@
 					<div class="row">
 						<div class="col-12">
 							<a href="{{ url('/') }}" class="btn btn-danger">Cancel</a>
-							<button type="submit" name="submit" class="btn btn-success mr-0 float-end">Sign In</button>
+							<button type="submit" name="submit" class="btn btn-success float-end">Sign In</button>
 						</div>
 					</div>
 				</form>
diff --git a/resources/views/domain/addedit.blade.php b/resources/views/domain/addedit.blade.php
index a4069cb..d5bca0f 100644
--- a/resources/views/domain/addedit.blade.php
+++ b/resources/views/domain/addedit.blade.php
@@ -100,7 +100,7 @@
 					<div class="col-12">
 						<a href="{{ url('ftn/domain') }}" class="btn btn-danger">Cancel</a>
 						@can('admin',$o)
-							<button type="submit" name="submit" class="btn btn-success mr-0 float-end">@if ($o->exists)Save @else Add @endif</button>
+							<button type="submit" name="submit" class="btn btn-success float-end">@if ($o->exists)Save @else Add @endif</button>
 						@endcan
 					</div>
 				</div>
diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php
new file mode 100644
index 0000000..51db30b
--- /dev/null
+++ b/resources/views/errors/500.blade.php
@@ -0,0 +1,18 @@
+@extends('layouts.auth')
+
+@section('htmlheader_title')
+	500
+@endsection
+
+@section('content')
+	<div class="row">
+		<div class="col-6 m-auto">
+			<h3>500 - Server Error?</h3>
+			<p>Sorry, something went bad. Try again?</p>
+			<span class="mb-3 btn btn-sm btn-danger" role="alert" style="text-align: left;">
+				{{ $exception->getMessage() }}
+			</span>
+			<p><a href="{{ url('/') }}" class="goback">Home</a></p>
+		</div>
+	</div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/layouts/partials/topmenu.blade.php b/resources/views/layouts/partials/topmenu.blade.php
index 050fd26..6de5455 100644
--- a/resources/views/layouts/partials/topmenu.blade.php
+++ b/resources/views/layouts/partials/topmenu.blade.php
@@ -25,7 +25,7 @@
 
 	@auth
 	<ul class="float-end" id="searchbar">
-		<li><input type="text" id="q" name="search" placeholder="Search..."><i class="bi bi-search"></i><div id="search_results"></div></li>
+		<li><input type="text" class="ps-2" id="q" name="search" placeholder="Search..."><i class="bi bi-search"></i><div id="search_results"></div></li>
 	</ul>
 	@endauth
 
diff --git a/resources/views/pkt/debug.blade.php b/resources/views/pkt/debug.blade.php
index 6dc19bb..4bbb353 100644
--- a/resources/views/pkt/debug.blade.php
+++ b/resources/views/pkt/debug.blade.php
@@ -28,7 +28,7 @@
 
 					@if($errors->count())
 						<div class="row">
-							<span class="pl-5 btn btn-sm btn-danger" role="alert" style="text-align: left;">
+							<span class="btn btn-sm btn-danger" role="alert" style="text-align: left;">
 								There were errors with the submission.
 								<ul>
 									@foreach ($errors->all() as $error)
@@ -42,7 +42,7 @@
 					<div class="row">
 						<div class="col-12">
 							<a href="{{ url('/') }}" class="btn btn-danger">Cancel</a>
-							<button type="submit" name="submit" class="btn btn-success mr-0 float-end">Process</button>
+							<button type="submit" name="submit" class="btn btn-success float-end">Process</button>
 						</div>
 					</div>
 				</div>
diff --git a/resources/views/setup.blade.php b/resources/views/setup.blade.php
index 119c3ed..69cdfb5 100644
--- a/resources/views/setup.blade.php
+++ b/resources/views/setup.blade.php
@@ -164,17 +164,24 @@ use App\Models\Setup;
 					</div>
 
 					<div class="row">
-						<div class="col-12">
+						<div class="col-2">
 							<a href="{{ url('ftn/domain') }}" class="btn btn-danger">Cancel</a>
-							@if($errors->count())
-								<span class="pl-5 btn btn-sm btn-danger" role="alert">
-									There were errors with the submission.
-									@dump($errors)
-								</span>
-							@endif
-							@can('admin',$o)
-								<button type="submit" name="submit" class="btn btn-success mr-0 float-end">@if ($o->exists)Save @else Add @endif</button>
-							@endcan
+						</div>
+
+						<span class="col-6 mt-auto mx-auto text-center align-bottom">
+						@if($errors->count())
+							<span class="btn btn-sm btn-danger" role="alert">
+								There were errors with the submission.
+								@dump($errors)
+							</span>
+						@endif
+						</span>
+
+						@can('admin',$o)
+							<div class="col-2">
+								<button type="submit" name="submit" class="btn btn-success float-end">@if ($o->exists)Save @else Add @endif</button>
+							</div>
+						@endcan
 						</div>
 					</div>
 				</form>
diff --git a/resources/views/system/form-address.blade.php b/resources/views/system/form-address.blade.php
index c95ae0c..60a55e2 100644
--- a/resources/views/system/form-address.blade.php
+++ b/resources/views/system/form-address.blade.php
@@ -84,7 +84,7 @@
 						<div class="input-group has-validation">
 							<span class="input-group-text"><i class="bi bi-hash"></i></span>
 							<input type="text" style="width: 35%;" class="form-control @error('node_id') is-invalid @enderror" id="node_id" placeholder="Node" name="node_id" value="{{ old('node_id',$o->node_id) }}" @cannot('admin',$o)disabled @endcannot>
-							<span class="input-group-text ml-1 mr-1 p-0">.</span>
+							<span class="input-group-text p-0">.</span>
 							<input type="text" class="form-control @error('point_id') is-invalid @enderror" id="point_id" placeholder="0" name="point_id" value="{{ old('point_id',$o->point_id) ?: 0 }}" @cannot('admin',$o)disabled @endcannot style="padding-left: 0;">
 							<span class="invalid-feedback" role="alert">
 								@error('node_id')
@@ -98,7 +98,7 @@
 					</div>
 
 					<!-- Region Address -->
-					<div class="pl-0 col-3 d-none" id="region-address">
+					<div class="col-3 ps-0 d-none" id="region-address">
 						<label for="region_id_new" class="form-label">Region Address</label>
 						<div class="input-group has-validation">
 							<span class="input-group-text"><i class="bi bi-hash"></i></span>
@@ -115,12 +115,12 @@
 					</div>
 
 					<!-- Host Address -->
-					<div class="pl-0 col-3 d-none" id="host-address">
+					<div class="col-3 ps-0 d-none" id="host-address">
 						<label for="host_id_new" class="form-label">Host Address</label>
 						<div class="input-group has-validation">
 							<span class="input-group-text"><i class="bi bi-hash"></i></span>
 							<input type="text" class="form-control @error('host_id_new') is-invalid @enderror" id="host_id_new" placeholder="Host #" name="host_id_new" value="{{ old('host_id_new') }}" @cannot('admin',$o)disabled @endcannot>
-							<span class="input-group-text ml-1 mr-1 p-0">/</span>
+							<span class="input-group-text p-0">/</span>
 							<input type="text" class="form-control @error('node_id_new') is-invalid @enderror" id="node_id_new" placeholder="Node #" name="node_id_new" value="{{ old('node_id_new') }}" @cannot('admin',$o)disabled @endcannot>
 							<span class="input-group-text">.0</span>
 							<span class="invalid-feedback" role="alert">
@@ -160,7 +160,7 @@
 
 					<span class="col-6 mt-auto mx-auto text-center align-bottom">
 						@if($errors->count())
-							<span class="pl-5 btn btn-sm btn-danger" role="alert">
+							<span class="btn btn-sm btn-danger" role="alert">
 								There were errors with the submission.
 							</span>
 						@endif
@@ -168,7 +168,7 @@
 
 					@can('admin',$o)
 						<div class="col-2">
-							<button type="submit" name="submit" class="btn btn-success mr-0 float-end">Add</button>
+							<button type="submit" name="submit" class="btn btn-success float-end">Add</button>
 						</div>
 					@endcan
 				</div>
diff --git a/resources/views/system/form-session.blade.php b/resources/views/system/form-session.blade.php
index b6eba7e..14a9dd0 100644
--- a/resources/views/system/form-session.blade.php
+++ b/resources/views/system/form-session.blade.php
@@ -109,7 +109,7 @@
 
 							<span class="col-6 mt-auto mx-auto text-center align-bottom">
 								@if($errors->count())
-									<span class="pl-5 btn btn-sm btn-danger" role="alert">
+									<span class="btn btn-sm btn-danger" role="alert">
 										There were errors with the submission.
 									</span>
 								@endif
@@ -117,7 +117,7 @@
 
 							@can('admin',$o)
 								<div class="col-2">
-									<button type="submit" name="submit" class="btn btn-success mr-0 float-end">Add</button>
+									<button type="submit" name="submit" class="btn btn-success float-end">Add</button>
 								</div>
 							@endcan
 						</div>
diff --git a/resources/views/system/form-system.blade.php b/resources/views/system/form-system.blade.php
index 186eb11..b7fbb01 100644
--- a/resources/views/system/form-system.blade.php
+++ b/resources/views/system/form-system.blade.php
@@ -171,7 +171,7 @@
 					<div class="col-12">
 						<a href="{{ url('ftn/system') }}" class="btn btn-danger">Cancel</a>
 						@can('admin',$o)
-							<button type="submit" name="submit" class="btn btn-success mr-0 float-end">@if ($o->exists)Save @else Add @endif</button>
+							<button type="submit" name="submit" class="btn btn-success float-end">@if ($o->exists)Save @else Add @endif</button>
 						@endcan
 					</div>
 				</div>
diff --git a/resources/views/user/addedit.blade.php b/resources/views/user/addedit.blade.php
index 24d0647..934bdae 100644
--- a/resources/views/user/addedit.blade.php
+++ b/resources/views/user/addedit.blade.php
@@ -89,7 +89,7 @@
 						<div class="col-12">
 							<a href="{{ url('user/list') }}" class="btn btn-danger">Cancel</a>
 							@can('admin',$o)
-								<button type="submit" name="submit" class="btn btn-success mr-0 float-end">@if ($o->exists)Save @else Add @endif</button>
+								<button type="submit" name="submit" class="btn btn-success float-end">@if ($o->exists)Save @else Add @endif</button>
 							@endcan
 						</div>
 					</div>
diff --git a/resources/views/zone/addedit.blade.php b/resources/views/zone/addedit.blade.php
index 8f4833b..0687542 100644
--- a/resources/views/zone/addedit.blade.php
+++ b/resources/views/zone/addedit.blade.php
@@ -147,7 +147,7 @@
 						<div class="col-12">
 							<a href="{{ url('ftn/zone') }}" class="btn btn-danger">Cancel</a>
 							@can('admin',$o)
-								<button type="submit" name="submit" class="btn btn-success mr-0 float-end">@if ($o->exists)Save @else Add @endif</button>
+								<button type="submit" name="submit" class="btn btn-success float-end">@if ($o->exists)Save @else Add @endif</button>
 							@endcan
 						</div>
 					</div>