Compare commits
10 Commits
#172-deplo
...
#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
|
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/
|
||||||
|
@@ -75,12 +75,12 @@ class HandleInertiaRequests extends Middleware
|
|||||||
|
|
||||||
protected function getDeployInformation(): Closure
|
protected function getDeployInformation(): Closure
|
||||||
{
|
{
|
||||||
return fn() => [
|
return fn(): array => [
|
||||||
"release_version" => config("heroku.release_version"),
|
"release_version" => config("heroku.release_version"),
|
||||||
"slug_description" => config("heroku.slug_description"),
|
"slug_description" => config("heroku.slug_description"),
|
||||||
"release_created_at" => config("heroku.release_created_at"),
|
"release_created_at" => config("heroku.release_created_at"),
|
||||||
"slug_commit" => config("heroku.slug_commit"),
|
"slug_commit" => config("heroku.slug_commit"),
|
||||||
"github_url" => preg_replace("/\/$/i", "", config("heroku.github_url", "")),
|
"github_url" => config("heroku.github_url", ""),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -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>
|
||||||
|
@@ -1,11 +1,11 @@
|
|||||||
<template>
|
<template>
|
||||||
<div
|
<div
|
||||||
:class="{ 'flex-col': isVertical(), 'flex-row': isHorizontal() }"
|
class="min-w-full p-4 text-xs text-gray-500 flex flex-row gap-x-1"
|
||||||
class="min-w-full p-4 text-xs text-gray-500 flex gap-x-1"
|
|
||||||
>
|
>
|
||||||
<p class="flex flex-row gap-x-1">
|
<p class="flex flex-col sm:flex-row gap-x-1">
|
||||||
<strong>Wersja:</strong>
|
<span class="font-bold whitespace-nowrap">Wersja:</span>
|
||||||
<span
|
<span
|
||||||
|
class="whitespace-nowrap"
|
||||||
:title="`Commit: ${deployInformation.slug_commit ?? 'unset'}`"
|
:title="`Commit: ${deployInformation.slug_commit ?? 'unset'}`"
|
||||||
>
|
>
|
||||||
{{ deployInformation.slug_description ?? 'unset' }} ({{ deployInformation.release_version ?? 'unset' }})
|
{{ deployInformation.slug_description ?? 'unset' }} ({{ deployInformation.release_version ?? 'unset' }})
|
||||||
@@ -13,20 +13,20 @@
|
|||||||
</p>
|
</p>
|
||||||
<p
|
<p
|
||||||
v-if="deployInformation.release_created_at"
|
v-if="deployInformation.release_created_at"
|
||||||
class="flex flex-row gap-x-1"
|
class="flex flex-col sm:flex-row gap-x-1 border-l-2 border-gray-300 pl-1"
|
||||||
:class="{ 'border-l-2 border-gray-300 pl-1': isHorizontal() }"
|
|
||||||
>
|
>
|
||||||
<strong>Ostatnio zbudowano:</strong>
|
<span class="font-bold whitespace-nowrap">Ostatnio zbudowano:</span>
|
||||||
<span>{{ getDate() }}</span>
|
<span>{{ getDate() }}</span>
|
||||||
</p>
|
</p>
|
||||||
<p
|
<p
|
||||||
v-if="deployInformation.github_url"
|
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
|
<a
|
||||||
v-if="deployInformation.github_url"
|
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"
|
:href="deployInformation.github_url"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noopener nofollow noreferrer"
|
rel="noopener nofollow noreferrer"
|
||||||
@@ -40,20 +40,8 @@ import { DateTime } from 'luxon'
|
|||||||
|
|
||||||
let props = defineProps({
|
let props = defineProps({
|
||||||
deployInformation: Object,
|
deployInformation: Object,
|
||||||
layout: {
|
|
||||||
type: String,
|
|
||||||
default: 'horizontal',
|
|
||||||
},
|
|
||||||
})
|
})
|
||||||
|
|
||||||
function isVertical() {
|
|
||||||
return props.layout === 'vertical'
|
|
||||||
}
|
|
||||||
|
|
||||||
function isHorizontal() {
|
|
||||||
return props.layout === 'horizontal'
|
|
||||||
}
|
|
||||||
|
|
||||||
function getDate() {
|
function getDate() {
|
||||||
return DateTime.fromISO(props.deployInformation.release_created_at)
|
return DateTime.fromISO(props.deployInformation.release_created_at)
|
||||||
.toLocaleString({
|
.toLocaleString({
|
||||||
|
@@ -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,10 +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>
|
||||||
<DeployInfo
|
<DeployInfo
|
||||||
:deploy-information="deployInformation"
|
:deploy-information="deployInformation"
|
||||||
|
class="absolute bottom-0 justify-end"
|
||||||
/>
|
/>
|
||||||
</main>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
@@ -3,8 +3,7 @@
|
|||||||
<slot />
|
<slot />
|
||||||
<DeployInfo
|
<DeployInfo
|
||||||
:deploy-information="deployInformation"
|
:deploy-information="deployInformation"
|
||||||
layout="vertical"
|
class="absolute left-0 bottom-0 justify-end"
|
||||||
class="absolute right-0 bottom-0"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
Reference in New Issue
Block a user