10 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
8 changed files with 116 additions and 2 deletions

View File

@@ -21,3 +21,9 @@ SESSION_DRIVER=array
SESSION_LIFETIME=120 SESSION_LIFETIME=120
FILESYSTEM_DISK=local FILESYSTEM_DISK=local
MAIL_MAILER=array 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_CLIENT_TOKEN=
SLACK_SIGNING_SECRET= SLACK_SIGNING_SECRET=
SLACK_DEFAULT_CHANNEL="#general" 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), "flash" => $this->getFlashData($request),
"years" => $this->getYearsData($request), "years" => $this->getYearsData($request),
"vacationRequestsCount" => $this->getVacationRequestsCount($request), "vacationRequestsCount" => $this->getVacationRequestsCount($request),
"deployInformation" => $this->getDeployInformation(),
]); ]);
} }
@@ -71,4 +72,15 @@ class HandleInertiaRequests extends Middleware
->count() ->count()
: null; : 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", ""),
];
}
} }

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

@@ -32,5 +32,10 @@
<env name="QUEUE_CONNECTION" value="sync"/> <env name="QUEUE_CONNECTION" value="sync"/>
<env name="SESSION_DRIVER" value="array"/> <env name="SESSION_DRIVER" value="array"/>
<env name="TELESCOPE_ENABLED" value="false"/> <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> </php>
</phpunit> </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> <template>
<div class="min-h-full"> <div class="relative min-h-screen">
<MainMenu <MainMenu
:auth="auth" :auth="auth"
:years="years" :years="years"
@@ -9,7 +9,12 @@
<div class="lg:px-4"> <div class="lg:px-4">
<slot /> <slot />
</div> </div>
<div class="h-8 sm:h-4"></div>
</main> </main>
<DeployInfo
:deploy-information="deployInformation"
class="absolute bottom-0 justify-end"
/>
</div> </div>
</template> </template>
@@ -17,12 +22,14 @@
import MainMenu from '@/Shared/MainMenu' import MainMenu from '@/Shared/MainMenu'
import { useToast } from 'vue-toastification' import { useToast } from 'vue-toastification'
import { watch } from 'vue' import { watch } from 'vue'
import DeployInfo from '@/Shared/DeployInfo'
const props = defineProps({ const props = defineProps({
flash: Object, flash: Object,
auth: Object, auth: Object,
years: Object, years: Object,
vacationRequestsCount: Number, vacationRequestsCount: Number,
deployInformation: Object,
}) })
const toast = useToast() const toast = useToast()

View File

@@ -1,5 +1,17 @@
<template> <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 /> <slot />
<DeployInfo
:deploy-information="deployInformation"
class="absolute left-0 bottom-0 justify-end"
/>
</div> </div>
</template> </template>
<script setup>
import DeployInfo from '@/Shared/DeployInfo'
defineProps({
deployInformation: Object,
})
</script>