Compare commits
10 Commits
d94a60d33b
...
#172-app-f
Author | SHA1 | Date | |
---|---|---|---|
0e741ea1b0
|
|||
d4cc6691e6
|
|||
8ac9df56f7
|
|||
552677bdb4
|
|||
0f69b342ec
|
|||
6d6470c3bd
|
|||
c16943b623
|
|||
f2c978d99b
|
|||
2062868376
|
|||
0d26af30b0
|
6
.env.ci
6
.env.ci
@@ -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/
|
||||
|
@@ -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/
|
||||
|
@@ -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", ""),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
11
config/heroku.php
Normal file
11
config/heroku.php
Normal 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"),
|
||||
];
|
@@ -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>
|
||||
|
55
resources/js/Shared/DeployInfo.vue
Normal file
55
resources/js/Shared/DeployInfo.vue
Normal 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>
|
@@ -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()
|
||||
|
@@ -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>
|
||||
|
Reference in New Issue
Block a user