Compare commits

..

No commits in common. "c04281b05015bff2cb0b5ce2046e45e5929acd36" and "043217e9d4eb397db46c734e80a304a91d38c7ca" have entirely different histories.

10 changed files with 713 additions and 588 deletions

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
{ {

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
{ {

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
{ {

View File

@ -9,7 +9,7 @@
"ext-pdo": "*", "ext-pdo": "*",
"ext-redis": "*", "ext-redis": "*",
"azuyalabs/yasumi": "^2.4", "azuyalabs/yasumi": "^2.4",
"barryvdh/laravel-dompdf": "^2.0", "barryvdh/laravel-dompdf": "^1.0",
"fruitcake/laravel-cors": "^3.0", "fruitcake/laravel-cors": "^3.0",
"guzzlehttp/guzzle": "^7.0.1", "guzzlehttp/guzzle": "^7.0.1",
"inertiajs/inertia-laravel": "^0.6.2", "inertiajs/inertia-laravel": "^0.6.2",

508
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -2,7 +2,7 @@ version: '3.8'
services: services:
web: web:
image: nginx:1.23-alpine image: nginx:1.21-alpine
container_name: toby-web container_name: toby-web
working_dir: /application working_dir: /application
volumes: volumes:
@ -76,7 +76,7 @@ services:
restart: unless-stopped restart: unless-stopped
node: node:
image: node:18.4.0-alpine3.16 image: node:18.1.0-alpine3.14
container_name: toby-node container_name: toby-node
working_dir: /application working_dir: /application
volumes: volumes:

747
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -13,7 +13,7 @@
"lintf": "./node_modules/.bin/eslint resources/js --ext .js,.vue --fix" "lintf": "./node_modules/.bin/eslint resources/js --ext .js,.vue --fix"
}, },
"dependencies": { "dependencies": {
"@headlessui/vue": "^1.6.5", "@headlessui/vue": "^1.6.4",
"@heroicons/vue": "^1.0.6", "@heroicons/vue": "^1.0.6",
"@inertiajs/inertia": "^0.11.0", "@inertiajs/inertia": "^0.11.0",
"@inertiajs/inertia-vue3": "^0.6.0", "@inertiajs/inertia-vue3": "^0.6.0",
@ -21,27 +21,27 @@
"@tailwindcss/forms": "^0.5.2", "@tailwindcss/forms": "^0.5.2",
"@tailwindcss/line-clamp": "^0.4.0", "@tailwindcss/line-clamp": "^0.4.0",
"@tailwindcss/typography": "^0.5.2", "@tailwindcss/typography": "^0.5.2",
"@vue/compiler-sfc": "^3.2.37", "@vue/compiler-sfc": "^3.2.31",
"autoprefixer": "^10.4.7", "autoprefixer": "^10.4.7",
"axios": "^0.27.2", "axios": "^0.27.2",
"echarts": "^5.3.3", "echarts": "^5.3.2",
"flatpickr": "^4.6.13", "flatpickr": "^4.6.13",
"laravel-mix": "^6.0.49", "laravel-mix": "^6.0.44",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"luxon": "^2.4.0", "luxon": "^2.3.2",
"postcss": "^8.4.14", "postcss": "^8.4.14",
"tailwindcss": "^3.1.4", "tailwindcss": "^3.0.24",
"vue": "3.2.37", "vue": "3.2.21",
"vue-echarts": "^6.1.0", "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",
"vue-material-design-icons": "^5.1.1", "vue-material-design-icons": "^5.0.0",
"vue-toastification": "^2.0.0-rc.5", "vue-toastification": "^2.0.0-rc.5",
"vue3-popper": "^1.5.0", "vue3-popper": "^1.5.0",
"vuedraggable": "^4.1.0" "vuedraggable": "^4.1.0"
}, },
"devDependencies": { "devDependencies": {
"eslint": "^8.19.0", "eslint": "^8.16.0",
"eslint-plugin-vue": "^9.1.1" "eslint-plugin-vue": "^9.1.0"
} }
} }

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([])

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")