From a3a30bd5e111dbcf60631a6abff18719c136a7ee Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 28 Jun 2014 09:57:17 +0200 Subject: [PATCH] Various new stuff. --- .../barryvdh/laravel-debugbar/config.php | 19 -------- app/controllers/HomeController.php | 18 ++------ app/routes.php | 5 +-- app/storage/debugbar/.gitignore | 2 + app/views/hello.php | 42 ------------------ app/views/index.blade.php | 8 ++++ composer.json | 2 +- .../laravel-debugbar/laravel-debugbar.css | 32 ------------- .../laravel-debugbar/laravel-icon.png | Bin 15938 -> 594 bytes 9 files changed, 15 insertions(+), 113 deletions(-) create mode 100644 app/storage/debugbar/.gitignore delete mode 100644 app/views/hello.php create mode 100644 app/views/index.blade.php 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 2ec0353a663ce1ec842ac8c7f79a2a2cce167d25..7f58610dbfcdf894f2159bc3bad0b6c7c8a07778 100644 GIT binary patch literal 594 zcmV-Y0Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0005ONkl?Ca#Tu*3v#2#LC&)m;v^|<%7qlg?%Mo`W?9SoGyQ&g zdOVMwG4*Pm`99D0^UU*mzRweS=!nPg1CMzAAoVIEroed}XvShIneqbhtd+wMlU|2W1H+Mt{aL~WpK znBtp-hE8&Td1z@$pexeYG~hc1aOw<{F6aiGU>8&9gl101WCrLjB_ket0g3#B(_q^(O8@`>07*qoM6N<$f@T;1!~g&Q literal 15938 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