Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Platform
Commits
887275df
Commit
887275df
authored
Nov 29, 2018
by
Micheal Mand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up spacing and other code smells
Signed-off-by:
Micheal Mand
<
micheal@kmdwebdesigns.com
>
parent
f731de14
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
51 additions
and
53 deletions
+51
-53
AppServiceProvider.php
app/Providers/AppServiceProvider.php
+2
-2
core.php
config/asgard/core/core.php
+32
-32
config.php
config/asgard/user/config.php
+4
-4
app.js
resources/assets/js/app.js
+2
-4
dashboard.blade.php
resources/views/asgard/dashboard/admin/dashboard.blade.php
+11
-11
No files found.
app/Providers/AppServiceProvider.php
View file @
887275df
...
@@ -2,9 +2,9 @@
...
@@ -2,9 +2,9 @@
namespace
App\Providers
;
namespace
App\Providers
;
use
Illuminate\Support\Carbon
;
use
Illuminate\Support\Facades\Schema
;
use
Illuminate\Support\Facades\Schema
;
use
Illuminate\Support\ServiceProvider
;
use
Illuminate\Support\ServiceProvider
;
use
Illuminate\Support\Carbon
;
class
AppServiceProvider
extends
ServiceProvider
class
AppServiceProvider
extends
ServiceProvider
{
{
...
@@ -18,7 +18,7 @@ class AppServiceProvider extends ServiceProvider
...
@@ -18,7 +18,7 @@ class AppServiceProvider extends ServiceProvider
Schema
::
defaultStringLength
(
191
);
Schema
::
defaultStringLength
(
191
);
Carbon
::
setLocale
(
config
(
'app.locale'
));
Carbon
::
setLocale
(
config
(
'app.locale'
));
Carbon
::
serializeUsing
(
function
(
$carbon
)
{
Carbon
::
serializeUsing
(
function
(
Carbon
$carbon
)
{
return
$carbon
->
format
(
'd/m/y H:i:s'
);
return
$carbon
->
format
(
'd/m/y H:i:s'
);
});
});
}
}
...
...
config/asgard/core/core.php
View file @
887275df
<?php
<?php
return
[
return
[
/*
/*
|--------------------------------------------------------------------------
|--------------------------------------------------------------------------
| The prefix that'll be used for the administration
| The prefix that'll be used for the administration
|--------------------------------------------------------------------------
|--------------------------------------------------------------------------
*/
*/
'admin-prefix'
=>
'backend'
,
'admin-prefix'
=>
'backend'
,
/*
/*
...
@@ -32,18 +32,18 @@ return [
...
@@ -32,18 +32,18 @@ return [
*/
*/
'skin'
=>
'skin-blue'
,
'skin'
=>
'skin-blue'
,
/*
/*
|--------------------------------------------------------------------------
|--------------------------------------------------------------------------
| WYSIWYG Backend Editor
| WYSIWYG Backend Editor
|--------------------------------------------------------------------------
|--------------------------------------------------------------------------
| Define which editor you would like to use for the backend wysiwygs.
| Define which editor you would like to use for the backend wysiwygs.
| These classes are event handlers, listening to EditorIsRendering
| These classes are event handlers, listening to EditorIsRendering
| you can define your own handlers and use them here
| you can define your own handlers and use them here
| Options:
| Options:
| - \Modules\Core\Events\Handlers\LoadCkEditor::class
| - \Modules\Core\Events\Handlers\LoadCkEditor::class
| - \Modules\Core\Events\Handlers\LoadSimpleMde::class
| - \Modules\Core\Events\Handlers\LoadSimpleMde::class
*/
*/
'wysiwyg-handler'
=>
\Modules\Core\Events\Handlers\LoadCkEditor
::
class
,
'wysiwyg-handler'
=>
\Modules\Core\Events\Handlers\LoadCkEditor
::
class
,
/*
/*
|--------------------------------------------------------------------------
|--------------------------------------------------------------------------
| Custom CKeditor configuration file
| Custom CKeditor configuration file
...
@@ -63,22 +63,22 @@ return [
...
@@ -63,22 +63,22 @@ return [
| Backend and Frontend routes.
| Backend and Frontend routes.
*/
*/
'middleware'
=>
[
'middleware'
=>
[
'backend'
=>
[
'backend'
=>
[
'auth.admin'
,
'auth.admin'
,
],
],
'frontend'
=>
[
'frontend'
=>
[
],
],
'api'
=>
[
'api'
=>
[
'api'
,
'api'
,
],
],
],
],
/*
/*
|--------------------------------------------------------------------------
|--------------------------------------------------------------------------
| Define which assets will be available through the asset manager
| Define which assets will be available through the asset manager
|--------------------------------------------------------------------------
|--------------------------------------------------------------------------
| These assets are registered on the asset manager
| These assets are registered on the asset manager
*/
*/
'admin-assets'
=>
[
'admin-assets'
=>
[
// Css
// Css
'bootstrap.css'
=>
[
'theme'
=>
'vendor/bootstrap/dist/css/bootstrap.min.css'
],
'bootstrap.css'
=>
[
'theme'
=>
'vendor/bootstrap/dist/css/bootstrap.min.css'
],
...
@@ -178,5 +178,5 @@ return [
...
@@ -178,5 +178,5 @@ return [
| Check if asgard was installed
| Check if asgard was installed
|--------------------------------------------------------------------------
|--------------------------------------------------------------------------
*/
*/
'is_installed'
=>
env
(
'INSTALLED'
,
false
)
'is_installed'
=>
env
(
'INSTALLED'
,
false
)
,
];
];
config/asgard/user/config.php
View file @
887275df
...
@@ -79,10 +79,10 @@ return [
...
@@ -79,10 +79,10 @@ return [
'casts'
=>
[
'casts'
=>
[
],
],
/*
/*
|--------------------------------------------------------------------------
|--------------------------------------------------------------------------
| Dynamic relations
| Dynamic relations
|--------------------------------------------------------------------------
|--------------------------------------------------------------------------
| Add relations that will be dynamically added to the User entity
| Add relations that will be dynamically added to the User entity
*/
*/
'relations'
=>
[
'relations'
=>
[
// 'extension' => function ($self) {
// 'extension' => function ($self) {
...
...
resources/assets/js/app.js
View file @
887275df
...
@@ -21,7 +21,6 @@ Vue.use(VueEvents);
...
@@ -21,7 +21,6 @@ Vue.use(VueEvents);
Vue
.
use
(
VueSimplemde
);
Vue
.
use
(
VueSimplemde
);
require
(
'
./mixins
'
);
require
(
'
./mixins
'
);
Vue
.
component
(
'
ckeditor
'
,
require
(
'
../../../Modules/Core/Assets/js/components/CkEditor.vue
'
));
Vue
.
component
(
'
ckeditor
'
,
require
(
'
../../../Modules/Core/Assets/js/components/CkEditor.vue
'
));
Vue
.
component
(
'
DeleteButton
'
,
require
(
'
../../../Modules/Core/Assets/js/components/DeleteComponent.vue
'
));
Vue
.
component
(
'
DeleteButton
'
,
require
(
'
../../../Modules/Core/Assets/js/components/DeleteComponent.vue
'
));
Vue
.
component
(
'
EditButton
'
,
require
(
'
../../../Modules/Core/Assets/js/components/EditButtonComponent.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
...
@@ -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
(
'
SingleMedia
'
,
require
(
'
../../../Modules/Media/Assets/js/components/SingleMedia.vue
'
));
Vue
.
component
(
'
MediaManager
'
,
require
(
'
../../../Modules/Media/Assets/js/components/MediaManager.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
()
{
function
makeBaseUrl
()
{
if
(
window
.
AsgardCMS
.
hideDefaultLocaleInURL
==
1
)
{
if
(
window
.
AsgardCMS
.
hideDefaultLocaleInURL
==
1
)
{
...
...
resources/views/asgard/dashboard/admin/dashboard.blade.php
View file @
887275df
...
@@ -24,17 +24,17 @@
...
@@ -24,17 +24,17 @@
<p>@setting('dashboard::welcome-description')</p>
<p>@setting('dashboard::welcome-description')</p>
</div>
</div>
@if (setting('core::site-name') === '')
@if (setting('core::site-name') === '')
<div class="
box
-
footer
">
<div class="
box
-
footer
">
<a class="
btn
btn
-
primary
btn
-
flat
" href="
{{
route
(
'dashboard.module.settings'
,
'core'
)
}}
">
<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') }}
<i class="
fa
fa
-
cog
"></i> {{ trans('dashboard::dashboard.configure your website') }}
</a>
</a>
<a class="
btn
btn
-
default
btn
-
flat
" href="
{{
route
(
'admin.page.page.index'
)
}}
">
<a class="
btn
btn
-
default
btn
-
flat
" href="
{{
route
(
'admin.page.page.index'
)
}}
">
{{ trans('dashboard::dashboard.add pages') }}
{{ trans('dashboard::dashboard.add pages') }}
</a>
</a>
<a class="
btn
btn
-
default
btn
-
flat
" href="
{{
route
(
'admin.menu.menu.index'
)
}}
">
<a class="
btn
btn
-
default
btn
-
flat
" href="
{{
route
(
'admin.menu.menu.index'
)
}}
">
{{ trans('dashboard::dashboard.add menus') }}
{{ trans('dashboard::dashboard.add menus') }}
</a>
</a>
</div>
</div>
@endif
@endif
</div>
</div>
@endif
@endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment