Switch laravel-them to fix issue with @ directives

composer.json

@@ -10,10 +10,9 @@
         }
     ],
     "require": {
-      "igaster/laravel-theme": "^2.0.12",
-      "acacha/user": "^0.2.2",
+      "leenooks/laravel-theme": "^2.0.15",
       "creativeorange/gravatar": "^1.0",
-      "orchestra/asset": "^3.6"
+      "orchestra/asset": "^4.0"
     },
     "require-dev": {
     },

resources/themes/adminlte/lang/en/message.php

@@ -29,11 +29,11 @@ return [
     'signGithub'              => 'Sign in using Github',
     'signFacebook'            => 'Sign in using Facebook',
     'signTwitter'             => 'Sign in using Twitter',
-    'signGoogle+'             => 'Sign in using Google+',
+    'signGoogle'              => 'Sign in using Google',
     'signLinkedin'            => 'Sign in using Linkedin',
     'signW3id'                => 'Sign in using W3id',
     'signIBMid'               => 'Sign in using IBMid',
-	'signMeetup'              => 'Sign in using Meetup',
+    'signMeetup'              => 'Sign in using Meetup',
     'sendpassword'            => 'Send Password Reset Link',
     'passwordreset'           => 'Reset password',
     'pagenotfound'            => 'Page not found',

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

@@ -21,6 +21,15 @@
 			</div>
 		@endif
 
+		@if (Session::has('error'))
+			<div class="alert alert-danger">
+				<strong>Whoops!</strong> {{ trans('adminlte_lang::message.someproblems') }}<br><br>
+				<ul>
+					<li>{{ Session::get('error') }}</li>
+				</ul>
+			</div>
+		@endif
+
 		<!-- /.login-logo -->
 		<div class="card">
 			<div class="card-body login-card-body">

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

@@ -12,10 +12,10 @@
 	<link rel="stylesheet" href="{{ asset('/plugin/font-awesome/css/font-awesome.min.css') }}">
 	<!-- IonIcons -->
 	<link rel="stylesheet" href="{{ request()->getScheme() }}://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
-	<!-- Theme style -->
-	<link rel="stylesheet" href="{{ asset('/css/adminlte.min.css') }}">
+
 	<!-- Google Font: Source Sans Pro -->
 	<link href="{{ request()->getScheme() }}://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
+
 	@if(file_exists('css/social.css'))
 		<!-- Social Logins -->
 		<link rel="stylesheet" href="{{ asset('/css/social.css') }}">
@@ -32,26 +32,12 @@
 		<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
 	<![endif]-->
 
-	<script>
-		//See https://laracasts.com/discuss/channels/vue/use-trans-in-vuejs
-		window.trans =
-		@php
-			// @todo Cache this processing
-			// copy all translations from /resources/lang/CURRENT_LOCALE/* to global JS variable
-			$lang_files = File::files(resource_path() . '/lang/' . App::getLocale());
-			$trans = [];
-			foreach ($lang_files as $f) {
-				$filename = pathinfo($f)['filename'];
-				$trans[$filename] = trans($filename);
-			}
-			$trans['adminlte_lang_message'] = trans('adminlte_lang::message');
-			echo json_encode($trans);
-		@endphp
-	</script>
-
 	<!-- STYLESHEETS -->
 	{!! Asset::styles() !!}
 
+	<!-- Theme style -->
+	<link rel="stylesheet" href="{{ asset('/css/adminlte.min.css') }}">
+
 	@if(file_exists('css/fixes.css'))
 	<!-- CSS Fixes -->
 		<link rel="stylesheet" href="{{ asset('/css/fixes.css') }}">

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

@@ -21,6 +21,9 @@
 		NoTransitionAfterReload: false
 	};
 
+	// Work out our timezone.
+	const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
 	$(function () {
 		"use strict";
 

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

@@ -15,6 +15,7 @@
 			</div>
 			<div class="info">
 				<a href="{{ url('login') }}" class="d-block">{{ $user->name ?: 'Nobody' }}</a>
+				@isset($user->lastlogin)<a span="d-block"><small><span style="color: #747474;">Last On:</span> {{ $user->lastlogin->format('Y-m-d H:i') }}</small></a>@endisset
 			</div>
 		</div>
 

src/GuestUser.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Leenooks;
+
+use Illuminate\Notifications\Notifiable;
+use Illuminate\Foundation\Auth\User as Authenticatable;
+
+class GuestUser extends Authenticatable
+{
+    use Notifiable;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'name', 'email', 'password',
+    ];
+
+    /**
+     * The attributes that should be hidden for arrays.
+     *
+     * @var array
+     */
+    protected $hidden = [
+        'password', 'remember_token',
+    ];
+}

src/Http/Middleware/GuestUser.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Leenooks\Http\Middleware;
+
+use Closure;
+
+/**
+ * Class GuestUser
+ * @package Leenooks\Laravel\Http\Middleware
+ */
+class GuestUser
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        view()->share('loggedin',auth()->check());
+        view()->share('user', auth()->user() ?: new \Leenooks\GuestUser);
+
+        return $next($request);
+    }
+}

src/Providers/LeenooksServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace Leenooks\Providers;
 
+use Leenooks\Http\Middleware\GuestUser;
 use Illuminate\Routing\Router;
 use Illuminate\Support\ServiceProvider;
 
@@ -12,60 +13,58 @@ use Illuminate\Support\ServiceProvider;
  */
 class LeenooksServiceProvider extends ServiceProvider
 {
-        private $_path = '';
+	private $_path = '';
 
-    /**
-     * Bootstrap the application services.
-     *
-     * @param Router $router
-     */
-    public function boot(Router $router)
-    {
-        $this->loadViewsFrom($this->_path.'/resources/themes/adminlte/views/', 'adminlte');
-	$this->loadTranslationsFrom($this->_path.'/resources/themes/adminlte/lang/', 'adminlte_lang');
+	/**
+	 * Bootstrap the application services.
+	 *
+	 * @param Router $router
+	 */
+	public function boot(Router $router)
+	{
+		$router->pushMiddlewareToGroup('web',GuestUser::class);
 
-	// Enable a recusive() collection function so that we can just arrives in config/*.php
-	\Illuminate\Support\Collection::macro('recursive', function () {
-		return $this->map(function ($value) {
-			if (is_array($value) || is_object($value)) {
-				return collect($value)->recursive();
-			}
+		$this->loadViewsFrom($this->_path.'/resources/themes/adminlte/views/', 'adminlte');
+		$this->loadTranslationsFrom($this->_path.'/resources/themes/adminlte/lang/', 'adminlte_lang');
 
-			return $value;
+		// Enable a Collect::recursive() function
+		\Illuminate\Support\Collection::macro('recursive', function () {
+			return $this->map(function ($value) {
+
+				if (is_array($value) || is_object($value)) {
+					return collect($value)->recursive();
+				}
+
+				return $value;
+			});
 		});
-	});
-    }
+	}
 
-    /**
-     * Register the application services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        if (! $this->_path) {
-            $this->_path = realpath(__DIR__.'/../../');
-        }
-    }
+	/**
+	 * Register the application services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		if (! $this->_path) {
+			$this->_path = realpath(__DIR__.'/../../');
+		}
+	}
 
-    /**
-     * Views copy path.
-     *
-     * @return array
-     */
-    public function views()
-    {
-        return [
-            $this->_path.'/resources/views/auth'              =>
-                resource_path('views/vendor/adminlte/auth'),
-            $this->_path.'/resources/views/errors'            =>
-                resource_path('views/vendor/adminlte/errors'),
-            $this->_path.'/resources/views/layouts'           =>
-                resource_path('views/vendor/adminlte/layouts'),
-            $this->_path.'/resources/views/home.blade.php'    =>
-                resource_path('views/vendor/adminlte/home.blade.php'),
-            $this->_path.'/resources/views/welcome.blade.php' =>
-                resource_path('views/welcome.blade.php'),
-        ];
-    }
-}
+	/**
+	 * Views copy path.
+	 *
+	 * @return array
+	 */
+	public function views()
+	{
+		return [
+			$this->_path.'/resources/views/auth' => resource_path('views/vendor/adminlte/auth'),
+			$this->_path.'/resources/views/errors' => resource_path('views/vendor/adminlte/errors'),
+			$this->_path.'/resources/views/layouts' => resource_path('views/vendor/adminlte/layouts'),
+			$this->_path.'/resources/views/home.blade.php' => resource_path('views/vendor/adminlte/home.blade.php'),
+			$this->_path.'/resources/views/welcome.blade.php' => resource_path('views/welcome.blade.php'),
+		];
+	}
+}