From 4bd5a61fdea215a2ba1f3a085dd3e82c249cc3a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Tue, 11 Oct 2016 15:32:06 +0200 Subject: [PATCH 1/6] FEATURE: add artisan shortcut for publishing assets and views --- .../Commands/PublishTemplateResources.php | 33 +++++++++++++++++++ app/Console/Kernel.php | 5 +-- .../errors/homepageNotAvailable.blade.php | 0 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 app/Console/Commands/PublishTemplateResources.php create mode 100644 templates/DobrotyZPece/Resources/views/visitor/errors/homepageNotAvailable.blade.php diff --git a/app/Console/Commands/PublishTemplateResources.php b/app/Console/Commands/PublishTemplateResources.php new file mode 100644 index 00000000..b5edc9e9 --- /dev/null +++ b/app/Console/Commands/PublishTemplateResources.php @@ -0,0 +1,33 @@ +call('vendor:publish', ['--tag' => 'module-views', '--force' => true]); + $this->call('vendor:publish', ['--tag' => 'public-assets', '--force' => true]); + } +} diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 4c3aadf1..f7ec8798 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -2,7 +2,7 @@ namespace App\Console; -use App\Console\Commands\AddLanguage; +use App\Console\Commands\PublishTemplateResources; use Illuminate\Console\Scheduling\Schedule; use Illuminate\Foundation\Console\Kernel as ConsoleKernel; @@ -22,7 +22,8 @@ class Kernel extends ConsoleKernel Commands\TranslateAll::class, Commands\InitDatabaseSchema::class, Commands\SetTemplate::class, - AddLanguage::class + Commands\AddLanguage::class, + PublishTemplateResources::class ]; /** diff --git a/templates/DobrotyZPece/Resources/views/visitor/errors/homepageNotAvailable.blade.php b/templates/DobrotyZPece/Resources/views/visitor/errors/homepageNotAvailable.blade.php new file mode 100644 index 00000000..e69de29b From cb9b96c8618c6b93db68a891409471abcd911808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Tue, 11 Oct 2016 15:40:42 +0200 Subject: [PATCH 2/6] FIX: fix one page menu --- .../Resources/views/admin/widgets/onePageMenu/edit.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/Base/OnePage/Resources/views/admin/widgets/onePageMenu/edit.blade.php b/templates/Base/OnePage/Resources/views/admin/widgets/onePageMenu/edit.blade.php index e91e4a74..f4dbc2cd 100644 --- a/templates/Base/OnePage/Resources/views/admin/widgets/onePageMenu/edit.blade.php +++ b/templates/Base/OnePage/Resources/views/admin/widgets/onePageMenu/edit.blade.php @@ -4,10 +4,10 @@ @section('content')
- @include('admin.widgets.htmlCode.form', ['action' => route('widgets.postEdit', ['id' => $widget->id])]) + @include('template::admin.widgets.onePageMenu.form', ['action' => route('widgets.postEdit', ['id' => $widget->id])])
-

@lang('widgets/htmlCode.preview')

+

@lang('widgets/menu.preview')

@widgetPreview($widget)
From c70e8a6b0d8625277760da560b259f3089b0b85b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Tue, 11 Oct 2016 15:57:29 +0200 Subject: [PATCH 3/6] FEATURE: minor changes in template for dobrotyzpece.cz --- .../Resources/views/visitor/layout.blade.php | 38 ++----------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/templates/DobrotyZPece/Resources/views/visitor/layout.blade.php b/templates/DobrotyZPece/Resources/views/visitor/layout.blade.php index b2e002d0..34fb4728 100644 --- a/templates/DobrotyZPece/Resources/views/visitor/layout.blade.php +++ b/templates/DobrotyZPece/Resources/views/visitor/layout.blade.php @@ -1,5 +1,5 @@ - + @@ -43,44 +43,12 @@
-
-
-
Kontaktujte nás
-
- - -
-
- - -
- -
-
-
-
Menu
- -
-
-
Firma
- Dobroty z pece - ICO - Adresa - email@dobrotyzpece.cz -

www.dobrotyzpece.cz

-
+ @widgetArea('footer')
- Copyright © www.binarity.cz + © {{date('Y')}} www.binarity.cz
From dee5060a2499f17f65643d5c9fd68d6a8612233d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Tue, 11 Oct 2016 16:16:16 +0200 Subject: [PATCH 4/6] FEATURE: add unique code to widgets --- ...16_10_11_135756_AddUniqueCodeToWidgets.php | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 database/migrations/2016_10_11_135756_AddUniqueCodeToWidgets.php diff --git a/database/migrations/2016_10_11_135756_AddUniqueCodeToWidgets.php b/database/migrations/2016_10_11_135756_AddUniqueCodeToWidgets.php new file mode 100644 index 00000000..36141a15 --- /dev/null +++ b/database/migrations/2016_10_11_135756_AddUniqueCodeToWidgets.php @@ -0,0 +1,66 @@ +string('container_id') + ->nullable(true) + ->default(null) + ->after('name'); + $table->string('container_class') + ->nullable(true) + ->after('name') + ->default(null); + + $table->unique(['language', 'container_id']); + }); + + // migrate data + $widgets = \App\Models\Widget::all(); + foreach ($widgets as $widget) { + $widget->settings = json_decode($widget->settings); + if (isset($widget->settings->containerClass)) { + $widget->container_class = $widget->settings->containerClass; + unset($widget->settings->containerClass); + $widget->settings = json_encode($widget->settings); + $widget->save(); + } + } + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('widgets', function (Blueprint $table) { + $table->dropUnique('widgets_language_container_id_unique'); + }); + + // migrate data + $widgets = \App\Models\Widget::all(); + foreach ($widgets as $widget) { + $widget->settings = (object)json_decode($widget->settings); + $widget->settings->containerClass = $widget->container_class; + $widget->settings = json_encode($widget->settings); + $widget->save(); + } + + Schema::table('widgets', function (Blueprint $table) { + $table->dropColumn('container_id'); + $table->dropColumn('container_class'); + }); + } +} From ce058ae8243903e13ec1afeb98b4e5e07afd771c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Tue, 11 Oct 2016 16:24:16 +0200 Subject: [PATCH 5/6] FEATURE: include commont parts of widget forms --- app/Http/Requests/EditWidgetRequest.php | 3 +- app/Http/Requests/NewWidgetRequest.php | 3 +- app/Models/Widget.php | 2 ++ app/Providers/AppServiceProvider.php | 2 +- resources/lang/en/widgets/common.php | 10 ++++++ .../admin/widgets/htmlCode/form.blade.php | 22 +------------ .../views/admin/widgets/menu/form.blade.php | 23 +------------ .../widgets/snippets/commonForm.blade.php | 33 +++++++++++++++++++ 8 files changed, 52 insertions(+), 46 deletions(-) create mode 100644 resources/lang/en/widgets/common.php create mode 100644 resources/views/admin/widgets/snippets/commonForm.blade.php diff --git a/app/Http/Requests/EditWidgetRequest.php b/app/Http/Requests/EditWidgetRequest.php index 55b93954..0395eb1f 100644 --- a/app/Http/Requests/EditWidgetRequest.php +++ b/app/Http/Requests/EditWidgetRequest.php @@ -12,7 +12,8 @@ class EditWidgetRequest extends Request public function rules() { return [ - 'name' => 'required' + 'name' => 'required', + 'containerId' => 'unique:widgets,container_id,'.$this->containerId ]; } } diff --git a/app/Http/Requests/NewWidgetRequest.php b/app/Http/Requests/NewWidgetRequest.php index 78ae08cd..968efad7 100644 --- a/app/Http/Requests/NewWidgetRequest.php +++ b/app/Http/Requests/NewWidgetRequest.php @@ -12,7 +12,8 @@ class NewWidgetRequest extends Request public function rules() { return [ - 'name' => 'required' + 'name' => 'required', + 'containerId' => 'unique:widgets,container_id' ]; } } diff --git a/app/Models/Widget.php b/app/Models/Widget.php index dc0d14bf..5836ff4d 100644 --- a/app/Models/Widget.php +++ b/app/Models/Widget.php @@ -44,6 +44,8 @@ class Widget extends Model $widget->language = LaravelLocalization::getCurrentLocale(); $widget->user_id = \Auth::user()->id; $widget->name = $data->name; + $widget->container_class = $data->containerClass; + $widget->container_id = $data->containerId; // save description if available if (isset($data->description)) { diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index cb1c8fec..6b079574 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -96,7 +96,7 @@ class AppServiceProvider extends ServiceProvider // register all available widgets $registrator->register(HtmlCode::class); $registrator->register(Menu::class); - $registrator->register(OrbitSlider::class); +// $registrator->register(OrbitSlider::class); } /** diff --git a/resources/lang/en/widgets/common.php b/resources/lang/en/widgets/common.php new file mode 100644 index 00000000..67639999 --- /dev/null +++ b/resources/lang/en/widgets/common.php @@ -0,0 +1,10 @@ + 'Create new HTML widget', + 'edit' => 'Editing widget :name', + 'containerClass' => 'HTML class used for container of this widget', + 'widgetDescription' => 'Simple widget for inserting html code', + 'name' => 'Name', + 'description' => 'Description', + 'containerId' => 'Unique name used as ID of widget' +]; \ No newline at end of file diff --git a/resources/views/admin/widgets/htmlCode/form.blade.php b/resources/views/admin/widgets/htmlCode/form.blade.php index 70068c59..38eccd2f 100644 --- a/resources/views/admin/widgets/htmlCode/form.blade.php +++ b/resources/views/admin/widgets/htmlCode/form.blade.php @@ -1,25 +1,5 @@
- {!! csrf_field() !!} - - - - - - - - - - - + @include('admin.widgets.snippets.commonForm')