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

Compare commits

base: kamilniemczycki:dependabot/npm_and_yarn/main/vue-3.2.37
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:#152-dashboard-tables
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

6 Commits
dependabot ... #152-dashb

Author SHA1 Message Date
Kamil Niemczycki
043217e9d4 - fixed overflow 2022-07-04 19:28:13 +02:00
Kamil Niemczycki
9e47c7cb28 #152 - updated vacation limits 2022-07-04 11:41:59 +02:00
Kamil Niemczycki
e6f4d0e78c #152 - updated calendar view 2022-07-04 11:04:43 +02:00
Kamil Niemczycki
8dc487a133 #152 - updated MonthlyUsage 2022-07-04 11:04:14 +02:00
Kamil Niemczycki
5f0d6b5af3 #152 - updated header in calendar 2022-07-04 11:00:35 +02:00
Kamil Niemczycki
f755e1e0db #152 - updated calendar 2022-07-04 11:00:10 +02:00
18 changed files with 461 additions and 204 deletions
Expand all files Collapse all files

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

@@ -31,7 +31,6 @@ 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,7 +46,6 @@ 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,7 +49,6 @@ 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
{ {

520
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.37", "vue": "3.2.21",
"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.37", "version": "3.2.36",
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.36.tgz",
"integrity": "sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==", "integrity": "sha512-bbyZM5hvBicv0PW3KUfVi+x3ylHnfKG7DOn5wM+f2OztTzTjLEyBb/5yrarIYpmnGitVGbjZqDbODyW4iK8hqw==",
"dependencies": { "dependencies": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/shared": "3.2.37", "@vue/shared": "3.2.36",
"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.37", "version": "3.2.36",
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.36.tgz",
"integrity": "sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==", "integrity": "sha512-tcOTAOiW4s24QLnq+ON6J+GRONXJ+A/mqKCORi0LSlIh8XQlNnlm24y8xIL8la+ZDgkdbjarQ9ZqYSvEja6gVA==",
"dependencies": { "dependencies": {
"@vue/compiler-core": "3.2.37", "@vue/compiler-core": "3.2.36",
"@vue/shared": "3.2.37" "@vue/shared": "3.2.36"
} }
}, },
"node_modules/@vue/compiler-sfc": { "node_modules/@vue/compiler-sfc": {
"version": "3.2.37", "version": "3.2.36",
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.36.tgz",
"integrity": "sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==", "integrity": "sha512-AvGb4bTj4W8uQ4BqaSxo7UwTEqX5utdRSMyHy58OragWlt8nEACQ9mIeQh3K4di4/SX+41+pJrLIY01lHAOFOA==",
"dependencies": { "dependencies": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/compiler-core": "3.2.37", "@vue/compiler-core": "3.2.36",
"@vue/compiler-dom": "3.2.37", "@vue/compiler-dom": "3.2.36",
"@vue/compiler-ssr": "3.2.37", "@vue/compiler-ssr": "3.2.36",
"@vue/reactivity-transform": "3.2.37", "@vue/reactivity-transform": "3.2.36",
"@vue/shared": "3.2.37", "@vue/shared": "3.2.36",
"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,69 +2176,146 @@
} }
}, },
"node_modules/@vue/compiler-ssr": { "node_modules/@vue/compiler-ssr": {
"version": "3.2.37", "version": "3.2.36",
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.36.tgz",
"integrity": "sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw==", "integrity": "sha512-+KugInUFRvOxEdLkZwE+W43BqHyhBh0jpYXhmqw1xGq2dmE6J9eZ8UUSOKNhdHtQ/iNLWWeK/wPZkVLUf3YGaw==",
"dependencies": { "dependencies": {
"@vue/compiler-dom": "3.2.37", "@vue/compiler-dom": "3.2.36",
"@vue/shared": "3.2.37" "@vue/shared": "3.2.36"
} }
}, },
"node_modules/@vue/reactivity": { "node_modules/@vue/reactivity": {
"version": "3.2.37", "version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.37.tgz", "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.21.tgz",
"integrity": "sha512-/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A==", "integrity": "sha512-7C57zFm/5E3SSTUhVuYj1InDwuJ+GIVQ/z+H43C9sST85gIThGXVhksl1yWTAadf8Yz4T5lSbqi5Ds8U/ueWcw==",
"dependencies": { "dependencies": {
"@vue/shared": "3.2.37" "@vue/shared": "3.2.21"
} }
}, },
"node_modules/@vue/reactivity-transform": { "node_modules/@vue/reactivity-transform": {
"version": "3.2.37", "version": "3.2.36",
"resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz", "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.36.tgz",
"integrity": "sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==", "integrity": "sha512-Jk5o2BhpODC9XTA7o4EL8hSJ4JyrFWErLtClG3NH8wDS7ri9jBDWxI7/549T7JY9uilKsaNM+4pJASLj5dtRwA==",
"dependencies": { "dependencies": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/compiler-core": "3.2.37", "@vue/compiler-core": "3.2.36",
"@vue/shared": "3.2.37", "@vue/shared": "3.2.36",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"magic-string": "^0.25.7" "magic-string": "^0.25.7"
} }
}, },
"node_modules/@vue/runtime-core": { "node_modules/@vue/reactivity/node_modules/@vue/shared": {
"version": "3.2.37", "version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.37.tgz", "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.21.tgz",
"integrity": "sha512-JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ==", "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": { "dependencies": {
"@vue/reactivity": "3.2.37", "@babel/parser": "^7.15.0",
"@vue/shared": "3.2.37" "@vue/compiler-core": "3.2.21",
"@vue/shared": "3.2.21",
"estree-walker": "^2.0.2",
"magic-string": "^0.25.7"
} }
}, },
"node_modules/@vue/runtime-dom": { "node_modules/@vue/ref-transform/node_modules/@vue/compiler-core": {
"version": "3.2.37", "version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.37.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.21.tgz",
"integrity": "sha512-HimKdh9BepShW6YozwRKAYjYQWg9mQn63RGEiSswMbW+ssIht1MILYlVGkAGGQbkhSh31PCdoUcfiu4apXJoPw==", "integrity": "sha512-NhhiQZNG71KNq1h5pMW/fAXdTF7lJRaSI7LDm2edhHXVz1ROMICo8SreUmQnSf4Fet0UPBVqJ988eF4+936iDQ==",
"dependencies": { "dependencies": {
"@vue/runtime-core": "3.2.37", "@babel/parser": "^7.15.0",
"@vue/shared": "3.2.37", "@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": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.21.tgz",
"integrity": "sha512-7oOxKaU0D2IunOAMOOHZgJVrHg63xwng8BZx3fbgmakqEIMwHhQcp+5GV1sOg/sWW7R4UhaRDIUCukO2GRVK2Q==",
"dependencies": {
"@vue/reactivity": "3.2.21",
"@vue/shared": "3.2.21"
}
},
"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": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.21.tgz",
"integrity": "sha512-apBdriD6QsI4ywbllY8kjr9/0scGuStDuvLbJULPQkFPtHzntd51bP5PQTQVAEIc9kwnTozmj6x6ZdX/cwo7xA==",
"dependencies": {
"@vue/runtime-core": "3.2.21",
"@vue/shared": "3.2.21",
"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.37", "version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.37.tgz", "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.21.tgz",
"integrity": "sha512-kLITEJvaYgZQ2h47hIzPh2K3jG8c1zCVbp/o/bzQOyvzaKiCquKS7AaioPI28GNxIsE/zSx+EwWYsNxDCX95MA==", "integrity": "sha512-QBgYqVgI7XCSBCqGa4LduV9vpfQFdZBOodFmq5Txk5W/v1KrJ1LoOh2Q0RHiRgtoK/UR9uyvRVcYqOmwHkZNEg==",
"dependencies": { "dependencies": {
"@vue/compiler-ssr": "3.2.37", "@vue/compiler-ssr": "3.2.21",
"@vue/shared": "3.2.37" "@vue/shared": "3.2.21"
}, },
"peerDependencies": { "peerDependencies": {
"vue": "3.2.37" "vue": "3.2.21"
} }
}, },
"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.37", "version": "3.2.36",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz", "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.36.tgz",
"integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==" "integrity": "sha512-JtB41wXl7Au3+Nl3gD16Cfpj7k/6aCroZ6BbOiCMFCMvrOpkg/qQUXTso2XowaNqBbnkuGHurLAqkLBxNGc1hQ=="
}, },
"node_modules/@webassemblyjs/ast": { "node_modules/@webassemblyjs/ast": {
"version": "1.11.1", "version": "1.11.1",
@@ -8638,15 +8715,15 @@
"integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==" "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
}, },
"node_modules/vue": { "node_modules/vue": {
"version": "3.2.37", "version": "3.2.21",
"resolved": "https://registry.npmjs.org/vue/-/vue-3.2.37.tgz", "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.21.tgz",
"integrity": "sha512-bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ==", "integrity": "sha512-jpy7ckXdyclfRzqLjL4mtq81AkzQleE54KjZsJg/9OorNVurAxdlU5XpD49GpjKdnftuffKUvx2C5jDOrgc/zg==",
"dependencies": { "dependencies": {
"@vue/compiler-dom": "3.2.37", "@vue/compiler-dom": "3.2.21",
"@vue/compiler-sfc": "3.2.37", "@vue/compiler-sfc": "3.2.21",
"@vue/runtime-dom": "3.2.37", "@vue/runtime-dom": "3.2.21",
"@vue/server-renderer": "3.2.37", "@vue/server-renderer": "3.2.21",
"@vue/shared": "3.2.37" "@vue/shared": "3.2.21"
} }
}, },
"node_modules/vue-echarts": { "node_modules/vue-echarts": {
@@ -8796,6 +8873,57 @@
"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",
@@ -10921,36 +11049,36 @@
} }
}, },
"@vue/compiler-core": { "@vue/compiler-core": {
"version": "3.2.37", "version": "3.2.36",
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.36.tgz",
"integrity": "sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==", "integrity": "sha512-bbyZM5hvBicv0PW3KUfVi+x3ylHnfKG7DOn5wM+f2OztTzTjLEyBb/5yrarIYpmnGitVGbjZqDbODyW4iK8hqw==",
"requires": { "requires": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/shared": "3.2.37", "@vue/shared": "3.2.36",
"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.37", "version": "3.2.36",
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.36.tgz",
"integrity": "sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==", "integrity": "sha512-tcOTAOiW4s24QLnq+ON6J+GRONXJ+A/mqKCORi0LSlIh8XQlNnlm24y8xIL8la+ZDgkdbjarQ9ZqYSvEja6gVA==",
"requires": { "requires": {
"@vue/compiler-core": "3.2.37", "@vue/compiler-core": "3.2.36",
"@vue/shared": "3.2.37" "@vue/shared": "3.2.36"
} }
}, },
"@vue/compiler-sfc": { "@vue/compiler-sfc": {
"version": "3.2.37", "version": "3.2.36",
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.36.tgz",
"integrity": "sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==", "integrity": "sha512-AvGb4bTj4W8uQ4BqaSxo7UwTEqX5utdRSMyHy58OragWlt8nEACQ9mIeQh3K4di4/SX+41+pJrLIY01lHAOFOA==",
"requires": { "requires": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/compiler-core": "3.2.37", "@vue/compiler-core": "3.2.36",
"@vue/compiler-dom": "3.2.37", "@vue/compiler-dom": "3.2.36",
"@vue/compiler-ssr": "3.2.37", "@vue/compiler-ssr": "3.2.36",
"@vue/reactivity-transform": "3.2.37", "@vue/reactivity-transform": "3.2.36",
"@vue/shared": "3.2.37", "@vue/shared": "3.2.36",
"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",
@@ -10958,66 +11086,153 @@
} }
}, },
"@vue/compiler-ssr": { "@vue/compiler-ssr": {
"version": "3.2.37", "version": "3.2.36",
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.36.tgz",
"integrity": "sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw==", "integrity": "sha512-+KugInUFRvOxEdLkZwE+W43BqHyhBh0jpYXhmqw1xGq2dmE6J9eZ8UUSOKNhdHtQ/iNLWWeK/wPZkVLUf3YGaw==",
"requires": { "requires": {
"@vue/compiler-dom": "3.2.37", "@vue/compiler-dom": "3.2.36",
"@vue/shared": "3.2.37" "@vue/shared": "3.2.36"
} }
}, },
"@vue/reactivity": { "@vue/reactivity": {
"version": "3.2.37", "version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.37.tgz", "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.21.tgz",
"integrity": "sha512-/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A==", "integrity": "sha512-7C57zFm/5E3SSTUhVuYj1InDwuJ+GIVQ/z+H43C9sST85gIThGXVhksl1yWTAadf8Yz4T5lSbqi5Ds8U/ueWcw==",
"requires": { "requires": {
"@vue/shared": "3.2.37" "@vue/shared": "3.2.21"
},
"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.37", "version": "3.2.36",
"resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz", "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.36.tgz",
"integrity": "sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==", "integrity": "sha512-Jk5o2BhpODC9XTA7o4EL8hSJ4JyrFWErLtClG3NH8wDS7ri9jBDWxI7/549T7JY9uilKsaNM+4pJASLj5dtRwA==",
"requires": { "requires": {
"@babel/parser": "^7.16.4", "@babel/parser": "^7.16.4",
"@vue/compiler-core": "3.2.37", "@vue/compiler-core": "3.2.36",
"@vue/shared": "3.2.37", "@vue/shared": "3.2.36",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"magic-string": "^0.25.7" "magic-string": "^0.25.7"
} }
}, },
"@vue/runtime-core": { "@vue/ref-transform": {
"version": "3.2.37", "version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.37.tgz", "resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.21.tgz",
"integrity": "sha512-JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ==", "integrity": "sha512-uiEWWBsrGeun9O7dQExYWzXO3rHm/YdtFNXDVqCSoPypzOVxWxdiL+8hHeWzxMB58fVuV2sT80aUtIVyaBVZgQ==",
"requires": { "requires": {
"@vue/reactivity": "3.2.37", "@babel/parser": "^7.15.0",
"@vue/shared": "3.2.37" "@vue/compiler-core": "3.2.21",
} "@vue/shared": "3.2.21",
"estree-walker": "^2.0.2",
"magic-string": "^0.25.7"
}, },
"@vue/runtime-dom": { "dependencies": {
"version": "3.2.37", "@vue/compiler-core": {
"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.37.tgz", "version": "3.2.21",
"integrity": "sha512-HimKdh9BepShW6YozwRKAYjYQWg9mQn63RGEiSswMbW+ssIht1MILYlVGkAGGQbkhSh31PCdoUcfiu4apXJoPw==", "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.21.tgz",
"integrity": "sha512-NhhiQZNG71KNq1h5pMW/fAXdTF7lJRaSI7LDm2edhHXVz1ROMICo8SreUmQnSf4Fet0UPBVqJ988eF4+936iDQ==",
"requires": { "requires": {
"@vue/runtime-core": "3.2.37", "@babel/parser": "^7.15.0",
"@vue/shared": "3.2.37", "@vue/shared": "3.2.21",
"csstype": "^2.6.8" "estree-walker": "^2.0.2",
} "source-map": "^0.6.1"
},
"@vue/server-renderer": {
"version": "3.2.37",
"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.37.tgz",
"integrity": "sha512-kLITEJvaYgZQ2h47hIzPh2K3jG8c1zCVbp/o/bzQOyvzaKiCquKS7AaioPI28GNxIsE/zSx+EwWYsNxDCX95MA==",
"requires": {
"@vue/compiler-ssr": "3.2.37",
"@vue/shared": "3.2.37"
} }
}, },
"@vue/shared": { "@vue/shared": {
"version": "3.2.37", "version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz", "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.21.tgz",
"integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==" "integrity": "sha512-5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA=="
}
}
},
"@vue/runtime-core": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.21.tgz",
"integrity": "sha512-7oOxKaU0D2IunOAMOOHZgJVrHg63xwng8BZx3fbgmakqEIMwHhQcp+5GV1sOg/sWW7R4UhaRDIUCukO2GRVK2Q==",
"requires": {
"@vue/reactivity": "3.2.21",
"@vue/shared": "3.2.21"
},
"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": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.21.tgz",
"integrity": "sha512-apBdriD6QsI4ywbllY8kjr9/0scGuStDuvLbJULPQkFPtHzntd51bP5PQTQVAEIc9kwnTozmj6x6ZdX/cwo7xA==",
"requires": {
"@vue/runtime-core": "3.2.21",
"@vue/shared": "3.2.21",
"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": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.21.tgz",
"integrity": "sha512-QBgYqVgI7XCSBCqGa4LduV9vpfQFdZBOodFmq5Txk5W/v1KrJ1LoOh2Q0RHiRgtoK/UR9uyvRVcYqOmwHkZNEg==",
"requires": {
"@vue/compiler-ssr": "3.2.21",
"@vue/shared": "3.2.21"
},
"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": {
"version": "3.2.21",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.21.tgz",
"integrity": "sha512-5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA=="
}
}
},
"@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",
@@ -15746,15 +15961,68 @@
"integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==" "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
}, },
"vue": { "vue": {
"version": "3.2.37", "version": "3.2.21",
"resolved": "https://registry.npmjs.org/vue/-/vue-3.2.37.tgz", "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.21.tgz",
"integrity": "sha512-bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ==", "integrity": "sha512-jpy7ckXdyclfRzqLjL4mtq81AkzQleE54KjZsJg/9OorNVurAxdlU5XpD49GpjKdnftuffKUvx2C5jDOrgc/zg==",
"requires": { "requires": {
"@vue/compiler-dom": "3.2.37", "@vue/compiler-dom": "3.2.21",
"@vue/compiler-sfc": "3.2.37", "@vue/compiler-sfc": "3.2.21",
"@vue/runtime-dom": "3.2.37", "@vue/runtime-dom": "3.2.21",
"@vue/server-renderer": "3.2.37", "@vue/server-renderer": "3.2.21",
"@vue/shared": "3.2.37" "@vue/shared": "3.2.21"
},
"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.37", "vue": "3.2.21",
"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,18 +55,20 @@
</div> </div>
</div> </div>
<div class="overflow-x-auto"> <div class="overflow-x-auto">
<table class="w-full text-sm text-center border border-gray-300"> <table class="w-full text-sm text-center border-y border-r border-gray-300">
<thead> <thead>
<tr> <tr>
<th class="py-2 w-64 text-lg font-semibold text-gray-800 border border-gray-300"> <th
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 }} {{ years.selected.year }} {{ selectedMonth.name }}
</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 border-gray-300" class="p-2 text-lg font-semibold text-gray-900 border second:border-l-0 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 }"
> >
@@ -84,22 +86,28 @@
v-for="user in users.data" v-for="user in users.data"
:key="user.id" :key="user.id"
> >
<th class="p-2 border border-gray-300"> <th
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"> <div class="ml-3 flex items-start flex-col-reverse md:flex-row">
<div class="text-sm font-medium text-gray-900 truncate"> <span
{{ user.name }} v-for="split in user.name.split(' ', 2)"
</div> :key="split"
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 border-gray-300" class="border second:border-l-0 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"
@@ -176,3 +184,10 @@ 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>

2
resources/js/Pages/Holidays/Index.vue
View File

@@ -17,7 +17,7 @@
</div> </div>
</div> </div>
<div class="border-t border-gray-200"> <div class="border-t border-gray-200">
<div class="overflow-auto xl:overflow-visible"> <div class="overflow-x-auto">
<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>

2
resources/js/Pages/Keys.vue
View File

@@ -19,7 +19,7 @@
</div> </div>
</div> </div>
<div class="border-t border-gray-200"> <div class="border-t border-gray-200">
<div class="overflow-auto xl:overflow-visible"> <div class="overflow-x-auto">
<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>

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 overflow-y-hidden xl:overflow-x-visible"> <div class="overflow-x-auto">
<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"> <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">
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"> <th class="p-4 text-sm font-semibold text-gray-500 capitalize whitespace-nowrap bg-white sticky -left-1">
<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,12 +46,14 @@
:src="item.user.avatar" :src="item.user.avatar"
> >
</span> </span>
<div class="ml-3"> <div class="ml-3 flex items-start flex-col-reverse md:flex-row">
<div <span
class="text-sm font-medium text-gray-900 whitespace-nowrap" v-for="split in item.user.name.split(' ', 2)"
:key="split"
class="text-sm first:text-xs md:first:text-sm font-medium text-gray-900 truncate first:mr-1"
> >
{{ item.user.name }} {{ split }}
</div> </span>
</div> </div>
</div> </div>
</th> </th>

2
resources/js/Pages/Resumes/Index.vue
View File

@@ -15,7 +15,7 @@
</div> </div>
</div> </div>
<div class="border-t border-gray-200"> <div class="border-t border-gray-200">
<div class="overflow-auto xl:overflow-visible"> <div class="overflow-x-auto">
<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>

2
resources/js/Pages/Technologies.vue
View File

@@ -18,7 +18,7 @@
</div> </div>
</div> </div>
<div class="border-t border-gray-200"> <div class="border-t border-gray-200">
<div class="overflow-auto xl:overflow-visible"> <div class="overflow-x-auto">
<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>

2
resources/js/Pages/Users/Index.vue
View File

@@ -30,7 +30,7 @@
> >
</div> </div>
</div> </div>
<div class="overflow-auto xl:overflow-visible"> <div class="overflow-x-auto">
<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>

20
resources/js/Pages/VacationLimits.vue
View File

@@ -10,13 +10,13 @@
</div> </div>
<div class="border-t border-gray-200"> <div class="border-t border-gray-200">
<form @submit.prevent="submitVacationDays"> <form @submit.prevent="submitVacationDays">
<div class="overflow-auto xl:overflow-visible"> <div class="overflow-x-auto">
<table class="min-w-full border-b divide-y divide-gray-200"> <table class="min-w-full border-b divide-y divide-gray-200">
<thead class="bg-gray-50"> <thead class="bg-gray-50">
<tr> <tr>
<th <th
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 bg-gray-50 sticky -left-1"
> >
Imię i nazwisko Imię i nazwisko
</th> </th>
@@ -52,8 +52,8 @@
:key="item.id" :key="item.id"
class="hover:bg-blumilk-25" class="hover:bg-blumilk-25"
> >
<td class="p-4 text-sm text-gray-500 whitespace-nowrap"> <td class="p-4 text-sm text-gray-500 whitespace-nowrap bg-white sticky -left-1 z-10">
<div class="flex"> <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
class="w-10 h-10 rounded-full" class="w-10 h-10 rounded-full"
@@ -61,10 +61,16 @@
> >
</span> </span>
<div class="ml-3"> <div class="ml-3">
<p class="text-sm font-medium text-gray-900 break-all"> <p class="flex items-start flex-col-reverse md:flex-row">
{{ item.user.name }} <span
v-for="split in item.user.name.split(' ', 2)"
:key="split"
class="first:text-xs md:first:text-sm font-medium text-gray-900 truncate first:mr-1"
>
{{ split }}
</span>
</p> </p>
<p class="text-sm text-gray-500 break-all"> <p class="hidden md:block text-sm text-gray-500 break-all">
{{ item.user.email }} {{ item.user.email }}
</p> </p>
</div> </div>

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 || !isDirty ? 'disabled:opacity-60' : 'hover:bg-blumilk-700']" :class="[form.processing || !form.isDirty ? 'disabled:opacity-60' : 'hover:bg-blumilk-700']"
:disabled="form.processing || !isDirty" :disabled="form.processing || !form.isDirty"
> >
Zapisz Zapisz
</button> </button>
@@ -359,13 +359,6 @@ 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([])

2
resources/js/Pages/VacationRequest/Index.vue
View File

@@ -88,7 +88,7 @@
</Listbox> </Listbox>
</div> </div>
</div> </div>
<div class="overflow-auto xl:overflow-visible"> <div class="overflow-x-auto">
<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>

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

@@ -53,7 +53,7 @@
leave-to-class="opacity-0" leave-to-class="opacity-0"
> >
<ListboxOptions <ListboxOptions
class="overflow-auto absolute z-10 py-1 mt-1 w-full max-w-lg max-h-60 text-base bg-white rounded-md focus:outline-none ring-1 ring-black ring-opacity-5 shadow-lg sm:text-sm" class="overflow-x-auto absolute z-10 py-1 mt-1 w-full max-w-lg max-h-60 text-base bg-white rounded-md focus:outline-none ring-1 ring-black ring-opacity-5 shadow-lg sm:text-sm"
> >
<ListboxOption <ListboxOption
v-slot="{ active }" v-slot="{ active }"
@@ -237,51 +237,17 @@
</Listbox> </Listbox>
</div> </div>
</div> </div>
<div class="overflow-auto xl:overflow-visible"> <div class="overflow-x-auto">
<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 <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"
> >
Numer {{ head }}
</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>
@@ -381,6 +347,8 @@ 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',

8
tailwind.config.js
View File

@@ -1,4 +1,5 @@
const defaultTheme = require('tailwindcss/defaultTheme') const defaultTheme = require('tailwindcss/defaultTheme')
const plugin = require('tailwindcss/plugin')
module.exports = { module.exports = {
content: [ content: [
@@ -31,5 +32,12 @@ 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(50)->create(); User::factory()->count(15)->create();
$admin = User::factory()->admin()->create(); $admin = User::factory()->admin()->create();
$this->assertDatabaseCount("users", 51); $this->assertDatabaseCount("users", 16);
$this->actingAs($admin) $this->actingAs($admin)
->get("/users?page=2") ->get("/users?page=2")