kamilniemczycki/toby
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Activity

Compare commits

base: kamilniemczycki:style-update
Branches Tags
kamilniemczycki:main kamilniemczycki:#152-dashboard kamilniemczycki:#172-app-footer kamilniemczycki:#152-dashboard-calendar-widget kamilniemczycki:#172-deploy-version kamilniemczycki:#152-dashboard-tables kamilniemczycki:dashboard-calendar-widget kamilniemczycki:dependabot/npm_and_yarn/main/vue-3.2.37 kamilniemczycki:dependabot/composer/main/spatie/laravel-ignition-1.3.1 kamilniemczycki:style-update kamilniemczycki:change-limits kamilniemczycki:#17-dusk-tests
..
compare: kamilniemczycki:dependabot/npm_and_yarn/main/vue-3.2.37
Branches Tags
kamilniemczycki:#152-dashboard kamilniemczycki:#172-app-footer kamilniemczycki:#152-dashboard-calendar-widget kamilniemczycki:#172-deploy-version kamilniemczycki:#152-dashboard-tables kamilniemczycki:dashboard-calendar-widget kamilniemczycki:dependabot/npm_and_yarn/main/vue-3.2.37 kamilniemczycki:dependabot/composer/main/spatie/laravel-ignition-1.3.1 kamilniemczycki:style-update kamilniemczycki:main kamilniemczycki:change-limits kamilniemczycki:#17-dusk-tests

3 Commits
style-upda ... dependabot

Author SHA1 Message Date
dependabot[bot]
17a6aa15d1 #5 - (js) Bump vue from 3.2.21 to 3.2.37 
Bumps [vue](https://github.com/vuejs/core) from 3.2.21 to 3.2.37.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/core/compare/v3.2.21...v3.2.37)

---
updated-dependencies:
- dependency-name: vue
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-01 06:03:47 +00: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
14 changed files with 186 additions and 815 deletions
Expand all files Collapse all files

1
app/Eloquent/Models/Resume.php
View File

@@ -31,6 +31,7 @@ class Resume extends Model
"technologies" => AsCollection::class, "technologies" => AsCollection::class,
"projects" => AsCollection::class, "projects" => AsCollection::class,
]; ];
protected $perPage = 50;
public function user(): BelongsTo public function user(): BelongsTo
{ {

1
app/Eloquent/Models/User.php
View File

@@ -46,6 +46,7 @@ class User extends Authenticatable implements NotifiableInterface
protected $with = [ protected $with = [
"profile", "profile",
]; ];
protected $perPage = 50;
public function profile(): HasOne public function profile(): HasOne
{ {

1
app/Eloquent/Models/VacationRequest.php
View File

@@ -49,6 +49,7 @@ class VacationRequest extends Model
"to" => "date", "to" => "date",
"event_ids" => AsCollection::class, "event_ids" => AsCollection::class,
]; ];
protected $perPage = 50;
public function user(): BelongsTo public function user(): BelongsTo
{ {

500
package-lock.json generated
View File

@@ -23,7 +23,7 @@
"luxon": "^2.3.2", "luxon": "^2.3.2",
"postcss": "^8.4.14", "postcss": "^8.4.14",
"tailwindcss": "^3.0.24", "tailwindcss": "^3.0.24",
"vue": "3.2.21", "vue": "3.2.37",
"vue-echarts": "^6.0.2", "vue-echarts": "^6.0.2",
"vue-flatpickr-component": "^9.0.6", "vue-flatpickr-component": "^9.0.6",
"vue-loader": "^17.0.0", "vue-loader": "^17.0.0",
@@ -2139,36 +2139,36 @@
} }
}, },
"node_modules/@vue/compiler-core": { "node_modules/@vue/compiler-core": {
"version": "3.2.36", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.36.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz",
"integrity": "sha512-bbyZM5hvBicv0PW3KUfVi+x3ylHnfKG7DOn5wM+f2OztTzTjLEyBb/5yrarIYpmnGitVGbjZqDbODyW4iK8hqw==", "integrity": "sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==",
"dependencies": { "dependencies": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/shared": "3.2.36", "@vue/shared": "3.2.37",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"source-map": "^0.6.1" "source-map": "^0.6.1"
} }
}, },
"node_modules/@vue/compiler-dom": { "node_modules/@vue/compiler-dom": {
"version": "3.2.36", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.36.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz",
"integrity": "sha512-tcOTAOiW4s24QLnq+ON6J+GRONXJ+A/mqKCORi0LSlIh8XQlNnlm24y8xIL8la+ZDgkdbjarQ9ZqYSvEja6gVA==", "integrity": "sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==",
"dependencies": { "dependencies": {
"@vue/compiler-core": "3.2.36", "@vue/compiler-core": "3.2.37",
"@vue/shared": "3.2.36" "@vue/shared": "3.2.37"
} }
}, },
"node_modules/@vue/compiler-sfc": { "node_modules/@vue/compiler-sfc": {
"version": "3.2.36", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.36.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz",
"integrity": "sha512-AvGb4bTj4W8uQ4BqaSxo7UwTEqX5utdRSMyHy58OragWlt8nEACQ9mIeQh3K4di4/SX+41+pJrLIY01lHAOFOA==", "integrity": "sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==",
"dependencies": { "dependencies": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/compiler-core": "3.2.36", "@vue/compiler-core": "3.2.37",
"@vue/compiler-dom": "3.2.36", "@vue/compiler-dom": "3.2.37",
"@vue/compiler-ssr": "3.2.36", "@vue/compiler-ssr": "3.2.37",
"@vue/reactivity-transform": "3.2.36", "@vue/reactivity-transform": "3.2.37",
"@vue/shared": "3.2.36", "@vue/shared": "3.2.37",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"magic-string": "^0.25.7", "magic-string": "^0.25.7",
"postcss": "^8.1.10", "postcss": "^8.1.10",
@@ -2176,146 +2176,69 @@
} }
}, },
"node_modules/@vue/compiler-ssr": { "node_modules/@vue/compiler-ssr": {
"version": "3.2.36", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.36.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz",
"integrity": "sha512-+KugInUFRvOxEdLkZwE+W43BqHyhBh0jpYXhmqw1xGq2dmE6J9eZ8UUSOKNhdHtQ/iNLWWeK/wPZkVLUf3YGaw==", "integrity": "sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw==",
"dependencies": { "dependencies": {
"@vue/compiler-dom": "3.2.36", "@vue/compiler-dom": "3.2.37",
"@vue/shared": "3.2.36" "@vue/shared": "3.2.37"
} }
}, },
"node_modules/@vue/reactivity": { "node_modules/@vue/reactivity": {
"version": "3.2.21", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.21.tgz", "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.37.tgz",
"integrity": "sha512-7C57zFm/5E3SSTUhVuYj1InDwuJ+GIVQ/z+H43C9sST85gIThGXVhksl1yWTAadf8Yz4T5lSbqi5Ds8U/ueWcw==", "integrity": "sha512-/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A==",
"dependencies": { "dependencies": {
"@vue/shared": "3.2.21" "@vue/shared": "3.2.37"
} }
}, },
"node_modules/@vue/reactivity-transform": { "node_modules/@vue/reactivity-transform": {
"version": "3.2.36", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.36.tgz", "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz",
"integrity": "sha512-Jk5o2BhpODC9XTA7o4EL8hSJ4JyrFWErLtClG3NH8wDS7ri9jBDWxI7/549T7JY9uilKsaNM+4pJASLj5dtRwA==", "integrity": "sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==",
"dependencies": { "dependencies": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/compiler-core": "3.2.36", "@vue/compiler-core": "3.2.37",
"@vue/shared": "3.2.36", "@vue/shared": "3.2.37",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"magic-string": "^0.25.7" "magic-string": "^0.25.7"
} }
}, },
"node_modules/@vue/reactivity/node_modules/@vue/shared": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.21.tgz",
"integrity": "sha512-5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA=="
},
"node_modules/@vue/ref-transform": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.21.tgz",
"integrity": "sha512-uiEWWBsrGeun9O7dQExYWzXO3rHm/YdtFNXDVqCSoPypzOVxWxdiL+8hHeWzxMB58fVuV2sT80aUtIVyaBVZgQ==",
"dependencies": {
"@babel/parser": "^7.15.0",
"@vue/compiler-core": "3.2.21",
"@vue/shared": "3.2.21",
"estree-walker": "^2.0.2",
"magic-string": "^0.25.7"
}
},
"node_modules/@vue/ref-transform/node_modules/@vue/compiler-core": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.21.tgz",
"integrity": "sha512-NhhiQZNG71KNq1h5pMW/fAXdTF7lJRaSI7LDm2edhHXVz1ROMICo8SreUmQnSf4Fet0UPBVqJ988eF4+936iDQ==",
"dependencies": {
"@babel/parser": "^7.15.0",
"@vue/shared": "3.2.21",
"estree-walker": "^2.0.2",
"source-map": "^0.6.1"
}
},
"node_modules/@vue/ref-transform/node_modules/@vue/shared": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.21.tgz",
"integrity": "sha512-5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA=="
},
"node_modules/@vue/runtime-core": { "node_modules/@vue/runtime-core": {
"version": "3.2.21", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.21.tgz", "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.37.tgz",
"integrity": "sha512-7oOxKaU0D2IunOAMOOHZgJVrHg63xwng8BZx3fbgmakqEIMwHhQcp+5GV1sOg/sWW7R4UhaRDIUCukO2GRVK2Q==", "integrity": "sha512-JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ==",
"dependencies": { "dependencies": {
"@vue/reactivity": "3.2.21", "@vue/reactivity": "3.2.37",
"@vue/shared": "3.2.21" "@vue/shared": "3.2.37"
} }
}, },
"node_modules/@vue/runtime-core/node_modules/@vue/shared": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.21.tgz",
"integrity": "sha512-5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA=="
},
"node_modules/@vue/runtime-dom": { "node_modules/@vue/runtime-dom": {
"version": "3.2.21", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.21.tgz", "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.37.tgz",
"integrity": "sha512-apBdriD6QsI4ywbllY8kjr9/0scGuStDuvLbJULPQkFPtHzntd51bP5PQTQVAEIc9kwnTozmj6x6ZdX/cwo7xA==", "integrity": "sha512-HimKdh9BepShW6YozwRKAYjYQWg9mQn63RGEiSswMbW+ssIht1MILYlVGkAGGQbkhSh31PCdoUcfiu4apXJoPw==",
"dependencies": { "dependencies": {
"@vue/runtime-core": "3.2.21", "@vue/runtime-core": "3.2.37",
"@vue/shared": "3.2.21", "@vue/shared": "3.2.37",
"csstype": "^2.6.8" "csstype": "^2.6.8"
} }
}, },
"node_modules/@vue/runtime-dom/node_modules/@vue/shared": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.21.tgz",
"integrity": "sha512-5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA=="
},
"node_modules/@vue/server-renderer": { "node_modules/@vue/server-renderer": {
"version": "3.2.21", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.21.tgz", "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.37.tgz",
"integrity": "sha512-QBgYqVgI7XCSBCqGa4LduV9vpfQFdZBOodFmq5Txk5W/v1KrJ1LoOh2Q0RHiRgtoK/UR9uyvRVcYqOmwHkZNEg==", "integrity": "sha512-kLITEJvaYgZQ2h47hIzPh2K3jG8c1zCVbp/o/bzQOyvzaKiCquKS7AaioPI28GNxIsE/zSx+EwWYsNxDCX95MA==",
"dependencies": { "dependencies": {
"@vue/compiler-ssr": "3.2.21", "@vue/compiler-ssr": "3.2.37",
"@vue/shared": "3.2.21" "@vue/shared": "3.2.37"
}, },
"peerDependencies": { "peerDependencies": {
"vue": "3.2.21" "vue": "3.2.37"
} }
}, },
"node_modules/@vue/server-renderer/node_modules/@vue/compiler-core": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.21.tgz",
"integrity": "sha512-NhhiQZNG71KNq1h5pMW/fAXdTF7lJRaSI7LDm2edhHXVz1ROMICo8SreUmQnSf4Fet0UPBVqJ988eF4+936iDQ==",
"dependencies": {
"@babel/parser": "^7.15.0",
"@vue/shared": "3.2.21",
"estree-walker": "^2.0.2",
"source-map": "^0.6.1"
}
},
"node_modules/@vue/server-renderer/node_modules/@vue/compiler-dom": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.21.tgz",
"integrity": "sha512-gsJD3DpYZSYquiA7UIPsMDSlAooYWDvHPq9VRsqzJEk2PZtFvLvHPb4aaMD8Ufd62xzYn32cnnkzsEOJhyGilA==",
"dependencies": {
"@vue/compiler-core": "3.2.21",
"@vue/shared": "3.2.21"
}
},
"node_modules/@vue/server-renderer/node_modules/@vue/compiler-ssr": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.21.tgz",
"integrity": "sha512-eU+A0iWYy+1zAo2CRIJ0zSVlv1iuGAIbNRCnllSJ31pV1lX3jypJYzGbJlSRAbB7VP6E+tYveVT1Oq8JKewa3g==",
"dependencies": {
"@vue/compiler-dom": "3.2.21",
"@vue/shared": "3.2.21"
}
},
"node_modules/@vue/server-renderer/node_modules/@vue/shared": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.21.tgz",
"integrity": "sha512-5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA=="
},
"node_modules/@vue/shared": { "node_modules/@vue/shared": {
"version": "3.2.36", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.36.tgz", "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz",
"integrity": "sha512-JtB41wXl7Au3+Nl3gD16Cfpj7k/6aCroZ6BbOiCMFCMvrOpkg/qQUXTso2XowaNqBbnkuGHurLAqkLBxNGc1hQ==" "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
}, },
"node_modules/@webassemblyjs/ast": { "node_modules/@webassemblyjs/ast": {
"version": "1.11.1", "version": "1.11.1",
@@ -8715,15 +8638,15 @@
"integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==" "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
}, },
"node_modules/vue": { "node_modules/vue": {
"version": "3.2.21", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/vue/-/vue-3.2.21.tgz", "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.37.tgz",
"integrity": "sha512-jpy7ckXdyclfRzqLjL4mtq81AkzQleE54KjZsJg/9OorNVurAxdlU5XpD49GpjKdnftuffKUvx2C5jDOrgc/zg==", "integrity": "sha512-bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ==",
"dependencies": { "dependencies": {
"@vue/compiler-dom": "3.2.21", "@vue/compiler-dom": "3.2.37",
"@vue/compiler-sfc": "3.2.21", "@vue/compiler-sfc": "3.2.37",
"@vue/runtime-dom": "3.2.21", "@vue/runtime-dom": "3.2.37",
"@vue/server-renderer": "3.2.21", "@vue/server-renderer": "3.2.37",
"@vue/shared": "3.2.21" "@vue/shared": "3.2.37"
} }
}, },
"node_modules/vue-echarts": { "node_modules/vue-echarts": {
@@ -8873,57 +8796,6 @@
"vue": "^3.0.2" "vue": "^3.0.2"
} }
}, },
"node_modules/vue/node_modules/@vue/compiler-core": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.21.tgz",
"integrity": "sha512-NhhiQZNG71KNq1h5pMW/fAXdTF7lJRaSI7LDm2edhHXVz1ROMICo8SreUmQnSf4Fet0UPBVqJ988eF4+936iDQ==",
"dependencies": {
"@babel/parser": "^7.15.0",
"@vue/shared": "3.2.21",
"estree-walker": "^2.0.2",
"source-map": "^0.6.1"
}
},
"node_modules/vue/node_modules/@vue/compiler-dom": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.21.tgz",
"integrity": "sha512-gsJD3DpYZSYquiA7UIPsMDSlAooYWDvHPq9VRsqzJEk2PZtFvLvHPb4aaMD8Ufd62xzYn32cnnkzsEOJhyGilA==",
"dependencies": {
"@vue/compiler-core": "3.2.21",
"@vue/shared": "3.2.21"
}
},
"node_modules/vue/node_modules/@vue/compiler-sfc": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.21.tgz",
"integrity": "sha512-+yDlUSebKpz/ovxM2vLRRx7w/gVfY767pOfYTgbIhAs+ogvIV2BsIt4fpxlThnlCNChJ+yE0ERUNoROv2kEGEQ==",
"dependencies": {
"@babel/parser": "^7.15.0",
"@vue/compiler-core": "3.2.21",
"@vue/compiler-dom": "3.2.21",
"@vue/compiler-ssr": "3.2.21",
"@vue/ref-transform": "3.2.21",
"@vue/shared": "3.2.21",
"estree-walker": "^2.0.2",
"magic-string": "^0.25.7",
"postcss": "^8.1.10",
"source-map": "^0.6.1"
}
},
"node_modules/vue/node_modules/@vue/compiler-ssr": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.21.tgz",
"integrity": "sha512-eU+A0iWYy+1zAo2CRIJ0zSVlv1iuGAIbNRCnllSJ31pV1lX3jypJYzGbJlSRAbB7VP6E+tYveVT1Oq8JKewa3g==",
"dependencies": {
"@vue/compiler-dom": "3.2.21",
"@vue/shared": "3.2.21"
}
},
"node_modules/vue/node_modules/@vue/shared": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.21.tgz",
"integrity": "sha512-5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA=="
},
"node_modules/vue3-popper": { "node_modules/vue3-popper": {
"version": "1.5.0", "version": "1.5.0",
"resolved": "https://registry.npmjs.org/vue3-popper/-/vue3-popper-1.5.0.tgz", "resolved": "https://registry.npmjs.org/vue3-popper/-/vue3-popper-1.5.0.tgz",
@@ -11049,36 +10921,36 @@
} }
}, },
"@vue/compiler-core": { "@vue/compiler-core": {
"version": "3.2.36", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.36.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz",
"integrity": "sha512-bbyZM5hvBicv0PW3KUfVi+x3ylHnfKG7DOn5wM+f2OztTzTjLEyBb/5yrarIYpmnGitVGbjZqDbODyW4iK8hqw==", "integrity": "sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==",
"requires": { "requires": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/shared": "3.2.36", "@vue/shared": "3.2.37",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"source-map": "^0.6.1" "source-map": "^0.6.1"
} }
}, },
"@vue/compiler-dom": { "@vue/compiler-dom": {
"version": "3.2.36", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.36.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz",
"integrity": "sha512-tcOTAOiW4s24QLnq+ON6J+GRONXJ+A/mqKCORi0LSlIh8XQlNnlm24y8xIL8la+ZDgkdbjarQ9ZqYSvEja6gVA==", "integrity": "sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==",
"requires": { "requires": {
"@vue/compiler-core": "3.2.36", "@vue/compiler-core": "3.2.37",
"@vue/shared": "3.2.36" "@vue/shared": "3.2.37"
} }
}, },
"@vue/compiler-sfc": { "@vue/compiler-sfc": {
"version": "3.2.36", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.36.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz",
"integrity": "sha512-AvGb4bTj4W8uQ4BqaSxo7UwTEqX5utdRSMyHy58OragWlt8nEACQ9mIeQh3K4di4/SX+41+pJrLIY01lHAOFOA==", "integrity": "sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==",
"requires": { "requires": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/compiler-core": "3.2.36", "@vue/compiler-core": "3.2.37",
"@vue/compiler-dom": "3.2.36", "@vue/compiler-dom": "3.2.37",
"@vue/compiler-ssr": "3.2.36", "@vue/compiler-ssr": "3.2.37",
"@vue/reactivity-transform": "3.2.36", "@vue/reactivity-transform": "3.2.37",
"@vue/shared": "3.2.36", "@vue/shared": "3.2.37",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"magic-string": "^0.25.7", "magic-string": "^0.25.7",
"postcss": "^8.1.10", "postcss": "^8.1.10",
@@ -11086,153 +10958,66 @@
} }
}, },
"@vue/compiler-ssr": { "@vue/compiler-ssr": {
"version": "3.2.36", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.36.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz",
"integrity": "sha512-+KugInUFRvOxEdLkZwE+W43BqHyhBh0jpYXhmqw1xGq2dmE6J9eZ8UUSOKNhdHtQ/iNLWWeK/wPZkVLUf3YGaw==", "integrity": "sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw==",
"requires": { "requires": {
"@vue/compiler-dom": "3.2.36", "@vue/compiler-dom": "3.2.37",
"@vue/shared": "3.2.36" "@vue/shared": "3.2.37"
} }
}, },
"@vue/reactivity": { "@vue/reactivity": {
"version": "3.2.21", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.21.tgz", "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.37.tgz",
"integrity": "sha512-7C57zFm/5E3SSTUhVuYj1InDwuJ+GIVQ/z+H43C9sST85gIThGXVhksl1yWTAadf8Yz4T5lSbqi5Ds8U/ueWcw==", "integrity": "sha512-/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A==",
"requires": { "requires": {
"@vue/shared": "3.2.21" "@vue/shared": "3.2.37"
},
"dependencies": {
"@vue/shared": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.21.tgz",
"integrity": "sha512-5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA=="
}
} }
}, },
"@vue/reactivity-transform": { "@vue/reactivity-transform": {
"version": "3.2.36", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.36.tgz", "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz",
"integrity": "sha512-Jk5o2BhpODC9XTA7o4EL8hSJ4JyrFWErLtClG3NH8wDS7ri9jBDWxI7/549T7JY9uilKsaNM+4pJASLj5dtRwA==", "integrity": "sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==",
"requires": { "requires": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/compiler-core": "3.2.36", "@vue/compiler-core": "3.2.37",
"@vue/shared": "3.2.36", "@vue/shared": "3.2.37",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"magic-string": "^0.25.7" "magic-string": "^0.25.7"
} }
}, },
"@vue/ref-transform": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.21.tgz",
"integrity": "sha512-uiEWWBsrGeun9O7dQExYWzXO3rHm/YdtFNXDVqCSoPypzOVxWxdiL+8hHeWzxMB58fVuV2sT80aUtIVyaBVZgQ==",
"requires": {
"@babel/parser": "^7.15.0",
"@vue/compiler-core": "3.2.21",
"@vue/shared": "3.2.21",
"estree-walker": "^2.0.2",
"magic-string": "^0.25.7"
},
"dependencies": {
"@vue/compiler-core": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.21.tgz",
"integrity": "sha512-NhhiQZNG71KNq1h5pMW/fAXdTF7lJRaSI7LDm2edhHXVz1ROMICo8SreUmQnSf4Fet0UPBVqJ988eF4+936iDQ==",
"requires": {
"@babel/parser": "^7.15.0",
"@vue/shared": "3.2.21",
"estree-walker": "^2.0.2",
"source-map": "^0.6.1"
}
},
"@vue/shared": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.21.tgz",
"integrity": "sha512-5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA=="
}
}
},
"@vue/runtime-core": { "@vue/runtime-core": {
"version": "3.2.21", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.21.tgz", "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.37.tgz",
"integrity": "sha512-7oOxKaU0D2IunOAMOOHZgJVrHg63xwng8BZx3fbgmakqEIMwHhQcp+5GV1sOg/sWW7R4UhaRDIUCukO2GRVK2Q==", "integrity": "sha512-JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ==",
"requires": { "requires": {
"@vue/reactivity": "3.2.21", "@vue/reactivity": "3.2.37",
"@vue/shared": "3.2.21" "@vue/shared": "3.2.37"
},
"dependencies": {
"@vue/shared": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.21.tgz",
"integrity": "sha512-5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA=="
}
} }
}, },
"@vue/runtime-dom": { "@vue/runtime-dom": {
"version": "3.2.21", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.21.tgz", "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.37.tgz",
"integrity": "sha512-apBdriD6QsI4ywbllY8kjr9/0scGuStDuvLbJULPQkFPtHzntd51bP5PQTQVAEIc9kwnTozmj6x6ZdX/cwo7xA==", "integrity": "sha512-HimKdh9BepShW6YozwRKAYjYQWg9mQn63RGEiSswMbW+ssIht1MILYlVGkAGGQbkhSh31PCdoUcfiu4apXJoPw==",
"requires": { "requires": {
"@vue/runtime-core": "3.2.21", "@vue/runtime-core": "3.2.37",
"@vue/shared": "3.2.21", "@vue/shared": "3.2.37",
"csstype": "^2.6.8" "csstype": "^2.6.8"
},
"dependencies": {
"@vue/shared": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.21.tgz",
"integrity": "sha512-5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA=="
}
} }
}, },
"@vue/server-renderer": { "@vue/server-renderer": {
"version": "3.2.21", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.21.tgz", "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.37.tgz",
"integrity": "sha512-QBgYqVgI7XCSBCqGa4LduV9vpfQFdZBOodFmq5Txk5W/v1KrJ1LoOh2Q0RHiRgtoK/UR9uyvRVcYqOmwHkZNEg==", "integrity": "sha512-kLITEJvaYgZQ2h47hIzPh2K3jG8c1zCVbp/o/bzQOyvzaKiCquKS7AaioPI28GNxIsE/zSx+EwWYsNxDCX95MA==",
"requires": { "requires": {
"@vue/compiler-ssr": "3.2.21", "@vue/compiler-ssr": "3.2.37",
"@vue/shared": "3.2.21" "@vue/shared": "3.2.37"
},
"dependencies": {
"@vue/compiler-core": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.21.tgz",
"integrity": "sha512-NhhiQZNG71KNq1h5pMW/fAXdTF7lJRaSI7LDm2edhHXVz1ROMICo8SreUmQnSf4Fet0UPBVqJ988eF4+936iDQ==",
"requires": {
"@babel/parser": "^7.15.0",
"@vue/shared": "3.2.21",
"estree-walker": "^2.0.2",
"source-map": "^0.6.1"
}
},
"@vue/compiler-dom": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.21.tgz",
"integrity": "sha512-gsJD3DpYZSYquiA7UIPsMDSlAooYWDvHPq9VRsqzJEk2PZtFvLvHPb4aaMD8Ufd62xzYn32cnnkzsEOJhyGilA==",
"requires": {
"@vue/compiler-core": "3.2.21",
"@vue/shared": "3.2.21"
}
},
"@vue/compiler-ssr": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.21.tgz",
"integrity": "sha512-eU+A0iWYy+1zAo2CRIJ0zSVlv1iuGAIbNRCnllSJ31pV1lX3jypJYzGbJlSRAbB7VP6E+tYveVT1Oq8JKewa3g==",
"requires": {
"@vue/compiler-dom": "3.2.21",
"@vue/shared": "3.2.21"
} }
}, },
"@vue/shared": { "@vue/shared": {
"version": "3.2.21", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.21.tgz", "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz",
"integrity": "sha512-5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA==" "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
}
}
},
"@vue/shared": {
"version": "3.2.36",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.36.tgz",
"integrity": "sha512-JtB41wXl7Au3+Nl3gD16Cfpj7k/6aCroZ6BbOiCMFCMvrOpkg/qQUXTso2XowaNqBbnkuGHurLAqkLBxNGc1hQ=="
}, },
"@webassemblyjs/ast": { "@webassemblyjs/ast": {
"version": "1.11.1", "version": "1.11.1",
@@ -15961,68 +15746,15 @@
"integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==" "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
}, },
"vue": { "vue": {
"version": "3.2.21", "version": "3.2.37",
"resolved": "https://registry.npmjs.org/vue/-/vue-3.2.21.tgz", "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.37.tgz",
"integrity": "sha512-jpy7ckXdyclfRzqLjL4mtq81AkzQleE54KjZsJg/9OorNVurAxdlU5XpD49GpjKdnftuffKUvx2C5jDOrgc/zg==", "integrity": "sha512-bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ==",
"requires": { "requires": {
"@vue/compiler-dom": "3.2.21", "@vue/compiler-dom": "3.2.37",
"@vue/compiler-sfc": "3.2.21", "@vue/compiler-sfc": "3.2.37",
"@vue/runtime-dom": "3.2.21", "@vue/runtime-dom": "3.2.37",
"@vue/server-renderer": "3.2.21", "@vue/server-renderer": "3.2.37",
"@vue/shared": "3.2.21" "@vue/shared": "3.2.37"
},
"dependencies": {
"@vue/compiler-core": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.21.tgz",
"integrity": "sha512-NhhiQZNG71KNq1h5pMW/fAXdTF7lJRaSI7LDm2edhHXVz1ROMICo8SreUmQnSf4Fet0UPBVqJ988eF4+936iDQ==",
"requires": {
"@babel/parser": "^7.15.0",
"@vue/shared": "3.2.21",
"estree-walker": "^2.0.2",
"source-map": "^0.6.1"
}
},
"@vue/compiler-dom": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.21.tgz",
"integrity": "sha512-gsJD3DpYZSYquiA7UIPsMDSlAooYWDvHPq9VRsqzJEk2PZtFvLvHPb4aaMD8Ufd62xzYn32cnnkzsEOJhyGilA==",
"requires": {
"@vue/compiler-core": "3.2.21",
"@vue/shared": "3.2.21"
}
},
"@vue/compiler-sfc": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.21.tgz",
"integrity": "sha512-+yDlUSebKpz/ovxM2vLRRx7w/gVfY767pOfYTgbIhAs+ogvIV2BsIt4fpxlThnlCNChJ+yE0ERUNoROv2kEGEQ==",
"requires": {
"@babel/parser": "^7.15.0",
"@vue/compiler-core": "3.2.21",
"@vue/compiler-dom": "3.2.21",
"@vue/compiler-ssr": "3.2.21",
"@vue/ref-transform": "3.2.21",
"@vue/shared": "3.2.21",
"estree-walker": "^2.0.2",
"magic-string": "^0.25.7",
"postcss": "^8.1.10",
"source-map": "^0.6.1"
}
},
"@vue/compiler-ssr": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.21.tgz",
"integrity": "sha512-eU+A0iWYy+1zAo2CRIJ0zSVlv1iuGAIbNRCnllSJ31pV1lX3jypJYzGbJlSRAbB7VP6E+tYveVT1Oq8JKewa3g==",
"requires": {
"@vue/compiler-dom": "3.2.21",
"@vue/shared": "3.2.21"
}
},
"@vue/shared": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.21.tgz",
"integrity": "sha512-5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA=="
}
} }
}, },
"vue-echarts": { "vue-echarts": {

2
package.json
View File

@@ -31,7 +31,7 @@
"luxon": "^2.3.2", "luxon": "^2.3.2",
"postcss": "^8.4.14", "postcss": "^8.4.14",
"tailwindcss": "^3.0.24", "tailwindcss": "^3.0.24",
"vue": "3.2.21", "vue": "3.2.37",
"vue-echarts": "^6.0.2", "vue-echarts": "^6.0.2",
"vue-flatpickr-component": "^9.0.6", "vue-flatpickr-component": "^9.0.6",
"vue-loader": "^17.0.0", "vue-loader": "^17.0.0",

35
resources/js/Pages/Calendar.vue
View File

@@ -55,20 +55,18 @@
</div> </div>
</div> </div>
<div class="overflow-x-auto"> <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> <thead>
<tr> <tr>
<th <th class="py-2 w-64 text-lg font-semibold text-gray-800 border border-gray-300">
class="py-2 w-64 text-lg font-semibold text-gray-800 border-y border-gray-300 bg-white sticky left-0 sticky-border"
>
<div class="flex justify-center items-center"> <div class="flex justify-center items-center">
{{ selectedMonth.name }} {{ selectedMonth.name }} {{ years.selected.year }}
</div> </div>
</th> </th>
<th <th
v-for="day in calendar" v-for="day in calendar"
:key="day.dayOfMonth" :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;" style="min-width: 46px;"
:class="{ 'bg-red-100 text-red-800': day.isWeekend || day.isHoliday, 'text-blumilk-600 bg-blumilk-25': day.isToday }" :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" v-for="user in users.data"
:key="user.id" :key="user.id"
> >
<th <th class="p-2 border border-gray-300">
class="p-2 border-y border-gray-300 bg-white sticky left-0 sticky-border"
>
<div class="flex justify-start items-center"> <div class="flex justify-start items-center">
<span class="inline-flex justify-center items-center w-8 h-8 rounded-full"> <span class="inline-flex justify-center items-center w-8 h-8 rounded-full">
<img :src="user.avatar"> <img :src="user.avatar">
</span> </span>
<div class="ml-3 flex items-start flex-col-reverse md:flex-row"> <div class="ml-3">
<span <div class="text-sm font-medium text-gray-900 truncate">
v-for="split in user.name.split(' ', 2)" {{ user.name }}
:key="split" </div>
class="text-sm first:text-xs md:first:text-sm font-medium text-gray-900 truncate first:mr-1"
>
{{ split }}
</span>
</div> </div>
</div> </div>
</th> </th>
<td <td
v-for="day in calendar" v-for="day in calendar"
:key="day.dayOfMonth" :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 }" :class="{ 'bg-blumilk-25': day.isToday, 'bg-red-100': day.isWeekend || day.isHoliday }"
@mouseover="setActiveDay(user.id + '+' + day.date)" @mouseover="setActiveDay(user.id + '+' + day.date)"
@mouseleave="unsetActiveDay" @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 } return props.can.createOnBehalfOfEmployee ? { user: user.id, from_date: day.date } : { from_date: day.date }
} }
</script> </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>

3
resources/js/Pages/Dashboard.vue
View File

@@ -3,11 +3,9 @@
<div class="grid grid-cols-1 gap-4 items-start xl:grid-cols-3 xl:gap-8"> <div class="grid grid-cols-1 gap-4 items-start xl:grid-cols-3 xl:gap-8">
<div class="grid grid-cols-1 gap-4 xl:col-span-2"> <div class="grid grid-cols-1 gap-4 xl:col-span-2">
<Welcome :user="auth.user" /> <Welcome :user="auth.user" />
<VacationCalendar />
<VacationStats :stats="stats" /> <VacationStats :stats="stats" />
</div> </div>
<div class="grid grid-cols-1 gap-4"> <div class="grid grid-cols-1 gap-4">
<VacationCalendar />
<PendingVacationRequests <PendingVacationRequests
v-if="can.listAllVacationRequests" v-if="can.listAllVacationRequests"
:requests="vacationRequests.data" :requests="vacationRequests.data"
@@ -40,7 +38,6 @@ import HomeOfficeList from '@/Shared/Widgets/HomeOfficeList'
import UpcomingHolidays from '@/Shared/Widgets/UpcomingHolidays' import UpcomingHolidays from '@/Shared/Widgets/UpcomingHolidays'
import UserVacationRequests from '@/Shared/Widgets/UserVacationRequests' import UserVacationRequests from '@/Shared/Widgets/UserVacationRequests'
import PendingVacationRequests from '@/Shared/Widgets/PendingVacationRequests' import PendingVacationRequests from '@/Shared/Widgets/PendingVacationRequests'
import VacationCalendar from '@/Shared/Widgets/VacationCalendar'
defineProps({ defineProps({
auth: Object, auth: Object,

18
resources/js/Pages/MonthlyUsage.vue
View File

@@ -9,11 +9,11 @@
</div> </div>
</div> </div>
<div class="border-t border-gray-200"> <div class="border-t border-gray-200">
<div class="overflow-x-auto xl:overflow-x-visible"> <div class="overflow-x-auto overflow-y-hidden xl:overflow-x-visible">
<table class="min-w-full divide-y divide-gray-200"> <table class="min-w-full divide-y divide-gray-200">
<thead class="bg-gray-50"> <thead class="bg-gray-50">
<tr> <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 Pracownik
</th> </th>
<th <th
@@ -38,7 +38,7 @@
:key="item.user.id" :key="item.user.id"
class="hover:bg-blumilk-25" 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"> <div class="flex justify-start items-center">
<span class="inline-flex justify-center items-center w-10 h-10 rounded-full"> <span class="inline-flex justify-center items-center w-10 h-10 rounded-full">
<img <img
@@ -46,14 +46,12 @@
:src="item.user.avatar" :src="item.user.avatar"
> >
</span> </span>
<div class="ml-3 flex items-start flex-col-reverse md:flex-row"> <div class="ml-3">
<span <div
v-for="split in item.user.name.split(' ', 2)" class="text-sm font-medium text-gray-900 whitespace-nowrap"
:key="split"
class="text-sm first:text-xs md:first:text-sm font-medium text-gray-900 truncate first:mr-1"
> >
{{ split }} {{ item.user.name }}
</span> </div>
</div> </div>
</div> </div>
</th> </th>

11
resources/js/Pages/VacationRequest/Create.vue
View File

@@ -297,8 +297,8 @@
<button <button
type="submit" 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="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']" :class="[form.processing || !isDirty ? 'disabled:opacity-60' : 'hover:bg-blumilk-700']"
:disabled="form.processing || !form.isDirty" :disabled="form.processing || !isDirty"
> >
Zapisz Zapisz
</button> </button>
@@ -359,6 +359,13 @@ const form = useForm({
flowSkipped: false, 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) refreshEstimatedDays(form.from, form.to)
const estimatedDays = ref([]) const estimatedDays = ref([])

42
resources/js/Pages/VacationRequest/IndexForApprovers.vue
View File

@@ -242,12 +242,46 @@
<thead class="bg-gray-50"> <thead class="bg-gray-50">
<tr> <tr>
<th <th
v-for="head in headers"
:key="head"
scope="col" scope="col"
class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap" 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>
<th scope="col" /> <th scope="col" />
</tr> </tr>
@@ -347,8 +381,6 @@ const props = defineProps({
types: Object, types: Object,
}) })
const headers = ['Numer', 'Pracownik', 'Rodzaj wniosku', 'Od', 'Do', 'Dni urlopu', 'Status']
const statuses = [ const statuses = [
{ {
name: 'Wszystkie', name: 'Wszystkie',

12
resources/js/Shared/Widgets/Calendar/ViewModeOptions.js
View File

@@ -1,12 +0,0 @@
function isViewModeKey(key) {
return this.key === key.value
}
export const viewModes = [
{ key: 'week', name: 'Widok tygodnia', shortcut: 'Tydzień', is: isViewModeKey },
{ key: 'month', name: 'Widok miesiąca', shortcut: 'Miesiąc', is: isViewModeKey },
]
export function find(modeKey) {
return viewModes.find(mode => mode.key === modeKey)
}

363
resources/js/Shared/Widgets/VacationCalendar.vue
View File

@@ -1,363 +0,0 @@
<template>
<section class="bg-white shadow-md">
<div class="grid grid-cols-3 grid-rows-1 items-center justify-center p-4 sm:px-6">
<h2 class="text-lg font-medium leading-6 text-gray-900">
{{ calendarState.monthName }} {{ !calendarState.isActualYear ? calendar.currents.year : undefined }}
</h2>
<div class="flex justify-center">
<div class="flex items-center rounded-md shadow-sm md:items-stretch">
<button
v-if="calendarState.isPrevious"
type="button"
class="flex items-center justify-center rounded-l-md border border-r-0 border-gray-300 bg-white py-2 pl-3 pr-4 text-gray-400 hover:text-gray-500 focus:relative md:w-9 md:px-2 md:hover:bg-gray-50"
@click="toLast"
>
<span class="sr-only">Poprzedni {{ calendarState.viewMode.details.shortcut }}</span>
<ChevronLeftIcon
class="h-5 w-5"
aria-hidden="true"
/>
</button>
<button
type="button"
class="hidden border-t border-b border-gray-300 bg-white px-3.5 text-sm font-medium text-gray-700 hover:bg-gray-50 hover:text-gray-900 focus:relative md:block"
:class="{ 'rounded-l-md border border-r-0': !calendarState.isPrevious, 'rounded-r-md border border-l-0': !calendarState.isNext }"
@click="goToToday"
>
Dziś
</button>
<span class="relative -mx-px h-5 w-px bg-gray-300 md:hidden" />
<button
v-if="calendarState.isNext"
type="button"
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"
@click="toNext"
>
<span class="sr-only">Następny {{ calendarState.viewMode.details.shortcut }}</span>
<ChevronRightIcon
class="h-5 w-5"
aria-hidden="true"
/>
</button>
</div>
</div>
<Menu
as="div"
class="flex justify-end relative"
>
<MenuButton
type="button"
class="flex items-center rounded-md border border-gray-300 bg-white py-2 pl-3 pr-2 text-sm font-medium text-gray-700 shadow-sm hover:bg-gray-50"
>
{{ calendarState.viewMode.details.name }}
<ChevronDownIcon
class="ml-2 h-5 w-5 text-gray-400"
aria-hidden="true"
/>
</MenuButton>
<transition
class="z-10"
enter-active-class="transition ease-out duration-100"
enter-from-class="transform opacity-0 scale-95"
enter-to-class="transform opacity-100 scale-100"
leave-active-class="transition ease-in duration-75"
leave-from-class="transform opacity-100 scale-100"
leave-to-class="transform opacity-0 scale-95"
>
<MenuItems class="absolute right-0 mt-3 w-36 origin-top-right overflow-hidden rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
<div class="py-1">
<MenuItem
v-for="option in viewModes"
:key="option.key"
v-slot="{ active }"
>
<button
:class="[active ? 'bg-gray-100 text-gray-900' : 'text-gray-700', 'flex px-4 py-2 text-sm text-left w-full']"
@click="updateViewMode(option.key)"
>
{{ option.shortcut }}
<CheckIcon
v-if="option.is(calendar.viewMode)"
class="ml-2 w-5 h-5 text-blumilk-500"
/>
</button>
</MenuItem>
</div>
</MenuItems>
</transition>
</Menu>
</div>
<div class="ring-1 ring-black ring-opacity-5 lg:flex lg:flex-auto lg:flex-col">
<div
v-if="calendarState.viewMode.isMonth"
class="grid grid-cols-7 gap-px border-b border-gray-300 bg-gray-200 text-center text-xs font-semibold leading-6 text-gray-700 lg:flex-none"
>
<div class="bg-white py-2">
Pn
</div>
<div class="bg-white py-2">
Wt
</div>
<div class="bg-white py-2">
Śr
</div>
<div class="bg-white py-2">
Cz
</div>
<div class="bg-white py-2">
Pt
</div>
<div class="bg-red-100 py-2">
Sb
</div>
<div class="bg-red-100 py-2">
Nd
</div>
</div>
<div class="flex bg-gray-200 text-xs leading-6 text-gray-700 lg:flex-auto">
<div
class="w-full grid grid-cols-7 gap-px"
:class="{ 'grid-rows-1': calendarState.viewMode.isWeek }"
>
<div
v-for="(day, index) in days"
:key="index"
class="flex flex-col"
:class="[day.isCurrentMonth ? 'bg-white' : 'bg-gray-50 text-gray-500', calendarState.viewMode.isWeek && index !== 0 && (index % 5 === 0 || index % 6 === 0) ? 'bg-red-100' : undefined, calendarState.viewMode.isWeek ? 'day' : 'month-day', 'relative py-2 px-3']"
>
<time
:datetime="day.date"
:class="day.isToday ? 'flex h-6 w-6 items-center justify-center rounded-full bg-indigo-600 font-semibold text-white' : undefined"
>
{{ day.date.split('-').pop().replace(/^0/, '') }}
</time>
</div>
</div>
</div>
</div>
</section>
</template>
<script setup>
import { CheckIcon, ChevronDownIcon, ChevronLeftIcon, ChevronRightIcon } from '@heroicons/vue/solid'
import { Menu, MenuButton, MenuItem, MenuItems } from '@headlessui/vue'
import { ref, watch, computed, reactive } from 'vue'
import { DateTime } from 'luxon'
import useCurrentYearPeriodInfo from '@/Composables/yearPeriodInfo'
import { useMonthInfo } from '@/Composables/monthInfo'
import { viewModes, find as findViewMode } from '@/Shared/Widgets/Calendar/ViewModeOptions'
let days = ref([])
const months = useMonthInfo().getMonths()
function getCurrentDate() {
const { year, month, weekNumber } = DateTime.now()
return { year, month, week: weekNumber }
}
const selectedYear = useCurrentYearPeriodInfo().year.value
const currentDate = getCurrentDate()
const calendar = {
viewMode: ref('week'),
currents: reactive({
year: selectedYear,
month: selectedYear === currentDate.year ? currentDate.month : 1,
week: selectedYear === currentDate.year ? currentDate.week : 0,
}),
}
const calendarState = reactive({
viewMode: {
isWeek: computed(() => calendar.viewMode.value === 'week'),
isMonth: computed(() => calendar.viewMode.value === 'month'),
details: computed(() => findViewMode(calendar.viewMode.value)),
},
monthName: computed(() => months[calendar.currents.month - 1]?.name),
isActualYear: computed(() => calendar.currents.year === DateTime.now().year),
isPrevious: computed(() => calendarState.viewMode.isMonth ? calendar.currents.month !== 1 : calendar.currents.week > 0),
isNext: computed(() => calendarState.viewMode.isMonth ? calendar.currents.month !== 12 : calendar.currents.week < DateTime.fromObject({ year: selectedYear, month: 12, day: 31 }).weekNumber),
})
const customCalendar = {
generateCalendar() {
const date = DateTime.fromObject({
year: calendar.currents.year,
month: calendarState.viewMode.isMonth ? calendar.currents.month : 1,
day: 1,
})
days.value = this.generateCalendarData(date)
},
generateCalendarData(date) {
const firstMonthDay = date.startOf('month')
const lastMonthDay = date.endOf('month')
if (calendarState.viewMode.isWeek) {
return this.generateWeekData(firstMonthDay.startOf('week'))
} else if (calendarState.viewMode.isMonth) {
return this.generateMonthData(firstMonthDay.startOf('week'), lastMonthDay.endOf('week'))
}
return []
},
generateWeekData(start) {
let days = [], startWeek
if (calendar.currents.month === 1 && calendar.currents.week === 0)
startWeek = DateTime.fromObject({ year: calendar.currents.year, month: 1, day: 1 }).startOf('week')
else if (calendarState.isActualYear)
startWeek = DateTime.fromObject({ weekNumber: calendar.currents.week })
else
startWeek = start.plus({ week: calendar.currents.week })
const endWeek = startWeek.endOf('week')
for (let day = startWeek; day < endWeek; day = day.plus({ day: 1 })) {
days.push(this.prepareDay(day))
}
return days
},
generateMonthData(start, end) {
let days = []
for (let day = start; day < end; day = day.plus({ day: 1 })) {
days.push(this.prepareDay(day))
}
return days
},
prepareDay(day) {
return {
date: day.toISODate(),
dayNumber: day.day,
isCurrentMonth: isInCurrentMonth(day),
isToday: isToday(day),
}
},
}
watch([calendar.viewMode, calendar.currents], () => {
customCalendar.generateCalendar()
})
customCalendar.generateCalendar()
function toLast() {
if (calendar.viewMode.value === 'week')
minusWeek()
else
addMonths(-1)
}
function toNext() {
if (calendar.viewMode.value === 'week') {
addWeek()
} else
addMonths()
}
function resetCalendar(config = {}) {
const currentMonth = isUndefined(config.month) ? currentDate.month : config.month
const currentWeek = isUndefined(config.week) ? currentDate.week : config.week
calendar.currents.year = isUndefined(config.year) ? selectedYear : config.month
calendar.currents.month = calendarState.isActualYear || !isUndefined(config.year) ? currentMonth : 1
calendar.currents.week = calendarState.isActualYear || !isUndefined(config.year) ? currentWeek : 1
}
function isUndefined(value) {
return value === undefined
}
function addWeek(minus = false) {
const howMany = minus ? -1: 1
let nextMonth, date = DateTime.fromObject({
year: calendar.currents.year,
month: 1,
day: 1,
})
date = date.plus({ week: calendar.currents.week + howMany })
const startWeekDay = date.startOf('week'), endWeekDay = date.endOf('week')
nextMonth = howMany > 0 ? startWeekDay.month : endWeekDay.month
if (howMany < 0 && endWeekDay.day === endWeekDay.daysInMonth) {
console.log('pre', endWeekDay.day, endWeekDay.daysInMonth)
calendar.currents.week--
} else if (howMany > 0 && startWeekDay.day === 1) {
console.log('next', endWeekDay.day, endWeekDay.daysInMonth)
calendar.currents.week++
} else {
console.log('else', endWeekDay.day, endWeekDay.daysInMonth)
}
if (nextMonth !== calendar.currents.month) {
calendar.currents.month = calendar.currents.week > 1 ? nextMonth : 1
if (calendar.currents.week === 1)
calendar.currents.week = 0
return
}
calendar.currents.week += howMany
}
function minusWeek() {
addWeek(true)
}
function addMonths(howMany = 1) {
calendar.currents.month += howMany
}
function goToToday() {
resetCalendar({ year: currentDate.year, months: currentDate.month, week: currentDate.week })
}
function updateViewMode(type) {
if (type === 'month')
resetCalendar({ week: 1 })
else
resetCalendar()
calendar.viewMode.value = type
}
function isInCurrentMonth(date) {
return calendar.currents.month === date.month
}
function isToday(date) {
return date.toISODate() === DateTime.local().toISODate()
}
</script>
<style lang="css">
.day:nth-of-type(7n - 6):before {
content: "Pn";
}
.day:nth-of-type(7n - 5):before {
content: "Wt";
}
.day:nth-of-type(7n - 4):before {
content: "Śr";
}
.day:nth-of-type(7n - 3):before {
content: "Cz";
}
.day:nth-of-type(7n - 2):before {
content: "Pt";
}
.day:nth-of-type(7n - 1):before,
.day:nth-of-type(7n):before {
color: #991b1b;
}
.day:nth-of-type(7n - 1):before {
content: "Sb";
}
.day:nth-of-type(7n):before {
content: "Nd";
}
.month-day:nth-of-type(7n - 1), .month-day:nth-of-type(7n) {
background-color: #fee2e2;
}
</style>

8
tailwind.config.js
View File

@@ -1,5 +1,4 @@
const defaultTheme = require('tailwindcss/defaultTheme') const defaultTheme = require('tailwindcss/defaultTheme')
const plugin = require('tailwindcss/plugin')
module.exports = { module.exports = {
content: [ content: [
@@ -32,12 +31,5 @@ module.exports = {
require('@tailwindcss/forms'), require('@tailwindcss/forms'),
require('@tailwindcss/typography'), require('@tailwindcss/typography'),
require('@tailwindcss/line-clamp'), require('@tailwindcss/line-clamp'),
plugin(function({ addVariant, e }) {
addVariant('second', ({ modifySelectors, separator }) => {
modifySelectors(({ className }) => {
return `.${e(`second${separator}${className}`)}:nth-child(2)`
})
})
}),
], ],
} }

4
tests/Feature/UserTest.php
View File

@@ -73,10 +73,10 @@ class UserTest extends FeatureTestCase
public function testUserListIsPaginated(): void public function testUserListIsPaginated(): void
{ {
User::factory()->count(15)->create(); User::factory()->count(50)->create();
$admin = User::factory()->admin()->create(); $admin = User::factory()->admin()->create();
$this->assertDatabaseCount("users", 16); $this->assertDatabaseCount("users", 51);
$this->actingAs($admin) $this->actingAs($admin)
->get("/users?page=2") ->get("/users?page=2")