diff --git a/app/config/packages/barryvdh/laravel-debugbar/config.php b/app/config/packages/barryvdh/laravel-debugbar/config.php index 6dc07e2867..b4ba5d5c62 100644 --- a/app/config/packages/barryvdh/laravel-debugbar/config.php +++ b/app/config/packages/barryvdh/laravel-debugbar/config.php @@ -4,27 +4,8 @@ use Illuminate\Support\Facades\Config; return array( - /* - |-------------------------------------------------------------------------- - | Debugbar Settings - |-------------------------------------------------------------------------- - | - | Debugbar is enabled by default, when debug is set to true in app.php. - | - */ - 'enabled' => Config::get('app.debug'), - /* - |-------------------------------------------------------------------------- - | Storage settings - |-------------------------------------------------------------------------- - | - | DebugBar stores data for session/ajax requests in a directory. - | You can disable this, so the debugbar stores data in headers/session, - | but this can cause problems with large data collectors. - | - */ 'storage' => array( 'enabled' => true, 'path' => storage_path() . '/debugbar', diff --git a/app/controllers/HomeController.php b/app/controllers/HomeController.php index ede41a7a62..d6670a8145 100644 --- a/app/controllers/HomeController.php +++ b/app/controllers/HomeController.php @@ -2,22 +2,10 @@ class HomeController extends BaseController { - /* - |-------------------------------------------------------------------------- - | Default Home Controller - |-------------------------------------------------------------------------- - | - | You may wish to use controllers instead of, or in addition to, Closure - | based routes. That's great! Here is an example controller method to - | get you started. To route to this controller, just add the route: - | - | Route::get('/', 'HomeController@showWelcome'); - | - */ - - public function showWelcome() + public function index() { - return View::make('hello'); + + return View::make('index'); } } diff --git a/app/routes.php b/app/routes.php index 3e10dcf56a..fbb3af4796 100644 --- a/app/routes.php +++ b/app/routes.php @@ -11,7 +11,4 @@ | */ -Route::get('/', function() -{ - return View::make('hello'); -}); +Route::get('/', ['uses' => 'HomeController@index','as' => 'index']); diff --git a/app/storage/debugbar/.gitignore b/app/storage/debugbar/.gitignore new file mode 100644 index 0000000000..c96a04f008 --- /dev/null +++ b/app/storage/debugbar/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/app/views/hello.php b/app/views/hello.php deleted file mode 100644 index 648424217d..0000000000 --- a/app/views/hello.php +++ /dev/null @@ -1,42 +0,0 @@ - - - - - Laravel PHP Framework - - - -
- Laravel PHP Framework -

You have arrived.

-
- - diff --git a/app/views/index.blade.php b/app/views/index.blade.php new file mode 100644 index 0000000000..018654bd89 --- /dev/null +++ b/app/views/index.blade.php @@ -0,0 +1,8 @@ + + + Bla bla + + +Bla bla + + \ No newline at end of file diff --git a/composer.json b/composer.json index 28ff78d91e..175c347c1d 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "grumpydictator/gchart": "dev-master" }, "require-dev": { - "barryvdh/laravel-debugbar": "dev-master", + "barryvdh/laravel-debugbar": "1.*", "barryvdh/laravel-ide-helper": "1.*" }, "autoload": { diff --git a/public/packages/barryvdh/laravel-debugbar/laravel-debugbar.css b/public/packages/barryvdh/laravel-debugbar/laravel-debugbar.css index 2dd6c8bc0a..80c4e9fd88 100644 --- a/public/packages/barryvdh/laravel-debugbar/laravel-debugbar.css +++ b/public/packages/barryvdh/laravel-debugbar/laravel-debugbar.css @@ -5,14 +5,11 @@ div.phpdebugbar { div.phpdebugbar-header { background: #efefef url(laravel-icon.png) no-repeat 4px 3px; - background-size: 20px; line-height: 17px; } a.phpdebugbar-restore-btn { background: #efefef url(laravel-icon.png) no-repeat 5px 3px; - background-size: 20px; width: 16px; - border-right-color: #ccc; } div.phpdebugbar-header > div > * { @@ -34,32 +31,3 @@ dl.phpdebugbar-widgets-kvlist dt{ dl.phpdebugbar-widgets-kvlist dd { margin-left: 210px; } - -ul.phpdebugbar-widgets-timeline li span.phpdebugbar-widgets-value { - height: 20px; - top: 0; - background-color: #f4645f; -} - -ul.phpdebugbar-widgets-timeline li span.phpdebugbar-widgets-label { - top: 2px; -} - -div.phpdebugbar-widgets-messages div.phpdebugbar-widgets-toolbar a.phpdebugbar-widgets-filter { - background-color: #f4645f; -} - -a.phpdebugbar-tab.phpdebugbar-active { - background: #f4645f; - color: #fff; -} - -a.phpdebugbar-tab.phpdebugbar-active span.phpdebugbar-badge { - background-color: white; - color: #f4645f; -} - -a.phpdebugbar-tab span.phpdebugbar-badge { - background: #f4645f; - color: #fff; -} diff --git a/public/packages/barryvdh/laravel-debugbar/laravel-icon.png b/public/packages/barryvdh/laravel-debugbar/laravel-icon.png index 2ec0353a66..7f58610dbf 100644 Binary files a/public/packages/barryvdh/laravel-debugbar/laravel-icon.png and b/public/packages/barryvdh/laravel-debugbar/laravel-icon.png differ