FEATURE: refactorize settings

app/CMS/Handlers/Registrators/SearchEngineRegistrator.php

@@ -1,7 +1,7 @@
 <?php
 namespace App\CMS\Handlers\Registrators;
 
-use App\CMS\Enumerations\Exceptions\EnumerationExistsException;
+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;

app/CMS/Helpers/CurrentTemplate.php

@@ -22,16 +22,9 @@ class CurrentTemplate implements TemplateHandler
     {
         if (!self::$initialized) {
                 self::$template = Cache::rememberForever('current-template', function () {
-                    $template = Module::where('is_template', true)
+                    return Module::where('is_template', true)
                           ->where('enabled', true)
                           ->first();
-
-                    // todo remove after adding $casts into Module model
-                    if ($template) {
-                        $template->module_settings = json_decode($template->module_settings);
-                    }
-
-                    return $template;
                 });
 
 

app/CMS/Helpers/Settings.php

@@ -2,6 +2,7 @@
 
 namespace App\CMS\Helpers;
 
+use App\CMS\Repositories\Settings\Settings as SettingsRepository;
 use App\Models\Settings as SettingsModel;
 use Illuminate\Support\Facades\Cache;
 
@@ -78,8 +79,7 @@ class Settings
     {
         if (!self::$initialized) {
             self::$settings = Cache::remember('settings', config('cache.settingCacheLifetime'), function () {
-                $model = new SettingsModel();
-                return $model->getAll();
+                app(SettingsRepository::class)->getAll();
             });
         }
     }

app/CMS/Helpers/WidgetAreas.php

@@ -27,12 +27,12 @@ class WidgetAreas
 
     protected static function loadWidgetArea($uniqueCode)
     {
-        dd($uniqueCode);
         WidgetArea::where('code', $uniqueCode)
                   ->increment('viewed');
 
         $widgets = Cache::remember('widget-area-' . $uniqueCode, setting('widgetCacheLifetime', 5), function () use ($uniqueCode) {
-            $widgetArea = new WidgetArea();
+            $widgetArea = app(\App\CMS\Repositories\Widgets\WidgetArea::class);
+
             return $widgetArea->getWidgets($uniqueCode)
                               ->get();
         });
@@ -69,6 +69,8 @@ class WidgetAreas
             self::initWidgetAreas();
         }
 
+//        dd($uniqueCode);
+
         if (!isset(self::$widgetAreas[$uniqueCode])) {
             self::loadWidgetArea($uniqueCode);
         }

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

@@ -31,22 +31,13 @@ class CreateDirectory implements Interaction
     {
         $data['parentDirectory'] = isset($data['parentDirectory']) ? $data['parentDirectory'] : null;
 
-        // todo this should probably go into validation, but we are not able to get $data in getValidationRules
         // check if created folder does not exist in current directory
         if ($this->repository->checkIfNameExists($data['name'], $data['parentDirectory'])) {
             throw new SubdirectoryExistsInDirectory();
         }
 
-        // todo use Directory::create() and rename columns/fields in request
         // create new database entry
-        $directory = new Directory();
-        $directory->name = $data['name'];
-        $directory->parent_id = $data['parentDirectory'];
-        $directory->user_id = \Auth::user()->id;
-        $directory->description = $data['description'];
-        $directory->save();
-
-        return $directory;
+        return $this->repository->create($data);
     }
 
     /**

app/CMS/MenuPresenters/FoundationDrilldownMenuPresenter.php

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

app/CMS/MenuPresenters/FoundationDropdownMenuPresenter.php

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

app/CMS/MenuPresenters/MetismenuPresenter.php

@@ -1,8 +1,8 @@
 <?php
 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\CMS\MenuPresenters;
 
-use Pingpong\Menus\MenuItem;
-use Pingpong\Menus\Presenters\Presenter;
+use Nwidart\Menus\MenuItem;
+use Nwidart\Menus\Presenters\Presenter;
+
 
 class ProfileMenuPresenter extends Presenter
 {

app/CMS/Modules/ServiceProviders/ServiceProvider.php

@@ -1,13 +1,13 @@
 <?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;
@@ -20,7 +20,6 @@ abstract class ModuleServiceProvider extends ServiceProvider
 
     /**
      * Boot the application events.
-     *
      * @return void
      */
     public function boot()
@@ -35,7 +34,6 @@ abstract class ModuleServiceProvider extends ServiceProvider
 
     /**
      * Register config.
-     *
      * @return void
      */
     protected function registerConfig()
@@ -50,7 +48,6 @@ abstract class ModuleServiceProvider extends ServiceProvider
 
     /**
      * Register views.
-     *
      * @return void
      */
     protected function registerViews()
@@ -69,7 +66,6 @@ abstract class ModuleServiceProvider extends ServiceProvider
 
     /**
      * Register translations.
-     *
      * @return void
      */
     protected function registerTranslations()

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__;
+    }
+}

app/CMS/Modules/Stubs/Repositories/$Module$Repository.stub

@@ -0,0 +1,24 @@
+<?php
+namespace Modules\$ModuleNamespace$\Repositories;
+
+use $EntityNamespace$\$Entity$ as $Entity$Entity;
+
+class $Module$Repository {
+    /**
+     * Create new instance of entity
+     *
+     * @param $data
+     */
+    public function create($data) {
+        $Entity$Entity::create($data);
+    }
+
+    /**
+     * Update entity
+     *
+     * @param $Entity$Entity $entity
+     */
+    public function update($Entity$Entity $entity, $data) {
+        $entity->update($data);
+    }
+}

app/CMS/Modules/Stubs/Resources/lang/cs/$module$.stub

@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'name' => '$Module$',
+    'new' => 'Vytvořit nový',
+    'description' => '',
+    'successfullyUpdated' => 'Úspěšně upraveno.',
+    'successfullyCreated' => 'Úspěšně vytvořeno.',
+    'successfullyDeleted' => 'Úspěšně smazáno.',
+    'overview' => 'Přehled',
+    'noItems' => 'Žádná data.',
+    'save' => 'Uložit'
+];

app/CMS/Modules/Stubs/Resources/views/admin/create.blade.stub

@@ -0,0 +1,7 @@
+@extends('admin.layoutWithNavigation')
+
+@section('pageHeading', @trans('$module$::$module$.name'))
+
+@section('content')
+    @include('$module$::admin/form', ['action' => route('$module$.new')])
+@endsection

app/CMS/Modules/Stubs/Resources/views/admin/edit.blade.stub

@@ -0,0 +1,7 @@
+@extends('admin.layoutWithNavigation')
+
+@section('pageHeading', @trans('$module$::$module$.name'))
+
+@section('content')
+    @include('$module$::admin/form', ['action' => route('$module$.update')])
+@endsection

app/CMS/Modules/Stubs/Resources/views/admin/form.blade.stub

@@ -0,0 +1,6 @@
+<form action="{{$action}}" method="post">
+
+    {{--...--}}
+
+    <input type="submit" class="btn btn-primary" value="@lang('$module$::$module$.save')">
+</form>

app/CMS/Modules/Stubs/Resources/views/admin/index.blade.stub

@@ -0,0 +1,17 @@
+@extends('admin.layoutWithNavigation')
+
+@section('pageHeading', @trans('$module$::$module$.overview'))
+
+@section('content')
+    @if (!empty($items))
+    <table>
+            @foreach($items as $item)
+
+            @endforeach
+    </table>
+    @else
+        <div class="alert alert-info">
+            <em>@trans('$module$::$module$.noItems')</em>
+        </div>
+    @endif
+@endsection

app/CMS/Pipeline/SavePipeline/Process/UploadRelatedFiles.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace App\CMS\Pipeline\SavePipeline\Process;
 
 use App\CMS\Contracts\Content\SavePipeline\Process;
@@ -19,6 +20,10 @@ class UploadRelatedFiles implements Process
      */
     function handle(Content & $page, array & $input)
     {
+        if (!isset($input['files'])) {
+            return;
+        }
+
         $files = $input['files'];
         $assignedFiles = isset($input['keepAssigned']) ? $input['keepAssigned'] : [];
 

app/CMS/Repositories/FileManager/Directory.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace App\CMS\Repositories\FileManager;
 
 use App\CMS\Helpers\RootDirectory;
@@ -25,7 +26,33 @@ class Directory
         return $exists->exists();
     }
 
-    public function update(DirectoryModel $directory, $data) {
+    /**
+     * Create new directory
+     *
+     * @param $data
+     *
+     * @return DirectoryModel
+     */
+    public function create($data)
+    {
+        $directory = new DirectoryModel();
+        $directory->name = $data['name'];
+        $directory->parent_id = $data['parentDirectory'];
+        $directory->user_id = \Auth::user()->id;
+        $directory->description = $data['description'];
+        $directory->save();
+
+        return $directory;
+    }
+
+    /**
+     * Update given directory
+     *
+     * @param DirectoryModel $directory
+     * @param                $data
+     */
+    public function update(DirectoryModel $directory, $data)
+    {
         $directory->name = $data['name'];
         $directory->description = $data['description'];
         $directory->save();

app/CMS/Repositories/FileManager/File.php

@@ -0,0 +1,16 @@
+<?php
+namespace App\CMS\Repositories\FileManager;
+
+use App\Models\FileManager\File as FileModel;
+
+class File {
+    /**
+     * Update given instance of File
+     *
+     * @param FileModel $file
+     * @param           $data
+     */
+    public function update(FileModel $file, $data) {
+        $file->update($data);
+    }
+}

app/CMS/Repositories/Settings/Settings.php

@@ -1,14 +1,14 @@
 <?php
-namespace App\Models\ModelTraits;
+
+namespace App\CMS\Repositories\Settings;
 
 use App\Models\Settings as SettingsModel;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 
-trait Settings
+class Settings
 {
     /**
      * Prepares common query for selecting settings
-     *
      * @return mixed
      */
     protected function getSettingsQuery()
@@ -21,7 +21,6 @@ trait Settings
 
     /**
      * Load all settings
-     *
      * @return \stdClass
      */
     public function getAll()
@@ -34,7 +33,6 @@ trait Settings
 
     /**
      * Get all settings with language info
-     *
      * @return \stdClass
      */
     public function getAllWithLanguage()
@@ -55,7 +53,6 @@ trait Settings
 
     /**
      * Load only config for views
-     *
      * @return \stdClass
      */
     public function getForView()
@@ -83,4 +80,29 @@ trait Settings
 
         return $data;
     }
+
+    /**
+     * Save settings
+     *
+     * @param array $data
+     */
+    public function save(array $data)
+    {
+        $commonSettings = isset($data['commonSettings']) ? $data['commonSettings'] : [];
+        unset($data['commonSettings']);
+
+        foreach ($data as $key => $value) {
+            // select language for this setting key
+            $language = isset($commonSettings[$key]) ? null : LaravelLocalization::getCurrentLocale();
+            $setting = SettingsModel::firstOrNew(['language' => $language, 'key' => $key]);
+
+            if ($setting->value == $value) {
+                continue;
+            }
+
+            // set value and save or delete
+            $setting->value = $value;
+            empty($value) ? $setting->delete() : $setting->save();
+        }
+    }
 }

app/CMS/Repositories/Users/User.php

@@ -0,0 +1,65 @@
+<?php
+namespace App\CMS\Repositories\Users;
+
+use App\CMS\Repositories\Repository;
+use App\Models\User as UserModel;
+use Illuminate\Support\Facades\Hash;
+
+class User extends Repository {
+    /**
+     * Update given user
+     *
+     * @param UserModel        $user
+     * @param                  $data
+     */
+    public function update(UserModel $user, $data) {
+        // update username if set
+        if (isset($data['username'])) {
+            $user->username = $data['username'];
+        }
+
+        // change name (if set)
+        if (isset($data['name'])) {
+            $user->name = $data['name'];
+        }
+
+        if (isset($data['role'])) {
+            $user->role = $data['role'];
+        }
+
+        if (isset($data['status'])) {
+            $user->status = $data['status'];
+        }
+
+        if (isset($data['password'])) {
+            $user->password = Hash::make($data['password']);
+        }
+
+        $user->email = $data['email'];
+
+        $user->save();
+    }
+
+    /**
+     * Create new user
+     *
+     * @param $data
+     *
+     * @return UserModel
+     */
+    public function create($data)
+    {
+        // create new user
+        $user = new UserModel();
+        $user->name = $data['name'];
+        $user->email = $data['email'];
+        $user->username = $data['username'];
+        $user->role = $data['role'];
+        $user->password = Hash::make($data['password']);
+
+        // store user into database
+        $user->save();
+
+        return $user;
+    }
+}

app/Console/Commands/Modules/CreateNew.php

@@ -0,0 +1,116 @@
+<?php
+
+namespace App\Console\Commands\Modules;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Str;
+
+class CreateNew extends Command
+{
+    /**
+     * The name and signature of the console command.
+     * @var string
+     */
+    protected $signature = 'module:new 
+    {name : module name} 
+    {parentModule? : name of parent module} 
+    {--entity= : entity}';
+    /**
+     * The console command description.
+     * @var string
+     */
+    protected $description = 'Create new CMS module.';
+    protected $moduleName;
+    protected $moduleNamespace;
+    protected $entity;
+    protected $entityNamespace;
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $defaultEntityNamespace = $this->loadArguments();
+        $path = preg_replace('|/{2,}|i', '/', config('modules.paths.modules') . '/' . $this->moduleNamespace);
+
+        if (is_dir($path)) {
+            $this->error('Module already exists in ' . $path);
+            return;
+        }
+
+        // copy stub files
+        \File::copyDirectory(config('modules.paths.stubs'), $path);
+
+        $files = \File::allFiles($path);
+        foreach ($files as $file) {
+            $newName = str_replace('stub', 'php', $this->replacePlaceholders($file->getPathname()));
+
+            // ignore new entity when using existing entity
+            if ($this->entityNamespace != $defaultEntityNamespace && Str::contains('Entities', $file)) {
+                \File::delete($file);
+                continue;
+            }
+
+            // rename file
+            \File::move($file, $newName);
+
+            // change its content
+            $content = file_get_contents($newName);
+            $content = $this->replacePlaceholders($content);
+            file_put_contents($newName, $content);
+        }
+
+        $this->info('Module successfully created.');
+    }
+
+    /**
+     * Find and replace all placeholders in given content
+     *
+     * @param $content
+     *
+     * @return mixed
+     */
+    private function replacePlaceholders($content)
+    {
+        $replace = [
+            '$Module$'          => $this->moduleName,
+            '$ModuleNamespace$' => str_replace('/', '\\', $this->moduleNamespace),
+            '$module$'          => strtolower($this->moduleName),
+            '$EntityNamespace$' => $this->entityNamespace,
+            '$Entity$'          => $this->entity
+        ];
+
+        foreach ($replace as $what => $for) {
+            $content = str_replace($what, $for, $content);
+        }
+
+        return $content;
+    }
+
+    /**
+     * Load command arguments
+     * @return string
+     */
+    private function loadArguments()
+    {
+        $parent = $this->argument('parentModule');
+        $this->moduleName = $moduleName = $this->argument('name');
+        $this->moduleNamespace = trim($parent . '/' . $moduleName, '/');
+
+        $entity = $this->option('entity');
+
+        $defaultEntityNamespace = '\\Modules\\' . str_replace('/', '\\', $this->moduleNamespace) . '\Entities\\';
+
+        if (!empty($entity)) {
+            $parts = explode('\\', $entity);
+            $this->entity = $parts[count($parts) - 1];
+            unset($parts[count($parts) - 1]);
+            $this->entityNamespace = implode('\\', $parts);
+        } else {
+            $this->entityNamespace = $defaultEntityNamespace;
+            $this->entity = $this->moduleName;
+        }
+
+        return $defaultEntityNamespace;
+    }
+}

app/Console/Commands/Modules/DisableModule.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Console\Commands\Modules;
+
+use App\Models\Module;
+use Illuminate\Console\Command;
+
+class DisableModule extends Command
+{
+    /**
+     * The name and signature of the console command.
+     * @var string
+     */
+    protected $signature = 'module:disable {module}';
+    /**
+     * The console command description.
+     * @var string
+     */
+    protected $description = 'Disable module';
+
+    /**
+     * Execute the console command.
+     * @return mixed
+     */
+    public function handle()
+    {
+        $moduleName = $this->argument('module');
+        $module = Module::where('static_name', $moduleName)
+                        ->firstOrFail();
+
+        if ($module->has_submodules) {
+            $submodules = $module->submodules;
+
+            foreach ($submodules as $submodule) {
+                $this->call('module:disable', ['module' => $submodule->static_name]);
+            }
+        }
+
+        $module->enabled = false;
+        $module->save();
+
+        $this->line('Module ' . $module->static_name . ' disabled.');
+    }
+}

app/Console/Commands/Modules/EnableModule.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Console\Commands\Modules;
+
+use App\Models\Module;
+use Illuminate\Console\Command;
+
+class EnableModule extends Command
+{
+    /**
+     * The name and signature of the console command.
+     * @var string
+     */
+    protected $signature = 'module:enable {module}';
+    /**
+     * The console command description.
+     * @var string
+     */
+    protected $description = 'Enable module';
+
+    /**
+     * Execute the console command.
+     * @return mixed
+     */
+    public function handle()
+    {
+        $moduleName = $this->argument('module');
+        $module = Module::where('static_name', $moduleName)
+                        ->firstOrFail();
+
+        if ($module->has_submodules) {
+            $submodules = $module->submodules;
+
+            foreach ($submodules as $submodule) {
+                $this->call('module:enable', ['module' => $submodule->static_name]);
+            }
+        }
+
+        if ($module->parent_id) {
+            $module->parent->update(['enabled' => true]);
+        }
+
+        $module->enabled = true;
+        $module->save();
+
+        $this->line('Module ' . $module->static_name . ' enabled.');
+    }
+}

app/Console/Commands/Modules/InstallAllModules.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Modules;
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
@@ -12,7 +12,7 @@ class InstallAllModules extends Command
      *
      * @var string
      */
-    protected $signature = 'install-all-modules';
+    protected $signature = 'module:install-all';
     /**
      * The console command description.
      *
@@ -20,16 +20,6 @@ class InstallAllModules extends Command
      */
     protected $description = 'Crawl /modules directory and install all modules';
 
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
     /**
      * Execute the console command.
      *
@@ -45,7 +35,7 @@ class InstallAllModules extends Command
 
             // try to install each module
             try {
-                $this->call('install-module', ['name' => $moduleName]);
+                $this->call('module:install', ['name' => $moduleName]);
             } catch (\Exception $e) {
                 $this->line('Module ' . $moduleName . ' already installed.');
             }

app/Console/Commands/Modules/InstallModule.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Modules;
 
 use App\Models\Module;
+use App\ModuleManager\Installer;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Support\Facades\Cache;
@@ -17,7 +18,7 @@ class InstallModule extends Command
      *
      * @var string
      */
-    protected $signature = 'install-module {name} {parentModuleId?}';
+    protected $signature = 'module:install {name} {parentModuleId?}';
     /**
      * The console command description.
      *
@@ -154,14 +155,12 @@ class InstallModule extends Command
         if (is_null($module)) {
             // insert module into database
             $settings = [
-                'staticName' => $this->moduleName,
                 'providers'  => $providers,
-                'aliases'    => isset($config['aliases']) ? $config['aliases'] : [],
                 'order'      => isset($config['order']) ? $config['order'] : 0,
                 'files'      => isset($config['files']) ? $config['files'] : []
             ];
 
-            $module = Module::install($name, $alias, $description, $handler, $this->parentModuleId, $settings);
+            $module = Installer::install($name, $alias, $this->moduleName, $description, $handler, $this->parentModuleId, $settings);
         }
 
         // try to install submodules
@@ -184,7 +183,7 @@ class InstallModule extends Command
             $submodule = str_replace($this->modulesPath . DIRECTORY_SEPARATOR, '', $submodulePath);
 
             try {
-                $this->call('install-module', ['name' => $submodule, 'parentModuleId' => $parentModule->id]);
+                $this->call('module:install', ['name' => $submodule, 'parentModuleId' => $parentModule->id]);
             } catch (\Exception $e) {
                 $this->error($e->getMessage());
             }

app/Console/Commands/Modules/ModuleMigrate.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Console\Commands\Modules;
+
+use App\Models\Module;
+use Illuminate\Console\Command;
+
+class ModuleMigrate extends Command
+{
+    /**
+     * The name and signature of the console command.
+     * @var string
+     */
+    protected $signature = 'module:migrate {module}';
+    /**
+     * The console command description.
+     * @var string
+     */
+    protected $description = 'Run migrations in specified module';
+
+    /**
+     * Execute the console command.
+     * @return mixed
+     */
+    public function handle()
+    {
+        $moduleName = $this->argument('module');
+        $module = Module::where('static_name', $moduleName)
+                        ->firstOrFail();
+
+        if ($module->has_submodules) {
+            $submodules = $module->submodules;
+
+            foreach ($submodules as $submodule) {
+                $this->call('module:migrate', ['module' => $submodule->static_name]);
+            }
+        }
+
+        $this->line('Migrating ' . $module->static_name);
+        $this->call('migrate', ['--path' => config('modules.paths.modules').'/'.$moduleName.'/Database']);
+    }
+}

app/Console/Commands/SetTemplate.php

@@ -3,6 +3,8 @@
 namespace App\Console\Commands;
 
 use App\Models\Module;
+use App\ModuleManager\Installer;
+use App\ModuleManager\Uninstaller;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Cache;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -43,14 +45,13 @@ class SetTemplate extends Command
         $config['staticName'] = $template;
 
         if ($current) {
-            $info = json_decode($current->module_settings);
-
-            $this->line('Template is already installed. Currently using template ' . trans($current->name) . ' located in /templates/' . $info->staticName . '.');
+            $this->line('Template is already installed. Currently using template ' . trans($current->name) . ' located in /templates/' . $current->static_name . '.');
             $confirm = $this->confirm('Uninstall it and install *' . trans($config['name']) . '*? All data associated with installed template will be lost!');
 
             if ($confirm) {
                 $this->line('Uninstalling ' . $current->name . '.');
-                $current->uninstall();
+
+                Uninstaller::uninstall($current);
             } else {
                 $this->line('Aborting installation.');
                 return;
@@ -58,7 +59,7 @@ class SetTemplate extends Command
         }
 
         try {
-            Module::install($config['name'], $config['alias'], $config['description'], $config['handler'], false, $config);
+            Installer::install($config['name'], $config['alias'], $current->static_name, $config['description'], $config['handler'], false, $config);
         } catch (\Exception $e) {
             $this->error('Cannot install template ' . $template . '. Message: ' . $e->getMessage());
             return;
@@ -72,6 +73,8 @@ class SetTemplate extends Command
 
         // run again artisan for publishing resources
         // it cannot be done using $this->call, because we need to load different template into service providers
+        if ($publish) {
             exec('php artisan vendor:publish');
         }
+    }
 }

app/Console/Commands/UninstallModule.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class UninstallModule extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'command:name';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command description';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        //
+    }
+}

app/Console/Kernel.php

@@ -2,6 +2,10 @@
 
 namespace App\Console;
 
+use App\Console\Commands\Modules\CreateNew;
+use App\Console\Commands\Modules\DisableModule;
+use App\Console\Commands\Modules\EnableModule;
+use App\Console\Commands\Modules\ModuleMigrate;
 use App\Console\Commands\PublishTemplateResources;
 use App\Console\Commands\TemplateInfo;
 use Illuminate\Console\Scheduling\Schedule;
@@ -11,14 +15,17 @@ class Kernel extends ConsoleKernel
 {
     /**
      * The Artisan commands provided by your application.
-     *
      * @var array
      */
     protected $commands = [
         Commands\NewUser::class,
         Commands\ChangePassword::class,
-        Commands\InstallModule::class,
-        Commands\InstallAllModules::class,
+        CreateNew::class,
+        ModuleMigrate::class,
+        EnableModule::class,
+        DisableModule::class,
+        Commands\Modules\InstallModule::class,
+        Commands\Modules\InstallAllModules::class,
         Commands\TranslateDirectory::class,
         Commands\TranslateAll::class,
         Commands\InitDatabaseSchema::class,
@@ -37,7 +44,5 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        // $schedule->command('inspire')
-        //          ->hourly();
     }
 }

app/Events/UploadFile.php

@@ -2,37 +2,33 @@
 
 namespace App\Events;
 
+use App\Models\FileManager\File as FileModel;
 use Illuminate\Queue\SerializesModels;
-use Symfony\Component\HttpFoundation\File\File;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class UploadFile extends Event
 {
     use SerializesModels;
-    /**
-     * @var UploadedFile
-     */
     public $uploadedFile;
     /**
-     * @var
+     * @var FileModel
      */
-    public $id;
+    public $file;
 
     /**
      * Create a new event instance.
      *
-     * @param File $uploadedFile
+     * @param FileModel                    $file
      * @param                              $id
+     *
+     * @internal param File $uploadedFile
      */
-    public function __construct(File $uploadedFile, $id)
+    public function __construct(FileModel $file)
     {
-        $this->uploadedFile = $uploadedFile;
-        $this->id = $id;
+        $this->file = $file;
     }
 
     /**
      * Get the channels the event should be broadcast on.
-     *
      * @return array
      */
     public function broadcastOn()

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

@@ -7,6 +7,8 @@ use App\CMS\Interactions\Admin\Content\ChangeStatus;
 use App\CMS\Interactions\Admin\Content\DeletePage;
 use App\CMS\Interactions\Admin\Content\SetHomepage;
 use App\Http\Controllers\Admin\Controller;
+use App\Models\Content\Content;
+use App\Models\Content\ContentHistory;
 
 class ContentActions extends Controller
 {
@@ -25,15 +27,13 @@ class ContentActions extends Controller
      * This method is called in static page overview from quick actions. It checks if status is valid, if page exists
      * and updates status.
      *
-     * @param $id
+     * @param Content $page
      * @param         $status
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function changeStatus($id, $status)
+    public function changeStatus(Content $page, $status)
     {
-        $page = $this->content->getOne($id);
-
         Interaction::handle(ChangeStatus::class, ['status' => $status], $page);
 
         // redirect back to overview with info for user
@@ -45,14 +45,12 @@ class ContentActions extends Controller
     /**
      * Delete page
      *
-     * @param $id
+     * @param Content $page
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function delete($id)
+    public function delete(Content $page)
     {
-        $page = $this->content->getOne($id);
-
         Interaction::handle(DeletePage::class, [], $page);
 
         // redirect back to overview with info for user
@@ -66,14 +64,12 @@ class ContentActions extends Controller
     /**
      * Sets page as homepage
      *
-     * @param $id
+     * @param Content $page
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function setHomepage($id)
+    public function setHomepage(Content $page)
     {
-        $page = $this->content->getOne($id);
-
         Interaction::handle(SetHomepage::class, [], $page);
 
         // redirect back to overview with info for user

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

@@ -5,6 +5,7 @@ use App\CMS\Contracts\Repositories\Content as IContent;
 use App\CMS\Contracts\Repositories\Module as IModule;
 use App\CMS\Enumerations\ContentStatuses;
 use App\Http\Controllers\Admin\Controller;
+use App\Models\Module;
 
 class ContentOverview extends Controller
 {
@@ -26,19 +27,19 @@ class ContentOverview extends Controller
     /**
      * Overview for all content pages.
      *
-     * @param null|int $moduleId
+     * @param Module|null $module
      * @param null        $status
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @internal param int|null $moduleId
      */
-    public function index($moduleId = null, $status = null)
+    public function index(Module $module = null, $status = null)
     {
         // get module settings
-        $module = $this->module->getOne($moduleId);
         $pageHeading = $this->module->getOverviewTitle($module);
 
         // get pages for overview
-        $handler = $module !== null ? $module->handler : null;
+        $handler = $module->exists ? $module->handler : null;
         $pages = $this->content->getOverview($handler, [$status])
                                ->paginate(setting('paginatedResults', 20));
 

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

@@ -10,6 +10,7 @@ use App\Cms\Interactions\Admin\Content\NewContent;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\CreateNewContentRequest;
 use App\Http\Requests\Request;
+use App\Models\Module;
 use Modules\Categories\Contracts\Repositories\Category as ICategory;
 
 /**
@@ -67,9 +68,8 @@ class CreateNewContent extends Controller
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function create($module)
+    public function create(Module $module)
     {
-        $module = $this->module->getOne($module);
         $statuses = ContentStatuses::getWithTranslations();
         $pageHeading = $this->module->getCreateContentTitle($module);
         $templates = $this->template->getForModule($module);
@@ -95,15 +95,14 @@ class CreateNewContent extends Controller
     /**
      * Save new content page
      *
-     * @param CreateNewContentRequest    $request
-     * @param                            $moduleId
+     * @param CreateNewContentRequest|Request $request
+     * @param Module                          $module
      *
      * @return \Illuminate\Http\RedirectResponse
+     * @internal param $moduleId
      */
-    public function store(Request $request, $moduleId)
+    public function store(Request $request, Module $module)
     {
-        $module = $this->module->getOne($moduleId);
-
         // create new page
         Interaction::handle(NewContent::class, $request->all(), $module->handler);
 

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

@@ -17,6 +17,7 @@ use App\Models\Content\ContentHistory;
 use App\Models\FileManager\File;
 use Illuminate\Support\Facades\Event;
 use Modules\Categories\Contracts\Repositories\Category as ICategory;
+use Modules\Categories\Repositories\Category;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class EditContent extends Controller
@@ -58,7 +59,7 @@ class EditContent extends Controller
      * @param ICategory         $category
      * @param ITemplate         $template
      */
-    public function __construct(ContentHistory $history, File $file, IContent $content, IModuleRepository $module, ICategory $category, ITemplate $template)
+    public function __construct(ContentHistory $history, File $file, IContent $content, IModuleRepository $module, Category $category, ITemplate $template)
     {
         $this->history = $history;
         $this->file = $file;
@@ -71,14 +72,13 @@ class EditContent extends Controller
     /**
      * Display form for editing static page
      *
-     * @param $id
+     * @param Content $page
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function edit($id)
+    public function edit(Content $page)
     {
         $statuses = ContentStatuses::getWithTranslations();
-        $page = $this->content->getOne($id);
 
         // get module ID
         $module = $this->module->getByHandler($page->moduleHandler);
@@ -105,29 +105,14 @@ class EditContent extends Controller
     /**
      * Edit static page and save changes into history.
      *
-     * @param EditContentRequest    $request
-     * @param                       $id
+     * @param EditContentRequest|Request $request
+     * @param Content                    $page
      *
      * @return \Illuminate\Http\RedirectResponse
+     * @internal param $id
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, Content $page)
     {
-        try {
-            /**
-             * @var $page Content
-             */
-            $page = $this->content->getOne($id);
-        } catch (NotFoundHttpException $e) {
-
-            // log attempt of invalid edit
-            Event::fire(new AttemptToEditInvalidContent($id));
-
-            // page for editing not found
-            return redirect()
-                ->route('content.overview')
-                ->with('error', trans('admin/contents.invalidPage'));
-        }
-
         // edit page
         Interaction::handle(EditContentInteraction::class, $request->all(), $page);
 

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

@@ -19,30 +19,31 @@ class History extends Controller
     }
 
     /**
-     * @param $id
+     * @param Content $page
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function getOverview($id)
+    public function getOverview(Content $page)
     {
-        // test if given content id is static page and if exists
-        $content = Content::findOrFail($id);
-
-        $history = $this->history->getStructuredHistoryOf($content);
+        $history = $this->history->getStructuredHistoryOf($page);
 
         return view('admin/history.overview', [
             'history' => $history,
-            'page'    => $content
+            'page'    => $page
         ]);
     }
 
-    public function getDiff($revision, $id)
+    /**
+     * @param ContentHistory $revision
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function getDiff(ContentHistory $revision)
     {
-        $change = $this->history->findOrFail($id);
-        $diff = $this->history->getDiff($change);
+        $diff = $this->history->getDiff($revision);
 
         return view('admin/history.diff', [
-            'change'     => $change,
+            'change'     => $revision,
             'diff'       => $diff
         ]);
     }

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

@@ -8,6 +8,7 @@ use App\CMS\Interactions\Admin\FileManager\CreateDirectory;
 use App\CMS\Repositories\FileManager\Directory as DirectoryRepository;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests;
+use App\Models\FileManager\Directory;
 use Illuminate\Http\Request;
 
 class CreateNewDirectory extends Controller
@@ -30,9 +31,10 @@ class CreateNewDirectory extends Controller
     /**
      * Create new directory
      *
-     * @param Requests\CreateNewDirectoryRequest $request
+     * @param Requests\CreateNewDirectoryRequest|Request $request
      *
      * @return $this|\Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
+     * @internal param Directory $parentDirectory
      */
     public function store(Request $request)
     {

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

@@ -5,19 +5,20 @@ namespace App\Http\Controllers\Admin\FileManager;
 use App\CMS\Repositories\FileManager\Directory as DirectoryRepository;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests;
+use App\Http\Requests\EditDirectoryRequest;
 use App\Models\FileManager\Directory;
 
 class EditDirectory extends Controller
 {
     /**
-     * @param Requests\EditDirectoryRequest $request
+     * @param EditDirectoryRequest $request
      * @param Directory                     $directory
      *
      * @return $this|\Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
      * @internal param $directoryId
      *
      */
-    public function update(Requests\EditDirectoryRequest $request, Directory $directory)
+    public function update(EditDirectoryRequest $request, Directory $directory)
     {
         $repository = app(DirectoryRepository::class);
         if ($repository->checkIfNameExists($request->name, $directory->parent_id, $directory->id)) {

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

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin\FileManager;
 
 use App\CMS\Helpers\FileManager;
 use App\CMS\Helpers\RootDirectory;
+use App\CMS\Repositories\FileManager\File as FileRepository;
 use App\Events\EditFile;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\EditUploadedFileRequest;
@@ -14,14 +15,12 @@ class EditUploadedFile extends Controller
 {
     /**
      * Edit form
-     *
      * Render edit form for displaying details and updating given file
      *
      * @param File $file
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\View\View
      * @internal param int $id file id
-     *
      */
     public function show(File $file)
     {
@@ -35,7 +34,6 @@ class EditUploadedFile extends Controller
 
     /**
      * Updates file
-     *
      * User can change only keywords, original filename and description. Mime type, hash and other fields remain
      * unchanged
      *
@@ -44,16 +42,11 @@ class EditUploadedFile extends Controller
      *
      * @return \Illuminate\Http\RedirectResponse
      * @internal param $id
-     *
      */
     public function update(EditUploadedFileRequest $request, File $file)
     {
-        // set values from form
-        $file->name = $request->name;
-        $file->keywords = $request->keywords;
-        $file->description = $request->description;
-        $file->directory_id = $request->directory_id;
-        $file->save();
+        $repository = app(FileRepository::class);
+        $repository->update($file, $request->all());
 
         // fire action
         Event::fire(new EditFile($file));

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

@@ -47,7 +47,7 @@ class UploadFile extends Controller
      */
     private function internalUpload(Request $request)
     {
-        try {
+//        try {
             $uploadedFiles = [];
             $files = $request->all()['files'];
 
@@ -62,9 +62,9 @@ class UploadFile extends Controller
             return redirect()
                 ->back()
                 ->with('success', trans_choice('admin/fileManager.uploadSuccessfull', $successfullUploads));
-        } catch (FileException $e) {
-            return $this->invalidUpload('invalidFile');
-        }
+//        } catch (FileException $e) {
+//            return $this->invalidUpload('invalidFile');
+//        }
     }
 
     /**

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

@@ -32,12 +32,12 @@ class UploadedFilesOverview extends Controller
      */
     public function index(Directory $directory = null)
     {
-        // include hidden directories?
-        $includeHidden = Input::get('hidden');
+//        dd($directory);
 
+        // include hidden directories?
         $subdirectories = $this->directoryRepository->getAllSubdirectories($directory);
 
-        if (!$includeHidden) {
+        if (!Input::get('hidden', true)) {
             $subdirectories = $subdirectories->where('hidden', false);
         }
 

app/Http/Controllers/Admin/Settings.php

@@ -2,15 +2,15 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\CMS\Repositories\Settings\Settings as SettingsRepository;
 use App\Http\Requests;
 use App\Models\Settings as SettingsModel;
 use Illuminate\Support\Facades\App;
-use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 
 class Settings extends Controller
 {
     /**
-     * @var SettingsModel
+     * @var SettingsRepository
      */
     protected $settings;
 
@@ -19,14 +19,13 @@ class Settings extends Controller
      *
      * @param SettingsModel $settings
      */
-    public function __construct(SettingsModel $settings)
+    public function __construct(SettingsRepository $settings)
     {
         $this->settings = $settings;
     }
 
     /**
      * Get overview (with form) for editing settings
-     *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function getOverview()
@@ -45,7 +44,6 @@ class Settings extends Controller
 
     /**
      * Save all settings (ignore empty ones)
-     *
      * When settings used to be non-empty string and user deletes it, key is also deleted from database
      *
      * @param Requests\SaveSettingsRequest $request
@@ -54,25 +52,7 @@ class Settings extends Controller
      */
     public function saveSettings(Requests\SaveSettingsRequest $request)
     {
-        $data = $request->all();
-        $commonSettings = isset($data['commonSettings']) ? $data['commonSettings'] : [];
-
-        // remove CSRF token field
-        unset($data['_token'], $data['commonSettings']);
-
-        foreach ($data as $key => $value) {
-            // select language for this setting key
-            $language = isset($commonSettings[$key]) ? null : LaravelLocalization::getCurrentLocale();
-            $setting = SettingsModel::firstOrNew(['language' => $language, 'key' => $key]);
-
-            if ($setting->value == $value) {
-                continue;
-            }
-
-            // set value and save or delete
-            $setting->value = $value;
-            empty($value) ? $setting->delete() : $setting->save();
-        }
+        $this->settings->save($request->except(['_token']));
 
         return redirect()
             ->route('settings.overview')

app/Http/Controllers/Admin/Templates/CopyTemplate.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Admin\Templates;
 
+use App\Cms\Repositories\Templates\Template as TemplateRepository;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\CopyTemplateRequest;
 use App\Models\Templates\Template;
@@ -10,7 +11,6 @@ class CopyTemplate extends Controller
 {
     /**
      * Method for copying given template.
-     *
      * This method is supposed to be called by POST method.
      *
      * @param CopyTemplateRequest $request
@@ -32,15 +32,22 @@ class CopyTemplate extends Controller
             $namespace .= '::';
         }
 
+        $repository = app(TemplateRepository::class);
+        $repository->setModel($template);
+
         // get template absolute paths
-        $realTemplatePath = $template->getPathToTemplate();
-        $customTemplatePath = $template->getPathToTemplate(Template::CUSTOM_EDIT_DIRECTORY);
+        $realTemplatePath = $repository->getPathToTemplate();
+        $customTemplatePath = $repository->getPathToTemplate(TemplateRepository::CUSTOM_EDIT_DIRECTORY);
         $path = dirname($customTemplatePath);
 
         // create file copy
         $data = file_get_contents($realTemplatePath);
-        $written = file_put_contents($path . DIRECTORY_SEPARATOR . $newName . Template::TEMPLATE_SUFFIX, $data);
 
+        if (!is_dir($path)) {
+            mkdir($path, 0777, true);
+        }
+
+        $written = file_put_contents($path . DIRECTORY_SEPARATOR . $newName . TemplateRepository::TEMPLATE_SUFFIX, $data);
         // were data written?
         if ($written === false) {
             return $this->copyFailed($request, $template);
@@ -67,7 +74,6 @@ class CopyTemplate extends Controller
      * @param Template            $template
      *
      * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
-     *
      */
     private function copyFailed(CopyTemplateRequest $request, Template $template)
     {

app/Http/Controllers/Admin/Templates/EditTemplate.php

@@ -34,13 +34,8 @@ class EditTemplate extends Controller
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function getEdit($template)
+    public function getEdit(Template $template)
     {
-        /**
-         * @var $template Template
-         */
-        $template = Template::findOrFail($template);
-
         $this->templateRepository->setModel($template);
 
         // load template content
@@ -59,15 +54,13 @@ class EditTemplate extends Controller
      * Save meta information about template and edited content
      *
      * @param EditTemplateRequest $request
-     * @param                     $templateId
+     * @param Template            $template
      *
      * @return \Illuminate\Http\RedirectResponse
+     * @internal param $templateId
      */
-    public function postEdit(EditTemplateRequest $request, $templateId)
+    public function postEdit(EditTemplateRequest $request, Template $template)
     {
-        // find template
-        $template = Template::findOrFail($templateId);
-
         // setup meta information
         $template->name = $request->name;
 

app/Http/Controllers/Admin/Templates/TemplateOverview.php

@@ -7,16 +7,21 @@ use App\Models\Templates\TemplatePath;
 
 class TemplateOverview extends Controller
 {
-    public function getPath($path)
+    /**
+     * Display overview of all templates in given path
+     *
+     * @param TemplatePath $templatePath
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function getPath(TemplatePath $templatePath)
     {
-        $path = TemplatePath::findOrFail($path);
-
         return view('admin.templates.list', [
-            'directory'      => $path,
-            'isWritable'     => is_writable(base_path($path->path)),
-            'templates'      => $path->templates()
+            'directory'      => $templatePath,
+            'isWritable'     => is_writable(base_path($templatePath->path)),
+            'templates'      => $templatePath->templates()
                                      ->get(),
-            'subdirectories' => $path->subdirectories()
+            'subdirectories' => $templatePath->subdirectories()
                                      ->get()
         ]);
     }

app/Http/Controllers/Admin/Users/CreateNewUser.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Admin\Users;
 
 use App\CMS\Enumerations\UserRoles;
+use App\CMS\Repositories\Users\User as UserRepository;
 use App\Events\CreateNewUser as CreateNewUserEvent;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\CreateNewUserRequest;
@@ -28,28 +29,21 @@ class CreateNewUser extends Controller
 
     /**
      * Create new user
-     *
      * This method saves new user into database
      *
      * @param CreateNewUserRequest $request
+     * @param UserRepository       $userRepository
      *
      * @return \Illuminate\Http\RedirectResponse
      */
-    protected function postRegistration(CreateNewUserRequest $request)
+    protected function postRegistration(CreateNewUserRequest $request, UserRepository $userRepository)
     {
         // when user did not provide any username, use his email
         $username = isset($request->username) && !empty($request->username) ? $request->username : $request->email;
 
-        // create new user
-        $user = new User();
-        $user->name = $request->name;
-        $user->email = $request->email;
-        $user->username = $username;
-        $user->role = $request->role;
-        $user->password = Hash::make($request->password);
-
-        // store user into database
-        $user->save();
+        $data = $request->all();
+        $data['username'] = $username;
+        $user = $userRepository->create($data);
 
         // fire event
         Event::fire(new CreateNewUserEvent($user));

app/Http/Controllers/Admin/Users/EditUser.php

@@ -4,25 +4,44 @@ namespace App\Http\Controllers\Admin\Users;
 
 use App\CMS\Enumerations\UserRoles;
 use App\CMS\Enumerations\UserStates;
+use App\CMS\Repositories\Users\User as UserRepository;
 use App\Events\EditUser as EditUserEvent;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\EditUserRequest;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Event;
-use Illuminate\Support\Facades\Hash;
 
 class EditUser extends Controller
 {
-    public function getEditUser($id = null)
+    /**
+     * @var UserRepository
+     */
+    private $userRepository;
+
+    /**
+     * EditUser constructor.
+     *
+     * @param UserRepository $userRepository
+     */
+    public function __construct(UserRepository $userRepository)
     {
-        // when no user specified, lets assume we want to edit "me"
-        if (!$id) {
-            $id = Auth::user()->id;
+        $this->userRepository = $userRepository;
     }
 
-        // try to find given user
-        $user = User::findOrFail($id);
+    /**
+     * Display form for editing user
+     *
+     * @param User|null $user
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function getEditUser(User $user = null)
+    {
+        // when no user specified, lets assume we want to edit "me"
+        if (!$user->exists()) {
+            $user = Auth::user();
+        }
 
         $states = UserStates::getWithTranslations();
         $roles = UserRoles::getWithTranslations();
@@ -35,49 +54,26 @@ class EditUser extends Controller
     }
 
     /**
+     * Edit user - store information
+     *
      * @param EditUserRequest $request
-     * @param                 $id
+     * @param User            $user
      *
      * @return \Illuminate\Http\RedirectResponse
+     * @internal param $id
      */
-    public function postEdit(EditUserRequest $request, $id)
+    public function postEdit(EditUserRequest $request, User $user)
     {
         $loggedUser = Auth::user();
 
-        $user = User::findOrFail($id);
-
         // non-admin user is trying to edit someone else
-        if ($loggedUser->role != User::ROLE_ADMIN && $id != $loggedUser->id) {
+        if ($loggedUser->role != User::ROLE_ADMIN && $user->id != $loggedUser->id) {
             return redirect()
                 ->back()
                 ->with('error', trans('auth.accessDenied'));
         }
 
-        // update username if set
-        if (isset($request->username)) {
-            $user->username = $request->username;
-        }
-
-        // change name (if set)
-        if (isset($request->name)) {
-            $user->name = $request->name;
-        }
-
-        if (isset($request->role)) {
-            $user->role = $request->role;
-        }
-
-        if (isset($request->status)) {
-            $user->status = $request->status;
-        }
-
-        if (isset($request->password)) {
-            $user->password = Hash::make($request->password);
-        }
-
-        $user->email = $request->email;
-
-        $user->save();
+        $this->userRepository->update($user, $request->all());
 
         // fire event about editing user
         Event::fire(new EditUserEvent($user));

app/Http/Controllers/Admin/Users/UserDetail.php

@@ -22,18 +22,14 @@ class UserDetail extends Controller
         $this->log = $log;
     }
 
-    public function getDetail($id = null)
+    public function getDetail(User $user = null)
     {
         // when no user specified, lets assume we want to edit "me"
-        if (!$id) {
-            $id = Auth::user()->id;
+        if (!$user->exists()) {
+            $id = Auth::user();
         }
 
-        // try to find given user
-        $user = User::findOrFail($id);
-
-        $actions = $this->log->getUserActions($id, 10);
-
+        $actions = $this->log->getUserActions($user->id, 10);
         $roles = UserRoles::getWithTranslations();
         $states = UserStates::getWithTranslations();
 

app/Http/Controllers/Admin/Widgets/Areas/EditWidgetArea.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Admin\Widgets\Areas;
 
 use App\CMS\Repositories\Widgets\WidgetArea as WidgetAreaRepository;
+use App\Events\DeleteWidgetArea;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\EditWidgetAreaRequest;
 use App\Models\Widgets\Widget;
@@ -39,6 +40,7 @@ class EditWidgetArea extends Controller
      */
     public function edit(WidgetArea $widgetArea)
     {
+        return view("test");
         $associatedWidgetIds = WidgetInWidgetArea::getWidgetIdsFromArea($widgetArea->id);
         $widgets = Widget::where('language', LaravelLocalization::getCurrentLocale())
                          ->paginate(25);
@@ -83,26 +85,14 @@ class EditWidgetArea extends Controller
         }
 
         // delete area
-        $area->delete();
+        $widgetArea->delete();
 
         // fire event with new widget area
-        Event::fire(new \App\Events\DeleteWidgetArea($area));
+        Event::fire(new DeleteWidgetArea($widgetArea));
 
         // redirect and inform user
         return redirect()
             ->route('widgetareas.overview')
             ->with('success', trans('admin/widgetAreas.successfullyDeleted'));
     }
-
-    /**
-     * Redirect user to overview with message about invalid widget area
-     *
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    private function invalidArea()
-    {
-        return redirect()
-            ->route('widgetareas.overview')
-            ->with('error', trans('admin/widgetAreas.invalidArea'));
-    }
 }

app/Http/Controllers/Controller.php

@@ -23,7 +23,7 @@ class Controller extends BaseController
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public static function VisitorsView($template, $data = [], $mergeData = [])
+    public static function visitorsView($template, $data = [], $mergeData = [])
     {
         $view = Template::name($template);
 

app/Http/Controllers/Visitor/ContentPage.php

@@ -65,7 +65,7 @@ class ContentPage extends Controller
         $displayPipeline = app('displayPipeline');
         $page = $displayPipeline->run($page);
 
-        return Controller::VisitorsView($page->template, ['page' => $page]);
+        return Controller::visitorsView($page->template, ['page' => $page]);
 
     }
 }

app/Http/Kernel.php

@@ -18,9 +18,7 @@ class Kernel extends HttpKernel
 {
     /**
      * The application's global HTTP middleware stack.
-     *
      * These middleware are run during every request to your application.
-     *
      * @var array
      */
     protected $middleware = [
@@ -33,7 +31,6 @@ class Kernel extends HttpKernel
     ];
     /**
      * The application's route middleware groups.
-     *
      * @var array
      */
     protected $middlewareGroups = [
@@ -53,9 +50,7 @@ class Kernel extends HttpKernel
     ];
     /**
      * The application's route middleware.
-     *
      * These middleware may be assigned to groups or used individually.
-     *
      * @var array
      */
     protected $routeMiddleware = [
@@ -66,6 +61,7 @@ class Kernel extends HttpKernel
         'throttle'              => ThrottleRequests::class,
         'localize'              => LaravelLocalizationRoutes::class,
         'localizationRedirect'  => LaravelLocalizationRedirectFilter::class,
-        'localeSessionRedirect' => LocaleSessionRedirect::class
+        'localeSessionRedirect' => LocaleSessionRedirect::class,
+        'bindings'              => \Illuminate\Routing\Middleware\SubstituteBindings::class,
     ];
 }

app/Http/routes.php

@@ -11,7 +11,7 @@ Route::pattern('url', '[0-9\-a-z]+');
 
 /*******************************************************************************/
 
-Route::group(['prefix' => LaravelLocalization::setLocale()], function () {
+Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['bindings']],  function () {
     /**
      * This route group serves to handle request in admin
      */
@@ -65,7 +65,7 @@ Route::group(['prefix' => LaravelLocalization::setLocale()], function () {
              ->name('login');
 
         // route for sitemap
-        Route::get('sitemap.xml', 'Sitemap@getMap')
+        Route::get('sitemap.xml', 'Visitor\Sitemap@getMap')
              ->name('sitemap');
 
         // route for all content pages. This rule must be specified last (because it matches every route)

app/Http/routes/admin/contents.php

@@ -9,34 +9,34 @@ Route::group(['namespace' => 'Contents'], function () {
          ->name('content.new');
 
     // form for editing existing static page
-    Route::get('content/edit/{id}', 'EditContent@edit')
+    Route::get('content/edit/{page}', 'EditContent@edit')
          ->name('content.edit');
 
     // post method for creating new static page
-    Route::post('content/new/{moduleId}', 'CreateNewContent@store')
+    Route::post('content/new/{module}', 'CreateNewContent@store')
          ->name('content.newPost');
 
     // post method for creating new static page
-    Route::post('content/edit/{id}', 'EditContent@update')
+    Route::post('content/edit/{page}', 'EditContent@update')
          ->name('content.editPost');
 
     // change status of page (protected, public or draft)
-    Route::get('content/status/{id}/{status}', 'ContentActions@changeStatus')
+    Route::get('content/status/{page}/{status}', 'ContentActions@changeStatus')
          ->name('content.changeStatus');
 
     // set homepage
-    Route::get('content/homepage/{id}', 'ContentActions@setHomepage')
+    Route::get('content/homepage/{page}', 'ContentActions@setHomepage')
          ->name('content.setHomepage');
 
     // delete page
-    Route::get('content/delete/{id}', 'ContentActions@delete')
+    Route::get('content/delete/{page}', 'ContentActions@delete')
          ->name('content.delete');
 
     // history of changes for specified page
-    Route::get('history/{id}', 'History@getOverview')
+    Route::get('history/{page}', 'History@getOverview')
          ->name('content.history');
 
     // history of changes for specified page
-    Route::get('history/{revision}/{id}', 'History@getDiff')
+    Route::get('history/{revision}', 'History@getDiff')
          ->name('history.diff');
 });

app/Http/routes/admin/fileManager.php

@@ -5,9 +5,6 @@ Route::group(['namespace' => 'FileManager'], function () {
          ->name('upload.overview');
 
     // uploader methods
-    Route::get('directories/new/{parentDirectory?}', 'CreateNewDirectory@create')
-         ->name('upload.newDirectory');
-
     Route::get('directories/edit/{directory}', 'EditDirectory@edit')
          ->name('upload.editDirectory');
 

app/Http/routes/admin/templates.php

@@ -1,15 +1,15 @@
 <?php
 // these routes are available only for user with role admin
 Route::group(['middleware' => 'onlyAdmin', 'namespace' => 'Templates'], function () {
-    Route::get('templates/overview/path/{id}', 'TemplateOverview@getPath')
+    Route::get('templates/overview/path/{templatePath}', 'TemplateOverview@getPath')
          ->name('templates.overview');
 
     Route::post('templates/copy', 'CopyTemplate@createCopy')
          ->name('templates.postCopy');
 
-    Route::get('templates/edit/{id}', 'EditTemplate@getEdit')
+    Route::get('templates/edit/{template}', 'EditTemplate@getEdit')
          ->name('templates.edit');
 
-    Route::post('templates/edit/{id}', 'EditTemplate@postEdit')
+    Route::post('templates/edit/{template}', 'EditTemplate@postEdit')
          ->name('templates.postEdit');
 });

app/Http/routes/admin/users.php

@@ -10,15 +10,15 @@ Route::group(['namespace' => 'Users'], function () {
          ->name('users.newPost');
 
     // display form for edit of existing user
-    Route::get('users/edit/{id}', 'EditUser@getEditUser')
+    Route::get('users/edit/{user}', 'EditUser@getEditUser')
          ->name('users.edit');
 
     // display user detail in admin
-    Route::get('users/detail/{id?}', 'UserDetail@getDetail')
+    Route::get('users/detail/{user?}', 'UserDetail@getDetail')
          ->name('users.detail');
 
     // method for saving edited data of user
-    Route::post('users/edit/{id}', 'EditUser@postEdit')
+    Route::post('users/edit/{user}', 'EditUser@postEdit')
          ->name('users.editPost');
 
     // display list of all users registered into our system

app/Listeners/CreateImageThumbnail.php

@@ -3,23 +3,16 @@
 namespace App\Listeners;
 
 use App\Events\UploadFile;
+use App\Models\FileManager\File;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Support\Facades\File as FileFacade;
 use Illuminate\Support\Str;
 use Intervention\Image\Constraint;
 use Intervention\Image\Facades\Image;
 use Symfony\Component\HttpFoundation\File\File as SymphonyFile;
 
-class CreateImageThumbnail
+class CreateImageThumbnail implements ShouldQueue
 {
-    /**
-     * Create the event listener.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-    }
-
     /**
      * Handle the event.
      *
@@ -29,10 +22,10 @@ class CreateImageThumbnail
      */
     public function handle(UploadFile $event)
     {
-        $uploadedFile = $event->uploadedFile;
+        $uploadedFile = $event->file;
 
         // is uploaded file an image?
-        if (!Str::startsWith($uploadedFile->getMimeType(), 'image')) {
+        if (!Str::startsWith($uploadedFile->mime_type, 'image')) {
             return;
         }
         // yes, create thumbnail
@@ -42,10 +35,12 @@ class CreateImageThumbnail
     /**
      * Create thumbnail of given image
      *
-     * @param SymphonyFile $file
+     * @param File $uploadedFile
      */
-    private function createThumbnail(SymphonyFile $file)
+    private function createThumbnail(File $uploadedFile)
     {
+        $file = new SymphonyFile(config('app.upload_path') . '/' . $uploadedFile->filename);
+
         // does thumbnail directory exist?
         if (!is_dir(config('app.thumbnail_path'))) {
             FileFacade::makeDirectory(config('app.thumbnail_path'));

app/Listeners/Loggers/LogUploadFile.php

@@ -2,30 +2,33 @@
 
 namespace App\Listeners\Loggers;
 
-use App\Events\Uploadfile;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
+use App\Events\UploadFile;
 
-class LogUploadFile
+class LogUploadFile extends Logger
 {
-    /**
-     * Create the event listener.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        //
-    }
-
     /**
      * Handle the event.
      *
-     * @param  Uploadfile  $event
+     * @param  CreateNewWidget $event
+     *
      * @return void
      */
-    public function handle(Uploadfile $event)
+    public function handle(UploadFile $event)
     {
-        //
+        $parameters = [
+            'name' => $event->file->filename,
+            'mime' => $event->file->mime_type,
+        ];
+
+        $this->saveLog($parameters);
+    }
+
+    /**
+     * Getter for action name. Used only internally
+     * @return mixed
+     */
+    protected function getName()
+    {
+        return 'newFile';
     }
 }

app/Models/Content/Content.php

@@ -6,6 +6,7 @@ use App\CMS\Contracts\Repositories\Content as ContentContract;
 use App\CMS\Helpers\Traits\Nullable;
 use App\CMS\Observers\Content as ContentObserver;
 use App\Models\FileManager\File;
+use App\Models\Module;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -55,7 +56,6 @@ class Content extends Model
 
     /**
      * Mark relationship with its historical records
-     *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function history()
@@ -65,7 +65,6 @@ class Content extends Model
 
     /**
      * Mark relationship with users table
-     *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function author()
@@ -75,7 +74,6 @@ class Content extends Model
 
     /**
      * Related files to content page
-     *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
     public function files()
@@ -85,7 +83,6 @@ class Content extends Model
 
     /**
      * Category of content page
-     *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function category()
@@ -95,7 +92,6 @@ class Content extends Model
 
     /**
      * Subpages assigned to page
-     *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function subpages()
@@ -103,9 +99,17 @@ class Content extends Model
         return $this->hasMany(Content::class, 'parentId');
     }
 
+    /**
+     * Module relationship
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function module()
+    {
+        return $this->belongsTo(Module::class, 'moduleHandler', 'handler');
+    }
+
     /**
      * Parent page
-     *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function parentPage()
@@ -115,7 +119,6 @@ class Content extends Model
 
     /**
      * Is current content draft?
-     *
      * @return bool
      */
     public function isDraft()
@@ -125,7 +128,6 @@ class Content extends Model
 
     /**
      * Is current content visible for all visitors?
-     *
      * @return bool
      */
     public function isPublic()
@@ -135,7 +137,6 @@ class Content extends Model
 
     /**
      * Is current content visible only for logged users?
-     *
      * @return bool
      */
     public function isProtected()
@@ -145,7 +146,6 @@ class Content extends Model
 
     /**
      * Is current content visible for logged user OR for everyone?
-     *
      * @return bool
      */
     public function isVisible()
@@ -164,6 +164,9 @@ class Content extends Model
         return parent::save($options);
     }
 
+    /**
+     * Increment number of viewed content
+     */
     public function view()
     {
         $this->timestamps = false;

app/Models/FileManager/ModelTraits/File.php

@@ -45,15 +45,15 @@ trait File
         $uploadedFile = $file->move($destination, $filename);
 
         // insert record into database
-        $id = $this->saveIntoDatabase($uploadedFile, $data, $file->getClientOriginalName());
+        $fileInDB = $this->saveIntoDatabase($uploadedFile, $data, $file->getClientOriginalName());
 
         // fire event about new file
-        Event::fire(new UploadFile($uploadedFile, $id));
+        Event::fire(new UploadFile($fileInDB));
 
         return [
             'filename' => $filename,
             'file'     => $file,
-            'id'       => $id
+            'id'       => $fileInDB->id
         ];
     }
 
@@ -89,6 +89,6 @@ trait File
                                          'keywords'          => isset($request->keyword) ? $request->keyword : ''
                                      ]);
 
-        return $newFile->id;
+        return $newFile;
     }
 }

app/Models/ModelTraits/Module.php

@@ -1,113 +0,0 @@
-<?php
-namespace App\Models\ModelTraits;
-
-use App\CMS\Contracts\Modules\AppHandler;
-use App\CMS\Contracts\Modules\TemplateHandler;
-use App\Models\Module as ModuleModel;
-use App\Models\Templates\TemplatePath;
-use Illuminate\Support\Facades\App;
-
-trait Module
-{
-    /**
-     * Create new module in database
-     *
-     * @param        $name
-     * @param        $alias
-     * @param string $description
-     * @param null   $handler
-     * @param        $parentModuleId
-     * @param array  $settings
-     *
-     * @return Module
-     * @throws \ErrorException
-     */
-    public static function install($name, $alias, $description, $handler, $parentModuleId, $settings)
-    {
-        // check if user does not want to install module in runtime
-        if (!App::runningInConsole()) {
-            throw new \ErrorException('Modules can be installed only via Artisan!');
-        }
-
-        $managesContent = $handler ? in_array(AppHandler::class, class_implements($handler)) : false;
-        $isTemplate = $handler ? in_array(TemplateHandler::class, class_implements($handler)) : false;
-        $supportCategories = $managesContent ? call_user_func([$handler, 'supportCategories']) : false;
-
-        if ($parentModuleId) {
-            $parentModule = ModuleModel::findOrFail($parentModuleId);
-            $parentModule->has_submodules = true;
-            $parentModule->save();
-        }
-
-        // insert module into database
-        $module = ModuleModel::create([
-                                          'name'               => $name,
-                                          'description'        => $description,
-                                          'handler'            => $handler,
-                                          'manages_content'    => $managesContent,
-                                          'support_categories' => $supportCategories,
-                                          'alias'              => $alias,
-                                          'module_settings'     => json_encode($settings),
-                                          'parent_id'          => $parentModuleId ? $parentModuleId : null,
-                                          'enabled'            => 1,
-                                          'is_template'        => $isTemplate
-                                      ]);
-
-        // install something module-specific
-        if ($handler && is_callable([$handler, 'install'])) {
-            call_user_func([$handler, 'install']);
-        }
-
-        return $module;
-    }
-
-    /**
-     * Delete module from database and uninstall its dependencies
-     *
-     * @throws \ErrorException
-     */
-    public function uninstall()
-    {
-        // check if user does not want to install module in runtime
-        if (!App::runningInConsole()) {
-            throw new \ErrorException('Modules can be uninstalled only via Artisan!');
-        }
-
-        // delete everything in /resources/views/visitor
-        if ($this->is_template) {
-            $this->deleteDirectory(resource_path('views/visitor'));
-            $this->deleteDirectory(resource_path('views/modules'));
-            $this->deleteDirectory(public_path('assets'));
-
-            // delete all template paths
-            TemplatePath::getQuery()
-                        ->delete();
-        }
-
-        if ($this->handler && is_callable([$this->handler, 'uninstall'])) {
-            call_user_func([$this->handler, 'uninstall'], $this);
-        }
-
-        $this->delete();
-    }
-
-    /**
-     * Delete directory when uninstalling module.
-     *
-     * @param $directory
-     *
-     * @throws \ErrorException
-     */
-    private function deleteDirectory($directory)
-    {
-        if (!is_dir($directory)) {
-            return;
-        }
-
-        $success = \File::deleteDirectory($directory, true);
-
-        if (!$success) {
-            throw new \ErrorException('Cannot delete ' . $directory);
-        }
-    }
-}

app/Models/Module.php

@@ -9,13 +9,13 @@ use Illuminate\Database\Eloquent\Model;
  */
 class Module extends Model
 {
-    use ModelTraits\Module;
     public $timestamps = false;
     protected $fillable = [
         'handler',
         'parent_id',
         'name',
         'description',
+        'static_name', // @todo instalace potrebuje naplnit tento sloupec!
         'alias',
         'module_settings',
         'enabled',
@@ -23,4 +23,23 @@ class Module extends Model
         'manages_content',
         'is_template'
     ];
+    protected $casts = [
+        'module_settings' => 'array',
+        'is_template'     => 'boolean',
+        'has_submodules'  => 'boolean'
+    ];
+
+    public function getRouteKeyName()
+    {
+        return 'alias';
+    }
+
+    public function submodules()
+    {
+        return $this->hasMany(Module::class, 'parent_id');
+    }
+
+    public function parent() {
+        return $this->belongsTo(Module::class, 'parent_id');
+    }
 }

app/Models/Settings.php

@@ -7,8 +7,6 @@ use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 
 class Settings extends Model
 {
-    use ModelTraits\Settings;
-
     protected $table = 'settings';
     public $timestamps = false;
     protected $fillable = ['key', 'value', 'language'];

app/ModuleManager/Config/modules.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'namespace' => 'Modules',
+    'paths'     => [
+        'modules'   => base_path('modules'),
+        'assets'    => public_path('modules'),
+        'stubs' => base_path('app/CMS/Modules/Stubs'),
+    ]
+];

app/ModuleManager/Installer.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\ModuleManager;
+
+use App\CMS\Contracts\Modules\AppHandler;
+use App\CMS\Contracts\Modules\TemplateHandler;
+use App\Models\Module;
+use Illuminate\Support\Facades\App;
+
+class Installer
+{
+    /**
+     * Create new module in database
+     *
+     * @param        $name
+     * @param        $alias
+     * @param string $description
+     * @param null   $handler
+     * @param        $parentModuleId
+     * @param array  $settings
+     *
+     * @return Module
+     * @throws \ErrorException
+     */
+    public static function install($name, $alias, $staticName, $description, $handler, $parentModuleId, $settings)
+    {
+        // check if user does not want to install module in runtime
+        if (!App::runningInConsole()) {
+            throw new \ErrorException('Modules can be installed only via Artisan!');
+        }
+
+        $managesContent = $handler ? in_array(AppHandler::class, class_implements($handler)) : false;
+        $isTemplate = $handler ? in_array(TemplateHandler::class, class_implements($handler)) : false;
+        $supportCategories = $managesContent ? call_user_func([$handler, 'supportCategories']) : false;
+
+        if ($parentModuleId) {
+            $parentModule = Module::findOrFail($parentModuleId);
+            $parentModule->has_submodules = true;
+            $parentModule->save();
+        }
+
+        // insert module into database
+        $module = Module::create([
+                                     'name'               => $name,
+                                     'description'        => $description,
+                                     'handler'            => $handler,
+                                     'static_name'        => $staticName,
+                                     'manages_content'    => $managesContent,
+                                     'support_categories' => $supportCategories,
+                                     'alias'              => $alias,
+                                     'module_settings'    => $settings,
+                                     'parent_id'          => $parentModuleId ? $parentModuleId : null,
+                                     'enabled'            => 1,
+                                     'is_template'        => $isTemplate
+                                 ]);
+
+        // install something module-specific
+        if ($handler && is_callable([$handler, 'install'])) {
+            call_user_func([$handler, 'install']);
+        }
+
+        return $module;
+    }
+}

app/ModuleManager/Providers/ModuleManager.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\ModuleManager\Providers;
+
+use App\Models\Module;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\ServiceProvider;
+
+class ModuleManager extends ServiceProvider
+{
+    /**
+     * Bootstrap the application services.
+     * @return void
+     */
+    public function boot()
+    {
+        // this service provider needs published config - config is merged right after this service provider
+        $modules = Cache::rememberForever('enabled-modules', function () {
+            return Module::where('enabled', true)
+                         ->where('is_template', false)
+                         ->get();
+        });
+
+        // iterate over all modules and enable or disable them
+        foreach ($modules as $module) {
+            if (isset($module->module_settings['providers']) && !empty($module->module_settings['providers'])) {
+                foreach ($module->module_settings['providers'] as $provider) {
+                    $this->app->register($provider);
+                }
+            }
+
+            // include files (if any)
+            if (isset($module->module_settings['files']) && !empty($module->module_settings['files'])) {
+                foreach ($module->module_settings['files'] as $file) {
+                    include config('modules.paths.modules') . '/' . $module->static_name . '/' . $file;
+                }
+            }
+        }
+    }
+
+    /**
+     * Register the application services.
+     * @return void
+     */
+    public function register()
+    {
+    }
+}

app/ModuleManager/Uninstaller.php

@@ -0,0 +1,60 @@
+<?php
+namespace  App\ModuleManager;
+
+use App\Models\Module;
+use App\Models\Templates\TemplatePath;
+use Illuminate\Support\Facades\App;
+
+class Uninstaller {
+    /**
+     * Delete module from database and uninstall its dependencies
+     *
+     * @param Module $module
+     *
+     * @throws \ErrorException
+     */
+    public static function uninstall(Module $module)
+    {
+        // check if user does not want to install module in runtime
+        if (!App::runningInConsole()) {
+            throw new \ErrorException('Modules can be uninstalled only via Artisan!');
+        }
+
+        // delete everything in /resources/views/visitor
+        if ($module->is_template) {
+            self::deleteDirectory(resource_path('views/visitor'));
+            self::deleteDirectory(resource_path('views/modules'));
+            self::deleteDirectory(public_path('assets'));
+
+            // delete all template paths
+            TemplatePath::getQuery()
+                        ->delete();
+        }
+
+        if ($module->handler && is_callable([$module->handler, 'uninstall'])) {
+            call_user_func([$module->handler, 'uninstall'], $module);
+        }
+
+        $module->delete();
+    }
+
+    /**
+     * Delete directory when uninstalling module.
+     *
+     * @param $directory
+     *
+     * @throws \ErrorException
+     */
+    private static function deleteDirectory($directory)
+    {
+        if (!is_dir($directory)) {
+            return;
+        }
+
+        $success = \File::deleteDirectory($directory, true);
+
+        if (!$success) {
+            throw new \ErrorException('Cannot delete ' . $directory);
+        }
+    }
+}

app/Providers/AppServiceProvider.php

@@ -28,8 +28,6 @@ use App\CMS\Widgets\Menu\Menu;
 use Barryvdh\Debugbar\ServiceProvider as DebugBarServiceProvider;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\ServiceProvider;
-use Pingpong\Menus\MenusServiceProvider;
-use Pingpong\Modules\ModulesServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -64,13 +62,11 @@ class AppServiceProvider extends ServiceProvider
         }
 
         // register PingPong module extension
-        $this->app->register(ModulesServiceProvider::class);
-        $this->app->register(MenusServiceProvider::class);
         $this->app->register(LaravelLocalizationServiceProvider::class);
 
         // create singletons for registering widgets
         $this->app->singleton('registerWidget', function ($app) {
-            return new WidgetRegistrator($app);
+            return new WidgetRegistrator();
         });
 
         // create singleton for display pipeline - pipeline used for displaying visitor pages
@@ -85,7 +81,7 @@ class AppServiceProvider extends ServiceProvider
 
         // create registrator for template directories
         $this->app->singleton('registerTemplateDir', function ($app) {
-            return new TemplateRegistrator($app);
+            return new TemplateRegistrator();
         });
 
         $this->app->singleton('registerSettingsExtension', function ($app) {

app/Providers/ModuleManager.php

@@ -1,93 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use App\Models\Module;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\ServiceProvider;
-
-class ModuleManager extends ServiceProvider
-{
-    /**
-     * Bootstrap the application services.
-     * @return void
-     */
-    public function boot()
-    {
-        // this service provider needs published config - config is merged right after this service provider
-        $modules = Cache::rememberForever('enabled-modules', function () {
-            $modules = Module::where('enabled', true)
-                             ->get();
-
-            foreach ($modules as $module) {
-                $module->module_settings = json_decode($module->module_settings);
-            }
-
-            return $modules;
-        });
-
-        // iterate over all modules and enable or disable them
-        foreach ($modules as $module) {
-            if ($module->is_template) {
-                if (isset($module->module_settings->providers) && !empty($module->module_settings->providers)) {
-                    foreach ($module->module_settings->providers as $provider) {
-                        $this->app->register($provider);
-                    }
-                }
-
-                continue;
-            }
-
-            $this->createModulesJson($module);
-        }
-    }
-
-    /**
-     * Register the application services.
-     * @return void
-     */
-    public function register()
-    {
-    }
-
-    /**
-     * Read config file and merge it with module config in database.
-     * This method REQUIRES published config of given module (otherwise config(modulename) is not available)!
-     *
-     * @param Module $module
-     *
-     * @throws \ErrorException when module.json is not writable
-     */
-    private function createModulesJson(Module $module)
-    {
-        $config = $module->module_settings;
-
-        if (is_null($config)) {
-            return;
-        }
-
-        // path to module.json
-        $path = config('modules.paths.modules') . DIRECTORY_SEPARATOR . $config->staticName . DIRECTORY_SEPARATOR . 'module.json';
-
-        // check if module config is writable
-        if (!is_writable(dirname($path))) {
-            Log::warning('Cannot write to ' . $path);
-            return;
-        }
-
-        // set enabled/disabled status for this module
-        $data = new \stdClass();
-        $data->name = $config->staticName;
-        $data->description = $module->description;
-        $data->alias = $module->alias;
-        $data->providers = $config->providers;
-        $data->aliases = $config->aliases;
-        $data->order = $config->order;
-        $data->files = $config->files;
-        $data->active = $module->enabled;
-
-        // create file
-        file_put_contents($path, json_encode($data));
-    }
-}

app/Providers/RouteServiceProvider.php

@@ -2,43 +2,45 @@
 
 namespace App\Providers;
 
-use Illuminate\Routing\Router;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Route;
 
 class RouteServiceProvider extends ServiceProvider
 {
     /**
-     * This namespace is applied to the controller routes in your routes file.
-     *
+     * This namespace is applied to your controller routes.
      * In addition, it is set as the URL generator's root namespace.
-     *
      * @var string
      */
     protected $namespace = 'App\Http\Controllers';
 
     /**
      * Define your route model bindings, pattern filters, etc.
-     *
-     * @param  \Illuminate\Routing\Router  $router
      * @return void
      */
-    public function boot(Router $router)
+    public function boot()
     {
-        //
-
-        parent::boot($router);
+        parent::boot();
     }
 
     /**
      * Define the routes for the application.
-     *
-     * @param  \Illuminate\Routing\Router  $router
      * @return void
      */
-    public function map(Router $router)
+    public function map()
     {
-        $router->group(['namespace' => $this->namespace], function ($router) {
-            require app_path('Http/routes.php');
-        });
+        $this->mapWebRoutes();
+    }
+
+    /**
+     * Define the "web" routes for the application.
+     * These routes all receive session state, CSRF protection, etc.
+     * @return void
+     */
+    protected function mapWebRoutes()
+    {
+        Route::namespace($this->namespace)
+             ->middleware('web')
+             ->group(app_path('Http/routes.php'));
     }
 }

app/Providers/SubmodulesManager.php

@@ -1,64 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use Illuminate\Contracts\Filesystem\FileNotFoundException;
-use Illuminate\Support\ServiceProvider;
-use Pingpong\Modules\Json;
-
-class SubmodulesManager extends ServiceProvider
-{
-    /**
-     * Boot submodules
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $enabledModules = \Module::enabled();
-
-        foreach ($enabledModules as $module) {
-            $modulePath = $module->getPath();
-            $config = new Json($modulePath . DIRECTORY_SEPARATOR . 'module.json');
-
-            // Does this module specify any providers? If not, consider this module with submodules and register them
-            if ($config->get('providers')) {
-                continue;
-            }
-
-            $submodules = \File::directories($modulePath);
-
-            foreach ($submodules as $submodulePath) {
-                try {
-                    $config = new Json($submodulePath . DIRECTORY_SEPARATOR . 'module.json');
-
-                    if (!$config->get('active')) {
-                        continue;
-                    }
-
-                    $serviceProviders = $config->get('providers', []);
-                    foreach ($serviceProviders as $serviceProvider) {
-                        $this->app->register($serviceProvider);
-                    }
-
-                    $initFiles = $config->get('files', []);
-
-                    foreach ($initFiles as $file) {
-                        require $submodulePath . DIRECTORY_SEPARATOR . $file;
-                    }
-                } catch (FileNotFoundException $e) {
-                    // ignore missing module and do not register this submodule
-                }
-            }
-        }
-    }
-
-    /**
-     * Register the service provider.
-     *
-     * @return void
-     */
-    public function register()
-    {
-    }
-}

app/Providers/TemplateServiceProvider.php

@@ -94,7 +94,7 @@ class TemplateServiceProvider extends ServiceProvider
             return;
         }
 
-        $templateDir = base_path('templates/' . $template->module_settings->staticName . '/Resources');
+        $templateDir = base_path('templates/' . $template->static_name. '/Resources');
         $assetsDir = $templateDir . '/' . TemplateContract::ASSETS_DIRECTORY;
         $viewsDir = $templateDir . '/views';
 

bower.json

@@ -4,14 +4,14 @@
   "devDependencies": {},
   "dependencies": {
     "animate.css": "~3.4.0",
-    "bootstrap": "v4.0.0-alpha.3",
+    "bootstrap": "v4.0.0-alpha.5",
     "font-awesome": "~4.5.0",
     "jquery": "~2.1.4",
     "metisMenu": "~2.0.3",
     "nprogress": "~0.2.0",
     "responsive-bootstrap-toolkit": "~2.5.0",
     "Sortable": "~1.4.2",
-    "tether": "~1.1.1",
+    "tether": "~1.3.7",
     "tinycolor": "~1.2.1",
     "dropzone": "~4.2.0",
     "jquery.are-you-sure": "~1.9"

composer.json

@@ -8,15 +8,14 @@
   "type": "project",
   "require": {
     "php": ">=5.5.9",
-    "laravel/framework": "5.2.*",
-    "pingpong/modules": "~2.0",
-    "pingpong/menus": "^2.2",
+    "laravel/framework": "5.4.*",
     "watson/sitemap": "^2.0",
     "mcamara/laravel-localization": "^1.1",
-    "franzose/closure-table": "^4.1",
+    "franzose/closure-table": "5.*",
     "intervention/image": "^2.3",
     "webwizo/laravel-shortcodes": "1.0.4",
-    "greggilbert/recaptcha": "^2.2@dev"
+    "greggilbert/recaptcha": "^2.2@dev",
+    "nwidart/laravel-menus": "dev-master"
   },
   "require-dev": {
     "fzaninotto/faker": "~1.4",
@@ -24,7 +23,6 @@
     "phpunit/phpunit": "~4.0",
     "symfony/css-selector": "2.8.*|3.0.*",
     "symfony/dom-crawler": "2.8.*|3.0.*",
-    "ignasbernotas/laravel-model-generator": "^1.0",
     "barryvdh/laravel-debugbar": "^2.1"
   },
   "autoload": {

config/app.php

@@ -154,11 +154,9 @@ return [
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,
         Mcamara\LaravelLocalization\LaravelLocalizationServiceProvider::class,
-        // this class must be before ModulesServiceProvider from PingPong, because it handles files module.json
-        App\Providers\ModuleManager::class,
-        Pingpong\Modules\ModulesServiceProvider::class,
-        Pingpong\Menus\MenusServiceProvider::class,
-        App\Providers\SubmodulesManager::class,
+        \App\ModuleManager\Providers\ModuleManager::class,
+        \Nwidart\Menus\MenusServiceProvider::class,
+//                Pingpong\Menus\MenusServiceProvider::class,
         Franzose\ClosureTable\ClosureTableServiceProvider::class,
         \Watson\Sitemap\SitemapServiceProvider::class,
         Intervention\Image\ImageServiceProvider::class,
@@ -205,8 +203,7 @@ return [
         'Lang'                => Illuminate\Support\Facades\Lang::class,
         'Log'                 => Illuminate\Support\Facades\Log::class,
         'Mail'                => Illuminate\Support\Facades\Mail::class,
-        'Menu'                => Pingpong\Menus\MenuFacade::class,
-        'Module'              => Pingpong\Modules\Facades\Module::class,
+        'Menu'                => Nwidart\Menus\Facades\Menu::class,
         'Password'            => Illuminate\Support\Facades\Password::class,
         'Queue'               => Illuminate\Support\Facades\Queue::class,
         'Redirect'            => Illuminate\Support\Facades\Redirect::class,

config/menus.php

@@ -3,12 +3,6 @@
 return [
 
     'styles'   => [
-        'navbar'                          => 'Pingpong\Menus\Presenters\Bootstrap\NavbarPresenter',
-        'navbar-right'                    => 'Pingpong\Menus\Presenters\Bootstrap\NavbarRightPresenter',
-        'nav-pills'                       => 'Pingpong\Menus\Presenters\Bootstrap\NavPillsPresenter',
-        'nav-tab'                         => 'Pingpong\Menus\Presenters\Bootstrap\NavTabPresenter',
-        'sidebar'                         => 'Pingpong\Menus\Presenters\Bootstrap\SidebarMenuPresenter',
-        'navmenu'                         => 'Pingpong\Menus\Presenters\Bootstrap\NavMenuPresenter',
         'foundation-drilldown'            => App\CMS\MenuPresenters\FoundationDrilldownMenuPresenter::class,
         'foundation-dropdown'             => App\CMS\MenuPresenters\FoundationDropdownMenuPresenter::class,
         'foundation-dropdown-initialized' => App\CMS\MenuPresenters\FoundationInitializedDropdownMenuPresenter::class,

config/modules.php

@@ -1,160 +1,10 @@
 <?php
 
 return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Module Namespace
-    |--------------------------------------------------------------------------
-    |
-    | Default module namespace.
-    |
-    */
-
     'namespace' => 'Modules',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Module Stubs
-    |--------------------------------------------------------------------------
-    |
-    | Default module stubs.
-    |
-    */
-
-    'stubs' => [
-        'enabled' => false,
-        'path' => base_path().'/vendor/pingpong/modules/src/Pingpong/Modules/Commands/stubs',
-        'files' => [
-            'start' => 'start.php',
-            'routes' => 'Http/routes.php',
-            'json' => 'module.json',
-            'views/index' => 'Resources/views/index.blade.php',
-            'views/master' => 'Resources/views/layouts/master.blade.php',
-            'scaffold/config' => 'Config/config.php',
-            'composer' => 'composer.json',
-        ],
-        'replacements' => [
-            'start' => ['LOWER_NAME'],
-            'routes' => ['LOWER_NAME', 'STUDLY_NAME', 'MODULE_NAMESPACE'],
-            'json' => ['LOWER_NAME', 'STUDLY_NAME', 'MODULE_NAMESPACE'],
-            'views/index' => ['LOWER_NAME'],
-            'views/master' => ['STUDLY_NAME'],
-            'scaffold/config' => ['STUDLY_NAME'],
-            'composer' => [
-                'LOWER_NAME',
-                'STUDLY_NAME',
-                'VENDOR',
-                'AUTHOR_NAME',
-                'AUTHOR_EMAIL',
-                'MODULE_NAMESPACE',
-            ],
-        ],
-    ],
     'paths'     => [
-        /*
-        |--------------------------------------------------------------------------
-        | Modules path
-        |--------------------------------------------------------------------------
-        |
-        | This path used for save the generated module. This path also will added
-        | automatically to list of scanned folders.
-        |
-        */
-
         'modules'   => base_path('modules'),
-        /*
-        |--------------------------------------------------------------------------
-        | Modules assets path
-        |--------------------------------------------------------------------------
-        |
-        | Here you may update the modules assets path.
-        |
-        */
-
         'assets'    => public_path('modules'),
-        /*
-        |--------------------------------------------------------------------------
-        | The migrations path
-        |--------------------------------------------------------------------------
-        |
-        | Where you run 'module:publish-migration' command, where do you publish the
-        | the migration files?
-        |
-        */
-
-        'migration' => base_path('database/migrations'),
-        /*
-        |--------------------------------------------------------------------------
-        | Generator path
-        |--------------------------------------------------------------------------
-        |
-        | Here you may update the modules generator path.
-        |
-        */
-
-        'generator' => [
-            'assets' => 'Assets',
-            'config' => 'Config',
-            'command' => 'Console',
-            'migration' => 'Database/Migrations',
-            'model' => 'Entities',
-            'repository' => 'Repositories',
-            'seeder' => 'Database/Seeders',
-            'controller' => 'Http/Controllers',
-            'filter' => 'Http/Middleware',
-            'request' => 'Http/Requests',
-            'provider' => 'Providers',
-            'lang' => 'Resources/lang',
-            'views' => 'Resources/views',
-            'test' => 'Tests',
-        ],
-    ],
-    /*
-    |--------------------------------------------------------------------------
-    | Scan Path
-    |--------------------------------------------------------------------------
-    |
-    | Here you define which folder will be scanned. By default will scan vendor
-    | directory. This is useful if you host the package in packagist website.
-    |
-    */
-
-    'scan' => [
-        'enabled' => false,
-        'paths' => [
-            base_path('vendor/*/*'),
-        ],
-    ],
-    /*
-    |--------------------------------------------------------------------------
-    | Composer File Template
-    |--------------------------------------------------------------------------
-    |
-    | Here is the config for composer.json file, generated by this package
-    | in every module since version >= 1.2.0.
-    |
-    */
-
-    'composer' => [
-        'vendor' => 'pingpong-modules',
-        'author' => [
-            'name' => 'Pingpong Labs',
-            'email' => 'pingpong.labs@gmail.com',
-        ],
-    ],
-    /*
-    |--------------------------------------------------------------------------
-    | Caching
-    |--------------------------------------------------------------------------
-    |
-    | Here is the config for setting up caching feature.
-    |
-    */
-    'cache' => [
-        'enabled' => false,
-        'key' => 'pingpong-modules',
-        'lifetime' => 60,
-    ],
-
+        'stubs' => base_path('app/ModuleManager/Stubs'),
+    ]
 ];

database/migrations/2017_08_01_181056_add_static_name_to_modules_table.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddStaticNameToModulesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('modules', function (Blueprint $table) {
+            $table->string('static_name')->after('description');
+        });
+
+        $modules = \App\Models\Module::all();
+        foreach ($modules as $module) {
+            $module->update(['static_name' => $module->static_name]);
+        }
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('modules', function (Blueprint $table) {
+            $table->dropColumn('static_name');
+        });
+    }
+}

database/migrations/2017_08_01_212743_add_new_action_log_type.php

@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+class AddNewActionLogType extends Migration
+{
+    /**
+     * Run the migrations.
+     * @return void
+     */
+    public function up()
+    {
+        \App\Models\ActionLog\ActionLogType::create([
+                                                        'string_id' => 'newFile',
+                                                        'name'      => 'admin/actionLog.nameNewFile',
+                                                        'value'     => 'admin/actionLog.newFile'
+                                                    ]);
+    }
+
+    /**
+     * Reverse the migrations.
+     * @return void
+     */
+    public function down()
+    {
+        \App\Models\ActionLog\ActionLogType::where('string_id', 'newFile')
+                                           ->delete();
+    }
+}

modules/Blog/Article/Http/Controllers/Admin/CommentsOverview.php

@@ -1,8 +1,8 @@
 <?php
 namespace Modules\Blog\Article\Http\Controllers\Admin;
 
+use App\Http\Controllers\Admin\Controller;
 use Modules\Blog\Article\Entities\Comment;
-use Pingpong\Modules\Routing\Controller;
 
 class CommentsOverview extends Controller
 {

modules/Blog/Article/Http/Controllers/Visitor/CreateNewComment.php

@@ -1,17 +1,18 @@
 <?php
+
 namespace Modules\Blog\Article\Http\Controllers\Visitor;
 
-use App\Models\Content\Content;
+use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Event;
+use Modules\Blog\Article\Entities\Article;
 use Modules\Blog\Article\Entities\Comment;
 use Modules\Blog\Article\Events\CreatedComment;
-use Modules\Blog\Article\Handlers\Article;
-use Pingpong\Modules\Routing\Controller;
+use Modules\Blog\Article\Http\Requests\CreateNewComment as CreateNewCommentRequest;
 
 class CreateNewComment extends Controller
 {
-    public function store(\Modules\Blog\Article\Http\Requests\CreateNewComment $request, \Modules\Blog\Article\Entities\Article $article)
+    public function store(CreateNewCommentRequest $request, Article $article)
     {
         if (!isset($article->moduleSettings['allowComments']) || !$article->moduleSettings['allowComments']) {
             return redirect()

modules/Blog/Article/Providers/ArticleEventServiceProvider.php

@@ -23,14 +23,4 @@ class ArticleEventServiceProvider extends ServiceProvider
         DeletedComment::class  => [LogDeletedComment::class],
         CreatedComment::class  => [LogNewComment::class],
     ];
-
-    public function boot(DispatcherContract $events)
-    {
-        parent::boot($events);
-    }
-
-    protected function setModulePath()
-    {
-        $this->path = __DIR__;
-    }
 }

modules/Blog/Article/Providers/ArticleServiceProvider.php

@@ -1,14 +1,13 @@
 <?php namespace Modules\Blog\Article\Providers;
 
-use App\Providers\ModuleServiceProvider;
+use App\CMS\Modules\ServiceProviders\ServiceProvider;
 use Modules\Blog\Article\Pipeline\DisplayContent\LoadCommentsForBlogpost;
 use Modules\Blog\Article\Pipeline\SaveContent\TurnCommentsOnOrOff;
 
-class ArticleServiceProvider extends ModuleServiceProvider
+class ArticleServiceProvider extends ServiceProvider
 {
     /**
      * Boot the application events.
-     *
      * @return void
      */
     public function boot()

modules/Blog/ArticleList/Providers/ArticleListServiceProvider.php

@@ -1,9 +1,9 @@
 <?php namespace Modules\Blog\ArticleList\Providers;
 
-use App\Providers\ModuleServiceProvider;
+use App\CMS\Modules\ServiceProviders\ServiceProvider;
 use Modules\Blog\ArticleList\Pipeline\DisplayContent\LoadArticlesForList;
 
-class ArticleListServiceProvider extends ModuleServiceProvider
+class ArticleListServiceProvider extends ServiceProvider
 {
     protected function setModuleAlias()
     {

modules/Categories/Http/Controllers/CategoriesOverview.php

@@ -1,9 +1,8 @@
 <?php namespace Modules\Categories\Http\Controllers;
 
 use App\CMS\Enumerations\ModuleNamesWithIds;
-use App\Models\Module;
+use App\Http\Controllers\Admin\Controller;
 use Modules\Categories\Entities\Category;
-use Pingpong\Modules\Routing\Controller;
 
 class CategoriesOverview extends Controller
 {

modules/Categories/Http/Controllers/CreateNewCategory.php

@@ -1,17 +1,16 @@
 <?php namespace Modules\Categories\Http\Controllers;
 
+use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\Request;
 use App\Models\Module;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Str;
 use Modules\Categories\Entities\Category;
-use Pingpong\Modules\Routing\Controller;
 
 class CreateNewCategory extends Controller
 {
     /**
      * Display form for new category
-     *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function getNew()

modules/Categories/Http/Controllers/EditCategory.php

@@ -1,10 +1,10 @@
 <?php namespace Modules\Categories\Http\Controllers;
 
+use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\Request;
 use App\Models\Module;
 use Illuminate\Support\Str;
 use Modules\Categories\Entities\Category;
-use Pingpong\Modules\Routing\Controller;
 
 class EditCategory extends Controller
 {

modules/Categories/Providers/CategoriesServiceProvider.php

@@ -1,11 +1,11 @@
 <?php
 namespace Modules\Categories\Providers;
 
-use App\Providers\ModuleServiceProvider;
+use App\CMS\Modules\ServiceProviders\ServiceProvider;
 use Modules\Categories\Contracts\Repositories\Category as ICategory;
 use Modules\Categories\Repositories\Category as Category;
 
-class CategoriesServiceProvider extends ModuleServiceProvider
+class CategoriesServiceProvider extends ServiceProvider
 {
     protected function setModuleAlias()
     {