Compare commits

...

30 Commits

Author SHA1 Message Date
46df11f087 Fix rogue ) being displayed, and other updates from osb 2024-07-03 13:02:59 +10:00
dc8983aa91 Package renamed to leenooks/laravel 2024-07-03 12:50:06 +10:00
Deon George
9db703d88f Added validation, debounce and highcharts funnel/solidguage 2022-10-20 10:30:21 +11:00
Deon George
05d3caddf4 Added toggle form helper 2022-08-20 23:27:00 +10:00
Deon George
e3ebef90d9 Added file form helper 2022-08-19 15:11:09 +10:00
Deon George
d494400e7e Updated form helpers, to ensure right hand corners were rounded. Added success_button helper 2022-08-06 00:19:20 +10:00
Deon George
61f38aefe7 For search, if we get a 401, redirect to the login page 2022-08-03 16:32:38 +10:00
Deon George
8e9ca4c531 Added form input select, and fixes to date 2022-08-02 22:34:20 +10:00
Deon George
2e512cc3ed Added some form and status widgets 2022-08-01 20:29:57 +10:00
Deon George
9ef7e8e626 Update style sheets 2022-08-01 14:58:37 +10:00
Deon George
c9cd560b36 Rename AdminController to SwitchUserController with some optimisations 2022-06-28 21:52:05 +10:00
Deon George
b3471f31a0 Fix singleOrFail() args are optional 2022-02-02 12:05:03 +11:00
Deon George
71712d445f Fix when blade call has no arguments 2021-12-20 14:35:58 +11:00
Deon George
ef210651aa Switch Asset::add() to @themecss for metronic theme 2021-12-20 12:51:19 +11:00
Deon George
cbfd13ffce Minor changes to architect theme 2021-12-05 16:24:56 +11:00
Deon George
d9896fbe93 Asset::add cannot be used with {{}} 2021-12-01 17:07:08 +11:00
Deon George
d376c79fad Add more libraries 2021-11-24 16:23:01 +11:00
Deon George
ab86ddc386 Fix #e3e43b87 should use Asset::add instead of @asset 2021-11-24 16:22:43 +11:00
Deon George
e3e43b87f4 Change metronic to use @asset instead of @css 2021-11-23 17:30:20 +11:00
Deon George
0507dc83d8 Optimise calling dependant javascript in views 2021-11-23 14:25:51 +11:00
Deon George
dd64cba897 Tweak Brand Logo 2021-11-03 13:03:50 +11:00
Deon George
8093eb8b72 Remove id from <a>, not required 2021-10-18 12:55:17 +11:00
Deon George
af1ea1b5fd Add addHalf()/subHalf() functions 2021-10-12 14:40:34 +11:00
Deon George
a4650f8710 Add Carbon::quarter_string 2021-08-23 15:22:51 +10:00
Deon George
4b25f97314 Remove classes for logo image 2021-08-04 17:30:24 +10:00
Deon George
2eaf000ce0 Fix password reset 2021-07-09 11:57:24 +10:00
Deon George
1f114667aa Changed ->, changed address() to ->address 2021-07-02 09:09:31 +10:00
Deon George
f801001571 Fix social icons in metronic 2021-07-02 08:22:28 +10:00
Deon George
45be8553a2 Added SingleOrFail Eloquent helper 2021-07-01 11:58:50 +10:00
Deon George
9798f6aa7d Change scopeActive to include table 2021-06-29 16:38:19 +10:00
34 changed files with 916 additions and 206 deletions

View File

@@ -1,16 +1,15 @@
{ {
"name": "leenooks/laravel", "name": "laravel/leenooks",
"description": "Leenooks standard templates and tools.", "description": "Leenooks standard templates and tools.",
"keywords": ["laravel", "leenooks"], "keywords": ["laravel","leenooks"],
"license": "MIT", "license": "MIT",
"authors": [ "authors": [
{ {
"name": "Deon George", "name": "Deon George",
"email": "deon@leenooks.net" "email": "deon@dege.au"
} }
], ],
"require": { "require": {
"igaster/laravel-theme": "^2.0.17",
"creativeorange/gravatar": "^1.0", "creativeorange/gravatar": "^1.0",
"orchestra/asset": "^6.0" "orchestra/asset": "^6.0"
}, },
@@ -27,7 +26,10 @@
"extra": { "extra": {
"laravel": { "laravel": {
"providers": [ "providers": [
"Leenooks\\Providers\\LeenooksServiceProvider" "Orchestra\\Asset\\AssetServiceProvider",
"Collective\\Html\\HtmlServiceProvider",
"Leenooks\\Providers\\LeenooksServiceProvider",
"Leenooks\\Providers\\CustomBladeServiceProvider"
] ]
} }
}, },

View File

@@ -45,14 +45,14 @@
<p class="login-box-msg">{{ trans('adminlte_lang::message.siginsession') }}</p> <p class="login-box-msg">{{ trans('adminlte_lang::message.siginsession') }}</p>
<form method="post"> <form method="post">
{{ csrf_field() }} @csrf
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="input-group mb-3"> <div class="input-group mb-3">
<input type="email" name="email" class="form-control" placeholder="Email"> <input type="email" name="email" class="form-control" placeholder="Email">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text"><i class="fas fa-envelope fa-fw"></i></span> <span class="input-group-text"><i class="fas fa-fw fa-envelope"></i></span>
</div> </div>
</div> </div>
</div> </div>
@@ -61,7 +61,7 @@
<div class="input-group mb-3"> <div class="input-group mb-3">
<input type="password" name="password" class="form-control" placeholder="Password"> <input type="password" name="password" class="form-control" placeholder="Password">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text"><i class="fas fa-key fa-fw"></i></span> <span class="input-group-text"><i class="fas fa-fw fa-key"></i></span>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -35,13 +35,15 @@
<p class="login-box-msg">You forgot your password? Here you can easily retrieve a new password.</p> <p class="login-box-msg">You forgot your password? Here you can easily retrieve a new password.</p>
<form method="post" action="{{ url('password/email') }}"> <form method="post" action="{{ url('password/email') }}">
{{ csrf_field() }} @csrf
<div class="input-group mb-3"> <div class="input-group mb-3">
<input type="email" name="email" class="form-control" placeholder="Email" required> <input type="email" name="email" class="form-control" placeholder="Email" required>
<div class="input-group-append"> <div class="input-group-append">
<span class="fas fa-envelope input-group-text"></span> <span class="input-group-text"><i class="fas fa-fw fa-envelope"></i></span>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<button type="submit" class="btn btn-primary btn-block">{{ trans('adminlte_lang::message.sendpassword') }}</button> <button type="submit" class="btn btn-primary btn-block">{{ trans('adminlte_lang::message.sendpassword') }}</button>

View File

@@ -27,32 +27,36 @@
<p class="login-box-msg">You are only one step a way from your new password, set your new password now.</p> <p class="login-box-msg">You are only one step a way from your new password, set your new password now.</p>
<form method="post" action="{{ url('password/reset') }}"> <form method="post" action="{{ url('password/reset') }}">
{{ csrf_field() }} <input type="hidden" name="token" value="{{ $token }}">
@csrf
<div class="input-group mb-3"> <div class="input-group mb-3">
<input type="email" name="email" class="form-control" placeholder="Email" required> <input type="email" name="email" class="form-control" placeholder="Email" required>
<div class="input-group-append"> <div class="input-group-append">
<span class="fas fa-envelope fa-fw input-group-text"></span> <span class="input-group-text"><i class="fas fa-fw fa-envelope"></i></span>
</div> </div>
</div> </div>
<div class="input-group mb-3"> <div class="input-group mb-3">
<input type="password" name="password" class="form-control" placeholder="Password" required> <input type="password" name="password" class="form-control" placeholder="Password" required>
<div class="input-group-append"> <div class="input-group-append">
<span class="fas fa-lock input-group-text"></span> <span class="input-group-text"><i class="fas fa-fw fa-lock"></i></span>
</div> </div>
</div> </div>
<div class="input-group mb-3"> <div class="input-group mb-3">
<input type="password" name="password_confirmation" class="form-control" placeholder="Confirm Password" data-match="#password" required> <input type="password" name="password_confirmation" class="form-control" placeholder="Confirm Password" data-match="#password" required>
<div class="input-group-append"> <div class="input-group-append">
<span class="fas fa-lock input-group-text"></span> <span class="input-group-text"><i class="fas fa-fw fa-clone"></i></span>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<button type="submit" class="btn btn-primary btn-block">{{ trans('adminlte_lang::message.passwordreset') }}</button> <button type="submit" class="btn btn-primary btn-block">{{ trans('adminlte_lang::message.passwordreset') }}</button>
</div> </div>
<!-- /.col --> <!-- /.col -->
</div> </div>
<input type="hidden" name="token" value="{{ $token }}">
</form> </form>
<p class="mt-3 mb-1"> <p class="mt-3 mb-1">

View File

@@ -6,16 +6,19 @@
<!-- CSRF Token --> <!-- CSRF Token -->
<meta name="csrf-token" content="{{ 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 --> <!-- 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 --> <!-- 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 --> <!-- 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"> <link href="https://fonts.googleapis.com/css2?family={{ str_replace(' ','+',config('app.font') ?: 'IBM Plex Sans') }}:wght@300&display=swap" rel="stylesheet">

View File

@@ -46,7 +46,7 @@
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
@if ($user->switched) @if ($user->switched)
<a href="{{ url('/admin/switch/stop') }}" class="dropdown-item" id="switch"> <a href="{{ url('/admin/switch/stop') }}" class="dropdown-item">
<i class="fas fa-sign-out-alt mr-2"></i> {{ trans('adminlte_lang::message.switchoff') }} <i class="fas fa-sign-out-alt mr-2"></i> {{ trans('adminlte_lang::message.switchoff') }}
</a> </a>
@else @else
@@ -83,7 +83,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$("input[name=q]").typeahead({ $('input[name=q]').typeahead({
autoSelect: false, autoSelect: false,
scrollHeight: 10, scrollHeight: 10,
theme: 'bootstrap4', theme: 'bootstrap4',
@@ -149,6 +149,11 @@
$('span[name=searching]').addClass("d-none"); $('span[name=searching]').addClass("d-none");
} }
} }
},
statusCode: {
401: function() {
window.parent.location.href = '{{ route('login') }}';
}
} }
}) })
}, 500); }, 500);

View File

@@ -2,9 +2,9 @@
<!-- Bootstrap & Jquery App --> <!-- 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/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="//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 --> <!-- 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 --> <!-- Additional Utilities -->
<script src="{{ asset('plugin/bootstrap3-typeahead/js/bootstrap3-typeahead.min.js') }}"></script> <script src="{{ asset('plugin/bootstrap3-typeahead/js/bootstrap3-typeahead.min.js') }}"></script>
@@ -44,7 +44,7 @@
$.AdminLTESidebarTweak.Open = state; $.AdminLTESidebarTweak.Open = state;
if (addclass !== 'undefined') if (addclass !== 'undefined')
$("body") $('body')
.addClass(state ? 'sidebar-open' : 'sidebar-collapse'); .addClass(state ? 'sidebar-open' : 'sidebar-collapse');
$(this).delay($.AdminLTESidebarTweak.ResizeDelay).queue(function() { $(this).delay($.AdminLTESidebarTweak.ResizeDelay).queue(function() {
@@ -56,7 +56,7 @@
$(function () { $(function () {
"use strict"; "use strict";
$("body").on("collapsed.lte.pushmenu", function(){ $('body').on('collapsed.lte.pushmenu', function(){
if($.AdminLTESidebarTweak.options.EnableRemember) { if($.AdminLTESidebarTweak.options.EnableRemember) {
document.cookie = "toggleState=closed;path=/"; 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){ if($.AdminLTESidebarTweak.options.EnableRemember){
document.cookie = "toggleState=opened;path=/"; document.cookie = "toggleState=opened;path=/";

View File

@@ -2,7 +2,7 @@
<aside class="main-sidebar sidebar-dark-primary elevation-4 d-print-none"> <aside class="main-sidebar sidebar-dark-primary elevation-4 d-print-none">
<!-- Brand Logo --> <!-- Brand Logo -->
<a href="{{ url('home') }}" class="brand-link"> <a href="{{ url('home') }}" class="brand-link">
<img src="{{ asset('img/logo.png') }}" alt="Logo" class="brand-image img-circle elevation-3" style="opacity: .8"> <img src="{{ asset('img/logo.png') }}" alt="Logo" style="margin-left: 0; padding: 5px;" class="brand-image">
<span class="brand-text font-weight-light">{!! config('app.name_html_long','<b>App</b>Name') !!}</span> <span class="brand-text font-weight-light">{!! config('app.name_html_long','<b>App</b>Name') !!}</span>
</a> </a>

View 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">&times;</button>
<h5><i class="icon fas fa-ban"></i> Whoops!</h5>
<ul>
@foreach ($errors->all() as $error)
<li>{!! $error !!}</li>
@endforeach
</ul>
</div>
@endif

View 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>

View 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

View 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

View 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>

View 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>

View File

@@ -1,23 +1,3 @@
<!-- Success --> @include('adminlte::widget.success')
@if(session()->has('success'))
<div class="alert alert-success alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<h5><i class="icon fas fa-check"></i> Success!</h5>
<ul>
<li>{{ session()->get('success') }}</li>
</ul>
</div>
@endif
<!-- Errors --> @include('adminlte::widget.errors')
@if ($errors->any())
<div class="alert alert-danger alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<h5><i class="icon fas fa-ban"></i> Whoops!</h5>
<ul>
@foreach ($errors->all() as $error)
<li>{!! $error !!}</li>
@endforeach
</ul>
</div>
@endif

View 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">&times;</button>
<h5><i class="icon fas fa-check"></i> Success!</h5>
<ul>
<li>{{ session()->get('success') }}</li>
</ul>
</div>
@endif

View File

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

View File

@@ -0,0 +1,114 @@
@extends('architect::layouts.auth')
@section('htmlheader_title')
Log in
@endsection
@section('content')
<!-- /.login-logo -->
<div class="app-container app-theme-white body-tabs-shadow">
<div class="app-container">
<div class="h-100 bg-animation">
<div class="d-flex h-100 justify-content-center align-items-center">
<div class="mx-auto app-login-box col-md-8">
@if(file_exists('login-note.html'))
<div class="mx-auto card text-white card-body bg-primary w-50">
<h5 class="text-white card-title"><i class="icon fa-2x fas fa-info pr-3"></i><span class="font-size-xlg">NOTE</span></h5>
<span class="w-100 pb-0">
{!! file_get_contents('login-note.html') !!}
</span>
</div>
@endif
<div class="modal-dialog w-100 mx-auto">
<div class="modal-content">
<form class="needs-validation" novalidate method="post">
{{ csrf_field() }}
<div class="modal-body">
<div class="h5 modal-title text-center">
<h4 class="mt-2">
<div class="app-logo mx-auto mb-3"><img class="w-75" src="{{ url('img/logo-h-lg.png') }}"></div>
<small>@lang('Sign in to <strong>:server</strong>',['server'=>'Foo'])</small>
</h4>
</div>
<div class="form-row">
<div class="col-md-12 mt-3">
<label class="mb-1">Email</label>
<input name="email" id="user" placeholder="" type="email" class="form-control" required="">
<div class="invalid-feedback">
@lang('Please enter your email')
</div>
</div>
<div class="col-md-12 mt-2">
<label class="mb-1">@lang('Password')</label>
<input name="password" id="password" placeholder="" type="password" class="form-control" required>
<div class="invalid-feedback">
@lang('Please enter your password')
</div>
</div>
</div>
</div>
<div class="modal-footer">
@if (count($errors) > 0)
<div class="alert alert-danger w-100">
<strong>Whoops!</strong> Something went wrong?<br><br>
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
@endif
<div class="float-right">
<button class="btn btn-primary btn-lg">Login</button>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@endsection
@section('page-scripts')
<style>
label {
text-transform: uppercase;
letter-spacing: 0.05em;
font-size: 85%;
font-weight: bold;
}
table.table tr:last-child {
border-bottom: 1px solid #e9ecef;
}
</style>
<script>
// Example starter JavaScript for disabling form submissions if there are invalid fields
(function () {
'use strict';
window.addEventListener('load',function () {
// Fetch all the forms we want to apply custom Bootstrap validation styles to
var forms = document.getElementsByClassName('needs-validation');
// Loop over them and prevent submission
var validation = Array.prototype.filter.call(forms, function (form) {
form.addEventListener('submit', function (event) {
if (form.checkValidity() === false) {
event.preventDefault();
event.stopPropagation();
}
form.classList.add('was-validated');
}, false);
});
}, false);
})();
</script>
@append

View File

@@ -1,5 +1,5 @@
<!doctype html> <!DOCTYPE html>
<html lang="en"> <html>
@section('htmlheader') @section('htmlheader')
@include('architect::layouts.partials.htmlheader') @include('architect::layouts.partials.htmlheader')
@show @show
@@ -8,16 +8,17 @@
<div class="app-container app-theme-white body-tabs-shadow fixed-sidebar"> <div class="app-container app-theme-white body-tabs-shadow fixed-sidebar">
@include('architect::layouts.partials.topmenu') @include('architect::layouts.partials.topmenu')
{{-- @includeIf('architect::layouts.partials.controlsidebar')
@include('architect::layouts.partials.controlsidebar')
--}}
<div class="app-main"> <div class="app-main">
@include('architect::layouts.partials.sidebarmenu') @include('architect::layouts.partials.sidebarmenu')
<div class="app-main__outer"> <div class="app-main__outer">
<div class="app-main__inner"> <div class="app-main__inner">
<div class="main-content">
@if (trim($__env->yieldContent('page_title')))
@include('architect::layouts.partials.contentheader') @include('architect::layouts.partials.contentheader')
@endif
<!-- Main content --> <!-- Main content -->
<div class="row"> <div class="row">
@@ -27,6 +28,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
@include('architect::layouts.partials.contentfooter') @include('architect::layouts.partials.contentfooter')
</div> </div>

View File

@@ -0,0 +1,21 @@
<!DOCTYPE html>
<html>
@section('htmlheader')
@include('architect::layouts.partials.htmlheader')
@show
<body class="hold-transition login-page">
<div id="app">
@yield('content')
</div>
@section('scripts')
@include('architect::auth.partials.scripts')
{{-- Scripts --}}
{!! Asset::scripts() !!}
@yield('page-scripts')
@show
</body>
</html>

View File

@@ -5,7 +5,7 @@
<ul class="nav"> <ul class="nav">
{{-- {{--
<li class="nav-item"> <li class="nav-item">
<a href="javascript:void(0);" class="nav-link">Footer Link 1</a> <a href="javascript:void(0);" class="nav-link">Footer Link</a>
</li> </li>
--}} --}}
</ul> </ul>
@@ -18,7 +18,7 @@
<div class="badge badge-success mr-1 ml-0"> <div class="badge badge-success mr-1 ml-0">
<small>NEW</small> <small>NEW</small>
</div> </div>
Footer Link 4 Footer Link
</a> </a>
</li> </li>
--}} --}}

View File

@@ -1,26 +1,30 @@
<div class="app-page-title"> <div class="app-page-title">
<div class="page-title-wrapper"> <div class="page-title-wrapper">
<div class="page-title-heading"> <div class="page-title-heading">
<div class="page-title-icon"> @if (trim($__env->yieldContent('page_icon')))
<i class="@yield('page_icon','pe-7s-car')"></i> <div class="page-title-icon f32">
<i class="@yield('page_icon','')"></i>
</div> </div>
@endif
<div> <div>
@yield('page_title','Page Title') @yield('page_title','Page Title')
<div class="page-title-subheading"> <div class="page-title-subheading">
@yield('page_subtitle','Page Sub Title') @yield('page_subtitle','')
</div> </div>
</div> </div>
</div> </div>
@isset($page_actions)
<div class="page-title-actions"> <div class="page-title-actions">
{{-- {{--
<button type="button" data-toggle="tooltip" title="Example Tooltip" data-placement="bottom" class="btn-shadow mr-3 btn btn-dark"> <button type="button" data-toggle="tooltip" title="Example Tooltip" data-placement="bottom" class="btn-shadow mr-3 btn btn-dark">
<i class="fas fa-star"></i> <i class="fa fa-star"></i>
</button> </button>
--}} --}}
<div class="d-inline-block dropdown"> <div class="d-inline-block dropdown">
<button type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn-shadow dropdown-toggle btn btn-info"> <button type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn-shadow dropdown-toggle btn btn-info">
<span class="btn-icon-wrapper pr-2 opacity-7"> <span class="btn-icon-wrapper pr-2 opacity-7">
<i class="fas fa-business-time fa-w-20"></i> <i class="fa fa-business-time fa-w-20"></i>
</span> </span>
Item Menu Item Menu
</button> </button>
@@ -40,5 +44,6 @@
</div> </div>
</div> </div>
</div> </div>
@endif
</div> </div>
</div> </div>

View File

@@ -43,7 +43,7 @@
{{-- {{--
<li class="nav-item"> <li class="nav-item">
<a href="javascript:void(0);" class="nav-link"> <a href="javascript:void(0);" class="nav-link">
<i class="nav-link-icon fas fa-database"></i> Statistics <i class="nav-link-icon fas fa-database"></i> Link
</a> </a>
</li> </li>
--}} --}}

View File

@@ -6,9 +6,9 @@
<div class="row"> <div class="row">
<!-- BEGIN BOTTOM ABOUT BLOCK --> <!-- BEGIN BOTTOM ABOUT BLOCK -->
<div class="col-md-4 col-sm-6 pre-footer-col"> <div class="col-md-4 col-sm-6 pre-footer-col">
@isset($so->site_aboutus)) @isset($site->site_aboutus))
<h2>About us</h2> <h2>About us</h2>
<p>{!! $so->site_aboutus !!}</p> <p>{!! $site->site_aboutus !!}</p>
<!-- <!--
<div class="photo-stream"> <div class="photo-stream">
<h2>Photos Stream</h2> <h2>Photos Stream</h2>
@@ -26,11 +26,11 @@
<h2 style="text-align: right;">Our Contact Details</h2> <h2 style="text-align: right;">Our Contact Details</h2>
<address class="margin-bottom-40" style="float: right;"> <address class="margin-bottom-40" style="float: right;">
<table> <table>
<tr><th style="vertical-align:top; padding-right: 5px;">Address</th><td>{!! $so->address('html') !!}</td></tr> <tr><th style="vertical-align:top; padding-right: 5px;">Address</th><td>{!! join('<br>',$site->address) !!}</td></tr>
@isset($so->site_fax) @isset($site->site_fax)
<tr><th>Fax</th><td>{{ $so->site_fax }}</tr> <tr><th>Fax</th><td>{{ $site->site_fax }}</tr>
@endif @endif
<tr><th>Email</th><td> <a href="mailto:{{ $so->site_email }}">{{ $so->site_email }}</a></tr> <tr><th>Email</th><td> <a href="mailto:{{ $site->site_email }}">{{ $site->site_email }}</a></tr>
</table> </table>
</address> </address>
<!-- <!--
@@ -81,8 +81,8 @@
<!-- BEGIN SOCIAL --> <!-- BEGIN SOCIAL -->
<div class="col-md-4 col-sm-4"> <div class="col-md-4 col-sm-4">
<ul class="social-footer list-unstyled list-inline pull-right"> <ul class="social-footer list-unstyled list-inline pull-right">
@foreach ($so->social as $social) @foreach ($site->social as $social)
<li><a href="{{ $social['url'] }}"><i class="fa fa-{{ $social['name'] }}"></i></a></li> <li><a href="{{ $social['url'] }}"><i class="fab fa-{{ $social['name'] }}"></i></a></li>
@endforeach @endforeach
</ul> </ul>
</div> </div>

View File

@@ -14,25 +14,25 @@
--}} --}}
<!-- Theme style --> <!-- Theme style -->
@css('css/components.css') @themecss('/css/components.css','components-css')
@css('css/style.css') @themecss('/css/style.css','style-css')
@css('css/style-responsive.css') @themecss('/css/style-responsive.css','style-responsive-css')
@css('css/themes/blue.css') @themecss('/css/themes/blue.css','theme-blue-css')
<!-- Google Font: Source Sans Pro --> <!-- 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&amp;subset=all" rel="stylesheet" type="text/css"> <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&amp;subset=all" rel="stylesheet" type="text/css">
<meta property="og:site_name" content="{{ config('app.name') }}" /> <meta property="og:site_name" content="{{ config('app.name') }}" />
<meta property="og:title" content="{{ $so->site_name }}" /> <meta property="og:title" content="{{ $site->site_name }}" />
<meta property="og:description" content="{{ $so->site_description }}" /> <meta property="og:description" content="{{ $site->site_description }}" />
<meta property="og:type" content="website" /> <meta property="og:type" content="website" />
<meta property="og:image" content="{{ $so->site_logo }}" /> <meta property="og:image" content="{{ $site->site_logo }}" />
<meta property="og:url" content="{{ url('/') }}" /> <meta property="og:url" content="{{ url('/') }}" />
<link rel="shortcut icon" href="{{ object_get($so,'favicon','favicon.ico') }}" /> <link rel="shortcut icon" href="{{ object_get($site,'favicon','favicon.ico') }}" />
<!-- Custom CSS --> <!-- Custom CSS -->
@css('css/custom.css') @php(Asset::add('custom-css','/css/custom.css'))
<!-- STYLESHEETS --> <!-- STYLESHEETS -->
{!! Asset::styles() !!} {!! Asset::styles() !!}

View File

@@ -5,8 +5,8 @@
<!-- BEGIN TOP BAR LEFT PART --> <!-- BEGIN TOP BAR LEFT PART -->
<div class="col-md-6 col-sm-6 additional-shop-info"> <div class="col-md-6 col-sm-6 additional-shop-info">
<ul class="list-unstyled list-inline"> <ul class="list-unstyled list-inline">
<li><i class="fas fa-phone mr-4"></i><span>{!! $so->site_phone !!}</span></li> <li><i class="fas fa-phone mr-4"></i><span>{!! $site->site_phone !!}</span></li>
<li><i class="fas fa-envelope mr-4"></i><span>{!! $so->site_email !!}</span></li> <li><i class="fas fa-envelope mr-4"></i><span>{!! $site->site_email !!}</span></li>
</ul> </ul>
</div> </div>
<!-- END TOP BAR LEFT PART --> <!-- END TOP BAR LEFT PART -->
@@ -29,14 +29,14 @@
<!-- BEGIN HEADER --> <!-- BEGIN HEADER -->
<div class="header"> <div class="header">
<div class="container"> <div class="container">
<a class="site-logo" href="{{ url('/') }}"><img src="{{ $so->site_logo }}" alt="{{ $so->site_description }}" height="32"></a> <a class="site-logo" href="{{ url('/') }}"><img src="{{ $site->site_logo }}" alt="{{ $site->site_description }}" height="32"></a>
<a href="javascript:void(0);" class="mobi-toggler"><i class="fa fa-bars"></i></a> <a href="javascript:void(0);" class="mobi-toggler"><i class="fa fa-bars"></i></a>
<!-- BEGIN NAVIGATION --> <!-- BEGIN NAVIGATION -->
<div class="header-navigation pull-right font-transform-inherit"> <div class="header-navigation pull-right font-transform-inherit">
<ul> <ul>
{{-- @todo Replace this with a function that can traverse children with multiple depths --}} {{-- @todo Replace this with a function that can traverse children with multiple depths --}}
@foreach ($so->top_menu as $item => $menu) @foreach ($site->top_menu as $item => $menu)
<li class="dropdown {{ Request::is($menu['url']) ? 'active' : '' }}"> <li class="dropdown {{ Request::is($menu['url']) ? 'active' : '' }}">
@if (! \Illuminate\Support\Arr::get($menu,'children')) @if (! \Illuminate\Support\Arr::get($menu,'children'))

View File

@@ -15,15 +15,38 @@ class Carbon extends CarbonBase
public function __get($name) public function __get($name)
{ {
switch (true) { switch ($name) {
case $name === 'half': case 'half':
return (int) ceil($this->month / static::MONTHS_PER_HALF); return (int) ceil($this->month / static::MONTHS_PER_HALF);
case 'quarter_string':
return sprintf('%dQ%d',$this->year,$this->quarter);
default: default:
return parent::__get($name); return parent::__get($name);
} }
} }
public function addHalf(): self
{
return $this->addHalves(1);
}
public function addHalves(int $unit): self
{
return $this->addQuarters(2*$unit);
}
public function subHalf(): self
{
return $this->subHalves(1);
}
public function subHalves(int $unit): self
{
return $this->subQuarters(2*$unit);
}
/** /**
* Modify to the first occurrence of a given day of the week * Modify to the first occurrence of a given day of the week
* in the current quarter. If no dayOfWeek is provided, modify to the * in the current quarter. If no dayOfWeek is provided, modify to the

View File

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

View 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);
}
}

View File

@@ -0,0 +1,319 @@
<?php
namespace Leenooks\Providers;
use Illuminate\Support\Facades\Blade;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\ServiceProvider;
use Orchestra\Support\Facades\Asset;
class CustomBladeServiceProvider extends ServiceProvider
{
/**
* Bootstrap services.
*
* @return void
*/
public function boot()
{
Blade::directive('css',function(string $expression,array $args=[]) {
return $this->resolve('css',$expression);
});
Blade::directive('js',function($expression,string $options=NULL) {
return $this->resolve('js',$expression);
});
}
private function resolve(string $content,string $expression): string
{
if (str_contains($expression,',')) {
[$type,$arguments] = explode(',',$expression,2);
$arguments = explode('|',$arguments);
} else {
$type = $expression;
$arguments = [];
}
$return = collect();
$urls = collect();
switch ($type) {
case 'datatables':
switch ($content) {
case 'css':
// Base
$urls->put($type,'https://cdn.datatables.net/1.10.23/css/jquery.dataTables.min.css');
foreach ($arguments as $option) {
$key = $type.':'.$option;
switch ($option) {
case 'bootstrap4':
$urls->put($key,'/plugin/dataTables/dataTables.bootstrap4.css');
break;
case 'buttons':
$urls->put($key,'https://cdn.datatables.net/buttons/1.6.5/css/buttons.dataTables.min.css');
break;
case 'fixedheader':
$urls->put($key,'https://cdn.datatables.net/fixedheader/3.1.7/css/fixedHeader.dataTables.min.css');
break;
case 'rowgroup':
$urls->put($key,'https://cdn.datatables.net/rowgroup/1.1.2/css/rowGroup.dataTables.min.css');
break;
case 'responsive':
$urls->put($key,'http://cdn.datatables.net/responsive/2.2.6/css/responsive.dataTables.min.css');
break;
case 'searchpanes':
$urls->put($key,'https://cdn.datatables.net/searchpanes/1.2.1/css/searchPanes.dataTables.min.css');
break;
case 'searchpanes-left':
$urls->put('searchpanes:searchpanes-left','/plugin/dataTables/leftSearchPanes.css');
break;
case 'select':
$urls->put($key,'https://cdn.datatables.net/select/1.3.1/css/select.dataTables.min.css');
break;
default:
throw new \Exception(sprintf('Unknown [%s] option: [%s:%s]',$type,$content,$option));
}
}
break;
case 'js':
// Base
$urls->put($type,'https://cdn.datatables.net/1.10.23/js/jquery.dataTables.min.js');
foreach ($arguments as $option) {
$key = $type.':'.$option;
switch ($option) {
case 'bootstrap4':
$urls->put($key,'/plugin/dataTables/dataTables.bootstrap4.js');
break;
case 'buttons':
$urls->put($key,'https://cdn.datatables.net/buttons/1.6.5/js/dataTables.buttons.min.js');
$urls->put($key.'html5','https://cdn.datatables.net/buttons/1.6.5/js/buttons.html5.min.js');
$urls->put($key.'jszip','https://cdnjs.cloudflare.com/ajax/libs/jszip/3.2.0/jszip.min.js');
break;
case 'fixedheader':
$urls->put($key,'https://cdn.datatables.net/fixedheader/3.1.7/js/dataTables.fixedHeader.min.js');
break;
case 'responsive':
$urls->put($key,'https://cdn.datatables.net/responsive/2.2.6/js/dataTables.responsive.min.js');
break;
case 'rowgroup':
$urls->put($key,'https://cdn.datatables.net/rowgroup/1.1.2/js/dataTables.rowGroup.min.js');
break;
case 'searchpanes':
$urls->put($key,'https://cdn.datatables.net/searchpanes/1.2.1/js/dataTables.searchPanes.min.js');
break;
case 'select':
$urls->put($key,'https://cdn.datatables.net/select/1.3.1/js/dataTables.select.min.js');
break;
default:
throw new \Exception(sprintf('Unknown [%s] option: [%s:%s]',$type,$content,$option));
}
}
}
break;
case 'datepick':
switch ($content) {
case 'css':
$urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/css/bootstrap-datepicker.min.css');
break;
case 'js':
$urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/js/bootstrap-datepicker.min.js');
}
break;
case 'debounce':
switch ($content) {
case 'js':
$urls->put($type,'js/debounce.js');
}
break;
case 'highcharts':
switch ($content) {
case 'js':
// Base
$urls->put($type,'https://code.highcharts.com/highcharts.js');
foreach ($arguments as $option) {
$key = $type.':'.$option;
switch ($option) {
case '3d':
$urls->put($key,'https://code.highcharts.com/highcharts-3d.js');
$urls->put($key.'mouseover','/plugin/highcharts/3dmouseover.js');
break;
case 'data':
$urls->put($key,'https://code.highcharts.com/modules/data.js');
break;
case 'defaults':
$urls->put($key,'/plugin/highcharts/defaults.js');
break;
case 'drilldown':
$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 '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':
$urls->put($key,'https://code.highcharts.com/themes/dark-unica.js');
break;
default:
throw new \Exception(sprintf('Unknown [%s] option: [%s:%s]',$type,$content,$option));
}
}
}
break;
case 'highcharts-stock':
switch ($content) {
case 'js':
// Base
$urls->put($type,'https://code.highcharts.com/stock/highstock.js');
foreach ($arguments as $option) {
$key = $type.':'.$option;
switch ($option) {
case 'data':
$urls->put($key,'https://code.highcharts.com/stock/modules/data.js');
break;
case 'export':
$urls->put($key,'https://code.highcharts.com/stock/modules/exporting.js');
break;
default:
throw new \Exception(sprintf('Unknown [%s] option: [%s:%s]',$type,$content,$option));
}
}
}
break;
case 'select2':
switch ($content) {
case 'css':
// Base
$urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css');
break;
case 'js':
// Base
$urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js');
foreach ($arguments as $option) {
$key = $type.':'.$option;
switch ($option) {
case 'autofocus':
$urls->put($key,'plugin/select2/fix-autofocus.js');
break;
default:
throw new \Exception(sprintf('Unknown [%s] option: [%s:%s]',$type,$content,$option));
}
}
}
break;
case 'simplemde':
switch ($content) {
case 'css':
// Base
$urls->put($type,'https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css');
break;
case 'js':
// Base
$urls->put($type,'https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.js');
}
break;
case 'summernote':
switch ($content) {
case 'css':
// Base
$urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.18/summernote-bs4.css');
break;
case 'js':
// Base
$urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.18/summernote-bs4.js');
}
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));
}
if ($urls->count())
return $urls->map(function($item,$key) {
$dependancy='';
if (str_contains($key,':'))
[$dependancy,$key] = explode(':',$key);
return "<?php Asset::add('$key','$item','$dependancy'); ?>";
})->join('');
}
}

View File

@@ -10,8 +10,8 @@ trait ScopeActive
/** /**
* Only query active records * Only query active records
*/ */
public function scopeActive() public function scopeActive($query)
{ {
return $this->where('active',TRUE); return $query->where($this->getTable().'.active',TRUE);
} }
} }

View File

@@ -0,0 +1,45 @@
<?php
/**
* Extend Eloquent so that it includes singleOrFail calls to test that a query returns only 1 record
*/
namespace Leenooks\Traits;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\ModelNotFoundException;
trait SingleOrFail
{
public static function bootSingleOrfail(): void
{
// When a query should return 1 object, or FAIL if it doesnt
Builder::macro('singleOrFail',function () {
$result = $this->get();
if (($x=$result->count()) == 1)
return $result->first();
throw new ModelNotFoundException(sprintf('Query brings back %d record(s) called for singleOrFail()',$x));
});
// When a query should return 1 object, or NULL if it doesnt
Builder::macro('single',function () {
$result = $this->get();
if ($result->count() == 1)
return $result->first();
return NULL;
});
// 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)
return $result->first();
return $this->newModelInstance($args);
});
}
}

View File

@@ -7,14 +7,27 @@ namespace Leenooks\Traits;
use Session; use Session;
use App\Models\User;
trait UserSwitch trait UserSwitch
{ {
/**
* Return if this is a switched user
*
* @return mixed
*/
public function getSwitchedAttribute() public function getSwitchedAttribute()
{ {
return Session::get('orig_user'); 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; return isset($this->admin) ? $this->admin : FALSE;
} }