mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2024-12-31 19:27:51 -06:00
Disabled some seeds, updated some routes.
This commit is contained in:
parent
0bd6636453
commit
5476509ef5
@ -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
|
||||||
*
|
*
|
||||||
|
@ -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();
|
||||||
|
@ -196,7 +196,7 @@ Route::group(
|
|||||||
Route::get('/budgets/edit/{budget}', ['uses' => 'BudgetController@edit', 'as' => 'budgets.edit']);
|
Route::get('/budgets/edit/{budget}', ['uses' => 'BudgetController@edit', 'as' => 'budgets.edit']);
|
||||||
Route::get('/budgets/delete/{budget}', ['uses' => 'BudgetController@delete', 'as' => 'budgets.delete']);
|
Route::get('/budgets/delete/{budget}', ['uses' => 'BudgetController@delete', 'as' => 'budgets.delete']);
|
||||||
Route::get('/budgets/show/{budget}/{limitrepetition?}', ['uses' => 'BudgetController@show', 'as' => 'budgets.show']);
|
Route::get('/budgets/show/{budget}/{limitrepetition?}', ['uses' => 'BudgetController@show', 'as' => 'budgets.show']);
|
||||||
Route::get('/budgets/list/noBudget', ['uses' => 'BudgetController@noBudget','as' => 'budgets.noBudget']);
|
Route::get('/budgets/list/noBudget', ['uses' => 'BudgetController@noBudget', 'as' => 'budgets.noBudget']);
|
||||||
|
|
||||||
// category controller:
|
// category controller:
|
||||||
Route::get('/categories', ['uses' => 'CategoryController@index', 'as' => 'categories.index']);
|
Route::get('/categories', ['uses' => 'CategoryController@index', 'as' => 'categories.index']);
|
||||||
@ -204,7 +204,7 @@ Route::group(
|
|||||||
Route::get('/categories/edit/{category}', ['uses' => 'CategoryController@edit', 'as' => 'categories.edit']);
|
Route::get('/categories/edit/{category}', ['uses' => 'CategoryController@edit', 'as' => 'categories.edit']);
|
||||||
Route::get('/categories/delete/{category}', ['uses' => 'CategoryController@delete', 'as' => 'categories.delete']);
|
Route::get('/categories/delete/{category}', ['uses' => 'CategoryController@delete', 'as' => 'categories.delete']);
|
||||||
Route::get('/categories/show/{category}', ['uses' => 'CategoryController@show', 'as' => 'categories.show']);
|
Route::get('/categories/show/{category}', ['uses' => 'CategoryController@show', 'as' => 'categories.show']);
|
||||||
Route::get('/categories/list/noCategory', ['uses' => 'CategoryController@noCategory','as' => 'categories.noBudget']);
|
Route::get('/categories/list/noCategory', ['uses' => 'CategoryController@noCategory', 'as' => 'categories.noBudget']);
|
||||||
|
|
||||||
// currency controller
|
// currency controller
|
||||||
Route::get('/currency', ['uses' => 'CurrencyController@index', 'as' => 'currency.index']);
|
Route::get('/currency', ['uses' => 'CurrencyController@index', 'as' => 'currency.index']);
|
||||||
@ -260,11 +260,11 @@ Route::group(
|
|||||||
Route::get('/profile/change-password', ['uses' => 'ProfileController@changePassword', 'as' => 'change-password']);
|
Route::get('/profile/change-password', ['uses' => 'ProfileController@changePassword', 'as' => 'change-password']);
|
||||||
|
|
||||||
// related controller:
|
// related controller:
|
||||||
Route::get('/related/alreadyRelated/{tj}', ['uses' => 'RelatedController@alreadyRelated','as' => 'related.alreadyRelated']);
|
Route::get('/related/alreadyRelated/{tj}', ['uses' => 'RelatedController@alreadyRelated', 'as' => 'related.alreadyRelated']);
|
||||||
Route::post('/related/relate/{tj}/{tjSecond}', ['uses' => 'RelatedController@relate','as' => 'related.relate']);
|
Route::post('/related/relate/{tj}/{tjSecond}', ['uses' => 'RelatedController@relate', 'as' => 'related.relate']);
|
||||||
Route::get('/related/removeRelation/{tj}/{tjSecond}', ['uses' => 'RelatedController@removeRelation','as' => 'related.removeRelation']);
|
Route::get('/related/removeRelation/{tj}/{tjSecond}', ['uses' => 'RelatedController@removeRelation', 'as' => 'related.removeRelation']);
|
||||||
Route::get('/related/related/{tj}', ['uses' => 'RelatedController@related','as' => 'related.related']);
|
Route::get('/related/related/{tj}', ['uses' => 'RelatedController@related', 'as' => 'related.related']);
|
||||||
Route::post('/related/search/{tj}', ['uses' => 'RelatedController@search','as' => 'related.search']);
|
Route::post('/related/search/{tj}', ['uses' => 'RelatedController@search', 'as' => 'related.search']);
|
||||||
|
|
||||||
// bills controller
|
// bills controller
|
||||||
Route::get('/bills', ['uses' => 'BillController@index', 'as' => 'bills.index']);
|
Route::get('/bills', ['uses' => 'BillController@index', 'as' => 'bills.index']);
|
||||||
@ -383,10 +383,12 @@ Route::group(
|
|||||||
['before' => 'guest'], function () {
|
['before' => 'guest'], function () {
|
||||||
// user controller
|
// user controller
|
||||||
Route::get('/login', ['uses' => 'UserController@login', 'as' => 'login']);
|
Route::get('/login', ['uses' => 'UserController@login', 'as' => 'login']);
|
||||||
Route::get('/register', ['uses' => 'UserController@register', 'as' => 'register','before' => 'allow-register']);
|
Route::get('/register', ['uses' => 'UserController@register', 'as' => 'register', 'before' => 'allow-register']);
|
||||||
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']);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@ -397,7 +399,7 @@ Route::group(
|
|||||||
|
|
||||||
// user controller
|
// user controller
|
||||||
Route::post('/login', ['uses' => 'UserController@postLogin', 'as' => 'login.post']);
|
Route::post('/login', ['uses' => 'UserController@postLogin', 'as' => 'login.post']);
|
||||||
Route::post('/register', ['uses' => 'UserController@postRegister', 'as' => 'register.post','before' => 'allow-register']);
|
Route::post('/register', ['uses' => 'UserController@postRegister', 'as' => 'register.post', 'before' => 'allow-register']);
|
||||||
Route::post('/remindMe', ['uses' => 'UserController@postRemindMe', 'as' => 'remindMe.post']);
|
Route::post('/remindMe', ['uses' => 'UserController@postRemindMe', 'as' => 'remindMe.post']);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
@ -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
3208
composer.lock
generated
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user