Tweak Brand Logo

resources/themes/adminlte/views/auth/login.blade.php

@@ -45,14 +45,14 @@
 				<p class="login-box-msg">{{ trans('adminlte_lang::message.siginsession') }}</p>
 
 				<form method="post">
-					{{ csrf_field() }}
+					@csrf
 
 					<div class="row">
 						<div class="col-12">
 							<div class="input-group mb-3">
 								<input type="email" name="email" class="form-control" placeholder="Email">
 								<div class="input-group-append">
-									<span class="input-group-text"><i class="fas fa-envelope fa-fw"></i></span>
+									<span class="input-group-text"><i class="fas fa-fw fa-envelope"></i></span>
 								</div>
 							</div>
 						</div>
@@ -61,7 +61,7 @@
 							<div class="input-group mb-3">
 								<input type="password" name="password" class="form-control" placeholder="Password">
 								<div class="input-group-append">
-									<span class="input-group-text"><i class="fas fa-key fa-fw"></i></span>
+									<span class="input-group-text"><i class="fas fa-fw fa-key"></i></span>
 								</div>
 							</div>
 						</div>

resources/themes/adminlte/views/auth/passwords/email.blade.php

@@ -35,13 +35,15 @@
 				<p class="login-box-msg">You forgot your password? Here you can easily retrieve a new password.</p>
 
 				<form method="post" action="{{ url('password/email') }}">
-					{{ csrf_field() }}
+					@csrf
+
 					<div class="input-group mb-3">
 						<input type="email" name="email" class="form-control" placeholder="Email" required>
 						<div class="input-group-append">
-							<span class="fas fa-envelope input-group-text"></span>
+							<span class="input-group-text"><i class="fas fa-fw fa-envelope"></i></span>
 						</div>
 					</div>
+
 					<div class="row">
 						<div class="col-12">
 							<button type="submit" class="btn btn-primary btn-block">{{ trans('adminlte_lang::message.sendpassword') }}</button>

resources/themes/adminlte/views/auth/passwords/reset.blade.php

@@ -27,32 +27,36 @@
 				<p class="login-box-msg">You are only one step a way from your new password, set your new password now.</p>
 
 				<form method="post" action="{{ url('password/reset') }}">
-					{{ csrf_field() }}
+					<input type="hidden" name="token" value="{{ $token }}">
+					@csrf
+
 					<div class="input-group mb-3">
 						<input type="email" name="email" class="form-control" placeholder="Email" required>
 						<div class="input-group-append">
-							<span class="fas fa-envelope fa-fw input-group-text"></span>
+							<span class="input-group-text"><i class="fas fa-fw fa-envelope"></i></span>
 						</div>
 					</div>
+
 					<div class="input-group mb-3">
 						<input type="password" name="password" class="form-control" placeholder="Password" required>
 						<div class="input-group-append">
-							<span class="fas fa-lock input-group-text"></span>
+							<span class="input-group-text"><i class="fas fa-fw fa-lock"></i></span>
 						</div>
 					</div>
+
 					<div class="input-group mb-3">
 						<input type="password" name="password_confirmation" class="form-control" placeholder="Confirm Password" data-match="#password" required>
 						<div class="input-group-append">
-							<span class="fas fa-lock input-group-text"></span>
+							<span class="input-group-text"><i class="fas fa-fw fa-clone"></i></span>
 						</div>
 					</div>
+
 					<div class="row">
 						<div class="col-12">
 							<button type="submit" class="btn btn-primary btn-block">{{ trans('adminlte_lang::message.passwordreset') }}</button>
 						</div>
 						<!-- /.col -->
 					</div>
-					<input type="hidden" name="token" value="{{ $token }}">
 				</form>
 
 				<p class="mt-3 mb-1">

resources/themes/adminlte/views/layouts/partials/mainheader.blade.php

@@ -46,7 +46,7 @@
 
 					<div class="dropdown-divider"></div>
 					@if ($user->switched)
-						<a href="{{ url('/admin/switch/stop') }}" class="dropdown-item" id="switch">
+						<a href="{{ url('/admin/switch/stop') }}" class="dropdown-item">
 							<i class="fas fa-sign-out-alt mr-2"></i> {{ trans('adminlte_lang::message.switchoff') }}
 						</a>
 					@else

resources/themes/adminlte/views/layouts/partials/sidebar.blade.php

@@ -2,7 +2,7 @@
 <aside class="main-sidebar sidebar-dark-primary elevation-4 d-print-none">
 	<!-- Brand Logo -->
 	<a href="{{ url('home') }}" class="brand-link">
-		<img src="{{ asset('img/logo.png') }}" alt="Logo" class="brand-image img-circle elevation-3" style="opacity: .8">
+		<img src="{{ asset('img/logo.png') }}" alt="Logo" style="margin-left: 0; padding: 5px;" class="brand-image">
 		<span class="brand-text font-weight-light">{!! config('app.name_html_long','<b>App</b>Name') !!}</span>
 	</a>
 

src/Carbon.php

@@ -15,15 +15,38 @@ class Carbon extends CarbonBase
 
     public function __get($name)
     {
-       switch (true) {
+       switch ($name) {
-            case $name === 'half':
+            case 'half':
                 return (int) ceil($this->month / static::MONTHS_PER_HALF);
 
+           case 'quarter_string':
+               return sprintf('%dQ%d',$this->year,$this->quarter);
+
             default:
                 return parent::__get($name);
        }
     }
 
+    public function addHalf(): self
+    {
+        return $this->addHalves(1);
+    }
+
+    public function addHalves(int $unit): self
+    {
+        return $this->addQuarters(2*$unit);
+    }
+
+    public function subHalf(): self
+    {
+        return $this->subHalves(1);
+    }
+
+    public function subHalves(int $unit): self
+    {
+        return $this->subQuarters(2*$unit);
+    }
+
     /**
      * Modify to the first occurrence of a given day of the week
      * in the current quarter. If no dayOfWeek is provided, modify to the
@@ -35,7 +58,7 @@ class Carbon extends CarbonBase
      * @return static
      */
     public function startOfHalf($dayOfWeek = null)
-    {   
+    {
         return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF - 5, 1)->firstOfMonth($dayOfWeek);
     }
 
@@ -50,7 +73,7 @@ class Carbon extends CarbonBase
      * @return static
      */
     public function endOfHalf($dayOfWeek = null)
-    {   
+    {
         return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF, 1)->lastOfMonth($dayOfWeek);
     }
 }