- updated style

- release note added
#173 - button behaviour in creating request (#174 )
2022-07-04 22:49:28 +02:00 · 2022-07-04 22:27:37 +02:00 · 2022-06-20 09:33:30 +02:00 · 2022-06-15 10:14:58 +02:00
21 changed files with 169 additions and 74 deletions
--- a/.env.example
+++ b/.env.example
@@ -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/
--- a/app/Eloquent/Models/Resume.php
+++ b/app/Eloquent/Models/Resume.php
@@ -31,6 +31,7 @@ class Resume extends Model
        "technologies" => AsCollection::class,
        "projects" => AsCollection::class,
    ];
+    protected $perPage = 50;

    public function user(): BelongsTo
    {
--- a/app/Eloquent/Models/User.php
+++ b/app/Eloquent/Models/User.php
@@ -46,6 +46,7 @@ class User extends Authenticatable implements NotifiableInterface
    protected $with = [
        "profile",
    ];
+    protected $perPage = 50;

    public function profile(): HasOne
    {
--- a/app/Eloquent/Models/VacationRequest.php
+++ b/app/Eloquent/Models/VacationRequest.php
@@ -49,6 +49,7 @@ class VacationRequest extends Model
        "to" => "date",
        "event_ids" => AsCollection::class,
    ];
+    protected $perPage = 50;

    public function user(): BelongsTo
    {
--- a/app/Infrastructure/Http/Middleware/HandleInertiaRequests.php
+++ b/app/Infrastructure/Http/Middleware/HandleInertiaRequests.php
@@ -6,6 +6,7 @@ namespace Toby\Infrastructure\Http\Middleware;

 use Closure;
 use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
 use Inertia\Middleware;
 use Toby\Domain\VacationRequestStatesRetriever;
 use Toby\Eloquent\Helpers\YearPeriodRetriever;
@@ -25,6 +26,7 @@ class HandleInertiaRequests extends Middleware
            "flash" => $this->getFlashData($request),
            "years" => $this->getYearsData($request),
            "vacationRequestsCount" => $this->getVacationRequestsCount($request),
+            "deployInformation" => $this->getDeployInformation(),
        ]);
    }

@@ -71,4 +73,17 @@ class HandleInertiaRequests extends Middleware
            ->count()
        : 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", "")),
+        ];
+    }
 }
--- a/config/heroku.php
+++ b/config/heroku.php
@@ -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")
+];
--- a/resources/js/Pages/Calendar.vue
+++ b/resources/js/Pages/Calendar.vue
@@ -55,20 +55,18 @@
      </div>
    </div>
    <div class="overflow-x-auto">
-      <table class="w-full text-sm text-center border-y border-r border-gray-300">
+      <table class="w-full text-sm text-center border border-gray-300">
        <thead>
          <tr>
-            <th
-              class="py-2 w-64 text-lg font-semibold text-gray-800 border-y border-gray-300 bg-white sticky left-0 sticky-border"
-            >
+            <th class="py-2 w-64 text-lg font-semibold text-gray-800 border border-gray-300">
              <div class="flex justify-center items-center">
-                {{ selectedMonth.name }}
+                {{ selectedMonth.name }} {{ years.selected.year }}
              </div>
            </th>
            <th
              v-for="day in calendar"
              :key="day.dayOfMonth"
-              class="p-2 text-lg font-semibold text-gray-900 border second:border-l-0 border-gray-300"
+              class="p-2 text-lg font-semibold text-gray-900 border border-gray-300"
              style="min-width: 46px;"
              :class="{ 'bg-red-100 text-red-800': day.isWeekend || day.isHoliday, 'text-blumilk-600 bg-blumilk-25': day.isToday }"
            >
@@ -86,28 +84,22 @@
            v-for="user in users.data"
            :key="user.id"
          >
-            <th
-              class="p-2 border-y border-gray-300 bg-white sticky left-0 sticky-border"
-            >
+            <th class="p-2 border border-gray-300">
              <div class="flex justify-start items-center">
                <span class="inline-flex justify-center items-center w-8 h-8 rounded-full">
                  <img :src="user.avatar">
                </span>
-                <div class="ml-3 flex items-start flex-col-reverse md:flex-row">
-                  <span
-                    v-for="split in user.name.split(' ', 2)"
-                    :key="split"
-                    class="text-sm first:text-xs md:first:text-sm font-medium text-gray-900 truncate first:mr-1"
-                  >
-                    {{ split }}
-                  </span>
+                <div class="ml-3">
+                  <div class="text-sm font-medium text-gray-900 truncate">
+                    {{ user.name }}
+                  </div>
                </div>
              </div>
            </th>
            <td
              v-for="day in calendar"
              :key="day.dayOfMonth"
-              class="border second:border-l-0 border-gray-300"
+              class="border border-gray-300"
              :class="{ 'bg-blumilk-25': day.isToday, 'bg-red-100': day.isWeekend || day.isHoliday }"
              @mouseover="setActiveDay(user.id + '+' + day.date)"
              @mouseleave="unsetActiveDay"
@@ -184,10 +176,3 @@ function linkParameters(user, day) {
  return props.can.createOnBehalfOfEmployee ? { user: user.id, from_date: day.date } : { from_date: day.date }
 }
 </script>
-
-<style lang="css">
-.sticky-border {
-  box-shadow: inset -1px 0 rgb(209 213 219 / 1),
-              inset 1px 0 rgb(209 213 219 / 1);
-}
-</style>
--- a/resources/js/Pages/Holidays/Index.vue
+++ b/resources/js/Pages/Holidays/Index.vue
@@ -17,7 +17,7 @@
      </div>
    </div>
    <div class="border-t border-gray-200">
-      <div class="overflow-x-auto">
+      <div class="overflow-auto xl:overflow-visible">
        <table class="min-w-full divide-y divide-gray-200">
          <thead class="bg-gray-50">
            <tr>
--- a/resources/js/Pages/Keys.vue
+++ b/resources/js/Pages/Keys.vue
@@ -19,7 +19,7 @@
      </div>
    </div>
    <div class="border-t border-gray-200">
-      <div class="overflow-x-auto">
+      <div class="overflow-auto xl:overflow-visible">
        <table class="min-w-full divide-y divide-gray-200">
          <thead class="bg-gray-50">
            <tr>
--- a/resources/js/Pages/MonthlyUsage.vue
+++ b/resources/js/Pages/MonthlyUsage.vue
@@ -9,11 +9,11 @@
      </div>
    </div>
    <div class="border-t border-gray-200">
-      <div class="overflow-x-auto">
+      <div class="overflow-x-auto overflow-y-hidden xl:overflow-x-visible">
        <table class="min-w-full divide-y divide-gray-200">
          <thead class="bg-gray-50">
            <tr>
-              <th class="py-3 px-6 w-64 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase bg-gray-50 sticky -left-1">
+              <th class="py-3 px-6 w-64 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase">
                Pracownik
              </th>
              <th
@@ -38,7 +38,7 @@
              :key="item.user.id"
              class="hover:bg-blumilk-25"
            >
-              <th class="p-4 text-sm font-semibold text-gray-500 capitalize whitespace-nowrap bg-white sticky -left-1">
+              <th class="p-4 text-sm font-semibold text-gray-500 capitalize whitespace-nowrap">
                <div class="flex justify-start items-center">
                  <span class="inline-flex justify-center items-center w-10 h-10 rounded-full">
                    <img
@@ -46,14 +46,12 @@
                      :src="item.user.avatar"
                    >
                  </span>
-                  <div class="ml-3 flex items-start flex-col-reverse md:flex-row">
-                    <span
-                      v-for="split in item.user.name.split(' ', 2)"
-                      :key="split"
-                      class="text-sm first:text-xs md:first:text-sm font-medium text-gray-900 truncate first:mr-1"
+                  <div class="ml-3">
+                    <div
+                      class="text-sm font-medium text-gray-900 whitespace-nowrap"
                    >
-                      {{ split }}
-                    </span>
+                      {{ item.user.name }}
+                    </div>
                  </div>
                </div>
              </th>
--- a/resources/js/Pages/Resumes/Index.vue
+++ b/resources/js/Pages/Resumes/Index.vue
@@ -15,7 +15,7 @@
      </div>
    </div>
    <div class="border-t border-gray-200">
-      <div class="overflow-x-auto">
+      <div class="overflow-auto xl:overflow-visible">
        <table class="min-w-full divide-y divide-gray-200">
          <thead class="bg-gray-50">
            <tr>
--- a/resources/js/Pages/Technologies.vue
+++ b/resources/js/Pages/Technologies.vue
@@ -18,7 +18,7 @@
      </div>
    </div>
    <div class="border-t border-gray-200">
-      <div class="overflow-x-auto">
+      <div class="overflow-auto xl:overflow-visible">
        <table class="min-w-full divide-y divide-gray-200">
          <thead class="bg-gray-50">
            <tr>
--- a/resources/js/Pages/Users/Index.vue
+++ b/resources/js/Pages/Users/Index.vue
@@ -30,7 +30,7 @@
          >
        </div>
      </div>
-      <div class="overflow-x-auto">
+      <div class="overflow-auto xl:overflow-visible">
        <table class="min-w-full divide-y divide-gray-200">
          <thead class="bg-gray-50">
            <tr>
--- a/resources/js/Pages/VacationLimits.vue
+++ b/resources/js/Pages/VacationLimits.vue
@@ -10,13 +10,13 @@
    </div>
    <div class="border-t border-gray-200">
      <form @submit.prevent="submitVacationDays">
-        <div class="overflow-x-auto">
+        <div class="overflow-auto xl:overflow-visible">
          <table class="min-w-full border-b divide-y divide-gray-200">
            <thead class="bg-gray-50">
              <tr>
                <th
                  scope="col"
-                  class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap bg-gray-50 sticky -left-1"
+                  class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
                >
                  Imię i nazwisko
                </th>
@@ -52,8 +52,8 @@
                :key="item.id"
                class="hover:bg-blumilk-25"
              >
-                <td class="p-4 text-sm text-gray-500 whitespace-nowrap bg-white sticky -left-1 z-10">
-                  <div class="flex justify-start items-center">
+                <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
+                  <div class="flex">
                    <span class="inline-flex justify-center items-center w-10 h-10 rounded-full">
                      <img
                        class="w-10 h-10 rounded-full"
@@ -61,16 +61,10 @@
                      >
                    </span>
                    <div class="ml-3">
-                      <p class="flex items-start flex-col-reverse md:flex-row">
-                        <span
-                          v-for="split in item.user.name.split(' ', 2)"
-                          :key="split"
-                          class="first:text-xs md:first:text-sm font-medium text-gray-900 truncate first:mr-1"
-                        >
-                          {{ split }}
-                        </span>
+                      <p class="text-sm font-medium text-gray-900 break-all">
+                        {{ item.user.name }}
                      </p>
-                      <p class="hidden md:block text-sm text-gray-500 break-all">
+                      <p class="text-sm text-gray-500 break-all">
                        {{ item.user.email }}
                      </p>
                    </div>
--- a/resources/js/Pages/VacationRequest/Create.vue
+++ b/resources/js/Pages/VacationRequest/Create.vue
@@ -297,8 +297,8 @@
              <button
                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="[form.processing || !form.isDirty ? 'disabled:opacity-60' : 'hover:bg-blumilk-700']"
-                :disabled="form.processing || !form.isDirty"
+                :class="[form.processing || !isDirty ? 'disabled:opacity-60' : 'hover:bg-blumilk-700']"
+                :disabled="form.processing || !isDirty"
              >
                Zapisz
              </button>
@@ -359,6 +359,13 @@ const form = useForm({
  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)

 const estimatedDays = ref([])
--- a/resources/js/Pages/VacationRequest/Index.vue
+++ b/resources/js/Pages/VacationRequest/Index.vue
@@ -88,7 +88,7 @@
        </Listbox>
      </div>
    </div>
-    <div class="overflow-x-auto">
+    <div class="overflow-auto xl:overflow-visible">
      <table class="min-w-full divide-y divide-gray-200">
        <thead class="bg-gray-50">
          <tr>
--- a/resources/js/Pages/VacationRequest/IndexForApprovers.vue
+++ b/resources/js/Pages/VacationRequest/IndexForApprovers.vue
@@ -53,7 +53,7 @@
              leave-to-class="opacity-0"
            >
              <ListboxOptions
-                class="overflow-x-auto absolute z-10 py-1 mt-1 w-full max-w-lg max-h-60 text-base bg-white rounded-md focus:outline-none ring-1 ring-black ring-opacity-5 shadow-lg sm:text-sm"
+                class="overflow-auto absolute z-10 py-1 mt-1 w-full max-w-lg max-h-60 text-base bg-white rounded-md focus:outline-none ring-1 ring-black ring-opacity-5 shadow-lg sm:text-sm"
              >
                <ListboxOption
                  v-slot="{ active }"
@@ -237,17 +237,51 @@
        </Listbox>
      </div>
    </div>
-    <div class="overflow-x-auto">
+    <div class="overflow-auto xl:overflow-visible">
      <table class="min-w-full divide-y divide-gray-200">
        <thead class="bg-gray-50">
          <tr>
            <th
-              v-for="head in headers"
-              :key="head"
              scope="col"
              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
            >
-              {{ head }}
+              Numer
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Pracownik
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Rodzaj wniosku
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Od
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Do
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Dni urlopu
+            </th>
+            <th
+              scope="col"
+              class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
+            >
+              Status
            </th>
            <th scope="col" />
          </tr>
@@ -347,8 +381,6 @@ const props = defineProps({
  types: Object,
 })

-const headers = ['Numer', 'Pracownik', 'Rodzaj wniosku', 'Od', 'Do', 'Dni urlopu', 'Status']
-
 const statuses = [
  {
    name: 'Wszystkie',
--- a/resources/js/Shared/Layout/AppLayout.vue
+++ b/resources/js/Shared/Layout/AppLayout.vue
@@ -9,6 +9,30 @@
      <div class="lg:px-4">
        <slot />
      </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>
  </div>
 </template>
@@ -23,6 +47,7 @@ const props = defineProps({
  auth: Object,
  years: Object,
  vacationRequestsCount: Number,
+  deployInformation: Object,
 })

 const toast = useToast()
--- a/resources/js/Shared/Layout/GuestLayout.vue
+++ b/resources/js/Shared/Layout/GuestLayout.vue
@@ -1,5 +1,32 @@
 <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 />
+    <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>
 </template>
+<script setup>
+defineProps({
+  deployInformation: Object,
+})
+</script>
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,5 +1,4 @@
 const defaultTheme = require('tailwindcss/defaultTheme')
-const plugin = require('tailwindcss/plugin')

 module.exports = {
  content: [
@@ -32,12 +31,5 @@ module.exports = {
    require('@tailwindcss/forms'),
    require('@tailwindcss/typography'),
    require('@tailwindcss/line-clamp'),
-    plugin(function({ addVariant, e }) {
-      addVariant('second', ({ modifySelectors, separator }) => {
-        modifySelectors(({ className }) => {
-          return `.${e(`second${separator}${className}`)}:nth-child(2)`
-        })
-      })
-    }),
  ],
 }
--- a/tests/Feature/UserTest.php
+++ b/tests/Feature/UserTest.php
@@ -73,10 +73,10 @@ class UserTest extends FeatureTestCase

    public function testUserListIsPaginated(): void
    {
-        User::factory()->count(15)->create();
+        User::factory()->count(50)->create();
        $admin = User::factory()->admin()->create();

-        $this->assertDatabaseCount("users", 16);
+        $this->assertDatabaseCount("users", 51);

        $this->actingAs($admin)
            ->get("/users?page=2")
Author	SHA1	Message	Date
Kamil Niemczycki	87ea723f4e	- updated style	2022-07-04 22:49:28 +02:00
Kamil Niemczycki	48b0c74684	- release note added	2022-07-04 22:27:37 +02:00
Kamil Niemczycki	643f546142	#173 - button behaviour in creating request (#174 ) #173 - improved button behaviour	2022-06-20 09:33:30 +02:00
Kamil Niemczycki	995c0b6696	- changed limits for item list (#171 ) * - changed limits for displayed items * - transferred to models * - updated tests	2022-06-15 10:14:58 +02:00