3 Commits

Author SHA1 Message Date
b312f9b764 - updated tests 2022-06-15 09:33:06 +02:00
691491a0b0 - transferred to models 2022-06-15 09:25:25 +02:00
3435a45952 - changed limits for displayed items 2022-06-15 09:04:50 +02:00
6 changed files with 3 additions and 94 deletions

View File

@@ -67,9 +67,3 @@ 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

@@ -6,7 +6,6 @@ namespace Toby\Infrastructure\Http\Middleware;
use Closure; use Closure;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Carbon;
use Inertia\Middleware; use Inertia\Middleware;
use Toby\Domain\VacationRequestStatesRetriever; use Toby\Domain\VacationRequestStatesRetriever;
use Toby\Eloquent\Helpers\YearPeriodRetriever; use Toby\Eloquent\Helpers\YearPeriodRetriever;
@@ -26,7 +25,6 @@ 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(),
]); ]);
} }
@@ -73,17 +71,4 @@ class HandleInertiaRequests extends Middleware
->count() ->count()
: null; : null;
} }
protected function getDeployInformation(): array
{
$releaseDate = config("heroku.release_created_at");
return [
"release_version" => config("heroku.release_version"),
"slug_description" => config("heroku.slug_description"),
"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", "")),
];
}
} }

View File

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

@@ -297,8 +297,8 @@
<button <button
type="submit" type="submit"
class="inline-flex justify-center py-2 px-4 text-sm font-medium text-white bg-blumilk-600 rounded-md border border-transparent focus:outline-none focus:ring-2 focus:ring-blumilk-500 focus:ring-offset-2 shadow-sm" class="inline-flex justify-center py-2 px-4 text-sm font-medium text-white bg-blumilk-600 rounded-md border border-transparent focus:outline-none focus:ring-2 focus:ring-blumilk-500 focus:ring-offset-2 shadow-sm"
:class="[form.processing || !isDirty ? 'disabled:opacity-60' : 'hover:bg-blumilk-700']" :class="[form.processing || !form.isDirty ? 'disabled:opacity-60' : 'hover:bg-blumilk-700']"
:disabled="form.processing || !isDirty" :disabled="form.processing || !form.isDirty"
> >
Zapisz Zapisz
</button> </button>
@@ -359,13 +359,6 @@ const form = useForm({
flowSkipped: false, flowSkipped: false,
}) })
let isDirty = ref(false)
watch(form, formData => {
const { from, to } = formData.data()
isDirty.value = formData.isDirty || from !== null || to !== null
}, { immediate: true, deep: true })
refreshEstimatedDays(form.from, form.to) refreshEstimatedDays(form.from, form.to)
const estimatedDays = ref([]) const estimatedDays = ref([])

View File

@@ -9,30 +9,6 @@
<div class="lg:px-4"> <div class="lg:px-4">
<slot /> <slot />
</div> </div>
<div class="p-4 text-xs text-gray-500 flex align-baseline gap-x-1">
<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> </main>
</div> </div>
</template> </template>
@@ -47,7 +23,6 @@ const props = defineProps({
auth: Object, auth: Object,
years: Object, years: Object,
vacationRequestsCount: Number, vacationRequestsCount: Number,
deployInformation: Object,
}) })
const toast = useToast() const toast = useToast()

View File

@@ -1,32 +1,5 @@
<template> <template>
<div class="relative flex flex-col justify-center py-12 min-h-screen bg-blumilk-25 sm:px-6 lg:px-8"> <div class="flex flex-col justify-center py-12 min-h-screen bg-blumilk-25 sm:px-6 lg:px-8">
<slot /> <slot />
<div class="absolute left-0 bottom-0 min-w-full p-4 text-xs text-gray-500 flex flex-col gap-x-1">
<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">
<strong>Data wydania:</strong> {{ deployInformation.release_created_at }}
</p>
</div>
</div> </div>
</template> </template>
<script setup>
defineProps({
deployInformation: Object,
})
</script>