Skip to content

fix: Address Ingredients Parser UX overflow issues on mobile #4962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
CloCkWeRX wants to merge 6 commits into from
Closed

fix: Address Ingredients Parser UX overflow issues on mobile #4962

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1d049cd
Display buttons as list
CloCkWeRX Jan 27, 2025
6e57be4
Improve add buttons
CloCkWeRX Jan 27, 2025
c664f1b
Merge branch 'mealie-next' into ingredients-overflow
CloCkWeRX Jan 27, 2025
c366a29
Merge branch 'mealie-next' into ingredients-overflow
CloCkWeRX Feb 1, 2025
6225baf
Update ingredient-parser.vue
CloCkWeRX Feb 6, 2025
a95c99b
Merge branch 'mealie-next' into ingredients-overflow
CloCkWeRX Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions frontend/pages/g/_groupSlug/r/_slug/ingredient-parser.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,19 +74,21 @@
<v-spacer />
<BaseButton
v-if="errors[index].unitError && errors[index].unitErrorMessage !== ''"
:title=errors[index].unitErrorMessage
color="warning"
small
@click="createUnit(ing.ingredient.unit, index)"
>
{{ errors[index].unitErrorMessage }}
{{ errors[index].unit }}
</BaseButton>
<BaseButton
v-if="errors[index].foodError && errors[index].foodErrorMessage !== ''"
:title=errors[index].foodErrorMessage
color="warning"
small
@click="createFood(ing.ingredient.food, index)"
>
{{ errors[index].foodErrorMessage }}
{{ errors[index].food }}
</BaseButton>
</v-card-actions>
</v-expansion-panel-content>
Expand All @@ -97,7 +99,6 @@
</v-container>
</v-container>
</template>

<script lang="ts">
import { computed, defineComponent, ref, useContext, useRoute, useRouter, watch } from "@nuxtjs/composition-api";
import { invoke, until } from "@vueuse/core";
Expand Down Expand Up @@ -187,20 +188,23 @@ export default defineComponent({
const unitError = !checkForUnit(ing.ingredient.unit);
const foodError = !checkForFood(ing.ingredient.food);

let unit = "";
let food = "";

let unitErrorMessage = "";
let foodErrorMessage = "";

if (unitError || foodError) {
if (unitError) {
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();
}
}

if (foodError) {
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();
}
}
Expand All @@ -210,8 +214,10 @@ export default defineComponent({
return {
ingredientIndex: index,
unitError,
unit,
unitErrorMessage,
foodError,
food,
foodErrorMessage,
} as Error;
}
Expand Down Expand Up @@ -400,3 +406,9 @@ export default defineComponent({
},
});
</script>
<style lang="css">
.v-card__actions {
flex-wrap: wrap;
overflow: truncate;
}
</style>
Loading