Compare commits
1 Commits
61add6b1e8
...
dependabot
| Author | SHA1 | Date | |
|---|---|---|---|
|
b2976a566d |
@@ -103,15 +103,6 @@ class UserVacationStatsRetriever
|
|||||||
return $limit ?? 0;
|
return $limit ?? 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function hasVacationDaysLimit(User $user, YearPeriod $yearPeriod): bool
|
|
||||||
{
|
|
||||||
$limit = $user->vacationLimits()
|
|
||||||
->whereBelongsTo($yearPeriod)
|
|
||||||
->first()?->days;
|
|
||||||
|
|
||||||
return $limit !== null;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function getLimitableVacationTypes(): Collection
|
protected function getLimitableVacationTypes(): Collection
|
||||||
{
|
{
|
||||||
$types = VacationType::all();
|
$types = VacationType::all();
|
||||||
|
|||||||
@@ -12,11 +12,8 @@ use Toby\Domain\UserVacationStatsRetriever;
|
|||||||
use Toby\Domain\VacationRequestStatesRetriever;
|
use Toby\Domain\VacationRequestStatesRetriever;
|
||||||
use Toby\Domain\VacationTypeConfigRetriever;
|
use Toby\Domain\VacationTypeConfigRetriever;
|
||||||
use Toby\Eloquent\Helpers\YearPeriodRetriever;
|
use Toby\Eloquent\Helpers\YearPeriodRetriever;
|
||||||
use Toby\Eloquent\Models\Holiday;
|
|
||||||
use Toby\Eloquent\Models\Vacation;
|
|
||||||
use Toby\Eloquent\Models\VacationRequest;
|
use Toby\Eloquent\Models\VacationRequest;
|
||||||
use Toby\Infrastructure\Http\Resources\HolidayResource;
|
use Toby\Infrastructure\Http\Resources\HolidayResource;
|
||||||
use Toby\Infrastructure\Http\Resources\SimpleVacationRequestResource;
|
|
||||||
use Toby\Infrastructure\Http\Resources\VacationRequestResource;
|
use Toby\Infrastructure\Http\Resources\VacationRequestResource;
|
||||||
use Toby\Infrastructure\Http\Resources\VacationResource;
|
use Toby\Infrastructure\Http\Resources\VacationResource;
|
||||||
|
|
||||||
@@ -57,24 +54,7 @@ class DashboardController extends Controller
|
|||||||
->limit(3)
|
->limit(3)
|
||||||
->get();
|
->get();
|
||||||
|
|
||||||
$allHolidays = $yearPeriod->holidays;
|
|
||||||
|
|
||||||
$approvedVacations = $request->user()
|
|
||||||
->vacations()
|
|
||||||
->with("vacationRequest.vacations")
|
|
||||||
->whereBelongsTo($yearPeriod)
|
|
||||||
->approved()
|
|
||||||
->get();
|
|
||||||
|
|
||||||
$pendingVacations = $request->user()
|
|
||||||
->vacations()
|
|
||||||
->with("vacationRequest.vacations")
|
|
||||||
->whereBelongsTo($yearPeriod)
|
|
||||||
->pending()
|
|
||||||
->get();
|
|
||||||
|
|
||||||
$limit = $vacationStatsRetriever->getVacationDaysLimit($user, $yearPeriod);
|
$limit = $vacationStatsRetriever->getVacationDaysLimit($user, $yearPeriod);
|
||||||
$hasLimit = $vacationStatsRetriever->hasVacationDaysLimit($user, $yearPeriod);
|
|
||||||
$used = $vacationStatsRetriever->getUsedVacationDays($user, $yearPeriod);
|
$used = $vacationStatsRetriever->getUsedVacationDays($user, $yearPeriod);
|
||||||
$pending = $vacationStatsRetriever->getPendingVacationDays($user, $yearPeriod);
|
$pending = $vacationStatsRetriever->getPendingVacationDays($user, $yearPeriod);
|
||||||
$homeOffice = $vacationStatsRetriever->getHomeOfficeDays($user, $yearPeriod);
|
$homeOffice = $vacationStatsRetriever->getHomeOfficeDays($user, $yearPeriod);
|
||||||
@@ -86,21 +66,7 @@ class DashboardController extends Controller
|
|||||||
"remoteDays" => VacationResource::collection($remoteDays),
|
"remoteDays" => VacationResource::collection($remoteDays),
|
||||||
"vacationRequests" => VacationRequestResource::collection($vacationRequests),
|
"vacationRequests" => VacationRequestResource::collection($vacationRequests),
|
||||||
"holidays" => HolidayResource::collection($holidays),
|
"holidays" => HolidayResource::collection($holidays),
|
||||||
"allHolidays" => $allHolidays->mapWithKeys(
|
|
||||||
fn(Holiday $holiday): array => [$holiday->date->toDateString() => $holiday->name],
|
|
||||||
),
|
|
||||||
"approvedVacations" => $approvedVacations->mapWithKeys(
|
|
||||||
fn(Vacation $vacation): array => [
|
|
||||||
$vacation->date->toDateString() => new SimpleVacationRequestResource($vacation->vacationRequest),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
"pendingVacations" => $pendingVacations->mapWithKeys(
|
|
||||||
fn(Vacation $vacation): array => [
|
|
||||||
$vacation->date->toDateString() => new SimpleVacationRequestResource($vacation->vacationRequest),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
"stats" => [
|
"stats" => [
|
||||||
"hasLimit" => $hasLimit,
|
|
||||||
"limit" => $limit,
|
"limit" => $limit,
|
||||||
"remaining" => $remaining,
|
"remaining" => $remaining,
|
||||||
"used" => $used,
|
"used" => $used,
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
"ext-pdo": "*",
|
"ext-pdo": "*",
|
||||||
"ext-redis": "*",
|
"ext-redis": "*",
|
||||||
"azuyalabs/yasumi": "^2.4",
|
"azuyalabs/yasumi": "^2.4",
|
||||||
"barryvdh/laravel-dompdf": "^2.0",
|
"barryvdh/laravel-dompdf": "^1.0",
|
||||||
"fruitcake/laravel-cors": "^3.0",
|
"fruitcake/laravel-cors": "^3.0",
|
||||||
"guzzlehttp/guzzle": "^7.0.1",
|
"guzzlehttp/guzzle": "^7.0.1",
|
||||||
"inertiajs/inertia-laravel": "^0.6.2",
|
"inertiajs/inertia-laravel": "^0.6.2",
|
||||||
|
|||||||
277
composer.lock
generated
277
composer.lock
generated
@@ -4,7 +4,7 @@
|
|||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "73a25b0ebae9d311665f9f662c396b99",
|
"content-hash": "c78c5cf9b365c5ca82066e15505079e6",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "azuyalabs/yasumi",
|
"name": "azuyalabs/yasumi",
|
||||||
@@ -81,20 +81,20 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "barryvdh/laravel-dompdf",
|
"name": "barryvdh/laravel-dompdf",
|
||||||
"version": "v2.0.0-beta2",
|
"version": "v1.0.2",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/barryvdh/laravel-dompdf.git",
|
"url": "https://github.com/barryvdh/laravel-dompdf.git",
|
||||||
"reference": "3c94042e00df5835a1636b478e3ec8a82b8cdfd9"
|
"reference": "de83130d029289e1b59f28b41c314ce1d157b4a0"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/3c94042e00df5835a1636b478e3ec8a82b8cdfd9",
|
"url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/de83130d029289e1b59f28b41c314ce1d157b4a0",
|
||||||
"reference": "3c94042e00df5835a1636b478e3ec8a82b8cdfd9",
|
"reference": "de83130d029289e1b59f28b41c314ce1d157b4a0",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"dompdf/dompdf": "^2",
|
"dompdf/dompdf": "^1.2.1",
|
||||||
"illuminate/support": "^6|^7|^8|^9",
|
"illuminate/support": "^6|^7|^8|^9",
|
||||||
"php": "^7.2 || ^8.0"
|
"php": "^7.2 || ^8.0"
|
||||||
},
|
},
|
||||||
@@ -107,7 +107,7 @@
|
|||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "2.0-dev"
|
"dev-master": "1.0-dev"
|
||||||
},
|
},
|
||||||
"laravel": {
|
"laravel": {
|
||||||
"providers": [
|
"providers": [
|
||||||
@@ -141,7 +141,7 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/barryvdh/laravel-dompdf/issues",
|
"issues": "https://github.com/barryvdh/laravel-dompdf/issues",
|
||||||
"source": "https://github.com/barryvdh/laravel-dompdf/tree/v2.0.0-beta2"
|
"source": "https://github.com/barryvdh/laravel-dompdf/tree/v1.0.2"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -153,7 +153,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2022-06-26T07:00:09+00:00"
|
"time": "2022-05-19T15:08:38+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "brick/math",
|
"name": "brick/math",
|
||||||
@@ -459,22 +459,21 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "dompdf/dompdf",
|
"name": "dompdf/dompdf",
|
||||||
"version": "v2.0.0",
|
"version": "v1.2.2",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/dompdf/dompdf.git",
|
"url": "https://github.com/dompdf/dompdf.git",
|
||||||
"reference": "79573d8b8a141ec8a17312515de8740eed014fa9"
|
"reference": "5031045d9640b38cfc14aac9667470df09c9e090"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/dompdf/dompdf/zipball/79573d8b8a141ec8a17312515de8740eed014fa9",
|
"url": "https://api.github.com/repos/dompdf/dompdf/zipball/5031045d9640b38cfc14aac9667470df09c9e090",
|
||||||
"reference": "79573d8b8a141ec8a17312515de8740eed014fa9",
|
"reference": "5031045d9640b38cfc14aac9667470df09c9e090",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"ext-dom": "*",
|
"ext-dom": "*",
|
||||||
"ext-mbstring": "*",
|
"ext-mbstring": "*",
|
||||||
"masterminds/html5": "^2.0",
|
|
||||||
"phenx/php-font-lib": "^0.5.4",
|
"phenx/php-font-lib": "^0.5.4",
|
||||||
"phenx/php-svg-lib": "^0.3.3 || ^0.4.0",
|
"phenx/php-svg-lib": "^0.3.3 || ^0.4.0",
|
||||||
"php": "^7.1 || ^8.0"
|
"php": "^7.1 || ^8.0"
|
||||||
@@ -523,9 +522,9 @@
|
|||||||
"homepage": "https://github.com/dompdf/dompdf",
|
"homepage": "https://github.com/dompdf/dompdf",
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/dompdf/dompdf/issues",
|
"issues": "https://github.com/dompdf/dompdf/issues",
|
||||||
"source": "https://github.com/dompdf/dompdf/tree/v2.0.0"
|
"source": "https://github.com/dompdf/dompdf/tree/v1.2.2"
|
||||||
},
|
},
|
||||||
"time": "2022-06-21T21:14:57+00:00"
|
"time": "2022-04-27T13:50:54+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "dragonmantank/cron-expression",
|
"name": "dragonmantank/cron-expression",
|
||||||
@@ -974,16 +973,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "google/apiclient",
|
"name": "google/apiclient",
|
||||||
"version": "v2.12.6",
|
"version": "v2.12.5",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/googleapis/google-api-php-client.git",
|
"url": "https://github.com/googleapis/google-api-php-client.git",
|
||||||
"reference": "f92aa126903a9e2da5bd41a280d9633cb249e79e"
|
"reference": "eb10f733eb0ebec058776cda206009d01af9f9e3"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/f92aa126903a9e2da5bd41a280d9633cb249e79e",
|
"url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/eb10f733eb0ebec058776cda206009d01af9f9e3",
|
||||||
"reference": "f92aa126903a9e2da5bd41a280d9633cb249e79e",
|
"reference": "eb10f733eb0ebec058776cda206009d01af9f9e3",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -1038,22 +1037,22 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/googleapis/google-api-php-client/issues",
|
"issues": "https://github.com/googleapis/google-api-php-client/issues",
|
||||||
"source": "https://github.com/googleapis/google-api-php-client/tree/v2.12.6"
|
"source": "https://github.com/googleapis/google-api-php-client/tree/v2.12.5"
|
||||||
},
|
},
|
||||||
"time": "2022-06-06T20:00:19+00:00"
|
"time": "2022-05-31T14:44:17+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "google/apiclient-services",
|
"name": "google/apiclient-services",
|
||||||
"version": "v0.256.0",
|
"version": "v0.251.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/googleapis/google-api-php-client-services.git",
|
"url": "https://github.com/googleapis/google-api-php-client-services.git",
|
||||||
"reference": "122e51021eb19b53f831904918460671d1e7259d"
|
"reference": "73b7a41113bd6b5ae2d42795dbe0d76e0c482782"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/122e51021eb19b53f831904918460671d1e7259d",
|
"url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/73b7a41113bd6b5ae2d42795dbe0d76e0c482782",
|
||||||
"reference": "122e51021eb19b53f831904918460671d1e7259d",
|
"reference": "73b7a41113bd6b5ae2d42795dbe0d76e0c482782",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -1082,22 +1081,22 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/googleapis/google-api-php-client-services/issues",
|
"issues": "https://github.com/googleapis/google-api-php-client-services/issues",
|
||||||
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.256.0"
|
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.251.0"
|
||||||
},
|
},
|
||||||
"time": "2022-07-04T01:10:37+00:00"
|
"time": "2022-05-30T00:56:11+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "google/auth",
|
"name": "google/auth",
|
||||||
"version": "v1.21.1",
|
"version": "v1.21.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/googleapis/google-auth-library-php.git",
|
"url": "https://github.com/googleapis/google-auth-library-php.git",
|
||||||
"reference": "aa3b9ca29258ac6347ce3c8937a2418c5d78f840"
|
"reference": "73392bad2eb6852eea9084b6bbdec752515cb849"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/aa3b9ca29258ac6347ce3c8937a2418c5d78f840",
|
"url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/73392bad2eb6852eea9084b6bbdec752515cb849",
|
||||||
"reference": "aa3b9ca29258ac6347ce3c8937a2418c5d78f840",
|
"reference": "73392bad2eb6852eea9084b6bbdec752515cb849",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -1140,9 +1139,9 @@
|
|||||||
"support": {
|
"support": {
|
||||||
"docs": "https://googleapis.github.io/google-auth-library-php/main/",
|
"docs": "https://googleapis.github.io/google-auth-library-php/main/",
|
||||||
"issues": "https://github.com/googleapis/google-auth-library-php/issues",
|
"issues": "https://github.com/googleapis/google-auth-library-php/issues",
|
||||||
"source": "https://github.com/googleapis/google-auth-library-php/tree/v1.21.1"
|
"source": "https://github.com/googleapis/google-auth-library-php/tree/v1.21.0"
|
||||||
},
|
},
|
||||||
"time": "2022-05-16T19:34:15+00:00"
|
"time": "2022-04-13T20:35:52+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "graham-campbell/result-type",
|
"name": "graham-campbell/result-type",
|
||||||
@@ -1208,22 +1207,22 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "guzzlehttp/guzzle",
|
"name": "guzzlehttp/guzzle",
|
||||||
"version": "7.4.5",
|
"version": "7.4.3",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/guzzle/guzzle.git",
|
"url": "https://github.com/guzzle/guzzle.git",
|
||||||
"reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"
|
"reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
|
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/74a8602c6faec9ef74b7a9391ac82c5e65b1cdab",
|
||||||
"reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
|
"reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"ext-json": "*",
|
"ext-json": "*",
|
||||||
"guzzlehttp/promises": "^1.5",
|
"guzzlehttp/promises": "^1.5",
|
||||||
"guzzlehttp/psr7": "^1.9 || ^2.4",
|
"guzzlehttp/psr7": "^1.8.3 || ^2.1",
|
||||||
"php": "^7.2.5 || ^8.0",
|
"php": "^7.2.5 || ^8.0",
|
||||||
"psr/http-client": "^1.0",
|
"psr/http-client": "^1.0",
|
||||||
"symfony/deprecation-contracts": "^2.2 || ^3.0"
|
"symfony/deprecation-contracts": "^2.2 || ^3.0"
|
||||||
@@ -1312,7 +1311,7 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/guzzle/guzzle/issues",
|
"issues": "https://github.com/guzzle/guzzle/issues",
|
||||||
"source": "https://github.com/guzzle/guzzle/tree/7.4.5"
|
"source": "https://github.com/guzzle/guzzle/tree/7.4.3"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -1328,7 +1327,7 @@
|
|||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2022-06-20T22:16:13+00:00"
|
"time": "2022-05-25T13:24:33+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "guzzlehttp/promises",
|
"name": "guzzlehttp/promises",
|
||||||
@@ -1416,16 +1415,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "guzzlehttp/psr7",
|
"name": "guzzlehttp/psr7",
|
||||||
"version": "2.4.0",
|
"version": "2.2.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/guzzle/psr7.git",
|
"url": "https://github.com/guzzle/psr7.git",
|
||||||
"reference": "13388f00956b1503577598873fffb5ae994b5737"
|
"reference": "c94a94f120803a18554c1805ef2e539f8285f9a2"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737",
|
"url": "https://api.github.com/repos/guzzle/psr7/zipball/c94a94f120803a18554c1805ef2e539f8285f9a2",
|
||||||
"reference": "13388f00956b1503577598873fffb5ae994b5737",
|
"reference": "c94a94f120803a18554c1805ef2e539f8285f9a2",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -1449,7 +1448,7 @@
|
|||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "2.4-dev"
|
"dev-master": "2.2-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
@@ -1511,7 +1510,7 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/guzzle/psr7/issues",
|
"issues": "https://github.com/guzzle/psr7/issues",
|
||||||
"source": "https://github.com/guzzle/psr7/tree/2.4.0"
|
"source": "https://github.com/guzzle/psr7/tree/2.2.1"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -1527,20 +1526,20 @@
|
|||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2022-06-20T21:43:11+00:00"
|
"time": "2022-03-20T21:55:58+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "inertiajs/inertia-laravel",
|
"name": "inertiajs/inertia-laravel",
|
||||||
"version": "v0.6.3",
|
"version": "v0.6.2",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/inertiajs/inertia-laravel.git",
|
"url": "https://github.com/inertiajs/inertia-laravel.git",
|
||||||
"reference": "540b953ec383364264f9bd633849db16560a4461"
|
"reference": "75859fb1586c3d37ed8705500b5f43e87eee3cb2"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/inertiajs/inertia-laravel/zipball/540b953ec383364264f9bd633849db16560a4461",
|
"url": "https://api.github.com/repos/inertiajs/inertia-laravel/zipball/75859fb1586c3d37ed8705500b5f43e87eee3cb2",
|
||||||
"reference": "540b953ec383364264f9bd633849db16560a4461",
|
"reference": "75859fb1586c3d37ed8705500b5f43e87eee3cb2",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -1588,7 +1587,7 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/inertiajs/inertia-laravel/issues",
|
"issues": "https://github.com/inertiajs/inertia-laravel/issues",
|
||||||
"source": "https://github.com/inertiajs/inertia-laravel/tree/v0.6.3"
|
"source": "https://github.com/inertiajs/inertia-laravel/tree/v0.6.2"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -1596,7 +1595,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2022-06-27T23:21:15+00:00"
|
"time": "2022-05-25T02:00:06+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "intervention/image",
|
"name": "intervention/image",
|
||||||
@@ -3139,75 +3138,6 @@
|
|||||||
},
|
},
|
||||||
"time": "2021-07-01T19:01:15+00:00"
|
"time": "2021-07-01T19:01:15+00:00"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "masterminds/html5",
|
|
||||||
"version": "2.7.5",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/Masterminds/html5-php.git",
|
|
||||||
"reference": "f640ac1bdddff06ea333a920c95bbad8872429ab"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f640ac1bdddff06ea333a920c95bbad8872429ab",
|
|
||||||
"reference": "f640ac1bdddff06ea333a920c95bbad8872429ab",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"ext-ctype": "*",
|
|
||||||
"ext-dom": "*",
|
|
||||||
"ext-libxml": "*",
|
|
||||||
"php": ">=5.3.0"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7"
|
|
||||||
},
|
|
||||||
"type": "library",
|
|
||||||
"extra": {
|
|
||||||
"branch-alias": {
|
|
||||||
"dev-master": "2.7-dev"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload": {
|
|
||||||
"psr-4": {
|
|
||||||
"Masterminds\\": "src"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Matt Butcher",
|
|
||||||
"email": "technosophos@gmail.com"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Matt Farina",
|
|
||||||
"email": "matt@mattfarina.com"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Asmir Mustafic",
|
|
||||||
"email": "goetas@gmail.com"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "An HTML5 parser and serializer.",
|
|
||||||
"homepage": "http://masterminds.github.io/html5-php",
|
|
||||||
"keywords": [
|
|
||||||
"HTML5",
|
|
||||||
"dom",
|
|
||||||
"html",
|
|
||||||
"parser",
|
|
||||||
"querypath",
|
|
||||||
"serializer",
|
|
||||||
"xml"
|
|
||||||
],
|
|
||||||
"support": {
|
|
||||||
"issues": "https://github.com/Masterminds/html5-php/issues",
|
|
||||||
"source": "https://github.com/Masterminds/html5-php/tree/2.7.5"
|
|
||||||
},
|
|
||||||
"time": "2021-07-01T14:25:37+00:00"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "meyfa/php-svg",
|
"name": "meyfa/php-svg",
|
||||||
"version": "v0.9.1",
|
"version": "v0.9.1",
|
||||||
@@ -3802,16 +3732,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "paragonie/constant_time_encoding",
|
"name": "paragonie/constant_time_encoding",
|
||||||
"version": "v2.6.3",
|
"version": "v2.5.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/paragonie/constant_time_encoding.git",
|
"url": "https://github.com/paragonie/constant_time_encoding.git",
|
||||||
"reference": "58c3f47f650c94ec05a151692652a868995d2938"
|
"reference": "9229e15f2e6ba772f0c55dd6986c563b937170a8"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938",
|
"url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/9229e15f2e6ba772f0c55dd6986c563b937170a8",
|
||||||
"reference": "58c3f47f650c94ec05a151692652a868995d2938",
|
"reference": "9229e15f2e6ba772f0c55dd6986c563b937170a8",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -3865,7 +3795,7 @@
|
|||||||
"issues": "https://github.com/paragonie/constant_time_encoding/issues",
|
"issues": "https://github.com/paragonie/constant_time_encoding/issues",
|
||||||
"source": "https://github.com/paragonie/constant_time_encoding"
|
"source": "https://github.com/paragonie/constant_time_encoding"
|
||||||
},
|
},
|
||||||
"time": "2022-06-14T06:56:20+00:00"
|
"time": "2022-01-17T05:32:27+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "paragonie/random_compat",
|
"name": "paragonie/random_compat",
|
||||||
@@ -4818,16 +4748,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "psy/psysh",
|
"name": "psy/psysh",
|
||||||
"version": "v0.11.6",
|
"version": "v0.11.5",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/bobthecow/psysh.git",
|
"url": "https://github.com/bobthecow/psysh.git",
|
||||||
"reference": "3f5b5f8aaa979fbd0d1783173f4c82ad529fe621"
|
"reference": "c23686f9c48ca202710dbb967df8385a952a2daf"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/3f5b5f8aaa979fbd0d1783173f4c82ad529fe621",
|
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/c23686f9c48ca202710dbb967df8385a952a2daf",
|
||||||
"reference": "3f5b5f8aaa979fbd0d1783173f4c82ad529fe621",
|
"reference": "c23686f9c48ca202710dbb967df8385a952a2daf",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -4888,9 +4818,9 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/bobthecow/psysh/issues",
|
"issues": "https://github.com/bobthecow/psysh/issues",
|
||||||
"source": "https://github.com/bobthecow/psysh/tree/v0.11.6"
|
"source": "https://github.com/bobthecow/psysh/tree/v0.11.5"
|
||||||
},
|
},
|
||||||
"time": "2022-07-03T16:40:23+00:00"
|
"time": "2022-05-27T18:03:49+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "rackbeat/laravel-ui-avatars",
|
"name": "rackbeat/laravel-ui-avatars",
|
||||||
@@ -5303,16 +5233,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "spatie/laravel-model-states",
|
"name": "spatie/laravel-model-states",
|
||||||
"version": "2.4.0",
|
"version": "2.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/spatie/laravel-model-states.git",
|
"url": "https://github.com/spatie/laravel-model-states.git",
|
||||||
"reference": "976e5dcf9ad98231c5d983bd7c5f1ad17695b13f"
|
"reference": "bfa12486558952eca4d6c81d4dd803b83f065297"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/spatie/laravel-model-states/zipball/976e5dcf9ad98231c5d983bd7c5f1ad17695b13f",
|
"url": "https://api.github.com/repos/spatie/laravel-model-states/zipball/bfa12486558952eca4d6c81d4dd803b83f065297",
|
||||||
"reference": "976e5dcf9ad98231c5d983bd7c5f1ad17695b13f",
|
"reference": "bfa12486558952eca4d6c81d4dd803b83f065297",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -5361,7 +5291,7 @@
|
|||||||
"state"
|
"state"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/spatie/laravel-model-states/tree/2.4.0"
|
"source": "https://github.com/spatie/laravel-model-states/tree/2.3.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -5373,20 +5303,20 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2022-06-07T08:19:20+00:00"
|
"time": "2022-04-21T12:09:37+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "spatie/laravel-package-tools",
|
"name": "spatie/laravel-package-tools",
|
||||||
"version": "1.12.1",
|
"version": "1.11.3",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/spatie/laravel-package-tools.git",
|
"url": "https://github.com/spatie/laravel-package-tools.git",
|
||||||
"reference": "09f80fa240d44fafb1c70657c74ee44ffa929357"
|
"reference": "baeb3df0ebb3a541394fdaf8cbe6115bf4034a59"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/09f80fa240d44fafb1c70657c74ee44ffa929357",
|
"url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/baeb3df0ebb3a541394fdaf8cbe6115bf4034a59",
|
||||||
"reference": "09f80fa240d44fafb1c70657c74ee44ffa929357",
|
"reference": "baeb3df0ebb3a541394fdaf8cbe6115bf4034a59",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -5424,7 +5354,7 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/spatie/laravel-package-tools/issues",
|
"issues": "https://github.com/spatie/laravel-package-tools/issues",
|
||||||
"source": "https://github.com/spatie/laravel-package-tools/tree/1.12.1"
|
"source": "https://github.com/spatie/laravel-package-tools/tree/1.11.3"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -5432,7 +5362,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2022-06-28T14:29:26+00:00"
|
"time": "2022-03-15T20:01:36+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "spatie/laravel-slack-slash-command",
|
"name": "spatie/laravel-slack-slash-command",
|
||||||
@@ -7869,21 +7799,21 @@
|
|||||||
"packages-dev": [
|
"packages-dev": [
|
||||||
{
|
{
|
||||||
"name": "blumilksoftware/codestyle",
|
"name": "blumilksoftware/codestyle",
|
||||||
"version": "v1.6.0",
|
"version": "v1.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/blumilksoftware/codestyle.git",
|
"url": "https://github.com/blumilksoftware/codestyle.git",
|
||||||
"reference": "717b521c2a40b3761df013f26aba507a4fb9801e"
|
"reference": "bf694da19f2cd5d0575b8fad585d3570d6785c23"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/blumilksoftware/codestyle/zipball/717b521c2a40b3761df013f26aba507a4fb9801e",
|
"url": "https://api.github.com/repos/blumilksoftware/codestyle/zipball/bf694da19f2cd5d0575b8fad585d3570d6785c23",
|
||||||
"reference": "717b521c2a40b3761df013f26aba507a4fb9801e",
|
"reference": "bf694da19f2cd5d0575b8fad585d3570d6785c23",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"friendsofphp/php-cs-fixer": "^3.8.0",
|
"friendsofphp/php-cs-fixer": "^3.8.0",
|
||||||
"kubawerlos/php-cs-fixer-custom-fixers": "^3.11.0",
|
"kubawerlos/php-cs-fixer-custom-fixers": "^3.10.1",
|
||||||
"php": "^8.0"
|
"php": "^8.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
@@ -7913,9 +7843,9 @@
|
|||||||
"description": "Blumilk codestyle configurator",
|
"description": "Blumilk codestyle configurator",
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/blumilksoftware/codestyle/issues",
|
"issues": "https://github.com/blumilksoftware/codestyle/issues",
|
||||||
"source": "https://github.com/blumilksoftware/codestyle/tree/v1.6.0"
|
"source": "https://github.com/blumilksoftware/codestyle/tree/v1.3.0"
|
||||||
},
|
},
|
||||||
"time": "2022-06-10T13:08:08+00:00"
|
"time": "2022-05-10T09:41:53+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "composer/pcre",
|
"name": "composer/pcre",
|
||||||
@@ -8137,16 +8067,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "doctrine/annotations",
|
"name": "doctrine/annotations",
|
||||||
"version": "1.13.3",
|
"version": "1.13.2",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/doctrine/annotations.git",
|
"url": "https://github.com/doctrine/annotations.git",
|
||||||
"reference": "648b0343343565c4a056bfc8392201385e8d89f0"
|
"reference": "5b668aef16090008790395c02c893b1ba13f7e08"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/doctrine/annotations/zipball/648b0343343565c4a056bfc8392201385e8d89f0",
|
"url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08",
|
||||||
"reference": "648b0343343565c4a056bfc8392201385e8d89f0",
|
"reference": "5b668aef16090008790395c02c893b1ba13f7e08",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -8158,10 +8088,9 @@
|
|||||||
"require-dev": {
|
"require-dev": {
|
||||||
"doctrine/cache": "^1.11 || ^2.0",
|
"doctrine/cache": "^1.11 || ^2.0",
|
||||||
"doctrine/coding-standard": "^6.0 || ^8.1",
|
"doctrine/coding-standard": "^6.0 || ^8.1",
|
||||||
"phpstan/phpstan": "^1.4.10 || ^1.8.0",
|
"phpstan/phpstan": "^0.12.20",
|
||||||
"phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5",
|
"phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5",
|
||||||
"symfony/cache": "^4.4 || ^5.2",
|
"symfony/cache": "^4.4 || ^5.2"
|
||||||
"vimeo/psalm": "^4.10"
|
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
@@ -8204,9 +8133,9 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/doctrine/annotations/issues",
|
"issues": "https://github.com/doctrine/annotations/issues",
|
||||||
"source": "https://github.com/doctrine/annotations/tree/1.13.3"
|
"source": "https://github.com/doctrine/annotations/tree/1.13.2"
|
||||||
},
|
},
|
||||||
"time": "2022-07-02T10:48:51+00:00"
|
"time": "2021-08-05T19:00:23+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "doctrine/instantiator",
|
"name": "doctrine/instantiator",
|
||||||
@@ -8810,16 +8739,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "nunomaduro/collision",
|
"name": "nunomaduro/collision",
|
||||||
"version": "v6.2.1",
|
"version": "v6.2.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/nunomaduro/collision.git",
|
"url": "https://github.com/nunomaduro/collision.git",
|
||||||
"reference": "5f058f7e39278b701e455b3c82ec5298cf001d89"
|
"reference": "c379636dc50e829edb3a8bcb944a01aa1aed8f25"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/5f058f7e39278b701e455b3c82ec5298cf001d89",
|
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/c379636dc50e829edb3a8bcb944a01aa1aed8f25",
|
||||||
"reference": "5f058f7e39278b701e455b3c82ec5298cf001d89",
|
"reference": "c379636dc50e829edb3a8bcb944a01aa1aed8f25",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -8831,7 +8760,6 @@
|
|||||||
"require-dev": {
|
"require-dev": {
|
||||||
"brianium/paratest": "^6.4.1",
|
"brianium/paratest": "^6.4.1",
|
||||||
"laravel/framework": "^9.7",
|
"laravel/framework": "^9.7",
|
||||||
"laravel/pint": "^0.2.1",
|
|
||||||
"nunomaduro/larastan": "^1.0.2",
|
"nunomaduro/larastan": "^1.0.2",
|
||||||
"nunomaduro/mock-final-classes": "^1.1.0",
|
"nunomaduro/mock-final-classes": "^1.1.0",
|
||||||
"orchestra/testbench": "^7.3.0",
|
"orchestra/testbench": "^7.3.0",
|
||||||
@@ -8894,7 +8822,7 @@
|
|||||||
"type": "patreon"
|
"type": "patreon"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2022-06-27T16:11:16+00:00"
|
"time": "2022-04-05T15:31:38+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phar-io/manifest",
|
"name": "phar-io/manifest",
|
||||||
@@ -9671,16 +9599,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/phpunit",
|
"name": "phpunit/phpunit",
|
||||||
"version": "9.5.21",
|
"version": "9.5.20",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||||
"reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1"
|
"reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0e32b76be457de00e83213528f6bb37e2a38fcb1",
|
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
|
||||||
"reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1",
|
"reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -9714,6 +9642,7 @@
|
|||||||
"sebastian/version": "^3.0.2"
|
"sebastian/version": "^3.0.2"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
|
"ext-pdo": "*",
|
||||||
"phpspec/prophecy-phpunit": "^2.0.1"
|
"phpspec/prophecy-phpunit": "^2.0.1"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
@@ -9757,7 +9686,7 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
|
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
|
||||||
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.21"
|
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -9769,7 +9698,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2022-06-19T12:14:25+00:00"
|
"time": "2022-04-01T12:37:26+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/cli-parser",
|
"name": "sebastian/cli-parser",
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ version: '3.8'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
web:
|
web:
|
||||||
image: nginx:1.23-alpine
|
image: nginx:1.21-alpine
|
||||||
container_name: toby-web
|
container_name: toby-web
|
||||||
working_dir: /application
|
working_dir: /application
|
||||||
volumes:
|
volumes:
|
||||||
@@ -76,7 +76,7 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
node:
|
node:
|
||||||
image: node:18.4.0-alpine3.16
|
image: node:18.1.0-alpine3.14
|
||||||
container_name: toby-node
|
container_name: toby-node
|
||||||
working_dir: /application
|
working_dir: /application
|
||||||
volumes:
|
volumes:
|
||||||
|
|||||||
747
package-lock.json
generated
747
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
22
package.json
22
package.json
@@ -13,7 +13,7 @@
|
|||||||
"lintf": "./node_modules/.bin/eslint resources/js --ext .js,.vue --fix"
|
"lintf": "./node_modules/.bin/eslint resources/js --ext .js,.vue --fix"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@headlessui/vue": "^1.6.5",
|
"@headlessui/vue": "^1.6.4",
|
||||||
"@heroicons/vue": "^1.0.6",
|
"@heroicons/vue": "^1.0.6",
|
||||||
"@inertiajs/inertia": "^0.11.0",
|
"@inertiajs/inertia": "^0.11.0",
|
||||||
"@inertiajs/inertia-vue3": "^0.6.0",
|
"@inertiajs/inertia-vue3": "^0.6.0",
|
||||||
@@ -21,27 +21,27 @@
|
|||||||
"@tailwindcss/forms": "^0.5.2",
|
"@tailwindcss/forms": "^0.5.2",
|
||||||
"@tailwindcss/line-clamp": "^0.4.0",
|
"@tailwindcss/line-clamp": "^0.4.0",
|
||||||
"@tailwindcss/typography": "^0.5.2",
|
"@tailwindcss/typography": "^0.5.2",
|
||||||
"@vue/compiler-sfc": "^3.2.37",
|
"@vue/compiler-sfc": "^3.2.31",
|
||||||
"autoprefixer": "^10.4.7",
|
"autoprefixer": "^10.4.7",
|
||||||
"axios": "^0.27.2",
|
"axios": "^0.27.2",
|
||||||
"echarts": "^5.3.3",
|
"echarts": "^5.3.2",
|
||||||
"flatpickr": "^4.6.13",
|
"flatpickr": "^4.6.13",
|
||||||
"laravel-mix": "^6.0.49",
|
"laravel-mix": "^6.0.44",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"luxon": "^2.4.0",
|
"luxon": "^2.3.2",
|
||||||
"postcss": "^8.4.14",
|
"postcss": "^8.4.14",
|
||||||
"tailwindcss": "^3.1.4",
|
"tailwindcss": "^3.0.24",
|
||||||
"vue": "3.2.37",
|
"vue": "3.2.21",
|
||||||
"vue-echarts": "^6.1.0",
|
"vue-echarts": "^6.0.2",
|
||||||
"vue-flatpickr-component": "^9.0.6",
|
"vue-flatpickr-component": "^9.0.6",
|
||||||
"vue-loader": "^17.0.0",
|
"vue-loader": "^17.0.0",
|
||||||
"vue-material-design-icons": "^5.1.1",
|
"vue-material-design-icons": "^5.0.0",
|
||||||
"vue-toastification": "^2.0.0-rc.5",
|
"vue-toastification": "^2.0.0-rc.5",
|
||||||
"vue3-popper": "^1.5.0",
|
"vue3-popper": "^1.5.0",
|
||||||
"vuedraggable": "^4.1.0"
|
"vuedraggable": "^4.1.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"eslint": "^8.19.0",
|
"eslint": "^8.16.0",
|
||||||
"eslint-plugin-vue": "^9.1.1"
|
"eslint-plugin-vue": "^9.1.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,11 +3,9 @@
|
|||||||
<div class="grid grid-cols-1 gap-4 items-start xl:grid-cols-3 xl:gap-8">
|
<div class="grid grid-cols-1 gap-4 items-start xl:grid-cols-3 xl:gap-8">
|
||||||
<div class="grid grid-cols-1 gap-4 xl:col-span-2">
|
<div class="grid grid-cols-1 gap-4 xl:col-span-2">
|
||||||
<Welcome :user="auth.user" />
|
<Welcome :user="auth.user" />
|
||||||
<VacationCalendar
|
<VacationStats :stats="stats" />
|
||||||
:holidays="allHolidays"
|
</div>
|
||||||
:approved-vacations="approvedVacations"
|
<div class="grid grid-cols-1 gap-4">
|
||||||
:pending-vacations="pendingVacations"
|
|
||||||
/>
|
|
||||||
<PendingVacationRequests
|
<PendingVacationRequests
|
||||||
v-if="can.listAllVacationRequests"
|
v-if="can.listAllVacationRequests"
|
||||||
:requests="vacationRequests.data"
|
:requests="vacationRequests.data"
|
||||||
@@ -16,9 +14,6 @@
|
|||||||
v-else
|
v-else
|
||||||
:requests="vacationRequests.data"
|
:requests="vacationRequests.data"
|
||||||
/>
|
/>
|
||||||
</div>
|
|
||||||
<div class="grid grid-cols-1 gap-4">
|
|
||||||
<VacationStats :stats="stats" />
|
|
||||||
<AbsenceList
|
<AbsenceList
|
||||||
v-if="years.current.year === years.selected.year && absences.data.length"
|
v-if="years.current.year === years.selected.year && absences.data.length"
|
||||||
:absences="absences.data"
|
:absences="absences.data"
|
||||||
@@ -43,7 +38,6 @@ import HomeOfficeList from '@/Shared/Widgets/HomeOfficeList'
|
|||||||
import UpcomingHolidays from '@/Shared/Widgets/UpcomingHolidays'
|
import UpcomingHolidays from '@/Shared/Widgets/UpcomingHolidays'
|
||||||
import UserVacationRequests from '@/Shared/Widgets/UserVacationRequests'
|
import UserVacationRequests from '@/Shared/Widgets/UserVacationRequests'
|
||||||
import PendingVacationRequests from '@/Shared/Widgets/PendingVacationRequests'
|
import PendingVacationRequests from '@/Shared/Widgets/PendingVacationRequests'
|
||||||
import VacationCalendar from '@/Shared/Widgets/VacationCalendar'
|
|
||||||
|
|
||||||
defineProps({
|
defineProps({
|
||||||
auth: Object,
|
auth: Object,
|
||||||
@@ -54,8 +48,5 @@ defineProps({
|
|||||||
can: Object,
|
can: Object,
|
||||||
stats: Object,
|
stats: Object,
|
||||||
years: Object,
|
years: Object,
|
||||||
allHolidays: Object,
|
|
||||||
approvedVacations: Object,
|
|
||||||
pendingVacations: Object,
|
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,120 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div
|
|
||||||
class="box-border"
|
|
||||||
:class="[
|
|
||||||
day.isCurrentMonth ? {
|
|
||||||
'bg-red-100': day.isWeekend,
|
|
||||||
'bg-white hover:bg-blumilk-25': !day.isWeekend && !day.isHoliday,
|
|
||||||
'bg-red-100 text-red-800': day.isHoliday || day.isWeekend
|
|
||||||
} : [
|
|
||||||
'bg-gray-50 text-gray-500',
|
|
||||||
{
|
|
||||||
'bg-red-50': day.isWeekend
|
|
||||||
}
|
|
||||||
],
|
|
||||||
day.isHoliday && 'font-bold cursor-default',
|
|
||||||
(day.isPendingVacation) && `border-b-4 border-dashed ${day.getVacationType.border}`,
|
|
||||||
(day.isVacation) && `border-b-4 ${day.getVacationType.border}`
|
|
||||||
]"
|
|
||||||
>
|
|
||||||
<Popper
|
|
||||||
v-if="day.isHoliday"
|
|
||||||
as="div"
|
|
||||||
open-delay="200"
|
|
||||||
hover
|
|
||||||
offset-distance="0"
|
|
||||||
@mouseover.passive="onMouseover"
|
|
||||||
@mouseleave="onMouseleave"
|
|
||||||
>
|
|
||||||
<time
|
|
||||||
:datetime="day.date"
|
|
||||||
:class="[ day.isToday && 'flex h-6 w-6 items-center justify-center rounded-full bg-blumilk-500 font-semibold text-white' ]"
|
|
||||||
>
|
|
||||||
{{ day.dayNumber }}
|
|
||||||
</time>
|
|
||||||
<template #content>
|
|
||||||
<div class="py-2 px-6 text-sm font-semibold text-left text-gray-700 bg-white rounded-lg border border-gray-400">
|
|
||||||
{{ day.getHolidayInfo }}
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</Popper>
|
|
||||||
<Popper
|
|
||||||
v-else-if="day.isVacation || day.isPendingVacation"
|
|
||||||
as="div"
|
|
||||||
open-delay="200"
|
|
||||||
hover
|
|
||||||
offset-distance="0"
|
|
||||||
@mouseover.passive="onMouseover"
|
|
||||||
@mouseleave="onMouseleave"
|
|
||||||
>
|
|
||||||
<div class="flex justify-between">
|
|
||||||
<time
|
|
||||||
:datetime="day.date"
|
|
||||||
:class="[ day.isToday && 'flex h-6 w-6 items-center justify-center rounded-full bg-blumilk-500 font-semibold text-white' ]"
|
|
||||||
>
|
|
||||||
{{ day.dayNumber }}
|
|
||||||
</time>
|
|
||||||
<div class="hidden md:inline-block">
|
|
||||||
<VacationIcon
|
|
||||||
:type="day.getVacationType.value"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<template #content>
|
|
||||||
<VacationPopup :vacation="day.getVacationInfo" />
|
|
||||||
</template>
|
|
||||||
</Popper>
|
|
||||||
<div
|
|
||||||
v-else-if="day.isWeekend"
|
|
||||||
class="text-red-800"
|
|
||||||
>
|
|
||||||
<time
|
|
||||||
:datetime="day.date"
|
|
||||||
class="cursor-default"
|
|
||||||
:class="{ 'flex h-6 w-6 items-center justify-center rounded-full bg-blumilk-500 font-semibold text-white': day.isToday }"
|
|
||||||
>
|
|
||||||
{{ day.dayNumber }}
|
|
||||||
</time>
|
|
||||||
</div>
|
|
||||||
<InertiaLink
|
|
||||||
v-else
|
|
||||||
href="/vacation/requests/create"
|
|
||||||
:data="{ 'from_date': day.date }"
|
|
||||||
@mouseover.passive="onMouseover"
|
|
||||||
@mouseleave="onMouseleave"
|
|
||||||
>
|
|
||||||
<time
|
|
||||||
:datetime="day.date"
|
|
||||||
:class="{ 'flex h-6 w-6 items-center justify-center rounded-full bg-blumilk-500 font-semibold text-white': day.isToday }"
|
|
||||||
>
|
|
||||||
{{ day.dayNumber }}
|
|
||||||
</time>
|
|
||||||
</InertiaLink>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup>
|
|
||||||
import Popper from 'vue3-popper'
|
|
||||||
import { defineProps, ref } from 'vue'
|
|
||||||
import VacationPopup from '@/Shared/VacationPopup'
|
|
||||||
import VacationIcon from '@/Shared/VacationTypeCalendarIcon'
|
|
||||||
|
|
||||||
defineProps({
|
|
||||||
day: {
|
|
||||||
type: Object,
|
|
||||||
required: true,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
const isActive = ref(false)
|
|
||||||
|
|
||||||
function onMouseover() {
|
|
||||||
if (!isActive.value)
|
|
||||||
isActive.value = true
|
|
||||||
}
|
|
||||||
|
|
||||||
function onMouseleave() {
|
|
||||||
if (isActive.value)
|
|
||||||
isActive.value = false
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
function isViewModeKey(key) {
|
|
||||||
return this.key === key.value
|
|
||||||
}
|
|
||||||
|
|
||||||
export const viewModes = [
|
|
||||||
{ key: 'week', name: 'Widok tygodnia', shortcut: 'Tydzień', is: isViewModeKey },
|
|
||||||
{ key: 'month', name: 'Widok miesiąca', shortcut: 'Miesiąc', is: isViewModeKey },
|
|
||||||
]
|
|
||||||
|
|
||||||
export function find(modeKey) {
|
|
||||||
return viewModes.find(mode => mode.key === modeKey)
|
|
||||||
}
|
|
||||||
@@ -1,407 +0,0 @@
|
|||||||
<template>
|
|
||||||
<section class="bg-white shadow-md">
|
|
||||||
<div class="grid grid-cols-3 grid-rows-1 items-center justify-center p-4 sm:px-6">
|
|
||||||
<h2 class="text-lg font-medium leading-6 text-gray-900">
|
|
||||||
{{ calendarState.monthName }} {{ !calendarState.isActualYear ? calendar.currents.year : undefined }}
|
|
||||||
</h2>
|
|
||||||
<div class="flex justify-center">
|
|
||||||
<div class="flex items-center rounded-md shadow-sm md:items-stretch">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="flex items-center justify-center rounded-l-md border border-r-0 border-gray-300 py-2 pl-3 pr-4 text-gray-400 focus:relative md:w-9 md:px-2"
|
|
||||||
:class="[ calendarState.isPrevious ? 'bg-white hover:text-gray-500 md:hover:bg-gray-50' : 'bg-gray-100' ]"
|
|
||||||
@click="toPrevious"
|
|
||||||
>
|
|
||||||
<span class="sr-only">Poprzedni {{ calendarState.viewMode.details.shortcut }}</span>
|
|
||||||
<ChevronLeftIcon
|
|
||||||
class="h-5 w-5"
|
|
||||||
aria-hidden="true"
|
|
||||||
/>
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="hidden border-t border-b border-gray-300 bg-white px-3.5 text-sm font-medium text-gray-700 hover:bg-gray-50 hover:text-gray-900 focus:relative md:block"
|
|
||||||
@click="goToToday"
|
|
||||||
>
|
|
||||||
Dzisiaj
|
|
||||||
</button>
|
|
||||||
<span
|
|
||||||
class="relative -mx-px h-5 w-px bg-gray-300 md:hidden z-10"
|
|
||||||
/>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="flex items-center justify-center rounded-r-md border border-l-0 border-gray-300 py-2 pl-4 pr-3 text-gray-400 focus:relative md:w-9 md:px-2"
|
|
||||||
:class="[ calendarState.isNext ? 'bg-white hover:text-gray-500 md:hover:bg-gray-50' : 'bg-gray-100' ]"
|
|
||||||
:disabled="!calendarState.isNext"
|
|
||||||
@click="toNext"
|
|
||||||
>
|
|
||||||
<span class="sr-only">Następny {{ calendarState.viewMode.details.shortcut }}</span>
|
|
||||||
<ChevronRightIcon
|
|
||||||
class="h-5 w-5"
|
|
||||||
aria-hidden="true"
|
|
||||||
/>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<Menu
|
|
||||||
as="div"
|
|
||||||
class="flex justify-end relative"
|
|
||||||
>
|
|
||||||
<MenuButton
|
|
||||||
type="button"
|
|
||||||
class="flex items-center rounded-md border border-gray-300 bg-white py-2 pl-3 pr-2 text-sm font-medium text-gray-700 shadow-sm hover:bg-gray-50"
|
|
||||||
>
|
|
||||||
<span class="md:hidden">{{ calendarState.viewMode.details.shortcut }}</span>
|
|
||||||
<span class="hidden md:inline-block">{{ calendarState.viewMode.details.name }}</span>
|
|
||||||
<ChevronDownIcon
|
|
||||||
class="ml-2 h-5 w-5 text-gray-400"
|
|
||||||
aria-hidden="true"
|
|
||||||
/>
|
|
||||||
</MenuButton>
|
|
||||||
|
|
||||||
<transition
|
|
||||||
class="z-10"
|
|
||||||
enter-active-class="transition ease-out duration-100"
|
|
||||||
enter-from-class="transform opacity-0 scale-95"
|
|
||||||
enter-to-class="transform opacity-100 scale-100"
|
|
||||||
leave-active-class="transition ease-in duration-75"
|
|
||||||
leave-from-class="transform opacity-100 scale-100"
|
|
||||||
leave-to-class="transform opacity-0 scale-95"
|
|
||||||
>
|
|
||||||
<MenuItems class="absolute right-0 mt-3 w-36 origin-top-right overflow-hidden rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
|
|
||||||
<div class="py-1">
|
|
||||||
<MenuItem
|
|
||||||
v-for="option in viewModes"
|
|
||||||
:key="option.key"
|
|
||||||
v-slot="{ active }"
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
:class="[active ? 'bg-gray-100 text-gray-900' : 'text-gray-700', 'flex px-4 py-2 text-sm text-left w-full']"
|
|
||||||
@click="updateViewMode(option.key)"
|
|
||||||
>
|
|
||||||
{{ option.shortcut }}
|
|
||||||
<CheckIcon
|
|
||||||
v-if="option.is(calendar.viewMode)"
|
|
||||||
class="ml-2 w-5 h-5 text-blumilk-500"
|
|
||||||
/>
|
|
||||||
</button>
|
|
||||||
</MenuItem>
|
|
||||||
</div>
|
|
||||||
</MenuItems>
|
|
||||||
</transition>
|
|
||||||
</Menu>
|
|
||||||
</div>
|
|
||||||
<div class="ring-1 ring-black ring-opacity-5 lg:flex lg:flex-auto lg:flex-col">
|
|
||||||
<div
|
|
||||||
v-if="calendarState.viewMode.isMonth"
|
|
||||||
class="grid grid-cols-7 gap-px border-b border-gray-300 bg-gray-200 text-center text-xs font-semibold leading-6 text-gray-700 lg:flex-none"
|
|
||||||
>
|
|
||||||
<div class="py-2 bg-white">
|
|
||||||
Pn
|
|
||||||
</div>
|
|
||||||
<div class="py-2 bg-white">
|
|
||||||
Wt
|
|
||||||
</div>
|
|
||||||
<div class="py-2 bg-white">
|
|
||||||
Śr
|
|
||||||
</div>
|
|
||||||
<div class="py-2 bg-white">
|
|
||||||
Cz
|
|
||||||
</div>
|
|
||||||
<div class="py-2 bg-white">
|
|
||||||
Pt
|
|
||||||
</div>
|
|
||||||
<div class="py-2 bg-red-100 text-red-800">
|
|
||||||
Sb
|
|
||||||
</div>
|
|
||||||
<div class="py-2 bg-red-100 text-red-800">
|
|
||||||
Nd
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="flex bg-gray-200 text-xs leading-6 text-gray-700 lg:flex-auto">
|
|
||||||
<div
|
|
||||||
class="w-full grid grid-cols-7 gap-px"
|
|
||||||
:class="{ 'grid-rows-1': calendarState.viewMode.isWeek }"
|
|
||||||
>
|
|
||||||
<DayComponent
|
|
||||||
v-for="(day, index) in days"
|
|
||||||
:key="index"
|
|
||||||
:day="day"
|
|
||||||
class="flex flex-col relative py-2 px-3"
|
|
||||||
:class="{ 'day': calendarState.viewMode.isWeek }"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup>
|
|
||||||
import { CheckIcon, ChevronDownIcon, ChevronLeftIcon, ChevronRightIcon } from '@heroicons/vue/solid'
|
|
||||||
import { Menu, MenuButton, MenuItem, MenuItems } from '@headlessui/vue'
|
|
||||||
import { ref, watch, computed, reactive } from 'vue'
|
|
||||||
import { DateTime } from 'luxon'
|
|
||||||
import useVacationTypeInfo from '@/Composables/vacationTypeInfo'
|
|
||||||
import useCurrentYearPeriodInfo from '@/Composables/yearPeriodInfo'
|
|
||||||
import { useMonthInfo } from '@/Composables/monthInfo'
|
|
||||||
import { viewModes, find as findViewMode } from '@/Shared/Widgets/Calendar/ViewModeOptions'
|
|
||||||
import DayComponent from '@/Shared/Widgets/Calendar/DayComponent'
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
holidays: Object,
|
|
||||||
approvedVacations: Object,
|
|
||||||
pendingVacations: Object,
|
|
||||||
})
|
|
||||||
|
|
||||||
let days = ref([])
|
|
||||||
|
|
||||||
function getCurrentDate() {
|
|
||||||
const { year, month, weekNumber } = DateTime.now()
|
|
||||||
return { year, month, week: weekNumber }
|
|
||||||
}
|
|
||||||
const currentDate = getCurrentDate()
|
|
||||||
|
|
||||||
const months = useMonthInfo().getMonths()
|
|
||||||
const { findType } = useVacationTypeInfo()
|
|
||||||
const selectedYear = useCurrentYearPeriodInfo().year.value
|
|
||||||
const weeksInYear = DateTime.fromObject({ year: selectedYear, month: 12, day: 31 }).weekNumber
|
|
||||||
|
|
||||||
const calendar = {
|
|
||||||
viewMode: ref(localStorage.getItem('calendarViewMode') ?? 'week'),
|
|
||||||
currents: reactive({
|
|
||||||
year: selectedYear,
|
|
||||||
month: selectedYear === currentDate.year ? currentDate.month : 1,
|
|
||||||
week: selectedYear === currentDate.year ? currentDate.week : 0,
|
|
||||||
}),
|
|
||||||
}
|
|
||||||
|
|
||||||
const calendarState = reactive({
|
|
||||||
viewMode: {
|
|
||||||
isWeek: computed(() => calendar.viewMode.value === 'week'),
|
|
||||||
isMonth: computed(() => calendar.viewMode.value === 'month'),
|
|
||||||
details: computed(() => findViewMode(calendar.viewMode.value)),
|
|
||||||
},
|
|
||||||
monthName: computed(() => months[calendar.currents.month - 1]?.name),
|
|
||||||
isActualYear: computed(() => calendar.currents.year === DateTime.now().year),
|
|
||||||
isPrevious: computed(() => calendarState.viewMode.isMonth ? calendar.currents.month !== 1 : calendar.currents.week > 0),
|
|
||||||
isNext: computed(() => calendarState.viewMode.isMonth ? calendar.currents.month !== 12 : calendar.currents.week < weeksInYear),
|
|
||||||
})
|
|
||||||
|
|
||||||
const customCalendar = {
|
|
||||||
loadCalendar() {
|
|
||||||
const date = DateTime.fromObject({
|
|
||||||
year: calendar.currents.year,
|
|
||||||
month: calendarState.viewMode.isMonth ? calendar.currents.month : 1,
|
|
||||||
day: 1,
|
|
||||||
})
|
|
||||||
days.value = this.generateCalendarData(date)
|
|
||||||
},
|
|
||||||
generateCalendarData(date) {
|
|
||||||
const firstMonthDay = date.startOf('month')
|
|
||||||
const lastMonthDay = date.endOf('month')
|
|
||||||
|
|
||||||
if (calendarState.viewMode.isWeek) {
|
|
||||||
return this.generateWeekData(firstMonthDay.startOf('week'))
|
|
||||||
} else if (calendarState.viewMode.isMonth) {
|
|
||||||
return this.generateMonthData(firstMonthDay.startOf('week'), lastMonthDay.endOf('week'))
|
|
||||||
}
|
|
||||||
return []
|
|
||||||
},
|
|
||||||
generateWeekData(start) {
|
|
||||||
let days = [], startWeek
|
|
||||||
if (calendar.currents.month === 1 && calendar.currents.week === 0)
|
|
||||||
startWeek = DateTime.fromObject({ year: calendar.currents.year, month: 1, day: 1 }).startOf('week')
|
|
||||||
else if (calendarState.isActualYear)
|
|
||||||
startWeek = DateTime.fromObject({ weekNumber: calendar.currents.week })
|
|
||||||
else
|
|
||||||
startWeek = start.plus({ week: calendar.currents.week })
|
|
||||||
const endWeek = startWeek.endOf('week')
|
|
||||||
for (let day = startWeek; day < endWeek; day = day.plus({ day: 1 })) {
|
|
||||||
days.push(this.prepareDay(day))
|
|
||||||
}
|
|
||||||
return days
|
|
||||||
},
|
|
||||||
generateMonthData(start, end) {
|
|
||||||
let days = []
|
|
||||||
for (let day = start; day < end; day = day.plus({ day: 1 })) {
|
|
||||||
days.push(this.prepareDay(day))
|
|
||||||
}
|
|
||||||
|
|
||||||
return days
|
|
||||||
},
|
|
||||||
prepareDay(day) {
|
|
||||||
const isCurrentMonth = isInCurrentMonth(day)
|
|
||||||
const startDay = {
|
|
||||||
date: day.toISODate(),
|
|
||||||
isVacation: isCurrentMonth && isVacation(day),
|
|
||||||
isPendingVacation: isCurrentMonth && isPendingVacation(day),
|
|
||||||
isHoliday: isHoliday(day),
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
...startDay,
|
|
||||||
dayNumber: day.day,
|
|
||||||
isCurrentMonth,
|
|
||||||
isToday: isToday(day),
|
|
||||||
isWeekend: isWeekend(day),
|
|
||||||
getHolidayInfo: startDay.isHoliday ? getHolidayInfo(startDay) : undefined,
|
|
||||||
getVacationType: startDay.isVacation || startDay.isPendingVacation ? getVacationType(startDay) : undefined,
|
|
||||||
getVacationInfo: startDay.isVacation || startDay.isPendingVacation ? getVacationInfo(startDay) : undefined,
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
watch([calendar.viewMode, calendar.currents], () => {
|
|
||||||
customCalendar.loadCalendar()
|
|
||||||
})
|
|
||||||
|
|
||||||
customCalendar.loadCalendar()
|
|
||||||
|
|
||||||
function toPrevious() {
|
|
||||||
if (calendarState.isPrevious) {
|
|
||||||
if (calendar.viewMode.value === 'week')
|
|
||||||
minusWeek()
|
|
||||||
else
|
|
||||||
minusMonth()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function toNext() {
|
|
||||||
if (calendarState.isNext) {
|
|
||||||
if (calendar.viewMode.value === 'week')
|
|
||||||
addWeek()
|
|
||||||
else
|
|
||||||
addMonth()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function resetCalendar(config = {}) {
|
|
||||||
const currentMonth = isUndefined(config.month) ? currentDate.month : config.month
|
|
||||||
const currentWeek = isUndefined(config.week) ? currentDate.week : config.week
|
|
||||||
|
|
||||||
calendar.currents.year = isUndefined(config.year) ? selectedYear : config.month
|
|
||||||
calendar.currents.month = calendarState.isActualYear || !isUndefined(config.year) ? currentMonth : 1
|
|
||||||
calendar.currents.week = calendarState.isActualYear || !isUndefined(config.week) ? currentWeek : 0
|
|
||||||
}
|
|
||||||
|
|
||||||
function isUndefined(value) {
|
|
||||||
return value === undefined
|
|
||||||
}
|
|
||||||
|
|
||||||
function addWeek(minus = false) {
|
|
||||||
const howMany = minus ? -1: 1
|
|
||||||
let nextMonth, date = DateTime.fromObject({
|
|
||||||
year: calendar.currents.year,
|
|
||||||
month: 1,
|
|
||||||
day: 1,
|
|
||||||
})
|
|
||||||
|
|
||||||
date = date.plus({ week: calendar.currents.week + howMany })
|
|
||||||
|
|
||||||
const startWeekDay = date.startOf('week'), endWeekDay = date.endOf('week')
|
|
||||||
nextMonth = howMany > 0 ? startWeekDay.month : endWeekDay.month
|
|
||||||
if (howMany < 0 && endWeekDay.day === endWeekDay.daysInMonth)
|
|
||||||
calendar.currents.week--
|
|
||||||
else if (howMany > 0 && startWeekDay.day === 1)
|
|
||||||
calendar.currents.week++
|
|
||||||
|
|
||||||
if (nextMonth !== calendar.currents.month) {
|
|
||||||
calendar.currents.month = calendar.currents.week > 1 ? nextMonth : 1
|
|
||||||
if (calendar.currents.week === 1)
|
|
||||||
calendar.currents.week = 0
|
|
||||||
return
|
|
||||||
}
|
|
||||||
calendar.currents.week += howMany
|
|
||||||
}
|
|
||||||
|
|
||||||
function minusWeek() {
|
|
||||||
addWeek(true)
|
|
||||||
}
|
|
||||||
|
|
||||||
function addMonth(minus = false) {
|
|
||||||
calendar.currents.month += minus ? -1 : 1
|
|
||||||
}
|
|
||||||
|
|
||||||
function minusMonth() {
|
|
||||||
addMonth(true)
|
|
||||||
}
|
|
||||||
|
|
||||||
function goToToday() {
|
|
||||||
resetCalendar({ year: currentDate.year, months: currentDate.month, week: currentDate.week })
|
|
||||||
}
|
|
||||||
|
|
||||||
function updateViewMode(type) {
|
|
||||||
if (type === 'month')
|
|
||||||
resetCalendar({ week: 0 })
|
|
||||||
else
|
|
||||||
resetCalendar()
|
|
||||||
calendar.viewMode.value = type
|
|
||||||
localStorage.setItem('calendarViewMode', type)
|
|
||||||
}
|
|
||||||
|
|
||||||
function isInCurrentMonth(date) {
|
|
||||||
return calendar.currents.month === date.month
|
|
||||||
}
|
|
||||||
|
|
||||||
function isWeekend(date) {
|
|
||||||
return date.weekday === 6 || date.weekday === 7
|
|
||||||
}
|
|
||||||
|
|
||||||
function isToday(date) {
|
|
||||||
return date.toISODate() === DateTime.local().toISODate()
|
|
||||||
}
|
|
||||||
|
|
||||||
function isHoliday(date) {
|
|
||||||
return props.holidays[date.toISODate()] !== undefined
|
|
||||||
}
|
|
||||||
|
|
||||||
function getHolidayInfo(day) {
|
|
||||||
return props.holidays[day.date]
|
|
||||||
}
|
|
||||||
|
|
||||||
function isVacation(date) {
|
|
||||||
return props.approvedVacations[date.toISODate()] !== undefined
|
|
||||||
}
|
|
||||||
|
|
||||||
function isPendingVacation(date) {
|
|
||||||
return props.pendingVacations[date.toISODate()] !== undefined
|
|
||||||
}
|
|
||||||
|
|
||||||
function getVacationType(day) {
|
|
||||||
return findType(getVacationInfo(day).type)
|
|
||||||
}
|
|
||||||
|
|
||||||
function getVacationInfo(day) {
|
|
||||||
return day.isVacation ? props.approvedVacations[day.date] : props.pendingVacations[day.date]
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style lang="css">
|
|
||||||
.day:nth-of-type(7n - 6):before {
|
|
||||||
content: "Pn";
|
|
||||||
}
|
|
||||||
|
|
||||||
.day:nth-of-type(7n - 5):before {
|
|
||||||
content: "Wt";
|
|
||||||
}
|
|
||||||
|
|
||||||
.day:nth-of-type(7n - 4):before {
|
|
||||||
content: "Śr";
|
|
||||||
}
|
|
||||||
|
|
||||||
.day:nth-of-type(7n - 3):before {
|
|
||||||
content: "Cz";
|
|
||||||
}
|
|
||||||
|
|
||||||
.day:nth-of-type(7n - 2):before {
|
|
||||||
content: "Pt";
|
|
||||||
}
|
|
||||||
|
|
||||||
.day:nth-of-type(7n - 1):before {
|
|
||||||
content: "Sb";
|
|
||||||
}
|
|
||||||
|
|
||||||
.day:nth-of-type(7n):before {
|
|
||||||
content: "Nd";
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -1,83 +1,84 @@
|
|||||||
<template>
|
<template>
|
||||||
<section>
|
<section class="grid grid-cols-1 gap-4 md:grid-cols-2">
|
||||||
<div
|
<div class="hidden p-4 bg-white shadow-md md:block">
|
||||||
v-if="stats.hasLimit"
|
<VacationChart :stats="stats" />
|
||||||
class="grid grid-cols-2 gap-2 h-full"
|
|
||||||
>
|
|
||||||
<div class="py-5 px-4 bg-white shadow-md sm:p-6">
|
|
||||||
<dd class="mt-1 text-4xl font-semibold text-blumilk-500">
|
|
||||||
{{ stats.remaining }}
|
|
||||||
</dd>
|
|
||||||
<dt class="font-medium text-gray-700 truncate text-md">
|
|
||||||
Pozostało
|
|
||||||
</dt>
|
|
||||||
</div>
|
|
||||||
<div class="py-5 px-4 bg-white shadow-md sm:p-6">
|
|
||||||
<dd class="mt-1 text-4xl font-semibold text-blumilk-700">
|
|
||||||
{{ stats.used }}
|
|
||||||
</dd>
|
|
||||||
<dt class="font-medium text-gray-700 truncate text-md">
|
|
||||||
Wykorzystane
|
|
||||||
</dt>
|
|
||||||
</div>
|
|
||||||
<div class="py-5 px-4 bg-white shadow-md sm:p-6">
|
|
||||||
<dt class="mt-1 text-4xl font-semibold text-blumilk-200">
|
|
||||||
{{ stats.pending }}
|
|
||||||
</dt>
|
|
||||||
<dd class="font-medium text-gray-700 truncate text-md">
|
|
||||||
Rozpatrywane
|
|
||||||
</dd>
|
|
||||||
</div>
|
|
||||||
<div class="py-5 px-4 bg-white shadow-md sm:p-6">
|
|
||||||
<dt class="mt-1 text-4xl font-semibold text-blumilk-800">
|
|
||||||
{{ stats.limit }}
|
|
||||||
</dt>
|
|
||||||
<dd class="font-medium text-gray-700 truncate text-md">
|
|
||||||
Limit urlopu
|
|
||||||
</dd>
|
|
||||||
</div>
|
|
||||||
<div class="py-5 px-4 bg-white shadow-md sm:p-6">
|
|
||||||
<dt class="mt-1 text-4xl font-semibold text-gray-500">
|
|
||||||
{{ stats.other }}
|
|
||||||
</dt>
|
|
||||||
<dd class="font-medium text-gray-700 truncate text-md">
|
|
||||||
Inne urlopy
|
|
||||||
</dd>
|
|
||||||
</div>
|
|
||||||
<div class="py-5 px-4 bg-white shadow-md sm:p-6">
|
|
||||||
<dt class="mt-1 text-4xl font-semibold text-lime-500">
|
|
||||||
{{ stats.homeOffice }}
|
|
||||||
</dt>
|
|
||||||
<dd class="font-medium text-gray-700 truncate text-md">
|
|
||||||
Praca zdalna
|
|
||||||
</dd>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div class="h-full">
|
||||||
v-else
|
<div class="grid grid-cols-2 gap-4 h-full">
|
||||||
class="h-full grid grid-cols-2 gap-2 h-full"
|
<div class="py-5 px-4 bg-white shadow-md sm:p-6">
|
||||||
>
|
<dd class="mt-1 text-4xl font-semibold text-blumilk-500">
|
||||||
<div class="py-5 px-4 bg-white shadow-md sm:p-6">
|
{{ stats.remaining }}
|
||||||
<dt class="mt-1 text-4xl font-semibold text-gray-500">
|
</dd>
|
||||||
{{ stats.other }}
|
<dt class="font-medium text-gray-700 truncate text-md">
|
||||||
</dt>
|
Pozostało
|
||||||
<dd class="font-medium text-gray-700 truncate text-md">
|
</dt>
|
||||||
Inne urlopy
|
<dt class="mt-2 text-sm font-medium text-gray-500">
|
||||||
</dd>
|
Dni do wykorzystania teraz.
|
||||||
</div>
|
</dt>
|
||||||
<div class="py-5 px-4 bg-white shadow-md sm:p-6">
|
</div>
|
||||||
<dt class="mt-1 text-4xl font-semibold text-lime-500">
|
<div class="py-5 px-4 bg-white shadow-md sm:p-6">
|
||||||
{{ stats.homeOffice }}
|
<dd class="mt-1 text-4xl font-semibold text-blumilk-700">
|
||||||
</dt>
|
{{ stats.used }}
|
||||||
<dd class="font-medium text-gray-700 truncate text-md">
|
</dd>
|
||||||
Praca zdalna
|
<dt class="font-medium text-gray-700 truncate text-md">
|
||||||
</dd>
|
Wykorzystane
|
||||||
|
</dt>
|
||||||
|
<dt class="mt-2 text-sm font-medium text-gray-500">
|
||||||
|
Dni, które zostały już wykorzystane na urlop wypoczynkowy.
|
||||||
|
</dt>
|
||||||
|
</div>
|
||||||
|
<div class="py-5 px-4 bg-white shadow-md sm:p-6">
|
||||||
|
<dt class="mt-1 text-4xl font-semibold text-blumilk-200">
|
||||||
|
{{ stats.pending }}
|
||||||
|
</dt>
|
||||||
|
<dd class="font-medium text-gray-700 truncate text-md">
|
||||||
|
Rozpatrywane
|
||||||
|
</dd>
|
||||||
|
<dt class="mt-2 text-sm font-medium text-gray-500">
|
||||||
|
Dni czekające na akceptację przełożonych.
|
||||||
|
</dt>
|
||||||
|
</div>
|
||||||
|
<div class="py-5 px-4 bg-white shadow-md sm:p-6">
|
||||||
|
<dt class="mt-1 text-4xl font-semibold text-blumilk-800">
|
||||||
|
{{ stats.limit }}
|
||||||
|
</dt>
|
||||||
|
<dd class="font-medium text-gray-700 truncate text-md">
|
||||||
|
Limit urlopu
|
||||||
|
</dd>
|
||||||
|
<dt class="mt-2 text-sm font-medium text-gray-500">
|
||||||
|
Twój roczny limit urlopu wypoczynkowego.
|
||||||
|
</dt>
|
||||||
|
</div>
|
||||||
|
<div class="py-5 px-4 bg-white shadow-md sm:p-6">
|
||||||
|
<dt class="mt-1 text-4xl font-semibold text-gray-500">
|
||||||
|
{{ stats.other }}
|
||||||
|
</dt>
|
||||||
|
<dd class="font-medium text-gray-700 truncate text-md">
|
||||||
|
Inne urlopy
|
||||||
|
</dd>
|
||||||
|
<dt class="mt-2 text-sm font-medium text-gray-500">
|
||||||
|
Urlopy bezpłatne, okolicznościowe, zwolnienia lekarskie, itd., które zostały już zatwierdzone.
|
||||||
|
</dt>
|
||||||
|
</div>
|
||||||
|
<div class="py-5 px-4 bg-white shadow-md sm:p-6">
|
||||||
|
<dt class="mt-1 text-4xl font-semibold text-lime-500">
|
||||||
|
{{ stats.homeOffice }}
|
||||||
|
</dt>
|
||||||
|
<dd class="font-medium text-gray-700 truncate text-md">
|
||||||
|
Praca zdalna
|
||||||
|
</dd>
|
||||||
|
<dt class="mt-2 text-sm font-medium text-gray-500">
|
||||||
|
Dni przepracowane poza biurem.
|
||||||
|
</dt>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
|
import VacationChart from '@/Shared/VacationChart'
|
||||||
|
|
||||||
defineProps({
|
defineProps({
|
||||||
stats: Object,
|
stats: Object,
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user