From 41a9a39cf3231954b744112cf9ad2a72334c9070 Mon Sep 17 00:00:00 2001 From: Kuchenpirat Date: Mon, 20 Nov 2023 17:09:16 +0000 Subject: [PATCH 1/7] data management: improve delete prompt --- frontend/pages/group/data/foods.vue | 6 +++++- frontend/pages/group/data/labels.vue | 19 ++++++++++++++----- frontend/pages/group/data/units.vue | 6 +++++- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/frontend/pages/group/data/foods.vue b/frontend/pages/group/data/foods.vue index d722f77e203..be592f870f7 100644 --- a/frontend/pages/group/data/foods.vue +++ b/frontend/pages/group/data/foods.vue @@ -150,7 +150,10 @@ @confirm="deleteFood" > - {{ $t("general.confirm-delete-generic") }} +
+ {{ $t("general.confirm-delete-generic") }} +
+

{{ deleteTarget.name }}

@@ -394,6 +397,7 @@ export default defineComponent({ deleteEventHandler, deleteDialog, deleteFood, + deleteTarget, // Alias Manager aliasManagerDialog, aliasManagerEventHandler, diff --git a/frontend/pages/group/data/labels.vue b/frontend/pages/group/data/labels.vue index c748d448be0..bbf65db0078 100644 --- a/frontend/pages/group/data/labels.vue +++ b/frontend/pages/group/data/labels.vue @@ -38,7 +38,10 @@ @confirm="deleteLabel" > - {{ $t("general.confirm-delete-generic") }} +
+ {{ $t("general.confirm-delete-generic") }} +
+
@@ -231,13 +234,19 @@ export default defineComponent({ labels: labelStore.labels, validators, - deleteEventHandler, - deleteLabel, + // create + createLabel, + createLabelData: labelData.data, + + // edit editLabel, editEventHandler, editSaveLabel, - createLabel, - createLabelData: labelData.data, + + // delete + deleteEventHandler, + deleteLabel, + deleteTarget, // Seed seedDatabase, diff --git a/frontend/pages/group/data/units.vue b/frontend/pages/group/data/units.vue index 919ba643145..6e99d790ab0 100644 --- a/frontend/pages/group/data/units.vue +++ b/frontend/pages/group/data/units.vue @@ -124,7 +124,10 @@ @confirm="deleteUnit" > - {{ $t("general.confirm-delete-generic") }} +
+ {{ $t("general.confirm-delete-generic") }} +
+

{{ deleteTarget.name }}

@@ -421,6 +424,7 @@ export default defineComponent({ deleteEventHandler, deleteDialog, deleteUnit, + deleteTarget, // Alias Manager aliasManagerDialog, aliasManagerEventHandler, From 55defdac8c7a8aa19077d18a52276f122a95c1cd Mon Sep 17 00:00:00 2001 From: Kuchenpirat Date: Tue, 21 Nov 2023 14:44:41 +0000 Subject: [PATCH 2/7] =?UTF-8?q?=F0=9F=A7=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/pages/group/data/categories.vue | 2 +- frontend/pages/group/data/foods.vue | 2 +- frontend/pages/group/data/labels.vue | 2 +- frontend/pages/group/data/recipes.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/pages/group/data/categories.vue b/frontend/pages/group/data/categories.vue index 856178ba8ed..16f7f5dcae3 100644 --- a/frontend/pages/group/data/categories.vue +++ b/frontend/pages/group/data/categories.vue @@ -48,7 +48,7 @@ - + - + - +
- + {{ $t('data-pages.recipes.data-exports-description') }} From dad3b3794600b778f8f9fcf94ab6d4cfac336b39 Mon Sep 17 00:00:00 2001 From: Kuchenpirat Date: Tue, 21 Nov 2023 14:46:34 +0000 Subject: [PATCH 3/7] =?UTF-8?q?=F0=9F=A7=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/pages/group/data/tags.vue | 2 +- frontend/pages/group/data/tools.vue | 2 +- frontend/pages/group/data/units.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/pages/group/data/tags.vue b/frontend/pages/group/data/tags.vue index b188d2bef31..cbbaf3592db 100644 --- a/frontend/pages/group/data/tags.vue +++ b/frontend/pages/group/data/tags.vue @@ -48,7 +48,7 @@ - + - + - + Date: Tue, 21 Nov 2023 14:51:00 +0000 Subject: [PATCH 4/7] add for remaining organizers --- frontend/pages/group/data/categories.vue | 5 ++++- frontend/pages/group/data/tags.vue | 5 ++++- frontend/pages/group/data/tools.vue | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/frontend/pages/group/data/categories.vue b/frontend/pages/group/data/categories.vue index 16f7f5dcae3..08a2a1d4205 100644 --- a/frontend/pages/group/data/categories.vue +++ b/frontend/pages/group/data/categories.vue @@ -44,7 +44,10 @@ @confirm="deleteCategory" > - {{ $t("general.confirm-delete-generic") }} +
+ {{ $t("general.confirm-delete-generic") }} +
+

{{ deleteTarget.name }}

diff --git a/frontend/pages/group/data/tags.vue b/frontend/pages/group/data/tags.vue index cbbaf3592db..8e5b39b6b9f 100644 --- a/frontend/pages/group/data/tags.vue +++ b/frontend/pages/group/data/tags.vue @@ -44,7 +44,10 @@ @confirm="deleteTag" > - {{ $t("general.confirm-delete-generic") }} +
+ {{ $t("general.confirm-delete-generic") }} +
+

{{ deleteTarget.name }}

diff --git a/frontend/pages/group/data/tools.vue b/frontend/pages/group/data/tools.vue index b596e40427c..ee82a1ed0d8 100644 --- a/frontend/pages/group/data/tools.vue +++ b/frontend/pages/group/data/tools.vue @@ -46,7 +46,10 @@ @confirm="deleteTool" > - {{ $t("general.confirm-delete-generic") }} +
+ {{ $t("general.confirm-delete-generic") }} +
+

{{ deleteTarget.name }}

From 3870819e3824accb01d6cdbd2cb336a11b8f2d6b Mon Sep 17 00:00:00 2001 From: Kuchenpirat Date: Tue, 21 Nov 2023 15:22:36 +0000 Subject: [PATCH 5/7] remove unnecessairy div --- frontend/pages/group/data/categories.vue | 6 ++---- frontend/pages/group/data/foods.vue | 6 ++---- frontend/pages/group/data/labels.vue | 6 ++---- frontend/pages/group/data/tags.vue | 6 ++---- frontend/pages/group/data/tools.vue | 6 ++---- frontend/pages/group/data/units.vue | 6 ++---- 6 files changed, 12 insertions(+), 24 deletions(-) diff --git a/frontend/pages/group/data/categories.vue b/frontend/pages/group/data/categories.vue index 08a2a1d4205..290e4f79e08 100644 --- a/frontend/pages/group/data/categories.vue +++ b/frontend/pages/group/data/categories.vue @@ -44,10 +44,8 @@ @confirm="deleteCategory" > -
- {{ $t("general.confirm-delete-generic") }} -
-

{{ deleteTarget.name }}

+ {{ $t("general.confirm-delete-generic") }} +

{{ deleteTarget.name }}

diff --git a/frontend/pages/group/data/foods.vue b/frontend/pages/group/data/foods.vue index 3a019ae3682..32eda4322b7 100644 --- a/frontend/pages/group/data/foods.vue +++ b/frontend/pages/group/data/foods.vue @@ -150,10 +150,8 @@ @confirm="deleteFood" > -
- {{ $t("general.confirm-delete-generic") }} -
-

{{ deleteTarget.name }}

+ {{ $t("general.confirm-delete-generic") }} +

{{ deleteTarget.name }}

diff --git a/frontend/pages/group/data/labels.vue b/frontend/pages/group/data/labels.vue index 7a6b2592d4f..71838dfd3d9 100644 --- a/frontend/pages/group/data/labels.vue +++ b/frontend/pages/group/data/labels.vue @@ -38,10 +38,8 @@ @confirm="deleteLabel" > -
- {{ $t("general.confirm-delete-generic") }} -
- + {{ $t("general.confirm-delete-generic") }} +
diff --git a/frontend/pages/group/data/tags.vue b/frontend/pages/group/data/tags.vue index 8e5b39b6b9f..076a23f08b4 100644 --- a/frontend/pages/group/data/tags.vue +++ b/frontend/pages/group/data/tags.vue @@ -44,10 +44,8 @@ @confirm="deleteTag" > -
- {{ $t("general.confirm-delete-generic") }} -
-

{{ deleteTarget.name }}

+ {{ $t("general.confirm-delete-generic") }} +

{{ deleteTarget.name }}

diff --git a/frontend/pages/group/data/tools.vue b/frontend/pages/group/data/tools.vue index ee82a1ed0d8..4ff3c547819 100644 --- a/frontend/pages/group/data/tools.vue +++ b/frontend/pages/group/data/tools.vue @@ -46,10 +46,8 @@ @confirm="deleteTool" > -
- {{ $t("general.confirm-delete-generic") }} -
-

{{ deleteTarget.name }}

+ {{ $t("general.confirm-delete-generic") }} +

{{ deleteTarget.name }}

diff --git a/frontend/pages/group/data/units.vue b/frontend/pages/group/data/units.vue index 1e8acd8d3ba..9ce5fa99111 100644 --- a/frontend/pages/group/data/units.vue +++ b/frontend/pages/group/data/units.vue @@ -124,10 +124,8 @@ @confirm="deleteUnit" > -
- {{ $t("general.confirm-delete-generic") }} -
-

{{ deleteTarget.name }}

+ {{ $t("general.confirm-delete-generic") }} +

{{ deleteTarget.name }}

From 31579d09a3088baaf3edc26cfca08788818a5315 Mon Sep 17 00:00:00 2001 From: Michael Genson <71845777+michael-genson@users.noreply.github.com> Date: Wed, 22 Nov 2023 17:40:53 +0000 Subject: [PATCH 6/7] updated deprecated devcontainer settings re-formatted structure removed deprecated linting settings added pylint extension to replace old linting setting --- .devcontainer/devcontainer.json | 43 +++++++++++++++------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index c17a8260b56..32bd1e18a1f 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, From a7bb02ffbde015ad5d2bb41e79ea9259f3600070 Mon Sep 17 00:00:00 2001 From: Michael Genson <71845777+michael-genson@users.noreply.github.com> Date: Wed, 22 Nov 2023 17:41:07 +0000 Subject: [PATCH 7/7] removed deprecated lint settings --- .vscode/settings.json | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 89b301f013c..7a225c846d5 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", + }, }