Skip to content

P
Platform
Unverified Commit 0a7fc6c8 authored by Nicolas Widart's avatar Nicolas Widart Committed by GitHub
Browse files
Options

Merge pull request #658 from mikemand/feature/fixes-cs-and-updates 

Fixes, CS and updates
parents bc5ec9ad 4bc4f037
Show whitespace changes
Inline Side-by-side
Showing with 217 additions and 196 deletions
Modules/Core/Config/core.php
View file @ 0a7fc6c8
......@@ -178,5 +178,5 @@ return [
| Check if asgard was installed
|--------------------------------------------------------------------------
*/
'is_installed' => env('INSTALLED', false)
'is_installed' => env('INSTALLED', false),
];
Modules/Page/Config/config.php
View file @ 0a7fc6c8
......@@ -25,8 +25,8 @@ return [
| Add relations that will be dynamically added to the Page entity
*/
'relations' => [
// 'extension' => function ($self) {
// return $self->belongsTo(PageExtension::class, 'id', 'page_id')->first();
// 'extension' => function (): \Illuminate\Database\Eloquent\Relations\BelongsTo {
// return $this->belongsTo(PageExtension::class, 'id', 'page_id')->first();
// }
],
/*
......
Modules/User/Config/config.php
View file @ 0a7fc6c8
......@@ -85,8 +85,8 @@ return [
| Add relations that will be dynamically added to the User entity
*/
'relations' => [
// 'extension' => function ($self) {
// return $self->belongsTo(UserExtension::class, 'user_id', 'id')->first();
// 'extension' => function (): \Illuminate\Database\Eloquent\Relations\BelongsTo {
// return $this->belongsTo(UserExtension::class, 'user_id', 'id')->first();
// }
],
/*
......
Themes/Adminlte/views/layouts/master.blade.php
View file @ 0a7fc6c8
<!DOCTYPE html>
<html>
<head>
<base src="{{ URL::asset('/') }}" />
<html lang="{{ locale() }}">
<head>
<meta charset="UTF-8">
<title>
@section('title')
@setting('core::site-name') | Admin
@show
</title>
<meta id="token" name="token" value="{{ csrf_token() }}" />
<meta name="csrf-token" content="{{ csrf_token() }}">
<meta name="user-api-token" content="{{ $currentUser->getFirstApiKey() }}">
<meta name="current-locale" content="{{ locale() }}">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, viewport-fit=cover">
<base href="{{ url('/') }}">
<link rel="canonical" href="{{ request()->url() }}">
@foreach($cssFiles as $css)
<link media="all" type="text/css" rel="stylesheet" href="{{ URL::asset($css) }}">
<link media="all" type="text/css" rel="stylesheet" href="{{ asset($css) }}">
@endforeach
<link media="all" type="text/css" rel="stylesheet" href="{{ mix('css/app.css') }}">
{!! Theme::script('vendor/jquery/jquery.min.js') !!}
......@@ -39,9 +40,9 @@
<![endif]-->
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic">
@routes
</head>
<body class="{{ config('asgard.core.core.skin', 'skin-blue') }} sidebar-mini" style="padding-bottom: 0 !important;">
<div class="wrapper" id="app">
</head>
<body class="{{ config('asgard.core.core.skin', 'skin-blue') }} sidebar-mini" style="padding-bottom: 0 !important;">
<div class="wrapper" id="app">
<header class="main-header">
<a href="{{ route('dashboard.index') }}" class="logo">
<span class="logo-mini">
......@@ -70,12 +71,12 @@
</aside><!-- /.right-side -->
@include('partials.footer')
@include('partials.right-sidebar')
</div><!-- ./wrapper -->
</div><!-- ./wrapper -->
@foreach($jsFiles as $js)
<script src="{{ URL::asset($js) }}" type="text/javascript"></script>
@endforeach
<script>
@foreach($jsFiles as $js)
<script src="{{ asset($js) }}" type="text/javascript"></script>
@endforeach
<script>
window.AsgardCMS = {
translations: {!! $staticTranslations !!},
locales: {!! json_encode(LaravelLocalization::getSupportedLocales()) !!},
......@@ -86,13 +87,13 @@
hideDefaultLocaleInURL: '{{ config('laravellocalization.hideDefaultLocaleInURL') }}',
filesystem: '{{ config('asgard.media.config.filesystem') }}'
};
</script>
</script>
<script src="{{ mix('js/manifest.js') }}"></script>
<script src="{{ mix('js/vendor.js') }}"></script>
<script src="{{ mix('js/app.js') }}"></script>
<script src="{{ mix('js/manifest.js') }}"></script>
<script src="{{ mix('js/vendor.js') }}"></script>
<script src="{{ mix('js/app.js') }}"></script>
<?php if (is_module_enabled('Notification')): ?>
@if(is_module_enabled('Notification'))
<script src="https://js.pusher.com/4.1.0/pusher.min.js" integrity="sha384-e9MoFh6Cw/uluf+NZ6MJwfJ1Dm7UOvJf9oTBxxCYDyStJeeAF0q53ztnEbLLDSQP" crossorigin="anonymous"></script>
<script src="{{ Module::asset('notification:js/pusherNotifications.js') }}"></script>
<script>
......@@ -100,22 +101,22 @@
pusherKey: '{{ config('broadcasting.connections.pusher.key') }}',
pusherCluster: '{{ config('broadcasting.connections.pusher.options.cluster') }}',
pusherEncrypted: {{ config('broadcasting.connections.pusher.options.encrypted') }},
loggedInUserId: {{ $currentUser->id }},
loggedInUserId: {{ $currentUser->id }}
});
</script>
<?php endif; ?>
@endif
<?php if (config('asgard.core.core.ckeditor-config-file-path') !== ''): ?>
@if(config('asgard.core.core.ckeditor-config-file-path') !== '')
<script>
$('.ckeditor').each(function() {
$('.ckeditor').each(function () {
CKEDITOR.replace($(this).attr('name'), {
customConfig: '{{ config('asgard.core.core.ckeditor-config-file-path') }}'
});
});
</script>
<?php endif; ?>
@section('scripts')
@show
@stack('js-stack')
</body>
@endif
@section('scripts')
@show
@stack('js-stack')
</body>
</html>
app/Providers/AppServiceProvider.php
View file @ 0a7fc6c8
......@@ -2,9 +2,9 @@
namespace App\Providers;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Schema;
use Illuminate\Support\ServiceProvider;
use Illuminate\Support\Carbon;
class AppServiceProvider extends ServiceProvider
{
......@@ -18,7 +18,7 @@ class AppServiceProvider extends ServiceProvider
Schema::defaultStringLength(191);
Carbon::setLocale(config('app.locale'));
Carbon::serializeUsing(function ($carbon) {
Carbon::serializeUsing(function (Carbon $carbon) {
return $carbon->format('d/m/y H:i:s');
});
}
......
config/asgard/core/core.php
View file @ 0a7fc6c8
......@@ -178,5 +178,5 @@ return [
| Check if asgard was installed
|--------------------------------------------------------------------------
*/
'is_installed' => env('INSTALLED', false)
'is_installed' => env('INSTALLED', false),
];
config/asgard/dashboard/settings.php 0 → 100644
View file @ 0a7fc6c8
<?php
return [
'welcome-title' => [
'description' => 'dashboard::dashboard.welcome-title',
'view' => 'text',
'translatable' => true,
'default' => 'Welcome on your backend!',
],
'welcome-description' => [
'description' => 'dashboard::dashboard.welcome-description',
'view' => 'textarea',
'translatable' => true,
'default' => 'Did you know you can access the documentation by pressing F1?',
],
'welcome-enabled' => [
'description' => 'dashboard::dashboard.welcome-enabled',
'view' => 'checkbox',
'translatable' => false,
'default' => '1',
],
];
config/asgard/page/config.php
View file @ 0a7fc6c8
......@@ -25,8 +25,8 @@ return [
| Add relations that will be dynamically added to the Page entity
*/
'relations' => [
// 'extension' => function ($self) {
// return $self->belongsTo(PageExtension::class, 'id', 'page_id')->first();
// 'extension' => function (): \Illuminate\Database\Eloquent\Relations\BelongsTo {
// return $this->belongsTo(PageExtension::class, 'id', 'page_id')->first();
// }
],
/*
......
config/asgard/user/config.php
View file @ 0a7fc6c8
......@@ -85,8 +85,8 @@ return [
| Add relations that will be dynamically added to the User entity
*/
'relations' => [
// 'extension' => function ($self) {
// return $self->belongsTo(UserExtension::class, 'user_id', 'id')->first();
// 'extension' => function (): \Illuminate\Database\Eloquent\Relations\BelongsTo {
// return $this->belongsTo(UserExtension::class, 'user_id', 'id')->first();
// }
],
/*
......
resources/assets/js/app.js
View file @ 0a7fc6c8
......@@ -21,7 +21,6 @@ Vue.use(VueEvents);
Vue.use(VueSimplemde);
require('./mixins');
Vue.component('ckeditor', require('../../../Modules/Core/Assets/js/components/CkEditor.vue'));
Vue.component('DeleteButton', require('../../../Modules/Core/Assets/js/components/DeleteComponent.vue'));
Vue.component('EditButton', require('../../../Modules/Core/Assets/js/components/EditButtonComponent.vue'));
......@@ -29,9 +28,8 @@ Vue.component('TagsInput', require('../../../Modules/Tag/Assets/js/components/Ta
Vue.component('SingleMedia', require('../../../Modules/Media/Assets/js/components/SingleMedia.vue'));
Vue.component('MediaManager', require('../../../Modules/Media/Assets/js/components/MediaManager.vue'));
const currentLocale = window.AsgardCMS.currentLocale;
const adminPrefix = window.AsgardCMS.adminPrefix;
const currentLocale = window.AsgardCMS.currentLocale,
adminPrefix = window.AsgardCMS.adminPrefix;
function makeBaseUrl() {
if (window.AsgardCMS.hideDefaultLocaleInURL == 1) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023