Revert "merge 1"

This reverts commit 0bc6c20a6d.
This commit is contained in:
2022-10-24 01:03:43 +01:00
parent 0bc6c20a6d
commit 0c463d1f10
166 changed files with 1849 additions and 4266 deletions

View File

@@ -22,7 +22,6 @@
use App\Http\Controllers\AbsenceController;
use App\Http\Controllers\ApplicationController;
use App\Http\Controllers\AppointmentController;
use App\Http\Controllers\Auth\DiscordController;
use App\Http\Controllers\Auth\LoginController;
use App\Http\Controllers\Auth\TwofaController;
use App\Http\Controllers\BanController;
@@ -79,10 +78,10 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
->name('verify2FA');
Route::get('/redirect/discord', [DiscordController::class, 'discordRedirect'])
Route::get('/auth/redirect/discord', [LoginController::class, 'discordRedirect'])
->name('discordRedirect');
Route::get('/callback/discord', [DiscordController::class, 'discordCallback'])
Route::get('/auth/callback/discord', [LoginController::class, 'discordCallback'])
->name('discordCallback');
});
@@ -98,9 +97,6 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
Route::get('/accounts/{accountID}/dg/process-delete/{action}', [UserController::class, 'processDeleteConfirmation'])
->name('processDeleteConfirmation');
Route::get('/apply/discord/{vacancySlug}', [ApplicationController::class, 'discordApply'])
->name('discord-apply');
Route::group(['middleware' => ['auth', 'forcelogout', 'passwordexpiration', '2fa', 'verified']], function () {
@@ -111,6 +107,9 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
->name('dashboard')
->middleware('eligibility');
Route::get('users/directory', [ProfileController::class, 'index'])
->name('directory');
Route::resource('teams', TeamController::class);
Route::post('teams/{team}/invites/send', [TeamController::class, 'invite'])
@@ -193,7 +192,6 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
// Further locking down the profile section by adding the middleware to everything but the required routes
Route::group(['prefix' => '/profile'], function () {
Route::get('/settings', [ProfileController::class, 'showProfile'])
->name('showProfileSettings')
->middleware('passwordredirect');
@@ -206,13 +204,6 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
->name('showSingleProfile')
->middleware('passwordredirect');
Route::post('user/profile', [ProfileController::class, 'createProfile'])
->name('createProfile')
->middleware('passwordredirect');
Route::delete('user/profile', [ProfileController::class, 'deleteProfile'])
->name('deleteProfile')
->middleware('passwordredirect');
Route::get('/settings/account', [UserController::class, 'showAccount'])
@@ -223,14 +214,6 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
->name('changePassword');
Route::patch('/settings/account/add-password', [UserController::class, 'setPassword'])
->name('addPassword');
Route::patch('/settings/account/unlink-oauth', [UserController::class, 'unlinkDiscordAccount'])
->name('unlink-discord-account');
Route::patch('settings/account/add-age', [UserController::class, 'addDob'])
->name('add-dob');
Route::patch('/settings/account/change-email', [UserController::class, 'changeEmail'])
->name('changeEmail')
@@ -300,28 +283,18 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
Route::patch('settings/game/update', [OptionsController::class, 'saveGameIntegration'])
->name('saveGameIntegration');
Route::post('accounts/suspend/{user}', [UserController::class, 'suspend'])
Route::post('players/ban/{user}', [BanController::class, 'insert'])
->name('banUser');
Route::delete('accounts/unsuspend/{user}', [UserController::class, 'unsuspend'])
Route::delete('players/unban/{user}', [BanController::class, 'delete'])
->name('unbanUser');
Route::delete('accounts/delete/{user}', [UserController::class, 'delete'])
Route::delete('players/delete/{user}', [UserController::class, 'delete'])
->name('deleteUser');
Route::patch('accounts/force-reset/{user}', [UserController::class, 'forcePasswordReset'])
->name('force-reset-user');
Route::patch('accounts/reset-twofa/{user}', [UserController::class, 'reset2FASecret'])
->name('reset-twofa');
Route::patch('accounts/update/{user}', [UserController::class, 'update'])
Route::patch('players/update/{user}', [UserController::class, 'update'])
->name('updateUser');
Route::get('accounts/manage/{user}', [UserController::class, 'showAcocuntManagement'])
->name('manageUser');
Route::get('positions', [VacancyController::class, 'index'])
->name('showPositions');
@@ -362,7 +335,7 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
->name('updateForm');
Route::group(['prefix' => 'developers'], function () {
Route::group(['prefix' => 'devtools'], function () {
Route::get('/', [DevToolsController::class, 'index'])
->name('devTools');
@@ -378,10 +351,7 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
->name('devForceEvaluateVotes');
Route::delete('/suspensions/purge-expired', [DevToolsController::class, 'purgeSuspensions'])
->name('devPurgeExpiredSuspensions');
Route::delete('/absences/purge-expired', [DevToolsController::class, 'endAbsencesNow'])
->name('devPurgeExpiredAbsences');
->name('devPurgeExpired');
});