FEATURE: cache most used SQL queries

This reverts commit 08e97fe2cb.

.env.example

@@ -1,8 +1,8 @@
-APP_ENV=testing
+APP_KEY=
-APP_DEBUG=true
+APP_ENV=
-APP_KEY=ZKZAzM23wQ6BPji6zffBjaTzZ3yW7zKQ
+APP_DEBUG=
 
-DB_HOST=localhost
+DB_HOST=
 DB_DATABASE=
 DB_USERNAME=
 DB_PASSWORD=
@@ -17,4 +17,3 @@ MAIL_PASSWORD=
 SITE_URL=/
 UPLOAD_URL=/public/uploads
 THUMBNAILS_URL=/uploads/thumbnails
-THEME=

.gitignore

@@ -1,8 +1,9 @@
 # published files from modules
-/resources/views/modules
 /public/modules
-/resources/views/vendor
 /public/assets
+/resources/views/modules
+/resources/views/visitor
+/resources/views/vendor
 
 # directories with custom templates
 **/views/**/custom/*
@@ -26,3 +27,9 @@
 
 # meta information created by installer
 .install
+/node_modules/
+/public/css/
+/public/js
+/public/fonts
+/bower_components
+.sass-cache

app/CMS/Contracts/Content/AdvancedContentModifier.php

@@ -0,0 +1,39 @@
+<?php
+namespace App\CMS\Contracts\Content;
+
+use App\Http\Requests\Request;
+use App\Models\Content\Content;
+
+interface AdvancedContentModifier {
+    /**
+     * Save module-specific values into database
+     *
+     * @param Content $content
+     * @param array $inputData
+     *
+     * @return mixed
+     */
+    public static function createNew(Content &$content, array $inputData);
+
+    /**
+     * Method used for editing existing content page.
+     *
+     * Reason why it is separated from createNew() method is simple - we need to save history of changes.
+     *
+     * @param Content $content
+     * @param $request
+     *
+     * @return mixed
+     */
+    public static function edit(Content $content, $request);
+    /**
+     * Method called right after content page is marked as deleted
+     *
+     * This method is supposed to clean after "deleted" page.
+     *
+     * @param Content $content
+     *
+     * @return mixed
+     */
+    public static function delete(Content $content);
+}

app/CMS/Contracts/Content/ContentTitles.php

@@ -0,0 +1,40 @@
+<?php
+namespace App\CMS\Contracts\Content;
+
+use App\Models\Content\Content;
+
+/**
+ * Interface ContentTitles
+ *
+ * Classes which implement this interface get the ability to rewrite default text on edit/create/overview of content
+ * page.
+ *
+ * @package App\CMS\Handlers\Contracts
+ */
+interface ContentTitles
+{
+    /**
+     * Get translated title for pages overview of given type.
+     *
+     * This value is used for rendering list of all content pages of given type in administration.
+     *
+     * @return string
+     */
+    public static function getOverviewTitle();
+
+    /**
+     * Title displayed above for for creating new content page
+     *
+     * @return string
+     */
+    public static function getCreateNewTitle();
+
+    /**
+     * Title for form displayed for editin content page
+     *
+     * @param Content $content
+     *
+     * @return mixed
+     */
+    public static function getEditTitle(Content $content);
+}

app/CMS/Contracts/Content/HistoryHandler.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Handlers\Contracts;
+namespace App\CMS\Handlers\Contracts;
 
 interface HistoryHandler
 {

app/CMS/Contracts/Interaction.php

@@ -0,0 +1,21 @@
+<?php
+namespace App\CMS\Contracts;
+
+interface Interaction {
+    /**
+     * Perform given action
+     *
+     * @param $data array input data
+     * @param $parameters array parameters
+     *
+     * @return mixed
+     */
+    public function handle($data, $parameters);
+
+    /**
+     * @param $data array input data
+     *
+     * @return array
+     */
+    public function getValidationRules($data = []);
+}

app/CMS/Contracts/Modules/AppHandler.php

@@ -0,0 +1,52 @@
+<?php
+namespace App\CMS\Contracts\Modules;
+
+use App\Http\Requests\Request;
+use App\Models\Content\Content;
+
+interface AppHandler extends BaseModuleHandler
+{
+    /**
+     * Render given module into visitor area.
+     *
+     * @param Content $content    DB model from table contents
+     * @param array   $parameters parameters used for modifications/custom settings of given model
+     *
+     * @return mixed
+     */
+    public function render(Content $content, $parameters);
+
+    public static function getHistoryHandler();
+
+    /**
+     * Getter for section names in creating/editing content resource
+     *
+     * @return mixed
+     */
+    public static function getExtendedFormSections();
+
+    /**
+     * Getter for views used in extended part of form for creating new content
+     *
+     * This method should return pairs <section, view-name>. View is returned only as name in plain text
+     *
+     * @return array of views/templates/html codes divided into section
+     */
+    public static function getExtendedFormInputsCreate();
+
+    /**
+     * Getter for extended part of form for editing existing content
+     *
+     * Basically, this method may be
+     *
+     * @return array of views/templates/html codes divided into section
+     */
+    public static function getExtendedFormInputsEdit();
+
+    /**
+     * Does this module support categories?
+     *
+     * @return boolean
+     */
+    public static function supportCategories();
+}

app/CMS/Contracts/Modules/BaseModuleHandler.php

@@ -0,0 +1,18 @@
+<?php
+namespace App\CMS\Contracts\Modules;
+
+use App\Models\User;
+
+interface BaseModuleHandler
+{
+    /**
+     * Register admin menu (or multiple ones)
+     *
+     * This cannot be in ServiceProvider because Session is started at middleware. And ServiceProvider is called before
+     * starting any middleware..
+     *
+     * @param User $user model of logged user
+     */
+    public static function registerAdminMenu(User $user);
+
+}

app/CMS/Contracts/Modules/InstallableModule.php

@@ -0,0 +1,23 @@
+<?php
+namespace App\CMS\Contracts\Modules;
+
+use App\Models\Module;
+
+interface InstallableModule {
+    /**
+     * Install module.
+     *
+     * This method is called after inserting info about module into database. It can be called only using Artisan in
+     * CLI.
+     */
+    public static function install();
+
+    /**
+     * Uninstalls module
+     *
+     * @param Module $module
+     *
+     * @return mixed
+     */
+    public static function uninstall(Module $module);
+}

app/CMS/Contracts/Modules/TemplateHandler.php

@@ -0,0 +1,54 @@
+<?php
+namespace App\CMS\Contracts\Modules;
+
+use App\Http\Requests\Request;
+use App\Models\Content\Content;
+
+/**
+ * Interface TemplateHandler
+ *
+ * Inerface used for registering template into CMS core.
+ *
+ * @package App\CMS\Handlers\Contracts
+ */
+interface TemplateHandler extends BaseModuleHandler
+{
+    /**
+     * Get list of registered templates and supported modules.
+     *
+     * Returned array is expected to be array of arrays with following items: module, namespace and templateName.
+     * Example:
+     * return [
+     *    ['module' => 'Article', 'templateName' => 'article::template.name']
+     * ];
+     *
+     * When no "namespace" is specified, value strtolower(module) is used instaed.
+     *
+     * @return array
+     */
+    public static function getPublicTemplatePaths();
+
+    /**
+     * Prepare Content object to be rendered using Blade template
+     *
+     * @param Content $content
+     */
+    public static function beforeRender(Content & $content);
+
+    /**
+     * Modify input data into format which can be understood by edit template
+     *
+     * @param Content $content
+     */
+    public static function beforePopulatingEditForm(Content & $content);
+
+    /**
+     * Slightly modify Content object before saving into database.
+     *
+     * This way we can do almost whatever we want - even in template
+     *
+     * @param Content $content
+     * @param  $request
+     */
+    public static function beforeSave(Content & $content, $request);
+}

app/CMS/Contracts/Repositories/BaseRepository.php

@@ -0,0 +1,7 @@
+<?php
+namespace App\CMS\Contracts\Repositories;
+
+interface BaseRepository {
+    public function getOne($id = null);
+    public function all();
+}

app/CMS/Contracts/Repositories/Content.php

@@ -0,0 +1,15 @@
+<?php
+namespace App\CMS\Contracts\Repositories;
+
+interface Content extends BaseRepository
+{
+    const STATUS_DRAFT = 'draft';
+    const STATUS_PROTECTED = 'protected';
+    const STATUS_PUBLIC = 'public';
+
+    public function getOverview($handler = null, $statuses = null);
+
+    public function getHomepage();
+
+    public function getByURL($url);
+}

app/CMS/Contracts/Repositories/Module.php

@@ -0,0 +1,20 @@
+<?php
+namespace App\CMS\Contracts\Repositories;
+
+use App\Models\Content\Content as ContentModel;
+use App\Models\Module as ModuleModel;
+
+interface Module extends BaseRepository
+{
+    public function getCreateContentTitle(ModuleModel $module);
+
+    public function getUpdateContentTitle(ModuleModel $module, ContentModel $content = null);
+
+    public function getOverviewTitle(ModuleModel $module);
+
+    public function getByHandler($handler);
+
+    public function call(ModuleModel $module, $method, $parameters = []);
+
+    public function callOnString($moduleHandler, $method, $parameters = []);
+}

app/CMS/Contracts/Repositories/Template.php

@@ -0,0 +1,21 @@
+<?php
+namespace App\CMS\Contracts\Repositories;
+
+use App\Models\Module as ModuleModel;
+use App\Models\Templates\Template as TemplateModel;
+
+interface Template
+{
+    const EDITED_TEMPLATES_DIRECTORY = 'custom';
+    const ASSETS_DIRECTORY = 'assets';
+    const MODULES_DIRECTORY = 'modules';
+    const TEMPLATE_SUFFIX = '.blade.php';
+    const CUSTOM_EDIT_DIRECTORY = 1;
+    const ORIGINAL_DIRECTORY = 2;
+
+    public function setModel(TemplateModel $model);
+
+    public function getPathToTemplate();
+
+    public function getForModule(ModuleModel $module);
+}

app/CMS/Contracts/Search/SearchHandler.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Handlers\Contracts;
+namespace App\CMS\Handlers\Contracts;
 
 interface SearchHandler {
     public function getId();

app/CMS/Contracts/Search/SearchPresenterHandler.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Handlers\Contracts;
+namespace App\CMS\Handlers\Contracts;
 
 interface SearchPresenterHandler
 {

app/CMS/Contracts/Widgets/AdminDashboardWidget.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Widgets\Contracts;
+namespace App\CMS\Contracts\Widgets;
 
 interface AdminDashboardWidget extends PublicWidget
 {

app/CMS/Contracts/Widgets/InstallableWidget.php

@@ -0,0 +1,17 @@
+<?php
+namespace App\CMS\Contracts\Widgets;
+
+interface InstallableWidget extends PublicWidget  {
+
+    /**
+     * Function for installing given widget
+     *
+     * @return mixed
+     */
+    public static function install();
+
+    /**
+     * Function for uninstalling widget
+     */
+    public static function uninstall();
+}

app/CMS/Contracts/Widgets/MenuExtensionHandler.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Widgets\Contracts;
+namespace App\CMS\Widgets\Contracts;
 
 interface MenuExtensionHandler {
 

app/CMS/Contracts/Widgets/PublicWidget.php

@@ -1,8 +1,8 @@
 <?php
-namespace App\Widgets\Contracts;
+namespace App\CMS\Contracts\Widgets;
 
 use App\Http\Requests\Request;
-use App\Models\Widget;
+use App\Models\Widgets\Widget;
 
 interface PublicWidget
 {
@@ -28,22 +28,11 @@ interface PublicWidget
     public static function getPresenter();
 
     /**
-     * @param Widget  $widget
+     * Get widget settings for saving into database
-     * @param \stdClass $data
      *
-     * @return mixed
+     * @param Request $request
-     */
-    public static function save(Widget $widget, \stdClass $data);
-
-    /**
-     * Function for installing given widget
      *
-     * @return mixed
+     * @return array
      */
-    public static function install();
+    public static function save(Request $request);
-
-    /**
-     * Function for uninstalling widget
-     */
-    public static function uninstall();
 }

app/CMS/Contracts/Widgets/WidgetRenderer.php

@@ -1,8 +1,8 @@
 <?php
-namespace App\Widgets\Contracts;
+namespace App\CMS\Contracts\Widgets;
 
-use App\Models\Widget;
+use App\Models\Widgets\Widget;
-use App\Models\WidgetType;
+use App\Models\Widgets\WidgetType;
 
 interface WidgetRenderer
 {
@@ -11,11 +11,11 @@ interface WidgetRenderer
      *
      * This method renders some HTML code for displaying.
      *
-     * @param object $settings
+     * @param Widget $settings
      *
      * @return mixed
      */
-    public static function render($settings);
+    public static function render(Widget $settings);
 
     /**
      * Display form for creating new instance of widget

app/CMS/Enumerations/ActionLogTypes.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Enumerations;
+namespace App\CMS\Enumerations;
 
 use App\Models\ActionLogType;
 

app/CMS/Enumerations/ActionLogTypesForLogger.php

@@ -1,7 +1,7 @@
 <?php
-namespace App\Enumerations;
+namespace App\CMS\Enumerations;
 
-use App\Models\ActionLogType;
+use App\Models\ActionLog\ActionLogType;
 
 class ActionLogTypesForLogger extends BaseEnumeration
 {

app/CMS/Enumerations/BaseEnumeration.php

@@ -1,7 +1,7 @@
 <?php
-namespace App\Enumerations;
+namespace App\CMS\Enumerations;
 
-use App\Enumerations\Exceptions\EnumerationExistsException;
+use App\CMS\Exceptions\Enumerations\EnumerationExistsException;
 
 abstract class BaseEnumeration
 {
@@ -47,7 +47,7 @@ abstract class BaseEnumeration
     public static function push($key, $translation, $overwrite = false)
     {
         // item exists and we do not want to overwrite items
-        if (!$overwrite && isset(self::$items[get_called_class()][$key])) {
+        if (!$overwrite && !is_null($key) && isset(self::$items[get_called_class()][$key])) {
             throw new EnumerationExistsException(get_called_class() . ': ' . $key . ' already in ' . $translation);
         }
 

app/CMS/Enumerations/ContentStatuses.php

@@ -1,7 +1,8 @@
 <?php
-namespace App\Enumerations;
+namespace App\CMS\Enumerations;
 
-use App\Models\Content;
+
+use App\CMS\Contracts\Repositories\Content;
 
 class ContentStatuses extends BaseEnumeration
 {
@@ -9,7 +10,6 @@ class ContentStatuses extends BaseEnumeration
     {
         $roles = [
             Content::STATUS_DRAFT     => 'admin/contents.status_' . Content::STATUS_DRAFT,
-            Content::STATUS_DELETED   => 'admin/contents.status_' . Content::STATUS_DELETED,
             Content::STATUS_PROTECTED => 'admin/contents.status_' . Content::STATUS_PROTECTED,
             Content::STATUS_PUBLIC    => 'admin/contents.status_' . Content::STATUS_PUBLIC
         ];

app/CMS/Enumerations/ModuleNamesWithIds.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Enumerations;
+namespace App\CMS\Enumerations;
 
 use App\Models\Module;
 

app/CMS/Enumerations/Modules.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Enumerations;
+namespace App\CMS\Enumerations;
 
 use App\Models\Module;
 

app/CMS/Enumerations/ModulesHandlerToId.php

@@ -1,7 +1,8 @@
 <?php
-namespace App\Enumerations;
+namespace App\CMS\Enumerations;
 
 use App\Models\Module;
+use Illuminate\Support\Facades\Cache;
 
 class ModulesHandlerToId extends BaseEnumeration
 {
@@ -12,7 +13,9 @@ class ModulesHandlerToId extends BaseEnumeration
      */
     protected static function init()
     {
-        $modules = Module::all(['handler', 'id']);
+        $modules = Cache::rememberForever('module-handler-to-id-enumeration', function () {
+            return Module::all(['handler', 'id']);
+        });
 
         foreach ($modules as $module) {
             self::push($module->handler, $module->id);

app/CMS/Enumerations/TemplatePaths.php

@@ -6,9 +6,9 @@
  * Time: 10:33
  */
 
-namespace App\Enumerations;
+namespace App\CMS\Enumerations;
 
-use App\Models\TemplatePath;
+use App\Models\Templates\TemplatePath;
 
 class TemplatePaths extends BaseEnumeration
 {

app/CMS/Enumerations/TemplatePathsHumanReadable.php

@@ -6,9 +6,9 @@
  * Time: 10:33
  */
 
-namespace App\Enumerations;
+namespace App\CMS\Enumerations;
 
-use App\Models\TemplatePath;
+use App\Models\Templates\TemplatePath;
 
 class TemplatePathsHumanReadable extends BaseEnumeration
 {

app/CMS/Enumerations/TemplatePathsHumanReadableRootOnly.php

@@ -6,9 +6,9 @@
  * Time: 10:33
  */
 
-namespace App\Enumerations;
+namespace App\CMS\Enumerations;
 
-use App\Models\TemplatePath;
+use App\Models\Templates\TemplatePath;
 
 class TemplatePathsHumanReadableRootOnly extends BaseEnumeration
 {

app/CMS/Enumerations/Templates.php

@@ -6,9 +6,9 @@
  * Time: 15:50
  */
 
-namespace App\Enumerations;
+namespace App\CMS\Enumerations;
 
-use App\Models\Template;
+use App\Models\Templates\Template;
 
 class Templates extends BaseEnumeration
 {

app/CMS/Enumerations/UserRoles.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Enumerations;
+namespace App\CMS\Enumerations;
 
 use App\Models\User;
 

app/CMS/Enumerations/UserStates.php

@@ -6,7 +6,7 @@
  * Time: 23:20
  */
 
-namespace App\Enumerations;
+namespace App\CMS\Enumerations;
 
 use App\Models\User;
 
@@ -15,7 +15,6 @@ class UserStates extends BaseEnumeration
     public static function init()
     {
         $items = [
-            User::STATE_DELETED => 'admin/userManagement.status_' . User::STATE_DELETED,
             User::STATE_BLOCKED => 'admin/userManagement.status_' . User::STATE_BLOCKED,
             User::STATE_ACTIVE  => 'admin/userManagement.status_' . User::STATE_ACTIVE
         ];

app/CMS/Enumerations/WidgetTypes.php

@@ -1,7 +1,7 @@
 <?php
-namespace App\Enumerations;
+namespace App\CMS\Enumerations;
 
-use App\Models\WidgetType;
+use App\Models\Widgets\WidgetType;
 
 class WidgetTypes extends BaseEnumeration
 {

app/CMS/Enumerations/WidgetTypesWithHandlers.php

@@ -1,7 +1,7 @@
 <?php
-namespace App\Enumerations;
+namespace App\CMS\Enumerations;
 
-use App\Models\WidgetType;
+use App\Models\Widgets\WidgetType;
 
 class WidgetTypesWithHandlers extends BaseEnumeration
 {

app/CMS/Exceptions/Enumerations/EnumerationExistsException.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Enumerations\Exceptions;
+namespace App\CMS\Exceptions\Enumerations;
 
 class EnumerationExistsException extends \Exception {
 

app/CMS/Exceptions/FileManager/SubdirectoryExistsInDirectory.php

@@ -0,0 +1,6 @@
+<?php
+namespace App\CMS\Exceptions\FileManager;
+
+class SubdirectoryExistsInDirectory extends \Exception
+{
+}

app/CMS/Exceptions/Validation/ValidationFailedException.php

@@ -0,0 +1,19 @@
+<?php
+namespace App\CMS\Exceptions\Validation;
+
+use Exception;
+
+class ValidationFailedException extends \Exception {
+    protected $validator;
+
+    public function __construct($validator, $message = null, $code = null, Exception $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+
+        $this->validator = $validator;
+    }
+
+    public function getValidator(){
+        return $this->validator;
+    }
+}

app/CMS/Exceptions/Widgets/MissingParameterException.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Widgets\Exceptions;
+namespace App\CMS\Widgets\Exceptions;
 
 use Exception;
 

app/CMS/Exceptions/Widgets/WidgetExistsException.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Widgets\Exceptions;
+namespace App\CMS\Widgets\Exceptions;
 
 use Exception;
 

app/CMS/Handlers/BaseHandler.php

@@ -0,0 +1,110 @@
+<?php
+namespace App\CMS\Handlers;
+
+use App\CMS\Contracts\Modules\BaseModuleHandler;
+use App\CMS\Enumerations\TemplatePathsHumanReadableRootOnly;
+use App\CMS\Enumerations\WidgetTypes;
+use App\Models\User;
+
+abstract class BaseHandler implements BaseModuleHandler
+{
+    /**
+     * Register admin menu (or multiple ones)
+     *
+     * This cannot be in ServiceProvider because Session is started at middleware. And ServiceProvider is called before
+     * starting any middleware..
+     *
+     * @param User $user model of logged user
+     */
+    public static function registerAdminMenu(User $user)
+    {
+        $menu = \Menu::instance('mainMenu');
+        if (!is_null($menu)) {
+            // menus were already defined
+            return;
+        }
+
+        // create instance of main menu
+        \Menu::create('mainMenu', function ($menu) {
+            //            $menu->route('admin.dashboard', trans('admin/mainMenu.dashboard'), [], 10, ['icon' => 'fa fa-fw fa-dashboard']);
+
+            /**
+             * Content pages
+             *
+             * Submenus can be registered later
+             */
+            $menu->dropdown(trans('admin/mainMenu.contentPages'), function ($sub) {
+                $sub->route('content.overview', trans('admin/mainMenu.contentPageOverview'), [], 10000, ['icon' => 'fa fa-fw fa-list']);
+            }, 20, ['icon' => 'fa fa-fw fa-database']);
+
+            /**
+             * File manager
+             */
+            $menu->route('upload.overview', trans('admin/mainMenu.fileManager'), [], 40, ['icon' => 'fa fa-fw fa-folder']);
+
+            /**
+             * Widgets and widget areas
+             */
+            $menu->dropdown(trans('admin/mainMenu.widgets'), function ($sub) {
+                // create list of all widget types
+                $widgets = WidgetTypes::getWithTranslations();
+
+                if (!empty($widgets)) {
+                    $sub->dropdown(trans('admin/mainMenu.newWidget'), function ($sub) use ($widgets) {
+                        $i = 1;
+                        foreach ($widgets as $type => $name) {
+                            $sub->route('widgets.new', $name, ['type' => $type], $i++);
+                        }
+                    }, 10, ['icon' => 'fa fa-fw fa-plus']);
+                }
+
+                $sub->route('widgets.overview', trans('admin/mainMenu.widgetsOverview'), [], 20, ['icon' => 'fa fa-fw fa-list']);
+
+                // menu for widget areas
+                $sub->dropdown(trans('admin/mainMenu.widgetAreas'), function ($sub) {
+                    $sub->route('widgetareas.new', trans('admin/mainMenu.newWidgetArea'), [], 1, ['icon' => 'fa fa-fw fa-plus']);
+                    $sub->route('widgetareas.overview', trans('admin/mainMenu.widgetAreaOverview'), [], 2, ['icon' => 'fa fa-fw fa-list']);
+                }, 50, ['icon' => 'fa fa-fw fa-object-group']);
+            }, 50, ['icon' => 'fa fa-fw fa-puzzle-piece']);
+
+            /**
+             * Divide system entries and other links in menu
+             */
+            $menu->addDivider(9999);
+
+            $menu->dropdown(trans('admin/mainMenu.system'), function ($sub) {
+
+                /**
+                 * User management
+                 */
+                $sub->dropdown(trans('admin/mainMenu.userManagement'), function ($sub) {
+                    $sub->route('users.new', trans('admin/mainMenu.newUser'), [], 10, ['icon' => 'fa fa-fw fa-user-plus']);
+                    $sub->route('users.overview', trans('admin/mainMenu.usersOverview'), [], 30, ['icon' => 'fa fa-fw fa-users']);
+                }, 20, ['icon' => 'fa fa-fw fa-users']);
+
+                /**
+                 * Templates
+                 */
+                $templatePaths = TemplatePathsHumanReadableRootOnly::getWithTranslations();
+                if (!empty($templatePaths)) {
+                    $sub->dropdown(trans('admin/mainMenu.templates'), function ($sub) use ($templatePaths) {
+                        $i = 1;
+                        foreach ($templatePaths as $id => $name) {
+                            $sub->route('templates.overview', $name, ['id' => $id], $i++);
+                        }
+                    }, 60, ['icon' => 'fa fa-fw fa-file-code-o']);
+                }
+
+                $sub->route('log.overview', trans('admin/mainMenu.actionLog'), [], 70, ['icon' => 'fa fa-fw fa-history']);
+                $sub->route('settings.overview', trans('admin/mainMenu.settings'), [], 80, ['icon' => 'fa fa-fw fa-gear']);
+            }, 10000, ['icon' => 'fa fa-fw fa-gears']);
+        });
+
+        // create menu with user profile
+        \Menu::create('profileMenu', function ($menu) {
+            $menu->route('users.detail', trans('admin/userManagement.profile'), [], 10, ['icon' => 'fa fa-fw fa-user icon']);
+            $menu->addDivider(999);
+            $menu->route('logout', trans('admin/common.logout'), [], 1000, ['icon' => 'fa fa-fw fa-power-off icon']);
+        });
+    }
+}

app/CMS/Handlers/Handler.php

@@ -0,0 +1,62 @@
+<?php
+namespace App\CMS\Handlers;
+
+use App\CMS\Contracts\Modules\AppHandler;
+use App\Http\Controllers\Controller;
+use App\Models\Content\Content;
+
+/**
+ * Class Handler
+ *
+ * Handler is a class which handles module-specific behaviour which cannot be done by module itself, resp. cannot be
+ * done by some abstract magic.
+ *
+ * @package App\CMS\Handlers\
+ */
+abstract class Handler extends BaseHandler implements AppHandler
+{
+    public static function getHistoryHandler()
+    {
+        return History::class;
+    }
+
+    /**
+     * Render given module into visitor area.
+     *
+     * @param Content $content    DB model from table contents
+     * @param array   $parameters parameters used for modifications/custom settings of given model
+     *
+     * @return mixed
+     */
+    public function render(Content $content, $parameters)
+    {
+        return Controller::VisitorsView($content->template, ['page' => $content, 'extra' => $parameters]);
+    }
+
+    public static function getExtendedFormSections()
+    {
+        return [
+            'basicInfo'   => trans('admin/contents.basicInfo'),
+            'meta'        => trans('admin/contents.metaOptions'),
+            'publication' => trans('admin/contents.publicationOptions'),
+            'appearance'  => trans('admin/contents.appearance'),
+            'files'       => trans('admin/contents.files')
+        ];
+    }
+
+    public static function getExtendedFormInputsCreate()
+    {
+        return [
+            'basicInfo'   => 'admin.content.formParts.basicInformation',
+            'meta'        => 'admin.content.formParts.metaInformation',
+            'publication' => 'admin.content.formParts.publicationSetup',
+            'appearance'  => 'admin.content.formParts.appearance',
+            'files'       => 'admin.content.formParts.files'
+        ];
+    }
+    
+    public static function getExtendedFormInputsEdit()
+    {
+        return self::getExtendedFormInputsCreate();
+    }
+}

app/CMS/Handlers/History.php

@@ -1,9 +1,9 @@
 <?php
-namespace App\Handlers;
+namespace App\CMS\Handlers;
 
-use App\Enumerations\ContentStatuses;
+use App\CMS\Enumerations\ContentStatuses;
-use App\Handlers\Contracts\HistoryHandler;
+use App\CMS\Handlers\Contracts\HistoryHandler;
-use App\Helpers\Differ;
+use App\CMS\Helpers\Differ;
 
 class History implements HistoryHandler
 {
@@ -25,6 +25,15 @@ class History implements HistoryHandler
                 break;
             case 'metaDescription':
                 return Differ::htmlDiff($changeset->old_value, $changeset->new_value);
+                break;
+            case 'file':
+                if (!$changeset->old_value) {
+                    // old value is null -> new file was uploaded
+                    return trans('admin/history.uploadedFile', ['file' => $changeset->new_value]);
+                } else {
+                    return trans('admin/history.deletedFile', ['file' => $changeset->old_value]);
+                }
+
                 break;
             case 'status':
                 $statuses = ContentStatuses::getWithTranslations();
@@ -34,7 +43,7 @@ class History implements HistoryHandler
                     'to'   => $statuses[$changeset->new_value]
                 ]);
                 break;
-            case 'is_homepage':
+            case 'isHomepage':
                 return trans('admin/history.setupAsHomepage');
                 break;
             default:

app/CMS/Handlers/Interaction.php

@@ -0,0 +1,39 @@
+<?php
+namespace App\Cms\Handlers\Interactions;
+
+use App\CMS\Contracts\Interaction as InteractionContract;
+use App\CMS\Exceptions\Validation\ValidationFailedException;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Validator;
+
+class Interaction
+{
+    /**
+     * Handle interaction with application
+     *
+     * @param string $interactionClass
+     * @param array  $data
+     * @param array  $extraParameters
+     *
+     * @return mixed
+     * @throws ValidationFailedException
+     */
+    public static function handle($interactionClass, $data, ...$extraParameters)
+    {
+        /**
+         * @var $interaction InteractionContract
+         */
+
+        $interaction = app($interactionClass);
+        // validate interaction
+        $validator = Validator::make($data, $interaction->getValidationRules($extraParameters));
+
+        if ($validator->fails()) {
+            throw new ValidationFailedException($validator);
+        }
+
+        // handle it
+
+        return $interaction->handle($data, $extraParameters);
+    }
+}

app/CMS/Handlers/Registrators/Items/SettingExtension.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Handlers\Registrators\Items;
+namespace App\CMS\Handlers\Registrators\Items;
 
 class SettingExtension
 {

app/CMS/Handlers/Registrators/MenuExtensionRegistrator.php

@@ -1,7 +1,7 @@
 <?php
-namespace App\Handlers\Registrators;
+namespace App\CMS\Handlers\Registrators;
 
-use App\Widgets\Contracts\MenuExtensionHandler;
+use App\CMS\Widgets\Contracts\MenuExtensionHandler;
 
 class MenuExtensionRegistrator {
 

app/CMS/Handlers/Registrators/SearchEngineRegistrator.php

@@ -1,10 +1,10 @@
 <?php
-namespace App\Handlers\Registrators;
+namespace App\CMS\Handlers\Registrators;
 
-use App\Enumerations\Exceptions\EnumerationExistsException;
+use App\CMS\Enumerations\Exceptions\EnumerationExistsException;
-use App\Handlers\Contracts\SearchHandler;
+use App\CMS\Handlers\Contracts\SearchHandler;
-use App\Handlers\Contracts\SearchPresenterHandler;
+use App\CMS\Handlers\Contracts\SearchPresenterHandler;
-use App\Handlers\Registrators\Items\SearchEngine;
+use App\CMS\Handlers\Registrators\Items\SearchEngine;
 use Symfony\Component\Process\Exception\InvalidArgumentException;
 
 class SearchEngineRegistrator

app/CMS/Handlers/Registrators/SettingsExtensionRegistrator.php

@@ -1,8 +1,8 @@
 <?php
-namespace App\Handlers\Registrators;
+namespace App\CMS\Handlers\Registrators;
 
-use App\Enumerations\Exceptions\EnumerationExistsException;
+use App\CMS\Enumerations\Exceptions\EnumerationExistsException;
-use App\Handlers\Registrators\Items\SettingExtension;
+use App\CMS\Handlers\Registrators\Items\SettingExtension;
 
 class SettingsExtensionRegistrator
 {

app/CMS/Handlers/Registrators/TemplateRegistrator.php

@@ -1,10 +1,11 @@
 <?php
-namespace App\Handlers\Registrators;
+namespace App\CMS\Handlers\Registrators;
 
-use App\Enumerations\TemplatePaths;
+use App\CMS\Contracts\Repositories\Template;
-use App\Enumerations\Templates;
+use App\CMS\Enumerations\TemplatePaths;
-use App\Models\Template;
+use App\CMS\Enumerations\Templates;
-use App\Models\TemplatePath;
+use App\Models\Templates\Template as TemplateModel;
+use App\Models\Templates\TemplatePath;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Str;
 use Symfony\Component\Process\Exception\InvalidArgumentException;
@@ -28,6 +29,10 @@ class TemplateRegistrator
      * @var int ID of module
      */
     protected $moduleId;
+    /**
+     * @var array list of all registered template paths
+     */
+    protected $paths = [];
 
     /**
      * Set base path
@@ -64,7 +69,7 @@ class TemplateRegistrator
      */
     public function setNamespace($namespace)
     {
-        $this->namespace = $namespace . '::';
+        $this->namespace = $namespace;
     }
 
     /**
@@ -73,28 +78,52 @@ class TemplateRegistrator
     public function unsetNamespace()
     {
         $this->namespace = null;
+        $this->setModuleId(null);
     }
 
     /**
      * Registers new template path.
      * This method registeres given path itself with all subdirectories
      *
+     * @param        $baseDirectory
      * @param string $path path relatively to root of the project
      * @param string $name human readable identification of given template path
      *
      * @throws \Exception
      */
-    public function register($path, $name)
+    public function register($baseDirectory, $path, $name)
     {
-        // check if base directory was set
+        $this->paths[] = [
-        if (!$this->baseDirectory || !is_dir($this->baseDirectory)) {
+            'namespace'     => $this->namespace,
-            throw new \Exception('Set $baseDirectory before registering template path.');
+            'moduleId'      => $this->moduleId,
+            'baseDirectory' => $baseDirectory,
+            'path'          => $this->baseDirectory . DIRECTORY_SEPARATOR . $path,
+            'name'          => $name
+        ];
+        $this->unsetNamespace();
+    }
+
+    /**
+     * Save templates into database
+     */
+    public function saveTemplates()
+    {
+        if (!is_array($this->paths) || empty($this->paths)) {
+            return;
         }
 
-        $this->registeredPath = $this->baseDirectory . DIRECTORY_SEPARATOR . $path;
+        foreach ($this->paths as $path) {
+            if (!empty($path['namespace'])) {
+                $this->setNamespace($path['namespace'] . '::');
+            }
+            $this->setModuleId($path['moduleId']);
+            $this->setBaseDirectory($path['baseDirectory']);
 
-        // register path
+            $this->registeredPath = $this->baseDirectory . DIRECTORY_SEPARATOR . $path['path'];
-        $this->registerPath($this->registeredPath, $name);
+            // register path
+            $this->registerPath($this->registeredPath, $path['name']);
+            $this->unsetNamespace();
+        }
     }
 
     /**
@@ -106,7 +135,10 @@ class TemplateRegistrator
      */
     protected function relativePath($directory)
     {
-        return trim(str_replace(base_path(), '', $directory), '/');
+        $directory = str_replace('/', DIRECTORY_SEPARATOR, $directory);
+        $directory = str_replace('\\', DIRECTORY_SEPARATOR, $directory);
+
+        return trim(str_replace(base_path(), '', $directory), '\\/');
     }
 
     /**
@@ -117,6 +149,10 @@ class TemplateRegistrator
      */
     protected function scanForSubdirectories($directory, $name)
     {
+        if (!is_dir($directory)) {
+            return;
+        }
+
         $directories = File::directories($directory);
 
         foreach ($directories as $dir) {
@@ -166,7 +202,7 @@ class TemplateRegistrator
      * @param $path
      * @param $templatePathId
      *
-     * @throws \App\Enumerations\Exceptions\EnumerationExistsException
+     * @throws \App\CMS\Enumerations\Exceptions\EnumerationExistsException
      */
     protected function registerTemplates($path, $templatePathId)
     {
@@ -184,7 +220,6 @@ class TemplateRegistrator
             $registeredTemplates = Templates::getWithTranslations();
 
             if (!in_array($templateName, $registeredTemplates)) {
-
                 $params = [
                     'template_name' => $templateName,
                     'name'          => $templateName,
@@ -195,7 +230,7 @@ class TemplateRegistrator
                 ];
 
                 // save template into database
-                $newTemplate = Template::create($params);
+                $newTemplate = TemplateModel::create($params);
 
                 // push template into enumeration - so it will not be registered again
                 Templates::push($newTemplate->id, $templateName);
@@ -211,7 +246,7 @@ class TemplateRegistrator
      * @param null $parent
      *
      * @return mixed|null
-     * @throws \App\Enumerations\Exceptions\EnumerationExistsException
+     * @throws \App\CMS\Enumerations\Exceptions\EnumerationExistsException
      */
     protected function saveTemplatePath($path, $name, $parent = null)
     {
@@ -268,12 +303,17 @@ class TemplateRegistrator
      *
      * @return string
      */
-    private function getTemplateName($template)
+    protected function getTemplateName($template)
     {
-        $templateName = str_replace($this->registeredPath . DIRECTORY_SEPARATOR, '', $template);
+        $templateName = $template;
+
+        $templateName = str_replace($this->registeredPath, '', $templateName);
+        $templateName = str_replace('\\', DIRECTORY_SEPARATOR, $templateName);
+        $templateName = str_replace('/', DIRECTORY_SEPARATOR, $templateName);
         $templateName = str_replace(DIRECTORY_SEPARATOR, '.', $templateName);
         $templateName = str_replace(Template::TEMPLATE_SUFFIX, '', $templateName);
+        $templateName = preg_replace('/\.{2,}/', '.', $templateName);
 
-        return $this->namespace . $templateName;
+        return $this->namespace . trim($templateName, '.');
     }
 }

app/CMS/Handlers/Registrators/WidgetRegistrator.php

@@ -0,0 +1,59 @@
+<?php
+namespace App\CMS\Handlers\Registrators;
+
+use App\CMS\Enumerations\WidgetTypesWithHandlers;
+use App\Models\Widgets\WidgetType;
+
+class WidgetRegistrator
+{
+    protected $registeredWidgets = [];
+
+    /**
+     * Method used for registering new widgets
+     *
+     * @param      $classname
+     * @param null $templateId
+     * @param null $moduleId
+     */
+    public function register($classname, $templateId = null, $moduleId = null)
+    {
+        $this->registeredWidgets[] = [
+            'class'      => $classname,
+            'templateId' => $templateId,
+            'moduleId'   => $moduleId
+        ];
+    }
+
+    /**
+     * Install all non-installed widgets
+     */
+    public function installWidgets()
+    {
+        $installed = WidgetTypesWithHandlers::getSimple();
+        foreach ($this->registeredWidgets as $registeredWidget) {
+            $classname = $registeredWidget['class'];
+            $templateId = $registeredWidget['templateId'];
+            $moduleId = $registeredWidget['moduleId'];
+
+            // register widget as new widget type
+            if (!in_array($classname, $installed)) {
+                $widgetName = call_user_func($classname . '::getName');
+                $widgetDescription = call_user_func($classname . '::getDescription');
+
+                // create row in widget types
+                WidgetType::create([
+                                       'handler'     => $classname,
+                                       'name'        => $widgetName,
+                                       'module_id'   => $moduleId,
+                                       'template_id' => $templateId,
+                                       'description' => $widgetDescription
+                                   ]);
+
+                // install widget (if neccessary)
+                if (is_callable([$classname, 'install'])) {
+                    call_user_func($classname . '::install');
+                }
+            }
+        }
+    }
+}

app/CMS/Handlers/Search/Content.php

@@ -1,7 +1,7 @@
 <?php
-namespace App\Handlers\Search;
+namespace App\CMS\Handlers\Search;
 
-use App\Models\Content as ContentModel;
+use App\Models\Content\Content as ContentModel;
 
 class Content extends Search
 {
@@ -16,9 +16,9 @@ class Content extends Search
     {
         $token = $this->tokenize($term);
 
-        return ContentModel::where('content', 'LIKE', $token)
+        return ContentModel::where('pageContent', 'LIKE', $token)
-                           ->orWhere('meta_description', 'LIKE', $token)
+                           ->orWhere('metaDescription', 'LIKE', $token)
-                           ->orWhere('meta_keywords', 'LIKE', $token)
+                           ->orWhere('metaKeywords', 'LIKE', $token)
                            ->orWhere('title', 'LIKE', $token)
                            ->orWhere('url', 'LIKE', $token)
                            ->get();

app/CMS/Handlers/Search/Files.php

@@ -1,7 +1,7 @@
 <?php
-namespace App\Handlers\Search;
+namespace App\CMS\Handlers\Search;
 
-use App\Models\File;
+use App\Models\FileManager\File;
 
 class Files extends Search
 {
@@ -27,6 +27,7 @@ class Files extends Search
         $token = $this->tokenize($term);
 
         return File::where('original_filename', 'LIKE', $token)
+                   ->orWhere('name', 'LIKE', $token)
                    ->orWhere('keywords', 'LIKE', $token)
                    ->orWhere('description', 'LIKE', $token)
                    ->orWhere('mime_type', 'LIKE', $token)

app/CMS/Handlers/Search/Presenters/AdminContent.php

@@ -0,0 +1,16 @@
+<?php
+namespace App\CMS\Handlers\Search\Presenters;
+
+use App\CMS\Enumerations\ContentStatuses;
+use App\CMS\Handlers\Contracts\SearchPresenterHandler;
+
+class AdminContent implements SearchPresenterHandler
+{
+    public function render($foundItems)
+    {
+        return view('admin.search.results.content', [
+            'pages'    => $foundItems,
+            'statuses' => ContentStatuses::getWithTranslations(),
+        ]);
+    }
+}

app/CMS/Handlers/Search/Presenters/AdminFiles.php

@@ -1,7 +1,7 @@
 <?php
-namespace App\Handlers\Search\Presenters;
+namespace App\CMS\Handlers\Search\Presenters;
 
-use App\Handlers\Contracts\SearchPresenterHandler;
+use App\CMS\Handlers\Contracts\SearchPresenterHandler;
 
 class AdminFiles implements SearchPresenterHandler
 {
@@ -14,6 +14,6 @@ class AdminFiles implements SearchPresenterHandler
      */
     public function render($foundItems)
     {
-        return view('admin.fileManager.filesTiles', ['files' => $foundItems]);
+        return view('admin.fileManager.filesTiles', ['files' => $foundItems, 'hideDelete' => true]);
     }
 }

app/CMS/Handlers/Search/Search.php

@@ -1,7 +1,7 @@
 <?php
-namespace App\Handlers\Search;
+namespace App\CMS\Handlers\Search;
 
-use App\Handlers\Contracts\SearchHandler;
+use App\CMS\Handlers\Contracts\SearchHandler;
 use Symfony\Component\Process\Exception\InvalidArgumentException;
 
 abstract class Search implements SearchHandler

app/CMS/Helpers/CurrentTemplate.php

@@ -0,0 +1,132 @@
+<?php
+namespace App\CMS\Helpers;
+
+use App\CMS\Contracts\Modules\TemplateHandler;
+use App\Models\Content\Content;
+use App\Models\Module;
+use App\Models\User;
+use Illuminate\Database\QueryException;
+use Illuminate\Support\Facades\Cache;
+
+class CurrentTemplate implements TemplateHandler
+{
+    protected static $template;
+    protected static $initialized = false;
+
+    /**
+     * Getter for currently set template
+     * @return Module
+     * @throws \ErrorException
+     */
+    public static function get()
+    {
+        if (!self::$initialized) {
+                self::$template = Cache::rememberForever('current-template', function () {
+                    $template = Module::where('is_template', true)
+                          ->where('enabled', true)
+                          ->first();
+
+                    // todo remove after adding $casts into Module model
+                    if ($template) {
+                        $template->module_settings = json_decode($template->module_settings);
+                    }
+
+                    return $template;
+                });
+
+
+            self::$initialized = true;
+        }
+
+        return self::$template;
+    }
+
+    /**
+     * Shortcut for getting template handler
+     *
+     * @return string
+     * @throws \ErrorException
+     */
+    public static function handler()
+    {
+        $template = self::get();
+
+        if (!$template) {
+            throw new \ErrorException('No template selected, no handler available!');
+        }
+
+        return $template->handler;
+    }
+
+    /**
+     * Reset currently set template and load another one on next call of get() method.
+     */
+    public static function reset()
+    {
+        self::$initialized = false;
+    }
+
+    /**
+     * Register admin menu (or multiple ones)
+     *
+     * This cannot be in ServiceProvider because Session is started at middleware. And ServiceProvider is called before
+     * starting any middleware..
+     *
+     * @param User $user model of logged user
+     */
+    public static function registerAdminMenu(User $user)
+    {
+        call_user_func_array([self::handler(), 'registerAdminMenu'], [$user]);
+    }
+
+    /**
+     * Get list of registered templates and supported modules.
+     *
+     * Returned array is expected to be array of arrays with following items: module, namespace and templateName.
+     * Example:
+     * return [
+     *    ['module' => 'Article', 'templateName' => 'article::template.name']
+     * ];
+     *
+     * When no "namespace" is specified, value strtolower(module) is used instaed.
+     *
+     * @return array
+     */
+    public static function getPublicTemplatePaths()
+    {
+        return call_user_func([self::handler(), 'getPublicTemplatePaths']);
+    }
+
+    /**
+     * Prepare Content object to be rendered using Blade template
+     *
+     * @param Content $content
+     */
+    public static function beforeRender(Content & $content)
+    {
+        call_user_func_array([self::handler(), 'beforeRender'], [&$content]);
+    }
+
+    /**
+     * Modify input data into format which can be understood by edit template
+     *
+     * @param Content $content
+     */
+    public static function beforePopulatingEditForm(Content & $content)
+    {
+        call_user_func_array([self::handler(), 'beforePopulatingEditForm'], [&$content]);
+    }
+
+    /**
+     * Slightly modify Content object before saving into database.
+     *
+     * This way we can do almost whatever we want - even in template
+     *
+     * @param Content $content
+     * @param         $request
+     */
+    public static function beforeSave(Content & $content, $request)
+    {
+        call_user_func_array([self::handler(), 'beforeSave'], [&$content, $request]);
+    }
+}

app/CMS/Helpers/Date.php

@@ -0,0 +1,64 @@
+<?php
+namespace App\CMS\Helpers;
+
+class Date
+{
+    /**
+     * Print date in configured format
+     *
+     * @param      $datestamp
+     * @param bool $withTime
+     *
+     * @return false|string
+     */
+    public static function date($datestamp, $withTime = true)
+    {
+        $timestamp = strtotime($datestamp);
+
+        if ($timestamp <= 0) {
+            return '';
+        }
+
+        $format = $withTime ? config('app.datetime_format') : config('app.date_format');
+
+        return date($format, $timestamp);
+    }
+
+    public static function dateFormatted($format, $datestamp)
+    {
+        $timestamp = strtotime($datestamp);
+
+        if ($timestamp <= 0) {
+            return '';
+        }
+
+        return date($format, $timestamp);
+    }
+
+    public static function monthName($datestamp) {
+        $timestamp = strtotime($datestamp);
+
+        if ($timestamp <= 0) {
+            return '';
+        }
+
+        $months = [
+            trans('common.months.january'),
+            trans('common.months.february'),
+            trans('common.months.march'),
+            trans('common.months.april'),
+            trans('common.months.may'),
+            trans('common.months.june'),
+            trans('common.months.july'),
+            trans('common.months.august'),
+            trans('common.months.semptember'),
+            trans('common.months.october'),
+            trans('common.months.november'),
+            trans('common.months.december'),
+        ];
+
+        $monthNumber = date('n', $timestamp);
+
+        return $months[$monthNumber - 1];
+    }
+}

app/CMS/Helpers/Differ.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Helpers;
+namespace App\CMS\Helpers;
 
 /*
     Paul's Simple Differ Algorithm v 0.1

app/CMS/Helpers/FileManager.php

@@ -1,7 +1,7 @@
 <?php
-namespace App\Helpers;
+namespace App\CMS\Helpers;
 
-use App\Models\File;
+use App\Models\FileManager\File;
 
 class FileManager
 {
@@ -17,34 +17,42 @@ class FileManager
         switch ($type) {
             case 'image':
 
-                // try to check if file have thumbnail
+               $url = Path::thumbnail($file->filename);
-                if (file_exists(config('app.thumbnail_url') . '/' . $file->filename)) {
-                    $url = config('app.thumbnail_url') . '/' . $file->filename;
-                } else {
-                    $url = config('app.upload_url') . '/' . $file->filename;
-                }
 
                 return '<img src="' . $url . '" alt="' . $file->description . '" />';
                 break;
             case 'text':
-                return '<i class="fa fa-file-text-o"></i>';
+                return self::getIcon($file, 'fa-file-text-o');
                 break;
             case 'application':
                 switch ($subtype) {
                     case 'pdf':
-                        return '<i class="fa fa-file-pdf-o"></i>';
+                        return self::getIcon($file, 'fa-file-pdf-o');
                         break;
                     default:
-                        return '<i class="fa fa-newspaper-o"></i>';
+                        return self::getIcon($file, 'fa-newspaper-o');
                         break;
                 }
                 break;
             default:
-                return '<i class="fa fa-question"></i>';
+                return self::getIcon($file, 'fa-question');
                 break;
         }
     }
 
+    /**
+     * Shortcut for displaying icons
+     *
+     * @param $file
+     * @param $icon
+     *
+     * @return string
+     */
+    protected static function getIcon($file, $icon)
+    {
+        return '<p><i class="fa fa-2x ' . $icon . '"></i><br /><span>' . e(str_limit($file->original_filename, 15)) . '</span></p>';
+    }
+
     /**
      *
      *
@@ -83,7 +91,6 @@ class FileManager
                 return '<img src="' . $url . '" alt="' . $file->description . '" />';
                 break;
             case 'text':
-
                 $string = '<pre><code>';
                 $string .= htmlspecialchars(file_get_contents($path));
                 $string .= '</pre></code>';
@@ -91,15 +98,8 @@ class FileManager
                 return $string;
                 break;
             case 'application':
-                switch ($subtype) {
+                return '<iframe src = "'.asset('resources/assets/admin/js/viewerJs/').'/#'.Path::upload($file->filename).'" style="width: 100%; height: 50em" allowfullscreen webkitallowfullscreen></iframe>';
-                    case 'pdf':
+            break;
-                        return '<i class="fa fa-file-pdf-o"></i>';
-                        break;
-                    default:
-                        return '<i class="fa fa-newspaper-o"></i>';
-                        break;
-                }
-                break;
             default:
                 return self::getPreview($file);
                 break;
@@ -119,19 +119,12 @@ class FileManager
 
         switch ($type) {
             case 'text':
-
+                return [trans('admin/fileManager.encoding') => mb_detect_encoding(file_get_contents($path))];
-                return [
-                    trans('admin/fileManager.encoding') => mb_detect_encoding(file_get_contents($path))
-                ];
                 break;
 
             case 'image':
                 list ($width, $height) = getimagesize($path);
-
+                return [trans('admin/fileManager.resolution') => $height . ' x ' . $width,];
-                return [
-                    trans('admin/fileManager.resolution') => $height . ' x ' . $width,
-                ];
-
                 break;
         }
 

app/CMS/Helpers/Gravatar.php

@@ -0,0 +1,10 @@
+<?php
+namespace App\CMS\Helpers;
+
+class Gravatar
+{
+    public static function img($email, $size = 50)
+    {
+        return "//www.gravatar.com/avatar/" . md5(strtolower(trim($email))) . "?s=" . $size;
+    }
+}

app/CMS/Helpers/PageRenderer.php

@@ -0,0 +1,40 @@
+<?php
+namespace App\CMS\Helpers;
+
+use App\CMS\Handlers\Contracts\AppHandler;
+use App\Models\Content\Content;
+use Webwizo\Shortcodes\Facades\Shortcode;
+
+/**
+ * Class PageRenderer
+ *
+ * Simple class for rendering page for visitor
+ *
+ * @package App\CMS\Helpers
+ */
+class PageRenderer
+{
+    /**
+     * Render page
+     *
+     * @param Content $page
+     *
+     * @return mixed
+     */
+    public static function render(Content $page)
+    {
+        // do something template-specific
+        $parameters = call_user_func_array([CurrentTemplate::handler(), 'beforeRender'], [&$page]);
+
+        /**
+         * @var $handler AppHandler
+         */
+        // get handler
+        $handler = new $page->moduleHandler;
+
+        $page->content = Shortcode::compile($page->content);
+
+        // render page
+        return $handler->render($page, $parameters);
+    }
+}

app/CMS/Helpers/Path.php

@@ -1,46 +1,11 @@
 <?php
-namespace App\Helpers;
+namespace App\CMS\Helpers;
 
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Process\Exception\InvalidArgumentException;
 
-class Template
+class Path
 {
-    /**
-     * Getter for real template name
-     *
-     * @param $template
-     *
-     * @return null|string
-     */
-    public static function name($template)
-    {
-        $namespace = null;
-        if (strpos($template, '::')) {
-            list($namespace, $template) = explode('::', $template);
-            $namespace .= '::';
-        }
-
-        $theme = config('app.theme');
-
-        // list of prefixes
-        $prefixes = [$theme . '.custom.', $theme . '.', ''];
-
-        $view = null;
-        foreach ($prefixes as $prefix) {
-            if (view()->exists($namespace . 'visitor.' . $prefix . $template)) {
-                $view = $namespace . 'visitor.' . $prefix . $template;
-                break;
-            }
-        }
-
-        if (is_null($view)) {
-            throw new InvalidArgumentException('Cannot find template for ' . $namespace . $template);
-        }
-
-        return $view;
-    }
-
     /**
      * Get URL to uploaded file
      *
@@ -59,6 +24,25 @@ class Template
         return config('app.upload_url') . '/' . $filename;
     }
 
+    public static function thumbnail($filename)
+    {
+        // try to check if file have thumbnail
+        if (file_exists(config('app.thumbnail_path') . '/' . $filename)) {
+            $url = config('app.thumbnail_url') . '/' . $filename;
+        } else {
+            $url = self::upload($filename);
+        }
+
+        return $url;
+    }
+
+    /**
+     * Get path to given asset
+     *
+     * @param $path
+     *
+     * @return string
+     */
     public static function asset($path)
     {
         if (env('APP_DEBUG')) {

app/CMS/Helpers/RootDirectory.php

@@ -0,0 +1,49 @@
+<?php
+namespace App\CMS\Helpers;
+
+use App\Models\FileManager\Directory;
+use App\Models\FileManager\File;
+
+class RootDirectory
+{
+    protected static $directory;
+
+    /**
+     * Create root directory
+     *
+     * @return Directory
+     */
+    protected static function create()
+    {
+        $directory = new Directory();
+        $directory->name = 'Root';
+        $directory->is_root = true;
+        $directory->save();
+
+        Directory::whereNull('parent_id')
+                 ->where('is_root', false)
+                 ->update(['parent_id' => $directory->id]);
+
+        File::where('directory_id', null)
+            ->update(['directory_id' => $directory->id]);
+
+        return $directory;
+    }
+
+    /**
+     * Get root directory
+     *
+     * @return Directory
+     */
+    public static function get()
+    {
+        self::$directory = Directory::where('is_root', true)
+                                    ->first();
+
+        if (is_null(self::$directory)) {
+            self::$directory = self::create();
+        }
+
+        return self::$directory;
+    }
+}

app/CMS/Helpers/Settings.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace App\CMS\Helpers;
+
+use App\Models\Settings as SettingsModel;
+use Illuminate\Support\Facades\Cache;
+
+/**
+ * Class Settings
+ *
+ * Helper class for easier obtaining system settings
+ *
+ * @package App\CMS\Helpers
+ */
+class Settings
+{
+    /**
+     * @var array List of all used settings
+     */
+    protected static $settings;
+    /**
+     * @var bool Are data already initialized?
+     */
+    protected static $initialized = false;
+
+    /**
+     * Getter for settings determined with key.
+     *
+     * @param string      $key     settings key
+     * @param string|null $default default value, which will be returned when given key does not exist
+     *
+     * @param null        $exists
+     *
+     * @return null|string
+     */
+    public static function get($key, $default = null, & $exists = null)
+    {
+        self::init();
+
+        if (isset(self::$settings->$key)) {
+            $exists = true;
+            self::$initialized = true;
+            return self::$settings->$key;
+        }
+
+        $exists = false;
+        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
+     *
+     * @return array
+     */
+    public static function all()
+    {
+        self::init();
+
+        return self::$settings;
+    }
+
+    /**
+     * Initialize settings array
+     */
+    private static function init()
+    {
+        if (!self::$initialized) {
+            self::$settings = Cache::remember('settings', config('cache.settingCacheLifetime'), function () {
+                $model = new SettingsModel();
+                return $model->getAll();
+            });
+        }
+    }
+}

app/CMS/Helpers/Template.php

@@ -0,0 +1,49 @@
+<?php
+namespace App\CMS\Helpers;
+
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Process\Exception\InvalidArgumentException;
+
+class Template
+{
+    /**
+     * Getter for real template name
+     *
+     * @param      $template
+     *
+     * @param bool $throwExceptions
+     *
+     * @return null|string
+     */
+    public static function name($template, $throwExceptions = true)
+    {
+        $namespace = null;
+        if (strpos($template, '::')) {
+            list($namespace, $template) = explode('::', $template);
+            $namespace .= '::';
+        }
+
+        // list of prefixes
+        $prefixes = ['custom.', ''];
+
+        $view = null;
+        foreach ($prefixes as $prefix) {
+            if (view()->exists($namespace . 'visitor.' . $prefix . $template)) {
+                $view = $namespace . 'visitor.' . $prefix . $template;
+                break;
+            }
+        }
+
+        if (is_null($view)) {
+            if ($throwExceptions) {
+                throw new InvalidArgumentException('Cannot find template for ' . $namespace . $template);
+            } else {
+                return false;
+            }
+        }
+
+        return $view;
+    }
+
+
+}

app/CMS/Helpers/Traits/Nullable.php

@@ -0,0 +1,33 @@
+<?php
+namespace App\CMS\Helpers\Traits;
+
+use Carbon\Carbon;
+
+/**
+ * Class Nullable
+ *
+ * @package App\CMS\Helpers\Traits
+ */
+trait Nullable {
+    /**
+     * Get null or parsed date
+     *
+     * @param $date
+     *
+     * @return null|string
+     */
+    public function nullableDate($date) {
+        return empty($date) ? null : Carbon::parse($date)->toDateTimeString();
+    }
+
+    /**
+     * Get null or input value
+     *
+     * @param $string
+     *
+     * @return null
+     */
+    public function nullable($string) {
+        return empty($string) ? null : $string;
+    }
+}

app/CMS/Helpers/Widget.php

@@ -0,0 +1,18 @@
+<?php
+namespace App\CMS\Helpers;
+
+class Widget
+{
+    public static function render(\App\Models\Widgets\Widget $widget)
+    {
+        $handler = $widget->widget_type_handler;
+
+        if (is_string($widget->settings)) {
+            $widget->settings = json_decode($widget->settings);
+        }
+
+        $presenter = call_user_func([$handler, 'getPresenter']);
+
+        return call_user_func([$presenter, 'render'], $widget);
+    }
+}

app/CMS/Helpers/WidgetAreas.php

@@ -0,0 +1,75 @@
+<?php
+namespace App\CMS\Helpers;
+
+use App\Models\Widgets\WidgetArea;
+use Illuminate\Support\Facades\Cache;
+
+class WidgetAreas
+{
+    /**
+     * @var array list of inicialized widget areas
+     */
+    protected static $widgetAreas = [];
+    protected static $initialized = false;
+
+    protected static function saveRenderedWidgetArea($widgets)
+    {
+        foreach ($widgets as $widget) {
+            if (!isset(self::$widgetAreas[$widget->widget_area_code])) {
+                self::$widgetAreas[$widget->widget_area_code] = '';
+            }
+
+            self::$widgetAreas[$widget->widget_area_code] .= Widget::render($widget);
+        }
+    }
+
+    protected static function loadWidgetArea($uniqueCode)
+    {
+        $widgets = Cache::remember('widget-' . $uniqueCode, setting('widgetCacheLifetime', 5), function () use ($uniqueCode) {
+            $widgetArea = new WidgetArea();
+            return $widgetArea->getWidgets($uniqueCode)
+                              ->get();
+        });
+
+        WidgetArea::where('code', $uniqueCode)
+                  ->increment('viewed');
+
+        self::saveRenderedWidgetArea($widgets);
+    }
+
+    protected static function initWidgetAreas()
+    {
+        if (self::$initialized) {
+            return;
+        }
+
+        $widgets = Cache::remember('widgets', setting('widgetCacheLifetime', 5), function () {
+            $widgetArea = new WidgetArea();
+            return $widgetArea->getWidgets()
+                              ->get();
+        });
+
+        self::saveRenderedWidgetArea($widgets);
+        self::$initialized = true;
+    }
+
+    /**
+     * Renderer for whole widget area.
+     *
+     * @param $uniqueCode
+     *
+     * @return mixed
+     */
+    public static function render($uniqueCode)
+    {
+        if (!self::$initialized) {
+            self::initWidgetAreas();
+        }
+
+        if (!isset(self::$widgetAreas[$uniqueCode])) {
+            self::loadWidgetArea($uniqueCode);
+        }
+
+        echo isset(self::$widgetAreas[$uniqueCode]) ? self::$widgetAreas[$uniqueCode] : null;
+    }
+}

app/CMS/Helpers/functions.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Define function for escaping characters.
+ *
+ * This funcion prevents of creating build-in function, which escapes also accents...
+ *
+ * @param $value
+ *
+ * @return string
+ */
+function e($value)
+{
+    return htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
+}
+
+/**
+ * Shortcut for \App\CMS\Helpers\Settings::get()
+ *
+ * @param      $key
+ * @param null $default
+ *
+ * @return null|string
+ */
+function setting($key, $default = null) {
+    return \App\CMS\Helpers\Settings::get($key, $default);
+}
+
+function asset_path($path) {
+    return env('SITE_URL').'/assets/'.$path;
+}
+
+function template_name($name, $throwExceptions = true) {
+    return \App\CMS\Helpers\Template::name($name, $throwExceptions);
+}

app/CMS/Interactions/Admin/Content/ChangeStatus.php

@@ -0,0 +1,38 @@
+<?php
+namespace App\CMS\Interactions\Admin\Content;
+
+use App\CMS\Contracts\Interaction;
+use App\CMS\Enumerations\ContentStatuses;
+
+class ChangeStatus implements Interaction
+{
+    /**
+     * Change status of content page
+     *
+     * @param array $data
+     * @param array $parameters
+     *
+     * @return mixed|void
+     */
+    public function handle($data, $parameters)
+    {
+        list ($page) = $parameters;
+
+        $page->status = $data['status'];
+        $page->save();
+    }
+
+    /**
+     * Check if status is valid
+     *
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function getValidationRules($parameters = [])
+    {
+        $statuses = ContentStatuses::getWithTranslations();
+
+        return ['status' => 'in:' . implode(',', array_keys($statuses))];
+    }
+}

app/CMS/Interactions/Admin/Content/DeletePage.php

@@ -0,0 +1,45 @@
+<?php
+namespace App\CMS\Interactions\Admin\Content;
+
+use App\CMS\Contracts\Interaction;
+use App\CMS\Contracts\Repositories\Module;
+use App\Models\Content\Content;
+use Illuminate\Support\Facades\App;
+
+class DeletePage implements Interaction
+{
+    /**
+     * Perform given action
+     *
+     * @param $data       array input data
+     * @param $parameters array parameters
+     *
+     * @return void
+     */
+    public function handle($data, $parameters)
+    {
+        /**
+         * @var $page   Content
+         * @var $module Module
+         */
+
+        $module = App::make(Module::class);
+        list ($page) = $parameters;
+
+        // delete page
+        $page->delete();
+
+        // let module to delete some extra content created during page's life
+        $module->callOnString($page->moduleHandler, 'delete', [$page]);
+    }
+
+    /**
+     * @param $data array input data
+     *
+     * @return array
+     */
+    public function getValidationRules($data = [])
+    {
+        return [];
+    }
+}

app/CMS/Interactions/Admin/Content/EditContent.php

@@ -0,0 +1,92 @@
+<?php
+namespace App\Cms\Interactions\Admin\Content;
+
+use App\CMS\Contracts\Interaction;
+use App\CMS\Contracts\Repositories\Module;
+use App\CMS\Enumerations\ContentStatuses;
+use App\CMS\Helpers\CurrentTemplate;
+use App\Events\EditContent as EditContentEvent;
+use App\Http\Requests\Request;
+use App\Models\Content\Content;
+use App\Models\FileManager\File;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Str;
+use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
+
+class EditContent implements Interaction
+{
+    /**
+     * @var Module
+     */
+    protected $module;
+    /**
+     * @var File
+     */
+    protected $file;
+
+    public function __construct()
+    {
+        $this->module = App::make(Module::class);
+        $this->file = App::make(File::class);
+    }
+
+    /**
+     * Edit page
+     *
+     * @param array $data
+     * @param array $parameters
+     *
+     * @return mixed|void
+     */
+    public function handle($data, $parameters)
+    {
+        /**
+         * @var $page Content
+         */
+        list($page, $titlePhoto, $relatedFiles) = $parameters;
+
+        // let template to modify request and content page
+        CurrentTemplate::beforeSave($page, $data);
+
+        // upload file - if provided
+        $data['titlePhoto'] = isset($data['existingTitlePhoto']) ? $data['existingTitlePhoto'] : null;
+
+        if (!is_null($titlePhoto)) {
+            $file = $this->file->upload($titlePhoto);
+            $data['titlePhoto'] = $file ? $file['filename'] : null;
+        }
+
+        $page->update($data);
+        $this->module->callOnString($page->moduleHandler, 'edit', [$page, $data]);
+
+        // move to interaction
+        $keepAssigned = isset($data->keepAssigned) ? $data->keepAssigned : [];
+        $page->uploadRelatedFiles($relatedFiles, $keepAssigned);
+    }
+
+    /**
+     * Validate this interaction
+     *
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function getValidationRules($parameters = [])
+    {
+        $id = $parameters[0]->id;
+
+        // get all available statuses
+        $statuses = ContentStatuses::getSimple();
+        $statuses = implode(',', $statuses);
+
+        return [
+            'title'         => 'required',
+            'url'           => 'required|unique:contents,url,' . $id.',id,deleted_at,NULL,language,' . LaravelLocalization::getCurrentLocale(),
+            'publishedFrom' => 'date',
+            'publishedTo'   => 'date',
+            'status'        => 'required|in:' . $statuses,
+            'parentPage'    => 'exists:contents,id'
+        ];
+    }
+}

app/CMS/Interactions/Admin/Content/NewContent.php

@@ -0,0 +1,89 @@
+<?php
+namespace App\Cms\Interactions\Admin\Content;
+
+use App\CMS\Contracts\Interaction;
+use App\CMS\Contracts\Repositories\Content as ContentRepository;
+use App\CMS\Contracts\Repositories\Module;
+use App\CMS\Enumerations\ContentStatuses;
+use App\CMS\Helpers\CurrentTemplate;
+use App\Models\Content\Content;
+use App\Models\FileManager\File;
+use Illuminate\Support\Facades\App;
+use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
+
+class NewContent implements Interaction
+{
+    /**
+     * @var ContentRepository
+     */
+    protected $content;
+    /**
+     * @var File
+     */
+    protected $file;
+    /**
+     * @var Module
+     */
+    protected $module;
+
+    public function __construct()
+    {
+        $this->content = App::make(ContentRepository::class);
+        $this->module = App::make(Module::class);
+        $this->file = App::make(File::class);
+    }
+
+    /**
+     * Create new content page
+     *
+     * @param array   $data
+     * @param         $parameters
+     *
+     * @return Content
+     */
+    public function handle($data, $parameters)
+    {
+        list($moduleHandler, $titlePhoto, $relatedFiles) = $parameters;
+
+        // upload file - if provided
+        $file = !is_null($titlePhoto) ? $this->file->upload($titlePhoto) : null;
+
+        $data['userId'] = \Auth::user()->id;
+        $data['language'] = LaravelLocalization::getCurrentLocale();
+        $data['titlePhoto'] = $file ? $file['filename'] : null;
+        $data['moduleHandler'] = $moduleHandler;
+
+        $page = Content::create($data);
+
+        // save module-specific stuff
+        $this->module->callOnString($moduleHandler, 'createNew', [&$page, $data]);
+
+        // let template to modify data and content page
+        CurrentTemplate::beforeSave($page, $data);
+
+        // save content of page before (possible) uploading related files
+        $page->save();
+
+        // upload files assigned to content page
+        $page->uploadRelatedFiles($relatedFiles);
+
+        return $page;
+    }
+
+    public function getValidationRules($parameters = [])
+    {
+        // get all available statuses
+        $statuses = ContentStatuses::getSimple();
+        $statuses = implode(',', $statuses);
+
+        return [
+            'titlePhoto'    => 'image',
+            'title'         => 'required',
+            'url'           => 'required|unique:contents,url,NULL,id,deleted_at,NULL,language,' . LaravelLocalization::getCurrentLocale(),
+            'status'        => 'required|in:'.$statuses,
+            'parentPage'    => 'exists:contents,id',
+            'publishedFrom' => 'date',
+            'publishedTo'   => 'date',
+        ];
+    }
+}

app/CMS/Interactions/Admin/Content/SetHomepage.php

@@ -0,0 +1,43 @@
+<?php
+namespace App\CMS\Interactions\Admin\Content;
+
+use App\CMS\Contracts\Interaction;
+use App\CMS\Enumerations\ContentStatuses;
+use App\Models\Content\Content;
+use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
+
+class SetHomepage implements Interaction
+{
+    /**
+     * Set homepage of given page
+     *
+     * @param array $data
+     * @param array $parameters
+     *
+     * @return void
+     */
+    public function handle($data, $parameters)
+    {
+        list ($page) = $parameters;
+        // disable any other existing homepage
+        Content::where('isHomepage', true)
+               ->where('language', LaravelLocalization::getCurrentLocale())
+               ->update(['isHomepage' => false]);
+
+        // set new homepage
+        $page->isHomepage = true;
+        $page->save();
+    }
+
+    /**
+     * Check if status is valid
+     *
+     * @param array $parameters
+     *
+     * @return array
+     */
+    public function getValidationRules($parameters = [])
+    {
+        return [];
+    }
+}

app/CMS/Interactions/Admin/FileManager/CreateDirectory.php

@@ -0,0 +1,65 @@
+<?php
+namespace App\CMS\Interactions\Admin\FileManager;
+
+use App\CMS\Contracts\Interaction;
+use App\CMS\Exceptions\FileManager\SubdirectoryExistsInDirectory;
+use App\CMS\Repositories\FileManager\Directory as DirectoryRepository;
+use App\Models\FileManager\Directory;
+
+class CreateDirectory implements Interaction
+{
+    /**
+     * @var DirectoryRepository
+     */
+    private $repository;
+
+    public function __construct(DirectoryRepository $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * Perform given action
+     *
+     * @param $data       array input data
+     * @param $parameters array parameters
+     *
+     * @return Directory
+     * @throws SubdirectoryExistsInDirectory
+     */
+    public function handle($data, $parameters)
+    {
+        $data['parentDirectory'] = isset($data['parentDirectory']) ? $data['parentDirectory'] : null;
+
+        // todo this should probably go into validation, but we are not able to get $data in getValidationRules
+        // check if created folder does not exist in current directory
+        if ($this->repository->checkIfNameExists($data['name'], $data['parentDirectory'])) {
+            throw new SubdirectoryExistsInDirectory();
+        }
+
+        // todo use Directory::create() and rename columns/fields in request
+        // create new database entry
+        $directory = new Directory();
+        $directory->name = $data['name'];
+        $directory->parent_id = $data['parentDirectory'];
+        $directory->user_id = \Auth::user()->id;
+        $directory->description = $data['description'];
+        $directory->save();
+
+        return $directory;
+    }
+
+    /**
+     * @param $data array input data
+     *
+     * @return array
+     * @throws SubdirectoryExistsInDirectory
+     */
+    public function getValidationRules($data = [])
+    {
+        return [
+            'name'            => 'required|max:255',
+            'parentDirectory' => 'exists:directories,id'
+        ];
+    }
+}

app/CMS/MenuPresenters/FoundationDrilldownMenuPresenter.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\MenuPresenters;
+namespace App\CMS\MenuPresenters;
 
 use Pingpong\Menus\MenuItem;
 use Pingpong\Menus\Presenters\Presenter;
@@ -77,6 +77,6 @@ class FoundationDrilldownMenuPresenter extends Presenter
                 <ul class="vertical menu">
                   ' . $this->getChildMenuItems($item) . '
                 </ul>
-              </li>' . PHP_EOL;;
+              </li>' . PHP_EOL;
     }
 }

app/CMS/MenuPresenters/FoundationDropdownMenuPresenter.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\MenuPresenters;
+namespace App\CMS\MenuPresenters;
 
 use Pingpong\Menus\Presenters\Presenter;
 
@@ -56,6 +56,6 @@ class FoundationDropdownMenuPresenter extends Presenter
                 <ul class="vertical menu">
                   ' . $this->getChildMenuItems($item) . '
                 </ul>
-              </li>' . PHP_EOL;;
+              </li>' . PHP_EOL;
     }
 }

app/CMS/MenuPresenters/FoundationInitializedDropdownMenuPresenter.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\MenuPresenters;
+namespace App\CMS\MenuPresenters;
 
 class FoundationInitializedDropdownMenuPresenter extends FoundationDropdownMenuPresenter
 {

app/CMS/MenuPresenters/MetismenuPresenter.php

@@ -0,0 +1,85 @@
+<?php
+namespace App\CMS\MenuPresenters;
+
+use Pingpong\Menus\MenuItem;
+use Pingpong\Menus\Presenters\Presenter;
+
+class MetismenuPresenter extends Presenter
+{
+    /**
+     * {@inheritdoc }
+     */
+    public function getOpenTagWrapper()
+    {
+        return PHP_EOL . '<ul class="nav metismenu" id="sidebar-menu">' . PHP_EOL;
+    }
+
+    /**
+     * {@inheritdoc }
+     */
+    public function getCloseTagWrapper()
+    {
+        return PHP_EOL . '</ul>' . PHP_EOL;
+    }
+
+    /**
+     * {@inheritdoc }
+     */
+    public function getMenuWithoutDropdownWrapper($item)
+    {
+        return '<li' . $this->getActiveState($item) . '><a href="' . $item->getUrl() . '">' . $item->getIcon() . ' ' . $item->title . '</a></li>' . PHP_EOL;
+    }
+
+    /**
+     * {@inheritdoc }
+     */
+    public function getActiveState(MenuItem $item)
+    {
+        if ($item->isDivider()) {
+            return null;
+        }
+
+        $active = ' class="active"';
+
+        if (empty($item->getChilds())) {
+            // for direct menu input return if page is active
+            return \Request::is($item->getRequest()) ? $active : null;
+        } else {
+            // on nested menu inputs loop over children and in case any of them is active, mark active also root level
+            foreach ($item->getChilds() as $child) {
+                if ($this->getActiveState($child)) {
+                    return $active;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * {@inheritdoc }
+     */
+    public function getDividerWrapper()
+    {
+        return '<li class="divider"></li>' . PHP_EOL;
+    }
+
+    public function getMultiLevelDropdownWrapper($item)
+    {
+        return $this->getMenuWithDropDownWrapper($item);
+    }
+
+    /**
+     * {@inheritdoc }
+     */
+    public function getMenuWithDropDownWrapper($item)
+    {
+        $active = $this->getActiveState($item);
+        return '<li' . $active . '>
+              <a  href="#">' . $item->getIcon() . ' ' . $item->title . ' <i class="fa arrow"></i></a>
+                <ul>
+                  ' . $this->getChildMenuItems($item) . '
+                </ul>
+              </li>' . PHP_EOL;
+    }
+}

app/CMS/MenuPresenters/ProfileMenuPresenter.php

@@ -0,0 +1,61 @@
+<?php
+namespace App\CMS\MenuPresenters;
+
+use Pingpong\Menus\MenuItem;
+use Pingpong\Menus\Presenters\Presenter;
+
+class ProfileMenuPresenter extends Presenter
+{
+    /**
+     * {@inheritdoc }
+     */
+    public function getOpenTagWrapper()
+    {
+        return PHP_EOL . '<div class="dropdown-menu profile-dropdown-menu">' . PHP_EOL;
+    }
+
+    /**
+     * {@inheritdoc }
+     */
+    public function getCloseTagWrapper()
+    {
+        return PHP_EOL . '</div>' . PHP_EOL;
+    }
+
+    /**
+     * {@inheritdoc }
+     */
+    public function getMenuWithoutDropdownWrapper($item)
+    {
+        return '<a href="' . $item->getUrl() . '" class="dropdown-item">' . $item->getIcon() . ' ' . $item->title . '</a>' . PHP_EOL;
+    }
+
+    /**
+     * {@inheritdoc }
+     */
+    public function getActiveState(MenuItem $item)
+    {
+        return null;
+    }
+
+    /**
+     * {@inheritdoc }
+     */
+    public function getDividerWrapper()
+    {
+        return '<div class="dropdown-divider"></div>' . PHP_EOL;
+    }
+
+    public function getMultiLevelDropdownWrapper($item)
+    {
+        return null;//$this->getMenuWithDropDownWrapper($item);
+    }
+
+    /**
+     * {@inheritdoc }
+     */
+    public function getMenuWithDropDownWrapper($item)
+    {
+        return null;
+    }
+}

app/CMS/Observers/Content.php

@@ -0,0 +1,168 @@
+<?php
+namespace App\CMS\Observers;
+
+use App\CMS\Contracts\Repositories\Content as ContentContract;
+use App\Events\CreateNewContent;
+use App\Events\DeleteContent;
+use App\Events\EditContent;
+use App\Events\MakeDraftFromContent;
+use App\Events\PublishContent;
+use App\Events\SetHomepage;
+use App\Models\Content\Content as ContentModel;
+use App\Models\Content\ContentHistory;
+use Illuminate\Support\Facades\Event;
+
+/**
+ * Class Content
+ *
+ * Model observer for logging changes on content page.
+ *
+ * @package App\CMS\Observers
+ */
+class Content
+{
+    /**
+     * @var string
+     */
+    protected $changeset;
+
+    public function __construct()
+    {
+        $this->changeset = uniqid();
+    }
+
+    /**
+     * Log changes on edit
+     *
+     * @param ContentModel $content
+     */
+    public function updated(ContentModel $content)
+    {
+        $fields = $this->getDirtyFields($content->getDirty(), $content->getOriginal());
+
+        $normalFieldsEdited = 0;
+        foreach ($fields as $field => $change) {
+            if ($field == 'viewed')
+                continue;
+
+            $history = [
+                'user_id'    => \Auth::user()->id,
+                'content_id' => $content->id,
+                'edit_batch' => $this->changeset,
+                'column'     => $field,
+                'old_value'  => $change['old'],
+                'new_value'  => $change['new']
+            ];
+
+            // save history
+            ContentHistory::create($history);
+
+            // fire event
+            $this->fireEvent($field, $change, $content, $normalFieldsEdited);
+        }
+
+        if ($normalFieldsEdited > 0) {
+            Event::fire(new EditContent($content, $this->changeset));
+        }
+    }
+
+
+    /**
+     * Fire event when new instance of model is stored into database
+     *
+     * @param ContentModel $content
+     */
+    public function created(ContentModel $content)
+    {
+        Event::fire(new CreateNewContent($content));
+    }
+
+    /**
+     * @param ContentModel $content
+     */
+    public function deleted(ContentModel $content)
+    {
+        Event::fire(new DeleteContent($content));
+    }
+
+    /**
+     * Get all dirty changed from model.
+     *
+     * If user did not change moduleSettings column, return result from ContentModel::getDirty(). Otherwise append all
+     * changed columns from module settings.
+     *
+     * @param $changed
+     * @param $original
+     *
+     * @return array
+     */
+    protected function getDirtyFields($changed, $original)
+    {
+        unset($changed['updated_at']);
+
+        $changes = $this->getNewAndOldValues(array_keys($changed), $changed, $original);
+
+        if (!isset($changed['moduleSettings'])) {
+            return $changes;
+        }
+
+        $moduleSettings = (array)json_decode($changed['moduleSettings']);
+        $originalSettings = isset($original['moduleSettings']) ? (array)json_decode($original['moduleSettings']) : [];
+        unset($changed['moduleSettings']);
+
+        $settingChanged = array_keys(array_diff_assoc($moduleSettings, $originalSettings));
+        $changesInSettings = $this->getNewAndOldValues($settingChanged, $moduleSettings, $originalSettings);
+
+        return array_merge($changes, $changesInSettings);
+    }
+
+    /**
+     * Get original and changed values in one array
+     *
+     * @param $fields
+     * @param $new
+     * @param $original
+     *
+     * @return array
+     */
+    protected function getNewAndOldValues($fields, $new, $original)
+    {
+        $changes = [];
+        foreach ($fields as $field) {
+            $changes[$field] = [
+                'new' => isset($new[$field]) ? $new[$field] : null,
+                'old' => isset($original[$field]) ? $original[$field] : null
+            ];
+        }
+
+        return $changes;
+    }
+
+    /**
+     * Fire events for publishing/making draft and setting homepage
+     *
+     * @param              $field
+     * @param              $change
+     * @param ContentModel $content
+     * @param              $normalFieldsEdited
+     */
+    protected function fireEvent($field, $change, ContentModel $content, &$normalFieldsEdited)
+    {
+        switch ($field) {
+            case 'status':
+                if ($change['new'] !== ContentContract::STATUS_DRAFT) {
+                    Event::fire(new PublishContent($content, $this->changeset));
+                } else {
+                    Event::fire(new MakeDraftFromContent($content, $this->changeset));
+                }
+                break;
+
+            case 'isHomepage':
+                Event::fire(new SetHomepage($content, $this->changeset));
+                break;
+
+            default:
+                $normalFieldsEdited++;
+        }
+    }
+}

app/CMS/Repositories/ActionLog/Actions.php

@@ -1,25 +1,32 @@
 <?php
+namespace App\Cms\Repositories\ActionLog;
 
-namespace App\Models;
+use App\Models\User;
-
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
 
-/**
+class Actions
- * Class ActionLog
- */
-class ActionLog extends Model
 {
-    protected $table = 'action_log';
+    /**
-    public $timestamps = false;
+     * @param null $userId
-    protected $fillable = [
+     *
-        'type_id',
+     * @return array
-        'user_id',
+     */
-        'ip',
+    public function getLoggedActions($userId = null)
-        'user_agent',
+    {
-        'parameters'
+        $actions = $this->getLogActionsQuery(true);
-    ];
+
-    protected $guarded = [];
+        $user = null;
+        if ($userId) {
+            $user = User::findOrFail($userId);
+            $actions->where('users.id', $userId);
+        }
+
+        $actions = $actions->paginate(25);
+
+        $this->translateLogMessages($actions);
+
+        return [$user, $actions];
+    }
 
     /**
      * Query factory for loading action logs with their type (therefore with name and value)
@@ -36,7 +43,6 @@ class ActionLog extends Model
                       ->orderBy('action_log.created_at', 'DESC');
 
         if ($joinUser) {
-
             $actions = $actions->join('users', 'users.id', '=', 'action_log.user_id')
                                ->select('action_log.*', 'action_log_types.*', 'users.email', 'users.name as user_name');
         }
@@ -75,8 +81,6 @@ class ActionLog extends Model
      * Method used for translating and filling parameters into value of log.
      *
      * @param $messages
-     *
-     * @return array
      */
     public function translateLogMessages(&$messages)
     {

app/CMS/Repositories/Content/Content.php

@@ -0,0 +1,133 @@
+<?php
+namespace App\CMS\Repositories\Content;
+
+use App\CMS\Contracts\Repositories\Content as IContent;
+use App\CMS\Enumerations\ContentStatuses;
+use App\CMS\Repositories\Repository;
+use App\Models\Content\Content as ContentModel;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
+use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
+
+class Content extends Repository implements IContent
+{
+    /**
+     * @var ContentModel
+     */
+    protected $model;
+
+    public function __construct(ContentModel $model)
+    {
+        $this->model = $model;
+    }
+
+    /**
+     * Getter for query with setup filter for non-deleted and non-draft pages
+     */
+    protected function getPageQuery()
+    {
+        return ContentModel::where('status', '!=', IContent::STATUS_DRAFT)
+                           ->select('contents.*')
+                           ->with('author')
+                           ->join('modules', 'modules.handler', '=', 'contents.moduleHandler')
+                           ->where(function ($query) {
+                               $query->where('publishedFrom', '<=', Carbon::now())
+                                     ->orWhereNull('publishedFrom');
+                           })
+                           ->where(function ($query) {
+                               $query->where('publishedTo', '>=', Carbon::now())
+                                     ->orWhereNull('publishedTo');
+                           })
+                           ->where('language', LaravelLocalization::getCurrentLocale())
+                           ->whereNull('contents.deleted_at')
+                           ->where('modules.enabled', true);
+    }
+
+    public function all()
+    {
+        return $this->getPageQuery()
+                      ->get();
+    }
+
+    /**
+     * @param int $id
+     *
+     * @return mixed
+     */
+    public function getOne($id = null)
+    {
+        if (is_null($id)) {
+            $page = new ContentModel();
+            $page->user_id = \Auth::user()->id;
+            $page->language = LaravelLocalization::getCurrentLocale();
+            $page->status = IContent::STATUS_DRAFT;
+            $page->moduleSettings = [];
+        } else {
+                $page = $this->model->findOrFail($id);
+        }
+
+        return $page;
+    }
+
+    /**
+     * Getter for homepage content page
+     * @return Content
+     */
+    public function getHomepage()
+    {
+        return $this->getPageQuery()
+                     ->where('isHomepage', 1)
+                     ->first();
+
+    }
+
+    /**
+     * Getter for any page specified by its url.
+     *
+     * @param $url
+     *
+     * @return Content
+     */
+    public function getByURL($url)
+    {
+        return $this->getPageQuery()
+                     ->where('url', $url)
+                     ->first();
+    }
+
+    /**
+     * Getter for overview of all content pages.
+     * These content pages may be filtered by using some handler
+     *
+     * @param bool $handler
+     * @param null $statuses
+     *
+     * @return
+     */
+    public function getOverview($handler = null, $statuses = null)
+    {
+        $query = ContentModel::select('contents.*', 'modules.name AS module_name', 'modules.id AS module_id')
+                             ->join('modules', 'modules.handler', '=', 'contents.moduleHandler')
+                             ->join('users', 'users.id', '=', 'contents.userId')
+                             ->addSelect(DB::raw('COALESCE(users.name, users.email) AS author_name'))
+                             ->addSelect('users.email AS author_email')
+                             ->whereNull('contents.deleted_at')
+                             ->where('contents.language', LaravelLocalization::getCurrentLocale())
+                             ->where('modules.enabled', 1)
+                             ->orderBy('contents.created_at', 'DESC');
+
+        // filter results using handler
+        if (!is_null($handler)) {
+            $query = $query->where('contents.moduleHandler', $handler);
+        }
+
+        // add filtering by status
+        if (is_array($statuses) && in_array($statuses, ContentStatuses::getSimple())) {
+            $query = $query->whereIn('contents.status', $statuses);
+        }
+
+        $pages = $query->paginate(setting('paginatedResults', 20));
+
+        return $pages;
+    }
+}

app/CMS/Repositories/FileManager/Directory.php

@@ -0,0 +1,54 @@
+<?php
+namespace App\CMS\Repositories\FileManager;
+
+use App\CMS\Helpers\RootDirectory;
+use App\Models\FileManager\Directory as DirectoryModel;
+
+class Directory
+{
+    /**
+     * Checks if directory with given name does not exist in current directory
+     *
+     * @param      $name
+     * @param      $parentDirectoryId
+     * @param bool $ignoredId
+     */
+    public function checkIfNameExists($name, $parentDirectoryId, $ignoredId = false)
+    {
+        $exists = DirectoryModel::where('name', $name)
+                                ->where('parent_id', $parentDirectoryId);
+
+        if ($ignoredId !== false) {
+            $exists = $exists->where('id', '!=', $ignoredId);
+        }
+
+        return $exists->exists();
+    }
+
+    public function update(DirectoryModel $directory, $data) {
+        $directory->name = $data['name'];
+        $directory->description = $data['description'];
+        $directory->save();
+    }
+
+    /**
+     * @param DirectoryModel $directory
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function getAllSubdirectories(DirectoryModel &$directory)
+    {
+        if (!$directory->exists) {
+            $directory = DirectoryModel::where('is_root', true)
+                                       ->first();
+
+            if (is_null($directory)) {
+                $directory = RootDirectory::get();
+            }
+        }
+
+        $subdirectories = $directory->allSubdirectories();
+
+        return $subdirectories;
+    }
+}

app/CMS/Repositories/Module.php

@@ -0,0 +1,82 @@
+<?php
+namespace App\CMS\Repositories;
+
+use App\CMS\Contracts\Repositories\Module as IModule;
+use App\Models\Content\Content;
+use App\Models\Module as ModuleModel;
+
+class Module extends Repository implements IModule
+{
+    public function __construct(ModuleModel $module)
+    {
+        $this->model = $module;
+    }
+
+    public function getOne($id = null)
+    {
+        if (is_null($id)) {
+            return new ModuleModel();
+        }
+
+        if (is_numeric($id)) {
+            return ModuleModel::findOrFail($id);
+        } else {
+            return ModuleModel::where('alias', $id)
+                              ->firstOrFail();
+        }
+    }
+
+    public function getCreateContentTitle(ModuleModel $module)
+    {
+        $pageHeading = trans('admin/contents.new', ['name' => trans($module->name)]);
+        $moduleHeading = $this->call($module, 'getCreateNewTitle');
+
+        return is_null($moduleHeading) ? $pageHeading : $moduleHeading;
+    }
+
+    public function getUpdateContentTitle(ModuleModel $module, Content $content = null)
+    {
+        $pageHeading = trans('admin/contents.edit', ['name' => trans($module->name)]);
+        $moduleHeading = $this->call($module, 'getEditTitle', [$content]);
+
+        return is_null($moduleHeading) ? $pageHeading : $moduleHeading;
+    }
+
+    public function getOverviewTitle(ModuleModel $module)
+    {
+        $pageHeading = 'admin/contents.overview';
+        $moduleHeading = $this->call($module, 'getOverviewTitle');
+
+        return is_null($moduleHeading) ? $pageHeading : $moduleHeading;
+    }
+
+    public function all()
+    {
+        return ModuleModel::where('enabled', true)
+                          ->get();
+    }
+
+    public function getByHandler($handler)
+    {
+        return ModuleModel::where('handler', $handler)
+                          ->firstOrFail();
+    }
+
+    public function call(ModuleModel $module, $method, $parameters = [])
+    {
+        if (!is_null($module) && is_callable([$module->handler, $method])) {
+            return call_user_func_array([$module->handler, $method], $parameters);
+        }
+
+        return null;
+    }
+
+    public function callOnString($moduleHandler, $method, $parameters = [])
+    {
+        if (is_callable([$moduleHandler, $method])) {
+            return call_user_func_array([$moduleHandler, $method], $parameters);
+        }
+
+        return null;
+    }
+}

app/CMS/Repositories/Repository.php

@@ -0,0 +1,12 @@
+<?php
+namespace App\CMS\Repositories;
+
+abstract class Repository
+{
+    protected $model;
+
+    public function __call($method, $args)
+    {
+        return call_user_func_array([$this->model, $method], $args);
+    }
+}

app/CMS/Repositories/Templates/Template.php

@@ -0,0 +1,75 @@
+<?php
+namespace App\Cms\Repositories\Templates;
+
+use App\CMS\Contracts\Repositories\Template as ITemplate;
+use App\CMS\Repositories\Repository;
+use App\Models\Module;
+use App\Models\Templates\Template as TemplateModel;
+
+class Template extends Repository implements ITemplate
+{
+    public function setModel(TemplateModel $model)
+    {
+        $this->model = $model;
+    }
+
+    /**
+     * Getter for absolute path to template
+     *
+     * @param null $mode
+     *
+     * @return string
+     */
+    public function getPathToTemplate($mode = null)
+    {
+        $templateName = $this->model->template_name;
+        $path = $this->model->templatePath;
+
+        // delete namespace if given
+        if (strpos($this->model->template_name, '::')) {
+            list(, $templateName) = explode('::', $templateName);
+        }
+
+        // get template name, do not care about directories (they are already contained in path)
+        $parts = explode('.', $templateName);
+        $templateName = last($parts);
+
+        // just a shortcut for this unbelievable long constant name...
+        $_ = DIRECTORY_SEPARATOR;
+
+        // path parts
+        $absolutePath = base_path($path->path);
+        $templatePath = str_replace('.', $_, $templateName);
+        $file = $templatePath . ITemplate::TEMPLATE_SUFFIX;
+
+        // compose two versions of path - original and with "custom" directory
+        $original = $absolutePath . $_ . $file;
+        $edited = $absolutePath . $_ . ITemplate::EDITED_TEMPLATES_DIRECTORY . $_ . $file;
+
+        // decide which path will be returned
+        switch ($mode) {
+            case ITemplate::CUSTOM_EDIT_DIRECTORY:
+                return $edited;
+                break;
+
+            case ITemplate::ORIGINAL_DIRECTORY:
+                return $original;
+                break;
+
+            default:
+                if (file_exists($absolutePath . $_ . ITemplate::EDITED_TEMPLATES_DIRECTORY . $_ . $file)) {
+                    return $edited;
+                }
+
+                return $original;
+                break;
+        }
+    }
+
+    public function getForModule(Module $module)
+    {
+        return TemplateModel::where('module_id', $module->id)
+                            ->select(['template_name', 'name', 'description'])
+                            ->get();
+    }
+}

app/CMS/Shortcodes/Widget.php

@@ -0,0 +1,88 @@
+<?php
+namespace App\CMS\Shortcodes;
+
+use App\Models\Widgets\Widget as WidgetModel;
+use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
+
+class Widget
+{
+    protected static $widgets = [];
+    protected static $initialized = false;
+
+    protected function getRenderedWidget(WidgetModel $widget)
+    {
+        $widget->settings = json_decode($widget->settings);
+
+        $handler = $widget->widget_type_handler;
+        $presenter = call_user_func([$handler, 'getPresenter']);
+
+        return call_user_func([$presenter, 'render'], $widget);
+    }
+
+    /**
+     * Load one widget from database
+     *
+     * @param $containerId
+     */
+    protected function loadWidget($containerId)
+    {
+        $widget = WidgetModel::where('container_id', $containerId)
+                             ->first();
+
+        if (!$widget) {
+            return;
+        }
+
+        $widget->timestamps = false;
+        $widget->viewed++;
+        $widget->save();
+        $widget->timestamps = true;
+
+        self::$widgets[$containerId] = $this->getRenderedWidget($widget);
+    }
+
+    /**
+     * Load all frequently used widgets
+     *
+     * Frequency of loaded widgets is counted only using direct loading, widgets displayed in widget areas are omitted
+     */
+    protected function initWidgets()
+    {
+        if (self::$initialized) {
+            return;
+        }
+
+        $widgets = WidgetModel::where('viewed', '>=', setting('preloadFrequentedWidgetsTreshold', 10))
+                              ->where('language', LaravelLocalization::getCurrentLocale())
+                              ->get();
+
+        foreach ($widgets as $widget) {
+            self::$widgets[$widget->container_id] = $this->getRenderedWidget($widget);
+        }
+
+        self::$initialized = true;
+    }
+
+    /**
+     * Register new shortcode
+     *
+     * Initfrequently used widgets and if not presented yet - load desired widget specified as content of shortcode
+     *
+     * @param $shortcode
+     * @param $containerId
+     * @param $compiler
+     * @param $name
+     *
+     * @return mixed
+     */
+    public function register($shortcode, $containerId, $compiler, $name)
+    {
+        $this->initWidgets();
+
+        if (!isset(self::$widgets[$containerId])) {
+            $this->loadWidget($containerId);
+        }
+
+        return self::$widgets[$containerId];
+    }
+}

app/CMS/Widgets/HtmlCode/HtmlCode.php

@@ -1,13 +1,12 @@
 <?php
-namespace App\Widgets\HtmlCode;
+namespace App\CMS\Widgets\HtmlCode;
 
+use App\CMS\Contracts\Widgets\PublicWidget;
+use App\CMS\Widgets\Exceptions\MissingParameterException;
 use App\Http\Requests\Request;
-use App\Models\Widget;
+use App\Models\Widgets\Widget;
-use App\Widgets\Contracts\WidgetRenderer;
-use App\Widgets\Exceptions\MissingParameterException;
-use App\Widgets\NonInstallableWidget;
 
-class HtmlCode extends NonInstallableWidget
+class HtmlCode implements PublicWidget
 {
     /**
      * Name getter
@@ -40,25 +39,17 @@ class HtmlCode extends NonInstallableWidget
     }
 
     /**
-     * @param Widget  $widget
+     * @param Request $data
-     * @param \stdClass $data
      *
-     * @return Widget
+     * @return array
      * @throws MissingParameterException
      */
-    public static function save(Widget $widget, \stdClass $data)
+    public static function save(Request $data)
     {
         if (!isset($data->code) || empty($data->code)) {
             throw new MissingParameterException('code');
         }
 
-        $widgetSettings = [
+        return ['code' => $data->code];
-            'code'           => $data->code,
-            'containerClass' => isset($data->containerClass) ? $data->containerClass : ''
-        ];
-
-        $widget->settings = json_encode($widgetSettings);
-
-        return $widget;
     }
 }

app/CMS/Widgets/HtmlCode/Presenters/HtmlCode.php

@@ -1,9 +1,9 @@
 <?php
-namespace App\Widgets\HtmlCode\Presenters;
+namespace App\CMS\Widgets\HtmlCode\Presenters;
 
-use App\Models\Widget;
+use App\Models\Widgets\Widget;
-use App\Models\WidgetType;
+use App\Models\Widgets\WidgetType;
-use App\Widgets\Contracts\WidgetRenderer;
+use App\CMS\Contracts\Widgets\WidgetRenderer;
 
 class HtmlCode implements WidgetRenderer
 {
@@ -12,14 +12,15 @@ class HtmlCode implements WidgetRenderer
      *
      * This method renders some HTML code for displaying.
      *
-     * @param object $settings
+     * @param Widget $widget
      *
      * @return mixed
      */
-    public static function render($settings)
+    public static function render(Widget $widget)
     {
+        $settings = $widget->settings;
         $code = '
-            <div class="html-code-widget ' . $settings->containerClass . '">
+            <div class="html-code-widget ' . $widget->container_class . '">
             ' . $settings->code . '
             </div>';
 
@@ -35,7 +36,11 @@ class HtmlCode implements WidgetRenderer
      */
     public static function renderAddForm(WidgetType $type)
     {
-        return view('admin.widgets.htmlCode.new', ['type' => $type]);
+        return view('admin.widgets.htmlCode.new', [
+            'type'     => $type,
+            'widget'   => new Widget(),
+            'settings' => new \stdClass()
+        ]);
     }
 
     /**
@@ -47,7 +52,7 @@ class HtmlCode implements WidgetRenderer
      */
     public static function renderEditForm(Widget $widget)
     {
-        $settings = json_decode($widget->settings);
+        $settings = $widget->settings;
         return view('admin.widgets.htmlCode.edit', ['widget' => $widget, 'settings' => $settings]);
     }
 }

app/CMS/Widgets/Menu/Extensions/URL.php

@@ -1,7 +1,7 @@
 <?php
-namespace App\Widgets\Menu\Extensions;
+namespace App\CMS\Widgets\Menu\Extensions;
 
-use App\Widgets\Contracts\MenuExtensionHandler;
+use App\CMS\Widgets\Contracts\MenuExtensionHandler;
 
 class URL implements MenuExtensionHandler {
     public function getPossibleValues()

app/CMS/Widgets/Menu/Menu.php

@@ -0,0 +1,87 @@
+<?php
+namespace App\CMS\Widgets\Menu;
+
+use App\CMS\Contracts\Widgets\PublicWidget;
+use App\CMS\Widgets\Contracts\WidgetRenderer;
+use App\CMS\Widgets\Exceptions\MissingParameterException;
+use App\Http\Requests\Request;
+use App\Models\Content\Content;
+use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
+use App\CMS\Contracts\Repositories\Content as IContent;
+
+class Menu implements PublicWidget
+{
+    /**
+     * Name getter
+     *
+     * @return string
+     */
+    public static function getName()
+    {
+        return 'widgets/menu.widgetName';
+    }
+
+    /**
+     * Getter for description
+     *
+     * @return string
+     */
+    public static function getDescription()
+    {
+        return 'widgets/menu.widgetDescription';
+    }
+
+    /**
+     * Getter for presenter/renderer of this widget
+     *
+     * @return WidgetRenderer
+     */
+    public static function getPresenter()
+    {
+        return Presenters\Menu::class;
+    }
+
+    /**
+     * @param \App\Models\Widget $widget
+     * @param \stdClass          $data
+     *
+     * @return mixed
+     */
+    public static function save(Request $data)
+    {
+        if (!isset($data->settings) || empty($data->settings) || !json_decode($data->settings)) {
+            throw new MissingParameterException('settings');
+        }
+
+        $links = json_decode($data->settings);
+        $pages = self::selectContentPages(array_keys((array)$links));
+
+        foreach ($links as $link) {
+            if (!isset($pages[$link->id])) {
+                unset($links->{$link->id});
+            }
+        }
+
+        return ['links' => $links];
+    }
+
+    public static function selectContentPages($ids)
+    {
+        $allowedStatuses = [IContent::STATUS_PUBLIC];
+
+        if (\Auth::user()) {
+            $allowedStatuses[] = IContent::STATUS_PROTECTED;
+        }
+
+        $pages = Content::where('language', LaravelLocalization::getCurrentLocale())
+                        ->whereIn('id', $ids)
+                        ->whereIn('status', $allowedStatuses)
+                        ->get();
+        $used = [];
+        foreach ($pages as $page) {
+            $used[$page->id] = $page;
+        }
+
+        return $used;
+    }
+}

app/CMS/Widgets/Menu/Presenters/Menu.php

@@ -1,47 +1,35 @@
 <?php
-namespace App\Widgets\Menu\Presenters;
+namespace App\CMS\Widgets\Menu\Presenters;
 
-use App\Models\Content;
+use App\CMS\Contracts\Repositories\Content as ContentContract;
-use App\Models\Widget;
+use App\CMS\Contracts\Widgets\WidgetRenderer;
-use App\Models\WidgetType;
+use App\CMS\Widgets\Menu\Menu as WidgetMenu;
-use App\Widgets\Contracts\WidgetRenderer;
+use App\Models\Widgets\Widget;
+use App\Models\Widgets\WidgetType;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Route;
 
 class Menu implements WidgetRenderer
 {
-    protected static function selectContentPages($ids)
-    {
-        $pages = Content::where('status', '!=', Content::STATUS_DELETED)
-                        ->whereIn('id', $ids)
-                        ->get();
-        $used = [];
-
-        foreach ($pages as $page) {
-            $used[$page->id] = $page;
-        }
-
-        return $used;
-    }
-
     /**
      * Method used for displaying widget.
      *
      * This method renders some HTML code for displaying.
      *
-     * @param object $settings
+     * @param Widget $widget
      *
      * @return mixed
      */
-    public static function render($settings)
+    public static function render(Widget $widget)
     {
+        $settings = $widget->settings;
         $links = (array)$settings->links;
-
         $pageIds = array_keys($links);
 
         // get pages
-        $pages = self::selectContentPages($pageIds);
+        $pages = WidgetMenu::selectContentPages($pageIds);
 
         // sort links using "order"
         uasort($links, function ($a, $b) {
@@ -53,24 +41,28 @@ class Menu implements WidgetRenderer
         $parameters = Route::current()
                            ->parameters();
 
-        $code = '<ul class="menu ' . $settings->containerClass . '">';
+        $code = '<ul class="menu ' . $widget->container_class . '"';
+
+        if ($widget->container_id) {
+            $code .= ' id="' . e($widget->container_id) . '"';
+        }
+
+        $code .= '>';
 
         foreach ($links as $pageId => $link) {
             if (!isset($pages[$pageId])) {
                 continue;
             }
-            $page = $pages[$pageId];
 
-            $active = false;
+            $page = $pages[$pageId];
-            if (($page->is_homepage && $route == 'page.index') || ($route == 'page.content' && isset($parameters['url']) && $parameters['url'] == $page->url)) {
+            $active = ($page->isHomepage && $route == 'page.index') || ($route == 'page.content' && isset($parameters['url']) && $parameters['url'] == $page->url);
-                $active = true;
+            $route = $page->isHomepage ? route('page.index') : route('page.content', ['url' => $page->url]);
-            }
 
             $code .= '<li';
             if ($active) {
                 $code .= ' class="is-active active"';
             }
-            $code .= '><a href="' . route('page.content', ['url' => $page->url]) . '">' . e($page->title) . '</a></li>';
+            $code .= '><a href="' . $route . '">' . e($page->title) . '</a></li>';
         }
 
         $code .= "</ul>";
@@ -87,24 +79,19 @@ class Menu implements WidgetRenderer
      */
     public static function renderAddForm(WidgetType $type)
     {
-        $extensions = App::make('registerMenuExtension')
-                         ->get();
-
         $widget = new Widget();
-        $content = new Content();
+        $content = app(ContentContract::class);
 
         // get list of all pages
-        $pages = $content->getOverview()
+        $pages = $content->getOverview();
-                         ->get();
+        $widget->settings = new \stdClass();
+        $widget->settings->links = [];
 
-        $widget->settingsObj = new \stdClass();
-        $widget->settingsObj->links = new \stdClass();
 
         return view('admin.widgets.menu.new', [
-            'type'       => $type,
+            'type'   => $type,
-            'widget'     => $widget,
+            'widget' => $widget,
-            'pages'      => $pages,
+            'pages'  => $pages,
-            'extensions' => $extensions
         ]);
     }
 
@@ -117,20 +104,19 @@ class Menu implements WidgetRenderer
      */
     public static function renderEditForm(Widget $widget)
     {
-        //        $extensions = App::make('registerMenuExtension')
+        /**
-        //                         ->get();
+         * @var $content ContentContract
-        $content = new Content();
+         */
+        $content = App::make(ContentContract::class);
 
         // get list of all pages
-        $pages = $content->getOverview()
+        $pages = $content->getOverview();
-                         ->get();
 
         // make object from JSON
-        $widget->settingsObj = json_decode($widget->settings);
+        if (!isset($widget->settings->links)) {
-        if (!isset($widget->settingsObj->links)) {
             $links = new \stdClass();
         } else {
-            $links = (array)$widget->settingsObj->links;
+            $links = (array)$widget->settings->links;
         }
 
         // sort links using "order"
@@ -138,7 +124,7 @@ class Menu implements WidgetRenderer
             return $a->order - $b->order;
         });
 
-        $widget->settingsObj->links = (object)$links;
+        $widget->settings->links = (object)$links;
 
         return view('admin.widgets.menu.edit', ['widget' => $widget, 'pages' => $pages]);
     }