From b49fcadbba716e1ccfc30956917b8e020bdd5454 Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Thu, 31 Mar 2022 10:12:33 +0200 Subject: [PATCH] #99 - ui changes (#100) * #99 - ui changes * #99 - logo fix * #99 - tailwind plugin for eslint * #99 - fix * #99 - fix * #99 - fix pagination * #99 - fix logo Co-authored-by: EwelinaLasowy --- .eslintrc.js | 6 + app/Eloquent/Models/User.php | 6 +- .../Controllers/VacationRequestController.php | 2 +- package-lock.json | 26 ++ package.json | 1 + public/img/logo-white.png | Bin 6896 -> 0 bytes public/img/logo-white.svg | 16 + resources/js/Pages/Calendar.vue | 36 +- resources/js/Pages/Dashboard.vue | 4 +- resources/js/Pages/Error.vue | 12 +- resources/js/Pages/Holidays/Create.vue | 23 +- resources/js/Pages/Holidays/Edit.vue | 23 +- resources/js/Pages/Holidays/Index.vue | 41 +-- resources/js/Pages/Login.vue | 22 +- resources/js/Pages/MonthlyUsage.vue | 20 +- resources/js/Pages/Users/Create.vue | 71 ++-- resources/js/Pages/Users/Edit.vue | 69 ++-- resources/js/Pages/Users/Index.vue | 69 ++-- resources/js/Pages/VacationLimits.vue | 67 ++-- resources/js/Pages/VacationRequest/Create.vue | 127 ++++--- resources/js/Pages/VacationRequest/Index.vue | 133 +++++-- .../VacationRequest/IndexForApprovers.vue | 327 +++++++++--------- resources/js/Pages/VacationRequest/Show.vue | 92 ++--- resources/js/Shared/Activity.vue | 10 +- resources/js/Shared/Layout/AppLayout.vue | 4 +- resources/js/Shared/Layout/GuestLayout.vue | 2 +- resources/js/Shared/MainMenu.vue | 91 ++--- resources/js/Shared/Pagination.vue | 14 +- resources/js/Shared/VacationBar.vue | 24 +- .../js/Shared/VacationTypeCalendarIcon.vue | 2 +- resources/js/Shared/Widgets/AbsenceList.vue | 8 +- .../Widgets/PendingVacationRequests.vue | 8 +- .../js/Shared/Widgets/UpcomingHolidays.vue | 8 +- .../Shared/Widgets/UserVacationRequests.vue | 6 +- resources/js/Shared/Widgets/VacationStats.vue | 36 +- resources/js/Shared/Widgets/Welcome.vue | 12 +- resources/js/app.js | 1 + routes/api.php | 6 +- 38 files changed, 758 insertions(+), 667 deletions(-) delete mode 100644 public/img/logo-white.png create mode 100644 public/img/logo-white.svg diff --git a/.eslintrc.js b/.eslintrc.js index e8d2e95..ba5b8c0 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,4 +1,5 @@ module.exports = { + plugins: ['tailwindcss'], env: { node: true, 'vue/setup-compiler-macros': true, @@ -15,5 +16,10 @@ module.exports = { 'comma-dangle': ['error', 'always-multiline'], 'object-curly-spacing': ['error', 'always'], 'vue/require-default-prop': 0, + 'tailwindcss/classnames-order': 'error', + 'tailwindcss/enforces-negative-arbitrary-values': 'error', + 'tailwindcss/enforces-shorthand': 'error', + 'tailwindcss/no-arbitrary-value': 'error', + 'tailwindcss/no-contradicting-classname': 'error', }, } diff --git a/app/Eloquent/Models/User.php b/app/Eloquent/Models/User.php index 0256927..3d12fa9 100644 --- a/app/Eloquent/Models/User.php +++ b/app/Eloquent/Models/User.php @@ -103,9 +103,9 @@ class User extends Authenticatable } return $query - ->where("first_name", "ILIKE", $text) - ->orWhere("last_name", "ILIKE", $text) - ->orWhere("email", "ILIKE", $text); + ->where("first_name", "ILIKE", "%{$text}%") + ->orWhere("last_name", "ILIKE", "%{$text}%") + ->orWhere("email", "ILIKE", "%{$text}%"); } public function scopeWithVacationLimitIn(Builder $query, YearPeriod $yearPeriod): Builder diff --git a/app/Infrastructure/Http/Controllers/VacationRequestController.php b/app/Infrastructure/Http/Controllers/VacationRequestController.php index 1ea2e0f..6d1cf6d 100644 --- a/app/Infrastructure/Http/Controllers/VacationRequestController.php +++ b/app/Infrastructure/Http/Controllers/VacationRequestController.php @@ -113,7 +113,7 @@ class VacationRequestController extends Controller "users" => UserResource::collection($users), "filters" => [ "status" => $status, - "user" => $user, + "user" => (int)$user, ], ]); } diff --git a/package-lock.json b/package-lock.json index b584c84..6e6fd67 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,6 +34,7 @@ }, "devDependencies": { "eslint": "^8.11.0", + "eslint-plugin-tailwindcss": "^3.5.0", "eslint-plugin-vue": "^8.5.0" } }, @@ -4344,6 +4345,20 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint-plugin-tailwindcss": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-tailwindcss/-/eslint-plugin-tailwindcss-3.5.0.tgz", + "integrity": "sha512-m1NyKX1qii3arb+zWrsNO5R15b27aaEm6m1ie9JM9a6yBrU9Q8H62obzT/U8PSITIucMY864uxljV8MiP7H6xg==", + "dev": true, + "dependencies": { + "fast-glob": "^3.2.5", + "postcss": "^8.4.4", + "tailwindcss": "^3.0.7" + }, + "engines": { + "node": ">=12.13.0" + } + }, "node_modules/eslint-plugin-vue": { "version": "8.5.0", "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.5.0.tgz", @@ -12883,6 +12898,17 @@ "v8-compile-cache": "^2.0.3" } }, + "eslint-plugin-tailwindcss": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-tailwindcss/-/eslint-plugin-tailwindcss-3.5.0.tgz", + "integrity": "sha512-m1NyKX1qii3arb+zWrsNO5R15b27aaEm6m1ie9JM9a6yBrU9Q8H62obzT/U8PSITIucMY864uxljV8MiP7H6xg==", + "dev": true, + "requires": { + "fast-glob": "^3.2.5", + "postcss": "^8.4.4", + "tailwindcss": "^3.0.7" + } + }, "eslint-plugin-vue": { "version": "8.5.0", "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.5.0.tgz", diff --git a/package.json b/package.json index 320b280..decb2c6 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ }, "devDependencies": { "eslint": "^8.11.0", + "eslint-plugin-tailwindcss": "^3.5.0", "eslint-plugin-vue": "^8.5.0" } } diff --git a/public/img/logo-white.png b/public/img/logo-white.png deleted file mode 100644 index 853f4e3246748a95fbccdacd0182ed1f985d60d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6896 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 diff --git a/public/img/logo-white.svg b/public/img/logo-white.svg new file mode 100644 index 0000000..a8798a0 --- /dev/null +++ b/public/img/logo-white.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + blumilk_ + + diff --git a/resources/js/Pages/Calendar.vue b/resources/js/Pages/Calendar.vue index 954399f..60e165d 100644 --- a/resources/js/Pages/Calendar.vue +++ b/resources/js/Pages/Calendar.vue @@ -3,28 +3,28 @@
-

+

Kalendarz urlopów

-
+
- + - + @@ -32,32 +32,32 @@ v-if="nextMonth" as="button" :href="`/vacation/calendar/${nextMonth.value}`" - class="flex items-center justify-center rounded-r-md border border-l-0 border-gray-300 bg-white py-2 pl-4 pr-3 text-gray-400 hover:text-gray-500 focus:relative md:w-9 md:px-2 md:hover:bg-gray-50" + class="flex focus:relative justify-center items-center p-2 text-gray-400 hover:text-gray-500 bg-white rounded-r-md border border-l-0 border-gray-300 md:px-2 md:w-9 md:hover:bg-gray-50" > - + - +
- +
-
+
{{ selectedMonth.name }} {{ years.selected.year }}
@@ -65,13 +65,13 @@
{{ day.dayOfMonth }} -

+

{{ day.dayOfWeek }}

@@ -83,9 +83,9 @@ v-for="user in users.data" :key="user.id" > - 		+
- +
diff --git a/resources/js/Pages/Dashboard.vue b/resources/js/Pages/Dashboard.vue index ba6e5d1..303e371 100644 --- a/resources/js/Pages/Dashboard.vue +++ b/resources/js/Pages/Dashboard.vue @@ -1,7 +1,7 @@ diff --git a/resources/js/Pages/VacationRequest/Create.vue b/resources/js/Pages/VacationRequest/Create.vue index 4575a21..9da43f1 100644 --- a/resources/js/Pages/VacationRequest/Create.vue +++ b/resources/js/Pages/VacationRequest/Create.vue @@ -1,25 +1,25 @@