Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apply fixes from StyleCI #1337

Merged
merged 1 commit into from Jul 9, 2022
Merged

Apply fixes from StyleCI #1337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/Templates/TemplateBS5.php
View file
Open in desktop
Expand Up @@ -45,7 +45,7 @@ public function initialize()
->addJs('admin-main-bs5', '//cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js')
->addCss('admin-main-bs5', '//cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css')
// ->addJs('admin-main-tw', '//cdn.tailwindcss.com')
;
;

/**
* Include jQuery.
Expand All @@ -54,23 +54,19 @@ public function initialize()
$this->meta()->addJs('admin-jq', config('sleeping_owl.templateParam.jqueryPath'));
}


if (config('sleeping_owl.dev_assets')) {
$this->meta()->addJs('admin-bs5', mix('bs5/js/admin-app-dev.js', $this->mainAsset()));
} else {
$this->meta()->addJs('admin-bs5', mix('bs5/js/admin-app.js', $this->mainAsset()));
}



/**
* Include Vue, Modules && Styles.
*/
$this->meta()
->addJs('admin-vue-init', mix('default/js/vue.js', $this->mainAsset()))
->addJs('admin-modules-load', mix('default/js/modules.js', $this->mainAsset()))
->addCss('admin-bs5', mix('bs5/css/admin-app.css', $this->mainAsset()))
;
->addCss('admin-bs5', mix('bs5/css/admin-app.css', $this->mainAsset()));
}

/**
Expand Down
18 changes: 9 additions & 9 deletions src/Templates/TemplateDefault.php
View file
Open in desktop
Expand Up @@ -39,15 +39,15 @@ public function homepage()
public function initialize()
{
// try {
// New version - with versioning tags. Travis was crashed with error:
// Exception: The Mix manifest does not exist.
if (config('sleeping_owl.dev_assets')) {
$this->meta()->addJs('admin-default', mix('/default/js/admin-app-dev.js', $this->mainAsset()));
} else {
$this->meta()->addJs('admin-default', mix('/default/js/admin-app.js', $this->mainAsset()));
}
// New version - with versioning tags. Travis was crashed with error:
// Exception: The Mix manifest does not exist.
if (config('sleeping_owl.dev_assets')) {
$this->meta()->addJs('admin-default', mix('/default/js/admin-app-dev.js', $this->mainAsset()));
} else {
$this->meta()->addJs('admin-default', mix('/default/js/admin-app.js', $this->mainAsset()));
}

$this->meta()
$this->meta()
->addJs('admin-vue-init', mix('/default/js/vue.js', $this->mainAsset()))
->addJs('admin-modules-load', mix('/default/js/modules.js', $this->mainAsset()))
->addCss('admin-default', mix('/default/css/admin-app.css', $this->mainAsset()));
Expand Down Expand Up @@ -83,7 +83,7 @@ public function getViewNamespace()
*/
public function assetDir()
{
return $this->mainAsset() . '/default';
return $this->mainAsset().'/default';
}

/**
Expand Down