Compare commits

..

24 Commits

Author SHA1 Message Date
Deon George
8b83990a66 Changed not logged in user to padlock with 'Login' 2019-12-16 11:29:34 +11:00
Deon George
4472202afb Display improvements for login note 2019-11-29 11:13:24 +11:00
Deon George
2040266ab2 Disable autocomplete in search 2019-11-26 09:58:45 +11:00
Deon George
1774987dea Dispatch resize event if sidebar collapsed 2019-11-22 14:22:37 +11:00
Deon George
6c60298e8f Add a note on the login page 2019-11-21 14:33:33 +11:00
Deon George
41b320a5b9 Fix file_exist check for custom.css 2019-11-17 23:26:12 +11:00
Deon George
1096f0e28d Added custom.css to app.blade 2019-10-30 14:31:32 +08:00
Deon George
b0730b9ed3 Revert name to igaster/laravel-theme 2019-10-30 14:15:20 +08:00
Deon George
163a7f2587 Add github cvs to composer 2019-10-30 12:15:23 +08:00
Deon George
4f2707a374 Switch laravel-them to fix issue with @ directives 2019-10-30 09:49:19 +08:00
Deon George
0ca66c6d1c Updated orchestra/asset 2019-10-11 15:50:06 +11:00
Deon George
5833122ab5 Removed Acache/User 2019-10-11 14:47:13 +11:00
Deon George
a946ce4418 Added error dialog on login box 2019-09-03 14:38:19 +10:00
Deon George
e5ff189d3e Added tz and move adminlte css to later 2019-08-20 15:50:15 +10:00
Deon George
1efdfca55f Remove mix() for now 2019-07-03 17:16:46 +10:00
Deon George
6d876f2c94 No longer using // urls, and fixed sudo rendoring 2019-06-17 11:44:56 +10:00
Deon George
70a7142877 Fix for sidebar collapse/expand and window resizing 2019-05-16 11:15:49 +10:00
Deon George
c406c35ff7 User login updates 2019-04-11 22:30:03 +10:00
Deon George
6d84613158 Added custom css files 2019-03-28 11:16:50 +11:00
Deon George
05dbcaf6c4 Added creativeorange/gravatar to requirements 2019-03-26 17:23:46 +11:00
Deon George
867b42be91 Added acache/user to requirements 2019-03-26 17:18:40 +11:00
Deon George
f44e6f1d09 Added csrf_field() to login form 2019-03-26 14:31:18 +11:00
Deon George
fb88cf2866 Added items to search 2019-03-22 21:52:44 +11:00
Deon George
91aa1d9378 Enabled search results and remember sidebar collapse 2019-02-18 20:44:17 +11:00
14 changed files with 273 additions and 113 deletions

View File

@@ -10,8 +10,9 @@
}
],
"require": {
"igaster/laravel-theme": "^2.0",
"orchestra/asset": "^3.6"
"igaster/laravel-theme": "^2.0.15",
"creativeorange/gravatar": "^1.0",
"orchestra/asset": "^4.0"
},
"require-dev": {
},

View File

@@ -29,10 +29,11 @@ return [
'signGithub' => 'Sign in using Github',
'signFacebook' => 'Sign in using Facebook',
'signTwitter' => 'Sign in using Twitter',
'signGoogle+' => 'Sign in using Google+',
'signLinkedin' => 'Sign in using Linkedin',
'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',
'sendpassword' => 'Send Password Reset Link',
'passwordreset' => 'Reset password',
'pagenotfound' => 'Page not found',

View File

@@ -5,7 +5,16 @@
@endsection
@section('content')
<div class="login-box">
@if(isset($login_note) AND $login_note)
<div class="alert alert-info alert-dismissible m-auto">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<h5><i class="icon fa fa-info"></i> NOTE!</h5>
{!! $login_note !!}
</div>
<br>
@endisset
<div class="login-box m-auto">
<div class="login-logo">
<a>{!! config('app.name_html_long') !!}</a>
</div>
@@ -21,12 +30,22 @@
</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">
<p class="login-box-msg">{{ trans('adminlte_lang::message.siginsession') }}</p>
<form method="post">
{{ csrf_field() }}
<div class="input-group mb-3">
<input type="email" name="email" class="form-control" placeholder="Email">
<div class="input-group-append">

View File

@@ -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() {

View File

@@ -4,7 +4,7 @@
@include('adminlte::layouts.partials.htmlheader')
@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 class="wrapper">
@include('adminlte::layouts.partials.mainheader')

View File

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

View File

@@ -1,20 +1,21 @@
<!-- 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">
<ol class="breadcrumb float-sm-right small">
<li class="breadcrumb-item"><a href="{{ url('/home'.(isset($ido) ? '/'.$ido->id : '')) }}">Home</a></li>
@isset($breadcrumb)
@foreach ($breadcrumb as $item => $url)
<li class="breadcrumb-item"><a href="{{url($url)}}">{{ $item }}</a></li>
@endforeach
@endisset
<li class="breadcrumb-item active">@yield('contentheader_title', 'Content Title')</li>
<li class="breadcrumb-item active">@yield('page_title','Page Title')</li>
</ol>
</div><!-- /.col -->
</div><!-- /.row -->

View File

@@ -6,18 +6,24 @@
<!-- 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">
<!-- Printing Modifications -->
<link rel="stylesheet" href="/css/print.css">
<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="{{ 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 -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -26,23 +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="{{ asset('/css/fixes.css') }}">
@endif
@if(file_exists('css/custom.css'))
<!-- Custom CSS -->
<link rel="stylesheet" href="{{ asset('/css/custom.css') }}">
@endif
</head>

View File

@@ -6,18 +6,19 @@
<li class="nav-item">
<a class="nav-link" data-widget="pushmenu" href="#"><i class="fa fa-bars"></i></a>
</li>
</ul>
<!-- SEARCH FORM -->
<form class="form-inline ml-3">
<div class="input-group input-group-sm">
<input class="form-control form-control-navbar" name="q" type="search" placeholder="Search" aria-label="Search">
<input class="form-control form-control-navbar" name="q" type="search" placeholder="Search" aria-label="Search" autocomplete="off">
<div class="input-group-append">
<button class="btn btn-navbar" type="submit">
<i class="fa fa-search"></i>
</button>
</div>
<span name="searching" class="d-none"><i class="fa fa-spinner fa-spin fa-fw" style="margin-top: .33em; width: 1em; height: 1em;"></i></span>
<div id="search_results"></div>
</div>
</form>
@@ -32,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">
@@ -40,11 +47,19 @@
</a>
<div class="dropdown-divider"></div>
<a href="{{ url('logout') }}" class="dropdown-item">
<i class="fa fa-sign-out mr-2"></i> Log Out
</a>
@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
<a href="{{ url('login') }}" class="text-muted pr-2"><i class="fa fa-lock"></i></a>
@endif
<!-- Control Side Bar -->
@@ -65,8 +80,9 @@
<script type="text/javascript">
$(document).ready(function() {
$("input[name=q]").typeahead({
delay: 300,
delay: 500,
minLength: 2,
items: {{ isset($search_limit) ? $search_limit : 15 }},
fitToElement: false,
appendTo: "#search_results",
source: function (query,process) {
@@ -95,14 +111,15 @@
type : 'GET',
data : 'term=' + query,
dataType : 'JSON',
async : false,
async : true,
cache : false,
beforeSend : function() {
if (c++ == 0) {
if (icon)
$('i[name='+icon+']').addClass("fa-spin");
else
$('i[name=searching]').removeClass("hidden");
else {
$('span[name=searching]').removeClass("d-none");
}
}
},
success : function(data) {
@@ -125,8 +142,9 @@
if (--c == 0) {
if (icon)
$('i[name='+icon+']').removeClass("fa-spin");
else
$('i[name=searching]').addClass("hidden");
else {
$('span[name=searching]').addClass("d-none");
}
}
}
})

View File

@@ -1,16 +1,73 @@
<!-- 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>
<!-- 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">
$.ajaxSetup({
headers: {
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
}
});
// Our CSRF token to each interaction
$.ajaxSetup({
headers: {
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
}
});
$.AdminLTESidebarTweak = {};
$.AdminLTESidebarTweak.options = {
EnableRemember: true,
//Removes the transition after page reload.
NoTransitionAfterReload: false
};
// Work out our timezone.
const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
$(function () {
"use strict";
$("body").on("collapsed.lte.pushmenu", function(){
if($.AdminLTESidebarTweak.options.EnableRemember) {
document.cookie = "toggleState=closed;path=/";
$("body").delay(500).queue(function () {
window.dispatchEvent(new Event('resize'));
$(this).dequeue();
});
}
});
// @todo this is not firing.
$("body").on("shown.lte.pushmenu", function(){
if($.AdminLTESidebarTweak.options.EnableRemember){
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')
.delay(500).queue(function () {
window.dispatchEvent(new Event('resize'));
$(this).dequeue();
});
}
}
}
});
</script>

View File

@@ -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>
@@ -11,10 +11,16 @@
<!-- Sidebar user panel (optional) -->
<div class="user-panel mt-3 pb-3 mb-3 d-flex">
<div class="image">
<img src="{{ Gravatar::get($user->exists ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User">
@if($user->exists)
<img src="{{ Gravatar::get(($user->exists AND $user->email) ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User">
@else
<a href="{{ url('login') }}" class="d-block"><i class="pl-1 fa fa-3x fa-lock"></i></a>
@endif
</div>
<div class="info">
<a class="d-block">{{ $user->name ?: 'Nobody' }}</a>
<a href="{{ url('login') }}" class="d-block">{{ $user->exists ? ($user->name ?: 'No Name') : 'Login' }}</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;
@@ -12,60 +13,58 @@ use Illuminate\Support\ServiceProvider;
*/
class LeenooksServiceProvider extends ServiceProvider
{
private $_path = '';
private $_path = '';
/**
* Bootstrap the application services.
*
* @param Router $router
*/
public function boot(Router $router)
{
$this->loadViewsFrom($this->_path.'/resources/themes/adminlte/views/', 'adminlte');
$this->loadTranslationsFrom($this->_path.'/resources/themes/adminlte/lang/', 'adminlte_lang');
/**
* Bootstrap the application services.
*
* @param Router $router
*/
public function boot(Router $router)
{
$router->pushMiddlewareToGroup('web',GuestUser::class);
// Enable a recusive() collection function so that we can just arrives in config/*.php
\Illuminate\Support\Collection::macro('recursive', function () {
return $this->map(function ($value) {
if (is_array($value) || is_object($value)) {
return collect($value)->recursive();
}
$this->loadViewsFrom($this->_path.'/resources/themes/adminlte/views/', 'adminlte');
$this->loadTranslationsFrom($this->_path.'/resources/themes/adminlte/lang/', 'adminlte_lang');
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.
*
* @return void
*/
public function register()
{
if (! $this->_path) {
$this->_path = realpath(__DIR__.'/../../');
}
}
/**
* Register the application services.
*
* @return void
*/
public function register()
{
if (! $this->_path) {
$this->_path = realpath(__DIR__.'/../../');
}
}
/**
* Views copy path.
*
* @return array
*/
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'),
];
}
}
/**
* Views copy path.
*
* @return array
*/
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'),
];
}
}