Docker/mealie
Docker/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-08-05 13:35:23 +02:00
Code Issues Releases Activity

Merge branch 'mealie-next' into mealie-next

Browse source
This commit is contained in:
boc-the-git 2023-11-25 21:07:01 +11:00 • committed by GitHub
commit 18a405808a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 129 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

3
frontend/pages/group/data/categories.vue
View file

@ -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"

4
frontend/pages/group/data/foods.vue
View file

@ -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"
@ -394,6 +395,7 @@ export default defineComponent({
deleteEventHandler,
deleteDialog,
deleteFood,
deleteTarget,
// Alias Manager
aliasManagerDialog,
aliasManagerEventHandler,

17
frontend/pages/group/data/labels.vue
View file

@ -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>
@ -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"
@ -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,

4
frontend/pages/group/data/recipes.vue
View file

@ -121,7 +121,7 @@
<template #icon>
{{ $globals.icons.database }}
</template>
Import
{{ $t('general.import') }}}
</BaseButton>
<BaseButton
color="info"
@ -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>

3
frontend/pages/group/data/tags.vue
View file

@ -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"

3
frontend/pages/group/data/tools.vue
View file

@ -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"

4
frontend/pages/group/data/units.vue
View file

@ -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>
@ -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"
@ -421,6 +422,7 @@ export default defineComponent({
deleteEventHandler,
deleteDialog,
deleteUnit,
deleteTarget,
// Alias Manager
aliasManagerDialog,
aliasManagerEventHandler,

5
frontend/pages/group/migrations.vue
View file

@ -392,6 +392,11 @@ export default defineComponent({
getMigrationReports,
};
},
head() {
return {
title: this.$tc("settings.migrations"),
};
},
});
</script>

2
frontend/pages/group/notifiers.vue
View file

@ -181,7 +181,7 @@ export default defineComponent({
const optionsSections: OptionSection[] = [
{
id: 1,
text: "Recipe Events",
text: i18n.tc("events.recipe-events"),
options: [
{
text: i18n.t("general.create") as string,

2
frontend/pages/group/reports/_id.vue
View file

@ -9,7 +9,7 @@
<v-container v-if="report">
<BaseCardSectionTitle :title="report.name"> </BaseCardSectionTitle>
<v-card-text> Report Id: {{ id }} </v-card-text>
<v-card-text> {{ $t('group.report-with-id', { id:id }) }} </v-card-text>
<v-data-table :headers="itemHeaders" :items="report.entries" :items-per-page="50" show-expand>
<template #item.success="{ item }">