diff --git a/.bash_history b/.bash_history index 7121085..db3be36 100755 --- a/.bash_history +++ b/.bash_history @@ -165,3 +165,128 @@ git push python loadCSVAugustin2014.py cd .. python loadCSVAugustin2014.py +git pull +git pull +git rm SRC/public/pictures/user_picture/2 +git rm -f SRC/public/pictures/user_picture/2 +git pull +git pull +git pull +git rm SRC/public/pictures/user_picture/* +git status +LS +ls +cd SRC +ls +cd public/pictures/ +ls +exit +git pull +git pull +git status +git commit -m "tt" +git push +git pull +git push +git pull +exit +cd .. +ls +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +locale +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +python loadCSVAugustin2014.py +git pull +git pull +exit +git pull +rm SRC/resources/views/navbar_signed.blade.php +git pull +git pull +git pull +git rm SRC/public/pictures/user_picture/3 +git pull +git rm SRC/public/pictures/user_picture/3 +git pull +git add . +git commit -m "lol" +git pull +git pull +git pull +git pull +git pull +ls +cd SRC/ +cd public/ +ls /la +ls -la +cd pictures/ +ls -la +cd referent/ +ls -la +cd ../.. +ls -la +git commit -a +cd ../.. +git commit -a +git pull +nano SRC/.env +nano SRC/.env diff --git a/SRC/app/Http/routes.php b/SRC/app/Http/routes.php index 8861b9e..2e3179e 100755 --- a/SRC/app/Http/routes.php +++ b/SRC/app/Http/routes.php @@ -14,6 +14,16 @@ Route::get('/', 'GameController@index'); Route::get('referents/{id}/games', 'GameController@showReferentGames')->where('id', '^((?!login|referent|admin).)*$'); Route::get('referents/{id}/games/{idGame}', 'GameController@showOneReferentGame'); +Route::get('password/reset', array( + 'uses' => 'LoginController@reset', + 'as' => 'password.reset' +)); + +Route::post('password/reset', array( + 'uses' => 'LoginController@update', + 'as' => 'password.update' +)); + Route::group(['middleware' => 'guest'], function () { @@ -28,8 +38,6 @@ Route::group(['middleware' => 'auth'], function () Route::get('referent', 'ReferentController@index'); Route::get('logout', 'LoginController@logout'); Route::post('update', 'ReferentController@update'); - - Route::post('addSession', 'ReferentController@addSession'); }); Route::group(['middleware' => 'admin'], function ()