diff --git a/app/Infrastructure/Http/Controllers/HolidayController.php b/app/Infrastructure/Http/Controllers/HolidayController.php index d22e39b..ff07005 100644 --- a/app/Infrastructure/Http/Controllers/HolidayController.php +++ b/app/Infrastructure/Http/Controllers/HolidayController.php @@ -64,19 +64,4 @@ class HolidayController extends Controller ->route("holidays.index") ->with("success", __("Holiday has been deleted")); } - - public function showCalendar(): Response - { - $users = User::query() - ->withTrashed() - ->orderBy("last_name") - ->orderBy("first_name") - ->paginate() - ->withQueryString(); - - return inertia("Holidays/Calendar", [ - "users" => UserResource::collection($users), - ]); - } - } diff --git a/app/Infrastructure/Http/Controllers/VacationCalendarController.php b/app/Infrastructure/Http/Controllers/VacationCalendarController.php new file mode 100644 index 0000000..2891304 --- /dev/null +++ b/app/Infrastructure/Http/Controllers/VacationCalendarController.php @@ -0,0 +1,24 @@ +orderBy("last_name") + ->orderBy("first_name") + ->paginate(); + + return inertia("Calendar", [ + "users" => UserResource::collection($users), + ]); + } +} diff --git a/app/Infrastructure/Http/Controllers/VacationRequestController.php b/app/Infrastructure/Http/Controllers/VacationRequestController.php index a19b81b..8166905 100644 --- a/app/Infrastructure/Http/Controllers/VacationRequestController.php +++ b/app/Infrastructure/Http/Controllers/VacationRequestController.php @@ -20,15 +20,19 @@ class VacationRequestController extends Controller { public function index(Request $request): Response { + $status = $request->get("status", "all"); + $vacationRequests = $request->user() ->vacationRequests() ->latest() - ->states(VacationRequestState::filterByStatus($request->query("status", "all"))) + ->states(VacationRequestState::filterByStatus($status)) ->paginate(); return inertia("VacationRequest/Index", [ "requests" => VacationRequestResource::collection($vacationRequests), - "filters" => $request->only("status"), + "filters" => [ + "status" => $status, + ], ]); } diff --git a/resources/js/Pages/Calendar.vue b/resources/js/Pages/Calendar.vue new file mode 100644 index 0000000..7db5f67 --- /dev/null +++ b/resources/js/Pages/Calendar.vue @@ -0,0 +1,130 @@ + + + diff --git a/resources/js/Pages/Dashboard.vue b/resources/js/Pages/Dashboard.vue index 4fab9a5..6fbe513 100644 --- a/resources/js/Pages/Dashboard.vue +++ b/resources/js/Pages/Dashboard.vue @@ -1,467 +1,374 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/js/Pages/Holidays/Calendar.vue b/resources/js/Pages/Holidays/Calendar.vue deleted file mode 100644 index 281eb8a..0000000 --- a/resources/js/Pages/Holidays/Calendar.vue +++ /dev/null @@ -1,97 +0,0 @@ - - - diff --git a/resources/js/Shared/MainMenu.vue b/resources/js/Shared/MainMenu.vue index 88a4819..8ad8232 100644 --- a/resources/js/Shared/MainMenu.vue +++ b/resources/js/Shared/MainMenu.vue @@ -1,297 +1,336 @@ \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 9b8bc47..6ffbe38 100644 --- a/routes/web.php +++ b/routes/web.php @@ -8,6 +8,7 @@ use Toby\Infrastructure\Http\Controllers\HolidayController; use Toby\Infrastructure\Http\Controllers\LogoutController; use Toby\Infrastructure\Http\Controllers\SelectYearPeriodController; use Toby\Infrastructure\Http\Controllers\UserController; +use Toby\Infrastructure\Http\Controllers\VacationCalendarController; use Toby\Infrastructure\Http\Controllers\VacationLimitController; use Toby\Infrastructure\Http\Controllers\VacationRequestController; @@ -23,7 +24,8 @@ Route::middleware("auth")->group(function (): void { Route::get("/vacation-limits", [VacationLimitController::class, "edit"]) ->name("vacation.limits"); - Route::get("/calendar", [HolidayController::class,"showCalendar"]); + Route::get("/vacation-calendar", [VacationCalendarController::class, "index"]) + ->name("vacation.calendar"); Route::get("/vacation-limits", [VacationLimitController::class, "edit"])->name("vacation.limits"); Route::put("/vacation-limits", [VacationLimitController::class, "update"]); diff --git a/tailwind.config.js b/tailwind.config.js index 99b5aeb..3129755 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,37 +1,34 @@ -const defaultTheme = require('tailwindcss/defaultTheme'); +const defaultTheme = require('tailwindcss/defaultTheme') module.exports = { - content: [ - './resources/**/*.vue', - ], - theme: { - extend: { - fontFamily: { - sans: ['Inter var', ...defaultTheme.fontFamily.sans], - }, - colors: { - 'blumilk': { - '25': '#F4F8FD', - '50': '#D5DFEE', - '100': '#C7D4E9', - '200': '#AABDDD', - '300': '#8CA7D1', - '400': '#6F90C6', - '500': '#527ABA', - '600': '#3C5F97', - '700': '#2C466F', - '800': '#1C2D47', - '900': '#0C141F' - }, - }, - gridTemplateColumns: { - '38': 'repeat(38, minmax(0, 1fr))', - } + content: [ + './resources/**/*.vue', + ], + theme: { + extend: { + fontFamily: { + sans: ['Inter var', ...defaultTheme.fontFamily.sans], + }, + colors: { + 'blumilk': { + '25': '#F4F8FD', + '50': '#D5DFEE', + '100': '#C7D4E9', + '200': '#AABDDD', + '300': '#8CA7D1', + '400': '#6F90C6', + '500': '#527ABA', + '600': '#3C5F97', + '700': '#2C466F', + '800': '#1C2D47', + '900': '#0C141F', }, + }, }, - plugins: [ - require('@tailwindcss/forms'), - require('@tailwindcss/typography'), - require('@tailwindcss/line-clamp') - ], -}; + }, + plugins: [ + require('@tailwindcss/forms'), + require('@tailwindcss/typography'), + require('@tailwindcss/line-clamp'), + ], +}