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 853f4e3..0000000
Binary files a/public/img/logo-white.png and /dev/null differ
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
-
+
-
+
-
+
Dzisiaj
@@ -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/Error.vue b/resources/js/Pages/Error.vue
index 76bfd45..438ae37 100644
--- a/resources/js/Pages/Error.vue
+++ b/resources/js/Pages/Error.vue
@@ -1,24 +1,24 @@
-