FEATURE: change directory structure

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

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

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

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

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

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

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

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

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

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

app/Http/Controllers/Admin/Controller.php

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,10 +1,10 @@
 <?php
 namespace App\Http\Controllers\Admin\FileManager;
 
-use App\Helpers\Template;
+use App\CMS\Helpers\Template;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\Request;
-use App\Models\File;
+use App\Models\FileManager\File;
 use Illuminate\Support\Facades\Input;
 use Symfony\Component\HttpFoundation\File\Exception\FileException;
 

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

@@ -2,8 +2,8 @@
 namespace App\Http\Controllers\Admin\FileManager;
 
 use App\Http\Controllers\Admin\Controller;
-use App\Models\Directory;
-use App\Models\File;
+use App\Models\FileManager\Directory;
+use App\Models\FileManager\File;
 use Illuminate\Support\Facades\Input;
 
 class UploadedFilesOverview extends Controller
@@ -41,7 +41,8 @@ class UploadedFilesOverview extends Controller
         return view('admin.fileManager.overview', [
             'directory'      => $directory,
             'subdirectories' => $directory->subdirectories($includeHidden),
-            'files'          => $files->get()
+            'files'          => $files->get(),
+            'newDirectory'   => new Directory()
         ]);
     }
 }

app/Http/Controllers/Admin/Login.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Http\Controllers\Controller;
 use App\Http\Requests\LoginRequest;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;

app/Http/Controllers/Admin/Search.php

@@ -2,11 +2,9 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Handlers\Contracts\SearchHandler;
-use App\Handlers\Contracts\SearchPresenterHandler;
-use App\Handlers\Registrators\SearchEngineRegistrator;
-use App\Http\Controllers\Controller;
-use App\Http\Requests;
+use App\CMS\Handlers\Contracts\SearchHandler;
+use App\CMS\Handlers\Contracts\SearchPresenterHandler;
+use App\CMS\Handlers\Registrators\SearchEngineRegistrator;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Input;
 use Symfony\Component\Process\Exception\InvalidArgumentException;

app/Http/Controllers/Admin/Settings.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Http\Controllers\Controller;
 use App\Http\Requests;
 use App\Models\Settings as SettingsModel;
 use Illuminate\Support\Facades\App;

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

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin\Users;
 
-use App\Enumerations\UserRoles;
+use App\CMS\Enumerations\UserRoles;
 use App\Events\CreateNewUser as CreateNewUserEvent;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\CreateNewUserRequest;

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

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Admin\Users;
 
-use App\Enumerations\UserRoles;
-use App\Enumerations\UserStates;
+use App\CMS\Enumerations\UserRoles;
+use App\CMS\Enumerations\UserStates;
 use App\Events\EditUser as EditUserEvent;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\EditUserRequest;

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

@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Admin\Users;
 
-use App\Enumerations\UserRoles;
-use App\Enumerations\UserStates;
+use App\CMS\Enumerations\UserRoles;
+use App\CMS\Enumerations\UserStates;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests;
-use App\Models\ActionLog;
+use App\Models\ActionLog\ActionLog;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 

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

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Admin\Users;
 
-use App\Enumerations\UserRoles;
-use App\Enumerations\UserStates;
+use App\CMS\Enumerations\UserRoles;
+use App\CMS\Enumerations\UserStates;
 use App\Http\Controllers\Admin\Controller;
 use App\Models\User;
 

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

@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Admin\Widgets\Areas;
 
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\EditWidgetAreaRequest;
-use App\Models\Widget;
+use App\Models\Widgets\Widget;
 use App\Models\WidgetArea;
 use App\Models\WidgetInWidgetArea;
 use Illuminate\Database\Eloquent\ModelNotFoundException;

app/Http/Controllers/Admin/Widgets/AssociateWidget.php

@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Admin\Widgets;
 use App\Events\AssignWidget;
 use App\Events\RemoveWidgetFromArea;
 use App\Http\Controllers\Admin\Controller;
-use App\Models\Widget;
+use App\Models\Widgets\Widget;
 use App\Models\WidgetArea;
 use App\Models\WidgetInWidgetArea;
 use Illuminate\Database\QueryException;

app/Http/Controllers/Admin/Widgets/CreateNewWidget.php

@@ -4,9 +4,9 @@ namespace App\Http\Controllers\Admin\Widgets;
 
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\NewWidgetRequest;
-use App\Models\Widget;
-use App\Models\WidgetType;
-use App\Widgets\Exceptions\MissingParameterException;
+use App\Models\Widgets\Widget;
+use App\Models\Widgets\WidgetType;
+use App\CMS\Widgets\Exceptions\MissingParameterException;
 
 class CreateNewWidget extends Controller
 {

app/Http/Controllers/Admin/Widgets/EditWidget.php

@@ -3,8 +3,8 @@ namespace App\Http\Controllers\Admin\Widgets;
 
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\EditWidgetRequest;
-use App\Models\Widget;
-use App\Widgets\Exceptions\MissingParameterException;
+use App\Models\Widgets\Widget;
+use App\CMS\Widgets\Exceptions\MissingParameterException;
 use Illuminate\Support\Facades\Event;
 
 class EditWidget extends Controller

app/Http/Controllers/Admin/Widgets/WidgetsOverview.php

@@ -2,7 +2,7 @@
 namespace App\Http\Controllers\Admin\Widgets;
 
 use App\Http\Controllers\Admin\Controller;
-use App\Models\Widget;
+use App\Models\Widgets\Widget;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 
 class WidgetsOverview extends Controller

app/Http/Controllers/Controller.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Helpers\Template;
+use App\CMS\Helpers\Template;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;

app/Http/Controllers/Sitemap.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests;
-use App\Models\Content;
+use App\Models\Content\Content;
 
 class Sitemap extends Controller
 {

app/Http/Controllers/Visitor/ContentPage.php

@@ -2,9 +2,9 @@
 
 namespace App\Http\Controllers\Visitor;
 
-use App\Helpers\PageRenderer;
+use App\CMS\Helpers\PageRenderer;
 use App\Http\Controllers\Controller;
-use App\Models\Content;
+use App\Models\Content\Content;
 use Illuminate\Support\Facades\Auth;
 
 class ContentPage extends Controller

app/Http/Middleware/AdminMenuRegistrator.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use App\Handlers\Handler;
+use App\CMS\Handlers\Handler;
 use App\Models\Module;
 use Closure;
 use Illuminate\Support\Facades\Log;

app/Http/Middleware/TemplatePathInstaller.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use App\Handlers\Registrators\TemplateRegistrator;
+use App\CMS\Handlers\Registrators\TemplateRegistrator;
 use Closure;
 use Illuminate\Support\Facades\App;
 

app/Http/Middleware/WidgetInstaller.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use App\Handlers\Registrators\WidgetRegistrator;
+use App\CMS\Handlers\Registrators\WidgetRegistrator;
 use Closure;
 use Illuminate\Support\Facades\App;
 

app/Http/Requests/EditContentRequest.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Requests;
 
-use App\Enumerations\ContentStatuses;
+use App\CMS\Enumerations\ContentStatuses;
 
 class EditContentRequest extends Request
 {

app/Http/routes.php

@@ -11,9 +11,7 @@ Route::pattern('url', '[0-9\-a-z]+');
 
 /*******************************************************************************/
 
-Route::group([
-                 'prefix'     => LaravelLocalization::setLocale(),
-             ], function () {
+Route::group(['prefix' => LaravelLocalization::setLocale()], function () {
     /**
      * This route group serves to handle request in admin
      */