FIX: fix few bugs in routes

app/CMS/Widgets/Menu/Menu.php

@@ -8,6 +8,7 @@ use App\CMS\Contracts\Widgets\WidgetRenderer;
 use App\CMS\Widgets\Exceptions\MissingParameterException;
 use App\Http\Requests\Request;
 use App\Models\Content\Content;
+use Illuminate\Support\Facades\Cache;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 use Modules\Blog\Article\Handlers\Article;
 
@@ -15,7 +16,6 @@ class Menu implements PublicWidget
 {
     /**
      * Name getter
-     *
      * @return string
      */
     public static function getName()
@@ -25,7 +25,6 @@ class Menu implements PublicWidget
 
     /**
      * Getter for description
-     *
      * @return string
      */
     public static function getDescription()
@@ -35,7 +34,6 @@ class Menu implements PublicWidget
 
     /**
      * Getter for presenter/renderer of this widget
-     *
      * @return WidgetRenderer
      */
     public static function getPresenter()
@@ -75,16 +73,19 @@ class Menu implements PublicWidget
             $allowedStatuses[] = IContent::STATUS_PROTECTED;
         }
 
-        $pages = Content::where('language', LaravelLocalization::getCurrentLocale())
+        return Cache::remember('widget-menu-content-pages', 5, function () use ($ids, $allowedStatuses) {
-                        ->whereIn('id', $ids)
+            $pages = Content::where('language', LaravelLocalization::getCurrentLocale())
-                        ->whereIn('status', $allowedStatuses)
+                            ->whereIn('id', $ids)
-                        ->where('moduleHandler', '!=', Article::class)
+                            ->whereIn('status', $allowedStatuses)
-                        ->get();
+                            ->where('moduleHandler', '!=', Article::class)
-        $used = [];
+                            ->get();
-        foreach ($pages as $page) {
-            $used[$page->id] = $page;
-        }
 
-        return $used;
+            $used = [];
+            foreach ($pages as $page) {
+                $used[$page->id] = $page;
+            }
+
+            return $used;
+        });
     }
 }

app/Http/Controllers/Admin/Dashboard/Dashboard.php

@@ -9,6 +9,12 @@ class Dashboard extends Controller
 {
     public function index(Request $request)
     {
+//        $data = unserialize(file_get_contents('/home/michal/decoded.bin'));
+//
+//        dd($data);
+
+
+
         return redirect()->route('content.overview');
     }
 }

app/Http/Controllers/Visitor/Sitemap.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Visitor;
 
 use App\CMS\Contracts\Repositories\Content;
-use App\Http\Requests;
+use App\Http\Controllers\Controller;
 
 class Sitemap extends Controller
 {
@@ -24,7 +24,6 @@ class Sitemap extends Controller
 
     /**
      * Get sitemap for all content pages
-     *
      * @return mixed
      */
     public function getMap()

app/Http/Middleware/Admin/AdminMenuRegistrator.php

@@ -38,7 +38,7 @@ class AdminMenuRegistrator
 
             // try to register menus
             try {
-                call_user_func([$module->handler, 'registerAdminMenu'], $user);
+//                call_user_func([$module->handler, 'registerAdminMenu'], $user);
             } catch (\Exception $e) {
                 Log::debug('Error in ' . $module->handler . '::registerAdminMenu: ' . $e->getMessage());
             }

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

@@ -1,11 +1,11 @@
 <?php
 namespace Modules\Blog\Article\Http\Controllers\Admin;
 
+use App\Http\Controllers\Admin\Controller;
 use Illuminate\Support\Facades\Event;
 use Modules\Blog\Article\Entities\Comment;
 use Modules\Blog\Article\Events\ApprovedComment;
 use Modules\Blog\Article\Events\DeletedComment;
-use Pingpong\Modules\Routing\Controller;
 
 class EditComment extends Controller
 {

modules/ContactForm/Http/Controllers/Visitor/CreateNewMessage.php

@@ -2,11 +2,11 @@
 namespace Modules\ContactForm\Http\Controllers\Visitor;
 
 use App\CMS\Helpers\Template;
+use App\Http\Controllers\Controller;
 use App\Models\Content\Content;
 use Illuminate\Mail\Message;
 use Illuminate\Support\Facades\Mail;
 use Modules\ContactForm\Http\Requests\SendNewEmailRequest;
-use Pingpong\Modules\Routing\Controller;
 
 class CreateNewMessage extends Controller
 {

routes/admin.php

@@ -6,9 +6,6 @@ Route::pattern('id', '\d+');
 Route::pattern('url', '[0-9\-a-z]+');
 
 /*******************************************************************************/
-Auth::routes();
-$this->get('logout', 'Auth\LoginController@logout')
-     ->name('logout');
 
 /**
  * This route group serves to handle request in admin

routes/web.php

@@ -12,6 +12,11 @@ Route::pattern('url', '[0-9\-a-z]+');
 /*******************************************************************************/
 
 Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['bindings', 'web']], function () {
+
+    Auth::routes();
+    $this->get('logout', 'Auth\LoginController@logout')
+         ->name('logout');
+
     // Homepage
     Route::get('/', 'Visitor\Homepage@getIndex')
          ->name('page.index');