Merge branch 'dev' into doucovanineratovice.cz

2016-09-25 02:00:18 +02:00
parent 124ad2f061 52394c6289
commit fa1d302ea6
16 changed files with 334 additions and 83 deletions
@@ -18,9 +18,11 @@ class WidgetRegistrator
    /**
     * Method used for registering new widgets
     *
-     * @param $classname
+     * @param      $classname
+     * @param null $templateId
+     * @param null $moduleId
     */
-    public function register($classname)
+    public function register($classname, $templateId = null, $moduleId = null)
    {
        $class = new $classname;
        if (!$class instanceof PublicWidget) {
@@ -36,6 +38,8 @@ class WidgetRegistrator
            WidgetType::create([
                                   'handler'     => $classname,
                                   'name'        => $widgetName,
+                                   'module_id'   => $moduleId,
+                                   'template_id' => $templateId,
                                   'description' => $widgetDescription
                               ]);

@@ -45,6 +45,18 @@ class Settings
        return $default;
    }

+    /**
+     * Shortcut for obtaining settings saved as JSON
+     *
+     * @param $key
+     *
+     * @return mixed
+     */
+    public static function getJson($key)
+    {
+        return json_decode(self::get($key, '{}'));
+    }
+
    /**
     * Get all settings
     *
@@ -17,7 +17,9 @@ class Widget extends Model
        'user_id',
        'name',
        'settings',
-        'description'
+        'language',
+        'description',
+        'deletable'
    ];
    protected $guarded = [];

@@ -31,7 +33,6 @@ class Widget extends Model
     */
    public function createNew(WidgetType $widgetType, $data)
    {
-
        // convert array or whatever into object
        if (!is_object($data)) {
            $data = (object)$data;
@@ -15,7 +15,8 @@ class WidgetArea extends Model
    protected $fillable = [
        'name',
        'code',
-        'description'
+        'description',
+        'deletable'
    ];
    protected $guarded = [];

@@ -15,6 +15,8 @@ class WidgetType extends Model
    protected $fillable = [
        'handler',
        'name',
+        'template_id',
+        'module_id',
        'description'
    ];

@@ -0,0 +1,55 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+class MakeUserIdNullableAtWidgets extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('widgets', function (Blueprint $table) {
+
+                $table->dropForeign(['user_id']);
+
+            $table->integer('user_id')
+                  ->nullable(true)
+                  ->default(null)
+                  ->comment('User ID who created this widget. NULL for widget created by template.')->change();
+
+            $table->foreign('user_id')
+                  ->references('id')
+                  ->on('users')
+                  ->onDelete('cascade')
+                  ->onUpdate('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('widgets', function (Blueprint $table) {
+            $table->dropForeign(['user_id']);
+        });
+
+        Schema::table('widgets', function (Blueprint $table) {
+            $table->integer('user_id')
+                  ->nullable(false)
+                  ->comment('User ID who created this widget. ')->change();
+
+            $table->foreign('user_id')
+                  ->references('id')
+                  ->on('users')
+                  ->onDelete('no action')
+                  ->onUpdate('no action');
+        });
+    }
+}
@@ -1,61 +1,15 @@
-@extends('admin.layout')
+@extends('admin.layoutWithNavigation')

@section('pageName', @trans('admin/widgets.overview'))

@section('content')
    <div class="row">
-
-        @if (session('success'))
-            <div class="callout success">
-                {{ session('success') }}
-            </div>
-        @endif
-
-        @if (session('error'))
-            <div class="callout alert">
-                {{ session('error') }}
-            </div>
-        @endif
-
-        <div class="column large-9 tile-overview" data-equalizer>
-
+        <div class="col-lg-9 sameheight-container">
            <h2>@lang('admin/widgets.overview')</h2>

-            @forelse($widgets as $widget)
-                <div class="column large-4">
-                    <div class="item" data-equalizer-watch>
-                        <h4>{{str_limit($widget->name, 20)}}</h4>
-                        <p>
-                            {{trans(call_user_func([$widget->widget_type_handler, 'getName']))}}
-                        </p>
-                        <p>
-                            {{str_limit($widget->description, 150)}}
-                        </p>
-
-                        <div class="controls row text-center">
-                            <a href="{{route('widgets.edit', ['id' => $widget->id])}}" class="button column large-6 primary"><i class="fa fa-edit"></i></a>
-
-                            @if (in_array($widget->id, $associatedWidgetIds))
-                                <a href="{{route('widgets.deleteAssociation', ['widgetId' => $widget->id, 'widgetArea' => $widgetArea->id])}}"
-                                   class="button column confirm large-6 alert">
-                                    <i class="fa fa-trash"></i>
-                                </a>
-                            @else
-                                <a href="{{route('widgets.makeAssociation', ['widgetId' => $widget->id, 'widgetArea' => $widgetArea->id])}}"
-                                   class="button column large-6 success"><i class="fa fa-plus"></i></a>
-                            @endif
-                        </div>
-                    </div>
-                </div>
-            @empty
-                <em>@lang('admin/widgets.noEntries')</em>
-            @endforelse
-
-            <div class="row">
-                {!! $widgets->render() !!}
-            </div>
+            @include('admin.widgets.widgetsToAssociate', ['tileClass' => 'col-lg-3 col-md-4 col-sm-6 col-xs-12'])
        </div>
-        <div class="column large-3">
+        <div class="col-lg-3">
            <h2>{{$widgetArea->name}}</h2>

            <p>
@@ -63,11 +17,11 @@
            </p>

            <ul>
-                <li>@lang('admin/widgets.createdAt'): {{$widgetArea->created_at}}</li>
-                <li>@lang('admin/widgets.updatedAt'): {{$widgetArea->updated_at}}</li>
+                <li>@lang('admin/widgets.createdAt'): @date($widgetArea->created_at)</li>
+                <li>@lang('admin/widgets.updatedAt'): @date($widgetArea->updated_at)</li>
            </ul>

-            <a href="{{route('widgetareas.edit', ['id' => $widgetArea->id])}}">@lang('admin/widgetAreas.editButton')</a>
+            <a href="{{route('widgetareas.edit', ['id' => $widgetArea->id])}}" class="btn btn-secondary col-sm-12">@lang('admin/widgetAreas.editButton')</a>

            @if (!empty($associatedWidgetIds))
                <h3>@lang('admin/widgets.preview')</h3>
@@ -2,7 +2,7 @@
    <div class="{{$tileClass}}">
        <div class=" card @if (in_array($widget->id, $associatedWidgetIds)) card-info @else card-success @endif">

-            <div class="card-header">
+            <div class="card-header sameheight-item ">
                <div class="header-block">
                    <p class="title" title="{{$widget->name}}"
                       data-toggle="tooltip"> {{str_limit($widget->name, 15)}}</p>
@@ -32,30 +32,42 @@ abstract class OnePage implements TemplateHandler
        $menu->route('template.setHomepage', trans('template::admin/mainMenu.setHomepage'), [], 1, ['icon' => 'fa fa-fw fa-home']);
    }

+    /**
+     * Getter for pages displayed on homepage
+     *
+     * @return array
+     */
+    public static function getPagesOnHomepage()
+    {
+        $pageIds = (array)json_decode(Settings::get(self::HOMEPAGE_PAGES_SETTINGS_KEY, '[]'));
+
+        if (empty($pageIds)) {
+            return [];
+        }
+
+        // get all available pages
+        $pages = Content::whereIn('id', $pageIds);
+
+        if (Auth::user()) {
+            $pages = $pages->where('status', '!=', Content::STATUS_DRAFT);
+        } else {
+            $pages = $pages->where('status', Content::STATUS_PUBLIC);
+        }
+
+        return $pages->get();
+    }
+
    /**
     * Prepare Content object to be rendered using Blade template
     *
     * @param Content $content
+     *
+     * @return array
     */
    public static function beforeRender(Content & $content)
    {
        if ($content->is_homepage) {
-            $pageIds = (array)json_decode(Settings::get(self::HOMEPAGE_PAGES_SETTINGS_KEY, '[]'));
-
-            if (empty($pageIds)) {
-                return [];
-            }
-
-            // get all available pages
-            $pages = Content::whereIn('id', $pageIds);
-
-            if (Auth::user()) {
-                $pages = $pages->where('status', '!=', Content::STATUS_DRAFT);
-            } else {
-                $pages = $pages->where('status', Content::STATUS_PUBLIC);
-            }
-
-            $pages = $pages->get();
+            $pages = self::getPagesOnHomepage();

            // create real content from pages
            $pagesRaw = $pagesInTemplates = [];
@@ -2,6 +2,7 @@
 namespace Templates\Base\OnePage\Providers;

 use Illuminate\Support\ServiceProvider;
+use Templates\Base\OnePage\Widgets\OnePageMenu\OnePageMenu;

 class OnePageTemplate extends ServiceProvider
 {
@@ -11,20 +12,46 @@ class OnePageTemplate extends ServiceProvider
     * @return void
     */
    public function register()
-    {
+    {        $this->registerTranslations();
    }

    public function boot()
    {
-        // register translations
-        $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'template');
-
-        // load views
-        $this->loadViewsFrom(array_merge(array_map(function ($path) {
-            return $path;
-        }, \Config::get('view.paths')), [__DIR__ . '/../Resources/views']), 'template');
+        $this->registerViews();
+        $this->registerWidgets();

        // register event service provider for this template
        $this->app->register(EventProvider::class);
    }
+
+    /**
+     * Register translations used in this base template
+     */
+    private function registerTranslations()
+    {
+        // register translations
+        $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'template');
+    }
+
+    /**
+     * Register views used in this template - both visitor's and admin's
+     */
+    private function registerViews()
+    {
+        // load views
+        $this->loadViewsFrom(array_merge(array_map(function ($path) {
+            return $path;
+        }, \Config::get('view.paths')), [__DIR__ . '/../Resources/views']), 'template');
+    }
+
+    /**
+     * Register all widgets related to this template
+     */
+    private function registerWidgets()
+    {
+        $registrator = $this->app->make('registerWidget');
+
+        // register all available widgets
+        $registrator->register(OnePageMenu::class);
+    }
 }
@@ -0,0 +1,12 @@
+<?php
+return [
+    'name'        => 'One page menu',
+    'description' => 'Simple menu used for one page templates. This menu navigates using nachor links on page. Links are generated automatically using list of pages on homepage.',
+    'new'         => 'Create new menu',
+    'form'        => [
+        'name'           => 'Menu name',
+        'description'    => 'Description',
+        'containerClass' => 'HTML class for container element',
+        'save'           => 'Save',
+    ]
+];
@@ -0,0 +1,15 @@
+@extends('admin.layoutWithNavigation')
+
+@section('pageHeading', @trans('widgets/htmlCode.edit', ['name' => $widget->name]))
+
+@section('content')
+    <div class="col-lg-8">
+        @include('admin.widgets.htmlCode.form', ['action' => route('widgets.postEdit', ['id' => $widget->id])])
+    </div>
+    <div class="col-lg-4">
+        <h3>@lang('widgets/htmlCode.preview')</h3>
+
+        @widgetPreview($widget)
+    </div>
+@stop
+
@@ -0,0 +1,27 @@
+<form action="{{$action}}" method="POST">
+    {!! csrf_field() !!}
+    <label class="label-control">
+        @lang('template::widget/menu.form.name')
+    </label>
+    <input class="form-control" type="text" name="name" value="{{old('name', $widget->name)}}"
+           placeholder="@lang('template::widget/menu.form.name')" />
+
+
+    <label class="label-control">
+        @lang('template::widget/menu.form.description')
+    </label>
+    <input class="form-control" type="text" name="description" placeholder="@lang('template::widget/menu.form.description')"
+           value="{{old('description', $widget->description)}}" />
+
+
+    <label class="label-control">
+        @lang('template::widget/menu.form.containerClass')
+    </label>
+
+    <input class="form-control" type="text" name="containerClass" placeholder="@lang('template::widget/menu.form.containerClass')"
+           value="{{old('containerClass', isset($settings->containerClass) ? $settings->containerClass : '')}}" />
+
+    <button type="submit" class="btn btn-primary">
+        @lang('template::widget/menu.form.save')
+    </button>
+</form>
@@ -0,0 +1,9 @@
+@extends('admin.layoutWithNavigation')
+
+@section('pageHeading', @trans('template::widget/menu.new'))
+@section('pageDescription', @trans($type->description))
+
+@section('content')
+    @include('template::admin.widgets.onePageMenu.form', ['action' => route('widgets.postNew', ['type' => $type->id])])
+@stop
+
@@ -0,0 +1,55 @@
+<?php
+namespace Templates\Base\OnePage\Widgets\OnePageMenu;
+
+use App\Models\Widget;
+use App\Widgets\Contracts\WidgetRenderer;
+use App\Widgets\NonInstallableWidget;
+use stdClass;
+
+class OnePageMenu extends NonInstallableWidget
+{
+    /**
+     * Name getter
+     *
+     * @return string
+     */
+    public static function getName()
+    {
+        return 'template::widget/menu.name';
+    }
+
+    /**
+     * Getter for description
+     *
+     * @return string
+     */
+    public static function getDescription()
+    {
+        return 'template::widget/menu.description';
+    }
+
+    /**
+     * Getter for presenter/renderer of this widget
+     *
+     * @return WidgetRenderer
+     */
+    public static function getPresenter()
+    {
+        return Presenter::class;
+    }
+
+    /**
+     * @param Widget $widget
+     * @param stdClass          $data
+     *
+     * @return mixed
+     */
+    public static function save(Widget $widget, stdClass $data)
+    {
+        $widgetSettings = ['containerClass' => isset($data->containerClass) ? $data->containerClass : ''];
+
+        $widget->settings = json_encode($widgetSettings);
+
+        return $widget;
+    }
+}
@@ -0,0 +1,65 @@
+<?php
+namespace Templates\Base\OnePage\Widgets\OnePageMenu;
+
+use App\Models\Widget;
+use App\Models\WidgetType;
+use App\Widgets\Contracts\WidgetRenderer;
+use Templates\Base\OnePage\Handlers\OnePage;
+
+class Presenter implements WidgetRenderer
+{
+    /**
+     * @var string path to template
+     */
+    public static $template;
+
+    /**
+     * Method used for displaying widget.
+     *
+     * This method renders some HTML code for displaying.
+     *
+     * @param object $settings
+     *
+     * @return mixed
+     * @throws \ErrorException
+     */
+    public static function render($settings)
+    {
+        if (!self::$template) {
+            throw new \ErrorException('Cannot render menu without template! Please, set Presenter::$template variable before rendering.');
+        }
+
+        $pages = OnePage::getPagesOnHomepage();
+
+        return view(self::$template, ['pages' => $pages])->render();
+    }
+
+    /**
+     * Display form for creating new instance of widget
+     *
+     * @param WidgetType $type
+     *
+     * @return mixed
+     */
+    public static function renderAddForm(WidgetType $type)
+    {
+        return view('template::admin.widgets.onePageMenu.new', [
+            'type'     => $type,
+            'widget'   => new Widget(),
+            'settings' => new \stdClass()
+        ]);
+    }
+
+    /**
+     * Display form for editing already existing widget
+     *
+     * @param Widget $widget
+     *
+     * @return mixed
+     */
+    public static function renderEditForm(Widget $widget)
+    {
+        $settings = json_decode($widget->settings);
+        return view('template::admin.widgets.onePageMenu.edit', ['widget' => $widget, 'settings' => $settings]);
+    }
+}