refactor: code style changes

Signed-off-by: miguel456 <me@nogueira.codes>
This commit is contained in:
2023-01-15 00:04:00 +00:00
parent 25155bff2e
commit 3727c84f3e
146 changed files with 1013 additions and 1341 deletions

View File

@@ -29,18 +29,17 @@ use App\Http\Controllers\DashboardController;
use App\Http\Controllers\DevToolsController;
use App\Http\Controllers\FormController;
use App\Http\Controllers\HomeController;
use App\Http\Controllers\OptionsController;
use App\Http\Controllers\ProfileController;
use App\Http\Controllers\SecuritySettingsController;
use App\Http\Controllers\TeamController;
use App\Http\Controllers\TeamFileController;
use App\Http\Controllers\UserController;
use App\Http\Controllers\VacancyController;
use App\Http\Controllers\VoteController;
use App\Http\Controllers\OptionsController;
use App\Http\Controllers\SecuritySettingsController;
use Illuminate\Support\Facades\Route;
use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
/*
|--------------------------------------------------------------------------
| Web Routes
@@ -53,34 +52,30 @@ use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
*/
Route::get('/uptime', function () {
return response()->json([
'app' => config('app.name'),
'status' => 'up',
'version' => '0.7.2',
'meta' => [
'demo_enabled' => config('demo.is_enabled'),
]
],
]);
})->name('uptime');
Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['localeSessionRedirect', 'localizationRedirect', 'localeViewPath']], function () {
Route::group(['prefix' => 'auth', 'middleware' => ['usernameUUID']], function () {
Auth::routes([
'verify' => true
'verify' => true,
]);
Route::post('/twofa/authenticate', [TwofaController::class, 'verify2FA'])
->name('verify2FA');
Route::get('/redirect/discord', [DiscordController::class, 'discordRedirect'])
->name('discordRedirect');
Route::get('/callback/discord', [DiscordController::class, 'discordCallback'])
->name('discordCallback');
});
Route::get('/', [HomeController::class, 'index'])
@@ -94,11 +89,7 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
->name('discord-apply');
Route::group(['middleware' => ['auth', 'forcelogout', 'passwordexpiration', '2fa', 'verified']], function () {
Route::group(['middleware' => ['passwordredirect']], function(){
Route::group(['middleware' => ['passwordredirect']], function () {
Route::get('/dashboard', [DashboardController::class, 'index'])
->name('dashboard')
->middleware('eligibility');
@@ -117,8 +108,6 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
Route::get('teams/invites/{action}/{token}', [TeamController::class, 'processInviteAction'])
->name('processInvite');
Route::get('team/files', [TeamFileController::class, 'index'])
->name('showTeamFiles');
@@ -130,7 +119,6 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
Route::get('team/files/{teamFile}/download', [TeamFileController::class, 'download'])
->name('downloadTeamFile');
});
Route::group(['prefix' => '/applications', 'middleware' => ['passwordredirect']], function () {
@@ -159,7 +147,6 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
Route::get('/staff/all', [ApplicationController::class, 'showAllApps'])
->name('allApplications');
Route::post('{application}/staff/vote', [VoteController::class, 'vote'])
->name('voteApplication');
});
@@ -185,7 +172,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,15 +192,12 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
->name('deleteProfile')
->middleware('passwordredirect');
Route::get('/settings/account', [UserController::class, 'showAccount'])
->name('showAccountSettings');
Route::patch('/settings/account/change-password', [UserController::class, 'changePassword'])
->name('changePassword');
Route::patch('/settings/account/add-password', [UserController::class, 'setPassword'])
->name('addPassword');
Route::patch('/settings/account/unlink-oauth', [UserController::class, 'unlinkDiscordAccount'])
@@ -222,8 +205,6 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
Route::patch('settings/account/add-age', [UserController::class, 'addDob'])
->name('add-dob');
Route::patch('/settings/account/change-email', [UserController::class, 'changeEmail'])
->name('changeEmail')
->middleware('passwordredirect');
@@ -246,7 +227,6 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
});
Route::group(['prefix' => '/hr', 'middleware' => ['passwordredirect']], function () {
Route::get('users', [UserController::class, 'showUsers'])
->name('registeredPlayerList');
@@ -256,12 +236,9 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
Route::patch('staff-members/terminate/{user}', [UserController::class, 'terminate'])
->name('terminateStaffMember');
Route::resource('absences', AbsenceController::class);
Route::controller(AbsenceController::class)->group(function () {
Route::get('my-absences', 'showUserAbsences')
->name('showUserAbsences');
@@ -273,16 +250,13 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
Route::patch('absences/{absence}/cancel', 'cancelAbsence')
->name('cancelAbsence');
});
});
Route::group(['prefix' => 'admin', 'middleware' => ['passwordredirect']], function () {
Route::get('settings', [OptionsController::class, 'index'])
->name('showSettings');
Route::post('settings/save', [OptionsController::class, 'saveSettings'])
->name('saveSettings');
@@ -292,7 +266,6 @@ 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'])
->name('banUser');
@@ -343,7 +316,6 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
Route::get('forms', [FormController::class, 'index'])
->name('showForms');
Route::get('forms/preview/{form}', [FormController::class, 'preview'])
->name('previewForm');
@@ -353,13 +325,10 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
Route::patch('forms/update/{form}', [FormController::class, 'update'])
->name('updateForm');
Route::group(['prefix' => 'developers'], function () {
Route::get('/', [DevToolsController::class, 'index'])
->name('devTools');
Route::post('/applications/force-approval', [DevToolsController::class, 'forceApprovalEvent'])
->name('devForceApprovalEvent');
@@ -374,9 +343,7 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
Route::delete('/absences/purge-expired', [DevToolsController::class, 'endAbsencesNow'])
->name('devPurgeExpiredAbsences');
});
});
});
});