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
6 changed files with 30 additions and 30 deletions

View File

@@ -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/

View File

@@ -75,12 +75,12 @@ class HandleInertiaRequests extends Middleware
protected function getDeployInformation(): Closure
{
return fn() => [
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" => preg_replace("/\/$/i", "", config("heroku.github_url", "")),
"github_url" => config("heroku.github_url", ""),
];
}
}

View File

@@ -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>

View File

@@ -1,11 +1,11 @@
<template>
<div
:class="{ 'flex-col': isVertical(), 'flex-row': isHorizontal() }"
class="min-w-full p-4 text-xs text-gray-500 flex gap-x-1"
class="min-w-full p-4 text-xs text-gray-500 flex flex-row gap-x-1"
>
<p class="flex flex-row gap-x-1">
<strong>Wersja:</strong>
<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' }})
@@ -13,20 +13,20 @@
</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() }"
class="flex flex-col sm:flex-row gap-x-1 border-l-2 border-gray-300 pl-1"
>
<strong>Ostatnio zbudowano:</strong>
<span class="font-bold whitespace-nowrap">Ostatnio zbudowano:</span>
<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() }"
class="flex flex-col sm:flex-row gap-x-1 border-l-2 border-gray-300 pl-1"
>
<strong v-if="isVertical()">Repozytorium:</strong>
<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 underline hover:no-underline hover:text-blumilk-600"
class="text-gray-800 whitespace-nowrap underline hover:no-underline hover:text-blumilk-600"
:href="deployInformation.github_url"
target="_blank"
rel="noopener nofollow noreferrer"
@@ -40,20 +40,8 @@ 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({

View File

@@ -1,5 +1,5 @@
<template>
<div class="min-h-full">
<div class="relative min-h-screen">
<MainMenu
:auth="auth"
:years="years"
@@ -9,10 +9,12 @@
<div class="lg:px-4">
<slot />
</div>
<DeployInfo
:deploy-information="deployInformation"
/>
<div class="h-8 sm:h-4"></div>
</main>
<DeployInfo
:deploy-information="deployInformation"
class="absolute bottom-0 justify-end"
/>
</div>
</template>

View File

@@ -3,8 +3,7 @@
<slot />
<DeployInfo
:deploy-information="deployInformation"
layout="vertical"
class="absolute right-0 bottom-0"
class="absolute left-0 bottom-0 justify-end"
/>
</div>
</template>