- content improvement

- cleaning
- updated style
2022-07-05 13:05:08 +02:00 · 2022-07-05 13:04:58 +02:00 · 2022-07-05 13:04:51 +02:00 · 2022-07-05 13:04:37 +02:00 · 2022-07-05 08:02:34 +02:00 · 2022-07-05 08:02:23 +02:00
11 changed files with 569 additions and 322 deletions
--- a/.env.example
+++ b/.env.example
@@ -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/
--- a/app/Infrastructure/Http/Middleware/HandleInertiaRequests.php
+++ b/app/Infrastructure/Http/Middleware/HandleInertiaRequests.php
@@ -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() => [
+            "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" => preg_replace("/\/$/i", "", config("heroku.github_url", "")),
+        ];
+    }
 }
--- a/composer.json
+++ b/composer.json
@@ -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",
--- a/composer.lock
+++ b/composer.lock
--- a/config/heroku.php
+++ b/config/heroku.php
@@ -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"),
+];
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -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:
--- a/package-lock.json
+++ b/package-lock.json
@@ -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"
            }
--- a/package.json
+++ b/package.json
@@ -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"
    }
 }
--- a/resources/js/Shared/DeployInfo.vue
+++ b/resources/js/Shared/DeployInfo.vue
@@ -0,0 +1,67 @@
+<template>
+  <div
+    :class="{ 'flex-col': isVertical(), 'flex-row': isHorizontal() }"
+    class="min-w-full p-4 text-xs text-gray-500 flex gap-x-1"
+  >
+    <p class="flex flex-row gap-x-1">
+      <strong>Wersja:</strong>
+      <span
+        :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-row gap-x-1"
+      :class="{ 'border-l-2 border-gray-300 pl-1': isHorizontal() }"
+    >
+      <strong>Ostatnio zbudowano:</strong>
+      <span>{{ getDate() }}</span>
+    </p>
+    <p
+      v-if="deployInformation.github_url"
+      :class="{ 'border-l-2 border-gray-300 pl-1': isHorizontal(), 'flex flex-row gap-x-1': isVertical() }"
+    >
+      <strong v-if="isVertical()">Repozytorium:</strong>
+      <a
+        v-if="deployInformation.github_url"
+        class="text-gray-800 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,
+  layout: {
+    type: String,
+    default: 'horizontal',
+  },
+})
+
+function isVertical() {
+  return props.layout === 'vertical'
+}
+
+function isHorizontal() {
+  return props.layout === 'horizontal'
+}
+
+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>
--- a/resources/js/Shared/Layout/AppLayout.vue
+++ b/resources/js/Shared/Layout/AppLayout.vue
@@ -9,6 +9,9 @@
      <div class="lg:px-4">
        <slot />
      </div>
+      <DeployInfo
+        :deploy-information="deployInformation"
+      />
    </main>
  </div>
 </template>
@@ -17,12 +20,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()
--- a/resources/js/Shared/Layout/GuestLayout.vue
+++ b/resources/js/Shared/Layout/GuestLayout.vue
@@ -1,5 +1,18 @@
 <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"
+      layout="vertical"
+      class="absolute right-0 bottom-0"
+    />
  </div>
 </template>
+
+<script setup>
+import DeployInfo from '@/Shared/DeployInfo'
+
+defineProps({
+  deployInformation: Object,
+})
+</script>
Author	SHA1	Message	Date
Kamil Niemczycki	26220f1025	- content improvement	2022-07-05 13:05:08 +02:00
Kamil Niemczycki	e39827df20	- cleaning	2022-07-05 13:04:58 +02:00
Kamil Niemczycki	b64f2ce269	- updated style	2022-07-05 13:04:51 +02:00
Kamil Niemczycki	600a1a369f	- release note added	2022-07-05 13:04:37 +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