Compare commits

..

11 Commits

Author SHA1 Message Date
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
10 changed files with 141 additions and 59 deletions

View File

@@ -10,10 +10,9 @@
}
],
"require": {
"igaster/laravel-theme": "^2.0.12",
"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": {
},

View File

@@ -29,11 +29,11 @@ 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',
'signMeetup' => 'Sign in using Meetup',
'signMeetup' => 'Sign in using Meetup',
'sendpassword' => 'Send Password Reset Link',
'passwordreset' => 'Reset password',
'pagenotfound' => 'Page not found',

View File

@@ -5,6 +5,14 @@
@endsection
@section('content')
@if(isset($login_note) AND $login_note)
<div class="alert alert-info alert-dismissible">
<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>
@endisset
<div class="login-box">
<div class="login-logo">
<a>{!! config('app.name_html_long') !!}</a>
@@ -21,6 +29,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">

View File

@@ -39,7 +39,12 @@
<link rel="stylesheet" href="{{ asset('/css/adminlte.min.css') }}">
@if(file_exists('css/fixes.css'))
<!-- CSS Fixes -->
<!-- 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

@@ -11,7 +11,7 @@
<!-- 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>

View File

@@ -60,7 +60,12 @@
$(this).removeClass('hold-transition');
});
}else{
$("body").addClass('sidebar-collapse');
$("body")
.addClass('sidebar-collapse')
.delay(500).queue(function () {
window.dispatchEvent(new Event('resize'));
$(this).dequeue();
});
}
}
}

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