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

Fixes, CS and updates

Merge pull request #658 from mikemand/feature/fixes-cs-and-updates
Fixes, CS and updates
0a7fc6c8 · Nicolas Widart · GitHub · bc5ec9ad · 4bc4f037 · 0a7fc6c8
Unverified Commit 0a7fc6c8 authored Nov 29, 2018 by Nicolas Widart Committed by GitHub Nov 29, 2018
11 changed files
--- a/Modules/Core/Config/core.php
+++ b/Modules/Core/Config/core.php
@@ -178,5 +178,5 @@ return [
    | Check if asgard was installed
    |--------------------------------------------------------------------------
    */
-    'is_installed' => env('INSTALLED', false)
+    'is_installed' => env('INSTALLED', false),
 ];
--- a/Modules/Page/Config/config.php
+++ b/Modules/Page/Config/config.php
@@ -25,8 +25,8 @@ return [
    | Add relations that will be dynamically added to the Page entity
    */
    'relations' => [
-//        'extension' => function ($self) {
+//        'extension' => function (): \Illuminate\Database\Eloquent\Relations\BelongsTo {
-//            return $self->belongsTo(PageExtension::class, 'id', 'page_id')->first();
+//            return $this->belongsTo(PageExtension::class, 'id', 'page_id')->first();
 //        }
    ],
    /*

--- a/Modules/User/Config/config.php
+++ b/Modules/User/Config/config.php
@@ -85,8 +85,8 @@ return [
    | Add relations that will be dynamically added to the User entity
     */
    'relations' => [
-//        'extension' => function ($self) {
+//        'extension' => function (): \Illuminate\Database\Eloquent\Relations\BelongsTo {
-//            return $self->belongsTo(UserExtension::class, 'user_id', 'id')->first();
+//            return $this->belongsTo(UserExtension::class, 'user_id', 'id')->first();
 //        }
    ],
    /*

--- a/Themes/Adminlte/views/layouts/master.blade.php
+++ b/Themes/Adminlte/views/layouts/master.blade.php
 <!DOCTYPE html>
-<html>
+<html lang="{{ locale() }}">
-<head>
+    <head>
-    <base src="{{ URL::asset('/') }}" />
        <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>
+    </head>
-<body class="{{ config('asgard.core.core.skin', 'skin-blue') }} sidebar-mini" style="padding-bottom: 0 !important;">
+    <body class="{{ config('asgard.core.core.skin', 'skin-blue') }} sidebar-mini" style="padding-bottom: 0 !important;">
-<div class="wrapper" id="app">
+        <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)
+        @foreach($jsFiles as $js)
-    <script src="{{ URL::asset($js) }}" type="text/javascript"></script>
+            <script src="{{ asset($js) }}" type="text/javascript"></script>
-@endforeach
+        @endforeach
-<script>
+        <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/manifest.js') }}"></script>
-<script src="{{ mix('js/vendor.js') }}"></script>
+        <script src="{{ mix('js/vendor.js') }}"></script>
-<script src="{{ mix('js/app.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; ?>
+        @endif
-@section('scripts')
+        @section('scripts')
-@show
+        @show
-@stack('js-stack')
+        @stack('js-stack')
-</body>
+    </body>
 </html>
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -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');
        });
    }

--- a/composer.json
+++ b/composer.json
@@ -31,17 +31,17 @@
        "idavoll/adminlte-theme": "4.0.x-dev"
    },
    "require-dev": {
+        "barryvdh/laravel-debugbar": "^3.2",
        "beyondcode/laravel-dump-server": "^1.0",
        "filp/whoops": "^2.0",
        "fzaninotto/faker": "^1.4",
-        "mockery/mockery": "^1.0",
-        "barryvdh/laravel-debugbar": "^3.1",
-        "orchestra/testbench": "3.7.*",
-        "league/flysystem-aws-s3-v3": "^1.0",
        "league/commonmark": "^0.15.4",
-        "predis/predis": "^1.1",
+        "league/flysystem-aws-s3-v3": "^1.0",
+        "mockery/mockery": "^1.0",
        "nunomaduro/collision": "^2.0",
+        "orchestra/testbench": "3.7.*",
        "phpunit/phpunit": "^7.0",
+        "predis/predis": "^1.1",
        "roave/security-advisories": "dev-master"
    },
    "autoload": {

--- a/config/asgard/core/core.php
+++ b/config/asgard/core/core.php
@@ -178,5 +178,5 @@ return [
    | Check if asgard was installed
    |--------------------------------------------------------------------------
    */
-    'is_installed' => env('INSTALLED', false)
+    'is_installed' => env('INSTALLED', false),
 ];
--- a/config/asgard/dashboard/settings.php
+++ b/config/asgard/dashboard/settings.php
+<?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',
+    ],
+];
--- a/config/asgard/page/config.php
+++ b/config/asgard/page/config.php
@@ -25,8 +25,8 @@ return [
    | Add relations that will be dynamically added to the Page entity
    */
    'relations' => [
-//        'extension' => function ($self) {
+//        'extension' => function (): \Illuminate\Database\Eloquent\Relations\BelongsTo {
-//            return $self->belongsTo(PageExtension::class, 'id', 'page_id')->first();
+//            return $this->belongsTo(PageExtension::class, 'id', 'page_id')->first();
 //        }
    ],
    /*

--- a/config/asgard/user/config.php
+++ b/config/asgard/user/config.php
@@ -85,8 +85,8 @@ return [
    | Add relations that will be dynamically added to the User entity
     */
    'relations' => [
-//        'extension' => function ($self) {
+//        'extension' => function (): \Illuminate\Database\Eloquent\Relations\BelongsTo {
-//            return $self->belongsTo(UserExtension::class, 'user_id', 'id')->first();
+//            return $this->belongsTo(UserExtension::class, 'user_id', 'id')->first();
 //        }
    ],
    /*

--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -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 currentLocale = window.AsgardCMS.currentLocale;
+    adminPrefix = window.AsgardCMS.adminPrefix;
-const adminPrefix = window.AsgardCMS.adminPrefix;
 function makeBaseUrl() {
    if (window.AsgardCMS.hideDefaultLocaleInURL == 1) {