- updated style

app/Infrastructure/Http/Middleware/HandleInertiaRequests.php

@@ -6,6 +6,7 @@ namespace Toby\Infrastructure\Http\Middleware;
 
 use Closure;
 use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
 use Inertia\Middleware;
 use Toby\Domain\VacationRequestStatesRetriever;
 use Toby\Eloquent\Helpers\YearPeriodRetriever;
@@ -73,12 +74,14 @@ class HandleInertiaRequests extends Middleware
         : null;
     }
 
-    protected function getDeployInformation(): Closure
+    protected function getDeployInformation(): array
     {
-        return fn() => [
+        $releaseDate = config("heroku.release_created_at");
+
+        return [
             "release_version" => config("heroku.release_version"),
             "slug_description" => config("heroku.slug_description"),
-            "release_created_at" => config("heroku.release_created_at"),
+            "release_created_at" => $releaseDate ? Carbon::parse($releaseDate)->format('Y-m-d H:i:s') : null,
             "slug_commit" => config("heroku.slug_commit"),
             "github_url" => preg_replace("/\/$/i", "", config("heroku.github_url", "")),
         ];

composer.json

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

config/heroku.php

@@ -1,11 +1,11 @@
 <?php
-
+
-declare(strict_types=1);
+declare(strict_types=1);
-
+
-return [
+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"),
+    "github_url" => env("GITHUB_REPO_URL")
-];
+];

docker-compose.yml

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

package.json

@@ -13,7 +13,7 @@
         "lintf": "./node_modules/.bin/eslint resources/js --ext .js,.vue --fix"
     },
     "dependencies": {
-        "@headlessui/vue": "^1.6.5",
+        "@headlessui/vue": "^1.6.4",
         "@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.37",
+        "@vue/compiler-sfc": "^3.2.31",
         "autoprefixer": "^10.4.7",
         "axios": "^0.27.2",
-        "echarts": "^5.3.3",
+        "echarts": "^5.3.2",
         "flatpickr": "^4.6.13",
-        "laravel-mix": "^6.0.49",
+        "laravel-mix": "^6.0.44",
         "lodash": "^4.17.21",
-        "luxon": "^2.4.0",
+        "luxon": "^2.3.2",
         "postcss": "^8.4.14",
-        "tailwindcss": "^3.1.4",
+        "tailwindcss": "^3.0.24",
-        "vue": "3.2.37",
+        "vue": "3.2.21",
-        "vue-echarts": "^6.1.0",
+        "vue-echarts": "^6.0.2",
         "vue-flatpickr-component": "^9.0.6",
         "vue-loader": "^17.0.0",
-        "vue-material-design-icons": "^5.1.1",
+        "vue-material-design-icons": "^5.0.0",
         "vue-toastification": "^2.0.0-rc.5",
         "vue3-popper": "^1.5.0",
         "vuedraggable": "^4.1.0"
     },
     "devDependencies": {
-        "eslint": "^8.19.0",
+        "eslint": "^8.16.0",
-        "eslint-plugin-vue": "^9.1.1"
+        "eslint-plugin-vue": "^9.1.0"
     }
 }

resources/js/Shared/DeployInfo.vue

@@ -1,67 +0,0 @@
-<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>

resources/js/Shared/Layout/AppLayout.vue

@@ -9,9 +9,30 @@
       <div class="lg:px-4">
         <slot />
       </div>
-      <DeployInfo
+      <div class="p-4 text-xs text-gray-500 flex align-baseline gap-x-1">
-        :deploy-information="deployInformation"
+        <p>
-      />
+          <strong>Wydanie:</strong> <a
+            v-if="deployInformation.github_url"
+            :href="`${deployInformation.github_url}/commit/${deployInformation.slug_commit}`"
+            target="_blank"
+            rel="noopener nofollow noreferrer"
+            :title="`Commit: ${deployInformation.slug_commit}`"
+          >
+            {{ deployInformation.slug_description }} ({{ deployInformation.release_version }})
+          </a><span
+            v-else
+            :title="`Commit: ${deployInformation.slug_commit}`"
+          >
+            {{ deployInformation.slug_description }}
+          </span>
+        </p>
+        <p
+          v-if="deployInformation.release_created_at"
+          class="border-l-2 border-gray-300 pl-1"
+        >
+          <strong>Data wydania:</strong> {{ deployInformation.release_created_at }}
+        </p>
+      </div>
     </main>
   </div>
 </template>
@@ -20,7 +41,6 @@
 import MainMenu from '@/Shared/MainMenu'
 import { useToast } from 'vue-toastification'
 import { watch } from 'vue'
-import DeployInfo from '@/Shared/DeployInfo'
 
 const props = defineProps({
   flash: Object,

resources/js/Shared/Layout/GuestLayout.vue

@@ -1,18 +1,32 @@
 <template>
   <div class="relative flex flex-col justify-center py-12 min-h-screen bg-blumilk-25 sm:px-6 lg:px-8">
     <slot />
-    <DeployInfo
+    <div class="absolute left-0 bottom-0 min-w-full p-4 text-xs text-gray-500 flex flex-col gap-x-1">
-      :deploy-information="deployInformation"
+      <p>
-      layout="vertical"
+        <strong>Wydanie:</strong> <a
-      class="absolute right-0 bottom-0"
+          v-if="deployInformation.github_url"
-    />
+          :href="`${deployInformation.github_url}/commit/${deployInformation.slug_commit}`"
+          target="_blank"
+          rel="noopener nofollow noreferrer"
+          :title="`Commit: ${deployInformation.slug_commit}`"
+        >
+          {{ deployInformation.slug_description }} ({{ deployInformation.release_version }})
+        </a>
+        <span
+          v-else
+          :title="`Commit: ${deployInformation.slug_commit}`"
+        >
+          {{ deployInformation.slug_description }}
+        </span>
+      </p>
+      <p v-if="deployInformation.release_created_at">
+        <strong>Data wydania:</strong> {{ deployInformation.release_created_at }}
+      </p>
+    </div>
   </div>
 </template>
-
 <script setup>
-import DeployInfo from '@/Shared/DeployInfo'
-
 defineProps({
   deployInformation: Object,
 })
-</script>
+</script>