diff --git a/Makefile b/Makefile index 958f481..9499ba7 100644 --- a/Makefile +++ b/Makefile @@ -131,11 +131,11 @@ npm-run-%: node_modules ## npm run (script) .PHONY: docker-compose-up docker-compose-up: ## docker compose up - $(DOCKER) compose up -d + $(DOCKER) compose up -d --wait --no-recreate .PHONY: docker-compose-up-% docker-compose-up-%: ## docker compose up (container) - $(DOCKER) compose up -d $* + $(DOCKER) compose up -d --wait --no-recreate $* .PHONY: docker-compose-down docker-compose-down: ## docker compose down diff --git a/bun.lock b/bun.lock index 8406aa2..d22cde9 100644 --- a/bun.lock +++ b/bun.lock @@ -1,22 +1,21 @@ { "lockfileVersion": 1, - "configVersion": 0, "workspaces": { "": { "name": "tout-doux", "dependencies": { - "@lucide/vue": "^1.24.0", + "@lucide/vue": "^1.25.0", "cron-parser": "^5.6.2", "date-fns": "^4.4.0", "pinia": "^3.0.4", "random-word-slugs": "^0.1.7", "rrule": "^2.8.1", - "vue": "^3.5.39", + "vue": "^3.5.40", "vue-i18n": "^11.4.6", - "vue-router": "^5.1.0", + "vue-router": "^5.2.0", }, "devDependencies": { - "@tailwindcss/vite": "^4.3.2", + "@tailwindcss/vite": "^4.3.3", "@tsconfig/node24": "^24.0.4", "@types/node": "^24.13.3", "@vitejs/plugin-vue": "^6.0.8", @@ -31,9 +30,9 @@ "npm-run-all2": "^8.0.4", "oxlint": "^1.74.0", "sass-embedded": "^1.100.0", - "tailwindcss": "^4.3.2", + "tailwindcss": "^4.3.3", "typescript": "~5.9.3", - "vite": "^8.1.4", + "vite": "^8.1.5", "vite-plugin-vue-devtools": "^8.1.5", "vue-tsc": "^3.3.7", }, diff --git a/resources/ts/components/CronInput.vue b/resources/ts/components/CronInput.vue index 6ca7ccb..73198a8 100644 --- a/resources/ts/components/CronInput.vue +++ b/resources/ts/components/CronInput.vue @@ -32,6 +32,9 @@ function onChangeCronType() { case CronType.EVERY_WEEK: case CronType.EVERY_MONTH: case CronType.EVERY_YEAR: + case CronType.EVERY_N_DAYS: + case CronType.EVERY_N_WEEKS: + case CronType.EVERY_N_MONTHS: cronValue.value = 1; break; case CronType.CUSTOM: diff --git a/resources/ts/lib/recurrence.ts b/resources/ts/lib/recurrence.ts index dd74a7a..d4fb41f 100644 --- a/resources/ts/lib/recurrence.ts +++ b/resources/ts/lib/recurrence.ts @@ -103,20 +103,11 @@ export function getCron( case CronType.EVERY_YEAR: return `0 0 1 ${value.toFixed(0)} *`; case CronType.EVERY_N_MONTHS: - return new RRule({ - freq: RRule.MONTHLY, - interval: value, - }).toString(); + return `RRULE:FREQ=MONTHLY;INTERVAL=${value.toFixed(0)}`; case CronType.EVERY_N_WEEKS: - return new RRule({ - freq: RRule.WEEKLY, - interval: value, - }).toString(); + return `RRULE:FREQ=WEEKLY;INTERVAL=${value.toFixed(0)}`; case CronType.EVERY_N_DAYS: - return new RRule({ - freq: RRule.DAILY, - interval: value, - }).toString(); + return `RRULE:FREQ=DAILY;INTERVAL=${value.toFixed(0)}`; case CronType.CUSTOM: if (validCron(fallback)) { return fallback;