diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c17a8260b56a..32bd1e18a1f7 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -18,31 +18,26 @@
"source=mealie-devcontainer-workspace,target=/workspaces/mealie/frontend/node_modules,type=volume",
"source=mealie-bashhistory,target=/home/vscode/commandhistory,type=volume"
],
- // Set *default* container specific settings.json values on container create.
- "settings": {
- "python.defaultInterpreterPath": "/usr/local/bin/python",
- "python.linting.enabled": true,
- "python.linting.pylintEnabled": true,
- "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
- "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
- "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
- "python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
- "python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
- "python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
- "python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
- "python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
- "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint"
+ "customizations": {
+ "vscode": {
+ "settings": {
+ "python.defaultInterpreterPath": "/usr/local/bin/python",
+ "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
+ "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
+ "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
+ },
+ "extensions": [
+ "dbaeumer.vscode-eslint",
+ "matangover.mypy",
+ "ms-python.black-formatter",
+ "ms-python.isort",
+ "ms-python.pylint",
+ "ms-python.python",
+ "ms-python.vscode-pylance",
+ "Vue.volar"
+ ]
+ }
},
- // Add the IDs of extensions you want installed when the container is created.
- "extensions": [
- "dbaeumer.vscode-eslint",
- "matangover.mypy",
- "ms-python.black-formatter",
- "ms-python.isort",
- "ms-python.python",
- "ms-python.vscode-pylance",
- "Vue.volar"
- ],
// Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [
3000,
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 89b301f013c7..7a225c846d5f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -36,13 +36,6 @@
"i18n-ally.localesPaths": "frontend/lang/messages",
"i18n-ally.sourceLanguage": "en-US",
"python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python",
- "python.formatting.provider": "black",
- "python.linting.enabled": true,
- "python.linting.flake8Enabled": false,
- "python.linting.pylintEnabled": false,
- "python.linting.pylintArgs": [
- "--rcfile=${workspaceFolder}/.pylintrc"
- ],
"python.testing.autoTestDiscoverOnSaveEnabled": false,
"python.testing.pytestArgs": [
"tests"
@@ -50,7 +43,6 @@
"python.testing.pytestEnabled": true,
"python.testing.unittestEnabled": false,
"python.analysis.typeCheckingMode": "off",
- "python.linting.mypyEnabled": true,
"search.mode": "reuseEditor",
"python.testing.unittestArgs": [
"-v",
@@ -69,4 +61,7 @@
"[vue]": {
"editor.formatOnSave": false
},
+ "[python]": {
+ "editor.defaultFormatter": "ms-python.black-formatter",
+ },
}
diff --git a/frontend/pages/group/data/categories.vue b/frontend/pages/group/data/categories.vue
index 856178ba8ed3..290e4f79e083 100644
--- a/frontend/pages/group/data/categories.vue
+++ b/frontend/pages/group/data/categories.vue
@@ -45,10 +45,11 @@
>
{{ $t("general.confirm-delete-generic") }}
+ {{ deleteTarget.name }}
-
+
{{ $t("general.confirm-delete-generic") }}
+ {{ deleteTarget.name }}
-
+
{{ $t("general.confirm-delete-generic") }}
+
@@ -79,7 +80,7 @@
-
+
-
+
{{ $t('data-pages.recipes.data-exports-description') }}
diff --git a/frontend/pages/group/data/tags.vue b/frontend/pages/group/data/tags.vue
index b188d2bef314..076a23f08b4d 100644
--- a/frontend/pages/group/data/tags.vue
+++ b/frontend/pages/group/data/tags.vue
@@ -45,10 +45,11 @@
>
{{ $t("general.confirm-delete-generic") }}
+ {{ deleteTarget.name }}
-
+
{{ $t("general.confirm-delete-generic") }}
+ {{ deleteTarget.name }}
-
+
{{ $t("general.confirm-delete-generic") }}
+ {{ deleteTarget.name }}
@@ -165,7 +166,7 @@
-
+