refactor directory

SethSharp · Mar 27, 2024 · d5f8894 · d5f8894
1 parent 23e4d94
commit d5f8894
Show file tree

Hide file tree

Showing 87 changed files with 230 additions and 221 deletions.
diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache
diff --git a/app/Console/Commands/Bootstrap.php → app/App/Console/Commands/Bootstrap.php b/app/Console/Commands/Bootstrap.php → app/App/Console/Commands/Bootstrap.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\App\Console\Commands;
 
 use Codinglabs\Roles\Role;
 use App\Domain\Iam\Models\User;

diff --git a/...Console/Commands/Counters/HabitStreak.php → ...Console/Commands/Counters/HabitStreak.php b/...Console/Commands/Counters/HabitStreak.php → ...Console/Commands/Counters/HabitStreak.php
@@ -1,15 +1,16 @@
 <?php
 
-namespace App\Console\Commands\Counters;
+namespace App\App\Console\Commands\Counters;
 
 use Carbon\Carbon;
 use App\Domain\Iam\Models\User;
 use Illuminate\Console\Command;
-use App\Http\Controllers\Traits\ScheduledHabits;
+use App\App\Http\Controllers\Traits\ScheduledHabits;
 
 class HabitStreak extends Command
 {
     use ScheduledHabits;
+
     protected $signature = 'counters:habit-streak';
     protected $description = 'Counts the habit streak by looking at the habits from yesterday and record if complete';
 
@@ -19,7 +20,7 @@ public function handle()
         $users->map(function ($user) {
             $scheduledHabits = $user->scheduledHabits()->where('scheduled_completion', Carbon::now()->subDay())->get();
 
-            foreach($scheduledHabits as $scheduledHabit) {
+            foreach ($scheduledHabits as $scheduledHabit) {
                 if ($scheduledHabit->completed == 1) {
                     $scheduledHabit->habit->increment('streak');
                     $scheduledHabit->habit->increment('completed');

diff --git a/app/Console/Commands/Counters/Testing.php → ...App/Console/Commands/Counters/Testing.php b/app/Console/Commands/Counters/Testing.php → ...App/Console/Commands/Counters/Testing.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Console\Commands\Counters;
+namespace App\App\Console\Commands\Counters;
 
 use App\Domain\Iam\Models\User;
 use Illuminate\Console\Command;
-use App\Http\Controllers\Traits\ScheduledHabits;
+use App\App\Http\Controllers\Traits\ScheduledHabits;
 
 class Testing extends Command
 {

diff --git a/app/Console/Commands/Counters/UserStreak.php → .../Console/Commands/Counters/UserStreak.php b/app/Console/Commands/Counters/UserStreak.php → .../Console/Commands/Counters/UserStreak.php
@@ -1,15 +1,16 @@
 <?php
 
-namespace App\Console\Commands\Counters;
+namespace App\App\Console\Commands\Counters;
 
 use Carbon\Carbon;
 use App\Domain\Iam\Models\User;
 use Illuminate\Console\Command;
-use App\Http\Controllers\Traits\ScheduledHabits;
+use App\App\Http\Controllers\Traits\ScheduledHabits;
 
 class UserStreak extends Command
 {
     use ScheduledHabits;
+
     protected $signature = 'counters:user-streak';
     protected $description = 'Look at all scheduled habits for yesterday, record whether all streaks were completed or not';
 

diff --git a/app/Console/Commands/Fix.php → app/App/Console/Commands/Fix.php b/app/Console/Commands/Fix.php → app/App/Console/Commands/Fix.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\App\Console\Commands;
 
 use Codinglabs\Roles\Role;
 use App\Domain\Iam\Models\User;

diff --git a/.../Notifications/SendDailyHabitReminder.php → .../Notifications/SendDailyHabitReminder.php b/.../Notifications/SendDailyHabitReminder.php → .../Notifications/SendDailyHabitReminder.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Console\Commands\Notifications;
+namespace App\App\Console\Commands\Notifications;
 
 use App\Domain\Iam\Models\User;
 use Illuminate\Console\Command;
-use App\Notifications\DailyReminderNotification;
+use App\Domain\Habits\Notifications\DailyReminderNotification;
 
 class SendDailyHabitReminder extends Command
 {

diff --git a/...s/Notifications/SendHabitGoalReminder.php → ...s/Notifications/SendHabitGoalReminder.php b/...s/Notifications/SendHabitGoalReminder.php → ...s/Notifications/SendHabitGoalReminder.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Console\Commands\Notifications;
+namespace App\App\Console\Commands\Notifications;
 
 use App\Domain\Iam\Models\User;
 use Illuminate\Console\Command;
-use App\Notifications\HabitGoalReminderNotification;
+use App\Domain\Habits\Notifications\HabitGoalReminderNotification;
 
 class SendHabitGoalReminder extends Command
 {

diff --git a/...cheduledHabits/ScheduleHabitsForMonth.php → ...cheduledHabits/ScheduleHabitsForMonth.php b/...cheduledHabits/ScheduleHabitsForMonth.php → ...cheduledHabits/ScheduleHabitsForMonth.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Console\Commands\ScheduledHabits;
+namespace App\App\Console\Commands\ScheduledHabits;
 
 use Carbon\Carbon;
-use App\Http\CacheKeys;
+use App\Support\CacheKeys;
 use App\Domain\Iam\Models\User;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Cache;
 use App\Domain\Frequency\Enums\Frequency;
-use App\Http\Controllers\Traits\ScheduledHabits;
 use App\Domain\HabitSchedule\Models\HabitSchedule;
+use App\App\Http\Controllers\Traits\ScheduledHabits;
 
 class ScheduleHabitsForMonth extends Command
 {

diff --git a/app/Console/Kernel.php → app/App/Console/Kernel.php b/app/Console/Kernel.php → app/App/Console/Kernel.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Console;
+namespace App\App\Console;
 
-use App\Console\Commands\Counters\Testing;
 use Illuminate\Console\Scheduling\Schedule;
+use App\App\Console\Commands\Counters\Testing;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
 class Kernel extends ConsoleKernel
@@ -13,11 +13,11 @@ protected function schedule(Schedule $schedule): void
         // test
         $schedule->command(Testing::class)->everyFiveMinutes();
         // scheduling habits
-//        $schedule->command(ScheduleHabitsForMonth::class)->monthly();
+        //        $schedule->command(ScheduleHabitsForMonth::class)->monthly();
 
         // counters
-//        $schedule->command(HabitStreak::class)->daily();
-//        $schedule->command(UserStreak::class)->daily();
+        //        $schedule->command(HabitStreak::class)->daily();
+        //        $schedule->command(UserStreak::class)->daily();
 
         // Notifications
         //        $schedule->command(SendDailyHabitReminder::class)->dailyAt('08:00');

diff --git a/app/Exceptions/Handler.php → app/App/Exceptions/Handler.php b/app/Exceptions/Handler.php → app/App/Exceptions/Handler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Exceptions;
+namespace App\App\Exceptions;
 
 use Throwable;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;

diff --git a/...s/Auth/AuthenticatedSessionController.php → ...s/Auth/AuthenticatedSessionController.php b/...s/Auth/AuthenticatedSessionController.php → ...s/Auth/AuthenticatedSessionController.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace App\App\Http\Controllers\Auth;
 
 use Inertia\Inertia;
 use Inertia\Response;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Route;
-use App\Providers\RouteServiceProvider;
-use App\Http\Requests\Auth\LoginRequest;
+use App\App\Http\Controllers\Controller;
+use App\App\Providers\RouteServiceProvider;
+use App\App\Http\Requests\Auth\LoginRequest;
 
 class AuthenticatedSessionController extends Controller
 {

diff --git a/...rs/Auth/ConfirmablePasswordController.php → ...rs/Auth/ConfirmablePasswordController.php b/...rs/Auth/ConfirmablePasswordController.php → ...rs/Auth/ConfirmablePasswordController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace App\App\Http\Controllers\Auth;
 
 use Inertia\Inertia;
 use Inertia\Response;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\RedirectResponse;
-use App\Providers\RouteServiceProvider;
+use App\App\Http\Controllers\Controller;
+use App\App\Providers\RouteServiceProvider;
 use Illuminate\Validation\ValidationException;
 
 class ConfirmablePasswordController extends Controller

diff --git a/...ailVerificationNotificationController.php → ...ailVerificationNotificationController.php b/...ailVerificationNotificationController.php → ...ailVerificationNotificationController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace App\App\Http\Controllers\Auth;
 
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use Illuminate\Http\RedirectResponse;
-use App\Providers\RouteServiceProvider;
+use App\App\Http\Controllers\Controller;
+use App\App\Providers\RouteServiceProvider;
 
 class EmailVerificationNotificationController extends Controller
 {

diff --git a/...uth/EmailVerificationPromptController.php → ...uth/EmailVerificationPromptController.php b/...uth/EmailVerificationPromptController.php → ...uth/EmailVerificationPromptController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace App\App\Http\Controllers\Auth;
 
 use Inertia\Inertia;
 use Inertia\Response;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use Illuminate\Http\RedirectResponse;
-use App\Providers\RouteServiceProvider;
+use App\App\Http\Controllers\Controller;
+use App\App\Providers\RouteServiceProvider;
 
 class EmailVerificationPromptController extends Controller
 {
@@ -17,7 +17,7 @@ class EmailVerificationPromptController extends Controller
     public function __invoke(Request $request): RedirectResponse|Response
     {
         return $request->user()->hasVerifiedEmail()
-                    ? redirect()->intended(RouteServiceProvider::HOME)
-                    : Inertia::render('Auth/VerifyEmail', ['status' => session('status')]);
+            ? redirect()->intended(RouteServiceProvider::HOME)
+            : Inertia::render('Auth/VerifyEmail', ['status' => session('status')]);
     }
 }
diff --git a/...ontrollers/Auth/NewPasswordController.php → ...ontrollers/Auth/NewPasswordController.php b/...ontrollers/Auth/NewPasswordController.php → ...ontrollers/Auth/NewPasswordController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace App\App\Http\Controllers\Auth;
 
 use Inertia\Inertia;
 use Inertia\Response;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use Illuminate\Validation\Rules;
-use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Http\RedirectResponse;
+use App\App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Password;
 use Illuminate\Auth\Events\PasswordReset;
 use Illuminate\Validation\ValidationException;

diff --git a/...lers/Auth/PasswordResetLinkController.php → ...lers/Auth/PasswordResetLinkController.php b/...lers/Auth/PasswordResetLinkController.php → ...lers/Auth/PasswordResetLinkController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace App\App\Http\Controllers\Auth;
 
 use Inertia\Inertia;
 use Inertia\Response;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use Illuminate\Http\RedirectResponse;
+use App\App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Password;
 use Illuminate\Validation\ValidationException;
 

diff --git a/...rollers/Auth/RegisteredUserController.php → ...rollers/Auth/RegisteredUserController.php b/...rollers/Auth/RegisteredUserController.php → ...rollers/Auth/RegisteredUserController.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace App\App\Http\Controllers\Auth;
 
 use Inertia\Inertia;
 use Inertia\Response;
 use Illuminate\Http\Request;
 use App\Domain\Iam\Models\User;
 use Illuminate\Validation\Rules;
-use App\Http\Controllers\Controller;
-use App\Http\Events\RegisteredEvent;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Http\RedirectResponse;
-use App\Providers\RouteServiceProvider;
+use App\App\Http\Controllers\Controller;
+use App\App\Http\Events\RegisteredEvent;
+use App\App\Providers\RouteServiceProvider;
 
 class RegisteredUserController extends Controller
 {

diff --git a/...rollers/Auth/UpdatePasswordController.php → ...rollers/Auth/UpdatePasswordController.php b/...rollers/Auth/UpdatePasswordController.php → ...rollers/Auth/UpdatePasswordController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace App\App\Http\Controllers\Auth;
 
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Http\RedirectResponse;
+use App\App\Http\Controllers\Controller;
 use Illuminate\Validation\Rules\Password;
 
 class UpdatePasswordController extends Controller

diff --git a/...ontrollers/Auth/VerifyEmailController.php → ...ontrollers/Auth/VerifyEmailController.php b/...ontrollers/Auth/VerifyEmailController.php → ...ontrollers/Auth/VerifyEmailController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Auth;
+namespace App\App\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
 use Illuminate\Auth\Events\Verified;
 use Illuminate\Http\RedirectResponse;
-use App\Providers\RouteServiceProvider;
+use App\App\Http\Controllers\Controller;
+use App\App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\EmailVerificationRequest;
 
 class VerifyEmailController extends Controller

diff --git a/app/Http/Controllers/Controller.php → app/App/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php → app/App/Http/Controllers/Controller.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\App\Http\Controllers;
 
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;

diff --git a/...chedule/CancelHabitScheduleController.php → ...chedule/CancelHabitScheduleController.php b/...chedule/CancelHabitScheduleController.php → ...chedule/CancelHabitScheduleController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\HabitSchedule;
+namespace App\App\Http\Controllers\HabitSchedule;
 
-use App\Http\Controllers\Controller;
 use Illuminate\Http\RedirectResponse;
+use App\App\Http\Controllers\Controller;
 use App\Domain\HabitSchedule\Models\HabitSchedule;
-use App\Http\Requests\HabitSchedule\CancelHabitScheduleRequest;
+use App\App\Http\Requests\HabitSchedule\CancelHabitScheduleRequest;
 
 class CancelHabitScheduleController extends Controller
 {

diff --git a/...edule/CompleteHabitScheduleController.php → ...edule/CompleteHabitScheduleController.php b/...edule/CompleteHabitScheduleController.php → ...edule/CompleteHabitScheduleController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\HabitSchedule;
+namespace App\App\Http\Controllers\HabitSchedule;
 
-use App\Http\Controllers\Controller;
 use Illuminate\Http\RedirectResponse;
+use App\App\Http\Controllers\Controller;
 use App\Domain\HabitSchedule\Models\HabitSchedule;
-use App\Http\Requests\HabitSchedule\CompleteHabitScheduleRequest;
+use App\App\Http\Requests\HabitSchedule\CompleteHabitScheduleRequest;
 
 class CompleteHabitScheduleController extends Controller
 {

diff --git a/...le/GetScheduledHabitsForDayController.php → ...le/GetScheduledHabitsForDayController.php b/...le/GetScheduledHabitsForDayController.php → ...le/GetScheduledHabitsForDayController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\HabitSchedule;
+namespace App\App\Http\Controllers\HabitSchedule;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
-use App\Http\Controllers\Controller;
-use App\Http\Controllers\Traits\ScheduledHabits;
+use App\App\Http\Controllers\Controller;
+use App\App\Http\Controllers\Traits\ScheduledHabits;
 
 class GetScheduledHabitsForDayController extends Controller
 {

diff --git a/...trollers/Habits/CreateHabitController.php → ...trollers/Habits/CreateHabitController.php b/...trollers/Habits/CreateHabitController.php → ...trollers/Habits/CreateHabitController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Habits;
+namespace App\App\Http\Controllers\Habits;
 
 use Carbon\Carbon;
 use Inertia\Inertia;
 use Inertia\Response;
-use App\Http\Controllers\Controller;
+use App\App\Http\Controllers\Controller;
 use App\Domain\Frequency\Enums\Frequency;
 
 class CreateHabitController extends Controller