developer/lk.zachem.info
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: developer:449310bd1c7fd59f0a0b4229bd274d6a7872f59d
Branches Tags
developer:main
..
compare: developer:a832749c074e190b757ade3cc0e8cd8463adac0f
Branches Tags
developer:main

No commits in common. "449310bd1c7fd59f0a0b4229bd274d6a7872f59d" and "a832749c074e190b757ade3cc0e8cd8463adac0f" have entirely different histories.
449310bd1c ... a832749c07

6 changed files with 14 additions and 17 deletions
Show Stats Expand all files Collapse all files

13
app/Modules/Main/Providers/ModuleServiceProvider.php
View File

@ -28,14 +28,11 @@ public function boot()
$this->registerComponent();
$this->registerLivewire();
$this->registerHelpers();
try {
define('DESIGN_PARAMETERS', Design::getParameters());
if (array_key_exists('title', DESIGN_PARAMETERS)) {
\Config::set('app.name', DESIGN_PARAMETERS['title']);
}
} catch (\Exception $e) {
define('DESIGN_PARAMETERS', []);
};
define('DESIGN_PARAMETERS', Design::getParameters());
if (array_key_exists('title', DESIGN_PARAMETERS)) {
\Config::set('app.name', DESIGN_PARAMETERS['title']);
}
}
protected function registerViews()

2
public/pull.php
View File

@ -24,7 +24,7 @@
if($json['total_commits'] > 0)
{
$result = shell_exec("cd /var/www/lk && git reset --hard HEAD && git pull");
$result = shell_exec("cd /var/www/lk && git reset --hard HEAD && git pull && php artisan migrate && npm run build");
//$result = shell_exec("cd /var/www/lk && git reset --hard HEAD && git pull");
echo "<p>$result</p>";
}

2
resources/views/layouts/admin.blade.php
View File

@ -25,7 +25,7 @@
<div class="container">
<div class="col-auto col-sm-2 text-center">
<a class="navbar-brand">
@if(array_key_exists('logo', DESIGN_PARAMETERS))
@if(DESIGN_PARAMETERS['logo'])
<img src="{{ url('/storage/' . DESIGN_PARAMETERS['logo']) }}" alt="Logo" height="70">
@else
<img src={{ url('/images/logo.png') }} alt="Logo" height="70">

2
resources/views/layouts/app.blade.php
View File

@ -26,7 +26,7 @@
<div class="container d-flex flex-row">
<div class=" text-center">
<a class="navbar-brand">
@if(array_key_exists('logo', DESIGN_PARAMETERS))
@if(DESIGN_PARAMETERS['logo'])
<img src="{{ url('/storage/' . DESIGN_PARAMETERS['logo']) }}" alt="Logo" height="70">
@else
<img src={{ url('/images/logo.png') }} alt="Logo" height="70">

10
resources/views/layouts/design.blade.php
View File

@ -14,13 +14,13 @@
}
@endif
@if(array_key_exists('text_color', DESIGN_PARAMETERS) && 1==2)
@if(DESIGN_PARAMETERS['text_color'] && 1==2)
#app *{
color: {{ DESIGN_PARAMETERS['text_color'] }};
}
@endif
@if(array_key_exists('primary_color', DESIGN_PARAMETERS))
@if(DESIGN_PARAMETERS['primary_color'])
.form-control:focus, .form-select:focus {
border-color: {{ DESIGN_PARAMETERS['primary_color'] }}60;
box-shadow: 0 0 0 .25rem {{ DESIGN_PARAMETERS['primary_color'] }}40;
@ -71,7 +71,7 @@
}
@endif
@if(array_key_exists('secondary_color', DESIGN_PARAMETERS))
@if(DESIGN_PARAMETERS['secondary_color'])
.btn-secondary,
.btn-secondary:disabled {
background-color:
@ -83,13 +83,13 @@
}
@endif
@if(array_key_exists('menu_btn_color', DESIGN_PARAMETERS))
@if(DESIGN_PARAMETERS['menu_btn_color'])
#leftPanel .nav-link {
background-color: {{ DESIGN_PARAMETERS['menu_btn_color'] }};
}
@endif
@if(array_key_exists('menu_btn_hover_color',DESIGN_PARAMETERS))
@if(DESIGN_PARAMETERS['menu_btn_hover_color'])
#leftPanel .nav-link:hover {
background-color: {{ DESIGN_PARAMETERS['menu_btn_hover_color'] }};
}

2
resources/views/layouts/guest.blade.php
View File

@ -60,7 +60,7 @@
<div class="cover-container d-flex w-100 h-100 p-3 mx-auto flex-column">
<header class="mb-auto">
<h3 class="float-md-start mb-0">
@if(array_key_exists('logo', DESIGN_PARAMETERS))
@if(DESIGN_PARAMETERS['logo'])
<img src="{{ url('/storage/' . DESIGN_PARAMETERS['logo']) }}" alt="Logo" height="100">
@else
<img src={{ url('/images/logo.png') }} alt="Logo" width="100">