-
-
Notifications
You must be signed in to change notification settings - Fork 763
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'mealie-next' into fix/sort-food-by-label
- Loading branch information
Showing
121 changed files
with
2,234 additions
and
425 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
frontend/components/Domain/Recipe/RecipeDialogAddToShoppingList.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| <template> | ||
| <v-container class="elevation-3"> | ||
| <v-row no-gutters> | ||
| <v-col cols="12"> | ||
| <RecipeCardMobile | ||
| :name="recipe.name" | ||
| :description="recipe.description" | ||
| :slug="recipe.slug" | ||
| :rating="recipe.rating" | ||
| :image="recipe.image" | ||
| :recipe-id="recipe.id" | ||
| /> | ||
| </v-col> | ||
| <div v-for="(organizer, idx) in missingOrganizers" :key="idx"> | ||
| <v-col | ||
| v-if="organizer.show" | ||
| cols="12" | ||
| > | ||
| <div class="d-flex flex-row flex-wrap align-center pt-2"> | ||
| <v-icon class="ma-0 pa-0">{{ organizer.icon }}</v-icon> | ||
| <v-card-text class="mr-0 my-0 pl-1 py-0" style="width: min-content;"> | ||
| {{ $tc("recipe-finder.missing") }}: | ||
| </v-card-text> | ||
| <v-chip | ||
| v-for="item in organizer.items" | ||
| :key="item.item.id" | ||
| label | ||
| color="secondary custom-transparent" | ||
| class="mr-2 my-1" | ||
| > | ||
| <v-checkbox dark :ripple="false" @click="handleCheckbox(item)"> | ||
| <template #label> | ||
| {{ organizer.getLabel(item.item) }} | ||
| </template> | ||
| </v-checkbox> | ||
| </v-chip> | ||
| </div> | ||
| </v-col> | ||
| </div> | ||
| </v-row> | ||
| </v-container> | ||
| </template> | ||
|
|
||
| <script lang="ts"> | ||
| import { computed, defineComponent, reactive, useContext } from "@nuxtjs/composition-api"; | ||
| import RecipeCardMobile from "./RecipeCardMobile.vue"; | ||
| import { IngredientFood, RecipeSummary, RecipeTool } from "~/lib/api/types/recipe"; | ||
| interface Organizer { | ||
| type: "food" | "tool"; | ||
| item: IngredientFood | RecipeTool; | ||
| selected: boolean; | ||
| } | ||
| export default defineComponent({ | ||
| components: { RecipeCardMobile }, | ||
| props: { | ||
| recipe: { | ||
| type: Object as () => RecipeSummary, | ||
| required: true, | ||
| }, | ||
| missingFoods: { | ||
| type: Array as () => IngredientFood[] | null, | ||
| default: null, | ||
| }, | ||
| missingTools: { | ||
| type: Array as () => RecipeTool[] | null, | ||
| default: null, | ||
| }, | ||
| disableCheckbox: { | ||
| type: Boolean, | ||
| default: false, | ||
| }, | ||
| }, | ||
| setup(props, context) { | ||
| const { $globals } = useContext(); | ||
| const missingOrganizers = computed(() => [ | ||
| { | ||
| type: "food", | ||
| show: props.missingFoods?.length, | ||
| icon: $globals.icons.foods, | ||
| items: props.missingFoods ? props.missingFoods.map((food) => { | ||
| return reactive({type: "food", item: food, selected: false} as Organizer); | ||
| }) : [], | ||
| getLabel: (item: IngredientFood) => item.pluralName || item.name, | ||
| }, | ||
| { | ||
| type: "tool", | ||
| show: props.missingTools?.length, | ||
| icon: $globals.icons.tools, | ||
| items: props.missingTools ? props.missingTools.map((tool) => { | ||
| return reactive({type: "tool", item: tool, selected: false} as Organizer); | ||
| }) : [], | ||
| getLabel: (item: RecipeTool) => item.name, | ||
| } | ||
| ]) | ||
| function handleCheckbox(organizer: Organizer) { | ||
| if (props.disableCheckbox) { | ||
| return; | ||
| } | ||
| organizer.selected = !organizer.selected; | ||
| if (organizer.selected) { | ||
| context.emit(`add-${organizer.type}`, organizer.item); | ||
| } | ||
| else { | ||
| context.emit(`remove-${organizer.type}`, organizer.item); | ||
| } | ||
| } | ||
| return { | ||
| missingOrganizers, | ||
| handleCheckbox, | ||
| }; | ||
| } | ||
| }); | ||
| </script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.