12 Commits

Author SHA1 Message Date
0e741ea1b0 - wip 2022-07-08 12:50:49 +02:00
d4cc6691e6 #172 - updated style 2022-07-08 12:23:26 +02:00
8ac9df56f7 #172 - fix 2022-07-07 15:16:15 +02:00
552677bdb4 #172 - facade used for config 2022-07-05 15:21:13 +02:00
0f69b342ec #172 - repair of tests 2022-07-05 14:59:56 +02:00
6d6470c3bd #172 - apply suggestions
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@gmail.com>
2022-07-05 14:55:38 +02:00
c16943b623 #172 - content improvement 2022-07-05 12:58:06 +02:00
f2c978d99b #172 - cleaning 2022-07-05 11:28:39 +02:00
2062868376 #172 - updated style 2022-07-05 11:28:25 +02:00
0d26af30b0 #172 - release note added 2022-07-05 11:27:54 +02:00
dependabot[bot]
902af64833 #5 - (js) Bump vue from 3.2.21 to 3.2.37 (#176)
* #5 - (js) Bump vue from 3.2.21 to 3.2.37

Bumps [vue](https://github.com/vuejs/core) from 3.2.21 to 3.2.37.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/core/compare/v3.2.21...v3.2.37)

---
updated-dependencies:
- dependency-name: vue
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* - npm dependencies update July 2022

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-07-05 08:02:34 +02:00
dependabot[bot]
d1047e8262 #5 - (php) Bump spatie/laravel-ignition from 1.2.3 to 1.3.1 (#175)
* #5 - (php) Bump spatie/laravel-ignition from 1.2.3 to 1.3.1

Bumps [spatie/laravel-ignition](https://github.com/spatie/laravel-ignition) from 1.2.3 to 1.3.1.
- [Release notes](https://github.com/spatie/laravel-ignition/releases)
- [Changelog](https://github.com/spatie/laravel-ignition/blob/main/CHANGELOG.md)
- [Commits](https://github.com/spatie/laravel-ignition/compare/1.2.3...1.3.1)

---
updated-dependencies:
- dependency-name: spatie/laravel-ignition
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* - composer dependencies update July 2022

* - docker-compose.yml update July 2022

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
2022-07-05 08:02:23 +02:00
13 changed files with 569 additions and 595 deletions

View File

@@ -21,3 +21,9 @@ SESSION_DRIVER=array
SESSION_LIFETIME=120
FILESYSTEM_DISK=local
MAIL_MAILER=array
HEROKU_RELEASE_VERSION=v01
HEROKU_SLUG_DESCRIPTION="Dev 643f546"
HEROKU_RELEASE_CREATED_AT=2022-07-04T18:05:46Z
HEROKU_SLUG_COMMIT=643f546142b8a2db342f0ae46f01e61dce03e97c
GITHUB_REPO_URL=https://github.com/blumilksoftware/toby/

View File

@@ -67,3 +67,9 @@ SLACK_ENABLED=true
SLACK_CLIENT_TOKEN=
SLACK_SIGNING_SECRET=
SLACK_DEFAULT_CHANNEL="#general"
HEROKU_RELEASE_VERSION=v01
HEROKU_SLUG_DESCRIPTION="Dev 643f546"
HEROKU_RELEASE_CREATED_AT=2022-07-04T18:05:46Z
HEROKU_SLUG_COMMIT=643f546142b8a2db342f0ae46f01e61dce03e97c
GITHUB_REPO_URL=https://github.com/blumilksoftware/toby/

View File

@@ -25,6 +25,7 @@ class HandleInertiaRequests extends Middleware
"flash" => $this->getFlashData($request),
"years" => $this->getYearsData($request),
"vacationRequestsCount" => $this->getVacationRequestsCount($request),
"deployInformation" => $this->getDeployInformation(),
]);
}
@@ -71,4 +72,15 @@ class HandleInertiaRequests extends Middleware
->count()
: null;
}
protected function getDeployInformation(): Closure
{
return fn(): array => [
"release_version" => config("heroku.release_version"),
"slug_description" => config("heroku.slug_description"),
"release_created_at" => config("heroku.release_created_at"),
"slug_commit" => config("heroku.slug_commit"),
"github_url" => config("heroku.github_url", ""),
];
}
}

View File

@@ -9,7 +9,7 @@
"ext-pdo": "*",
"ext-redis": "*",
"azuyalabs/yasumi": "^2.4",
"barryvdh/laravel-dompdf": "^1.0",
"barryvdh/laravel-dompdf": "^2.0",
"fruitcake/laravel-cors": "^3.0",
"guzzlehttp/guzzle": "^7.0.1",
"inertiajs/inertia-laravel": "^0.6.2",

277
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "c78c5cf9b365c5ca82066e15505079e6",
"content-hash": "73a25b0ebae9d311665f9f662c396b99",
"packages": [
{
"name": "azuyalabs/yasumi",
@@ -81,20 +81,20 @@
},
{
"name": "barryvdh/laravel-dompdf",
"version": "v1.0.2",
"version": "v2.0.0-beta2",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-dompdf.git",
"reference": "de83130d029289e1b59f28b41c314ce1d157b4a0"
"reference": "3c94042e00df5835a1636b478e3ec8a82b8cdfd9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/de83130d029289e1b59f28b41c314ce1d157b4a0",
"reference": "de83130d029289e1b59f28b41c314ce1d157b4a0",
"url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/3c94042e00df5835a1636b478e3ec8a82b8cdfd9",
"reference": "3c94042e00df5835a1636b478e3ec8a82b8cdfd9",
"shasum": ""
},
"require": {
"dompdf/dompdf": "^1.2.1",
"dompdf/dompdf": "^2",
"illuminate/support": "^6|^7|^8|^9",
"php": "^7.2 || ^8.0"
},
@@ -107,7 +107,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "2.0-dev"
},
"laravel": {
"providers": [
@@ -141,7 +141,7 @@
],
"support": {
"issues": "https://github.com/barryvdh/laravel-dompdf/issues",
"source": "https://github.com/barryvdh/laravel-dompdf/tree/v1.0.2"
"source": "https://github.com/barryvdh/laravel-dompdf/tree/v2.0.0-beta2"
},
"funding": [
{
@@ -153,7 +153,7 @@
"type": "github"
}
],
"time": "2022-05-19T15:08:38+00:00"
"time": "2022-06-26T07:00:09+00:00"
},
{
"name": "brick/math",
@@ -459,21 +459,22 @@
},
{
"name": "dompdf/dompdf",
"version": "v1.2.2",
"version": "v2.0.0",
"source": {
"type": "git",
"url": "https://github.com/dompdf/dompdf.git",
"reference": "5031045d9640b38cfc14aac9667470df09c9e090"
"reference": "79573d8b8a141ec8a17312515de8740eed014fa9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/dompdf/dompdf/zipball/5031045d9640b38cfc14aac9667470df09c9e090",
"reference": "5031045d9640b38cfc14aac9667470df09c9e090",
"url": "https://api.github.com/repos/dompdf/dompdf/zipball/79573d8b8a141ec8a17312515de8740eed014fa9",
"reference": "79573d8b8a141ec8a17312515de8740eed014fa9",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-mbstring": "*",
"masterminds/html5": "^2.0",
"phenx/php-font-lib": "^0.5.4",
"phenx/php-svg-lib": "^0.3.3 || ^0.4.0",
"php": "^7.1 || ^8.0"
@@ -522,9 +523,9 @@
"homepage": "https://github.com/dompdf/dompdf",
"support": {
"issues": "https://github.com/dompdf/dompdf/issues",
"source": "https://github.com/dompdf/dompdf/tree/v1.2.2"
"source": "https://github.com/dompdf/dompdf/tree/v2.0.0"
},
"time": "2022-04-27T13:50:54+00:00"
"time": "2022-06-21T21:14:57+00:00"
},
{
"name": "dragonmantank/cron-expression",
@@ -973,16 +974,16 @@
},
{
"name": "google/apiclient",
"version": "v2.12.5",
"version": "v2.12.6",
"source": {
"type": "git",
"url": "https://github.com/googleapis/google-api-php-client.git",
"reference": "eb10f733eb0ebec058776cda206009d01af9f9e3"
"reference": "f92aa126903a9e2da5bd41a280d9633cb249e79e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/eb10f733eb0ebec058776cda206009d01af9f9e3",
"reference": "eb10f733eb0ebec058776cda206009d01af9f9e3",
"url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/f92aa126903a9e2da5bd41a280d9633cb249e79e",
"reference": "f92aa126903a9e2da5bd41a280d9633cb249e79e",
"shasum": ""
},
"require": {
@@ -1037,22 +1038,22 @@
],
"support": {
"issues": "https://github.com/googleapis/google-api-php-client/issues",
"source": "https://github.com/googleapis/google-api-php-client/tree/v2.12.5"
"source": "https://github.com/googleapis/google-api-php-client/tree/v2.12.6"
},
"time": "2022-05-31T14:44:17+00:00"
"time": "2022-06-06T20:00:19+00:00"
},
{
"name": "google/apiclient-services",
"version": "v0.251.0",
"version": "v0.256.0",
"source": {
"type": "git",
"url": "https://github.com/googleapis/google-api-php-client-services.git",
"reference": "73b7a41113bd6b5ae2d42795dbe0d76e0c482782"
"reference": "122e51021eb19b53f831904918460671d1e7259d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/73b7a41113bd6b5ae2d42795dbe0d76e0c482782",
"reference": "73b7a41113bd6b5ae2d42795dbe0d76e0c482782",
"url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/122e51021eb19b53f831904918460671d1e7259d",
"reference": "122e51021eb19b53f831904918460671d1e7259d",
"shasum": ""
},
"require": {
@@ -1081,22 +1082,22 @@
],
"support": {
"issues": "https://github.com/googleapis/google-api-php-client-services/issues",
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.251.0"
"source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.256.0"
},
"time": "2022-05-30T00:56:11+00:00"
"time": "2022-07-04T01:10:37+00:00"
},
{
"name": "google/auth",
"version": "v1.21.0",
"version": "v1.21.1",
"source": {
"type": "git",
"url": "https://github.com/googleapis/google-auth-library-php.git",
"reference": "73392bad2eb6852eea9084b6bbdec752515cb849"
"reference": "aa3b9ca29258ac6347ce3c8937a2418c5d78f840"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/73392bad2eb6852eea9084b6bbdec752515cb849",
"reference": "73392bad2eb6852eea9084b6bbdec752515cb849",
"url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/aa3b9ca29258ac6347ce3c8937a2418c5d78f840",
"reference": "aa3b9ca29258ac6347ce3c8937a2418c5d78f840",
"shasum": ""
},
"require": {
@@ -1139,9 +1140,9 @@
"support": {
"docs": "https://googleapis.github.io/google-auth-library-php/main/",
"issues": "https://github.com/googleapis/google-auth-library-php/issues",
"source": "https://github.com/googleapis/google-auth-library-php/tree/v1.21.0"
"source": "https://github.com/googleapis/google-auth-library-php/tree/v1.21.1"
},
"time": "2022-04-13T20:35:52+00:00"
"time": "2022-05-16T19:34:15+00:00"
},
{
"name": "graham-campbell/result-type",
@@ -1207,22 +1208,22 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "7.4.3",
"version": "7.4.5",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab"
"reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/74a8602c6faec9ef74b7a9391ac82c5e65b1cdab",
"reference": "74a8602c6faec9ef74b7a9391ac82c5e65b1cdab",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
"reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/promises": "^1.5",
"guzzlehttp/psr7": "^1.8.3 || ^2.1",
"guzzlehttp/psr7": "^1.9 || ^2.4",
"php": "^7.2.5 || ^8.0",
"psr/http-client": "^1.0",
"symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -1311,7 +1312,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/7.4.3"
"source": "https://github.com/guzzle/guzzle/tree/7.4.5"
},
"funding": [
{
@@ -1327,7 +1328,7 @@
"type": "tidelift"
}
],
"time": "2022-05-25T13:24:33+00:00"
"time": "2022-06-20T22:16:13+00:00"
},
{
"name": "guzzlehttp/promises",
@@ -1415,16 +1416,16 @@
},
{
"name": "guzzlehttp/psr7",
"version": "2.2.1",
"version": "2.4.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "c94a94f120803a18554c1805ef2e539f8285f9a2"
"reference": "13388f00956b1503577598873fffb5ae994b5737"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/c94a94f120803a18554c1805ef2e539f8285f9a2",
"reference": "c94a94f120803a18554c1805ef2e539f8285f9a2",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737",
"reference": "13388f00956b1503577598873fffb5ae994b5737",
"shasum": ""
},
"require": {
@@ -1448,7 +1449,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.2-dev"
"dev-master": "2.4-dev"
}
},
"autoload": {
@@ -1510,7 +1511,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/2.2.1"
"source": "https://github.com/guzzle/psr7/tree/2.4.0"
},
"funding": [
{
@@ -1526,20 +1527,20 @@
"type": "tidelift"
}
],
"time": "2022-03-20T21:55:58+00:00"
"time": "2022-06-20T21:43:11+00:00"
},
{
"name": "inertiajs/inertia-laravel",
"version": "v0.6.2",
"version": "v0.6.3",
"source": {
"type": "git",
"url": "https://github.com/inertiajs/inertia-laravel.git",
"reference": "75859fb1586c3d37ed8705500b5f43e87eee3cb2"
"reference": "540b953ec383364264f9bd633849db16560a4461"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/inertiajs/inertia-laravel/zipball/75859fb1586c3d37ed8705500b5f43e87eee3cb2",
"reference": "75859fb1586c3d37ed8705500b5f43e87eee3cb2",
"url": "https://api.github.com/repos/inertiajs/inertia-laravel/zipball/540b953ec383364264f9bd633849db16560a4461",
"reference": "540b953ec383364264f9bd633849db16560a4461",
"shasum": ""
},
"require": {
@@ -1587,7 +1588,7 @@
],
"support": {
"issues": "https://github.com/inertiajs/inertia-laravel/issues",
"source": "https://github.com/inertiajs/inertia-laravel/tree/v0.6.2"
"source": "https://github.com/inertiajs/inertia-laravel/tree/v0.6.3"
},
"funding": [
{
@@ -1595,7 +1596,7 @@
"type": "github"
}
],
"time": "2022-05-25T02:00:06+00:00"
"time": "2022-06-27T23:21:15+00:00"
},
{
"name": "intervention/image",
@@ -3138,6 +3139,75 @@
},
"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",
"version": "v0.9.1",
@@ -3732,16 +3802,16 @@
},
{
"name": "paragonie/constant_time_encoding",
"version": "v2.5.0",
"version": "v2.6.3",
"source": {
"type": "git",
"url": "https://github.com/paragonie/constant_time_encoding.git",
"reference": "9229e15f2e6ba772f0c55dd6986c563b937170a8"
"reference": "58c3f47f650c94ec05a151692652a868995d2938"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/9229e15f2e6ba772f0c55dd6986c563b937170a8",
"reference": "9229e15f2e6ba772f0c55dd6986c563b937170a8",
"url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938",
"reference": "58c3f47f650c94ec05a151692652a868995d2938",
"shasum": ""
},
"require": {
@@ -3795,7 +3865,7 @@
"issues": "https://github.com/paragonie/constant_time_encoding/issues",
"source": "https://github.com/paragonie/constant_time_encoding"
},
"time": "2022-01-17T05:32:27+00:00"
"time": "2022-06-14T06:56:20+00:00"
},
{
"name": "paragonie/random_compat",
@@ -4748,16 +4818,16 @@
},
{
"name": "psy/psysh",
"version": "v0.11.5",
"version": "v0.11.6",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
"reference": "c23686f9c48ca202710dbb967df8385a952a2daf"
"reference": "3f5b5f8aaa979fbd0d1783173f4c82ad529fe621"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/c23686f9c48ca202710dbb967df8385a952a2daf",
"reference": "c23686f9c48ca202710dbb967df8385a952a2daf",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/3f5b5f8aaa979fbd0d1783173f4c82ad529fe621",
"reference": "3f5b5f8aaa979fbd0d1783173f4c82ad529fe621",
"shasum": ""
},
"require": {
@@ -4818,9 +4888,9 @@
],
"support": {
"issues": "https://github.com/bobthecow/psysh/issues",
"source": "https://github.com/bobthecow/psysh/tree/v0.11.5"
"source": "https://github.com/bobthecow/psysh/tree/v0.11.6"
},
"time": "2022-05-27T18:03:49+00:00"
"time": "2022-07-03T16:40:23+00:00"
},
{
"name": "rackbeat/laravel-ui-avatars",
@@ -5233,16 +5303,16 @@
},
{
"name": "spatie/laravel-model-states",
"version": "2.3.0",
"version": "2.4.0",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-model-states.git",
"reference": "bfa12486558952eca4d6c81d4dd803b83f065297"
"reference": "976e5dcf9ad98231c5d983bd7c5f1ad17695b13f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/laravel-model-states/zipball/bfa12486558952eca4d6c81d4dd803b83f065297",
"reference": "bfa12486558952eca4d6c81d4dd803b83f065297",
"url": "https://api.github.com/repos/spatie/laravel-model-states/zipball/976e5dcf9ad98231c5d983bd7c5f1ad17695b13f",
"reference": "976e5dcf9ad98231c5d983bd7c5f1ad17695b13f",
"shasum": ""
},
"require": {
@@ -5291,7 +5361,7 @@
"state"
],
"support": {
"source": "https://github.com/spatie/laravel-model-states/tree/2.3.0"
"source": "https://github.com/spatie/laravel-model-states/tree/2.4.0"
},
"funding": [
{
@@ -5303,20 +5373,20 @@
"type": "github"
}
],
"time": "2022-04-21T12:09:37+00:00"
"time": "2022-06-07T08:19:20+00:00"
},
{
"name": "spatie/laravel-package-tools",
"version": "1.11.3",
"version": "1.12.1",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-package-tools.git",
"reference": "baeb3df0ebb3a541394fdaf8cbe6115bf4034a59"
"reference": "09f80fa240d44fafb1c70657c74ee44ffa929357"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/baeb3df0ebb3a541394fdaf8cbe6115bf4034a59",
"reference": "baeb3df0ebb3a541394fdaf8cbe6115bf4034a59",
"url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/09f80fa240d44fafb1c70657c74ee44ffa929357",
"reference": "09f80fa240d44fafb1c70657c74ee44ffa929357",
"shasum": ""
},
"require": {
@@ -5354,7 +5424,7 @@
],
"support": {
"issues": "https://github.com/spatie/laravel-package-tools/issues",
"source": "https://github.com/spatie/laravel-package-tools/tree/1.11.3"
"source": "https://github.com/spatie/laravel-package-tools/tree/1.12.1"
},
"funding": [
{
@@ -5362,7 +5432,7 @@
"type": "github"
}
],
"time": "2022-03-15T20:01:36+00:00"
"time": "2022-06-28T14:29:26+00:00"
},
{
"name": "spatie/laravel-slack-slash-command",
@@ -7799,21 +7869,21 @@
"packages-dev": [
{
"name": "blumilksoftware/codestyle",
"version": "v1.3.0",
"version": "v1.6.0",
"source": {
"type": "git",
"url": "https://github.com/blumilksoftware/codestyle.git",
"reference": "bf694da19f2cd5d0575b8fad585d3570d6785c23"
"reference": "717b521c2a40b3761df013f26aba507a4fb9801e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/blumilksoftware/codestyle/zipball/bf694da19f2cd5d0575b8fad585d3570d6785c23",
"reference": "bf694da19f2cd5d0575b8fad585d3570d6785c23",
"url": "https://api.github.com/repos/blumilksoftware/codestyle/zipball/717b521c2a40b3761df013f26aba507a4fb9801e",
"reference": "717b521c2a40b3761df013f26aba507a4fb9801e",
"shasum": ""
},
"require": {
"friendsofphp/php-cs-fixer": "^3.8.0",
"kubawerlos/php-cs-fixer-custom-fixers": "^3.10.1",
"kubawerlos/php-cs-fixer-custom-fixers": "^3.11.0",
"php": "^8.0"
},
"require-dev": {
@@ -7843,9 +7913,9 @@
"description": "Blumilk codestyle configurator",
"support": {
"issues": "https://github.com/blumilksoftware/codestyle/issues",
"source": "https://github.com/blumilksoftware/codestyle/tree/v1.3.0"
"source": "https://github.com/blumilksoftware/codestyle/tree/v1.6.0"
},
"time": "2022-05-10T09:41:53+00:00"
"time": "2022-06-10T13:08:08+00:00"
},
{
"name": "composer/pcre",
@@ -8067,16 +8137,16 @@
},
{
"name": "doctrine/annotations",
"version": "1.13.2",
"version": "1.13.3",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
"reference": "5b668aef16090008790395c02c893b1ba13f7e08"
"reference": "648b0343343565c4a056bfc8392201385e8d89f0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08",
"reference": "5b668aef16090008790395c02c893b1ba13f7e08",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/648b0343343565c4a056bfc8392201385e8d89f0",
"reference": "648b0343343565c4a056bfc8392201385e8d89f0",
"shasum": ""
},
"require": {
@@ -8088,9 +8158,10 @@
"require-dev": {
"doctrine/cache": "^1.11 || ^2.0",
"doctrine/coding-standard": "^6.0 || ^8.1",
"phpstan/phpstan": "^0.12.20",
"phpstan/phpstan": "^1.4.10 || ^1.8.0",
"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",
"autoload": {
@@ -8133,9 +8204,9 @@
],
"support": {
"issues": "https://github.com/doctrine/annotations/issues",
"source": "https://github.com/doctrine/annotations/tree/1.13.2"
"source": "https://github.com/doctrine/annotations/tree/1.13.3"
},
"time": "2021-08-05T19:00:23+00:00"
"time": "2022-07-02T10:48:51+00:00"
},
{
"name": "doctrine/instantiator",
@@ -8739,16 +8810,16 @@
},
{
"name": "nunomaduro/collision",
"version": "v6.2.0",
"version": "v6.2.1",
"source": {
"type": "git",
"url": "https://github.com/nunomaduro/collision.git",
"reference": "c379636dc50e829edb3a8bcb944a01aa1aed8f25"
"reference": "5f058f7e39278b701e455b3c82ec5298cf001d89"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/c379636dc50e829edb3a8bcb944a01aa1aed8f25",
"reference": "c379636dc50e829edb3a8bcb944a01aa1aed8f25",
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/5f058f7e39278b701e455b3c82ec5298cf001d89",
"reference": "5f058f7e39278b701e455b3c82ec5298cf001d89",
"shasum": ""
},
"require": {
@@ -8760,6 +8831,7 @@
"require-dev": {
"brianium/paratest": "^6.4.1",
"laravel/framework": "^9.7",
"laravel/pint": "^0.2.1",
"nunomaduro/larastan": "^1.0.2",
"nunomaduro/mock-final-classes": "^1.1.0",
"orchestra/testbench": "^7.3.0",
@@ -8822,7 +8894,7 @@
"type": "patreon"
}
],
"time": "2022-04-05T15:31:38+00:00"
"time": "2022-06-27T16:11:16+00:00"
},
{
"name": "phar-io/manifest",
@@ -9599,16 +9671,16 @@
},
{
"name": "phpunit/phpunit",
"version": "9.5.20",
"version": "9.5.21",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
"reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
"reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0e32b76be457de00e83213528f6bb37e2a38fcb1",
"reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1",
"shasum": ""
},
"require": {
@@ -9642,7 +9714,6 @@
"sebastian/version": "^3.0.2"
},
"require-dev": {
"ext-pdo": "*",
"phpspec/prophecy-phpunit": "^2.0.1"
},
"suggest": {
@@ -9686,7 +9757,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.21"
},
"funding": [
{
@@ -9698,7 +9769,7 @@
"type": "github"
}
],
"time": "2022-04-01T12:37:26+00:00"
"time": "2022-06-19T12:14:25+00:00"
},
{
"name": "sebastian/cli-parser",

11
config/heroku.php Normal file
View File

@@ -0,0 +1,11 @@
<?php
declare(strict_types=1);
return [
"release_version" => env("HEROKU_RELEASE_VERSION"),
"slug_description" => env("HEROKU_SLUG_DESCRIPTION"),
"release_created_at" => env("HEROKU_RELEASE_CREATED_AT"),
"slug_commit" => env("HEROKU_SLUG_COMMIT"),
"github_url" => env("GITHUB_REPO_URL"),
];

View File

@@ -2,7 +2,7 @@ version: '3.8'
services:
web:
image: nginx:1.21-alpine
image: nginx:1.23-alpine
container_name: toby-web
working_dir: /application
volumes:
@@ -76,7 +76,7 @@ services:
restart: unless-stopped
node:
image: node:18.1.0-alpine3.14
image: node:18.4.0-alpine3.16
container_name: toby-node
working_dir: /application
volumes:

741
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -13,7 +13,7 @@
"lintf": "./node_modules/.bin/eslint resources/js --ext .js,.vue --fix"
},
"dependencies": {
"@headlessui/vue": "^1.6.4",
"@headlessui/vue": "^1.6.5",
"@heroicons/vue": "^1.0.6",
"@inertiajs/inertia": "^0.11.0",
"@inertiajs/inertia-vue3": "^0.6.0",
@@ -21,27 +21,27 @@
"@tailwindcss/forms": "^0.5.2",
"@tailwindcss/line-clamp": "^0.4.0",
"@tailwindcss/typography": "^0.5.2",
"@vue/compiler-sfc": "^3.2.31",
"@vue/compiler-sfc": "^3.2.37",
"autoprefixer": "^10.4.7",
"axios": "^0.27.2",
"echarts": "^5.3.2",
"echarts": "^5.3.3",
"flatpickr": "^4.6.13",
"laravel-mix": "^6.0.44",
"laravel-mix": "^6.0.49",
"lodash": "^4.17.21",
"luxon": "^2.3.2",
"luxon": "^2.4.0",
"postcss": "^8.4.14",
"tailwindcss": "^3.0.24",
"vue": "3.2.21",
"vue-echarts": "^6.0.2",
"tailwindcss": "^3.1.4",
"vue": "3.2.37",
"vue-echarts": "^6.1.0",
"vue-flatpickr-component": "^9.0.6",
"vue-loader": "^17.0.0",
"vue-material-design-icons": "^5.0.0",
"vue-material-design-icons": "^5.1.1",
"vue-toastification": "^2.0.0-rc.5",
"vue3-popper": "^1.5.0",
"vuedraggable": "^4.1.0"
},
"devDependencies": {
"eslint": "^8.16.0",
"eslint-plugin-vue": "^9.1.0"
"eslint": "^8.19.0",
"eslint-plugin-vue": "^9.1.1"
}
}

View File

@@ -32,5 +32,10 @@
<env name="QUEUE_CONNECTION" value="sync"/>
<env name="SESSION_DRIVER" value="array"/>
<env name="TELESCOPE_ENABLED" value="false"/>
<env name="HEROKU_RELEASE_VERSION" value="v01"/>
<env name="HEROKU_SLUG_DESCRIPTION" value="Dev 643f546"/>
<env name="HEROKU_RELEASE_CREATED_AT" value="2022-07-04T18:05:46Z"/>
<env name="HEROKU_SLUG_COMMIT" value="643f546142b8a2db342f0ae46f01e61dce03e97c"/>
<env name="GITHUB_REPO_URL" value="https://github.com/blumilksoftware/toby"/>
</php>
</phpunit>

View File

@@ -0,0 +1,55 @@
<template>
<div
class="min-w-full p-4 text-xs text-gray-500 flex flex-row gap-x-1"
>
<p class="flex flex-col sm:flex-row gap-x-1">
<span class="font-bold whitespace-nowrap">Wersja:</span>
<span
class="whitespace-nowrap"
:title="`Commit: ${deployInformation.slug_commit ?? 'unset'}`"
>
{{ deployInformation.slug_description ?? 'unset' }} ({{ deployInformation.release_version ?? 'unset' }})
</span>
</p>
<p
v-if="deployInformation.release_created_at"
class="flex flex-col sm:flex-row gap-x-1 border-l-2 border-gray-300 pl-1"
>
<span class="font-bold whitespace-nowrap">Ostatnio zbudowano:</span>
<span>{{ getDate() }}</span>
</p>
<p
v-if="deployInformation.github_url"
class="flex flex-col sm:flex-row gap-x-1 border-l-2 border-gray-300 pl-1"
>
<span class="hidden sm:block font-bold whitespace-nowrap">Repozytorium:</span>
<span class="block sm:hidden font-bold whitespace-nowrap">Repo:</span>
<a
v-if="deployInformation.github_url"
class="text-gray-800 whitespace-nowrap underline hover:no-underline hover:text-blumilk-600"
:href="deployInformation.github_url"
target="_blank"
rel="noopener nofollow noreferrer"
>GitHub</a>
</p>
</div>
</template>
<script setup>
import { DateTime } from 'luxon'
let props = defineProps({
deployInformation: Object,
})
function getDate() {
return DateTime.fromISO(props.deployInformation.release_created_at)
.toLocaleString({
year: 'numeric',
month: '2-digit',
day: '2-digit',
hour: '2-digit',
minute: '2-digit',
})
}
</script>

View File

@@ -1,5 +1,5 @@
<template>
<div class="min-h-full">
<div class="relative min-h-screen">
<MainMenu
:auth="auth"
:years="years"
@@ -9,7 +9,12 @@
<div class="lg:px-4">
<slot />
</div>
<div class="h-8 sm:h-4"></div>
</main>
<DeployInfo
:deploy-information="deployInformation"
class="absolute bottom-0 justify-end"
/>
</div>
</template>
@@ -17,12 +22,14 @@
import MainMenu from '@/Shared/MainMenu'
import { useToast } from 'vue-toastification'
import { watch } from 'vue'
import DeployInfo from '@/Shared/DeployInfo'
const props = defineProps({
flash: Object,
auth: Object,
years: Object,
vacationRequestsCount: Number,
deployInformation: Object,
})
const toast = useToast()

View File

@@ -1,5 +1,17 @@
<template>
<div class="flex flex-col justify-center py-12 min-h-screen bg-blumilk-25 sm:px-6 lg:px-8">
<div class="relative flex flex-col justify-center py-12 min-h-screen bg-blumilk-25 sm:px-6 lg:px-8">
<slot />
<DeployInfo
:deploy-information="deployInformation"
class="absolute left-0 bottom-0 justify-end"
/>
</div>
</template>
<script setup>
import DeployInfo from '@/Shared/DeployInfo'
defineProps({
deployInformation: Object,
})
</script>