Compare commits
31 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
432606760b | ||
|
|
958dbc7092 | ||
|
|
12f33b6853 | ||
|
|
b67df24219 | ||
|
|
7ffcdb139a | ||
|
|
5a9437db37 | ||
|
|
9389fd9e83 | ||
|
|
87819891a1 | ||
|
|
b3924ea239 | ||
|
|
6bc2787602 | ||
|
|
96a6830e61 | ||
|
|
176f680ff7 | ||
|
|
62f66d7eed | ||
|
|
f131db31c6 | ||
|
|
8b83990a66 | ||
|
|
4472202afb | ||
|
|
2040266ab2 | ||
|
|
1774987dea | ||
|
|
6c60298e8f | ||
|
|
41b320a5b9 | ||
|
|
1096f0e28d | ||
|
|
b0730b9ed3 | ||
|
|
163a7f2587 | ||
|
|
4f2707a374 | ||
|
|
0ca66c6d1c | ||
|
|
5833122ab5 | ||
|
|
a946ce4418 | ||
|
|
e5ff189d3e | ||
|
|
1efdfca55f | ||
|
|
6d876f2c94 | ||
|
|
70a7142877 |
@@ -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": "^5.0"
|
||||
},
|
||||
"require-dev": {
|
||||
},
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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">×</button>
|
||||
<h5><i class="icon fas 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,6 +30,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">
|
||||
@@ -28,18 +46,27 @@
|
||||
|
||||
<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">
|
||||
<span class="fa fa-envelope input-group-text"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="input-group mb-3">
|
||||
<input type="password" name="password" class="form-control" placeholder="Password">
|
||||
<div class="input-group-append">
|
||||
<span class="fa fa-lock input-group-text"></span>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="input-group mb-3">
|
||||
<input type="email" name="email" class="form-control" placeholder="Email">
|
||||
<div class="input-group-append">
|
||||
<span class="input-group-text"><i class="fas fa-envelope fa-fw"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-12">
|
||||
<div class="input-group mb-3">
|
||||
<input type="password" name="password" class="form-control" placeholder="Password">
|
||||
<div class="input-group-append">
|
||||
<span class="input-group-text"><i class="fas fa-key fa-fw"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-8">
|
||||
<div class="checkbox icheck">
|
||||
@@ -48,9 +75,10 @@
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- /.col -->
|
||||
<div class="col-4">
|
||||
<button type="submit" name="submit" class="btn btn-primary btn-block btn-flat">Sign In</button>
|
||||
<button type="submit" name="submit" class="btn btn-primary mr-0 float-right">Sign In</button>
|
||||
</div>
|
||||
<!-- /.col -->
|
||||
</div>
|
||||
@@ -61,12 +89,12 @@
|
||||
@endif
|
||||
|
||||
<p class="mb-1">
|
||||
<a name="reset" href="{{ url('/password/reset') }}">{{ trans('adminlte_lang::message.forgotpassword') }}</a>
|
||||
<a name="reset" href="{{ url('password/reset') }}">{{ trans('adminlte_lang::message.forgotpassword') }}</a>
|
||||
</p>
|
||||
|
||||
@isset($register)
|
||||
<p class="mb-0">
|
||||
<a href="register.html" class="text-center">Register a new membership</a>
|
||||
<a href="{{ url('register') }}" class="text-center">{{ trans('adminlte_lang::message.register') }}</a>
|
||||
</p>
|
||||
@endisset
|
||||
</div>
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<div class="social-auth-links text-center mb-3">
|
||||
<p>- OR -</p>
|
||||
@foreach(config('auth.social') as $o)
|
||||
<a href="{{ url('/auth/'.$o['id']) }}" class="btn btn-block btn-{{ $o['class'] }}">
|
||||
<i class="fa fa-{{ $o['icon'] }} mr-2"></i> {{ trans('adminlte_lang::message.sign'.$o['name']) }}
|
||||
<a href="{{ url('/auth/'.$o['id']) }}" class="btn btn-block {{ $o['class'] }}">
|
||||
<i class="{{ $o['icon'] }} fa-fw mr-2"></i> {{ trans('adminlte_lang::message.sign'.$o['name']) }}
|
||||
</a>
|
||||
@endforeach
|
||||
</div>
|
||||
|
||||
@@ -5,41 +5,63 @@
|
||||
@endsection
|
||||
|
||||
@section('content')
|
||||
<body class="hold-transition login-page">
|
||||
<div id="app" v-cloak>
|
||||
<div class="login-box">
|
||||
<div class="login-logo">
|
||||
<a href="{{ url('/home') }}">{!! config('app.name_html_long') !!}</a>
|
||||
</div><!-- /.login-logo -->
|
||||
<div class="login-box m-auto">
|
||||
<div class="login-logo">
|
||||
<a>{!! config('app.name_html_long') !!}</a>
|
||||
</div>
|
||||
|
||||
@if (session('status'))
|
||||
<div class="alert alert-success">
|
||||
{{ session('status') }}
|
||||
@if (Session::has('status'))
|
||||
<div class="text-center mb-3">
|
||||
<div class="alert alert-success m-auto">
|
||||
<strong>OK!</strong> {{ Session::get('status') }}
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if (count($errors) > 0)
|
||||
<div class="alert alert-danger">
|
||||
<strong>Whoops!</strong> {{ trans('adminlte_lang::message.someproblems') }}<br><br>
|
||||
<ul>
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ $error }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
@if (count($errors) > 0)
|
||||
<div class="alert alert-danger">
|
||||
<strong>Whoops!</strong> {{ trans('adminlte_lang::message.someproblems') }}<br><br>
|
||||
<ul>
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ $error }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="login-box-body">
|
||||
<p class="login-box-msg">{{ trans('adminlte_lang::message.passwordreset') }}</p>
|
||||
<!-- /.login-logo -->
|
||||
<div class="card">
|
||||
<div class="card-body login-card-body">
|
||||
<p class="login-box-msg">You forgot your password? Here you can easily retrieve a new password.</p>
|
||||
|
||||
<email-reset-password-form></email-reset-password-form>
|
||||
<form method="post" action="{{ url('password/email') }}">
|
||||
{{ csrf_field() }}
|
||||
<div class="input-group mb-3">
|
||||
<input type="email" name="email" class="form-control" placeholder="Email" required>
|
||||
<div class="input-group-append">
|
||||
<span class="fas fa-envelope input-group-text"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<button type="submit" class="btn btn-primary btn-block">{{ trans('adminlte_lang::message.sendpassword') }}</button>
|
||||
</div>
|
||||
<!-- /.col -->
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<a href="{{ url('/login') }}">Log in</a><br>
|
||||
</div><!-- /.login-box-body -->
|
||||
<p class="mt-3 mb-1">
|
||||
<a href="{{ url('login') }}">{{ trans('adminlte_lang::message.login') }}</a>
|
||||
</p>
|
||||
|
||||
</div><!-- /.login-box -->
|
||||
@isset($register)
|
||||
<p class="mb-0">
|
||||
<a href="{{ url('register') }}" class="text-center">{{ trans('adminlte_lang::message.register') }}</a>
|
||||
</p>
|
||||
@endisset
|
||||
</div>
|
||||
<!-- /.login-card-body -->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@include('adminlte::layouts.partials.scripts_auth')
|
||||
</body>
|
||||
<!-- /.login-box -->
|
||||
@endsection
|
||||
@@ -5,42 +5,65 @@
|
||||
@endsection
|
||||
|
||||
@section('content')
|
||||
<body class="hold-transition login-page">
|
||||
<div id="app" v-cloak>
|
||||
<div class="login-box">
|
||||
<div class="login-logo">
|
||||
<a href="{{ url('/home') }}">{!! config('app.name_html_long') !!}</a>
|
||||
</div><!-- /.login-logo -->
|
||||
<div class="login-box m-auto">
|
||||
<div class="login-logo">
|
||||
<a>{!! config('app.name_html_long') !!}</a>
|
||||
</div>
|
||||
|
||||
@if (session('status'))
|
||||
<div class="alert alert-success">
|
||||
{{ session('status') }}
|
||||
</div>
|
||||
@endif
|
||||
@if (count($errors) > 0)
|
||||
<div class="alert alert-danger">
|
||||
<strong>Whoops!</strong> {{ trans('adminlte_lang::message.someproblems') }}<br><br>
|
||||
<ul>
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ $error }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if (count($errors) > 0)
|
||||
<div class="alert alert-danger">
|
||||
<strong>Whoops!</strong> {{ trans('adminlte_lang::message.someproblems') }}<br><br>
|
||||
<ul>
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ $error }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
<!-- /.login-logo -->
|
||||
<div class="card">
|
||||
<div class="card-body login-card-body">
|
||||
<p class="login-box-msg">You are only one step a way from your new password, set your new password now.</p>
|
||||
|
||||
<div class="login-box-body">
|
||||
<p class="login-box-msg">{{ trans('adminlte_lang::message.passwordreset') }}</p>
|
||||
<form method="post" action="{{ url('password/reset') }}">
|
||||
{{ csrf_field() }}
|
||||
<div class="input-group mb-3">
|
||||
<input type="email" name="email" class="form-control" placeholder="Email" required>
|
||||
<div class="input-group-append">
|
||||
<span class="fas fa-envelope fa-fw input-group-text"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="input-group mb-3">
|
||||
<input type="password" name="password" class="form-control" placeholder="Password" required>
|
||||
<div class="input-group-append">
|
||||
<span class="fas fa-lock input-group-text"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="input-group mb-3">
|
||||
<input type="password" name="password_confirmation" class="form-control" placeholder="Confirm Password" data-match="#password" required>
|
||||
<div class="input-group-append">
|
||||
<span class="fas fa-lock input-group-text"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<button type="submit" class="btn btn-primary btn-block">{{ trans('adminlte_lang::message.passwordreset') }}</button>
|
||||
</div>
|
||||
<!-- /.col -->
|
||||
</div>
|
||||
<input type="hidden" name="token" value="{{ $token }}">
|
||||
</form>
|
||||
|
||||
<reset-password-form token="{{ $token }}">></reset-password-form>
|
||||
|
||||
<a href="{{ url('/login') }}">Log in</a><br>
|
||||
<a href="{{ url('/register') }}" class="text-center">{{ trans('adminlte_lang::message.register') }}</a>
|
||||
</div><!-- /.login-box-body -->
|
||||
|
||||
</div><!-- /.login-box -->
|
||||
<p class="mt-3 mb-1">
|
||||
<a href="{{ url('login') }}">Login</a>
|
||||
@isset($register)
|
||||
<a href="{{ url('register') }}" class="text-center">{{ trans('adminlte_lang::message.register') }}</a>
|
||||
@endisset
|
||||
</p>
|
||||
</div>
|
||||
<!-- /.login-card-body -->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@include('adminlte::layouts.partials.scripts_auth')
|
||||
</body>
|
||||
<!-- /.login-box -->
|
||||
@endsection
|
||||
@@ -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')
|
||||
@@ -13,7 +13,8 @@
|
||||
|
||||
<!-- Content Wrapper. Contains page content -->
|
||||
<div class="content-wrapper">
|
||||
|
||||
<!-- In case we have input fields in the header -->
|
||||
@yield('page-form-start')
|
||||
@include('adminlte::layouts.partials.contentheader')
|
||||
|
||||
<!-- Main content -->
|
||||
@@ -24,6 +25,7 @@
|
||||
</div>
|
||||
</section><!-- /.content -->
|
||||
|
||||
@yield('page-form-end')
|
||||
</div><!-- /.content-wrapper -->
|
||||
|
||||
@isset($controlsidebar)
|
||||
|
||||
@@ -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,12 +1,13 @@
|
||||
<!-- 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">
|
||||
<div class="col-sm-8">
|
||||
<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">
|
||||
|
||||
<div class="col-sm-4">
|
||||
<ol class="breadcrumb float-sm-right small">
|
||||
<li class="breadcrumb-item"><a href="{{ url('/home'.(isset($ido) ? '/'.$ido->id : '')) }}">Home</a></li>
|
||||
@isset($breadcrumb)
|
||||
|
||||
@@ -6,23 +6,22 @@
|
||||
<!-- 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">
|
||||
<!-- 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="{{ asset('//use.fontawesome.com/releases/v5.13.0/css/all.css') }}">
|
||||
<link rel="stylesheet" href="{{ asset('//use.fontawesome.com/releases/v5.13.0/css/v4-shims.css') }}">
|
||||
|
||||
<!-- Google Font: Source Sans Pro -->
|
||||
<link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
|
||||
<link href="https://fonts.googleapis.com/css2?family={{ str_replace(' ','+',config('app.font') ?: 'IBM Plex Sans') }}:wght@300&display=swap" 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 +31,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">
|
||||
<!-- 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>
|
||||
@@ -4,20 +4,20 @@
|
||||
<!-- Left navbar links -->
|
||||
<ul class="navbar-nav">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" data-widget="pushmenu" href="#"><i class="fa fa-bars"></i></a>
|
||||
<a class="nav-link" data-widget="pushmenu" href="#"><i class="fas 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>
|
||||
<i class="fas 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>
|
||||
<span name="searching" class="d-none"><i class="fas fa-spinner fa-spin fa-fw" style="margin-top: .33em; width: 1em; height: 1em;"></i></span>
|
||||
<div id="search_results"></div>
|
||||
</div>
|
||||
</form>
|
||||
@@ -30,31 +30,43 @@
|
||||
<!-- Profile Settings -->
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link" data-toggle="dropdown" href="#">
|
||||
<i class="fa fa-cog"></i>
|
||||
<i class="fas 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">
|
||||
<i class="fa fa-user mr-2"></i> Settings
|
||||
<i class="fas fa-user mr-2"></i> Settings
|
||||
</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="fas fa-sign-out-alt mr-2"></i> {{ trans('adminlte_lang::message.switchoff') }}
|
||||
</a>
|
||||
@else
|
||||
<a href="{{ url('logout') }}" class="dropdown-item">
|
||||
<i class="fas fa-sign-out-alt 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>
|
||||
<a href="{{ url()->current().'?login=1' }}" class="text-muted pr-2"><i class="fas fa-lock"></i></a>
|
||||
@endif
|
||||
|
||||
<!-- Control Side Bar -->
|
||||
@isset($controlsidebar)
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#">
|
||||
<i class="fa fa-th-large"></i>
|
||||
<i class="fas fa-th"></i>
|
||||
</a>
|
||||
</li>
|
||||
@endisset
|
||||
@@ -63,15 +75,25 @@
|
||||
</nav>
|
||||
|
||||
@section('page-scripts')
|
||||
@js('/plugin/bootstrap3-typeahead/js/bootstrap3-typeahead.min.js','bs-typeahead')
|
||||
<style>
|
||||
/* Solid border */
|
||||
div.typeahead.dropdown-menu > .dropdown-header {
|
||||
color: #000000;
|
||||
text-align: left;
|
||||
}
|
||||
</style>
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
$("input[name=q]").typeahead({
|
||||
autoSelect: false,
|
||||
scrollHeight: 10,
|
||||
theme: 'bootstrap4',
|
||||
delay: 500,
|
||||
minLength: 2,
|
||||
items: {{ isset($search_limit) ? $search_limit : 15 }},
|
||||
items: {{ isset($search_limit) ? $search_limit : 100 }},
|
||||
fitToElement: false,
|
||||
selectOnBlur: false,
|
||||
appendTo: "#search_results",
|
||||
source: function (query,process) {
|
||||
search('{{ url("search",['date'=>isset($ido) ? $ido->id : NULL]) }}',query,process);
|
||||
@@ -79,8 +101,13 @@
|
||||
|
||||
matcher: function () { return true; },
|
||||
|
||||
// Disable sorting and just return the items (items should by the ajax method)
|
||||
sorter: function(items) {
|
||||
return items;
|
||||
},
|
||||
|
||||
updater: function (item) {
|
||||
window.parent.location.href = '{{ url("/") }}'+users[item];
|
||||
window.parent.location.href = item.value;
|
||||
},
|
||||
})
|
||||
.on('keyup keypress', function(event) {
|
||||
@@ -114,17 +141,7 @@
|
||||
// if json is null, means no match, won't do again.
|
||||
if(data==null || (data.length===0)) return;
|
||||
|
||||
users = {};
|
||||
userLabels = [];
|
||||
_.each(data,function(item,ix,list) {
|
||||
if (_.includes(users,item.label))
|
||||
item.label = item.label + ' #' + item.value;
|
||||
|
||||
userLabels.push(item.label);
|
||||
users[item.label] = item.value;
|
||||
});
|
||||
|
||||
process(userLabels);
|
||||
process(data);
|
||||
},
|
||||
complete : function() {
|
||||
if (--c == 0) {
|
||||
|
||||
@@ -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
|
||||
@@ -14,6 +14,8 @@
|
||||
});
|
||||
|
||||
$.AdminLTESidebarTweak = {};
|
||||
$.AdminLTESidebarTweak.Open = true;
|
||||
$.AdminLTESidebarTweak.ResizeDelay = 1000;
|
||||
|
||||
$.AdminLTESidebarTweak.options = {
|
||||
EnableRemember: true,
|
||||
@@ -21,19 +23,48 @@
|
||||
NoTransitionAfterReload: false
|
||||
};
|
||||
|
||||
// Work out our timezone.
|
||||
const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
|
||||
|
||||
/**
|
||||
* Open and close the sidebar
|
||||
* @param state
|
||||
* @param addclass
|
||||
*/
|
||||
function sidebaropenclose(state,addclass) {
|
||||
// Dont do anything if the state hasnt changed.
|
||||
if (state == $.AdminLTESidebarTweak.Open) {
|
||||
return;
|
||||
}
|
||||
|
||||
$.AdminLTESidebarTweak.Open = state;
|
||||
|
||||
if (addclass !== 'undefined')
|
||||
$("body")
|
||||
.addClass(state ? 'sidebar-open' : 'sidebar-collapse');
|
||||
|
||||
$(this).delay($.AdminLTESidebarTweak.ResizeDelay).queue(function() {
|
||||
window.dispatchEvent(new Event('resize'));
|
||||
$(this).dequeue();
|
||||
});
|
||||
}
|
||||
|
||||
$(function () {
|
||||
"use strict";
|
||||
|
||||
$("body").on("collapsed.lte.pushmenu", function(){
|
||||
if($.AdminLTESidebarTweak.options.EnableRemember){
|
||||
document.cookie = "toggleState=closed";
|
||||
if($.AdminLTESidebarTweak.options.EnableRemember) {
|
||||
document.cookie = "toggleState=closed;path=/";
|
||||
|
||||
$("body").queue(sidebaropenclose(false));
|
||||
}
|
||||
});
|
||||
|
||||
// @todo this is not firing.
|
||||
$("body").on("expanded.lte.pushmenu", function(){
|
||||
$("body").on("shown.lte.pushmenu", function(){
|
||||
if($.AdminLTESidebarTweak.options.EnableRemember){
|
||||
document.cookie = "toggleState=opened";
|
||||
document.cookie = "toggleState=opened;path=/";
|
||||
|
||||
$("body").queue(sidebaropenclose(true));
|
||||
}
|
||||
});
|
||||
|
||||
@@ -47,9 +78,14 @@
|
||||
$(this).removeClass('hold-transition');
|
||||
});
|
||||
}else{
|
||||
$("body").addClass('sidebar-collapse');
|
||||
$("body").queue(sidebaropenclose(false,true));
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
</script>
|
||||
</script>
|
||||
|
||||
@if(file_exists('js/custom.js'))
|
||||
<!-- Any Custom JS -->
|
||||
<script src="{{ asset('js/custom.js') }}"></script>
|
||||
@endif
|
||||
@@ -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 AND $user->email) ? $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 name="login" href="{{ url()->current().'?login=1' }}" class="d-block"><i class="pl-1 fas fa-lock fa-2x"></i></a>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="info">
|
||||
<a href="{{ url('login') }}" 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 name="login" span="d-block"><small><span style="color: #747474;">Last On:</span> {{ $user->lastlogin->format('Y-m-d H:i') }}</small></a>@endisset
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
<li class="nav-item">
|
||||
<a href="#" class="nav-link @if(Route::current()->getName() == 'home') active @endif">
|
||||
<i class="nav-icon fa fa-th"></i>
|
||||
<i class="nav-icon fas fa-th"></i>
|
||||
<p>
|
||||
My Link Title
|
||||
<span class="right badge badge-danger">New</span>
|
||||
|
||||
23
resources/themes/adminlte/views/widget/status.blade.php
Normal file
23
resources/themes/adminlte/views/widget/status.blade.php
Normal file
@@ -0,0 +1,23 @@
|
||||
<!-- Success -->
|
||||
@if(session()->has('success'))
|
||||
<div class="alert alert-success alert-dismissible">
|
||||
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
|
||||
<h5><i class="icon fas fa-check"></i> Success!</h5>
|
||||
<ul>
|
||||
<li>{{ session()->get('success') }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<!-- Errors -->
|
||||
@if ($errors->any())
|
||||
<div class="alert alert-danger alert-dismissible">
|
||||
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
|
||||
<h5><i class="icon fas fa-ban"></i> Whoops!</h5>
|
||||
<ul>
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{!! $error !!}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
@@ -34,7 +34,7 @@ class Carbon extends CarbonBase
|
||||
*
|
||||
* @return static
|
||||
*/
|
||||
public function firstOfHalf($dayOfWeek = null)
|
||||
public function startOfHalf($dayOfWeek = null)
|
||||
{
|
||||
return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF - 5, 1)->firstOfMonth($dayOfWeek);
|
||||
}
|
||||
@@ -49,7 +49,7 @@ class Carbon extends CarbonBase
|
||||
*
|
||||
* @return static
|
||||
*/
|
||||
public function lastOfHalf($dayOfWeek = null)
|
||||
public function endOfHalf($dayOfWeek = null)
|
||||
{
|
||||
return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF, 1)->lastOfMonth($dayOfWeek);
|
||||
}
|
||||
|
||||
@@ -26,9 +26,6 @@ class AdminController extends Controller
|
||||
return ! Session::get('orig_user');
|
||||
}
|
||||
|
||||
/**
|
||||
* @todo Change the background color (or something) so we know we are switched
|
||||
*/
|
||||
public function user_switch_start($id)
|
||||
{
|
||||
if ($this->switch_session() AND $this->switch_authorised($id))
|
||||
|
||||
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;
|
||||
|
||||
@@ -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'),
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -21,7 +21,7 @@ if (! function_exists('array_undot')) {
|
||||
$array = [];
|
||||
|
||||
foreach ($dotNotationArray as $key => $value) {
|
||||
array_set($array, $key, $value);
|
||||
\Illuminate\Support\Arr::set($array, $key, $value);
|
||||
}
|
||||
|
||||
return $array;
|
||||
|
||||
Reference in New Issue
Block a user