9 Commits

Author SHA1 Message Date
c04281b050 Merge remote-tracking branch 'blumilk/main' into #152-dashboard-tables 2022-07-06 14:37:31 +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
043217e9d4 - fixed overflow 2022-07-04 19:28:13 +02:00
9e47c7cb28 #152 - updated vacation limits 2022-07-04 11:41:59 +02:00
e6f4d0e78c #152 - updated calendar view 2022-07-04 11:04:43 +02:00
8dc487a133 #152 - updated MonthlyUsage 2022-07-04 11:04:14 +02:00
5f0d6b5af3 #152 - updated header in calendar 2022-07-04 11:00:35 +02:00
f755e1e0db #152 - updated calendar 2022-07-04 11:00:10 +02:00
16 changed files with 523 additions and 391 deletions

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",

508
composer.lock generated

File diff suppressed because it is too large Load Diff

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:

241
package-lock.json generated
View File

@@ -5,7 +5,7 @@
"packages": {
"": {
"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",
@@ -13,28 +13,28 @@
"@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",
"tailwindcss": "^3.1.4",
"vue": "3.2.37",
"vue-echarts": "^6.0.2",
"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"
}
},
"node_modules/@ampproject/remapping": {
@@ -1670,9 +1670,9 @@
}
},
"node_modules/@headlessui/vue": {
"version": "1.6.4",
"resolved": "https://registry.npmjs.org/@headlessui/vue/-/vue-1.6.4.tgz",
"integrity": "sha512-axZMcfRLNuwHESPMgDb0Vj7xxlNPmsPl77pvoRZGzJh7lRdRic9kC/qbVM8G36OpIJRZzqrlADLQ2JIObhQjBg==",
"version": "1.6.5",
"resolved": "https://registry.npmjs.org/@headlessui/vue/-/vue-1.6.5.tgz",
"integrity": "sha512-C/BeTVuowTDLkGgUd6UfiPZVDLdR7OTnd8o4wF37Ub9Js1uhQ3XSTfitdZvlJALUqeQ30j+5Hk3KyjVDLQ3GYQ==",
"engines": {
"node": ">=10"
},
@@ -2588,9 +2588,9 @@
}
},
"node_modules/arg": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/arg/-/arg-5.0.1.tgz",
"integrity": "sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA=="
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
"integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="
},
"node_modules/argparse": {
"version": "2.0.1",
@@ -3851,7 +3851,7 @@
"node_modules/defined": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
"integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM="
"integrity": "sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ=="
},
"node_modules/delayed-stream": {
"version": "1.0.0",
@@ -3893,13 +3893,13 @@
"integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
},
"node_modules/detective": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz",
"integrity": "sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==",
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz",
"integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==",
"dependencies": {
"acorn-node": "^1.6.1",
"acorn-node": "^1.8.2",
"defined": "^1.0.0",
"minimist": "^1.1.1"
"minimist": "^1.2.6"
},
"bin": {
"detective": "bin/detective.js"
@@ -4083,12 +4083,12 @@
"integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="
},
"node_modules/echarts": {
"version": "5.3.2",
"resolved": "https://registry.npmjs.org/echarts/-/echarts-5.3.2.tgz",
"integrity": "sha512-LWCt7ohOKdJqyiBJ0OGBmE9szLdfA9sGcsMEi+GGoc6+Xo75C+BkcT/6NNGRHAWtnQl2fNow05AQjznpap28TQ==",
"version": "5.3.3",
"resolved": "https://registry.npmjs.org/echarts/-/echarts-5.3.3.tgz",
"integrity": "sha512-BRw2serInRwO5SIwRviZ6Xgm5Lb7irgz+sLiFMmy/HOaf4SQ+7oYqxKzRHAKp4xHQ05AuHw1xvoQWJjDQq/FGw==",
"dependencies": {
"tslib": "2.3.0",
"zrender": "5.3.1"
"zrender": "5.3.2"
}
},
"node_modules/ee-first": {
@@ -4211,9 +4211,9 @@
}
},
"node_modules/eslint": {
"version": "8.16.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz",
"integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==",
"version": "8.19.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.19.0.tgz",
"integrity": "sha512-SXOPj3x9VKvPe81TjjUJCYlV4oJjQw68Uek+AM0X4p+33dj2HY5bpTZOgnQHcG2eAm1mtCU9uNMnJi7exU/kYw==",
"dev": true,
"dependencies": {
"@eslint/eslintrc": "^1.3.0",
@@ -4263,9 +4263,9 @@
}
},
"node_modules/eslint-plugin-vue": {
"version": "9.1.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.1.0.tgz",
"integrity": "sha512-EPCeInPicQ/YyfOWJDr1yfEeSNoFCMzUus107lZyYi37xejdOolNzS5MXGXp8+9bkoKZMdv/1AcZzQebME6r+g==",
"version": "9.1.1",
"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.1.1.tgz",
"integrity": "sha512-W9n5PB1X2jzC7CK6riG0oAcxjmKrjTF6+keL1rni8n57DZeilx/Fulz+IRJK3lYseLNAygN0I62L7DvioW40Tw==",
"dev": true,
"dependencies": {
"eslint-utils": "^3.0.0",
@@ -5719,9 +5719,9 @@
}
},
"node_modules/laravel-mix": {
"version": "6.0.44",
"resolved": "https://registry.npmjs.org/laravel-mix/-/laravel-mix-6.0.44.tgz",
"integrity": "sha512-yoszJ2cbISW21ljIkWnx/NIUaBZuKjhk9j9SbSbJi4uB6V8sHv/5SF3fQV50jlKfMOSdXdvdYxYzT9CM5ZBxAw==",
"version": "6.0.49",
"resolved": "https://registry.npmjs.org/laravel-mix/-/laravel-mix-6.0.49.tgz",
"integrity": "sha512-bBMFpFjp26XfijPvY5y9zGKud7VqlyOE0OWUcPo3vTBY5asw8LTjafAbee1dhfLz6PWNqDziz69CP78ELSpfKw==",
"dependencies": {
"@babel/core": "^7.15.8",
"@babel/plugin-proposal-object-rest-spread": "^7.15.6",
@@ -6669,6 +6669,14 @@
"url": "https://github.com/sponsors/jonschlinkert"
}
},
"node_modules/pify": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/pkg-dir": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
@@ -6790,6 +6798,22 @@
"postcss": "^8.2.15"
}
},
"node_modules/postcss-import": {
"version": "14.1.0",
"resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.1.0.tgz",
"integrity": "sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==",
"dependencies": {
"postcss-value-parser": "^4.0.0",
"read-cache": "^1.0.0",
"resolve": "^1.1.7"
},
"engines": {
"node": ">=10.0.0"
},
"peerDependencies": {
"postcss": "^8.0.0"
}
},
"node_modules/postcss-js": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.0.tgz",
@@ -7418,6 +7442,14 @@
"node": ">= 0.8"
}
},
"node_modules/read-cache": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
"integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
"dependencies": {
"pify": "^2.3.0"
}
},
"node_modules/readable-stream": {
"version": "2.3.7",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -8258,14 +8290,14 @@
}
},
"node_modules/tailwindcss": {
"version": "3.0.24",
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.24.tgz",
"integrity": "sha512-H3uMmZNWzG6aqmg9q07ZIRNIawoiEcNFKDfL+YzOPuPsXuDXxJxB9icqzLgdzKNwjG3SAro2h9SYav8ewXNgig==",
"version": "3.1.4",
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.1.4.tgz",
"integrity": "sha512-NrxbFV4tYsga/hpWbRyUfIaBrNMXDxx5BsHgBS4v5tlyjf+sDsgBg5m9OxjrXIqAS/uR9kicxLKP+bEHI7BSeQ==",
"dependencies": {
"arg": "^5.0.1",
"arg": "^5.0.2",
"chokidar": "^3.5.3",
"color-name": "^1.1.4",
"detective": "^5.2.0",
"detective": "^5.2.1",
"didyoumean": "^1.2.2",
"dlv": "^1.1.3",
"fast-glob": "^3.2.11",
@@ -8275,7 +8307,8 @@
"normalize-path": "^3.0.0",
"object-hash": "^3.0.0",
"picocolors": "^1.0.0",
"postcss": "^8.4.12",
"postcss": "^8.4.14",
"postcss-import": "^14.1.0",
"postcss-js": "^4.0.0",
"postcss-load-config": "^3.1.4",
"postcss-nested": "5.0.6",
@@ -8650,13 +8683,13 @@
}
},
"node_modules/vue-echarts": {
"version": "6.0.3",
"resolved": "https://registry.npmjs.org/vue-echarts/-/vue-echarts-6.0.3.tgz",
"integrity": "sha512-Nu+qb+szmBFCiVmNSZclquRx2lONGxfJXeppXODBYCl+KAdsP2TIaDwO2wfEFqU5jyxaL4b/qV7IYxswESTSFw==",
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/vue-echarts/-/vue-echarts-6.1.0.tgz",
"integrity": "sha512-UkIUX/QNRVgRJ/zPMmYxIT8TRcgo8LIsropb+bQhfJ4uUpHgpwjLy5B/9NVOeFniIrAT8/3SV3JthVbmF4wUqw==",
"hasInstallScript": true,
"dependencies": {
"resize-detector": "^0.3.0",
"vue-demi": "^0.12.1"
"vue-demi": "^0.12.5"
},
"peerDependencies": {
"@vue/composition-api": "^1.0.5",
@@ -8746,9 +8779,9 @@
}
},
"node_modules/vue-material-design-icons": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-5.0.0.tgz",
"integrity": "sha512-lYSJFW/TyQqmg7MvUbEB8ua1mwWy/v8qve7QJuA/UWUAXC4/yVUdAm4pg/sM9+k5n7VLckBv6ucOROuGBsGPDQ=="
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-5.1.1.tgz",
"integrity": "sha512-f2M4+7GWIwrg106KJ9a4BU1G5kOxvemIuK1ZDkIdh3ehAJ0vvln7/5PZJ8u6ka4VWV8oA+26mBYSDbS1dpq05w=="
},
"node_modules/vue-style-loader": {
"version": "4.1.3",
@@ -9368,9 +9401,9 @@
}
},
"node_modules/zrender": {
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/zrender/-/zrender-5.3.1.tgz",
"integrity": "sha512-7olqIjy0gWfznKr6vgfnGBk7y4UtdMvdwFmK92vVQsQeDPyzkHW1OlrLEKg6GHz1W5ePf0FeN1q2vkl/HFqhXw==",
"version": "5.3.2",
"resolved": "https://registry.npmjs.org/zrender/-/zrender-5.3.2.tgz",
"integrity": "sha512-8IiYdfwHj2rx0UeIGZGGU4WEVSDEdeVCaIg/fomejg1Xu6OifAL1GVzIPHg2D+MyUkbNgPWji90t0a8IDk+39w==",
"dependencies": {
"tslib": "2.3.0"
}
@@ -10500,9 +10533,9 @@
}
},
"@headlessui/vue": {
"version": "1.6.4",
"resolved": "https://registry.npmjs.org/@headlessui/vue/-/vue-1.6.4.tgz",
"integrity": "sha512-axZMcfRLNuwHESPMgDb0Vj7xxlNPmsPl77pvoRZGzJh7lRdRic9kC/qbVM8G36OpIJRZzqrlADLQ2JIObhQjBg==",
"version": "1.6.5",
"resolved": "https://registry.npmjs.org/@headlessui/vue/-/vue-1.6.5.tgz",
"integrity": "sha512-C/BeTVuowTDLkGgUd6UfiPZVDLdR7OTnd8o4wF37Ub9Js1uhQ3XSTfitdZvlJALUqeQ30j+5Hk3KyjVDLQ3GYQ==",
"requires": {}
},
"@heroicons/vue": {
@@ -11300,9 +11333,9 @@
}
},
"arg": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/arg/-/arg-5.0.1.tgz",
"integrity": "sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA=="
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
"integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="
},
"argparse": {
"version": "2.0.1",
@@ -12267,7 +12300,7 @@
"defined": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
"integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM="
"integrity": "sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ=="
},
"delayed-stream": {
"version": "1.0.0",
@@ -12299,13 +12332,13 @@
"integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
},
"detective": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz",
"integrity": "sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==",
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz",
"integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==",
"requires": {
"acorn-node": "^1.6.1",
"acorn-node": "^1.8.2",
"defined": "^1.0.0",
"minimist": "^1.1.1"
"minimist": "^1.2.6"
}
},
"didyoumean": {
@@ -12443,12 +12476,12 @@
"integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="
},
"echarts": {
"version": "5.3.2",
"resolved": "https://registry.npmjs.org/echarts/-/echarts-5.3.2.tgz",
"integrity": "sha512-LWCt7ohOKdJqyiBJ0OGBmE9szLdfA9sGcsMEi+GGoc6+Xo75C+BkcT/6NNGRHAWtnQl2fNow05AQjznpap28TQ==",
"version": "5.3.3",
"resolved": "https://registry.npmjs.org/echarts/-/echarts-5.3.3.tgz",
"integrity": "sha512-BRw2serInRwO5SIwRviZ6Xgm5Lb7irgz+sLiFMmy/HOaf4SQ+7oYqxKzRHAKp4xHQ05AuHw1xvoQWJjDQq/FGw==",
"requires": {
"tslib": "2.3.0",
"zrender": "5.3.1"
"zrender": "5.3.2"
}
},
"ee-first": {
@@ -12546,9 +12579,9 @@
"dev": true
},
"eslint": {
"version": "8.16.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz",
"integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==",
"version": "8.19.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.19.0.tgz",
"integrity": "sha512-SXOPj3x9VKvPe81TjjUJCYlV4oJjQw68Uek+AM0X4p+33dj2HY5bpTZOgnQHcG2eAm1mtCU9uNMnJi7exU/kYw==",
"dev": true,
"requires": {
"@eslint/eslintrc": "^1.3.0",
@@ -12589,9 +12622,9 @@
}
},
"eslint-plugin-vue": {
"version": "9.1.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.1.0.tgz",
"integrity": "sha512-EPCeInPicQ/YyfOWJDr1yfEeSNoFCMzUus107lZyYi37xejdOolNzS5MXGXp8+9bkoKZMdv/1AcZzQebME6r+g==",
"version": "9.1.1",
"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.1.1.tgz",
"integrity": "sha512-W9n5PB1X2jzC7CK6riG0oAcxjmKrjTF6+keL1rni8n57DZeilx/Fulz+IRJK3lYseLNAygN0I62L7DvioW40Tw==",
"dev": true,
"requires": {
"eslint-utils": "^3.0.0",
@@ -13636,9 +13669,9 @@
"integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ=="
},
"laravel-mix": {
"version": "6.0.44",
"resolved": "https://registry.npmjs.org/laravel-mix/-/laravel-mix-6.0.44.tgz",
"integrity": "sha512-yoszJ2cbISW21ljIkWnx/NIUaBZuKjhk9j9SbSbJi4uB6V8sHv/5SF3fQV50jlKfMOSdXdvdYxYzT9CM5ZBxAw==",
"version": "6.0.49",
"resolved": "https://registry.npmjs.org/laravel-mix/-/laravel-mix-6.0.49.tgz",
"integrity": "sha512-bBMFpFjp26XfijPvY5y9zGKud7VqlyOE0OWUcPo3vTBY5asw8LTjafAbee1dhfLz6PWNqDziz69CP78ELSpfKw==",
"requires": {
"@babel/core": "^7.15.8",
"@babel/plugin-proposal-object-rest-spread": "^7.15.6",
@@ -14363,6 +14396,11 @@
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
},
"pify": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="
},
"pkg-dir": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
@@ -14433,6 +14471,16 @@
"integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
"requires": {}
},
"postcss-import": {
"version": "14.1.0",
"resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.1.0.tgz",
"integrity": "sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==",
"requires": {
"postcss-value-parser": "^4.0.0",
"read-cache": "^1.0.0",
"resolve": "^1.1.7"
}
},
"postcss-js": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.0.tgz",
@@ -14815,6 +14863,14 @@
}
}
},
"read-cache": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
"integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
"requires": {
"pify": "^2.3.0"
}
},
"readable-stream": {
"version": "2.3.7",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -15461,14 +15517,14 @@
}
},
"tailwindcss": {
"version": "3.0.24",
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.24.tgz",
"integrity": "sha512-H3uMmZNWzG6aqmg9q07ZIRNIawoiEcNFKDfL+YzOPuPsXuDXxJxB9icqzLgdzKNwjG3SAro2h9SYav8ewXNgig==",
"version": "3.1.4",
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.1.4.tgz",
"integrity": "sha512-NrxbFV4tYsga/hpWbRyUfIaBrNMXDxx5BsHgBS4v5tlyjf+sDsgBg5m9OxjrXIqAS/uR9kicxLKP+bEHI7BSeQ==",
"requires": {
"arg": "^5.0.1",
"arg": "^5.0.2",
"chokidar": "^3.5.3",
"color-name": "^1.1.4",
"detective": "^5.2.0",
"detective": "^5.2.1",
"didyoumean": "^1.2.2",
"dlv": "^1.1.3",
"fast-glob": "^3.2.11",
@@ -15478,7 +15534,8 @@
"normalize-path": "^3.0.0",
"object-hash": "^3.0.0",
"picocolors": "^1.0.0",
"postcss": "^8.4.12",
"postcss": "^8.4.14",
"postcss-import": "^14.1.0",
"postcss-js": "^4.0.0",
"postcss-load-config": "^3.1.4",
"postcss-nested": "5.0.6",
@@ -15758,12 +15815,12 @@
}
},
"vue-echarts": {
"version": "6.0.3",
"resolved": "https://registry.npmjs.org/vue-echarts/-/vue-echarts-6.0.3.tgz",
"integrity": "sha512-Nu+qb+szmBFCiVmNSZclquRx2lONGxfJXeppXODBYCl+KAdsP2TIaDwO2wfEFqU5jyxaL4b/qV7IYxswESTSFw==",
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/vue-echarts/-/vue-echarts-6.1.0.tgz",
"integrity": "sha512-UkIUX/QNRVgRJ/zPMmYxIT8TRcgo8LIsropb+bQhfJ4uUpHgpwjLy5B/9NVOeFniIrAT8/3SV3JthVbmF4wUqw==",
"requires": {
"resize-detector": "^0.3.0",
"vue-demi": "^0.12.1"
"vue-demi": "^0.12.5"
},
"dependencies": {
"vue-demi": {
@@ -15808,9 +15865,9 @@
}
},
"vue-material-design-icons": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-5.0.0.tgz",
"integrity": "sha512-lYSJFW/TyQqmg7MvUbEB8ua1mwWy/v8qve7QJuA/UWUAXC4/yVUdAm4pg/sM9+k5n7VLckBv6ucOROuGBsGPDQ=="
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-5.1.1.tgz",
"integrity": "sha512-f2M4+7GWIwrg106KJ9a4BU1G5kOxvemIuK1ZDkIdh3ehAJ0vvln7/5PZJ8u6ka4VWV8oA+26mBYSDbS1dpq05w=="
},
"vue-style-loader": {
"version": "4.1.3",
@@ -16242,9 +16299,9 @@
"integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="
},
"zrender": {
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/zrender/-/zrender-5.3.1.tgz",
"integrity": "sha512-7olqIjy0gWfznKr6vgfnGBk7y4UtdMvdwFmK92vVQsQeDPyzkHW1OlrLEKg6GHz1W5ePf0FeN1q2vkl/HFqhXw==",
"version": "5.3.2",
"resolved": "https://registry.npmjs.org/zrender/-/zrender-5.3.2.tgz",
"integrity": "sha512-8IiYdfwHj2rx0UeIGZGGU4WEVSDEdeVCaIg/fomejg1Xu6OifAL1GVzIPHg2D+MyUkbNgPWji90t0a8IDk+39w==",
"requires": {
"tslib": "2.3.0"
}

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",
"tailwindcss": "^3.1.4",
"vue": "3.2.37",
"vue-echarts": "^6.0.2",
"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

@@ -55,18 +55,20 @@
</div>
</div>
<div class="overflow-x-auto">
<table class="w-full text-sm text-center border border-gray-300">
<table class="w-full text-sm text-center border-y border-r border-gray-300">
<thead>
<tr>
<th class="py-2 w-64 text-lg font-semibold text-gray-800 border border-gray-300">
<th
class="py-2 w-64 text-lg font-semibold text-gray-800 border-y border-gray-300 bg-white sticky left-0 sticky-border"
>
<div class="flex justify-center items-center">
{{ selectedMonth.name }} {{ years.selected.year }}
{{ selectedMonth.name }}
</div>
</th>
<th
v-for="day in calendar"
:key="day.dayOfMonth"
class="p-2 text-lg font-semibold text-gray-900 border border-gray-300"
class="p-2 text-lg font-semibold text-gray-900 border second:border-l-0 border-gray-300"
style="min-width: 46px;"
:class="{ 'bg-red-100 text-red-800': day.isWeekend || day.isHoliday, 'text-blumilk-600 bg-blumilk-25': day.isToday }"
>
@@ -84,22 +86,28 @@
v-for="user in users.data"
:key="user.id"
>
<th class="p-2 border border-gray-300">
<th
class="p-2 border-y border-gray-300 bg-white sticky left-0 sticky-border"
>
<div class="flex justify-start items-center">
<span class="inline-flex justify-center items-center w-8 h-8 rounded-full">
<img :src="user.avatar">
</span>
<div class="ml-3">
<div class="text-sm font-medium text-gray-900 truncate">
{{ user.name }}
</div>
<div class="ml-3 flex items-start flex-col-reverse md:flex-row">
<span
v-for="split in user.name.split(' ', 2)"
:key="split"
class="text-sm first:text-xs md:first:text-sm font-medium text-gray-900 truncate first:mr-1"
>
{{ split }}
</span>
</div>
</div>
</th>
<td
v-for="day in calendar"
:key="day.dayOfMonth"
class="border border-gray-300"
class="border second:border-l-0 border-gray-300"
:class="{ 'bg-blumilk-25': day.isToday, 'bg-red-100': day.isWeekend || day.isHoliday }"
@mouseover="setActiveDay(user.id + '+' + day.date)"
@mouseleave="unsetActiveDay"
@@ -176,3 +184,10 @@ function linkParameters(user, day) {
return props.can.createOnBehalfOfEmployee ? { user: user.id, from_date: day.date } : { from_date: day.date }
}
</script>
<style lang="css">
.sticky-border {
box-shadow: inset -1px 0 rgb(209 213 219 / 1),
inset 1px 0 rgb(209 213 219 / 1);
}
</style>

View File

@@ -17,7 +17,7 @@
</div>
</div>
<div class="border-t border-gray-200">
<div class="overflow-auto xl:overflow-visible">
<div class="overflow-x-auto">
<table class="min-w-full divide-y divide-gray-200">
<thead class="bg-gray-50">
<tr>

View File

@@ -19,7 +19,7 @@
</div>
</div>
<div class="border-t border-gray-200">
<div class="overflow-auto xl:overflow-visible">
<div class="overflow-x-auto">
<table class="min-w-full divide-y divide-gray-200">
<thead class="bg-gray-50">
<tr>

View File

@@ -9,11 +9,11 @@
</div>
</div>
<div class="border-t border-gray-200">
<div class="overflow-x-auto overflow-y-hidden xl:overflow-x-visible">
<div class="overflow-x-auto">
<table class="min-w-full divide-y divide-gray-200">
<thead class="bg-gray-50">
<tr>
<th class="py-3 px-6 w-64 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase">
<th class="py-3 px-6 w-64 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase bg-gray-50 sticky -left-1">
Pracownik
</th>
<th
@@ -38,7 +38,7 @@
:key="item.user.id"
class="hover:bg-blumilk-25"
>
<th class="p-4 text-sm font-semibold text-gray-500 capitalize whitespace-nowrap">
<th class="p-4 text-sm font-semibold text-gray-500 capitalize whitespace-nowrap bg-white sticky -left-1">
<div class="flex justify-start items-center">
<span class="inline-flex justify-center items-center w-10 h-10 rounded-full">
<img
@@ -46,12 +46,14 @@
:src="item.user.avatar"
>
</span>
<div class="ml-3">
<div
class="text-sm font-medium text-gray-900 whitespace-nowrap"
<div class="ml-3 flex items-start flex-col-reverse md:flex-row">
<span
v-for="split in item.user.name.split(' ', 2)"
:key="split"
class="text-sm first:text-xs md:first:text-sm font-medium text-gray-900 truncate first:mr-1"
>
{{ item.user.name }}
</div>
{{ split }}
</span>
</div>
</div>
</th>

View File

@@ -15,7 +15,7 @@
</div>
</div>
<div class="border-t border-gray-200">
<div class="overflow-auto xl:overflow-visible">
<div class="overflow-x-auto">
<table class="min-w-full divide-y divide-gray-200">
<thead class="bg-gray-50">
<tr>

View File

@@ -18,7 +18,7 @@
</div>
</div>
<div class="border-t border-gray-200">
<div class="overflow-auto xl:overflow-visible">
<div class="overflow-x-auto">
<table class="min-w-full divide-y divide-gray-200">
<thead class="bg-gray-50">
<tr>

View File

@@ -30,7 +30,7 @@
>
</div>
</div>
<div class="overflow-auto xl:overflow-visible">
<div class="overflow-x-auto">
<table class="min-w-full divide-y divide-gray-200">
<thead class="bg-gray-50">
<tr>

View File

@@ -10,13 +10,13 @@
</div>
<div class="border-t border-gray-200">
<form @submit.prevent="submitVacationDays">
<div class="overflow-auto xl:overflow-visible">
<div class="overflow-x-auto">
<table class="min-w-full border-b divide-y divide-gray-200">
<thead class="bg-gray-50">
<tr>
<th
scope="col"
class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap bg-gray-50 sticky -left-1"
>
Imię i nazwisko
</th>
@@ -52,8 +52,8 @@
:key="item.id"
class="hover:bg-blumilk-25"
>
<td class="p-4 text-sm text-gray-500 whitespace-nowrap">
<div class="flex">
<td class="p-4 text-sm text-gray-500 whitespace-nowrap bg-white sticky -left-1 z-10">
<div class="flex justify-start items-center">
<span class="inline-flex justify-center items-center w-10 h-10 rounded-full">
<img
class="w-10 h-10 rounded-full"
@@ -61,10 +61,16 @@
>
</span>
<div class="ml-3">
<p class="text-sm font-medium text-gray-900 break-all">
{{ item.user.name }}
<p class="flex items-start flex-col-reverse md:flex-row">
<span
v-for="split in item.user.name.split(' ', 2)"
:key="split"
class="first:text-xs md:first:text-sm font-medium text-gray-900 truncate first:mr-1"
>
{{ split }}
</span>
</p>
<p class="text-sm text-gray-500 break-all">
<p class="hidden md:block text-sm text-gray-500 break-all">
{{ item.user.email }}
</p>
</div>

View File

@@ -88,7 +88,7 @@
</Listbox>
</div>
</div>
<div class="overflow-auto xl:overflow-visible">
<div class="overflow-x-auto">
<table class="min-w-full divide-y divide-gray-200">
<thead class="bg-gray-50">
<tr>

View File

@@ -53,7 +53,7 @@
leave-to-class="opacity-0"
>
<ListboxOptions
class="overflow-auto absolute z-10 py-1 mt-1 w-full max-w-lg max-h-60 text-base bg-white rounded-md focus:outline-none ring-1 ring-black ring-opacity-5 shadow-lg sm:text-sm"
class="overflow-x-auto absolute z-10 py-1 mt-1 w-full max-w-lg max-h-60 text-base bg-white rounded-md focus:outline-none ring-1 ring-black ring-opacity-5 shadow-lg sm:text-sm"
>
<ListboxOption
v-slot="{ active }"
@@ -237,51 +237,17 @@
</Listbox>
</div>
</div>
<div class="overflow-auto xl:overflow-visible">
<div class="overflow-x-auto">
<table class="min-w-full divide-y divide-gray-200">
<thead class="bg-gray-50">
<tr>
<th
v-for="head in headers"
:key="head"
scope="col"
class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
>
Numer
</th>
<th
scope="col"
class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
>
Pracownik
</th>
<th
scope="col"
class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
>
Rodzaj wniosku
</th>
<th
scope="col"
class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
>
Od
</th>
<th
scope="col"
class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
>
Do
</th>
<th
scope="col"
class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
>
Dni urlopu
</th>
<th
scope="col"
class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
>
Status
{{ head }}
</th>
<th scope="col" />
</tr>
@@ -381,6 +347,8 @@ const props = defineProps({
types: Object,
})
const headers = ['Numer', 'Pracownik', 'Rodzaj wniosku', 'Od', 'Do', 'Dni urlopu', 'Status']
const statuses = [
{
name: 'Wszystkie',

View File

@@ -1,4 +1,5 @@
const defaultTheme = require('tailwindcss/defaultTheme')
const plugin = require('tailwindcss/plugin')
module.exports = {
content: [
@@ -31,5 +32,12 @@ module.exports = {
require('@tailwindcss/forms'),
require('@tailwindcss/typography'),
require('@tailwindcss/line-clamp'),
plugin(function({ addVariant, e }) {
addVariant('second', ({ modifySelectors, separator }) => {
modifySelectors(({ className }) => {
return `.${e(`second${separator}${className}`)}:nth-child(2)`
})
})
}),
],
}