github/mealie
1
0
Fork 0
mirror of https://github.com/hay-kot/mealie.git synced 2025-08-23 06:45:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge a95c99b0ce into ac984a2d04

Browse source
This commit is contained in:
Daniel O'Connor 2025-06-18 19:52:15 +00:00 • committed by GitHub
commit 697fa2d554
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
frontend/pages/g/_groupSlug/r/_slug/ingredient-parser.vue
View file

@ -67,19 +67,21 @@
<v-spacer /> <v-spacer />
<BaseButton <BaseButton
v-if="errors[index].unitError && errors[index].unitErrorMessage !== ''" v-if="errors[index].unitError && errors[index].unitErrorMessage !== ''"
:title=errors[index].unitErrorMessage
color="warning" color="warning"
small small
@click="createUnit(ing.ingredient.unit, index)" @click="createUnit(ing.ingredient.unit, index)"
> >
{{ errors[index].unitErrorMessage }} {{ errors[index].unit }}
</BaseButton> </BaseButton>
<BaseButton <BaseButton
v-if="errors[index].foodError && errors[index].foodErrorMessage !== ''" v-if="errors[index].foodError && errors[index].foodErrorMessage !== ''"
:title=errors[index].foodErrorMessage
color="warning" color="warning"
small small
@click="createFood(ing.ingredient.food, index)" @click="createFood(ing.ingredient.food, index)"
> >
{{ errors[index].foodErrorMessage }} {{ errors[index].food }}
</BaseButton> </BaseButton>
</v-card-actions> </v-card-actions>
</v-expansion-panel-content> </v-expansion-panel-content>
@ -90,7 +92,6 @@
</v-container> </v-container>
</v-container> </v-container>
</template> </template>
<script lang="ts"> <script lang="ts">
import { computed, defineComponent, ref, useContext, useRoute, useRouter, watch } from "@nuxtjs/composition-api"; import { computed, defineComponent, ref, useContext, useRoute, useRouter, watch } from "@nuxtjs/composition-api";
import { invoke, until } from "@vueuse/core"; import { invoke, until } from "@vueuse/core";
@ -180,20 +181,23 @@ export default defineComponent({
const unitError = !checkForUnit(ing.ingredient.unit); const unitError = !checkForUnit(ing.ingredient.unit);
const foodError = !checkForFood(ing.ingredient.food); const foodError = !checkForFood(ing.ingredient.food);
let unit = "";
let food = "";
let unitErrorMessage = ""; let unitErrorMessage = "";
let foodErrorMessage = ""; let foodErrorMessage = "";
if (unitError || foodError) { if (unitError || foodError) {
if (unitError) { if (unitError) {
if (ing?.ingredient?.unit?.name) { if (ing?.ingredient?.unit?.name) {
const unit = ing.ingredient.unit.name || i18n.tc("recipe.parser.no-unit"); unit = ing.ingredient.unit.name || i18n.tc("recipe.parser.no-unit");
unitErrorMessage = i18n.t("recipe.parser.missing-unit", { unit }).toString(); unitErrorMessage = i18n.t("recipe.parser.missing-unit", { unit }).toString();
} }
} }
if (foodError) { if (foodError) {
if (ing?.ingredient?.food?.name) { if (ing?.ingredient?.food?.name) {
const food = ing.ingredient.food.name || i18n.tc("recipe.parser.no-food"); food = ing.ingredient.food.name || i18n.tc("recipe.parser.no-food");
foodErrorMessage = i18n.t("recipe.parser.missing-food", { food }).toString(); foodErrorMessage = i18n.t("recipe.parser.missing-food", { food }).toString();
} }
} }
@ -203,8 +207,10 @@ export default defineComponent({
return { return {
ingredientIndex: index, ingredientIndex: index,
unitError, unitError,
unit,
unitErrorMessage, unitErrorMessage,
foodError, foodError,
food,
foodErrorMessage, foodErrorMessage,
} as Error; } as Error;
} }
@ -393,3 +399,9 @@ export default defineComponent({
}, },
}); });
</script> </script>
<style lang="css">
.v-card__actions {
flex-wrap: wrap;
overflow: truncate;
}
</style>