Skip to content

Commit

Permalink
Merge branch 'mealie-next' into fix/hardcoded-strings
Browse files Browse the repository at this point in the history
  • Loading branch information
p0lycarpio authored Nov 24, 2023
2 parents 1e3418c + 2ff0b60 commit 0933ad4
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 43 deletions.
43 changes: 19 additions & 24 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
11 changes: 3 additions & 8 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,13 @@
"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"
],
"python.testing.pytestEnabled": true,
"python.testing.unittestEnabled": false,
"python.analysis.typeCheckingMode": "off",
"python.linting.mypyEnabled": true,
"search.mode": "reuseEditor",
"python.testing.unittestArgs": [
"-v",
Expand All @@ -69,4 +61,7 @@
"[vue]": {
"editor.formatOnSave": false
},
"[python]": {
"editor.defaultFormatter": "ms-python.black-formatter",
},
}
3 changes: 2 additions & 1 deletion frontend/pages/group/data/categories.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,11 @@
>
<v-card-text>
{{ $t("general.confirm-delete-generic") }}
<p v-if="deleteTarget" class="mt-4 ml-4">{{ deleteTarget.name }}</p>
</v-card-text>
</BaseDialog>

<!-- Recipe Data Table -->
<!-- Data Table -->
<BaseCardSectionTitle :icon="$globals.icons.categories" section :title="$tc('data-pages.categories.category-data')"> </BaseCardSectionTitle>
<CrudTable
:table-config="tableConfig"
Expand Down
4 changes: 3 additions & 1 deletion frontend/pages/group/data/foods.vue
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,11 @@
>
<v-card-text>
{{ $t("general.confirm-delete-generic") }}
<p v-if="deleteTarget" class="mt-4 ml-4">{{ deleteTarget.name }}</p>
</v-card-text>
</BaseDialog>

<!-- Recipe Data Table -->
<!-- Data Table -->
<BaseCardSectionTitle :icon="$globals.icons.foods" section :title="$tc('data-pages.foods.food-data')"> </BaseCardSectionTitle>
<CrudTable
:table-config="tableConfig"
Expand Down Expand Up @@ -394,6 +395,7 @@ export default defineComponent({
deleteEventHandler,
deleteDialog,
deleteFood,
deleteTarget,
// Alias Manager
aliasManagerDialog,
aliasManagerEventHandler,
Expand Down
17 changes: 12 additions & 5 deletions frontend/pages/group/data/labels.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
>
<v-card-text>
{{ $t("general.confirm-delete-generic") }}
<MultiPurposeLabel v-if="deleteTarget" class="mt-4 ml-4" :label="deleteTarget" />
</v-card-text>
</BaseDialog>

Expand Down Expand Up @@ -79,7 +80,7 @@
</v-card-text>
</BaseDialog>

<!-- Recipe Data Table -->
<!-- Data Table -->
<BaseCardSectionTitle :icon="$globals.icons.tags" section :title="$tc('data-pages.labels.labels')"> </BaseCardSectionTitle>
<CrudTable
:table-config="tableConfig"
Expand Down Expand Up @@ -228,13 +229,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,
Expand Down
2 changes: 1 addition & 1 deletion frontend/pages/group/data/recipes.vue
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
</section>

<section class="mt-10">
<!-- Downloads Data Table -->
<!-- Data Table -->
<BaseCardSectionTitle :icon="$globals.icons.database" section :title="$tc('data-pages.recipes.data-exports')">
{{ $t('data-pages.recipes.data-exports-description') }}
</BaseCardSectionTitle>
Expand Down
3 changes: 2 additions & 1 deletion frontend/pages/group/data/tags.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,11 @@
>
<v-card-text>
{{ $t("general.confirm-delete-generic") }}
<p v-if="deleteTarget" class="mt-4 ml-4">{{ deleteTarget.name }}</p>
</v-card-text>
</BaseDialog>

<!-- Recipe Data Table -->
<!-- Data Table -->
<BaseCardSectionTitle :icon="$globals.icons.tags" section :title="$tc('data-pages.tags.tag-data')"> </BaseCardSectionTitle>
<CrudTable
:table-config="tableConfig"
Expand Down
3 changes: 2 additions & 1 deletion frontend/pages/group/data/tools.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@
>
<v-card-text>
{{ $t("general.confirm-delete-generic") }}
<p v-if="deleteTarget" class="mt-4 ml-4">{{ deleteTarget.name }}</p>
</v-card-text>
</BaseDialog>

<!-- Tool Data Table -->
<!-- Data Table -->
<BaseCardSectionTitle :icon="$globals.icons.potSteam" section :title="$tc('data-pages.tools.tool-data')"> </BaseCardSectionTitle>
<CrudTable
:table-config="tableConfig"
Expand Down
4 changes: 3 additions & 1 deletion frontend/pages/group/data/units.vue
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@
>
<v-card-text>
{{ $t("general.confirm-delete-generic") }}
<p v-if="deleteTarget" class="mt-4 ml-4">{{ deleteTarget.name }}</p>
</v-card-text>
</BaseDialog>

Expand Down Expand Up @@ -165,7 +166,7 @@
</v-card-text>
</BaseDialog>

<!-- Recipe Data Table -->
<!-- Data Table -->
<BaseCardSectionTitle :icon="$globals.icons.units" section :title="$tc('data-pages.units.unit-data')"> </BaseCardSectionTitle>
<CrudTable
:table-config="tableConfig"
Expand Down Expand Up @@ -421,6 +422,7 @@ export default defineComponent({
deleteEventHandler,
deleteDialog,
deleteUnit,
deleteTarget,
// Alias Manager
aliasManagerDialog,
aliasManagerEventHandler,
Expand Down

0 comments on commit 0933ad4

Please sign in to comment.