Revert name to igaster/laravel-theme

composer.json

@@ -10,11 +10,16 @@
         }
     ],
     "require": {
-      "igaster/laravel-theme": "^2.0.12",
+      "igaster/laravel-theme": "^2.0.15",
-      "acacha/user": "^0.2.2",
       "creativeorange/gravatar": "^1.0",
-      "orchestra/asset": "^3.6"
+      "orchestra/asset": "^4.0"
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/leenooks/laravel-theme"
+        }
+    ],
     "require-dev": {
     },
     "autoload": {

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