Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
41b320a5b9 | ||
|
|
1096f0e28d | ||
|
|
b0730b9ed3 | ||
|
|
163a7f2587 | ||
|
|
4f2707a374 | ||
|
|
0ca66c6d1c | ||
|
|
5833122ab5 | ||
|
|
a946ce4418 | ||
|
|
e5ff189d3e | ||
|
|
1efdfca55f | ||
|
|
6d876f2c94 |
@@ -10,10 +10,9 @@
|
||||
}
|
||||
],
|
||||
"require": {
|
||||
"igaster/laravel-theme": "^2.0",
|
||||
"acacha/user": "^0.2.2",
|
||||
"igaster/laravel-theme": "^2.0.15",
|
||||
"creativeorange/gravatar": "^1.0",
|
||||
"orchestra/asset": "^3.6"
|
||||
"orchestra/asset": "^4.0"
|
||||
},
|
||||
"require-dev": {
|
||||
},
|
||||
|
||||
@@ -29,7 +29,7 @@ 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',
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<!-- Compiled app javascript -->
|
||||
<script src="{{ url (mix('/js/app.js')) }}"></script>
|
||||
<script src="{{ asset('/js/app.js') }}"></script>
|
||||
<!-- iCheck -->
|
||||
<script src="/plugin/iCheck/icheck.min.js"></script>
|
||||
<script src="{{ asset('/plugin/iCheck/icheck.min.js') }}"></script>
|
||||
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
@include('adminlte::layouts.partials.htmlheader')
|
||||
|
||||
<!-- iCheck -->
|
||||
<link rel="stylesheet" href="/plugin/iCheck/square/blue.css">
|
||||
<link rel="stylesheet" href="{{ asset('/plugin/iCheck/square/blue.css') }}">
|
||||
@show
|
||||
|
||||
<body class="hold-transition login-page">
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
<!-- Content Header (Page header) -->
|
||||
<div class="content-header">
|
||||
<div class="content-header d-print-none">
|
||||
<div class="container-fluid">
|
||||
<div class="row mb-2">
|
||||
<div class="col-sm-6">
|
||||
<h1 class="m-0 text-dark">@yield('contentheader_title', 'Content Title')</h1>
|
||||
<small>@yield('contentheader_description','Description')</small>
|
||||
</div><!-- /.col -->
|
||||
|
||||
<div class="col-sm-6">
|
||||
<ol class="breadcrumb float-sm-right small">
|
||||
<li class="breadcrumb-item"><a href="{{ url('/home'.(isset($ido) ? '/'.$ido->id : '')) }}">Home</a></li>
|
||||
|
||||
@@ -6,23 +6,23 @@
|
||||
<!-- 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 -->
|
||||
<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 -->
|
||||
<link rel="stylesheet" href="//code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
|
||||
<!-- Theme style -->
|
||||
<link rel="stylesheet" href="/css/adminlte.min.css">
|
||||
<link rel="stylesheet" href="{{ request()->getScheme() }}://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
|
||||
|
||||
<!-- 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">
|
||||
|
||||
@if(file_exists('css/social.css'))
|
||||
<!-- Social Logins -->
|
||||
<link rel="stylesheet" href="/css/social.css">
|
||||
<link rel="stylesheet" href="{{ asset('/css/social.css') }}">
|
||||
@endif
|
||||
@if(file_exists('css/print.css'))
|
||||
<!-- Printing Modifications -->
|
||||
<link rel="stylesheet" href="/css/print.css">
|
||||
<link rel="stylesheet" href="{{ asset('/css/print.css') }}">
|
||||
@endif
|
||||
|
||||
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
|
||||
@@ -32,28 +32,19 @@
|
||||
<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="/css/fixes.css">
|
||||
<link rel="stylesheet" href="{{ asset('/css/fixes.css') }}">
|
||||
@endif
|
||||
|
||||
@if(file_exists('css/custom.css'))
|
||||
<!-- Custom CSS -->
|
||||
<link rel="stylesheet" href="{{ asset('/css/custom.css') }}">
|
||||
@endif
|
||||
</head>
|
||||
@@ -33,7 +33,13 @@
|
||||
<i class="fa fa-cog"></i>
|
||||
</a>
|
||||
<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>
|
||||
<a href="{{ url('settings') }}" class="dropdown-item">
|
||||
@@ -41,9 +47,15 @@
|
||||
</a>
|
||||
|
||||
<div class="dropdown-divider"></div>
|
||||
@if ($user->switched)
|
||||
<a href="{{ url('/admin/switch/stop') }}" class="dropdown-item" id="switch">
|
||||
<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>
|
||||
</li>
|
||||
@else
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<!-- REQUIRED JS SCRIPTS -->
|
||||
<!-- JQuery and bootstrap are required by Laravel 5.7 in resources/js/bootstrap.js-->
|
||||
<!-- Laravel App -->
|
||||
<script src="{{ url(mix('/js/app.js')) }}" type="text/javascript"></script>
|
||||
<script src="{{ asset('/js/app.js') }}" type="text/javascript"></script>
|
||||
<!-- AdminLTE -->
|
||||
<script src="/js/adminlte.min.js"></script>
|
||||
<script src="{{ asset('/js/adminlte.min.js') }}"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
// Our CSRF token to each interaction
|
||||
@@ -21,6 +21,9 @@
|
||||
NoTransitionAfterReload: false
|
||||
};
|
||||
|
||||
// Work out our timezone.
|
||||
const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
|
||||
|
||||
$(function () {
|
||||
"use strict";
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<!-- 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 -->
|
||||
<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>
|
||||
</a>
|
||||
|
||||
@@ -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
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;
|
||||
|
||||
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'),
|
||||
];
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user