Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
b0730b9ed3 | ||
|
|
163a7f2587 | ||
|
|
4f2707a374 | ||
|
|
0ca66c6d1c | ||
|
|
5833122ab5 | ||
|
|
a946ce4418 | ||
|
|
e5ff189d3e | ||
|
|
1efdfca55f | ||
|
|
6d876f2c94 | ||
|
|
70a7142877 | ||
|
|
c406c35ff7 | ||
|
|
6d84613158 | ||
|
|
05dbcaf6c4 | ||
|
|
867b42be91 | ||
|
|
f44e6f1d09 |
@@ -10,9 +10,16 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"igaster/laravel-theme": "^2.0",
|
"igaster/laravel-theme": "^2.0.15",
|
||||||
"orchestra/asset": "^3.6"
|
"creativeorange/gravatar": "^1.0",
|
||||||
|
"orchestra/asset": "^4.0"
|
||||||
},
|
},
|
||||||
|
"repositories": [
|
||||||
|
{
|
||||||
|
"type": "vcs",
|
||||||
|
"url": "https://github.com/leenooks/laravel-theme"
|
||||||
|
}
|
||||||
|
],
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
|||||||
@@ -29,10 +29,11 @@ return [
|
|||||||
'signGithub' => 'Sign in using Github',
|
'signGithub' => 'Sign in using Github',
|
||||||
'signFacebook' => 'Sign in using Facebook',
|
'signFacebook' => 'Sign in using Facebook',
|
||||||
'signTwitter' => 'Sign in using Twitter',
|
'signTwitter' => 'Sign in using Twitter',
|
||||||
'signGoogle+' => 'Sign in using Google+',
|
'signGoogle' => 'Sign in using Google',
|
||||||
'signLinkedin' => 'Sign in using Linkedin',
|
'signLinkedin' => 'Sign in using Linkedin',
|
||||||
'signW3id' => 'Sign in using W3id',
|
'signW3id' => 'Sign in using W3id',
|
||||||
'signIBMid' => 'Sign in using IBMid',
|
'signIBMid' => 'Sign in using IBMid',
|
||||||
|
'signMeetup' => 'Sign in using Meetup',
|
||||||
'sendpassword' => 'Send Password Reset Link',
|
'sendpassword' => 'Send Password Reset Link',
|
||||||
'passwordreset' => 'Reset password',
|
'passwordreset' => 'Reset password',
|
||||||
'pagenotfound' => 'Page not found',
|
'pagenotfound' => 'Page not found',
|
||||||
|
|||||||
@@ -21,12 +21,22 @@
|
|||||||
</div>
|
</div>
|
||||||
@endif
|
@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 -->
|
<!-- /.login-logo -->
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-body login-card-body">
|
<div class="card-body login-card-body">
|
||||||
<p class="login-box-msg">{{ trans('adminlte_lang::message.siginsession') }}</p>
|
<p class="login-box-msg">{{ trans('adminlte_lang::message.siginsession') }}</p>
|
||||||
|
|
||||||
<form method="post">
|
<form method="post">
|
||||||
|
{{ csrf_field() }}
|
||||||
<div class="input-group mb-3">
|
<div class="input-group mb-3">
|
||||||
<input type="email" name="email" class="form-control" placeholder="Email">
|
<input type="email" name="email" class="form-control" placeholder="Email">
|
||||||
<div class="input-group-append">
|
<div class="input-group-append">
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<!-- Compiled app javascript -->
|
<!-- Compiled app javascript -->
|
||||||
<script src="{{ url (mix('/js/app.js')) }}"></script>
|
<script src="{{ asset('/js/app.js') }}"></script>
|
||||||
<!-- iCheck -->
|
<!-- iCheck -->
|
||||||
<script src="/plugin/iCheck/icheck.min.js"></script>
|
<script src="{{ asset('/plugin/iCheck/icheck.min.js') }}"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
@include('adminlte::layouts.partials.htmlheader')
|
@include('adminlte::layouts.partials.htmlheader')
|
||||||
@show
|
@show
|
||||||
|
|
||||||
<body class="hold-transition sidebar-mini">
|
<body class="hold-transition sidebar-mini @if (Cookie::get('toggleState') === 'closed') {{ 'sidebar-collapse' }} @endif">
|
||||||
<div id="app">
|
<div id="app">
|
||||||
<div class="wrapper">
|
<div class="wrapper">
|
||||||
@include('adminlte::layouts.partials.mainheader')
|
@include('adminlte::layouts.partials.mainheader')
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
@include('adminlte::layouts.partials.htmlheader')
|
@include('adminlte::layouts.partials.htmlheader')
|
||||||
|
|
||||||
<!-- iCheck -->
|
<!-- iCheck -->
|
||||||
<link rel="stylesheet" href="/plugin/iCheck/square/blue.css">
|
<link rel="stylesheet" href="{{ asset('/plugin/iCheck/square/blue.css') }}">
|
||||||
@show
|
@show
|
||||||
|
|
||||||
<body class="hold-transition login-page">
|
<body class="hold-transition login-page">
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
<!-- Content Header (Page header) -->
|
<!-- Content Header (Page header) -->
|
||||||
<div class="content-header">
|
<div class="content-header d-print-none">
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<div class="row mb-2">
|
<div class="row mb-2">
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-6">
|
||||||
<h1 class="m-0 text-dark">@yield('contentheader_title', 'Content Title')</h1>
|
<h1 class="m-0 text-dark">@yield('contentheader_title', 'Content Title')</h1>
|
||||||
<small>@yield('contentheader_description','Description')</small>
|
<small>@yield('contentheader_description','Description')</small>
|
||||||
</div><!-- /.col -->
|
</div><!-- /.col -->
|
||||||
|
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-6">
|
||||||
<ol class="breadcrumb float-sm-right small">
|
<ol class="breadcrumb float-sm-right small">
|
||||||
<li class="breadcrumb-item"><a href="{{ url('/home'.(isset($ido) ? '/'.$ido->id : '')) }}">Home</a></li>
|
<li class="breadcrumb-item"><a href="{{ url('/home'.(isset($ido) ? '/'.$ido->id : '')) }}">Home</a></li>
|
||||||
@@ -14,7 +15,7 @@
|
|||||||
<li class="breadcrumb-item"><a href="{{url($url)}}">{{ $item }}</a></li>
|
<li class="breadcrumb-item"><a href="{{url($url)}}">{{ $item }}</a></li>
|
||||||
@endforeach
|
@endforeach
|
||||||
@endisset
|
@endisset
|
||||||
<li class="breadcrumb-item active">@yield('contentheader_title', 'Content Title')</li>
|
<li class="breadcrumb-item active">@yield('page_title','Page Title')</li>
|
||||||
</ol>
|
</ol>
|
||||||
</div><!-- /.col -->
|
</div><!-- /.col -->
|
||||||
</div><!-- /.row -->
|
</div><!-- /.row -->
|
||||||
|
|||||||
@@ -6,18 +6,24 @@
|
|||||||
<!-- CSRF Token -->
|
<!-- CSRF Token -->
|
||||||
<meta name="csrf-token" content="{{ csrf_token() }}">
|
<meta name="csrf-token" content="{{ csrf_token() }}">
|
||||||
|
|
||||||
<link href="{{ asset('/css/app.css') }}" rel="stylesheet" type="text/css" />
|
<link rel="stylesheet" href="{{ asset('/css/app.css') }}">
|
||||||
|
|
||||||
<!-- Font Awesome Icons -->
|
<!-- Font Awesome Icons -->
|
||||||
<link rel="stylesheet" href="/plugin/font-awesome/css/font-awesome.min.css">
|
<link rel="stylesheet" href="{{ asset('/plugin/font-awesome/css/font-awesome.min.css') }}">
|
||||||
<!-- IonIcons -->
|
<!-- IonIcons -->
|
||||||
<link rel="stylesheet" href="//code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
|
<link rel="stylesheet" href="{{ request()->getScheme() }}://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
|
||||||
<!-- Theme style -->
|
|
||||||
<link rel="stylesheet" href="/css/adminlte.min.css">
|
|
||||||
<!-- Google Font: Source Sans Pro -->
|
<!-- Google Font: Source Sans Pro -->
|
||||||
<link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
|
<link href="{{ request()->getScheme() }}://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
|
||||||
<!-- Printing Modifications -->
|
|
||||||
<link rel="stylesheet" href="/css/print.css">
|
@if(file_exists('css/social.css'))
|
||||||
|
<!-- Social Logins -->
|
||||||
|
<link rel="stylesheet" href="{{ asset('/css/social.css') }}">
|
||||||
|
@endif
|
||||||
|
@if(file_exists('css/print.css'))
|
||||||
|
<!-- Printing Modifications -->
|
||||||
|
<link rel="stylesheet" href="{{ asset('/css/print.css') }}">
|
||||||
|
@endif
|
||||||
|
|
||||||
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
|
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
|
||||||
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
|
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
|
||||||
@@ -26,23 +32,14 @@
|
|||||||
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
|
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
|
||||||
<![endif]-->
|
<![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 -->
|
<!-- STYLESHEETS -->
|
||||||
{!! Asset::styles() !!}
|
{!! 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') }}">
|
||||||
|
@endif
|
||||||
</head>
|
</head>
|
||||||
@@ -33,7 +33,13 @@
|
|||||||
<i class="fa fa-cog"></i>
|
<i class="fa fa-cog"></i>
|
||||||
</a>
|
</a>
|
||||||
<div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
|
<div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
|
||||||
<span class="dropdown-item dropdown-header">{{ $user->name ?: 'User Name' }}</span>
|
<span class="dropdown-item dropdown-header @if($user->switched) bg-danger @endif">
|
||||||
|
@if($user->switched)
|
||||||
|
SUDO (<small>{{ $user->name ?: 'User Name' }}</small>)
|
||||||
|
@else
|
||||||
|
{{ $user->name ?: 'User Name' }}
|
||||||
|
@endif
|
||||||
|
</span>
|
||||||
|
|
||||||
<div class="dropdown-divider"></div>
|
<div class="dropdown-divider"></div>
|
||||||
<a href="{{ url('settings') }}" class="dropdown-item">
|
<a href="{{ url('settings') }}" class="dropdown-item">
|
||||||
@@ -41,11 +47,19 @@
|
|||||||
</a>
|
</a>
|
||||||
|
|
||||||
<div class="dropdown-divider"></div>
|
<div class="dropdown-divider"></div>
|
||||||
<a href="{{ url('logout') }}" class="dropdown-item">
|
@if ($user->switched)
|
||||||
<i class="fa fa-sign-out mr-2"></i> Log Out
|
<a href="{{ url('/admin/switch/stop') }}" class="dropdown-item" id="switch">
|
||||||
</a>
|
<i class="fa fa-sign-out mr-2"></i> {{ trans('adminlte_lang::message.switchoff') }}
|
||||||
|
</a>
|
||||||
|
@else
|
||||||
|
<a href="{{ url('logout') }}" class="dropdown-item">
|
||||||
|
<i class="fa fa-sign-out mr-2"></i> Log Out
|
||||||
|
</a>
|
||||||
|
@endif
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
|
@else
|
||||||
|
<a href="{{ url('login') }}" class="text-muted pr-2"><i class="fa fa-lock"></i></a>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
<!-- Control Side Bar -->
|
<!-- Control Side Bar -->
|
||||||
|
|||||||
@@ -1,55 +1,68 @@
|
|||||||
<!-- REQUIRED JS SCRIPTS -->
|
<!-- REQUIRED JS SCRIPTS -->
|
||||||
<!-- JQuery and bootstrap are required by Laravel 5.7 in resources/js/bootstrap.js-->
|
<!-- JQuery and bootstrap are required by Laravel 5.7 in resources/js/bootstrap.js-->
|
||||||
<!-- Laravel App -->
|
<!-- Laravel App -->
|
||||||
<script src="{{ url(mix('/js/app.js')) }}" type="text/javascript"></script>
|
<script src="{{ asset('/js/app.js') }}" type="text/javascript"></script>
|
||||||
<!-- AdminLTE -->
|
<!-- AdminLTE -->
|
||||||
<script src="/js/adminlte.min.js"></script>
|
<script src="{{ asset('/js/adminlte.min.js') }}"></script>
|
||||||
|
|
||||||
<!-- Our our CSRF token to each interaction -->
|
|
||||||
{{-- @todo Test that we are validating this, also axios should be doing this for us? --}}
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$.ajaxSetup({
|
// Our CSRF token to each interaction
|
||||||
headers: {
|
$.ajaxSetup({
|
||||||
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
|
headers: {
|
||||||
}
|
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
|
||||||
});
|
}
|
||||||
|
});
|
||||||
|
|
||||||
$.AdminLTESidebarTweak = {};
|
$.AdminLTESidebarTweak = {};
|
||||||
|
|
||||||
$.AdminLTESidebarTweak.options = {
|
$.AdminLTESidebarTweak.options = {
|
||||||
EnableRemember: true,
|
EnableRemember: true,
|
||||||
//Removes the transition after page reload.
|
//Removes the transition after page reload.
|
||||||
NoTransitionAfterReload: false
|
NoTransitionAfterReload: false
|
||||||
};
|
};
|
||||||
|
|
||||||
$(function () {
|
// Work out our timezone.
|
||||||
"use strict";
|
const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
|
||||||
|
|
||||||
$("body").on("collapsed.lte.pushmenu", function(){
|
$(function () {
|
||||||
if($.AdminLTESidebarTweak.options.EnableRemember){
|
"use strict";
|
||||||
document.cookie = "toggleState=closed";
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
$("body").on("expanded.lte.pushmenu", function(){
|
$("body").on("collapsed.lte.pushmenu", function(){
|
||||||
if($.AdminLTESidebarTweak.options.EnableRemember){
|
if($.AdminLTESidebarTweak.options.EnableRemember) {
|
||||||
document.cookie = "toggleState=opened";
|
document.cookie = "toggleState=closed;path=/";
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if($.AdminLTESidebarTweak.options.EnableRemember){
|
$("body").delay(500).queue(function () {
|
||||||
var re = new RegExp('toggleState' + "=([^;]+)");
|
window.dispatchEvent(new Event('resize'));
|
||||||
var value = re.exec(document.cookie);
|
$(this).dequeue();
|
||||||
var toggleState = (value != null) ? unescape(value[1]) : null;
|
});
|
||||||
if(toggleState == 'closed'){
|
}
|
||||||
if($.AdminLTESidebarTweak.options.NoTransitionAfterReload){
|
});
|
||||||
$("body").addClass('sidebar-collapse hold-transition').delay(100).queue(function(){
|
|
||||||
$(this).removeClass('hold-transition');
|
// @todo this is not firing.
|
||||||
});
|
$("body").on("shown.lte.pushmenu", function(){
|
||||||
}else{
|
if($.AdminLTESidebarTweak.options.EnableRemember){
|
||||||
$("body").addClass('sidebar-collapse');
|
document.cookie = "toggleState=opened;path=/";
|
||||||
}
|
|
||||||
}
|
$("body").delay(500).queue(function () {
|
||||||
}
|
window.dispatchEvent(new Event('resize'));
|
||||||
});
|
$(this).dequeue();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if($.AdminLTESidebarTweak.options.EnableRemember){
|
||||||
|
var re = new RegExp('toggleState' + "=([^;]+)");
|
||||||
|
var value = re.exec(document.cookie);
|
||||||
|
var toggleState = (value != null) ? unescape(value[1]) : null;
|
||||||
|
if(toggleState == 'closed'){
|
||||||
|
if($.AdminLTESidebarTweak.options.NoTransitionAfterReload){
|
||||||
|
$("body").addClass('sidebar-collapse hold-transition').delay(100).queue(function(){
|
||||||
|
$(this).removeClass('hold-transition');
|
||||||
|
});
|
||||||
|
}else{
|
||||||
|
$("body").addClass('sidebar-collapse');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
<!-- Main Sidebar Container -->
|
<!-- Main Sidebar Container -->
|
||||||
<aside class="main-sidebar sidebar-dark-primary elevation-4">
|
<aside class="main-sidebar sidebar-dark-primary elevation-4 d-print-none">
|
||||||
<!-- Brand Logo -->
|
<!-- Brand Logo -->
|
||||||
<a href="{{ url('home') }}" class="brand-link">
|
<a href="{{ url('home') }}" class="brand-link">
|
||||||
<img src="/img/logo.png" alt="Logo" class="brand-image img-circle elevation-3" style="opacity: .8">
|
<img src="{{ asset('/img/logo.png') }}" alt="Logo" class="brand-image img-circle elevation-3" style="opacity: .8">
|
||||||
<span class="brand-text font-weight-light">{!! config('app.name_html_long','<b>App</b>Name') !!}</span>
|
<span class="brand-text font-weight-light">{!! config('app.name_html_long','<b>App</b>Name') !!}</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
@@ -11,10 +11,11 @@
|
|||||||
<!-- Sidebar user panel (optional) -->
|
<!-- Sidebar user panel (optional) -->
|
||||||
<div class="user-panel mt-3 pb-3 mb-3 d-flex">
|
<div class="user-panel mt-3 pb-3 mb-3 d-flex">
|
||||||
<div class="image">
|
<div class="image">
|
||||||
<img src="{{ Gravatar::get($user->exists ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User">
|
<img src="{{ Gravatar::get(($user->exists AND $user->email) ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User">
|
||||||
</div>
|
</div>
|
||||||
<div class="info">
|
<div class="info">
|
||||||
<a 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'),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user