Skip to content

Commit

Permalink
Run rector on some files
Browse files Browse the repository at this point in the history
  • Loading branch information
@PavlosIsaris
PavlosIsaris committed Jan 7, 2025
1 parent c40e8b5 commit bb0a71a
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 42 deletions.
15 changes: 5 additions & 10 deletions resources/views/vendor/notifications/email.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,11 @@
{{-- Action Button --}}
@isset($actionText)
<?php
switch ($level) {
case 'success':
$color = 'green';
break;
case 'error':
$color = 'red';
break;
default:
$color = 'blue';
}
$color = match ($level) {
'success' => 'green',
'error' => 'red',
default => 'blue',
};
?>
@component('mail::button', ['url' => $actionUrl, 'color' => $color])
{{ $actionText }}
Expand Down
12 changes: 6 additions & 6 deletions routes/api.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
use App\Http\Controllers\User\UserController;
use Illuminate\Support\Facades\Route;

Route::middleware(['throttle:api-public'])->group(function () {
Route::middleware(['throttle:api-public'])->group(function (): void {
Route::get('/questionnaire/languages', [QuestionnaireController::class, 'getLanguagesForQuestionnaire'])->name('api.questionnaire.languages.get');
Route::get('/languages', [LanguageController::class, 'getLanguages'])->name('api.languages.get');
Route::post('/questionnaire/respond', [QuestionnaireResponseController::class, 'store'])->name('api.questionnaire-responses.store');
Expand All @@ -38,26 +38,26 @@
Route::get('/problems', [ProblemController::class, 'getProblemsForCrowdSourcingProject'])->name('api.problems.get');
});

Route::middleware(['throttle:api-internal', 'auth'])->group(function () {
Route::middleware(['throttle:api-internal', 'auth'])->group(function (): void {
Route::post('/questionnaire/answer-votes', [QuestionnaireResponseController::class, 'voteAnswer'])->name('api.questionnaire.answer-votes.store');

Route::post('/solutions/vote-downvote', [SolutionController::class, 'voteOrDownVoteSolution'])->name('api.solutions.vote-downvote');
});

Route::middleware(['throttle:api-internal'])->group(function () {
Route::middleware(['throttle:api-internal'])->group(function (): void {
Route::get('/solutions', [SolutionController::class, 'getSolutions'])->name('api.solutions.get');
Route::post('/solutions/handle-share', [SolutionController::class, 'handleShareSolution'])->name('api.solutions.handle-share');
});

Route::group(['middleware' => ['throttle:api-internal', 'auth', 'can:moderate-content-by-users']], function () {
Route::group(['middleware' => ['throttle:api-internal', 'auth', 'can:moderate-content-by-users']], function (): void {
Route::get('questionnaire/report-data', [QuestionnaireReportController::class, 'getReportDataForQuestionnaire'])->name('api.questionnaire.report-data.get');
Route::post('/questionnaire/answer-annotations', [QuestionnaireAnswerAnnotationController::class, 'annotateAnswer'])->name('api.questionnaire.answer-annotations.store');
Route::post('/questionnaire/answer-annotations/delete', [QuestionnaireAnswerAnnotationController::class, 'deleteAnswerAnnotation'])->name('questionnaire.answer-annotations.destroy');
Route::get('/questionnaire/answers-admin-analysis-statuses-get/', [QuestionnaireAnswerAnnotationController::class, 'getQuestionnaireAnswerAdminReviewStatuses'])->name('questionnaire.answers-admin-analysis-statuses.get');
Route::post('questionnaire/delete-response', [QuestionnaireResponseController::class, 'destroy'])->name('questionnaire_response.destroy');
});

Route::group(['middleware' => ['throttle:api-internal', 'auth', 'can:manage-platform-content']], function () {
Route::group(['middleware' => ['throttle:api-internal', 'auth', 'can:manage-platform-content']], function (): void {
Route::post('/questionnaire/new', [QuestionnaireController::class, 'store'])->name('api.questionnaire.store');
Route::post('/questionnaire/update/{id?}', [QuestionnaireController::class, 'update'])->name('api.questionnaire.update');
Route::post('/questionnaire/translate', [QuestionnaireController::class, 'translateQuestionnaire'])->name('api.questionnaire.translation.store');
Expand All @@ -73,6 +73,6 @@
Route::put('/solutions/update-status/{id}', [SolutionController::class, 'updateStatus'])->name('api.solutions.update-status');
});

Route::group(['middleware' => ['throttle:api-internal', 'auth', 'can:manage-users']], function () {
Route::group(['middleware' => ['throttle:api-internal', 'auth', 'can:manage-users']], function (): void {
Route::get('/users/filter', [UserController::class, 'showUsersByCriteria'])->name('api.users.get-filtered');
});
4 changes: 1 addition & 3 deletions routes/channels.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,4 @@
|
*/

Broadcast::channel('App.User.{id}', function ($user, $id) {
return (int) $user->id === (int) $id;
});
Broadcast::channel('App.User.{id}', fn ($user, $id): bool => (int) $user->id === (int) $id);
2 changes: 1 addition & 1 deletion routes/console.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
|
*/

Artisan::command('inspire', function () {
Artisan::command('inspire', function (): void {
$this->comment(Inspiring::quote());
})->describe('Display an inspiring quote');
44 changes: 22 additions & 22 deletions routes/web.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
'middleware' => 'setlocale',
];

Route::group($localeInfo, function () {
Route::group($localeInfo, function (): void {
Auth::routes();
Route::get('/', [HomeController::class, 'showHomePage'])->name('home');
Route::get('/terms-and-privacy', [HomeController::class, 'showTermsAndPrivacyPage'])->name('terms.privacy');
Expand All @@ -39,21 +39,21 @@
Route::get('login/social/{driver}', [LoginController::class, 'redirectToProvider']);
Route::get('login/social/{driver}/callback', [LoginController::class, 'handleProviderCallback'])->name('socialLoginCallback');

Route::group(['middleware' => ['auth', 'setlocale']], function () use ($localeInfo, $backOfficePrefix) {
Route::group($localeInfo, function () use ($backOfficePrefix) {
Route::group(['middleware' => ['auth', 'setlocale']], function () use ($localeInfo, $backOfficePrefix): void {
Route::group($localeInfo, function () use ($backOfficePrefix): void {
Route::get('/{project_slug}/problems/{problem_slug}/solutions/propose', [SolutionController::class, 'userProposalCreate'])->name('solutions.user-proposal-create');
Route::post('/{project_slug}/problems/{problem_slug}/solutions', [SolutionController::class, 'userProposalStore'])->name('solutions.user-proposal-store');
Route::get('/{project_slug}/problems/{problem_slug}/solutions/{solution_slug}/submitted', [SolutionController::class, 'userProposalSubmitted'])->name('solutions.user-proposal-submitted');
Route::group(['prefix' => $backOfficePrefix], function () {
Route::group(['prefix' => $backOfficePrefix], function (): void {
Route::get('/my-dashboard', [UserController::class, 'myDashboard'])->name('my-dashboard');
Route::get('/my-account', [UserController::class, 'myAccount'])->name('my-account');
Route::get('/my-contributions', [UserController::class, 'showUserContributions'])->name('my-contributions');
});
});
});

Route::group(['middleware' => ['auth', 'can:manage-users']], function () use ($backOfficePrefix) {
Route::group(['prefix' => $backOfficePrefix], function () {
Route::group(['middleware' => ['auth', 'can:manage-users']], function () use ($backOfficePrefix): void {
Route::group(['prefix' => $backOfficePrefix], function (): void {
Route::get('/manage-users', [AdminController::class, 'manageUsers'])->name('manage-users');
Route::get('/edit-user/{id}', [AdminController::class, 'editUserForm'])->name('edit-user');
Route::post('/add-user', [AdminController::class, 'addUserToPlatform']);
Expand All @@ -62,24 +62,24 @@
});
});

Route::group(['middleware' => ['auth', 'can:manage-platform']], function () use ($backOfficePrefix) {
Route::group(['prefix' => $backOfficePrefix], function () {
Route::group(['middleware' => ['auth', 'can:manage-platform']], function () use ($backOfficePrefix): void {
Route::group(['prefix' => $backOfficePrefix], function (): void {
Route::post('update-user', [AdminController::class, 'updateUserRoles']);
Route::get('/communication/mailchimp', [CommunicationController::class, 'getMailChimpIntegration'])->name('mailchimp-integration.get');
Route::post('/communication/mailchimp', [CommunicationController::class, 'storeMailChimpListsIds'])->name('mailchimp-integration');
});
Route::middleware(['throttle:api-public'])->group(function () {
Route::group(['prefix' => 'admin'], function () {
Route::get('/phpinfo', fn () => phpinfo());
Route::middleware(['throttle:api-public'])->group(function (): void {
Route::group(['prefix' => 'admin'], function (): void {
Route::get('/phpinfo', fn (): true => phpinfo());
Route::get('/check-upload', [AdminController::class, 'checkUploadPage']);
Route::post('/upload-files', [AdminController::class, 'uploadAdminFile'])->name('admin.image.upload');
});
});
});

Route::group(['middleware' => ['auth', 'can:manage-platform-content']], function () use ($localeInfo, $backOfficePrefix) {
Route::group($localeInfo, function () use ($backOfficePrefix) {
Route::group(['prefix' => $backOfficePrefix], function () {
Route::group(['middleware' => ['auth', 'can:manage-platform-content']], function () use ($localeInfo, $backOfficePrefix): void {
Route::group($localeInfo, function () use ($backOfficePrefix): void {
Route::group(['prefix' => $backOfficePrefix], function (): void {
Route::resource('projects', CrowdSourcingProjectController::class)->except(['destroy']);
Route::get('project/{id}/clone', [CrowdSourcingProjectController::class, 'clone'])->name('project.clone');
Route::post('project/destroy', [CrowdSourcingProjectController::class, 'destroy'])->name('project.destroy');
Expand All @@ -94,33 +94,33 @@
});
});

Route::group(['middleware' => ['auth', 'can:moderate-content-by-users']], function () use ($localeInfo, $backOfficePrefix) {
Route::group($localeInfo, function () use ($backOfficePrefix) {
Route::group(['prefix' => $backOfficePrefix], function () {
Route::group(['middleware' => ['auth', 'can:moderate-content-by-users']], function () use ($localeInfo, $backOfficePrefix): void {
Route::group($localeInfo, function () use ($backOfficePrefix): void {
Route::group(['prefix' => $backOfficePrefix], function (): void {
Route::get('/questionnaires', [QuestionnaireController::class, 'manageQuestionnaires'])->name('questionnaires.all');
Route::get('/questionnaires/reports', [QuestionnaireReportController::class, 'viewReportsPage'])->name('questionnaires.reports');
Route::get('/{project:slug}/questionnaire/{questionnaire:id}/moderator-add-answer', [QuestionnaireController::class, 'showAddResponseAsModeratorToQuestionnaire'])->name('questionnaire-moderator-add-response');
});
});
});

Route::group(['middleware' => 'auth'], function () use ($backOfficePrefix) {
Route::group(['prefix' => $backOfficePrefix], function () {
Route::group(['middleware' => 'auth'], function () use ($backOfficePrefix): void {
Route::group(['prefix' => $backOfficePrefix], function (): void {
Route::put('/user/update', [UserController::class, 'patch'])->name('user.update');
Route::post('/user/deactivate', [UserController::class, 'deactivateLoggedInUser'])->name('user.deactivate');
Route::get('/questionnaire/{questionnaire_id}/download-responses', [QuestionnaireResponseController::class, 'downloadQuestionnaireResponses'])->name('questionnaire.responses.download');
Route::get('/user/my-data/download', [UserController::class, 'downloadMyData'])->name('my-data.download');
});
});

Route::group($localeInfo, function () {
Route::group($localeInfo, function (): void {
Route::get('/questionnaires/{questionnaire}/statistics/{projectFilter?}', [QuestionnaireStatisticsController::class, 'showStatisticsPageForQuestionnaire'])->name('questionnaire.statistics')->middleware('questionnaire.page_settings');
});

Route::group($localeInfo, function () {
Route::group($localeInfo, function (): void {
Route::post('/languages/setlocale', [LanguageController::class, 'setLocale'])->name('languages.setlocale');
});
Route::group($localeInfo, function () {
Route::group($localeInfo, function (): void {
Route::get('/{slug}', [CrowdSourcingProjectController::class, 'showLandingPage'])->name('project.landing-page');
Route::get('/{project_slug}/{questionnaire_id}/thanks', [QuestionnaireResponseController::class, 'showQuestionnaireThanksForRespondingPage'])->name('questionnaire.thanks');
Route::get('/{project_slug}/problems', [ProblemController::class, 'showProblemsPage'])->name('project.problems-page');
Expand Down

0 comments on commit bb0a71a

Please sign in to comment.