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
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 228 additions and 207 deletions
Modules/Core/Config/core.php
View file @ 0a7fc6c8
<?php
return [
/*
|--------------------------------------------------------------------------
| The prefix that'll be used for the administration
|--------------------------------------------------------------------------
*/
/*
|--------------------------------------------------------------------------
| The prefix that'll be used for the administration
|--------------------------------------------------------------------------
*/
'admin-prefix' => 'backend',
/*
......@@ -32,18 +32,18 @@ return [
*/
'skin' => 'skin-blue',
/*
|--------------------------------------------------------------------------
| WYSIWYG Backend Editor
|--------------------------------------------------------------------------
| Define which editor you would like to use for the backend wysiwygs.
| These classes are event handlers, listening to EditorIsRendering
| you can define your own handlers and use them here
| Options:
| - \Modules\Core\Events\Handlers\LoadCkEditor::class
| - \Modules\Core\Events\Handlers\LoadSimpleMde::class
*/
'wysiwyg-handler' => \Modules\Core\Events\Handlers\LoadCkEditor::class,
/*
|--------------------------------------------------------------------------
| WYSIWYG Backend Editor
|--------------------------------------------------------------------------
| Define which editor you would like to use for the backend wysiwygs.
| These classes are event handlers, listening to EditorIsRendering
| you can define your own handlers and use them here
| Options:
| - \Modules\Core\Events\Handlers\LoadCkEditor::class
| - \Modules\Core\Events\Handlers\LoadSimpleMde::class
*/
'wysiwyg-handler' => \Modules\Core\Events\Handlers\LoadCkEditor::class,
/*
|--------------------------------------------------------------------------
| Custom CKeditor configuration file
......@@ -63,22 +63,22 @@ return [
| Backend and Frontend routes.
*/
'middleware' => [
'backend' => [
'auth.admin',
],
'frontend' => [
],
'api' => [
'api',
],
'backend' => [
'auth.admin',
],
'frontend' => [
],
'api' => [
'api',
],
],
/*
|--------------------------------------------------------------------------
| Define which assets will be available through the asset manager
|--------------------------------------------------------------------------
| These assets are registered on the asset manager
*/
/*
|--------------------------------------------------------------------------
| Define which assets will be available through the asset manager
|--------------------------------------------------------------------------
| These assets are registered on the asset manager
*/
'admin-assets' => [
// Css
'bootstrap.css' => ['theme' => 'vendor/bootstrap/dist/css/bootstrap.min.css'],
......@@ -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
......@@ -79,14 +79,14 @@ return [
'casts' => [
],
/*
|--------------------------------------------------------------------------
| Dynamic relations
|--------------------------------------------------------------------------
| Add relations that will be dynamically added to the User entity
|--------------------------------------------------------------------------
| Dynamic relations
|--------------------------------------------------------------------------
| 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();
// }
],
/*
......
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
<?php
return [
/*
|--------------------------------------------------------------------------
| The prefix that'll be used for the administration
|--------------------------------------------------------------------------
*/
/*
|--------------------------------------------------------------------------
| The prefix that'll be used for the administration
|--------------------------------------------------------------------------
*/
'admin-prefix' => 'backend',
/*
......@@ -32,18 +32,18 @@ return [
*/
'skin' => 'skin-blue',
/*
|--------------------------------------------------------------------------
| WYSIWYG Backend Editor
|--------------------------------------------------------------------------
| Define which editor you would like to use for the backend wysiwygs.
| These classes are event handlers, listening to EditorIsRendering
| you can define your own handlers and use them here
| Options:
| - \Modules\Core\Events\Handlers\LoadCkEditor::class
| - \Modules\Core\Events\Handlers\LoadSimpleMde::class
*/
'wysiwyg-handler' => \Modules\Core\Events\Handlers\LoadCkEditor::class,
/*
|--------------------------------------------------------------------------
| WYSIWYG Backend Editor
|--------------------------------------------------------------------------
| Define which editor you would like to use for the backend wysiwygs.
| These classes are event handlers, listening to EditorIsRendering
| you can define your own handlers and use them here
| Options:
| - \Modules\Core\Events\Handlers\LoadCkEditor::class
| - \Modules\Core\Events\Handlers\LoadSimpleMde::class
*/
'wysiwyg-handler' => \Modules\Core\Events\Handlers\LoadCkEditor::class,
/*
|--------------------------------------------------------------------------
| Custom CKeditor configuration file
......@@ -63,22 +63,22 @@ return [
| Backend and Frontend routes.
*/
'middleware' => [
'backend' => [
'auth.admin',
],
'frontend' => [
],
'api' => [
'api',
],
'backend' => [
'auth.admin',
],
'frontend' => [
],
'api' => [
'api',
],
],
/*
|--------------------------------------------------------------------------
| Define which assets will be available through the asset manager
|--------------------------------------------------------------------------
| These assets are registered on the asset manager
*/
/*
|--------------------------------------------------------------------------
| Define which assets will be available through the asset manager
|--------------------------------------------------------------------------
| These assets are registered on the asset manager
*/
'admin-assets' => [
// Css
'bootstrap.css' => ['theme' => 'vendor/bootstrap/dist/css/bootstrap.min.css'],
......@@ -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
......@@ -79,14 +79,14 @@ return [
'casts' => [
],
/*
|--------------------------------------------------------------------------
| Dynamic relations
|--------------------------------------------------------------------------
| Add relations that will be dynamically added to the User entity
|--------------------------------------------------------------------------
| Dynamic relations
|--------------------------------------------------------------------------
| 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) {
......
resources/views/asgard/dashboard/admin/dashboard.blade.php
View file @ 0a7fc6c8
......@@ -24,17 +24,17 @@
<p>@setting('dashboard::welcome-description')</p>
</div>
@if (setting('core::site-name') === '')
<div class="box-footer">
<a class="btn btn-primary btn-flat" href="{{ route('dashboard.module.settings', 'core') }}">
<i class="fa fa-cog"></i> {{ trans('dashboard::dashboard.configure your website') }}
</a>
<a class="btn btn-default btn-flat" href="{{ route('admin.page.page.index') }}">
{{ trans('dashboard::dashboard.add pages') }}
</a>
<a class="btn btn-default btn-flat" href="{{ route('admin.menu.menu.index') }}">
{{ trans('dashboard::dashboard.add menus') }}
</a>
</div>
<div class="box-footer">
<a class="btn btn-primary btn-flat" href="{{ route('dashboard.module.settings', 'core') }}">
<i class="fa fa-cog"></i> {{ trans('dashboard::dashboard.configure your website') }}
</a>
<a class="btn btn-default btn-flat" href="{{ route('admin.page.page.index') }}">
{{ trans('dashboard::dashboard.add pages') }}
</a>
<a class="btn btn-default btn-flat" href="{{ route('admin.menu.menu.index') }}">
{{ trans('dashboard::dashboard.add menus') }}
</a>
</div>
@endif
</div>
@endif
......
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