FIX: fix invalid pingpong parent classes in few controllers

.env.example

@@ -16,4 +16,4 @@ MAIL_PASSWORD=
 
 SITE_URL=/
 UPLOAD_URL=/public/uploads
-THUMBNAILS_URL=/uploads/thumbnails
+THUMBNAIL_URL=/public/uploads/thumbnails

.gitignore

@@ -27,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,18 @@
+<?php
+namespace App\CMS\Contracts\Content;
+
+use App\Http\Requests\Request;
+use App\Models\Content\Content;
+
+interface AdvancedContentModifier {
+    /**
+     * 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

@@ -1,7 +1,7 @@
 <?php
-namespace App\Handlers\Contracts;
+namespace App\CMS\Contracts\Content;
 
-use App\Models\Content;
+use App\Models\Content\Content;
 
 /**
  * Interface ContentTitles
@@ -9,7 +9,7 @@ use App\Models\Content;
  * Classes which implement this interface get the ability to rewrite default text on edit/create/overview of content
  * page.
  *
- * @package App\Handlers\Contracts
+ * @package App\CMS\Handlers\Contracts
  */
 interface ContentTitles
 {

app/CMS/Contracts/Content/DisplayPipeline/Pipeline.php

@@ -0,0 +1,16 @@
+<?php
+namespace App\CMS\Contracts\Content\DisplayPipeline;
+
+use App\Models\Content\Content;
+
+interface Pipeline {
+    /**
+     * Add new process into pipeline
+     *
+     * @param string $process
+     *
+     * @return void
+     */
+    function add($process);
+    function run(Content $page);
+}

app/CMS/Contracts/Content/DisplayPipeline/Process.php

@@ -0,0 +1,15 @@
+<?php
+namespace App\CMS\Contracts\Content\DisplayPipeline;
+
+use App\Models\Content\Content;
+
+interface Process {
+    /**
+     * Process and modify given page
+     *
+     * @param Content $page
+     *
+     * @return mixed
+     */
+    function handle(Content & $page);
+}

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/Content/SavePipeline/Pipeline.php

@@ -0,0 +1,25 @@
+<?php
+namespace App\CMS\Contracts\Content\SavePipeline;
+
+use App\Models\Content\Content;
+
+interface Pipeline {
+    /**
+     * Add new process into pipeline
+     *
+     * @param string $process
+     *
+     * @return void
+     */
+    function add($process);
+
+    /**
+     * Save content page
+     *
+     * @param Content $page
+     * @param array   $input
+     *
+     * @return Content
+     */
+    function run(Content & $page, array $input);
+}

app/CMS/Contracts/Content/SavePipeline/Process.php

@@ -0,0 +1,16 @@
+<?php
+namespace App\CMS\Contracts\Content\SavePipeline;
+
+use App\Models\Content\Content;
+
+interface Process {
+    /**
+     * Process and modify given page
+     *
+     * @param Content $page
+     * @param array   $input
+     *
+     * @return mixed
+     */
+    function handle(Content & $page, array & $input);
+}

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,42 @@
+<?php
+namespace App\CMS\Contracts\Modules;
+
+use App\Http\Requests\Request;
+use App\Models\Content\Content;
+
+interface AppHandler extends BaseModuleHandler
+{
+    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

@@ -1,5 +1,5 @@
 <?php
-namespace App\Handlers\Contracts;
+namespace App\CMS\Contracts\Modules;
 
 use App\Models\User;
 
@@ -15,11 +15,4 @@ interface BaseModuleHandler
      */
     public static function registerAdminMenu(User $user);
 
-    /**
-     * 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();
 }

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,30 @@
+<?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();
+}

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($mode = null);
+
+    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
-     * @param \stdClass $data
+     * Get widget settings for saving into database
      *
-     * @return mixed
-     */
-    public static function save(Widget $widget, \stdClass $data);
-
-    /**
-     * Function for installing given widget
+     * @param Request $request
      *
-     * @return mixed
+     * @return array
      */
-    public static function install();
-
-    /**
-     * Function for uninstalling widget
-     */
-    public static function uninstall();
+    public static function save(Request $request);
 }

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\WidgetType;
+use App\Models\Widgets\Widget;
+use App\Models\Widgets\WidgetType;
 
 interface WidgetRenderer
 {
@@ -11,7 +11,7 @@ interface WidgetRenderer
      *
      * This method renders some HTML code for displaying.
      *
-     * @param object $settings
+     * @param Widget $settings
      *
      * @return mixed
      */

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
 {

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
 {

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;
 

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

@@ -1,10 +1,9 @@
 <?php
-namespace App\Handlers;
+namespace App\CMS\Handlers;
 
-use App\Enumerations\TemplatePathsHumanReadableRootOnly;
-use App\Enumerations\WidgetTypes;
-use App\Handlers\Contracts\AppHandler;
-use App\Handlers\Contracts\BaseModuleHandler;
+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
@@ -35,7 +34,6 @@ abstract class BaseHandler implements BaseModuleHandler
              * Submenus can be registered later
              */
             $menu->dropdown(trans('admin/mainMenu.contentPages'), function ($sub) {
-                $sub->addDivider(9999);
                 $sub->route('content.overview', trans('admin/mainMenu.contentPageOverview'), [], 10000, ['icon' => 'fa fa-fw fa-list']);
             }, 20, ['icon' => 'fa fa-fw fa-database']);
 
@@ -97,22 +95,11 @@ abstract class BaseHandler implements BaseModuleHandler
                     }, 60, ['icon' => 'fa fa-fw fa-file-code-o']);
                 }
 
-
-
-                //            $menu->dropdown(trans('admin/mainMenu.customFields'), function ($sub) {
-                //                $sub->route('customfields.new', trans('admin/mainMenu.customFieldsNew'), [], 10, ['icon' => 'fa fa-fw fa-code']);
-                //                $sub->route('customfields.overview', trans('admin/mainMenu.customFieldsOverview'), [], 50, ['icon' => 'fa fa-fw fa-code-fork']);
-                //            }, 30, ['icon' => 'fa fa-fw fa-code']);
-
                 $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']);
-
-
         });
 
-        // order
-
         // 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']);

app/CMS/Handlers/Handler.php

@@ -1,9 +1,9 @@
 <?php
-namespace App\Handlers;
+namespace App\CMS\Handlers;
 
-use App\Handlers\Contracts\AppHandler;
+use App\CMS\Contracts\Modules\AppHandler;
 use App\Http\Controllers\Controller;
-use App\Models\Content;
+use App\Models\Content\Content;
 
 /**
  * Class Handler
@@ -11,38 +11,15 @@ use App\Models\Content;
  * 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\Handlers
+ * @package App\CMS\Handlers\
  */
 abstract class Handler extends BaseHandler implements AppHandler
 {
-    /**
-     * todo: Temporary method, will be implemented for each Handler
-     *
-     * @return bool
-     */
-    public static function supportCategories()
-    {
-        return true;
-    }
-
     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 [
@@ -64,16 +41,7 @@ abstract class Handler extends BaseHandler implements AppHandler
             'files'       => 'admin.content.formParts.files'
         ];
     }
-
-    public static function delete(Content $content)
-    {
-        // temporarily nothing to do
-    }
-
-    public static function loadExtraData(Content $content) {
-        // temporarily nothing to do
-    }
-
+    
     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\Handlers\Contracts\HistoryHandler;
-use App\Helpers\Differ;
+use App\CMS\Enumerations\ContentStatuses;
+use App\CMS\Handlers\Contracts\HistoryHandler;
+use App\CMS\Helpers\Differ;
 
 class History implements HistoryHandler
 {
@@ -43,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\Handlers\Contracts\SearchHandler;
-use App\Handlers\Contracts\SearchPresenterHandler;
-use App\Handlers\Registrators\Items\SearchEngine;
+use App\CMS\Exceptions\Enumerations\EnumerationExistsException;
+use App\CMS\Handlers\Contracts\SearchHandler;
+use App\CMS\Handlers\Contracts\SearchPresenterHandler;
+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\Handlers\Registrators\Items\SettingExtension;
+use App\CMS\Enumerations\Exceptions\EnumerationExistsException;
+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\Enumerations\Templates;
-use App\Models\Template;
-use App\Models\TemplatePath;
+use App\CMS\Contracts\Repositories\Template;
+use App\CMS\Enumerations\TemplatePaths;
+use App\CMS\Enumerations\Templates;
+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;
@@ -134,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), '\\/');
     }
 
     /**
@@ -145,6 +149,10 @@ class TemplateRegistrator
      */
     protected function scanForSubdirectories($directory, $name)
     {
+        if (!is_dir($directory)) {
+            return;
+        }
+
         $directories = File::directories($directory);
 
         foreach ($directories as $dir) {
@@ -194,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)
     {
@@ -222,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);
@@ -238,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)
     {
@@ -295,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

@@ -1,14 +1,13 @@
 <?php
-namespace App\Handlers\Registrators;
+namespace App\CMS\Handlers\Registrators;
 
-use App\Enumerations\WidgetTypesWithHandlers;
-use App\Models\WidgetType;
+use App\CMS\Enumerations\WidgetTypesWithHandlers;
+use App\Models\Widgets\WidgetType;
 
 class WidgetRegistrator
 {
     protected $registeredWidgets = [];
 
-
     /**
      * Method used for registering new widgets
      *
@@ -51,7 +50,9 @@ class WidgetRegistrator
                                    ]);
 
                 // install widget (if neccessary)
-                call_user_func($classname . '::install');
+                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)
-                           ->orWhere('meta_description', 'LIKE', $token)
-                           ->orWhere('meta_keywords', 'LIKE', $token)
+        return ContentModel::where('pageContent', 'LIKE', $token)
+                           ->orWhere('metaDescription', '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
 {

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

@@ -1,8 +1,8 @@
 <?php
-namespace App\Handlers\Search\Presenters;
+namespace App\CMS\Handlers\Search\Presenters;
 
-use App\Enumerations\ContentStatuses;
-use App\Handlers\Contracts\SearchPresenterHandler;
+use App\CMS\Enumerations\ContentStatuses;
+use App\CMS\Handlers\Contracts\SearchPresenterHandler;
 
 class AdminContent implements SearchPresenterHandler
 {

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
 {

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,92 @@
+<?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 () {
+                    return Module::where('is_template', true)
+                          ->where('enabled', true)
+                          ->first();
+                });
+
+
+            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']);
+    }
+}

app/CMS/Helpers/Date.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Helpers;
+namespace App\CMS\Helpers;
 
 class Date
 {

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,7 +17,7 @@ class FileManager
         switch ($type) {
             case 'image':
 
-               $url = Template::thumbnail($file->filename);
+               $url = Path::thumbnail($file->filename);
 
                 return '<img src="' . $url . '" alt="' . $file->description . '" />';
                 break;
@@ -98,7 +98,7 @@ class FileManager
                 return $string;
                 break;
             case 'application':
-                return '<iframe src = "'.asset('resources/assets/admin/js/viewerJs/').'/#'.Template::upload($file->filename).'" style="width: 100%; height: 50em" allowfullscreen webkitallowfullscreen></iframe>';
+                return '<iframe src = "'.asset('resources/assets/admin/js/viewerJs/').'/#'.Path::upload($file->filename).'" style="width: 100%; height: 50em" allowfullscreen webkitallowfullscreen></iframe>';
             break;
             default:
                 return self::getPreview($file);

app/CMS/Helpers/Gravatar.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Helpers;
+namespace App\CMS\Helpers;
 
 class Gravatar
 {

app/CMS/Helpers/PageRenderer.php

@@ -1,8 +1,8 @@
 <?php
-namespace App\Helpers;
+namespace App\CMS\Helpers;
 
-use App\Handlers\Contracts\AppHandler;
-use App\Models\Content;
+use App\CMS\Handlers\Contracts\AppHandler;
+use App\Models\Content\Content;
 use Webwizo\Shortcodes\Facades\Shortcode;
 
 /**
@@ -10,7 +10,7 @@ use Webwizo\Shortcodes\Facades\Shortcode;
  *
  * Simple class for rendering page for visitor
  *
- * @package App\Helpers
+ * @package App\CMS\Helpers
  */
 class PageRenderer
 {
@@ -23,19 +23,13 @@ class PageRenderer
      */
     public static function render(Content $page)
     {
-        // decode module settings
-        $page->module_settings = json_decode($page->module_settings);
-
         // do something template-specific
         $parameters = call_user_func_array([CurrentTemplate::handler(), 'beforeRender'], [&$page]);
 
         /**
          * @var $handler AppHandler
          */
-        // get handler
-        $handler = new $page->module_handler;
-
-        $page->content = Shortcode::compile($page->content);
+        $handler = new $page->moduleHandler;
 
         // render page
         return $handler->render($page, $parameters);

app/CMS/Helpers/Path.php

@@ -1,48 +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, $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;
-    }
-
     /**
      * Get URL to uploaded file
      *
@@ -95,25 +58,4 @@ class Template
 
         return config('app.url') . '/assets/' . config('app.theme') . '/' . $path;
     }
-
-    /**
-     * 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);
-    }
 }

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

@@ -1,15 +1,16 @@
 <?php
 
-namespace App\Helpers;
+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\Helpers
+ * @package App\CMS\Helpers
  */
 class Settings
 {
@@ -76,8 +77,10 @@ class Settings
     private static function init()
     {
         if (!self::$initialized) {
-            $model = new SettingsModel();
-            self::$settings = $model->getAll();
+            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

@@ -1,7 +1,10 @@
 <?php
-namespace App\Helpers;
 
-use App\Models\WidgetArea;
+namespace App\CMS\Helpers;
+
+use App\CMS\Repositories\Widgets\WidgetArea as WidgetAreaRepository;
+use App\Models\Widgets\WidgetArea;
+use Illuminate\Support\Facades\Cache;
 
 class WidgetAreas
 {
@@ -14,37 +17,40 @@ class WidgetAreas
     protected static function saveRenderedWidgetArea($widgets)
     {
         foreach ($widgets as $widget) {
-            if (!isset(self::$widgetAreas[$widget->widget_area_code]))
+            if (!isset(self::$widgetAreas[$widget->widget_area_code])) {
                 self::$widgetAreas[$widget->widget_area_code] = '';
+            }
 
-            $handler = $widget->widget_type_handler;
-            $widget->settings = json_decode($widget->settings);
-            $presenter = call_user_func([$handler, 'getPresenter']);
-
-            self::$widgetAreas[$widget->widget_area_code] .= call_user_func([$presenter, 'render'], $widget);
+            self::$widgetAreas[$widget->widget_area_code] .= Widget::render($widget);
         }
     }
 
     protected static function loadWidgetArea($uniqueCode)
     {
-        $widgetArea = new WidgetArea();
-        $widgets = $widgetArea->getWidgets($uniqueCode)
-                              ->get();
-
         WidgetArea::where('code', $uniqueCode)
                   ->increment('viewed');
 
+        $widgets = Cache::remember('widget-area-' . $uniqueCode, setting('widgetCacheLifetime', 5), function () use ($uniqueCode) {
+            $widgetArea = app(\App\CMS\Repositories\Widgets\WidgetArea::class);
+
+            return $widgetArea->getWidgets($uniqueCode)
+                              ->get();
+        });
+
         self::saveRenderedWidgetArea($widgets);
     }
 
     protected static function initWidgetAreas()
     {
-        if (self::$initialized)
+        if (self::$initialized) {
             return;
+        }
 
-        $widgetArea = new WidgetArea();
-        $widgets = $widgetArea->getWidgets()
+        $widgets = Cache::remember('widgets', setting('widgetCacheLifetime', 5), function () {
+            $widgetArea = app(WidgetAreaRepository::class);
+            return $widgetArea->getWidgets()
                               ->get();
+        });
 
         self::saveRenderedWidgetArea($widgets);
         self::$initialized = true;
@@ -55,7 +61,7 @@ class WidgetAreas
      *
      * @param $uniqueCode
      *
-     * @return mixed
+     * @return void
      */
     public static function render($uniqueCode)
     {
@@ -63,6 +69,8 @@ class WidgetAreas
             self::initWidgetAreas();
         }
 
+//        dd($uniqueCode);
+
         if (!isset(self::$widgetAreas[$uniqueCode])) {
             self::loadWidgetArea($uniqueCode);
         }

app/CMS/Helpers/functions.php

@@ -14,7 +14,7 @@ function e($value)
 }
 
 /**
- * Shortcut for \App\Helpers\Settings::get()
+ * Shortcut for \App\CMS\Helpers\Settings::get()
  *
  * @param      $key
  * @param null $default
@@ -22,9 +22,13 @@ function e($value)
  * @return null|string
  */
 function setting($key, $default = null) {
-    return \App\Helpers\Settings::get($key, $default);
+    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,78 @@
+<?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
+     */
+    public function handle($data, $parameters)
+    {
+        /**
+         * @var $page Content
+         */
+        list($page) = $parameters;
+
+        app('saveContentPipeline')->run($page, $data);
+
+        return $page;
+    }
+
+    /**
+     * 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,74 @@
+<?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) = $parameters;
+
+        $data['userId'] = \Auth::user()->id;
+        $data['language'] = LaravelLocalization::getCurrentLocale();
+        $data['moduleHandler'] = $moduleHandler;
+
+        $page = new Content();
+        app('saveContentPipeline')->run($page, $data);
+
+        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,56 @@
+<?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;
+
+        // check if created folder does not exist in current directory
+        if ($this->repository->checkIfNameExists($data['name'], $data['parentDirectory'])) {
+            throw new SubdirectoryExistsInDirectory();
+        }
+
+        // create new database entry
+        return $this->repository->create($data);
+    }
+
+    /**
+     * @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,8 +1,9 @@
 <?php
-namespace App\MenuPresenters;
 
-use Pingpong\Menus\MenuItem;
-use Pingpong\Menus\Presenters\Presenter;
+namespace App\CMS\MenuPresenters;
+
+use Nwidart\Menus\MenuItem;
+use Nwidart\Menus\Presenters\Presenter;
 
 class FoundationDrilldownMenuPresenter extends Presenter
 {
@@ -77,6 +78,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,7 +1,8 @@
 <?php
-namespace App\MenuPresenters;
 
-use Pingpong\Menus\Presenters\Presenter;
+namespace App\CMS\MenuPresenters;
+
+use Nwidart\Menus\Presenters\Presenter;
 
 class FoundationDropdownMenuPresenter extends Presenter
 {
@@ -27,7 +28,7 @@ class FoundationDropdownMenuPresenter extends Presenter
     public function getMenuWithoutDropdownWrapper($item)
     {
         $link = '<a href="' . $item->getUrl() . '">' . $item->getIcon() . ' ' . $item->title . '</a>';
-        return '<li' . $this->getActiveState($item) . '>' . $link . '</li>'.PHP_EOL;
+        return '<li' . $this->getActiveState($item) . '>' . $link . '</li>' . PHP_EOL;
     }
 
     /**
@@ -43,7 +44,7 @@ class FoundationDropdownMenuPresenter extends Presenter
      */
     public function getDividerWrapper()
     {
-        return '<li class="divider"></li>'.PHP_EOL;
+        return '<li class="divider"></li>' . PHP_EOL;
     }
 
     /**
@@ -56,6 +57,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

@@ -1,8 +1,8 @@
 <?php
-namespace App\MenuPresenters;
+namespace App\CMS\MenuPresenters;
 
-use Pingpong\Menus\MenuItem;
-use Pingpong\Menus\Presenters\Presenter;
+use Nwidart\Menus\MenuItem;
+use Nwidart\Menus\Presenters\Presenter;
 
 class MetismenuPresenter extends Presenter
 {

app/CMS/MenuPresenters/ProfileMenuPresenter.php

@@ -1,8 +1,9 @@
 <?php
-namespace App\MenuPresenters;
+namespace App\CMS\MenuPresenters;
+
+use Nwidart\Menus\MenuItem;
+use Nwidart\Menus\Presenters\Presenter;
 
-use Pingpong\Menus\MenuItem;
-use Pingpong\Menus\Presenters\Presenter;
 
 class ProfileMenuPresenter extends Presenter
 {

app/CMS/Modules/ServiceProviders/ServiceProvider.php

@@ -1,32 +1,32 @@
 <?php
-namespace App\Providers;
 
-use Illuminate\Support\ServiceProvider;
+namespace App\CMS\Modules\ServiceProviders;
 
-abstract class ModuleServiceProvider extends ServiceProvider {
+use Illuminate\Support\ServiceProvider as LaravelServiceProvider;
+
+abstract class ServiceProvider extends LaravelServiceProvider
+{
     /**
      * Indicates if loading of the provider is deferred.
-     *
      * @var bool
      */
     protected $defer = false;
-
     protected $alias = false;
     protected $path = false;
 
     abstract protected function setModuleAlias();
+
     abstract protected function setModulePath();
 
     /**
      * Boot the application events.
-     *
      * @return void
      */
     public function boot()
     {
         $this->setModuleAlias();
         $this->setModulePath();
-        
+
         $this->registerTranslations();
         $this->registerConfig();
         $this->registerViews();
@@ -34,12 +34,11 @@ abstract class ModuleServiceProvider extends ServiceProvider {
 
     /**
      * Register config.
-     *
      * @return void
      */
     protected function registerConfig()
     {
-        $this->publishes([$this->path . '/../Config/config.php' => config_path($this->alias.'.php')]);
+        $this->publishes([$this->path . '/../Config/config.php' => config_path($this->alias . '.php')]);
         $this->mergeConfigFrom($this->path . '/../Config/config.php', $this->alias);
     }
 
@@ -49,29 +48,28 @@ abstract class ModuleServiceProvider extends ServiceProvider {
 
     /**
      * Register views.
-     *
      * @return void
      */
     protected function registerViews()
     {
-        $viewPath = base_path('resources/views/modules/'.$this->alias);
+        $viewPath = base_path('resources/views/modules/' . $this->alias);
         $sourcePath = $this->path . '/../Resources/views';
 
-        $this->publishes([$sourcePath => $viewPath], 'module-views');
-
         $this->loadViewsFrom(array_merge(array_map(function ($path) {
-            return $path . '/modules/'.$this->alias;
+            return $path . '/modules/' . $this->alias;
         }, \Config::get('view.paths')), [$sourcePath]), $this->alias);
+
+        if (is_dir($sourcePath)) {
+            $this->publishes([$sourcePath => $viewPath], 'module-views');
+        }
     }
 
     /**
      * Register translations.
-     *
      * @return void
      */
     protected function registerTranslations()
     {
         $this->loadTranslationsFrom($this->path . '/../Resources/lang', $this->alias);
     }
-
 }

app/CMS/Modules/Stubs/Config/config.stub

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'name' => '$Module$',
+    'translatedName' => '$module$::$module$.name',
+    'translatedDescription' => '$module$::$module$.description',
+    'alias'     => 'categories',
+    'handler'   => \Modules\$Module$\Handlers\$Module$Handler::class,
+    'providers' => [\Modules\$Module$\Providers\$Module$ServiceProvider::class],
+    'files'     => ['Http/routes.php'],
+    'order'     => 0,
+];

app/CMS/Modules/Stubs/Entities/$Entity$.stub

@@ -0,0 +1,8 @@
+<?php
+namespace Modules\$ModuleNamespace$\Entities;
+
+use Illuminate\Database\Eloquent\Model;
+
+class $Entity$ extends Model {
+	// ...
+}

app/CMS/Modules/Stubs/Handlers/$Module$ContentHandler.stub

@@ -0,0 +1,40 @@
+<?php
+
+namespace Modules\$ModuleNamespace$\Handlers;
+
+use App\CMS\Contracts\Content\ContentTitles;
+use App\Models\Content\Content;
+
+class $Module$ContentHandler extends $Module$Handler implements 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()
+    {
+        // TODO: Implement getOverviewTitle() method.
+    }
+
+    /**
+     * Title displayed above for for creating new content page
+     * @return string
+     */
+    public static function getCreateNewTitle()
+    {
+        // TODO: Implement getCreateNewTitle() method.
+    }
+
+    /**
+     * Title for form displayed for editin content page
+     *
+     * @param Content $content
+     *
+     * @return mixed
+     */
+    public static function getEditTitle(Content $content)
+    {
+        // TODO: Implement getEditTitle() method.
+    }
+}

app/CMS/Modules/Stubs/Handlers/$Module$Handler.stub

@@ -0,0 +1,38 @@
+<?php
+
+namespace Modules\$ModuleNamespace$\Handlers;
+
+use App\CMS\Handlers\Handler;
+use App\Models\User;
+
+class $Module$Handler extends Handler
+{
+    /**
+     * Register admin menu
+     *
+     * @param User $user
+     */
+    public static function registerAdminMenu(User $user)
+    {
+        // register links in admin menu
+        $menu = \Menu::instance('mainMenu');
+
+		  $menu->dropdown(trans('$module$::$module$.name'), function ($submenu) use ($user) {
+             $submenu->route('$module$.overview', trans('$module$::$module$.overview'), [], 20, ['icon' => 'fa fa-fw fa-list']);
+             $submenu->route('$module$.new', trans('$module$::$module$.new'), [], 21, ['icon' => 'fa fa-fw fa-plus']);
+        }, 15, ['icon' => 'fa fa-fw']);
+
+
+
+        // TODO: add admin menu entries
+    }
+
+    /**
+     * Does this module support categories?
+     * @return boolean
+     */
+    public static function supportCategories()
+    {
+        return true;
+    }
+}

app/CMS/Modules/Stubs/Http/Controllers/Admin/$Module$.stub

@@ -0,0 +1,103 @@
+<?php
+
+namespace Modules\$ModuleNamespace$\Http\Controllers\Admin;
+
+use App\Http\Controllers\Admin\Controller;
+use Modules\$ModuleNamespace$\Http\Requests\Update$Entity$;
+use Modules\$ModuleNamespace$\Http\Requests\Create$Entity$;
+use Modules\$ModuleNamespace$\Repositories\$Module$Repository;
+use $EntityNamespace$\$Entity$ as $Entity$Entity;
+
+class $Module$ extends Controller
+{
+    /**
+     * @var $Module$Repository
+     */
+    private $$module$Repository;
+
+    public function __construct($Module$Repository $$module$Repository)
+    {
+        $this->$module$Repository = $$module$Repository;
+    }
+
+    /**
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function index()
+    {
+		  $items = $Entity$Entity::all();
+
+        return view('$module$::admin/index', compact('items'));
+    }
+
+    /**
+     * Display form for updating entity
+     *
+     * @param $Entity$Entity $entity
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function edit($Entity$Entity $entity)
+    {
+        return view('$module$::admin/update', compact('entity'));
+    }
+
+    /**
+     * Update existing entity
+     *
+     * @param Update$Entity$ $request
+     * @param $Entity$Entity       $item
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function update(Update$Entity$ $request, $Entity$Entity $entity)
+    {
+
+        // ...
+
+        $this->$module$Repository->update($entity, $request->all());
+
+        return redirect()
+            ->back()
+            ->with('success', trans('$module$.$module.successfullyUpdated'));
+    }
+
+    /**
+     * Display form for creating new entity
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function create() {
+        $entity = new $Entity$Entity();
+
+        return view('$module$::admin/create', compact('entity'));
+    }
+
+    /**
+     * Create new instance of entity
+     */
+    public function store(Create$Entity$ $request) {
+        // ...
+
+        $this->$module$Repository->create($request->all());
+
+        return redirect()
+            ->back()
+            ->with('success', trans('$module$.$module.successfullyUpdated'));
+    }
+
+    /**
+     * Delete entity
+     *
+     * @param $Entity$ $entity
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function destroy($Entity$ $entity) {
+        $entity->delete();
+
+        return redirect()
+            ->back()
+            ->with('success', trans('$module$.$module.successfullyDeleted'));
+    }
+}

app/CMS/Modules/Stubs/Http/Requests/Create$Entity$.stub

@@ -0,0 +1,11 @@
+<?php
+namespace Modules\$ModuleNamespace$\Http\Requests;
+
+use App\Http\Requests\Request;
+
+class Create$Entity$ extends Request {
+    public function rules()
+    {
+        return parent::rules();
+    }
+}

app/CMS/Modules/Stubs/Http/Requests/Update$Entity$.stub

@@ -0,0 +1,11 @@
+<?php
+namespace Modules\$ModuleNamespace$\Http\Requests;
+
+use App\Http\Requests\Request;
+
+class Update$Entity$ extends Request {
+    public function rules()
+    {
+        return parent::rules();
+    }
+}

app/CMS/Modules/Stubs/Http/routes.stub

@@ -0,0 +1,25 @@
+<?php
+
+\Route::group([
+                 'prefix'     => \LaravelLocalization::setLocale() . '/admin/$module$',
+                 'middleware' => ['admin'],
+                 'namespace'  => 'Modules\$Module$\Http\Controllers\Admin'
+             ], function () {
+    Route::get('/', '$Module$@index')
+         ->name('$module$.overview');
+
+    Route::get('/new', '$Module$@create')
+         ->name('$module$.new');
+    
+    Route::post('/new', '$Module$@store')
+         ->name('$module$.postNew');
+
+    Route::get('/edit/{id}', '$Module$@edit')
+         ->name('$module$.edit');
+    
+    Route::post('/edit/{id}', '$Module$@update')
+         ->name('$module$.postEdit');
+
+    Route::get('/delete/{id}', '$Module$@delete')
+         ->name('$module$.delete');
+});

app/CMS/Modules/Stubs/Providers/$Module$ServiceProvider.stub

@@ -0,0 +1,31 @@
+<?php
+
+namespace Modules\$Module$\Providers;
+
+use App\CMS\Contracts\Modules\ServiceProvider;
+
+/**
+ * Class $Module$ServiceProvider
+ *
+ * Service provider for module $Module$
+ *
+ * @package Modules\$Module$\Providers
+ */
+class $Module$ServiceProvider extends ServiceProvider
+{
+    /**
+     * Set module Alias
+     */
+    protected function setModuleAlias()
+    {
+        $this->alias = strtolower('$module$');
+    }
+
+    /**
+     * Set path to module
+     */
+    protected function setModulePath()
+    {
+        $this->path = __DIR__;
+    }
+}