diff --git a/.eslintrc.js b/.eslintrc.js
index d4ea4bf..e8d2e95 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -13,5 +13,7 @@ module.exports = {
indent: ['error', 2],
'vue/html-indent': ['error', 2],
'comma-dangle': ['error', 'always-multiline'],
+ 'object-curly-spacing': ['error', 'always'],
+ 'vue/require-default-prop': 0,
},
}
diff --git a/resources/js/Composables/vacationTypeInfo.js b/resources/js/Composables/vacationTypeInfo.js
index f2cdc6e..6594ab7 100644
--- a/resources/js/Composables/vacationTypeInfo.js
+++ b/resources/js/Composables/vacationTypeInfo.js
@@ -65,7 +65,7 @@ const types = [
},
]
-export function useVacationTypeInfo() {
+export default function useVacationTypeInfo() {
const getTypes = () => types
const findType = value => types.find(type => type.value === value)
diff --git a/resources/js/Composables/yearPeriodInfo.js b/resources/js/Composables/yearPeriodInfo.js
index 8425e0a..ec799da 100644
--- a/resources/js/Composables/yearPeriodInfo.js
+++ b/resources/js/Composables/yearPeriodInfo.js
@@ -1,5 +1,5 @@
-import {computed} from 'vue'
-import {usePage} from '@inertiajs/inertia-vue3'
+import { computed } from 'vue'
+import { usePage } from '@inertiajs/inertia-vue3'
export default function useCurrentYearPeriodInfo() {
const minDate = computed(() => new Date(usePage().props.value.years.current, 0, 1))
diff --git a/resources/js/Pages/Calendar.vue b/resources/js/Pages/Calendar.vue
index 7e70980..812055f 100644
--- a/resources/js/Pages/Calendar.vue
+++ b/resources/js/Pages/Calendar.vue
@@ -83,9 +83,7 @@
v-for="user in users.data"
:key="user.id"
>
-
+ |
-
diff --git a/resources/js/Pages/Dashboard.vue b/resources/js/Pages/Dashboard.vue
index 2f2793f..ba6e5d1 100644
--- a/resources/js/Pages/Dashboard.vue
+++ b/resources/js/Pages/Dashboard.vue
@@ -2,346 +2,38 @@
-
-
-
-
-
-
- ![]()
-
-
-
- Cześć,
-
-
- {{ user.name }}
-
-
- {{ user.role }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ stats.remaining }}
-
-
- Pozostało
-
-
- Dni do wykorzystania teraz.
-
-
-
-
- {{ stats.used }}
-
-
- Dni wykorzystane
-
-
- Dni, które zostały już wykorzystane na urlop wypoczynkowy.
-
-
-
-
- {{ stats.pending }}
-
-
- Rozpatrywane
-
-
- Dni czekające na akceptację przełożonych.
-
-
-
-
- {{ stats.limit }}
-
-
- Limit urlopu
-
-
- Twój roczny limit urlopu wypoczynkowego.
-
-
-
-
- {{ stats.other }}
-
-
- Inne urlopy
-
-
- Urlopy bezpłatne, okolicznościowe, zwolnienia lekarskie, itd., które zostały już zatwierdzone.
-
-
-
-
-
-
+
+
-
-
-
-
- Wnioski oczekujące na akcje
-
-
-
-
-
- -
-
-
-
-
- Wniosek o {{ findType(request.type).text.toLowerCase() }}
- [{{ request.name }}]
-
-
-
- {{ request.from }} - {{ request.to }}
-
-
-
- ![]()
-
-
- {{ request.user.name }}
-
-
- {{ request.user.email }}
-
-
-
-
-
-
- -
-
- Brak danych
-
-
-
-
-
-
- Zobacz wszystkie
-
-
-
-
-
-
-
-
-
- Twoje wnioski
-
-
-
-
-
- -
-
-
-
-
- Wniosek o {{ findType(request.type).text.toLowerCase() }}
- [{{ request.name }}]
-
-
-
- {{ request.from }} - {{ request.to }}
-
-
-
-
-
-
- -
-
- Brak danych
-
-
-
-
-
-
- Zobacz wszystkie
-
-
-
-
-
-
-
-
-
- Dzisiejsze nieobecności
-
-
-
-
- -
-
-
-
- {{ absence.user.name }}
-
-
- {{ absence.user.email }}
-
-
-
- -
-
- Brak danych
-
-
-
-
-
-
-
-
-
-
-
- Najbliższe dni wolne
-
-
-
-
- -
-
-
- {{ holiday.name }}
-
-
- {{ holiday.displayDate }}
-
-
-
- -
-
- Brak danych
-
-
-
-
-
- Zobacz wszystkie
-
-
-
-
-
-
+
+
+
+
-
diff --git a/resources/js/Pages/Holidays/Create.vue b/resources/js/Pages/Holidays/Create.vue
index 48a7850..0705e9a 100644
--- a/resources/js/Pages/Holidays/Create.vue
+++ b/resources/js/Pages/Holidays/Create.vue
@@ -81,34 +81,19 @@
-
diff --git a/resources/js/Pages/Holidays/Edit.vue b/resources/js/Pages/Holidays/Edit.vue
index ac6a590..77d2940 100644
--- a/resources/js/Pages/Holidays/Edit.vue
+++ b/resources/js/Pages/Holidays/Edit.vue
@@ -80,34 +80,20 @@
-
diff --git a/resources/js/Pages/Holidays/Index.vue b/resources/js/Pages/Holidays/Index.vue
index be5d0bb..f41a416 100644
--- a/resources/js/Pages/Holidays/Index.vue
+++ b/resources/js/Pages/Holidays/Index.vue
@@ -94,10 +94,7 @@
:href="`/holidays/${holiday.id}/edit`"
:class="[active ? 'bg-gray-100 text-gray-900' : 'text-gray-700', 'font-medium block px-4 py-2 text-sm']"
>
- Edytuj
+ Edytuj
@@ -123,9 +117,7 @@
- |
+
-
diff --git a/resources/js/Pages/Login.vue b/resources/js/Pages/Login.vue
index 073a587..f209e9d 100644
--- a/resources/js/Pages/Login.vue
+++ b/resources/js/Pages/Login.vue
@@ -26,10 +26,7 @@
@click="delete errors.oauth"
>
Close
-
+
@@ -43,7 +40,6 @@
+
+
diff --git a/resources/js/Pages/Users/Create.vue b/resources/js/Pages/Users/Create.vue
index 805784d..524a341 100644
--- a/resources/js/Pages/Users/Create.vue
+++ b/resources/js/Pages/Users/Create.vue
@@ -258,57 +258,34 @@
-
diff --git a/resources/js/Pages/Users/Edit.vue b/resources/js/Pages/Users/Edit.vue
index d11c07a..4aca6ac 100644
--- a/resources/js/Pages/Users/Edit.vue
+++ b/resources/js/Pages/Users/Edit.vue
@@ -128,7 +128,9 @@
leave-from-class="opacity-100"
leave-to-class="opacity-0"
>
-
+
-
+
{{ role.label }}
@@ -182,7 +186,9 @@
leave-from-class="opacity-100"
leave-to-class="opacity-0"
>
-
+
-
+
{{ employmentForm.label }}
@@ -257,61 +265,35 @@
-
diff --git a/resources/js/Pages/Users/Index.vue b/resources/js/Pages/Users/Index.vue
index 7bb4bce..0ad84af 100644
--- a/resources/js/Pages/Users/Index.vue
+++ b/resources/js/Pages/Users/Index.vue
@@ -81,13 +81,10 @@
>
-
+
@@ -118,10 +115,7 @@
class="relative inline-block text-left"
>
-
+
- Edytuj
+ Edytuj
@@ -184,10 +172,7 @@
:href="`/users/${user.id}/restore`"
:class="[active ? 'bg-gray-100 text-gray-900' : 'text-gray-700', 'block w-full text-left font-medium px-4 py-2 text-sm']"
>
- Przywróć
+ Przywróć
@@ -208,102 +193,32 @@
| |
-
-
-
- Poprzednia
-
-
- Następna
-
-
-
-
- Wyświetlanie
- {{ users.meta.from }}
- od
- {{ users.meta.to }}
- do
- {{ users.meta.total }}
- wyników
-
-
-
-
+
-
diff --git a/resources/js/Pages/VacationLimits.vue b/resources/js/Pages/VacationLimits.vue
index f71d327..507c306 100644
--- a/resources/js/Pages/VacationLimits.vue
+++ b/resources/js/Pages/VacationLimits.vue
@@ -7,7 +7,7 @@
Dostępne dni urlopu dla użytkowników
- Zarządzaj dostepnymi dniami urlopów dla użytkowników.
+ Zarządzaj dostępnymi dniami urlopów dla użytkowników.
@@ -56,13 +56,10 @@
>
-
+
@@ -112,9 +109,7 @@
|
-
+
-
diff --git a/resources/js/Pages/VacationRequest/Create.vue b/resources/js/Pages/VacationRequest/Create.vue
index 2678078..374cf47 100644
--- a/resources/js/Pages/VacationRequest/Create.vue
+++ b/resources/js/Pages/VacationRequest/Create.vue
@@ -322,128 +322,94 @@
-
diff --git a/resources/js/Pages/VacationRequest/Index.vue b/resources/js/Pages/VacationRequest/Index.vue
index cd489c6..d34955b 100644
--- a/resources/js/Pages/VacationRequest/Index.vue
+++ b/resources/js/Pages/VacationRequest/Index.vue
@@ -118,9 +118,7 @@
/>
|
-
+
-
-
-
- Poprzednia
-
-
- Następna
-
-
-
-
- Wyświetlanie
- {{ requests.meta.from }}
- od
- {{ requests.meta.to }}
- do
- {{ requests.meta.total }}
- wyników
-
-
-
-
+
-
diff --git a/resources/js/Pages/VacationRequest/IndexForApprovers.vue b/resources/js/Pages/VacationRequest/IndexForApprovers.vue
index 69adae8..84ad725 100644
--- a/resources/js/Pages/VacationRequest/IndexForApprovers.vue
+++ b/resources/js/Pages/VacationRequest/IndexForApprovers.vue
@@ -93,7 +93,9 @@
:src="user.avatar"
class="flex-shrink-0 h-6 w-6 rounded-full"
>
-
+
{{ user.name }}
@@ -123,9 +125,7 @@
-
+
{{ form.status.name }}
@@ -274,9 +274,7 @@
/>
|
-
+
-
-
-
- Poprzednia
-
-
- Następna
-
-
-
-
- Wyświetlanie
- {{ requests.meta.from }}
- od
- {{ requests.meta.to }}
- do
- {{ requests.meta.total }}
- wyników
-
-
-
-
+
-
diff --git a/resources/js/Pages/VacationRequest/Show.vue b/resources/js/Pages/VacationRequest/Show.vue
index 7c9dccb..3f285b8 100644
--- a/resources/js/Pages/VacationRequest/Show.vue
+++ b/resources/js/Pages/VacationRequest/Show.vue
@@ -245,33 +245,15 @@
-
diff --git a/resources/js/Shared/Activity.vue b/resources/js/Shared/Activity.vue
index d183714..dfd18ee 100644
--- a/resources/js/Shared/Activity.vue
+++ b/resources/js/Shared/Activity.vue
@@ -31,30 +31,16 @@
-
diff --git a/resources/js/Shared/Layout/AppLayout.vue b/resources/js/Shared/Layout/AppLayout.vue
index df7ae29..4911e4e 100644
--- a/resources/js/Shared/Layout/AppLayout.vue
+++ b/resources/js/Shared/Layout/AppLayout.vue
@@ -1,6 +1,9 @@
-
+
@@ -9,38 +12,26 @@
-
diff --git a/resources/js/Shared/Layout/GuestLayout.vue b/resources/js/Shared/Layout/GuestLayout.vue
index 50ad393..722ed6f 100644
--- a/resources/js/Shared/Layout/GuestLayout.vue
+++ b/resources/js/Shared/Layout/GuestLayout.vue
@@ -3,9 +3,3 @@
-
-
diff --git a/resources/js/Shared/MainMenu.vue b/resources/js/Shared/MainMenu.vue
index 304c539..939d449 100644
--- a/resources/js/Shared/MainMenu.vue
+++ b/resources/js/Shared/MainMenu.vue
@@ -91,7 +91,6 @@
-
-
-
diff --git a/resources/js/Shared/Pagination.vue b/resources/js/Shared/Pagination.vue
new file mode 100644
index 0000000..3cd59e6
--- /dev/null
+++ b/resources/js/Shared/Pagination.vue
@@ -0,0 +1,61 @@
+
+
+
+
+ Poprzednia
+
+
+ Następna
+
+
+
+
+ Wyświetlanie
+ {{ pagination.from }}
+ od
+ {{ pagination.to }}
+ do
+ {{ pagination.total }}
+ wyników
+
+
+
+
+
+
+
diff --git a/resources/js/Shared/Status.vue b/resources/js/Shared/Status.vue
index 0b8ed58..acaa89b 100644
--- a/resources/js/Shared/Status.vue
+++ b/resources/js/Shared/Status.vue
@@ -2,36 +2,21 @@
{{ statusInfo.text }}
-
diff --git a/resources/js/Shared/VacationChart.vue b/resources/js/Shared/VacationChart.vue
index 2a38062..9c5a6d4 100644
--- a/resources/js/Shared/VacationChart.vue
+++ b/resources/js/Shared/VacationChart.vue
@@ -6,17 +6,13 @@
/>
-
diff --git a/resources/js/Shared/VacationType.vue b/resources/js/Shared/VacationType.vue
index e6c3b2c..43199a9 100644
--- a/resources/js/Shared/VacationType.vue
+++ b/resources/js/Shared/VacationType.vue
@@ -9,30 +9,15 @@
-
diff --git a/resources/js/Shared/VacationTypeCalendarIcon.vue b/resources/js/Shared/VacationTypeCalendarIcon.vue
index 06f5d26..22d49df 100644
--- a/resources/js/Shared/VacationTypeCalendarIcon.vue
+++ b/resources/js/Shared/VacationTypeCalendarIcon.vue
@@ -15,34 +15,16 @@
-
diff --git a/resources/js/Shared/Widgets/AbsenceList.vue b/resources/js/Shared/Widgets/AbsenceList.vue
new file mode 100644
index 0000000..9fc8c97
--- /dev/null
+++ b/resources/js/Shared/Widgets/AbsenceList.vue
@@ -0,0 +1,42 @@
+
+
+
+
+ Dzisiejsze nieobecności
+
+
+
+
+ -
+
+
+
+ {{ absence.user.name }}
+
+
+ {{ absence.user.email }}
+
+
+
+ -
+
+ Brak danych
+
+
+
+
+
+
+
+
diff --git a/resources/js/Shared/Widgets/PendingVacationRequests.vue b/resources/js/Shared/Widgets/PendingVacationRequests.vue
new file mode 100644
index 0000000..998e39c
--- /dev/null
+++ b/resources/js/Shared/Widgets/PendingVacationRequests.vue
@@ -0,0 +1,76 @@
+
+
+
+
+ Wnioski oczekujące na akcje
+
+
+
+
+
+ -
+
+
+
+
+ Wniosek o {{ findType(request.type).text.toLowerCase() }}
+ [{{ request.name }}]
+
+
+
+ {{ request.from }} - {{ request.to }}
+
+
+
+ ![]()
+
+
+ {{ request.user.name }}
+
+
+ {{ request.user.email }}
+
+
+
+
+
+
+ -
+
+ Brak danych
+
+
+
+
+
+
+ Zobacz wszystkie
+
+
+
+
+
+
+
diff --git a/resources/js/Shared/Widgets/UpcomingHolidays.vue b/resources/js/Shared/Widgets/UpcomingHolidays.vue
new file mode 100644
index 0000000..b5f82a0
--- /dev/null
+++ b/resources/js/Shared/Widgets/UpcomingHolidays.vue
@@ -0,0 +1,46 @@
+
+
+
+
+ Najbliższe dni wolne
+
+
+
+
+ -
+
+
+ {{ holiday.name }}
+
+
+ {{ holiday.displayDate }}
+
+
+
+ -
+
+ Brak danych
+
+
+
+
+
+ Zobacz wszystkie
+
+
+
+
+
+
+
diff --git a/resources/js/Shared/Widgets/UserVacationRequests.vue b/resources/js/Shared/Widgets/UserVacationRequests.vue
new file mode 100644
index 0000000..cac0dfe
--- /dev/null
+++ b/resources/js/Shared/Widgets/UserVacationRequests.vue
@@ -0,0 +1,62 @@
+
+
+
+
+ Twoje wnioski
+
+
+
+
+
+ -
+
+
+
+
+ Wniosek o {{ findType(request.type).text.toLowerCase() }}
+ [{{ request.name }}]
+
+
+
+ {{ request.from }} - {{ request.to }}
+
+
+
+
+
+
+ -
+
+ Brak danych
+
+
+
+
+
+
+ Zobacz wszystkie
+
+
+
+
+
+
+
diff --git a/resources/js/Shared/Widgets/VacationStats.vue b/resources/js/Shared/Widgets/VacationStats.vue
new file mode 100644
index 0000000..8c380cf
--- /dev/null
+++ b/resources/js/Shared/Widgets/VacationStats.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+ {{ stats.remaining }}
+
+
+ Pozostało
+
+
+ Dni do wykorzystania teraz.
+
+
+
+
+ {{ stats.used }}
+
+
+ Dni wykorzystane
+
+
+ Dni, które zostały już wykorzystane na urlop wypoczynkowy.
+
+
+
+
+ {{ stats.pending }}
+
+
+ Rozpatrywane
+
+
+ Dni czekające na akceptację przełożonych.
+
+
+
+
+ {{ stats.limit }}
+
+
+ Limit urlopu
+
+
+ Twój roczny limit urlopu wypoczynkowego.
+
+
+
+
+ {{ stats.other }}
+
+
+ Inne urlopy
+
+
+ Urlopy bezpłatne, okolicznościowe, zwolnienia lekarskie, itd., które zostały już zatwierdzone.
+
+
+
+
+
+
+
+
diff --git a/resources/js/Shared/Widgets/Welcome.vue b/resources/js/Shared/Widgets/Welcome.vue
new file mode 100644
index 0000000..74f26d5
--- /dev/null
+++ b/resources/js/Shared/Widgets/Welcome.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+ ![]()
+
+
+
+ Cześć,
+
+
+ {{ user.name }}
+
+
+ {{ user.role }}
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/js/app.js b/resources/js/app.js
index 14ebf63..4b411df 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -1,6 +1,6 @@
-import {createApp, h} from 'vue'
-import {createInertiaApp, Head, Link} from '@inertiajs/inertia-vue3'
-import {InertiaProgress} from '@inertiajs/progress'
+import { createApp, h } from 'vue'
+import { createInertiaApp, Head, Link } from '@inertiajs/inertia-vue3'
+import { InertiaProgress } from '@inertiajs/progress'
import AppLayout from '@/Shared/Layout/AppLayout'
import Flatpickr from 'flatpickr'
import { Polish } from 'flatpickr/dist/l10n/pl.js'
@@ -14,8 +14,8 @@ createInertiaApp({
return page
},
- setup({el, App, props, plugin}) {
- createApp({render: () => h(App, props)})
+ setup({ el, App, props, plugin }) {
+ createApp({ render: () => h(App, props) })
.use(plugin)
.use(Toast, {
position: 'bottom-right',
|