Removed Acache/User

This commit is contained in:
Deon George 2019-10-11 14:47:13 +11:00
parent a946ce4418
commit 5833122ab5
No known key found for this signature in database
GPG Key ID: 7670E8DC27415254
5 changed files with 107 additions and 52 deletions

View File

@ -11,7 +11,6 @@
],
"require": {
"igaster/laravel-theme": "^2.0.12",
"acacha/user": "^0.2.2",
"creativeorange/gravatar": "^1.0",
"orchestra/asset": "^3.6"
},

View File

@ -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>

29
src/GuestUser.php Normal file
View File

@ -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',
];
}

View File

@ -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);
}
}

View File

@ -2,6 +2,7 @@
namespace Leenooks\Providers;
use Leenooks\Http\Middleware\GuestUser;
use Illuminate\Routing\Router;
use Illuminate\Support\ServiceProvider;
@ -21,12 +22,15 @@ class LeenooksServiceProvider extends ServiceProvider
*/
public function boot(Router $router)
{
$router->pushMiddlewareToGroup('web',GuestUser::class);
$this->loadViewsFrom($this->_path.'/resources/themes/adminlte/views/', 'adminlte');
$this->loadTranslationsFrom($this->_path.'/resources/themes/adminlte/lang/', 'adminlte_lang');
// Enable a recusive() collection function so that we can just arrives in config/*.php
// 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();
}
@ -56,16 +60,11 @@ class LeenooksServiceProvider extends ServiceProvider
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'),
$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'),
];
}
}