Disabled some seeds, updated some routes.

This commit is contained in:
James Cole
2015-01-02 22:44:25 +01:00
parent 0bd6636453
commit 5476509ef5
5 changed files with 503 additions and 2744 deletions

View File

@@ -7,6 +7,7 @@ use Carbon\Carbon;
*/ */
class HomeController extends BaseController class HomeController extends BaseController
{ {
/** /**
* @return \Illuminate\Http\RedirectResponse * @return \Illuminate\Http\RedirectResponse
*/ */
@@ -59,6 +60,18 @@ class HomeController extends BaseController
->with('mainTitleIcon', 'fa-fire'); ->with('mainTitleIcon', 'fa-fire');
} }
/**
* @return string
*/
public function marauder()
{
echo '<pre>';
print_r(Input::all());
echo '</pre>';
return '';
}
/** /**
* @param $range * @param $range
* *

View File

@@ -72,6 +72,7 @@ class TestContentSeeder extends Seeder
*/ */
public function run() public function run()
{ {
return;
if (App::environment() == 'testing' || App::environment() == 'homestead') { if (App::environment() == 'testing' || App::environment() == 'homestead') {
$user = User::whereEmail('thegrumpydictator@gmail.com')->first(); $user = User::whereEmail('thegrumpydictator@gmail.com')->first();

View File

@@ -387,6 +387,8 @@ Route::group(
Route::get('/reset/{reset}', ['uses' => 'UserController@reset', 'as' => 'reset']); Route::get('/reset/{reset}', ['uses' => 'UserController@reset', 'as' => 'reset']);
Route::get('/remindMe', ['uses' => 'UserController@remindMe', 'as' => 'remindMe']); Route::get('/remindMe', ['uses' => 'UserController@remindMe', 'as' => 'remindMe']);
Route::get('/oauth2callback', ['uses' => 'HomeController@marauder', 'as' => 'marauder']);
} }
); );

View File

@@ -24,12 +24,13 @@
"davejamesmiller/laravel-breadcrumbs": "2.*", "davejamesmiller/laravel-breadcrumbs": "2.*",
"grumpydictator/gchart": "1.*", "grumpydictator/gchart": "1.*",
"michelf/php-markdown": "1.*", "michelf/php-markdown": "1.*",
"watson/validating": "0.10.*" "watson/validating": "0.10.*",
"doctrine/dbal": "~2.3"
}, },
"require-dev": { "require-dev": {
"barryvdh/laravel-debugbar": "@stable", "barryvdh/laravel-debugbar": "@stable",
"barryvdh/laravel-ide-helper": "@stable", "barryvdh/laravel-ide-helper": "@stable",
"doctrine/dbal": "~2.3",
"satooshi/php-coveralls": "dev-master", "satooshi/php-coveralls": "dev-master",
"mockery/mockery": "@stable", "mockery/mockery": "@stable",
"league/factory-muffin": "~2.1", "league/factory-muffin": "~2.1",

3208
composer.lock generated

File diff suppressed because it is too large Load Diff