diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 4b4d703ea..f8c9d46f6 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -19,7 +19,7 @@ module.exports = {
'semi': ['error', 'never'],
'vue/v-on-event-hyphenation': ['warn', 'never', { 'autofix': true }],
- 'vue/multi-word-component-names': 'warn',
+ 'vue/multi-word-component-names': 'off',
// uncategorized rules:
'vue/component-api-style': ['error', ['script-setup']],
@@ -43,6 +43,7 @@ module.exports = {
'vue/no-required-prop-with-default': ['error', { 'autofix': true }],
'vue/no-duplicate-attr-inheritance': 'error',
'vue/no-empty-component-block': 'error',
+ 'vue/html-indent': ['error', 'tab'],
// vue3
'vue/no-ref-object-destructure': 'error',
diff --git a/cypress.config.ts b/cypress.config.js
similarity index 100%
rename from cypress.config.ts
rename to cypress.config.js
diff --git a/eslint.config_bac.js b/eslint.config_bac.js
deleted file mode 100644
index 2dc445c5a..000000000
--- a/eslint.config_bac.js
+++ /dev/null
@@ -1,122 +0,0 @@
-// import originalEslintPluginVue from 'eslint-plugin-vue'
-import vueTsRecommended from '@vue/eslint-config-typescript/recommended.js'
-// import vueParser from 'vue-eslint-parser'
-import tsParser from "@typescript-eslint/parser"
-
-const vue3Recommended = vue.configs['vue3-recommended']
-
-import {default as originalVuePlugin} from "eslint-plugin-vue";
-
-// see https://github.com/eslint/eslint/issues/16875#issuecomment-1426594123
-const eslintPluginVue = {
- ...originalVuePlugin,
- parsers: {
- 'parser': {
- parseForESLint: originalVuePlugin.parseForESLint
- }
- }
-}
-
-// export default [{
-// files: ["**/*.json", "**/*.jsonc", "**/*.json5"],
-// plugins: {
-// vue: { ...vue, parsers}
-// /* same as
-// jsonc: {
-// parsers: {
-// 'jsonc-eslint-parser': {
-// parseForESLint
-// }
-// }
-// } */
-// },
-// languageOptions: {
-// parser: 'vue/vue-eslint-parser'
-// },
-// rules: {...}
-// }];
-
-export default [
- // 'eslint:recommended',
- {
- files: ["**/*.vue"],
- plugins: {
- vue: eslintPluginVue,
- },
- languageOptions: {
- parser: 'vue/parser'
- },
- },
- // {
- // plugins: {
- // // vue: vue3Recommended,
- // // '@typescript-eslint': vueTsRecommended,
- // },
- // languageOptions: {
- // // parser: eslintPluginVue,
- // // parser: 'vue/vue-eslint-parser',
- // parserOptions: {
- // parser: '@typescript-eslint/parser',
- // // 'ecmaVersion': 2022,
- // // 'sourceType': 'module',
- // },
- // }
- // }
- // {
- // files: ["./src/**/*.vue"],
- // // files: ["./src/**/*.js"],
- // // ignores: ["**/*.config.js"],
- // rules: {
- // semi: "error"
- // },
- // plugins: {
- // vue: vue3Recommended,
- // // '@typescript-eslint': vueTsRecommended,
- // },
- // },
- // {
- // files: ["src/**/*.vue"],
- // // files: [
- // // 'src/**/*.vue',
- // // 'src/**/*.js',
- // // 'src/**/*.ts',
- // // // 'src/**/*.+(vue|js|ts)',
- // // ],
- // ignores: [
- // '*.test.*',
- // 'cypress/*',
- // ],
- // plugins: {
- // vue: vue3Recommended,
- // '@typescript-eslint': vueTsRecommended,
- // },
- // rules: {
- // 'vue/html-quotes': ['error', 'double'],
- // 'quotes': ['error', 'single'],
- // 'comma-dangle': ['error', 'always-multiline'],
- // 'semi': ['error', 'never'],
- // 'vue/multi-word-component-names': 0,
- // // disabled until we have support for reactivityTransform
- // // See https://github.com/vuejs/eslint-plugin-vue/issues/1948
- // // see also setting in `vite.config`
- // 'vue/no-setup-props-destructure': 0,
- // },
- // // overwrite the following with correct values
- // // eslint-plugin-vue/lib/configs/base.js
-
- // // parser:
- // parserOptions: {
- // ecmaVersion: 2022,
-
-
- // 'parser': '@typescript-eslint/parser',
- // 'sourceType': 'module',
- // },
- // globals: {
- // 'browser': true,
- // 'es2022': true,
- // 'node': true,
- // 'vue/setup-compiler-macros': true,
- // }
- // },
-]
\ No newline at end of file
diff --git a/package.json b/package.json
index 5c743af7b..21cb98b6a 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
"build:modern-only": "BUILD_MODERN_ONLY=true vite build && workbox copyLibraries dist/",
"build:dev": "vite build --mode development --outDir dist-dev/",
"lint": "eslint 'src/**/*.{js,ts,vue}'",
- "lint:fix": "eslint --fix 'src/**/*.{js,ts,vue}' ",
+ "lint:fix": "pnpm run lint --fix",
"test:e2e": "start-server-and-test preview http://127.0.0.1:4173 'cypress run --e2e --browser chrome'",
"test:e2e-record": "start-server-and-test preview http://127.0.0.1:4173 'cypress run --e2e --browser chrome --record'",
"test:e2e-dev-dev": "start-server-and-test preview:dev http://127.0.0.1:4173 'cypress open --e2e'",
diff --git a/src/App.vue b/src/App.vue
index 77d3dacf4..0c0c4093c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,23 +1,23 @@
-
-
-
{{ $t('input.datemathHelp.canuse') }}
-
{{ $t('home.addToHomeScreen') }}
now
||
{{ $t('input.datemathHelp.supportedUnits') }}
-
-
-
- s
{{ $t('input.datemathHelp.units.seconds') }}
-
-
-
- m
{{ $t('input.datemathHelp.units.minutes') }}
-
-
-
- h
{{ $t('input.datemathHelp.units.hours') }}
-
-
-
- H
{{ $t('input.datemathHelp.units.hours') }}
-
-
-
- d
{{ $t('input.datemathHelp.units.days') }}
-
-
-
- w
{{ $t('input.datemathHelp.units.weeks') }}
-
-
-
- M
{{ $t('input.datemathHelp.units.months') }}
-
-
+
- y
{{ $t('input.datemathHelp.units.years') }}
-
+
+
+ s
{{ $t('input.datemathHelp.units.seconds') }}
+
+
+
+ m
{{ $t('input.datemathHelp.units.minutes') }}
+
+
+
+ h
{{ $t('input.datemathHelp.units.hours') }}
+
+
+
+ H
{{ $t('input.datemathHelp.units.hours') }}
+
+
+
+ d
{{ $t('input.datemathHelp.units.days') }}
+
+
+
+ w
{{ $t('input.datemathHelp.units.weeks') }}
+
+
+
+ M
{{ $t('input.datemathHelp.units.months') }}
+
+
+ y
{{ $t('input.datemathHelp.units.years') }}
+ {{ $t('input.datemathHelp.someExamples') }}
-
diff --git a/src/components/date/datepickerWithRange.vue b/src/components/date/datepickerWithRange.vue
index 919de8811..be9e70683 100644
--- a/src/components/date/datepickerWithRange.vue
+++ b/src/components/date/datepickerWithRange.vue
@@ -1,20 +1,31 @@
-
-
- now
{{ $t('input.datemathHelp.examples.now') }}
-
-
-
- now+24h
{{ $t('input.datemathHelp.examples.in24h') }}
-
-
-
- now/d
{{ $t('input.datemathHelp.examples.today') }}
-
-
-
- now/w
{{ $t('input.datemathHelp.examples.beginningOfThisWeek') }}
-
-
-
- now/w+1w
{{ $t('input.datemathHelp.examples.endOfThisWeek') }}
-
-
-
- now+30d
{{ $t('input.datemathHelp.examples.in30Days') }}
-
-
+
- {{ exampleDate }}||+1M/d
-
-
+
+
+ now
{{ $t('input.datemathHelp.examples.now') }}
+
+
+
+ now+24h
{{ $t('input.datemathHelp.examples.in24h') }}
+
+
+
+ now/d
{{ $t('input.datemathHelp.examples.today') }}
+
+
+
+ now/w
{{ $t('input.datemathHelp.examples.beginningOfThisWeek') }}
+
+
+
+ now/w+1w
{{ $t('input.datemathHelp.examples.endOfThisWeek') }}
+
+
+
+ now+30d
{{ $t('input.datemathHelp.examples.in30Days') }}
+
+
+ {{ exampleDate }}||+1M/d
+
+
{{ title }}