diff --git a/app/Http/Controllers/TicketsController.php b/app/Http/Controllers/TicketsController.php index cf86ea43..2477d729 100644 --- a/app/Http/Controllers/TicketsController.php +++ b/app/Http/Controllers/TicketsController.php @@ -145,7 +145,8 @@ class TicketsController extends Controller return __($tickets->priority); }) ->editColumn('updated_at', function (Ticket $tickets) { - return $tickets->updated_at ? $tickets->updated_at->diffForHumans() : ''; + return ['display' => $tickets->updated_at ? $tickets->updated_at->diffForHumans() : '', + 'raw' => $tickets->updated_at ? strtotime($tickets->updated_at) : '']; }) ->addColumn('actions', function (Ticket $tickets) { return ' diff --git a/config/app.php b/config/app.php index 208e87ba..093ddd41 100644 --- a/config/app.php +++ b/config/app.php @@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Facade; return [ - 'version' => '0.9', + 'version' => '0.9.1', /* |-------------------------------------------------------------------------- diff --git a/public/themes/BlueInfinity/app.css b/public/themes/BlueInfinity/app.css new file mode 100644 index 00000000..898ee94c --- /dev/null +++ b/public/themes/BlueInfinity/app.css @@ -0,0 +1 @@ +@import "default.css";.layout-fixed .wrapper .sidebar{ height:calc(100vh - 3.5rem - 1px);background:radial-gradient(#061b29,black);}body:not(.sidebar-mini-md) .content-wrapper,body:not(.sidebar-mini-md) .main-footer,body:not(.sidebar-mini-md) .main-header{ transition:margin-left .3s ease-in-out;margin-left:250px;background:radial-gradient(#061b29,black);}[class*=sidebar-dark] .brand-link,[class*=sidebar-dark] .brand-link .pushmenu{ color:hsla(0,0%,100%,.8);background:radial-gradient(#061b29,black);}.main-sidebar .brand-text,.main-sidebar .logo-xl,.main-sidebar .logo-xs,.sidebar .nav-link p,.sidebar .user-panel .info{ transition:margin-left .3s linear,opacity .3s ease,visibility .3s ease;color:#d3d3d3;}.sidebar-dark-primary .nav-sidebar>.nav-item>.nav-link.active,.sidebar-light-primary .nav-sidebar>.nav-item>.nav-link.active{ color:#fff;background:radial-gradient(#1b4b61,#fd030300);border-radius:50px;}.dark-mode .card{ background-color:#00000000;color:#ffffff99;border-width:3px;border-color:#f7f7f7;border-style:double;border-radius:15px;}.btn-info{ color:#ffffff;background-color:#b8171700;border-color:#ffffff;box-shadow:none;}.btn-warning{ color:#ffffff;background-color:#ffc10700;border-color:#ffffff;box-shadow:none;}.card-title{ float:left;font-size:1.1rem;font-weight:400;margin:0;color:white;}.dark-mode .text-muted{ color:#ffffff99!important;}.dark-mode .list-group-item{ background-color:#343a4000;border-color:#ffffff99;}.dark-mode .info-box{ background-color:#343a4000;color:#fff;border:3px;border-style:double;border-radius:15px;border-color:white;}label:not(.form-check-label):not(.custom-file-label){ font-weight:700;color:#ffffffc2;}.dark-mode .custom-control-label:before,.dark-mode .custom-file-label,.dark-mode .custom-file-label:after,.dark-mode .custom-select,.dark-mode .form-control,.dark-mode .input-group-text{ background-color:#007af400;color:#828282;}.alert-success{ color:#fff;background-color:#28a745;border-color:#ffffff;border-radius:15px;border-style:double;}.dark-mode{ color:#fff;background:radial-gradient(#061b29,black);}.dark-mode .invoice{ background-color:#343a4000;border:3px;border-radius:15px;border-color:white;border:double;}.dark-mode .nav-tabs .nav-item.show .nav-link,.dark-mode .nav-tabs .nav-link.active{ background-color:#ffffff1c;color:#fff;}.slim-crop-area img,.slim-image-editor img,.slim-popover img,.slim img{ background:black;}.dark-mode .callout{ background-color:#00ff0333;}.callout.callout-info{ border-left-color:#00e11d;}.p-3{ padding:1rem!important;background:#061b29;}.small-box>.small-box-footer{ color:hsla(0,0%,100%,.8);display:block;padding:3px 0;position:relative;text-align:center;text-decoration:none;z-index:10;background:#061b29;}.dark-mode .dropdown-menu{ background-color:#061b29;border-color:white;}.card-header:first-child{ border-radius:14px 14px 0px 0px;background:#061b29;}.card-body{ flex:1 1 auto;min-height:1px;padding:1.25rem;background:#061b29;}.justify-content-between{ justify-content:space-between!important;background:#061b29;}.dark-mode .card .card-footer{ background-color:#061b29;border-radius:0px 0px 14px 14px;}.dark-mode .select2-selection--single{ background-color:#061b29;border-color:#6c757d;}.select2-search--dropdown{ display:block;padding:4px;background:#061b29;}.select2-container--default .select2-results__option{ padding:6px 12px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background:blue;background:#061b29;}.dark-mode .select2-dropdown,.dark-mode .select2-dropdown .select2-search__field,.dark-mode .select2-search--inline .select2-search__field{ background-color:#061b29;border-color:#ffffff;color:#fff;}.modal-header{ background:#061b29;}.modal-body{ position:relative;flex:1 1 auto;padding:1rem;background:#061b29;}.dark-mode .modal-footer,.dark-mode .modal-header{ border-color:#ffffff;background:#061b29;} diff --git a/public/themes/blue/app.css.map b/public/themes/BlueInfinity/app.css.map similarity index 100% rename from public/themes/blue/app.css.map rename to public/themes/BlueInfinity/app.css.map diff --git a/public/themes/blue/default.css b/public/themes/BlueInfinity/default.css similarity index 100% rename from public/themes/blue/default.css rename to public/themes/BlueInfinity/default.css diff --git a/public/themes/blue/app.css b/public/themes/blue/app.css deleted file mode 100644 index 10839a8e..00000000 --- a/public/themes/blue/app.css +++ /dev/null @@ -1,24 +0,0 @@ -@import "default.css";.layout-fixed .wrapper .sidebar{ height:calc(100vh - 3.5rem - 1px);background:radial-gradient(#061b29,black);} -body:not(.sidebar-mini-md) .content-wrapper,body:not(.sidebar-mini-md) .main-footer,body:not(.sidebar-mini-md) .main-header{ transition:margin-left .3s ease-in-out;margin-left:250px;background:radial-gradient(#061b29,black);} -[class*=sidebar-dark] .brand-link,[class*=sidebar-dark] .brand-link .pushmenu{ color:hsla(0,0%,100%,.8);background:radial-gradient(#061b29,black);} -.main-sidebar .brand-text,.main-sidebar .logo-xl,.main-sidebar .logo-xs,.sidebar .nav-link p,.sidebar .user-panel .info{ transition:margin-left .3s linear,opacity .3s ease,visibility .3s ease;color:#d3d3d3;} -.sidebar-dark-primary .nav-sidebar>.nav-item>.nav-link.active,.sidebar-light-primary .nav-sidebar>.nav-item>.nav-link.active{ color:#fff;background:radial-gradient(#1b4b61,#fd030300);border-radius:50px;} -.dark-mode .card{ background-color:#00000000;color:#ffffff99;border-width:3px;border-color:#f7f7f7;border-style:double;border-radius:15px;} -.btn-info{ color:#ffffff;background-color:#b8171700;border-color:#ffffff;box-shadow:none;} -.btn-warning{ color:#ffffff;background-color:#ffc10700;border-color:#ffffff;box-shadow:none;} -.card-title{ float:left;font-size:1.1rem;font-weight:400;margin:0;color:white;} -.dark-mode .text-muted{ color:#ffffff99!important;} -.dark-mode .list-group-item{ background-color:#343a4000;border-color:#ffffff99;} -.dark-mode .info-box{ background-color:#343a4000;color:#fff;border:3px;border-style:double;border-radius:15px;border-color:white;} -label:not(.form-check-label):not(.custom-file-label){ font-weight:700;color:#ffffffc2;} -.dark-mode .custom-control-label:before,.dark-mode .custom-file-label,.dark-mode .custom-file-label:after,.dark-mode .custom-select,.dark-mode .form-control,.dark-mode .input-group-text{ background-color:#007af400;color:#828282;} -.alert-success{ color:#fff;background-color:#28a745;border-color:#ffffff;border-radius:15px;border-style:double;} -.dark-mode{ color:#fff;background:radial-gradient(#061b29,black);} -.dark-mode .invoice{ background-color:#343a4000;border:3px;border-radius:15px;border-color:white;border:double;} -.dark-mode .nav-tabs .nav-item.show .nav-link,.dark-mode .nav-tabs .nav-link.active{ background-color:#ffffff1c;color:#fff;} -.slim-crop-area img,.slim-image-editor img,.slim-popover img,.slim img{ background:black;} -.dark-mode .callout{ background-color:#00ff0333;} -.callout.callout-info{ border-left-color:#00e11d;} -.p-3{ padding:1rem!important;background:#04141e;} -.small-box>.small-box-footer{ color:hsla(0,0%,100%,.8);display:block;padding:3px 0;position:relative;text-align:center;text-decoration:none;z-index:10;background:#061b29;} -.dark-mode .dropdown-menu{ background-color:#061b29;border-color:white;} \ No newline at end of file diff --git a/themes/blue/views/layouts/app.blade.php b/themes/BlueInfinity/views/layouts/app.blade.php similarity index 60% rename from themes/blue/views/layouts/app.blade.php rename to themes/BlueInfinity/views/layouts/app.blade.php index e073422e..07050e68 100644 --- a/themes/blue/views/layouts/app.blade.php +++ b/themes/BlueInfinity/views/layouts/app.blade.php @@ -13,8 +13,8 @@ {{ config('app.name', 'Laravel') }} + href="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('favicon.ico') ? \Illuminate\Support\Facades\Storage::disk('public')->url('favicon.ico') : asset('favicon.ico') }}" + type="image/x-icon"> @@ -23,14 +23,14 @@ + onload="this.onload=null;this.rel='stylesheet'"> @if (config('SETTINGS::RECAPTCHA:ENABLED') == 'true') {!! htmlScriptTagJsApi() !!} @endif - + @yield('content') @@ -38,28 +38,28 @@ diff --git a/themes/BlueInfinity/views/layouts/main.blade.php b/themes/BlueInfinity/views/layouts/main.blade.php new file mode 100644 index 00000000..c4ba7cd8 --- /dev/null +++ b/themes/BlueInfinity/views/layouts/main.blade.php @@ -0,0 +1,544 @@ + + + + + + + + + + + exists('logo.png') ? asset('storage/logo.png') : asset('images/controlpanel_logo.png') }}' property="og:image"> + {{ config('app.name', 'Laravel') }} + + + + + {{-- --}} + + + {{-- summernote --}} + + + {{-- datetimepicker --}} + + + {{-- select2 --}} + + + + + + + + + + + +
+ + + + + + + + +
+ + @if (!Auth::user()->hasVerifiedEmail()) + @if (Auth::user()->created_at->diffInHours(now(), false) > 1) +
+
{{ __('Warning!') }}
+ {{ __('You have not yet verified your email address') }} {{ __('Click here to resend verification email') }} +
+ {{ __('Please contact support If you didnt receive your verification email.') }} +
+ @endif + @endif + + @yield('content') + + @include('models.redeem_voucher_modal') +
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/themes/blue/views/layouts/main.blade.php b/themes/blue/views/layouts/main.blade.php deleted file mode 100644 index 1307f748..00000000 --- a/themes/blue/views/layouts/main.blade.php +++ /dev/null @@ -1,544 +0,0 @@ - - - - - - - - - - - exists('logo.png') ? asset('storage/logo.png') : asset('images/controlpanel_logo.png') }}' property="og:image"> - {{ config('app.name', 'Laravel') }} - - - - - {{-- --}} - - - {{-- summernote --}} - - - {{-- datetimepicker --}} - - - {{-- select2 --}} - - - - - - - - - - - -
- - - - - - - - -
- - @if (!Auth::user()->hasVerifiedEmail()) - @if (Auth::user()->created_at->diffInHours(now(), false) > 1) -
-
{{ __('Warning!') }}
- {{ __('You have not yet verified your email address') }} {{ __('Click here to resend verification email') }} -
- {{ __('Please contact support If you didnt receive your verification email.') }} -
- @endif - @endif - - @yield('content') - - @include('models.redeem_voucher_modal') -
- - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/themes/default/views/ticket/create.blade.php b/themes/default/views/ticket/create.blade.php index 138ce836..7da409cf 100644 --- a/themes/default/views/ticket/create.blade.php +++ b/themes/default/views/ticket/create.blade.php @@ -46,14 +46,14 @@ @if ($servers->count() >= 1)
- + - + @if ($errors->has('category')) {{ $errors->first('ticketcategory') }} @@ -62,14 +62,14 @@
@endif
- - + @foreach ($ticketcategories as $ticketcategory) @endforeach - + @if ($errors->has('category')) {{ $errors->first('ticketcategory') }} @@ -79,10 +79,10 @@
@if ($errors->has('priority')) @@ -108,7 +108,7 @@
- + @if ($errors->has('message')) {{ $errors->first('message') }} @@ -124,12 +124,12 @@ @endsection diff --git a/themes/default/views/ticket/index.blade.php b/themes/default/views/ticket/index.blade.php index b4a0a9a6..b23048e8 100644 --- a/themes/default/views/ticket/index.blade.php +++ b/themes/default/views/ticket/index.blade.php @@ -86,12 +86,13 @@ serverSide: true, stateSave: true, ajax: "{{route('ticket.datatable')}}", + order: [[ 4, "desc" ]], columns: [ {data: 'category'}, {data: 'title'}, {data: 'priority'}, {data: 'status'}, - {data: 'updated_at', sortable: false}, + {data: 'updated_at', type: 'num', render: {_: 'display', sort: 'raw'}}, {data: 'actions', sortable: false}, ], fnDrawCallback: function( oSettings ) {