Compare commits

...

3 Commits

10 changed files with 10 additions and 31 deletions

View File

@@ -39,9 +39,6 @@
@section('scripts') @section('scripts')
@include('adminlte::layouts.partials.scripts') @include('adminlte::layouts.partials.scripts')
{{-- Scripts --}}
{!! Asset::scripts() !!}
@yield('page-scripts') @yield('page-scripts')
@show @show
</body> </body>

View File

@@ -41,9 +41,6 @@
<![endif]--> <![endif]-->
--}} --}}
<!-- STYLESHEETS -->
{!! Asset::styles() !!}
@yield('page-styles') @yield('page-styles')
@if(file_exists('css/fixes.css')) @if(file_exists('css/fixes.css'))

View File

@@ -12,7 +12,7 @@
<div class="user-panel mt-3 pb-3 mb-3 d-flex"> <div class="user-panel mt-3 pb-3 mb-3 d-flex">
<div class="image"> <div class="image">
@if(isset($user) AND $user->exists) @if(isset($user) AND $user->exists)
<img src="{{ Gravatar::get(($user->exists AND $user->email) ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User"> <i class="fa fa-fw fa-2x fa-user text-white"></i>
@else @else
<a name="login" href="{{ url()->current().'?login=1' }}" class="d-block"><i class="pl-1 fas fa-lock fa-2x"></i></a> <a name="login" href="{{ url()->current().'?login=1' }}" class="d-block"><i class="pl-1 fas fa-lock fa-2x"></i></a>
@endif @endif

View File

@@ -38,9 +38,6 @@
@section('scripts') @section('scripts')
@include('architect::layouts.partials.scripts') @include('architect::layouts.partials.scripts')
{{-- Scripts --}}
{!! Asset::scripts() !!}
@yield('page-scripts') @yield('page-scripts')
@show @show
</body> </body>

View File

@@ -12,9 +12,6 @@
@section('scripts') @section('scripts')
@include('architect::auth.partials.scripts') @include('architect::auth.partials.scripts')
{{-- Scripts --}}
{!! Asset::scripts() !!}
@yield('page-scripts') @yield('page-scripts')
@show @show
</body> </body>

View File

@@ -35,9 +35,6 @@
<link rel="stylesheet" href="{{ asset('/css/print.css') }}"> <link rel="stylesheet" href="{{ asset('/css/print.css') }}">
@endif @endif
<!-- STYLESHEETS -->
{!! Asset::styles() !!}
<!-- Theme style --> <!-- Theme style -->
<link rel="stylesheet" href="{{ asset('/css/architect.min.css') }}"> <link rel="stylesheet" href="{{ asset('/css/architect.min.css') }}">

View File

@@ -38,9 +38,6 @@
@section('scripts') @section('scripts')
@include('metronic::layouts.partials.scripts') @include('metronic::layouts.partials.scripts')
{{-- Scripts --}}
{!! Asset::scripts() !!}
@yield('page-scripts') @yield('page-scripts')
@show @show
</body> </body>

View File

@@ -14,10 +14,10 @@
--}} --}}
<!-- Theme style --> <!-- Theme style -->
@themecss('/css/components.css','components-css') <link rel="stylesheet" href="{{ asset('theme/frontend/metronic/css/components.css') }}">
@themecss('/css/style.css','style-css') <link rel="stylesheet" href="{{ asset('theme/frontend/metronic/css/style.css') }}">
@themecss('/css/style-responsive.css','style-responsive-css') <link rel="stylesheet" href="{{ asset('theme/frontend/metronic/css/style-responsive.css') }}">
@themecss('/css/themes/blue.css','theme-blue-css') <link rel="stylesheet" href="{{ asset('theme/frontend/metronic/css/themes/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">
@@ -32,10 +32,7 @@
<link rel="shortcut icon" href="{{ object_get($site,'favicon','favicon.ico') }}" /> <link rel="shortcut icon" href="{{ object_get($site,'favicon','favicon.ico') }}" />
<!-- Custom CSS --> <!-- Custom CSS -->
@php(Asset::add('custom-css','/css/custom.css')) <link rel="stylesheet" href="{{ asset('theme/frontend/metronic/css/custom.css') }}">
<!-- STYLESHEETS -->
{!! Asset::styles() !!}
@yield('page-styles') @yield('page-styles')
</head> </head>

View File

@@ -18,5 +18,5 @@
@if(file_exists('js/custom.js')) @if(file_exists('js/custom.js'))
<!-- Any Custom JS --> <!-- Any Custom JS -->
<script src="{{ asset('js/custom.js') }}"></script> <script type="text/javascript" src="{{ asset('js/custom.js') }}"></script>
@endif @endif

View File

@@ -13,7 +13,7 @@ class Carbon extends CarbonBase
{ {
const MONTHS_PER_HALF = 6; const MONTHS_PER_HALF = 6;
public function __get($name) public function __get(string $name): mixed
{ {
switch ($name) { switch ($name) {
case 'half': case 'half':
@@ -57,7 +57,7 @@ class Carbon extends CarbonBase
* *
* @return static * @return static
*/ */
public function startOfHalf($dayOfWeek = null) public function startOfHalf(int $dayOfWeek=NULL)
{ {
return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF - 5, 1)->firstOfMonth($dayOfWeek); return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF - 5, 1)->firstOfMonth($dayOfWeek);
} }
@@ -72,7 +72,7 @@ class Carbon extends CarbonBase
* *
* @return static * @return static
*/ */
public function endOfHalf($dayOfWeek = null) public function endOfHalf(int $dayOfWeek=NULL)
{ {
return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF, 1)->lastOfMonth($dayOfWeek); return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF, 1)->lastOfMonth($dayOfWeek);
} }