Merge branch 'layout' into dev

app/Http/Controllers/Admin/Controller.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller as BaseController;
+use App\Http\Requests;
+
+abstract class Controller extends BaseController
+{
+    /**
+     * @var
+     */
+    protected $menu;
+
+    /**
+     * Controller constructor.
+     */
+    public function __construct()
+    {
+        $this->menu = Menu::instance('navbar');
+
+        var_dump($this->menu);
+    }
+}

app/Http/Controllers/Admin/Dashboard.php

@@ -3,13 +3,19 @@
 namespace App\Http\Controllers\Admin;
 
 use Illuminate\Http\Request;
-
 use App\Http\Requests;
-use App\Http\Controllers\Controller;
 
 class Dashboard extends Controller
 {
+    /**
+     * Dashboard constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
     public function getIndex() {
-        echo "dasboard";
+        return view('admin.dashboard');
     }
 }

app/Providers/AppServiceProvider.php

@@ -29,5 +29,6 @@ class AppServiceProvider extends ServiceProvider
 
         // register PingPong module extension
         $this->app->register('Pingpong\Modules\ModulesServiceProvider');
+        $this->app->register('Pingpong\Menus\MenusServiceProvider');
     }
 }