diff --git a/app/Modules/Main/Providers/ModuleServiceProvider.php b/app/Modules/Main/Providers/ModuleServiceProvider.php index 8b69bbd..541a56c 100644 --- a/app/Modules/Main/Providers/ModuleServiceProvider.php +++ b/app/Modules/Main/Providers/ModuleServiceProvider.php @@ -28,12 +28,14 @@ public function boot() $this->registerComponent(); $this->registerLivewire(); $this->registerHelpers(); - - /*define('DESIGN_PARAMETERS', Design::getParameters()); - - if (array_key_exists('title', DESIGN_PARAMETERS)) { - \Config::set('app.name', DESIGN_PARAMETERS['title']); - }*/ + 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', []); + }; } protected function registerViews() diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php index 41d538b..4418cc3 100644 --- a/resources/views/layouts/admin.blade.php +++ b/resources/views/layouts/admin.blade.php @@ -25,7 +25,7 @@
- @if(DESIGN_PARAMETERS['logo']) + @if(array_key_exists('logo', DESIGN_PARAMETERS)) Logo @else Logo diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index b3bdeab..b7d5838 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -26,7 +26,7 @@
- @if(DESIGN_PARAMETERS['logo']) + @if(array_key_exists('logo', DESIGN_PARAMETERS)) Logo @else Logo diff --git a/resources/views/layouts/design.blade.php b/resources/views/layouts/design.blade.php index 8466ee8..5e8c90b 100644 --- a/resources/views/layouts/design.blade.php +++ b/resources/views/layouts/design.blade.php @@ -14,13 +14,13 @@ } @endif - @if(DESIGN_PARAMETERS['text_color'] && 1==2) + @if(array_key_exists('text_color', DESIGN_PARAMETERS) && 1==2) #app *{ color: {{ DESIGN_PARAMETERS['text_color'] }}; } @endif - @if(DESIGN_PARAMETERS['primary_color']) + @if(array_key_exists('primary_color', DESIGN_PARAMETERS)) .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(DESIGN_PARAMETERS['secondary_color']) + @if(array_key_exists('secondary_color', DESIGN_PARAMETERS)) .btn-secondary, .btn-secondary:disabled { background-color: @@ -83,13 +83,13 @@ } @endif - @if(DESIGN_PARAMETERS['menu_btn_color']) + @if(array_key_exists('menu_btn_color', DESIGN_PARAMETERS)) #leftPanel .nav-link { background-color: {{ DESIGN_PARAMETERS['menu_btn_color'] }}; } @endif - @if(DESIGN_PARAMETERS['menu_btn_hover_color']) + @if(array_key_exists('menu_btn_hover_color',DESIGN_PARAMETERS)) #leftPanel .nav-link:hover { background-color: {{ DESIGN_PARAMETERS['menu_btn_hover_color'] }}; } diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php index afb0712..3bba0d5 100644 --- a/resources/views/layouts/guest.blade.php +++ b/resources/views/layouts/guest.blade.php @@ -60,7 +60,7 @@

- @if(DESIGN_PARAMETERS['logo']) + @if(array_key_exists('logo', DESIGN_PARAMETERS)) Logo @else Logo