diff --git a/apps/backend/app/Http/Controllers/EventsController.php b/apps/backend/app/Http/Controllers/EventsController.php index 7b2f862..2cc927c 100755 --- a/apps/backend/app/Http/Controllers/EventsController.php +++ b/apps/backend/app/Http/Controllers/EventsController.php @@ -2,10 +2,10 @@ namespace app\Http\Controllers; -use apps\backend\app\Mail\EventParticipationCancelledMail; -use apps\backend\app\Models\Event; -use apps\backend\app\Models\Task; -use apps\backend\app\Notifications\EventDeleted; +use app\Mail\EventParticipationCancelledMail; +use app\Models\Event; +use app\Models\Task; +use app\Notifications\EventDeleted; use Carbon\Carbon; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; diff --git a/apps/backend/app/Http/Controllers/ExportController.php b/apps/backend/app/Http/Controllers/ExportController.php index 81f7a14..0163be3 100755 --- a/apps/backend/app/Http/Controllers/ExportController.php +++ b/apps/backend/app/Http/Controllers/ExportController.php @@ -2,7 +2,7 @@ namespace app\Http\Controllers; -use apps\backend\app\Models\User; +use app\Models\User; use Carbon\Carbon; use function App\Http\Controllers\response; diff --git a/apps/backend/app/Http/Controllers/TasksController.php b/apps/backend/app/Http/Controllers/TasksController.php index e3e37bd..cb0461b 100755 --- a/apps/backend/app/Http/Controllers/TasksController.php +++ b/apps/backend/app/Http/Controllers/TasksController.php @@ -2,18 +2,18 @@ namespace app\Http\Controllers; -use apps\backend\app\Mail\TaskDateUpdateMail; -use apps\backend\app\Mail\TaskParticipationCancelledMail; -use apps\backend\app\Mail\VolunteerAssignToTaskMail; -use apps\backend\app\Mail\VolunteerUnassignToTaskMail; -use apps\backend\app\Models\Event; -use apps\backend\app\Models\Task; -use apps\backend\app\Models\User; -use apps\backend\app\Notifications\TaskDateUpdated; -use apps\backend\app\Notifications\TaskDeleted; -use apps\backend\app\Notifications\VolunteerAssignedToTask; -use apps\backend\app\Notifications\VolunteerUnassignedFromTask; -use apps\backend\app\Services\FormatDate; +use app\Mail\TaskDateUpdateMail; +use app\Mail\TaskParticipationCancelledMail; +use app\Mail\VolunteerAssignToTaskMail; +use app\Mail\VolunteerUnassignToTaskMail; +use app\Models\Event; +use app\Models\Task; +use app\Models\User; +use app\Notifications\TaskDateUpdated; +use app\Notifications\TaskDeleted; +use app\Notifications\VolunteerAssignedToTask; +use app\Notifications\VolunteerUnassignedFromTask; +use app\Services\FormatDate; use Carbon\Carbon; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; diff --git a/apps/backend/app/Http/Controllers/UserController.php b/apps/backend/app/Http/Controllers/UserController.php index 100cb54..909c564 100755 --- a/apps/backend/app/Http/Controllers/UserController.php +++ b/apps/backend/app/Http/Controllers/UserController.php @@ -2,21 +2,21 @@ namespace app\Http\Controllers; -use apps\backend\app\Mail\CreateUserByAdminMail; -use apps\backend\app\Mail\DeactivateAccountMail; -use apps\backend\app\Mail\DeleteAccountMail; -use apps\backend\app\Mail\EmailChangeConfirmedMail; -use apps\backend\app\Mail\NotifyEmailChangeMail; -use apps\backend\app\Mail\RegisterMail; -use apps\backend\app\Mail\RequestEmailChangeMail; -use apps\backend\app\Mail\UpdatePasswordMail; -use apps\backend\app\Mail\UpdateRoleMail; -use apps\backend\app\Mail\ValidateMail; -use apps\backend\app\Models\User; -use apps\backend\app\Notifications\UserRegistered; -use apps\backend\app\Notifications\VolunteerRoleUpdated; -use apps\backend\app\Services\GetRole; -use apps\backend\app\Services\UserService; +use app\Mail\CreateUserByAdminMail; +use app\Mail\DeactivateAccountMail; +use app\Mail\DeleteAccountMail; +use app\Mail\EmailChangeConfirmedMail; +use app\Mail\NotifyEmailChangeMail; +use app\Mail\RegisterMail; +use app\Mail\RequestEmailChangeMail; +use app\Mail\UpdatePasswordMail; +use app\Mail\UpdateRoleMail; +use app\Mail\ValidateMail; +use app\Models\User; +use app\Notifications\UserRegistered; +use app\Notifications\VolunteerRoleUpdated; +use app\Services\GetRole; +use app\Services\UserService; use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; diff --git a/apps/backend/app/Mail/EventParticipationCancelledMail.php b/apps/backend/app/Mail/EventParticipationCancelledMail.php index 364cf9d..03c8ee7 100755 --- a/apps/backend/app/Mail/EventParticipationCancelledMail.php +++ b/apps/backend/app/Mail/EventParticipationCancelledMail.php @@ -2,7 +2,7 @@ namespace app\Mail; -use apps\backend\app\Services\FormatDate; +use app\Services\FormatDate; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; diff --git a/apps/backend/app/Mail/TaskParticipationCancelledMail.php b/apps/backend/app/Mail/TaskParticipationCancelledMail.php index ef3c9be..65aa84d 100755 --- a/apps/backend/app/Mail/TaskParticipationCancelledMail.php +++ b/apps/backend/app/Mail/TaskParticipationCancelledMail.php @@ -2,7 +2,7 @@ namespace app\Mail; -use apps\backend\app\Services\FormatDate; +use app\Services\FormatDate; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; diff --git a/apps/backend/app/Mail/VolunteerAssignToTaskMail.php b/apps/backend/app/Mail/VolunteerAssignToTaskMail.php index d1e7f85..7bdc1e7 100755 --- a/apps/backend/app/Mail/VolunteerAssignToTaskMail.php +++ b/apps/backend/app/Mail/VolunteerAssignToTaskMail.php @@ -2,7 +2,7 @@ namespace app\Mail; -use apps\backend\app\Services\FormatDate; +use app\Services\FormatDate; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; diff --git a/apps/backend/app/Mail/VolunteerUnassignToTaskMail.php b/apps/backend/app/Mail/VolunteerUnassignToTaskMail.php index 576ca48..09263d1 100755 --- a/apps/backend/app/Mail/VolunteerUnassignToTaskMail.php +++ b/apps/backend/app/Mail/VolunteerUnassignToTaskMail.php @@ -2,7 +2,7 @@ namespace app\Mail; -use apps\backend\app\Services\FormatDate; +use app\Services\FormatDate; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; diff --git a/apps/backend/app/Notifications/EventDeleted.php b/apps/backend/app/Notifications/EventDeleted.php index 2c8e4c8..9938938 100755 --- a/apps/backend/app/Notifications/EventDeleted.php +++ b/apps/backend/app/Notifications/EventDeleted.php @@ -2,7 +2,7 @@ namespace app\Notifications; -use apps\backend\app\Models\Event; +use app\Models\Event; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Notifications\Messages\BroadcastMessage; diff --git a/apps/backend/app/Notifications/TaskDateUpdated.php b/apps/backend/app/Notifications/TaskDateUpdated.php index 0d7f774..cfa636b 100755 --- a/apps/backend/app/Notifications/TaskDateUpdated.php +++ b/apps/backend/app/Notifications/TaskDateUpdated.php @@ -2,8 +2,8 @@ namespace app\Notifications; -use apps\backend\app\Models\Event; -use apps\backend\app\Models\Task; +use app\Models\Event; +use app\Models\Task; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Notifications\Messages\BroadcastMessage; diff --git a/apps/backend/app/Notifications/TaskDeleted.php b/apps/backend/app/Notifications/TaskDeleted.php index 9a40ec5..99bae4e 100755 --- a/apps/backend/app/Notifications/TaskDeleted.php +++ b/apps/backend/app/Notifications/TaskDeleted.php @@ -2,8 +2,8 @@ namespace app\Notifications; -use apps\backend\app\Models\Event; -use apps\backend\app\Models\Task; +use app\Models\Event; +use app\Models\Task; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Notifications\Messages\BroadcastMessage; diff --git a/apps/backend/app/Notifications/UserRegistered.php b/apps/backend/app/Notifications/UserRegistered.php index 215c80f..886a727 100755 --- a/apps/backend/app/Notifications/UserRegistered.php +++ b/apps/backend/app/Notifications/UserRegistered.php @@ -2,7 +2,7 @@ namespace app\Notifications; -use apps\backend\app\Models\User; +use app\Models\User; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Notifications\Messages\BroadcastMessage; diff --git a/apps/backend/app/Notifications/VolunteerAssignedToTask.php b/apps/backend/app/Notifications/VolunteerAssignedToTask.php index abd40ab..b8eb277 100755 --- a/apps/backend/app/Notifications/VolunteerAssignedToTask.php +++ b/apps/backend/app/Notifications/VolunteerAssignedToTask.php @@ -2,8 +2,8 @@ namespace app\Notifications; -use apps\backend\app\Models\Event; -use apps\backend\app\Models\Task; +use app\Models\Event; +use app\Models\Task; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Notifications\Messages\BroadcastMessage; diff --git a/apps/backend/app/Notifications/VolunteerUnassignedFromTask.php b/apps/backend/app/Notifications/VolunteerUnassignedFromTask.php index fb11b5c..be91640 100755 --- a/apps/backend/app/Notifications/VolunteerUnassignedFromTask.php +++ b/apps/backend/app/Notifications/VolunteerUnassignedFromTask.php @@ -2,8 +2,8 @@ namespace app\Notifications; -use apps\backend\app\Models\Event; -use apps\backend\app\Models\Task; +use app\Models\Event; +use app\Models\Task; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Broadcasting\ShouldBroadcast; use Illuminate\Notifications\Messages\BroadcastMessage; diff --git a/apps/backend/app/Observers/EventObserver.php b/apps/backend/app/Observers/EventObserver.php index b391939..7e3504e 100755 --- a/apps/backend/app/Observers/EventObserver.php +++ b/apps/backend/app/Observers/EventObserver.php @@ -2,8 +2,8 @@ namespace app\Observers; -use apps\backend\app\Models\Event; -use apps\backend\app\Services\TypesenseService; +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 7aeadb4..f6c5b54 100755 --- a/apps/backend/app/Observers/UserObserver.php +++ b/apps/backend/app/Observers/UserObserver.php @@ -2,8 +2,8 @@ namespace app\Observers; -use apps\backend\app\Models\User; -use apps\backend\app\Services\TypesenseService; +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 c99236b..d529569 100755 --- a/apps/backend/app/Policies/EventsPolicy.php +++ b/apps/backend/app/Policies/EventsPolicy.php @@ -2,7 +2,7 @@ namespace app\Policies; -use apps\backend\app\Models\User; +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 b79b466..81fae29 100755 --- a/apps/backend/app/Policies/TasksPolicy.php +++ b/apps/backend/app/Policies/TasksPolicy.php @@ -2,7 +2,7 @@ namespace app\Policies; -use apps\backend\app\Models\User; +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 47b4987..763da8a 100755 --- a/apps/backend/app/Policies/UsersPolicy.php +++ b/apps/backend/app/Policies/UsersPolicy.php @@ -2,7 +2,7 @@ namespace app\Policies; -use apps\backend\app\Models\User; +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 c3da131..52502eb 100755 --- a/apps/backend/app/Providers/AppServiceProvider.php +++ b/apps/backend/app/Providers/AppServiceProvider.php @@ -2,10 +2,10 @@ namespace app\Providers; -use apps\backend\app\Models\Event; -use apps\backend\app\Models\User; -use apps\backend\app\Observers\EventObserver; -use apps\backend\app\Observers\UserObserver; +use app\Models\Event; +use app\Models\User; +use app\Observers\EventObserver; +use app\Observers\UserObserver; use Illuminate\Support\Facades\Route; use Illuminate\Support\ServiceProvider; use function App\Providers\base_path; diff --git a/apps/backend/app/Providers/GateServiceProvider.php b/apps/backend/app/Providers/GateServiceProvider.php index 3bccff8..4d0ad40 100755 --- a/apps/backend/app/Providers/GateServiceProvider.php +++ b/apps/backend/app/Providers/GateServiceProvider.php @@ -2,12 +2,12 @@ namespace app\Providers; -use apps\backend\app\Models\Event; -use apps\backend\app\Models\Task; -use apps\backend\app\Models\User; -use apps\backend\app\Policies\EventsPolicy; -use apps\backend\app\Policies\TasksPolicy; -use apps\backend\app\Policies\UsersPolicy; +use app\Models\Event; +use app\Models\Task; +use app\Models\User; +use app\Policies\EventsPolicy; +use app\Policies\TasksPolicy; +use app\Policies\UsersPolicy; use Illuminate\Support\Facades\Gate; use Illuminate\Support\ServiceProvider; diff --git a/apps/backend/app/Services/UserService.php b/apps/backend/app/Services/UserService.php index a5c6a84..b3baa31 100755 --- a/apps/backend/app/Services/UserService.php +++ b/apps/backend/app/Services/UserService.php @@ -1,7 +1,7 @@ post('/events/create', [EventsController::class, "create"]); diff --git a/apps/backend/routes/notifications.php b/apps/backend/routes/notifications.php index 4071332..3ad21f4 100755 --- a/apps/backend/routes/notifications.php +++ b/apps/backend/routes/notifications.php @@ -1,6 +1,6 @@ get('/users/notifications', [NotificationsController::class, "getNotifications"]); diff --git a/apps/backend/routes/users.php b/apps/backend/routes/users.php index 50884c0..ee1e60e 100755 --- a/apps/backend/routes/users.php +++ b/apps/backend/routes/users.php @@ -1,7 +1,7 @@