Merge branch 'develop' of https://github.com/vabene1111/recipes into develop

# Conflicts:
#	vue/src/components/Modals/LookupInput.vue
This commit is contained in:
Kaibu
2022-01-17 23:48:12 +01:00
22 changed files with 591 additions and 323 deletions

View File

@@ -586,6 +586,8 @@ export default {
if (this.recipe.working_time === "" || isNaN(this.recipe.working_time)) {
this.recipe.working_time = 0
}
this.recipe.servings = Math.floor(this.recipe.servings) // temporary fix until a proper framework for frontend input validation is established
if (this.recipe.servings === "" || isNaN(this.recipe.servings)) {
this.recipe.servings = 0
}

View File

@@ -1,6 +1,6 @@
<template>
<div id="app" style="margin-bottom: 4vh">
<RecipeSwitcher mode="mealplan" />
<RecipeSwitcher ref="ref_recipe_switcher"/>
<div class="row">
<div class="col-12 col-xl-8 col-lg-10 offset-xl-2 offset-lg-1">
<div class="row">

View File

@@ -5,7 +5,7 @@
</template>
<div v-if="!loading">
<RecipeSwitcher :recipe="rootrecipe.id" :name="rootrecipe.name" mode="recipe" @switch="quickSwitch($event)" />
<RecipeSwitcher ref="ref_recipe_switcher" @switch="quickSwitch($event)" />
<div class="row">
<div class="col-12" style="text-align: center">
<h3>{{ recipe.name }}</h3>