Compare commits
18 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
2a8dd4fa2c | ||
|
b3471f31a0 | ||
|
71712d445f | ||
|
ef210651aa | ||
|
cbfd13ffce | ||
|
d9896fbe93 | ||
|
d376c79fad | ||
|
ab86ddc386 | ||
|
e3e43b87f4 | ||
|
0507dc83d8 | ||
|
dd64cba897 | ||
|
8093eb8b72 | ||
|
af1ea1b5fd | ||
|
a4650f8710 | ||
|
4b25f97314 | ||
|
2eaf000ce0 | ||
|
1f114667aa | ||
|
f801001571 |
@@ -10,9 +10,8 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"igaster/laravel-theme": "^2.0.17",
|
"creativeorange/gravatar": "^1.0",
|
||||||
"creativeorange/gravatar": "^1.0",
|
"orchestra/asset": "^6.0"
|
||||||
"orchestra/asset": "^6.0"
|
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
},
|
},
|
||||||
@@ -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"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@@ -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>
|
||||||
|
@@ -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>
|
||||||
|
@@ -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">
|
||||||
|
@@ -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
|
||||||
|
@@ -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>
|
||||||
|
|
||||||
|
114
resources/themes/architect/views/auth/login.blade.php
Normal file
114
resources/themes/architect/views/auth/login.blade.php
Normal 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
|
@@ -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,22 +8,24 @@
|
|||||||
<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">
|
||||||
@include('architect::layouts.partials.contentheader')
|
<div class="main-content">
|
||||||
|
@if (trim($__env->yieldContent('page_title')))
|
||||||
|
@include('architect::layouts.partials.contentheader')
|
||||||
|
@endif
|
||||||
|
|
||||||
<!-- Main content -->
|
<!-- Main content -->
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<!-- Your Page Content Here -->
|
<!-- Your Page Content Here -->
|
||||||
@yield('main-content')
|
@yield('main-content')
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -42,4 +44,4 @@
|
|||||||
@yield('page-scripts')
|
@yield('page-scripts')
|
||||||
@show
|
@show
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
21
resources/themes/architect/views/layouts/auth.blade.php
Normal file
21
resources/themes/architect/views/layouts/auth.blade.php
Normal 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>
|
@@ -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>
|
||||||
--}}
|
--}}
|
||||||
@@ -26,4 +26,4 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@@ -1,44 +1,49 @@
|
|||||||
<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">
|
||||||
</div>
|
<i class="@yield('page_icon','')"></i>
|
||||||
|
</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>
|
||||||
<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">
|
|
||||||
<i class="fas fa-star"></i>
|
|
||||||
</button>
|
|
||||||
--}}
|
|
||||||
<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">
|
|
||||||
<span class="btn-icon-wrapper pr-2 opacity-7">
|
|
||||||
<i class="fas fa-business-time fa-w-20"></i>
|
|
||||||
</span>
|
|
||||||
Item Menu
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<div tabindex="-1" role="menu" aria-hidden="true" class="dropdown-menu dropdown-menu-right">
|
@isset($page_actions)
|
||||||
<ul class="nav flex-column">
|
<div class="page-title-actions">
|
||||||
{{--
|
{{--
|
||||||
<li class="nav-item">
|
<button type="button" data-toggle="tooltip" title="Example Tooltip" data-placement="bottom" class="btn-shadow mr-3 btn btn-dark">
|
||||||
<a href="javascript:void(0);" class="nav-link">
|
<i class="fa fa-star"></i>
|
||||||
<i class="nav-link-icon lnr-inbox"></i>
|
</button>
|
||||||
<span>Inbox</span>
|
--}}
|
||||||
<div class="ml-auto badge badge-pill badge-secondary">86</div>
|
<div class="d-inline-block dropdown">
|
||||||
</a>
|
<button type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn-shadow dropdown-toggle btn btn-info">
|
||||||
</li>
|
<span class="btn-icon-wrapper pr-2 opacity-7">
|
||||||
--}}
|
<i class="fa fa-business-time fa-w-20"></i>
|
||||||
</ul>
|
</span>
|
||||||
|
Item Menu
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<div tabindex="-1" role="menu" aria-hidden="true" class="dropdown-menu dropdown-menu-right">
|
||||||
|
<ul class="nav flex-column">
|
||||||
|
{{--
|
||||||
|
<li class="nav-item">
|
||||||
|
<a href="javascript:void(0);" class="nav-link">
|
||||||
|
<i class="nav-link-icon lnr-inbox"></i>
|
||||||
|
<span>Inbox</span>
|
||||||
|
<div class="ml-auto badge badge-pill badge-secondary">86</div>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
--}}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
@endif
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@@ -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>
|
||||||
--}}
|
--}}
|
||||||
@@ -70,7 +70,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="widget-content-left ml-3 header-user-info">
|
<div class="widget-content-left ml-3 header-user-info">
|
||||||
<div class="widget-heading">
|
<div class="widget-heading">
|
||||||
{{ $user->name ?? 'John Smith' }}
|
{{ $user->name ?? 'John Smith' }}
|
||||||
</div>
|
</div>
|
||||||
|
@@ -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>
|
||||||
|
@@ -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&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&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() !!}
|
||||||
|
@@ -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'))
|
||||||
|
@@ -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
|
||||||
@@ -35,7 +58,7 @@ class Carbon extends CarbonBase
|
|||||||
* @return static
|
* @return static
|
||||||
*/
|
*/
|
||||||
public function startOfHalf($dayOfWeek = null)
|
public function startOfHalf($dayOfWeek = null)
|
||||||
{
|
{
|
||||||
return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF - 5, 1)->firstOfMonth($dayOfWeek);
|
return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF - 5, 1)->firstOfMonth($dayOfWeek);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -50,7 +73,7 @@ class Carbon extends CarbonBase
|
|||||||
* @return static
|
* @return static
|
||||||
*/
|
*/
|
||||||
public function endOfHalf($dayOfWeek = null)
|
public function endOfHalf($dayOfWeek = null)
|
||||||
{
|
{
|
||||||
return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF, 1)->lastOfMonth($dayOfWeek);
|
return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF, 1)->lastOfMonth($dayOfWeek);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
319
src/Providers/CustomBladeServiceProvider.php
Normal file
319
src/Providers/CustomBladeServiceProvider.php
Normal 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('');
|
||||||
|
}
|
||||||
|
}
|
@@ -32,8 +32,8 @@ trait SingleOrFail
|
|||||||
return NULL;
|
return NULL;
|
||||||
});
|
});
|
||||||
|
|
||||||
// When a query should return 1 object, or NULL if it doesnt
|
// When a query should return 1 object, or setup to create a new object
|
||||||
Builder::macro('singleOrNew',function ($args) {
|
Builder::macro('singleOrNew',function (array $args=[]) {
|
||||||
$result = $this->where($args)->get();
|
$result = $this->where($args)->get();
|
||||||
|
|
||||||
if ($result->count() == 1)
|
if ($result->count() == 1)
|
||||||
|
Reference in New Issue
Block a user