diff --git a/.vscode/settings.json b/.vscode/settings.json index 632384f7..96522090 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,7 +4,7 @@ }, "explorer.fileNesting.enabled": true, "explorer.fileNesting.patterns": { - "package.json": "package-lock.json, yarn.lock, .eslintrc.js, tsconfig.json, .prettierrc, .editorconfig, pnpm-lock.yaml, postcss.config.js, tailwind.config.js", + "package.json": "package-lock.json, yarn.lock, eslint.config.mjs, tsconfig.json, .prettierrc, .editorconfig, pnpm-lock.yaml, postcss.config.js, tailwind.config.js", "docker-compose.yml": "Dockerfile, .dockerignore, docker-compose.dev.yml, docker-compose.yml", "README.md": "LICENSE, SECURITY.md" }, @@ -22,6 +22,7 @@ "editor.defaultFormatter": "dbaeumer.vscode-eslint" }, "eslint.format.enable": true, + "eslint.useFlatConfig": true, "css.validate": false, "tailwindCSS.includeLanguages": { "vue": "html", diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js deleted file mode 100644 index e2bc53c5..00000000 --- a/frontend/.eslintrc.js +++ /dev/null @@ -1,55 +0,0 @@ -module.exports = { - env: { - browser: true, - es2021: true, - node: true, - }, - extends: [ - "eslint:recommended", - "plugin:vue/essential", - "plugin:@typescript-eslint/recommended", - "@nuxtjs/eslint-config-typescript", - "plugin:vue/vue3-recommended", - "plugin:prettier/recommended", - "plugin:tailwindcss/recommended", - ], - parserOptions: { - ecmaVersion: "latest", - parser: "@typescript-eslint/parser", - sourceType: "module", - }, - plugins: ["vue", "@typescript-eslint"], - rules: { - "no-console": 0, - "no-unused-vars": "off", - "vue/multi-word-component-names": "off", - "vue/no-setup-props-destructure": 0, - "vue/no-multiple-template-root": 0, - "vue/no-v-model-argument": 0, - "vue/no-v-html": 0, - "@typescript-eslint/consistent-type-imports": "error", - "@typescript-eslint/ban-ts-comment": 0, - "tailwindcss/no-custom-classname": "warn", - "@typescript-eslint/no-unused-vars": [ - "error", - { - ignoreRestSiblings: true, - destructuredArrayIgnorePattern: "_", - caughtErrors: "none", - }, - ], - "prettier/prettier": [ - "warn", - { - arrowParens: "avoid", - semi: true, - tabWidth: 2, - useTabs: false, - vueIndentScriptAndStyle: true, - singleQuote: false, - trailingComma: "es5", - printWidth: 120, - }, - ], - }, -}; diff --git a/frontend/app.vue b/frontend/app.vue index ba159df7..71428a16 100644 --- a/frontend/app.vue +++ b/frontend/app.vue @@ -6,7 +6,7 @@ - + diff --git a/frontend/components/App/CreateModal.vue b/frontend/components/App/CreateModal.vue index a2efe690..19a35470 100644 --- a/frontend/components/App/CreateModal.vue +++ b/frontend/components/App/CreateModal.vue @@ -47,7 +47,7 @@ import { useMediaQuery } from "@vueuse/core"; import type { DialogID } from "@/components/ui/dialog-provider/utils"; import { Drawer, DrawerContent, DrawerHeader, DrawerTitle } from "@/components/ui/drawer"; - import { Dialog, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog"; + import { Dialog, DialogScrollContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog"; const isDesktop = useMediaQuery("(min-width: 768px)"); diff --git a/frontend/components/App/ScannerModal.vue b/frontend/components/App/ScannerModal.vue index e13cb266..d404e51a 100644 --- a/frontend/components/App/ScannerModal.vue +++ b/frontend/components/App/ScannerModal.vue @@ -33,7 +33,7 @@ - +