diff --git a/apps/backend/app/Http/Controllers/AuthController.php b/apps/backend/app/Http/Controllers/AuthController.php index 5001f66..11a3297 100755 --- a/apps/backend/app/Http/Controllers/AuthController.php +++ b/apps/backend/app/Http/Controllers/AuthController.php @@ -5,7 +5,6 @@ namespace app\Http\Controllers; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; -use function App\Http\Controllers\response; class AuthController extends Controller { diff --git a/apps/backend/app/Http/Controllers/EventsController.php b/apps/backend/app/Http/Controllers/EventsController.php index 2cc927c..0c928c7 100755 --- a/apps/backend/app/Http/Controllers/EventsController.php +++ b/apps/backend/app/Http/Controllers/EventsController.php @@ -14,8 +14,6 @@ use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Mail; use Illuminate\Support\Facades\Notification; use Illuminate\Support\Facades\Storage; -use function App\Http\Controllers\response; - class EventsController extends Controller { diff --git a/apps/backend/app/Http/Controllers/ExportController.php b/apps/backend/app/Http/Controllers/ExportController.php index 0163be3..d5305b8 100755 --- a/apps/backend/app/Http/Controllers/ExportController.php +++ b/apps/backend/app/Http/Controllers/ExportController.php @@ -4,7 +4,6 @@ namespace app\Http\Controllers; use app\Models\User; use Carbon\Carbon; -use function App\Http\Controllers\response; class ExportController extends Controller { diff --git a/apps/backend/app/Http/Controllers/NotificationsController.php b/apps/backend/app/Http/Controllers/NotificationsController.php index e0dabc0..58cdd6f 100755 --- a/apps/backend/app/Http/Controllers/NotificationsController.php +++ b/apps/backend/app/Http/Controllers/NotificationsController.php @@ -5,7 +5,6 @@ namespace app\Http\Controllers; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Log; -use function App\Http\Controllers\response; class NotificationsController extends Controller { diff --git a/apps/backend/app/Http/Controllers/SearchController.php b/apps/backend/app/Http/Controllers/SearchController.php index 887db73..974b194 100755 --- a/apps/backend/app/Http/Controllers/SearchController.php +++ b/apps/backend/app/Http/Controllers/SearchController.php @@ -5,8 +5,6 @@ namespace app\Http\Controllers; use Exception; use Illuminate\Http\Request; use Typesense\Client; -use function App\Http\Controllers\config; -use function App\Http\Controllers\response; class SearchController extends Controller { diff --git a/apps/backend/app/Http/Controllers/TasksController.php b/apps/backend/app/Http/Controllers/TasksController.php index cb0461b..b54843b 100755 --- a/apps/backend/app/Http/Controllers/TasksController.php +++ b/apps/backend/app/Http/Controllers/TasksController.php @@ -21,7 +21,6 @@ use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Mail; use Illuminate\Support\Facades\Notification; -use function App\Http\Controllers\response; class TasksController extends Controller { diff --git a/apps/backend/app/Http/Controllers/UserController.php b/apps/backend/app/Http/Controllers/UserController.php index 909c564..e99c136 100755 --- a/apps/backend/app/Http/Controllers/UserController.php +++ b/apps/backend/app/Http/Controllers/UserController.php @@ -28,8 +28,6 @@ use Illuminate\Support\Facades\Notification; use Illuminate\Support\Facades\Storage; use Pest\Support\Str; use Propaganistas\LaravelPhone\PhoneNumber; -use function App\Http\Controllers\now; -use function App\Http\Controllers\response; class UserController extends Controller { diff --git a/apps/backend/app/Mail/CreateUserByAdminMail.php b/apps/backend/app/Mail/CreateUserByAdminMail.php index 87967ce..6da6f3d 100755 --- a/apps/backend/app/Mail/CreateUserByAdminMail.php +++ b/apps/backend/app/Mail/CreateUserByAdminMail.php @@ -3,7 +3,6 @@ namespace app\Mail; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailables\Content; use Illuminate\Mail\Mailables\Envelope; diff --git a/apps/backend/app/Mail/DeactivateAccountMail.php b/apps/backend/app/Mail/DeactivateAccountMail.php index ca4367e..4ee97e5 100755 --- a/apps/backend/app/Mail/DeactivateAccountMail.php +++ b/apps/backend/app/Mail/DeactivateAccountMail.php @@ -3,7 +3,6 @@ namespace app\Mail; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailables\Content; use Illuminate\Mail\Mailables\Envelope; diff --git a/apps/backend/app/Mail/DeleteAccountMail.php b/apps/backend/app/Mail/DeleteAccountMail.php index d3ad47e..9d9b37d 100755 --- a/apps/backend/app/Mail/DeleteAccountMail.php +++ b/apps/backend/app/Mail/DeleteAccountMail.php @@ -3,7 +3,6 @@ namespace app\Mail; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailables\Content; use Illuminate\Mail\Mailables\Envelope; diff --git a/apps/backend/app/Mail/EmailChangeConfirmedMail.php b/apps/backend/app/Mail/EmailChangeConfirmedMail.php index 708692f..65e5454 100755 --- a/apps/backend/app/Mail/EmailChangeConfirmedMail.php +++ b/apps/backend/app/Mail/EmailChangeConfirmedMail.php @@ -3,7 +3,6 @@ namespace app\Mail; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailables\Content; use Illuminate\Mail\Mailables\Envelope; diff --git a/apps/backend/app/Mail/EventParticipationCancelledMail.php b/apps/backend/app/Mail/EventParticipationCancelledMail.php index 03c8ee7..8c2f6a6 100755 --- a/apps/backend/app/Mail/EventParticipationCancelledMail.php +++ b/apps/backend/app/Mail/EventParticipationCancelledMail.php @@ -4,7 +4,6 @@ namespace app\Mail; use app\Services\FormatDate; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailables\Content; use Illuminate\Mail\Mailables\Envelope; diff --git a/apps/backend/app/Mail/NotifyEmailChangeMail.php b/apps/backend/app/Mail/NotifyEmailChangeMail.php index 813e98f..567f9d2 100755 --- a/apps/backend/app/Mail/NotifyEmailChangeMail.php +++ b/apps/backend/app/Mail/NotifyEmailChangeMail.php @@ -3,7 +3,6 @@ namespace app\Mail; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailables\Content; use Illuminate\Mail\Mailables\Envelope; diff --git a/apps/backend/app/Mail/RegisterMail.php b/apps/backend/app/Mail/RegisterMail.php index 14fdf66..cfe9bba 100755 --- a/apps/backend/app/Mail/RegisterMail.php +++ b/apps/backend/app/Mail/RegisterMail.php @@ -3,7 +3,6 @@ namespace app\Mail; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailables\Content; use Illuminate\Mail\Mailables\Envelope; diff --git a/apps/backend/app/Mail/RequestEmailChangeMail.php b/apps/backend/app/Mail/RequestEmailChangeMail.php index dbda479..e30c6da 100755 --- a/apps/backend/app/Mail/RequestEmailChangeMail.php +++ b/apps/backend/app/Mail/RequestEmailChangeMail.php @@ -3,7 +3,6 @@ namespace app\Mail; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailables\Content; use Illuminate\Mail\Mailables\Envelope; diff --git a/apps/backend/app/Mail/TaskDateUpdateMail.php b/apps/backend/app/Mail/TaskDateUpdateMail.php index 73ab0b0..5ec5999 100755 --- a/apps/backend/app/Mail/TaskDateUpdateMail.php +++ b/apps/backend/app/Mail/TaskDateUpdateMail.php @@ -3,7 +3,6 @@ namespace app\Mail; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailables\Content; use Illuminate\Mail\Mailables\Envelope; diff --git a/apps/backend/app/Mail/TaskParticipationCancelledMail.php b/apps/backend/app/Mail/TaskParticipationCancelledMail.php index 65aa84d..63c7ebc 100755 --- a/apps/backend/app/Mail/TaskParticipationCancelledMail.php +++ b/apps/backend/app/Mail/TaskParticipationCancelledMail.php @@ -4,7 +4,6 @@ namespace app\Mail; use app\Services\FormatDate; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailables\Content; use Illuminate\Mail\Mailables\Envelope; diff --git a/apps/backend/app/Mail/UpdatePasswordMail.php b/apps/backend/app/Mail/UpdatePasswordMail.php index 50a72e7..134c6f9 100755 --- a/apps/backend/app/Mail/UpdatePasswordMail.php +++ b/apps/backend/app/Mail/UpdatePasswordMail.php @@ -3,7 +3,6 @@ namespace app\Mail; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailables\Content; use Illuminate\Mail\Mailables\Envelope; diff --git a/apps/backend/app/Mail/UpdateRoleMail.php b/apps/backend/app/Mail/UpdateRoleMail.php index 780172d..bad44af 100755 --- a/apps/backend/app/Mail/UpdateRoleMail.php +++ b/apps/backend/app/Mail/UpdateRoleMail.php @@ -3,7 +3,6 @@ namespace app\Mail; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailables\Content; use Illuminate\Mail\Mailables\Envelope; diff --git a/apps/backend/app/Mail/ValidateMail.php b/apps/backend/app/Mail/ValidateMail.php index 2ad73b7..3b9b202 100755 --- a/apps/backend/app/Mail/ValidateMail.php +++ b/apps/backend/app/Mail/ValidateMail.php @@ -3,7 +3,6 @@ namespace app\Mail; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailables\Content; use Illuminate\Mail\Mailables\Envelope; diff --git a/apps/backend/app/Mail/VolunteerAssignToTaskMail.php b/apps/backend/app/Mail/VolunteerAssignToTaskMail.php index 7bdc1e7..2645a1b 100755 --- a/apps/backend/app/Mail/VolunteerAssignToTaskMail.php +++ b/apps/backend/app/Mail/VolunteerAssignToTaskMail.php @@ -4,7 +4,6 @@ namespace app\Mail; use app\Services\FormatDate; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailables\Content; use Illuminate\Mail\Mailables\Envelope; diff --git a/apps/backend/app/Mail/VolunteerUnassignToTaskMail.php b/apps/backend/app/Mail/VolunteerUnassignToTaskMail.php index 09263d1..123cfcf 100755 --- a/apps/backend/app/Mail/VolunteerUnassignToTaskMail.php +++ b/apps/backend/app/Mail/VolunteerUnassignToTaskMail.php @@ -4,7 +4,6 @@ namespace app\Mail; use app\Services\FormatDate; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailables\Content; use Illuminate\Mail\Mailables\Envelope; diff --git a/apps/backend/app/Notifications/EventDeleted.php b/apps/backend/app/Notifications/EventDeleted.php index 9938938..6ac8cb8 100755 --- a/apps/backend/app/Notifications/EventDeleted.php +++ b/apps/backend/app/Notifications/EventDeleted.php @@ -7,7 +7,6 @@ use Illuminate\Bus\Queueable; use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Notifications\Messages\BroadcastMessage; use Illuminate\Notifications\Notification; -use Illuminate\Support\Facades\Mail; class EventDeleted extends Notification implements ShouldBroadcast { diff --git a/apps/backend/app/Notifications/TaskDateUpdated.php b/apps/backend/app/Notifications/TaskDateUpdated.php index cfa636b..333e301 100755 --- a/apps/backend/app/Notifications/TaskDateUpdated.php +++ b/apps/backend/app/Notifications/TaskDateUpdated.php @@ -8,7 +8,6 @@ use Illuminate\Bus\Queueable; use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Notifications\Messages\BroadcastMessage; use Illuminate\Notifications\Notification; -use Illuminate\Support\Facades\Mail; class TaskDateUpdated extends Notification implements ShouldBroadcast { diff --git a/apps/backend/app/Notifications/TaskDeleted.php b/apps/backend/app/Notifications/TaskDeleted.php index 99bae4e..238a84c 100755 --- a/apps/backend/app/Notifications/TaskDeleted.php +++ b/apps/backend/app/Notifications/TaskDeleted.php @@ -8,7 +8,6 @@ use Illuminate\Bus\Queueable; use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Notifications\Messages\BroadcastMessage; use Illuminate\Notifications\Notification; -use Illuminate\Support\Facades\Mail; class TaskDeleted extends Notification implements ShouldBroadcast { diff --git a/apps/backend/app/Notifications/UserRegistered.php b/apps/backend/app/Notifications/UserRegistered.php index 886a727..e07ae8e 100755 --- a/apps/backend/app/Notifications/UserRegistered.php +++ b/apps/backend/app/Notifications/UserRegistered.php @@ -6,9 +6,7 @@ use app\Models\User; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Notifications\Messages\BroadcastMessage; -use Illuminate\Notifications\Messages\MailMessage; use Illuminate\Notifications\Notification; -use Illuminate\Support\Facades\Mail; class UserRegistered extends Notification implements ShouldBroadcast { diff --git a/apps/backend/app/Notifications/VolunteerAssignedToTask.php b/apps/backend/app/Notifications/VolunteerAssignedToTask.php index b8eb277..e968d93 100755 --- a/apps/backend/app/Notifications/VolunteerAssignedToTask.php +++ b/apps/backend/app/Notifications/VolunteerAssignedToTask.php @@ -8,7 +8,6 @@ use Illuminate\Bus\Queueable; use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Notifications\Messages\BroadcastMessage; use Illuminate\Notifications\Notification; -use Illuminate\Support\Facades\Mail; class VolunteerAssignedToTask extends Notification implements ShouldBroadcast { diff --git a/apps/backend/app/Notifications/VolunteerRoleUpdated.php b/apps/backend/app/Notifications/VolunteerRoleUpdated.php index b097f81..3b34e6b 100755 --- a/apps/backend/app/Notifications/VolunteerRoleUpdated.php +++ b/apps/backend/app/Notifications/VolunteerRoleUpdated.php @@ -6,7 +6,6 @@ use Illuminate\Bus\Queueable; use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Notifications\Messages\BroadcastMessage; use Illuminate\Notifications\Notification; -use Illuminate\Support\Facades\Mail; class VolunteerRoleUpdated extends Notification implements ShouldBroadcast { diff --git a/apps/backend/app/Notifications/VolunteerUnassignedFromTask.php b/apps/backend/app/Notifications/VolunteerUnassignedFromTask.php index be91640..f862d4f 100755 --- a/apps/backend/app/Notifications/VolunteerUnassignedFromTask.php +++ b/apps/backend/app/Notifications/VolunteerUnassignedFromTask.php @@ -8,7 +8,6 @@ use Illuminate\Bus\Queueable; use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Notifications\Messages\BroadcastMessage; use Illuminate\Notifications\Notification; -use Illuminate\Support\Facades\Mail; class VolunteerUnassignedFromTask extends Notification implements ShouldBroadcast { diff --git a/apps/backend/app/Observers/EventObserver.php b/apps/backend/app/Observers/EventObserver.php index 7e3504e..e44f7fe 100755 --- a/apps/backend/app/Observers/EventObserver.php +++ b/apps/backend/app/Observers/EventObserver.php @@ -4,7 +4,6 @@ namespace app\Observers; use app\Models\Event; use app\Services\TypesenseService; -use function App\Observers\app; class EventObserver { diff --git a/apps/backend/app/Observers/UserObserver.php b/apps/backend/app/Observers/UserObserver.php index f6c5b54..71517b3 100755 --- a/apps/backend/app/Observers/UserObserver.php +++ b/apps/backend/app/Observers/UserObserver.php @@ -4,7 +4,6 @@ namespace app\Observers; use app\Models\User; use app\Services\TypesenseService; -use function App\Observers\app; class UserObserver { diff --git a/apps/backend/app/Policies/EventsPolicy.php b/apps/backend/app/Policies/EventsPolicy.php index d529569..86475ba 100755 --- a/apps/backend/app/Policies/EventsPolicy.php +++ b/apps/backend/app/Policies/EventsPolicy.php @@ -3,7 +3,6 @@ namespace app\Policies; use app\Models\User; -use Illuminate\Auth\Access\Response; class EventsPolicy { diff --git a/apps/backend/app/Policies/TasksPolicy.php b/apps/backend/app/Policies/TasksPolicy.php index 81fae29..89e9a7c 100755 --- a/apps/backend/app/Policies/TasksPolicy.php +++ b/apps/backend/app/Policies/TasksPolicy.php @@ -3,7 +3,6 @@ namespace app\Policies; use app\Models\User; -use Illuminate\Auth\Access\Response; class TasksPolicy { diff --git a/apps/backend/app/Policies/UsersPolicy.php b/apps/backend/app/Policies/UsersPolicy.php index 763da8a..eb51319 100755 --- a/apps/backend/app/Policies/UsersPolicy.php +++ b/apps/backend/app/Policies/UsersPolicy.php @@ -3,7 +3,6 @@ namespace app\Policies; use app\Models\User; -use Illuminate\Auth\Access\Response; class UsersPolicy { diff --git a/apps/backend/app/Providers/AppServiceProvider.php b/apps/backend/app/Providers/AppServiceProvider.php index 52502eb..dfe80a3 100755 --- a/apps/backend/app/Providers/AppServiceProvider.php +++ b/apps/backend/app/Providers/AppServiceProvider.php @@ -8,7 +8,6 @@ use app\Observers\EventObserver; use app\Observers\UserObserver; use Illuminate\Support\Facades\Route; use Illuminate\Support\ServiceProvider; -use function App\Providers\base_path; class AppServiceProvider extends ServiceProvider { @@ -23,13 +22,17 @@ class AppServiceProvider extends ServiceProvider /** * Bootstrap any application services. */ - public function boot(): void - { - Route::middleware('web')->prefix('api')->group(base_path('routes/users.php')); - Route::middleware('web')->prefix('api')->group(base_path('routes/auth.php')); - Route::middleware('web')->prefix('api')->group(base_path('routes/events.php')); - Route::middleware('web')->prefix('api')->group(base_path('routes/notifications.php')); - Route::middleware('web')->prefix('api')->group(base_path('routes/channels.php')); + public function boot(): void { + Route::middleware('web')->prefix('api') + ->group($this->app->basePath('routes/users.php')); + Route::middleware('web')->prefix('api') + ->group($this->app->basePath('routes/auth.php')); + Route::middleware('web')->prefix('api') + ->group($this->app->basePath('routes/events.php')); + Route::middleware('web')->prefix('api') + ->group($this->app->basePath('routes/notifications.php')); + Route::middleware('web')->prefix('api') + ->group($this->app->basePath('routes/channels.php')); User::observe(UserObserver::class); Event::observe(EventObserver::class); } diff --git a/apps/backend/app/Providers/BroadcastServiceProvider.php b/apps/backend/app/Providers/BroadcastServiceProvider.php index b4bc3c2..5d5dd88 100755 --- a/apps/backend/app/Providers/BroadcastServiceProvider.php +++ b/apps/backend/app/Providers/BroadcastServiceProvider.php @@ -4,7 +4,6 @@ namespace app\Providers; use Illuminate\Support\Facades\Broadcast; use Illuminate\Support\ServiceProvider; -use function App\Providers\base_path; class BroadcastServiceProvider extends ServiceProvider { diff --git a/apps/backend/app/Services/TypesenseService.php b/apps/backend/app/Services/TypesenseService.php index cd2a2bf..91ae68a 100755 --- a/apps/backend/app/Services/TypesenseService.php +++ b/apps/backend/app/Services/TypesenseService.php @@ -1,10 +1,9 @@ diff --git a/apps/backend/database/seeders/DatabaseSeeder.php b/apps/backend/database/seeders/DatabaseSeeder.php index b7bd2e9..9ad27b5 100755 --- a/apps/backend/database/seeders/DatabaseSeeder.php +++ b/apps/backend/database/seeders/DatabaseSeeder.php @@ -1,6 +1,6 @@