FEATURE: change directory structure

app/CMS/Contracts/AppHandler.php

@@ -1,8 +1,8 @@
 <?php
-namespace App\Handlers\Contracts;
+namespace App\CMS\Handlers\Contracts;
 
 use App\Http\Requests\Request;
-use App\Models\Content;
+use App\Models\Content\Content;
 
 interface AppHandler extends BaseModuleHandler
 {

app/CMS/Contracts/BaseModuleHandler.php

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

app/CMS/Contracts/Content/ContentTitles.php

@@ -1,7 +1,7 @@
 <?php
-namespace App\Handlers\Contracts;
+namespace App\CMS\Handlers\Contracts;
 
-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/HistoryHandler.php

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

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/TemplateHandler.php

@@ -1,8 +1,8 @@
 <?php
-namespace App\Handlers\Contracts;
+namespace App\CMS\Handlers\Contracts;
 
 use App\Http\Requests\Request;
-use App\Models\Content;
+use App\Models\Content\Content;
 use App\Models\Module;
 
 /**
@@ -10,7 +10,7 @@ use App\Models\Module;
  *
  * Inerface used for registering template into CMS core.
  *
- * @package App\Handlers\Contracts
+ * @package App\CMS\Handlers\Contracts
  */
 interface TemplateHandler extends BaseModuleHandler
 {

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,7 @@
 <?php
-namespace App\Widgets\Contracts;
+namespace App\CMS\Contracts\Widgets;
 
-use App\Http\Requests\Request;
+use App\Models\Widgets\Widget;
-use App\Models\Widget;
 
 interface PublicWidget
 {
@@ -28,22 +27,10 @@ interface PublicWidget
     public static function getPresenter();
 
     /**
-     * @param Widget  $widget
+     * @param Widget    $widget
      * @param \stdClass $data
      *
      * @return mixed
      */
     public static function save(Widget $widget, \stdClass $data);
-
-    /**
-     * Function for installing given widget
-     *
-     * @return mixed
-     */
-    public static function install();
-
-    /**
-     * 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,7 +11,7 @@ interface WidgetRenderer
      *
      * This method renders some HTML code for displaying.
      *
-     * @param object $settings
+     * @param Widget $settings
      *
      * @return mixed
      */

app/CMS/CustomFields/BaseField.php

@@ -0,0 +1,6 @@
+<?php
+namespace App\CMS\CustomFields;
+
+class BaseField {
+
+}

app/CMS/CustomFields/Date.php

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

app/CMS/CustomFields/Number.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\CustomFields;
+namespace App\CMS\CustomFields;
 
 class Number extends BaseField {
 

app/CMS/CustomFields/SelectboxList.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\CustomFields;
+namespace App\CMS\CustomFields;
 
 class SelectboxList extends BaseField {
 

app/CMS/CustomFields/String.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\CustomFields;
+namespace App\CMS\CustomFields;
 
 class String extends BaseField {
 

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,7 @@
 <?php
-namespace App\Enumerations;
+namespace App\CMS\Enumerations;
 
-use App\Models\Content;
+use App\Models\Content\Content;
 
 class ContentStatuses extends BaseEnumeration
 {

app/CMS/Enumerations/CustomFieldResources.php

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

app/CMS/Enumerations/CustomFieldTypes.php

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

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,5 +1,5 @@
 <?php
-namespace App\Enumerations;
+namespace App\CMS\Enumerations;
 
 use App\Models\Module;
 

app/CMS/Enumerations/TemplatePaths.php

@@ -6,7 +6,7 @@
  * Time: 10:33
  */
 
-namespace App\Enumerations;
+namespace App\CMS\Enumerations;
 
 use App\Models\TemplatePath;
 

app/CMS/Enumerations/TemplatePathsHumanReadable.php

@@ -6,7 +6,7 @@
  * Time: 10:33
  */
 
-namespace App\Enumerations;
+namespace App\CMS\Enumerations;
 
 use App\Models\TemplatePath;
 

app/CMS/Enumerations/TemplatePathsHumanReadableRootOnly.php

@@ -6,7 +6,7 @@
  * Time: 10:33
  */
 
-namespace App\Enumerations;
+namespace App\CMS\Enumerations;
 
 use App\Models\TemplatePath;
 

app/CMS/Enumerations/Templates.php

@@ -6,7 +6,7 @@
  * Time: 15:50
  */
 
-namespace App\Enumerations;
+namespace App\CMS\Enumerations;
 
 use App\Models\Template;
 

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/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,10 @@
 <?php
-namespace App\Handlers;
+namespace App\CMS\Handlers;
 
-use App\Enumerations\TemplatePathsHumanReadableRootOnly;
+use App\CMS\Enumerations\TemplatePathsHumanReadableRootOnly;
-use App\Enumerations\WidgetTypes;
+use App\CMS\Enumerations\WidgetTypes;
-use App\Handlers\Contracts\AppHandler;
+use App\CMS\Handlers\Contracts\AppHandler;
-use App\Handlers\Contracts\BaseModuleHandler;
+use App\CMS\Handlers\Contracts\BaseModuleHandler;
 use App\Models\User;
 
 abstract class BaseHandler implements BaseModuleHandler

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\Handlers\Contracts\AppHandler;
 use App\Http\Controllers\Controller;
-use App\Models\Content;
+use App\Models\Content\Content;
 
 /**
  * Class Handler
@@ -11,7 +11,7 @@ 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
 {

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
 {

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,8 +1,8 @@
 <?php
-namespace App\Handlers\Registrators;
+namespace App\CMS\Handlers\Registrators;
 
-use App\Enumerations\TemplatePaths;
+use App\CMS\Enumerations\TemplatePaths;
-use App\Enumerations\Templates;
+use App\CMS\Enumerations\Templates;
 use App\Models\Template;
 use App\Models\TemplatePath;
 use Illuminate\Support\Facades\File;
@@ -194,7 +194,7 @@ class TemplateRegistrator
      * @param $path
      * @param $templatePathId
      *
-     * @throws \App\Enumerations\Exceptions\EnumerationExistsException
+     * @throws \App\CMS\Enumerations\Exceptions\EnumerationExistsException
      */
     protected function registerTemplates($path, $templatePathId)
     {
@@ -238,7 +238,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)
     {

app/CMS/Handlers/Registrators/WidgetRegistrator.php

@@ -1,8 +1,8 @@
 <?php
-namespace App\Handlers\Registrators;
+namespace App\CMS\Handlers\Registrators;
 
-use App\Enumerations\WidgetTypesWithHandlers;
+use App\CMS\Enumerations\WidgetTypesWithHandlers;
-use App\Models\WidgetType;
+use App\Models\Widgets\WidgetType;
 
 class WidgetRegistrator
 {

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
 {

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\CMS\Enumerations\ContentStatuses;
-use App\Handlers\Contracts\SearchPresenterHandler;
+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

@@ -1,5 +1,5 @@
 <?php
-namespace App\Helpers;
+namespace App\CMS\Helpers;
 
 use App\Models\Module;
 use DebugBar\Bridge\MonologCollector;

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;

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\CMS\Handlers\Contracts\AppHandler;
-use App\Models\Content;
+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
 {

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/Settings.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Helpers;
+namespace App\CMS\Helpers;
 
 use App\Models\Settings as SettingsModel;
 
@@ -9,7 +9,7 @@ use App\Models\Settings as SettingsModel;
  *
  * Helper class for easier obtaining system settings
  *
- * @package App\Helpers
+ * @package App\CMS\Helpers
  */
 class Settings
 {

app/CMS/Helpers/Template.php

@@ -0,0 +1,47 @@
+<?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
+     *
+     * @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/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_object($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,7 @@
 <?php
-namespace App\Helpers;
+namespace App\CMS\Helpers;
 
-use App\Models\WidgetArea;
+use App\Models\Widgets\WidgetArea;
 
 class WidgetAreas
 {
@@ -17,11 +17,7 @@ class WidgetAreas
             if (!isset(self::$widgetAreas[$widget->widget_area_code]))
                 self::$widgetAreas[$widget->widget_area_code] = '';
 
-            $handler = $widget->widget_type_handler;
+            self::$widgetAreas[$widget->widget_area_code] .= Widget::render($widget);
-            $widget->settings = json_decode($widget->settings);
-            $presenter = call_user_func([$handler, 'getPresenter']);
-
-            self::$widgetAreas[$widget->widget_area_code] .= call_user_func([$presenter, 'render'], $widget);
         }
     }
 

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,7 +22,7 @@ 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) {

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;

app/CMS/MenuPresenters/FoundationDropdownMenuPresenter.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\MenuPresenters;
+namespace App\CMS\MenuPresenters;
 
 use Pingpong\Menus\Presenters\Presenter;
 

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,5 +1,5 @@
 <?php
-namespace App\MenuPresenters;
+namespace App\CMS\MenuPresenters;
 
 use Pingpong\Menus\MenuItem;
 use Pingpong\Menus\Presenters\Presenter;

app/CMS/MenuPresenters/ProfileMenuPresenter.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\MenuPresenters;
+namespace App\CMS\MenuPresenters;
 
 use Pingpong\Menus\MenuItem;
 use Pingpong\Menus\Presenters\Presenter;

app/CMS/Shortcodes/Widget.php

@@ -1,7 +1,7 @@
 <?php
-namespace App\Shortcodes;
+namespace App\CMS\Shortcodes;
 
-use App\Models\Widget as WidgetModel;
+use App\Models\Widgets\Widget as WidgetModel;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 
 class Widget

app/CMS/Widgets/HtmlCode/HtmlCode.php

@@ -1,13 +1,12 @@
 <?php
-namespace App\Widgets\HtmlCode;
+namespace App\CMS\Widgets\HtmlCode;
 
-use App\Http\Requests\Request;
+use App\CMS\Contracts\Widgets\PublicWidget;
-use App\Models\Widget;
+use App\CMS\Widgets\Contracts\WidgetRenderer;
-use App\Widgets\Contracts\WidgetRenderer;
+use App\CMS\Widgets\Exceptions\MissingParameterException;
-use App\Widgets\Exceptions\MissingParameterException;
+use App\Models\Widgets\Widget;
-use App\Widgets\NonInstallableWidget;
 
-class HtmlCode extends NonInstallableWidget
+class HtmlCode implements PublicWidget
 {
     /**
      * Name getter
@@ -40,7 +39,7 @@ class HtmlCode extends NonInstallableWidget
     }
 
     /**
-     * @param Widget  $widget
+     * @param Widget    $widget
      * @param \stdClass $data
      *
      * @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
 {

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

@@ -1,13 +1,14 @@
 <?php
-namespace App\Widgets\Menu;
+namespace App\CMS\Widgets\Menu;
 
-use App\Models\Content;
+use App\CMS\Contracts\Widgets\PublicWidget;
-use App\Widgets\Contracts\WidgetRenderer;
+use App\CMS\Widgets\Contracts\WidgetRenderer;
-use App\Widgets\Exceptions\MissingParameterException;
+use App\CMS\Widgets\Exceptions\MissingParameterException;
-use App\Widgets\NonInstallableWidget;
+use App\Models\Content\Content;
+use App\Models\Widgets\Widget;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 
-class Menu extends NonInstallableWidget
+class Menu implements PublicWidget
 {
     /**
      * Name getter
@@ -45,7 +46,7 @@ class Menu extends NonInstallableWidget
      *
      * @return mixed
      */
-    public static function save(\App\Models\Widget $widget, \stdClass $data)
+    public static function save(Widget $widget, \stdClass $data)
     {
         if (!isset($data->settings) || empty($data->settings) || !json_decode($data->settings)) {
             throw new MissingParameterException('settings');

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

@@ -1,13 +1,12 @@
 <?php
-namespace App\Widgets\Menu\Presenters;
+namespace App\CMS\Widgets\Menu\Presenters;
 
-use App\Models\Content;
+use App\CMS\Contracts\Widgets\WidgetRenderer;
-use App\Models\Widget;
+use App\CMS\Widgets\Menu\Menu as WidgetMenu;
-use App\Models\WidgetType;
+use App\Models\Content\Content;
-use App\Widgets\Contracts\WidgetRenderer;
+use App\Models\Widgets\Widget;
-use App\Widgets\Menu\Menu as WidgetMenu;
+use App\Models\Widgets\WidgetType;
 use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Route;
 
@@ -43,8 +42,9 @@ class Menu implements WidgetRenderer
 
         $code = '<ul class="menu ' . $widget->container_class . '"';
 
-        if ($widget->container_id)
+        if ($widget->container_id) {
-            $code .= ' id="'.e($widget->container_id).'"';
+            $code .= ' id="' . e($widget->container_id) . '"';
+        }
 
         $code .= '>';
 
@@ -108,8 +108,6 @@ class Menu implements WidgetRenderer
      */
     public static function renderEditForm(Widget $widget)
     {
-        //        $extensions = App::make('registerMenuExtension')
-        //                         ->get();
         $content = new Content();
 
         // get list of all pages
@@ -117,11 +115,10 @@ class Menu implements WidgetRenderer
                          ->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"
@@ -129,7 +126,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]);
     }

app/Console/Commands/ChangePassword.php

@@ -14,13 +14,13 @@ class ChangePassword extends Command
      *
      * @var string
      */
-    protected $signature = 'user:change-password {userID} {newPassword}';
+    protected $signature = 'user:change-password {email}';
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Change password for user with given ID';
+    protected $description = 'Change password for user with given e-mail';
 
     /**
      * Execute the console command.
@@ -29,18 +29,26 @@ class ChangePassword extends Command
      */
     public function handle()
     {
-        $id = $this->argument('userID');
+        $email = $this->argument('email');
-        $newPassword = $this->argument('newPassword');
-
         try {
-            $user = User::findOrFail($id);
+            $user = User::where(['email' => $email])
+                        ->first();
         } catch (ModelNotFoundException $e) {
-            $this->error('Invalid user ID ' . $id . '. Please see table `users` for correct IDs.');
+            $this->error('Invalid user ' . $email . '.');
-            exit(1);
+            return;
         }
 
+        do {
+            $password = $this->secret('Password');
+            $passwordAgain = $this->secret('Password again');
+
+            if ($password !== $passwordAgain) {
+                $this->error('Passwords does not match');
+            }
+        } while ($passwordAgain !== $password || strlen($password) === 0);
+
         // set new password
-        $user->password = Hash::make($newPassword);
+        $user->password = Hash::make($password);
         $user->save();
 
         $this->info('Password successfully changed.');

app/Console/Commands/NewUser.php

@@ -2,11 +2,10 @@
 
 namespace App\Console\Commands;
 
-use App\Enumerations\UserRoles;
+use App\CMS\Enumerations\UserRoles;
 use App\Models\User;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Hash;
-use Symfony\Component\Console\Exception\InvalidArgumentException;
 
 class NewUser extends Command
 {
@@ -15,7 +14,7 @@ class NewUser extends Command
      *
      * @var string
      */
-    protected $signature = 'user:new {email} {password} {role}';
+    protected $signature = 'user:new {email}';
     /**
      * The console command description.
      *
@@ -25,21 +24,38 @@ class NewUser extends Command
 
     /**
      * Execute the console command.
-     *
-     * @return mixed
      */
     public function handle()
     {
         $email = $this->argument('email');
-        $password = $this->argument('password');
-        $role = $this->argument('role');
 
-        // check if given role is valid
+        // check if username is really email
-        $roles = UserRoles::getSimple();
+        if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
-        if (!in_array($role, $roles)) {
+            $this->error($email . ' is not a valid e-mail!');
-            throw new InvalidArgumentException('Invalid role specified. valid roles are: ' . implode(', ', $roles));
+            return;
         }
 
+        // ask for password
+        do {
+            $password = $this->secret('Password');
+            $passwordAgain = $this->secret('Password again');
+
+            if ($password !== $passwordAgain) {
+                $this->error('Passwords does not match');
+            }
+        } while ($passwordAgain !== $password || strlen($password) === 0);
+
+        // ask for role
+        $roles = UserRoles::getSimple();
+        do {
+            $role = $this->ask('Role (default ' . User::ROLE_ADMIN . '): ', User::ROLE_ADMIN);
+
+            // check if given role is valid
+            if (!in_array($role, $roles)) {
+                $this->error('Invalid role specified. valid roles are: ' . implode(', ', $roles));
+            }
+        } while (!in_array($role, $roles));
+
         // create new user
         $user = new User();
         $user->username = $user->email = $email;

app/CustomFields/BaseField.php

@@ -1,6 +0,0 @@
-<?php
-namespace App\CustomFields;
-
-class BaseField {
-
-}

app/Events/AssignWidget.php

@@ -2,7 +2,7 @@
 
 namespace App\Events;
 
-use App\Models\Widget;
+use App\Models\Widgets\Widget;
 use App\Models\WidgetArea;
 use Illuminate\Queue\SerializesModels;
 

app/Events/CreateNewContent.php

@@ -3,7 +3,7 @@
 namespace App\Events;
 
 use App\Events\Event;
-use App\Models\Content;
+use App\Models\Content\Content;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 

app/Events/CreateNewWidget.php

@@ -2,7 +2,7 @@
 
 namespace App\Events;
 
-use App\Models\Widget;
+use App\Models\Widgets\Widget;
 use Illuminate\Queue\SerializesModels;
 
 class CreateNewWidget extends Event

app/Events/DeleteContent.php

@@ -2,7 +2,7 @@
 
 namespace App\Events;
 
-use App\Models\Content;
+use App\Models\Content\Content;
 use Illuminate\Queue\SerializesModels;
 
 class DeleteContent extends Event

app/Events/EditContent.php

@@ -2,7 +2,7 @@
 
 namespace App\Events;
 
-use App\Models\Content;
+use App\Models\Content\Content;
 use Illuminate\Queue\SerializesModels;
 
 class EditContent extends Event

app/Events/EditFile.php

@@ -3,7 +3,7 @@
 namespace App\Events;
 
 use App\Events\Event;
-use App\Models\File;
+use App\Models\FileManager\File;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 

app/Events/EditWidget.php

@@ -2,7 +2,7 @@
 
 namespace App\Events;
 
-use App\Models\Widget;
+use App\Models\Widgets\Widget;
 use Illuminate\Queue\SerializesModels;
 
 class EditWidget extends Event

app/Events/MakeDraftFromContent.php

@@ -2,7 +2,7 @@
 
 namespace App\Events;
 
-use App\Models\Content;
+use App\Models\Content\Content;
 use Illuminate\Queue\SerializesModels;
 
 class MakeDraftFromContent extends Event

app/Events/PublishContent.php

@@ -2,7 +2,7 @@
 
 namespace App\Events;
 
-use App\Models\Content;
+use App\Models\Content\Content;
 use Illuminate\Queue\SerializesModels;
 
 class PublishContent extends Event

app/Events/RemoveWidgetFromArea.php

@@ -2,7 +2,7 @@
 
 namespace App\Events;
 
-use App\Models\Widget;
+use App\Models\Widgets\Widget;
 use App\Models\WidgetArea;
 use Illuminate\Queue\SerializesModels;
 

app/Events/SetHomepage.php

@@ -3,7 +3,7 @@
 namespace App\Events;
 
 use App\Events\Event;
-use App\Models\Content;
+use App\Models\Content\Content;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 

app/Http/Controllers/Admin/ActionLog/Overview.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Admin\ActionLog;
 
 use App\Http\Controllers\Admin\Controller;
-use App\Models\ActionLog;
+use App\Models\ActionLog\ActionLog;
 use App\Models\User;
 use Illuminate\Support\Facades\Input;
 

app/Http/Controllers/Admin/Contents/ContentOverview.php

@@ -1,9 +1,9 @@
 <?php
 namespace App\Http\Controllers\Admin\Contents;
 
-use App\Enumerations\ContentStatuses;
+use App\CMS\Enumerations\ContentStatuses;
 use App\Http\Controllers\Admin\Controller;
-use App\Models\Content;
+use App\Models\Content\Content;
 use App\Models\Module;
 use Illuminate\Support\Facades\Input;
 

app/Http/Controllers/Admin/Contents/CreateNewContent.php

@@ -1,13 +1,13 @@
 <?php
 namespace App\Http\Controllers\Admin\Contents;
 
-use App\Enumerations\ContentStatuses;
+use App\CMS\Enumerations\ContentStatuses;
 use App\Events\CreateNewContent as CreateNewContentEvent;
-use App\Helpers\CurrentTemplate;
+use App\CMS\Helpers\CurrentTemplate;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\CreateNewContentRequest;
-use App\Models\Content;
+use App\Models\Content\Content;
-use App\Models\File;
+use App\Models\FileManager\File;
 use App\Models\Module;
 use App\Models\Template;
 use Illuminate\Support\Facades\Event;

app/Http/Controllers/Admin/Contents/EditContent.php

@@ -1,20 +1,20 @@
 <?php
 namespace App\Http\Controllers\Admin\Contents;
 
-use App\Enumerations\ContentStatuses;
+use App\CMS\Enumerations\ContentStatuses;
 use App\Events\AttemptToEditInvalidContent;
 use App\Events\DeleteContent;
 use App\Events\EditContent as EditContentEvent;
 use App\Events\MakeDraftFromContent;
 use App\Events\PublishContent;
 use App\Events\SetHomepage;
-use App\Helpers\CurrentTemplate;
+use App\CMS\Helpers\CurrentTemplate;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\EditContentRequest;
 use App\Http\Requests\Request;
-use App\Models\Content;
+use App\Models\Content\Content;
-use App\Models\ContentHistory;
+use App\Models\Content\ContentHistory;
-use App\Models\File;
+use App\Models\FileManager\File;
 use App\Models\Module;
 use App\Models\Template;
 use Illuminate\Support\Facades\Event;

app/Http/Controllers/Admin/Contents/History.php

@@ -2,8 +2,8 @@
 namespace App\Http\Controllers\Admin\Contents;
 
 use App\Http\Controllers\Admin\Controller;
-use App\Models\Content;
+use App\Models\Content\Content;
-use App\Models\ContentHistory;
+use App\Models\Content\ContentHistory;
 
 class History extends Controller
 {

app/Http/Controllers/Admin/Controller.php

@@ -12,6 +12,5 @@ abstract class Controller extends BaseController
      */
     public function __construct()
     {
-
     }
 }

app/Http/Controllers/Admin/CustomFields/CreateNewCustomField.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Admin\CustomFields;
 
-use App\Enumerations\CustomFieldResources;
+use App\CMS\Enumerations\CustomFieldResources;
-use App\Enumerations\CustomFieldTypes;
+use App\CMS\Enumerations\CustomFieldTypes;
 use App\Events\CreateNewCustomField as CreateNewCustomFieldEvent;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\NewCustomFieldRequest;

app/Http/Controllers/Admin/CustomFields/CustomFieldsOverview.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Admin\CustomFields;
 
-use App\Enumerations\CustomFieldResources;
+use App\CMS\Enumerations\CustomFieldResources;
-use App\Enumerations\CustomFieldTypes;
+use App\CMS\Enumerations\CustomFieldTypes;
 use App\Http\Controllers\Admin\Controller;
 use App\Models\CustomField;
 

app/Http/Controllers/Admin/CustomFields/EditCustomField.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Admin\CustomFields;
 
-use App\Enumerations\CustomFieldResources;
+use App\CMS\Enumerations\CustomFieldResources;
-use App\Enumerations\CustomFieldTypes;
+use App\CMS\Enumerations\CustomFieldTypes;
 use App\Events\DeleteCustomField;
 use App\Events\EditCustomField as EditCustomFieldEvent;
 use App\Http\Controllers\Admin\Controller;

app/Http/Controllers/Admin/FileManager/CreateNewDirectory.php

@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Admin\FileManager;
 
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests;
-use App\Models\Directory;
+use App\Models\FileManager\Directory;
 
 class CreateNewDirectory extends Controller
 {

app/Http/Controllers/Admin/FileManager/EditDirectory.php

@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Admin\FileManager;
 
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests;
-use App\Models\Directory;
+use App\Models\FileManager\Directory;
 
 class EditDirectory extends Controller
 {

app/Http/Controllers/Admin/FileManager/EditUploadedFile.php

@@ -3,10 +3,10 @@
 namespace App\Http\Controllers\Admin\FileManager;
 
 use App\Events\EditFile;
-use App\Helpers\FileManager;
+use App\CMS\Helpers\FileManager;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\EditUploadedFileRequest;
-use App\Models\File;
+use App\Models\FileManager\File;
 use Illuminate\Support\Facades\Event;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;