Compare commits
16 Commits
Author | SHA1 | Date | |
---|---|---|---|
4b541857d7 | |||
4e9bdca2f5 | |||
e0333e352a | |||
f44d780e19 | |||
46df11f087 | |||
dc8983aa91 | |||
|
9db703d88f | ||
|
05d3caddf4 | ||
|
e3ebef90d9 | ||
|
d494400e7e | ||
|
61f38aefe7 | ||
|
8e9ca4c531 | ||
|
2e512cc3ed | ||
|
9ef7e8e626 | ||
|
c9cd560b36 | ||
|
b3471f31a0 |
@@ -1,17 +1,15 @@
|
||||
{
|
||||
"name": "leenooks/laravel",
|
||||
"name": "laravel/leenooks",
|
||||
"description": "Leenooks standard templates and tools.",
|
||||
"keywords": ["laravel","leenooks"],
|
||||
"license": "MIT",
|
||||
"authors": [
|
||||
{
|
||||
"name": "Deon George",
|
||||
"email": "deon@leenooks.net"
|
||||
"email": "deon@dege.au"
|
||||
}
|
||||
],
|
||||
"require": {
|
||||
"creativeorange/gravatar": "^1.0",
|
||||
"orchestra/asset": "^6.0"
|
||||
},
|
||||
"require-dev": {
|
||||
},
|
||||
@@ -26,8 +24,6 @@
|
||||
"extra": {
|
||||
"laravel": {
|
||||
"providers": [
|
||||
"Orchestra\\Asset\\AssetServiceProvider",
|
||||
"Collective\\Html\\HtmlServiceProvider",
|
||||
"Leenooks\\Providers\\LeenooksServiceProvider",
|
||||
"Leenooks\\Providers\\CustomBladeServiceProvider"
|
||||
]
|
||||
|
@@ -39,9 +39,6 @@
|
||||
@section('scripts')
|
||||
@include('adminlte::layouts.partials.scripts')
|
||||
|
||||
{{-- Scripts --}}
|
||||
{!! Asset::scripts() !!}
|
||||
|
||||
@yield('page-scripts')
|
||||
@show
|
||||
</body>
|
||||
|
@@ -6,16 +6,19 @@
|
||||
<!-- CSRF Token -->
|
||||
<meta name="csrf-token" content="{{ csrf_token() }}">
|
||||
|
||||
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/css/bootstrap.min.css" integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l" crossorigin="anonymous">
|
||||
{{--
|
||||
<!-- Included in adminlte -->
|
||||
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l" crossorigin="anonymous">
|
||||
--}}
|
||||
|
||||
<!-- Font Awesome Icons -->
|
||||
<link rel="stylesheet" href="//use.fontawesome.com/releases/v5.15.3/css/all.css">
|
||||
<link rel="stylesheet" href="//use.fontawesome.com/releases/v5.15.4/css/all.css">
|
||||
{{--
|
||||
<link rel="stylesheet" href="//use.fontawesome.com/releases/v5.15.3/css/v4-shims.css">
|
||||
<link rel="stylesheet" href="//use.fontawesome.com/releases/v5.15.4/css/v4-shims.css">
|
||||
--}}
|
||||
|
||||
<!-- Theme style -->
|
||||
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/admin-lte@3.1.0/dist/css/adminlte.min.css">
|
||||
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/admin-lte@3.2.0/dist/css/adminlte.min.css">
|
||||
|
||||
<!-- Google Font: Source Sans Pro -->
|
||||
<link href="https://fonts.googleapis.com/css2?family={{ str_replace(' ','+',config('app.font') ?: 'IBM Plex Sans') }}:wght@300&display=swap" rel="stylesheet">
|
||||
@@ -38,9 +41,6 @@
|
||||
<![endif]-->
|
||||
--}}
|
||||
|
||||
<!-- STYLESHEETS -->
|
||||
{!! Asset::styles() !!}
|
||||
|
||||
@yield('page-styles')
|
||||
|
||||
@if(file_exists('css/fixes.css'))
|
||||
|
@@ -83,7 +83,7 @@
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
$("input[name=q]").typeahead({
|
||||
$('input[name=q]').typeahead({
|
||||
autoSelect: false,
|
||||
scrollHeight: 10,
|
||||
theme: 'bootstrap4',
|
||||
@@ -149,6 +149,11 @@
|
||||
$('span[name=searching]').addClass("d-none");
|
||||
}
|
||||
}
|
||||
},
|
||||
statusCode: {
|
||||
401: function() {
|
||||
window.parent.location.href = '{{ route('login') }}';
|
||||
}
|
||||
}
|
||||
})
|
||||
}, 500);
|
||||
|
@@ -2,9 +2,9 @@
|
||||
<!-- Bootstrap & Jquery App -->
|
||||
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js" integrity="sha512-894YE6QWD5I59HgZOGReFYm4dnWc1Qt5NtvYSaNcOP+u1T9qYdvdihz0PPSiiqn/+/3e7Jo4EaG7TubfWGUrMQ==" crossorigin="anonymous"></script>
|
||||
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.21/lodash.min.js" integrity="sha512-WFN04846sdKMIP5LKNphMaWzU7YpMyCU245etK3g/2ARYbPK9Ub18eG+ljU96qKRCWh+quCY7yefSmlkQw1ANQ==" crossorigin="anonymous"></script>
|
||||
<script type="text/javascript" src="//cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-Piv4xVNRyMGpqkS2by6br4gNJ7DXjqk09RmUpJ8jgGtD7zP9yug3goQfGII0yAns" crossorigin="anonymous"></script>
|
||||
<script type="text/javascript" src="//cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
|
||||
<!-- AdminLTE -->
|
||||
<script type="text/javascript" src="//cdn.jsdelivr.net/npm/admin-lte@3.1.0/dist/js/adminlte.min.js"></script>
|
||||
<script type="text/javascript" src="//cdn.jsdelivr.net/npm/admin-lte@3.2.0/dist/js/adminlte.min.js"></script>
|
||||
|
||||
<!-- Additional Utilities -->
|
||||
<script src="{{ asset('plugin/bootstrap3-typeahead/js/bootstrap3-typeahead.min.js') }}"></script>
|
||||
@@ -44,7 +44,7 @@
|
||||
$.AdminLTESidebarTweak.Open = state;
|
||||
|
||||
if (addclass !== 'undefined')
|
||||
$("body")
|
||||
$('body')
|
||||
.addClass(state ? 'sidebar-open' : 'sidebar-collapse');
|
||||
|
||||
$(this).delay($.AdminLTESidebarTweak.ResizeDelay).queue(function() {
|
||||
@@ -56,7 +56,7 @@
|
||||
$(function () {
|
||||
"use strict";
|
||||
|
||||
$("body").on("collapsed.lte.pushmenu", function(){
|
||||
$('body').on('collapsed.lte.pushmenu', function(){
|
||||
if($.AdminLTESidebarTweak.options.EnableRemember) {
|
||||
document.cookie = "toggleState=closed;path=/";
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
}
|
||||
});
|
||||
|
||||
$("body").on("shown.lte.pushmenu", function(){
|
||||
$('body').on('shown.lte.pushmenu', function(){
|
||||
if($.AdminLTESidebarTweak.options.EnableRemember){
|
||||
document.cookie = "toggleState=opened;path=/";
|
||||
|
||||
|
@@ -12,7 +12,7 @@
|
||||
<div class="user-panel mt-3 pb-3 mb-3 d-flex">
|
||||
<div class="image">
|
||||
@if(isset($user) AND $user->exists)
|
||||
<img src="{{ Gravatar::get(($user->exists AND $user->email) ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User">
|
||||
<i class="fa fa-fw fa-2x fa-user text-white"></i>
|
||||
@else
|
||||
<a name="login" href="{{ url()->current().'?login=1' }}" class="d-block"><i class="pl-1 fas fa-lock fa-2x"></i></a>
|
||||
@endif
|
||||
|
12
resources/themes/adminlte/views/widget/errors.blade.php
Normal file
12
resources/themes/adminlte/views/widget/errors.blade.php
Normal file
@@ -0,0 +1,12 @@
|
||||
<!-- 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
|
17
resources/themes/adminlte/views/widget/form_date.blade.php
Normal file
17
resources/themes/adminlte/views/widget/form_date.blade.php
Normal file
@@ -0,0 +1,17 @@
|
||||
<div class="form-group">
|
||||
<label for="{{ $id }}">{{ $label }}</label>
|
||||
<div class="input-group has-validation">
|
||||
@empty($icon)
|
||||
@else
|
||||
<div class="input-group-prepend">
|
||||
<span class="input-group-text"><i class="fa-fw {{ $icon }}"></i></span>
|
||||
</div>
|
||||
@endempty()
|
||||
<input type="date" class="form-control @error($id) is-invalid @enderror" id="{{ $id }}" name="{{ $name ?? $id}}" value="{{ old($old,$value) }}">
|
||||
<span class="invalid-feedback" role="alert">
|
||||
@error($id)
|
||||
{{ $message }}
|
||||
@enderror
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
39
resources/themes/adminlte/views/widget/form_file.blade.php
Normal file
39
resources/themes/adminlte/views/widget/form_file.blade.php
Normal file
@@ -0,0 +1,39 @@
|
||||
<div class="form-group">
|
||||
<label for="{{ $id }}">{{ $label }}</label>
|
||||
<div class="input-group has-validation">
|
||||
@empty($icon)
|
||||
@else
|
||||
<div class="input-group-prepend">
|
||||
<span class="input-group-text"><i class="fa-fw {{ $icon }}"></i></span>
|
||||
</div>
|
||||
@endempty()
|
||||
<div class="custom-file">
|
||||
<input type="file" class="custom-file-input @error($id) is-invalid @enderror" id="{{ $id }}" name="{{ $name ?? $id}}">
|
||||
<label class="custom-file-label input-group-text" for="{{ $id }}">Choose file</label>
|
||||
</div>
|
||||
|
||||
{{--
|
||||
<div class="input-group-append">
|
||||
<button type="submit" class="input-group-text btn btn-success" id="">Upload</button>
|
||||
</div>
|
||||
--}}
|
||||
<span class="invalid-feedback @error($id) d-block @enderror" role="alert">
|
||||
@error($id)
|
||||
{{ $message }}
|
||||
@enderror
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@section('page-scripts')
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
$('#{{ $id }}').on('change',function(){
|
||||
//get the file name
|
||||
var fileName = $(this).val();
|
||||
//replace the "Choose a file" label
|
||||
$(this).next('.custom-file-label').html(fileName);
|
||||
})
|
||||
});
|
||||
</script>
|
||||
@append
|
57
resources/themes/adminlte/views/widget/form_select.blade.php
Normal file
57
resources/themes/adminlte/views/widget/form_select.blade.php
Normal file
@@ -0,0 +1,57 @@
|
||||
<div class="form-group">
|
||||
<label for="{{ $id }}">{{ $label }}</label>
|
||||
<div class="input-group has-validation">
|
||||
@empty($icon)
|
||||
@else
|
||||
<div class="input-group-prepend">
|
||||
<span class="input-group-text"><i class="fa-fw {{ $icon }}"></i></span>
|
||||
</div>
|
||||
@endempty()
|
||||
|
||||
<select class="form-control @error($id) is-invalid @enderror" id="{{ $id }}" name="{{ $name ?? $id}}">
|
||||
@if(! isset($addvalues) || ! $addvalues)
|
||||
<option id="new"></option>
|
||||
@endif
|
||||
@empty($groupby)
|
||||
@foreach($options as $option)
|
||||
@empty(Arr::get($option,'value')) @continue @endempty
|
||||
<option value="{{ Arr::get($option,'id') }}" @if(Arr::get($option,'id') == old($old,$value))selected @endif>{{ Arr::get($option,'value') }}</option>
|
||||
@endforeach
|
||||
@else
|
||||
@foreach($options->groupBy($groupby) as $group)
|
||||
<optgroup label="{{ $groupby == 'active' ? (Arr::get($group->first(),$groupby) ? 'Active' : 'Not Active') : Arr::get($group->first(),$groupby) }}">
|
||||
@foreach($group as $option)
|
||||
@empty(Arr::get($option,'value')) @continue @endempty
|
||||
<option value="{{ Arr::get($option,'id') }}" @if(Arr::get($option,'id') == old($old,$value))selected @endif>{{ Arr::get($option,'value') }}</option>
|
||||
@endforeach
|
||||
</optgroup>
|
||||
@endforeach
|
||||
@endempty
|
||||
</select>
|
||||
|
||||
<span class="invalid-feedback" role="alert">
|
||||
@error($id)
|
||||
{{ $message }}
|
||||
@enderror
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@section('page-scripts')
|
||||
@css(select2)
|
||||
@js(select2,autofocus)
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
$('#{{ $id }}').select2({
|
||||
dropdownAutoWidth: true,
|
||||
width: 'style',
|
||||
@isset($addvalues)
|
||||
tags: true,
|
||||
placeholder: '',
|
||||
allowClear: true,
|
||||
@endisset
|
||||
});
|
||||
});
|
||||
</script>
|
||||
@append
|
17
resources/themes/adminlte/views/widget/form_text.blade.php
Normal file
17
resources/themes/adminlte/views/widget/form_text.blade.php
Normal file
@@ -0,0 +1,17 @@
|
||||
<div class="form-group">
|
||||
<label for="{{ $id }}">{{ $label }}</label>
|
||||
<div class="input-group has-validation">
|
||||
@empty($icon)
|
||||
@else
|
||||
<div class="input-group-prepend">
|
||||
<span class="input-group-text"><i class="fa-fw {{ $icon }}"></i></span>
|
||||
</div>
|
||||
@endempty()
|
||||
<input type="text" class="form-control {{ $classes ?? ''}}@error($id) is-invalid @enderror" id="{{ $id }}" name="{{ $name ?: $id }}" value="{{ old($old ?? $name,$value) }}">
|
||||
<span class="invalid-feedback" role="alert">
|
||||
@error($id)
|
||||
{{ $message }}
|
||||
@enderror
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
11
resources/themes/adminlte/views/widget/form_toggle.blade.php
Normal file
11
resources/themes/adminlte/views/widget/form_toggle.blade.php
Normal file
@@ -0,0 +1,11 @@
|
||||
<div class="form-group">
|
||||
<div class="custom-control custom-switch custom-switch-off-danger custom-switch-on-success">
|
||||
<input type="checkbox" class="custom-control-input" id="{{ $id }}" name="{{ $name ?: $id }}" {{ old($old ?? $name,$value) ? 'checked' : '' }}>
|
||||
<label class="custom-control-label" for="{{ $id }}">{{ $label }}</label>
|
||||
</div>
|
||||
<span class="invalid-feedback @error($id) d-block @enderror" role="alert">
|
||||
@error($id)
|
||||
{{ $message }}
|
||||
@enderror
|
||||
</span>
|
||||
</div>
|
@@ -1,23 +1,3 @@
|
||||
<!-- 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
|
||||
@include('adminlte::widget.success')
|
||||
|
||||
<!-- 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
|
||||
@include('adminlte::widget.errors')
|
||||
|
10
resources/themes/adminlte/views/widget/success.blade.php
Normal file
10
resources/themes/adminlte/views/widget/success.blade.php
Normal file
@@ -0,0 +1,10 @@
|
||||
<!-- 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
|
@@ -0,0 +1 @@
|
||||
@if(session()->has('success'))<span class="ml-3 pt-0 pb-0 pr-1 pl-1 btn btn-outline-success float-right"><small>{{ session()->get('success') }}</small></span>@endif
|
@@ -38,9 +38,6 @@
|
||||
@section('scripts')
|
||||
@include('architect::layouts.partials.scripts')
|
||||
|
||||
{{-- Scripts --}}
|
||||
{!! Asset::scripts() !!}
|
||||
|
||||
@yield('page-scripts')
|
||||
@show
|
||||
</body>
|
||||
|
@@ -12,9 +12,6 @@
|
||||
@section('scripts')
|
||||
@include('architect::auth.partials.scripts')
|
||||
|
||||
{{-- Scripts --}}
|
||||
{!! Asset::scripts() !!}
|
||||
|
||||
@yield('page-scripts')
|
||||
@show
|
||||
</body>
|
||||
|
@@ -35,9 +35,6 @@
|
||||
<link rel="stylesheet" href="{{ asset('/css/print.css') }}">
|
||||
@endif
|
||||
|
||||
<!-- STYLESHEETS -->
|
||||
{!! Asset::styles() !!}
|
||||
|
||||
<!-- Theme style -->
|
||||
<link rel="stylesheet" href="{{ asset('/css/architect.min.css') }}">
|
||||
|
||||
|
@@ -38,9 +38,6 @@
|
||||
@section('scripts')
|
||||
@include('metronic::layouts.partials.scripts')
|
||||
|
||||
{{-- Scripts --}}
|
||||
{!! Asset::scripts() !!}
|
||||
|
||||
@yield('page-scripts')
|
||||
@show
|
||||
</body>
|
||||
|
@@ -14,10 +14,10 @@
|
||||
--}}
|
||||
|
||||
<!-- Theme style -->
|
||||
@themecss('/css/components.css','components-css')
|
||||
@themecss('/css/style.css','style-css')
|
||||
@themecss('/css/style-responsive.css','style-responsive-css')
|
||||
@themecss('/css/themes/blue.css','theme-blue-css')
|
||||
<link rel="stylesheet" href="{{ asset('theme/frontend/metronic/css/components.css') }}">
|
||||
<link rel="stylesheet" href="{{ asset('theme/frontend/metronic/css/style.css') }}">
|
||||
<link rel="stylesheet" href="{{ asset('theme/frontend/metronic/css/style-responsive.css') }}">
|
||||
<link rel="stylesheet" href="{{ asset('theme/frontend/metronic/css/themes/blue.css') }}">
|
||||
|
||||
<!-- Google Font: Source Sans Pro -->
|
||||
<link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700|PT+Sans+Narrow|Source+Sans+Pro:200,300,400,600,700,900&subset=all" rel="stylesheet" type="text/css">
|
||||
@@ -32,10 +32,7 @@
|
||||
<link rel="shortcut icon" href="{{ object_get($site,'favicon','favicon.ico') }}" />
|
||||
|
||||
<!-- Custom CSS -->
|
||||
@php(Asset::add('custom-css','/css/custom.css'))
|
||||
|
||||
<!-- STYLESHEETS -->
|
||||
{!! Asset::styles() !!}
|
||||
<link rel="stylesheet" href="{{ asset('theme/frontend/metronic/css/custom.css') }}">
|
||||
|
||||
@yield('page-styles')
|
||||
</head>
|
@@ -18,5 +18,5 @@
|
||||
|
||||
@if(file_exists('js/custom.js'))
|
||||
<!-- Any Custom JS -->
|
||||
<script src="{{ asset('js/custom.js') }}"></script>
|
||||
<script type="text/javascript" src="{{ asset('js/custom.js') }}"></script>
|
||||
@endif
|
@@ -13,7 +13,7 @@ class Carbon extends CarbonBase
|
||||
{
|
||||
const MONTHS_PER_HALF = 6;
|
||||
|
||||
public function __get($name)
|
||||
public function __get(string $name): mixed
|
||||
{
|
||||
switch ($name) {
|
||||
case 'half':
|
||||
@@ -57,7 +57,7 @@ class Carbon extends CarbonBase
|
||||
*
|
||||
* @return static
|
||||
*/
|
||||
public function startOfHalf($dayOfWeek = null)
|
||||
public function startOfHalf(int $dayOfWeek=NULL)
|
||||
{
|
||||
return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF - 5, 1)->firstOfMonth($dayOfWeek);
|
||||
}
|
||||
@@ -72,7 +72,7 @@ class Carbon extends CarbonBase
|
||||
*
|
||||
* @return static
|
||||
*/
|
||||
public function endOfHalf($dayOfWeek = null)
|
||||
public function endOfHalf(int $dayOfWeek=NULL)
|
||||
{
|
||||
return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF, 1)->lastOfMonth($dayOfWeek);
|
||||
}
|
||||
|
@@ -1,54 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Leenooks\Controllers;
|
||||
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Redirect;
|
||||
use Session;
|
||||
|
||||
use App\Models\User;
|
||||
|
||||
class AdminController extends Controller
|
||||
{
|
||||
public function __construct()
|
||||
{
|
||||
$this->middleware('auth');
|
||||
}
|
||||
|
||||
public function switch_authorised($id)
|
||||
{
|
||||
return (method_exists(Auth::user(),'isAdmin') && Auth::user()->isAdmin($id)) ? TRUE : FALSE;
|
||||
}
|
||||
|
||||
public function switch_session()
|
||||
{
|
||||
return ! Session::get('orig_user');
|
||||
}
|
||||
|
||||
public function user_switch_start($id)
|
||||
{
|
||||
if ($this->switch_session() AND $this->switch_authorised($id))
|
||||
{
|
||||
$uo = User::find($id);
|
||||
|
||||
if (! $uo)
|
||||
abort(404,'User not found');
|
||||
|
||||
Session::put('orig_user',Auth::id());
|
||||
Auth::login($uo);
|
||||
}
|
||||
|
||||
return Redirect::to('/home');
|
||||
}
|
||||
|
||||
public function user_switch_stop()
|
||||
{
|
||||
if ($id = Session::pull('orig_user')) {
|
||||
$uo = User::find($id);
|
||||
Auth::login($uo);
|
||||
}
|
||||
|
||||
return Redirect::to('/home');
|
||||
}
|
||||
}
|
62
src/Controllers/SwitchUserController.php
Normal file
62
src/Controllers/SwitchUserController.php
Normal file
@@ -0,0 +1,62 @@
|
||||
<?php
|
||||
|
||||
namespace Leenooks\Controllers;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Providers\RouteServiceProvider;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Redirect;
|
||||
use Session;
|
||||
|
||||
use App\Models\User;
|
||||
|
||||
class SwitchUserController extends Controller
|
||||
{
|
||||
public function __construct()
|
||||
{
|
||||
$this->middleware('auth');
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine if the user is authorised to switch to another user
|
||||
*
|
||||
* @param User $user
|
||||
* @return bool
|
||||
*/
|
||||
public function switch_authorised(User $user): bool
|
||||
{
|
||||
return (method_exists(Auth::user(),'isAdmin') && Auth::user()->isAdmin($user)) ? TRUE : FALSE;
|
||||
}
|
||||
|
||||
/**
|
||||
* Switch to a different user
|
||||
*
|
||||
* @param User $user
|
||||
* @return mixed
|
||||
*/
|
||||
public function switch_start(User $user)
|
||||
{
|
||||
if ($user->switched)
|
||||
abort(403,'User already switched');
|
||||
|
||||
if ($this->switch_authorised($user)) {
|
||||
Session::put('orig_user',Auth::user());
|
||||
Auth::login($user);
|
||||
}
|
||||
|
||||
return Redirect::to('/home');
|
||||
}
|
||||
|
||||
/**
|
||||
* Return back from the switch users
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function switch_stop()
|
||||
{
|
||||
if ($user = Session::pull('orig_user'))
|
||||
Auth::login($user);
|
||||
|
||||
return Redirect::to(RouteServiceProvider::HOME);
|
||||
}
|
||||
}
|
@@ -146,6 +146,14 @@ class CustomBladeServiceProvider extends ServiceProvider
|
||||
|
||||
break;
|
||||
|
||||
case 'debounce':
|
||||
switch ($content) {
|
||||
case 'js':
|
||||
$urls->put($type,'js/debounce.js');
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 'highcharts':
|
||||
switch ($content) {
|
||||
case 'js':
|
||||
@@ -172,13 +180,23 @@ class CustomBladeServiceProvider extends ServiceProvider
|
||||
$urls->put($key,'https://code.highcharts.com/modules/drilldown.js');
|
||||
break;
|
||||
|
||||
case 'export':
|
||||
$urls->put($key,'https://code.highcharts.com/modules/exporting.js');
|
||||
$urls->put($key.'data','https://code.highcharts.com/modules/export-data.js');
|
||||
break;
|
||||
|
||||
case 'funnel':
|
||||
$urls->put($key,'https://code.highcharts.com/modules/funnel.js');
|
||||
break;
|
||||
|
||||
case 'heatmap':
|
||||
$urls->put($key,'https://code.highcharts.com/modules/heatmap.js');
|
||||
break;
|
||||
|
||||
case 'export':
|
||||
$urls->put($key,'https://code.highcharts.com/modules/exporting.js');
|
||||
$urls->put($key.'data','https://code.highcharts.com/modules/export-data.js');
|
||||
case 'solidguage':
|
||||
$urls->put($key,'https://code.highcharts.com/highcharts-more.js');
|
||||
$urls->put($key.'accessiblity','https://code.highcharts.com/modules/accessibility.js');
|
||||
$urls->put($key.'solid-guage','https://code.highcharts.com/modules/solid-gauge.js');
|
||||
break;
|
||||
|
||||
case 'theme-dark':
|
||||
@@ -275,6 +293,16 @@ class CustomBladeServiceProvider extends ServiceProvider
|
||||
|
||||
break;
|
||||
|
||||
case 'validation':
|
||||
switch ($content) {
|
||||
case 'js':
|
||||
// Base
|
||||
$urls->put('validate','https://cdn.jsdelivr.net/npm/jquery-validation@1.19.3/dist/jquery.validate.min.js');
|
||||
$urls->put('validate.additional','https://cdn.jsdelivr.net/npm/jquery-validation@1.19.3/dist/additional-methods.min.js');
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
default:
|
||||
throw new \Exception(sprintf('Unknown Expression: [%s]',$expression));
|
||||
}
|
||||
|
@@ -32,8 +32,8 @@ trait SingleOrFail
|
||||
return NULL;
|
||||
});
|
||||
|
||||
// When a query should return 1 object, or NULL if it doesnt
|
||||
Builder::macro('singleOrNew',function ($args) {
|
||||
// When a query should return 1 object, or setup to create a new object
|
||||
Builder::macro('singleOrNew',function (array $args=[]) {
|
||||
$result = $this->where($args)->get();
|
||||
|
||||
if ($result->count() == 1)
|
||||
|
@@ -7,14 +7,27 @@ namespace Leenooks\Traits;
|
||||
|
||||
use Session;
|
||||
|
||||
use App\Models\User;
|
||||
|
||||
trait UserSwitch
|
||||
{
|
||||
/**
|
||||
* Return if this is a switched user
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function getSwitchedAttribute()
|
||||
{
|
||||
return Session::get('orig_user');
|
||||
}
|
||||
|
||||
public function isAdmin($id)
|
||||
/**
|
||||
* If the user record has an admin attribute, we'll return that
|
||||
*
|
||||
* @param User|null $user
|
||||
* @return false|mixed
|
||||
*/
|
||||
public function isAdmin(User $user=NULL)
|
||||
{
|
||||
return isset($this->admin) ? $this->admin : FALSE;
|
||||
}
|
||||
|
Reference in New Issue
Block a user