Removed Acache/User
This commit is contained in:
parent
a946ce4418
commit
5833122ab5
@ -11,7 +11,6 @@
|
|||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"igaster/laravel-theme": "^2.0.12",
|
"igaster/laravel-theme": "^2.0.12",
|
||||||
"acacha/user": "^0.2.2",
|
|
||||||
"creativeorange/gravatar": "^1.0",
|
"creativeorange/gravatar": "^1.0",
|
||||||
"orchestra/asset": "^3.6"
|
"orchestra/asset": "^3.6"
|
||||||
},
|
},
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="info">
|
<div class="info">
|
||||||
<a href="{{ url('login') }}" class="d-block">{{ $user->name ?: 'Nobody' }}</a>
|
<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>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
29
src/GuestUser.php
Normal file
29
src/GuestUser.php
Normal 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',
|
||||||
|
];
|
||||||
|
}
|
27
src/Http/Middleware/GuestUser.php
Normal file
27
src/Http/Middleware/GuestUser.php
Normal 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);
|
||||||
|
}
|
||||||
|
}
|
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace Leenooks\Providers;
|
namespace Leenooks\Providers;
|
||||||
|
|
||||||
|
use Leenooks\Http\Middleware\GuestUser;
|
||||||
use Illuminate\Routing\Router;
|
use Illuminate\Routing\Router;
|
||||||
use Illuminate\Support\ServiceProvider;
|
use Illuminate\Support\ServiceProvider;
|
||||||
|
|
||||||
@ -12,60 +13,58 @@ use Illuminate\Support\ServiceProvider;
|
|||||||
*/
|
*/
|
||||||
class LeenooksServiceProvider extends 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'),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user