Commit 03ab97c8 authored by Gabrielle Harang's avatar Gabrielle Harang
Browse files

🐛 fix: try to fix the last merge

parent f9e7e41e

app/Http/Controllers/AuthController.php

+5 −1
Original line number Diff line number Diff line
@@ -16,7 +16,11 @@ public function login(Request $request) 


        $user = User::where('US_EMAIL', $request->mail)->first();



        if ($user == null || !$user->checkPassword(hash("sha256",$request->password))) {

        /*if ($user == null || !$user->checkPassword(hash("sha256",$request->password))) {

            return view('login', ['wrongPassword' => true]);

        }*/



        if ($user == null || !$user->checkPassword($request->password)) {

            return view('login', ['wrongPassword' => true]);

        }

routes/web.php

+0 −25
Original line number Diff line number Diff line
@@ -231,30 +231,6 @@ 
 */

Route::get('/alldivings?{afterthe}&{beforethe}', [DivingNumberController::class, 'filteredSearch({afterthe}, {beforethe})']);



/**

 * Leads to a page that allows to manage every member and change their roles.

 * Only accessible to the diving section manager.

 */

Route::middleware('App\Http\Middleware\rightChecker')

    ->get('manage/members', [ManageAdherentController::class, 'index'])

    ->name('manage_members');



/**

 * Updates every user's roles.

 * Only accessible to the diving section manager.

 */

Route::middleware('App\Http\Middleware\rightChecker')

    ->post('manage/members/roles', [ManageAdherentController::class, 'update'])

    ->name('updateMembersRole');



Route::middleware('App\Http\Middleware\rightChecker')

    ->get('dive/{id}', [DivesList::class, 'show'])

    ->name('dives_show');



Route::middleware('App\Http\Middleware\rightChecker')

    ->get('manage/dives', [DivesList::class, 'showManagementList'])

->name('manage_dives_dir');



Route::get('/modificationdives', [ModificationDives::class, 'index']);



Route::get('modificationdives/members/{ds_code}', function($ds_code){
@@ -348,7 +324,6 @@ 
});



Route::get('/modificationdives/members/{ds_code}/ajoutadherent/{level}', [AdherentController::class, 'searchByName']);

    ->name('manage_dives_dir');



Route::middleware('App\Http\Middleware\RightChecker')

    ->get('dodo', function () {