From e8118213e1ceacf74807e7ff985a377453f0c686 Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Thu, 3 Feb 2022 07:51:48 +0100 Subject: [PATCH] #20 - fix --- .eslintrc.js | 2 +- resources/js/Pages/Dashboard.vue | 17 +++++++++-------- resources/js/Pages/VacationRequest/Show.vue | 4 ---- resources/js/Shared/MainMenu.vue | 2 -- resources/lang/pl.json | 4 ++-- 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 73bc6a2..d4ea4bf 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -14,4 +14,4 @@ module.exports = { 'vue/html-indent': ['error', 2], 'comma-dangle': ['error', 'always-multiline'], }, -} \ No newline at end of file +} diff --git a/resources/js/Pages/Dashboard.vue b/resources/js/Pages/Dashboard.vue index 0bfa70d..3232ab0 100644 --- a/resources/js/Pages/Dashboard.vue +++ b/resources/js/Pages/Dashboard.vue @@ -255,6 +255,7 @@ import { } from '@heroicons/vue/outline' import {computed} from 'vue' import {usePage} from '@inertiajs/inertia-vue3' + export default { name: 'DashboardPage', setup() { @@ -313,28 +314,28 @@ export default { name: 'Leonard Krasner', handle: 'leonardkrasner', imageUrl: - 'https://images.unsplash.com/photo-1519345182560-3f2917c472ef?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80', + 'https://images.unsplash.com/photo-1519345182560-3f2917c472ef?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80', href: '#', }, { name: 'Floyd Miles', handle: 'floydmiles', imageUrl: - 'https://images.unsplash.com/photo-1463453091185-61582044d556?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80', + 'https://images.unsplash.com/photo-1463453091185-61582044d556?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80', href: '#', }, { name: 'Emily Selman', handle: 'emilyselman', imageUrl: - 'https://images.unsplash.com/photo-1502685104226-ee32379fefbe?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80', + 'https://images.unsplash.com/photo-1502685104226-ee32379fefbe?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80', href: '#', }, { name: 'Kristin Watson', handle: 'kristinwatson', imageUrl: - 'https://images.unsplash.com/photo-1500917293891-ef795e70e1f6?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80', + 'https://images.unsplash.com/photo-1500917293891-ef795e70e1f6?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80', href: '#', }, ] @@ -344,21 +345,21 @@ export default { title: 'Office closed on July 2nd', href: '#', preview: - 'Cum qui rem deleniti. Suscipit in dolor veritatis sequi aut. Vero ut earum quis deleniti. Ut a sunt eum cum ut repudiandae possimus. Nihil ex tempora neque cum consectetur dolores.', + 'Cum qui rem deleniti. Suscipit in dolor veritatis sequi aut. Vero ut earum quis deleniti. Ut a sunt eum cum ut repudiandae possimus. Nihil ex tempora neque cum consectetur dolores.', }, { id: 2, title: 'New password policy', href: '#', preview: - 'Alias inventore ut autem optio voluptas et repellendus. Facere totam quaerat quam quo laudantium cumque eaque excepturi vel. Accusamus maxime ipsam reprehenderit rerum id repellendus rerum. Culpa cum vel natus. Est sit autem mollitia.', + 'Alias inventore ut autem optio voluptas et repellendus. Facere totam quaerat quam quo laudantium cumque eaque excepturi vel. Accusamus maxime ipsam reprehenderit rerum id repellendus rerum. Culpa cum vel natus. Est sit autem mollitia.', }, { id: 3, title: 'Office closed on July 2nd', href: '#', preview: - 'Tenetur libero voluptatem rerum occaecati qui est molestiae exercitationem. Voluptate quisquam iure assumenda consequatur ex et recusandae. Alias consectetur voluptatibus. Accusamus a ab dicta et. Consequatur quis dignissimos voluptatem nisi.', + 'Tenetur libero voluptatem rerum occaecati qui est molestiae exercitationem. Voluptate quisquam iure assumenda consequatur ex et recusandae. Alias consectetur voluptatibus. Accusamus a ab dicta et. Consequatur quis dignissimos voluptatem nisi.', }, ] return { @@ -370,4 +371,4 @@ export default { } }, } - \ No newline at end of file + diff --git a/resources/js/Pages/VacationRequest/Show.vue b/resources/js/Pages/VacationRequest/Show.vue index d2fe273..d3ee1be 100644 --- a/resources/js/Pages/VacationRequest/Show.vue +++ b/resources/js/Pages/VacationRequest/Show.vue @@ -213,7 +213,3 @@ export default { }, } - - \ No newline at end of file diff --git a/resources/js/Shared/MainMenu.vue b/resources/js/Shared/MainMenu.vue index 39785cf..7243cbe 100644 --- a/resources/js/Shared/MainMenu.vue +++ b/resources/js/Shared/MainMenu.vue @@ -339,6 +339,4 @@ export default { } }, } - - diff --git a/resources/lang/pl.json b/resources/lang/pl.json index fe74d8d..29fae87 100644 --- a/resources/lang/pl.json +++ b/resources/lang/pl.json @@ -22,8 +22,8 @@ "canceled": "Anulowany", "rejected": "Odrzucony", "approved": "Zatwierdzony", - "waiting_for_technical": "Czeka na akceptacje od technicznego", - "waiting_for_administrative": "Czeka na akceptacje od administracyjnego", + "waiting_for_technical": "Czeka na akceptację od technicznego", + "waiting_for_administrative": "Czeka na akceptację od administracyjnego", "accepted_by_technical": "Zaakceptowany przez technicznego", "accepted_by_administrative": "Zaakceptowany przez administracyjnego" }