Merge branch 'feature/export-progress' into develop

This commit is contained in:
vabene1111
2022-01-28 15:41:49 +01:00
committed by GitHub
141 changed files with 14841 additions and 8379 deletions

View File

@ -312,6 +312,12 @@ export interface Food {
* @memberof Food
*/
full_name?: string;
/**
*
* @type {boolean}
* @memberof Food
*/
ignore_shopping?: boolean;
}
/**
*
@ -708,6 +714,12 @@ export interface IngredientFood {
* @memberof IngredientFood
*/
full_name?: string;
/**
*
* @type {boolean}
* @memberof IngredientFood
*/
ignore_shopping?: boolean;
}
/**
*
@ -1353,6 +1365,12 @@ export interface MealPlanRecipe {
* @memberof MealPlanRecipe
*/
_new?: string;
/**
*
* @type {string}
* @memberof MealPlanRecipe
*/
recent?: string;
}
/**
*
@ -1813,25 +1831,25 @@ export interface RecipeNutrition {
* @type {string}
* @memberof RecipeNutrition
*/
carbohydrates?: string;
carbohydrates: string;
/**
*
* @type {string}
* @memberof RecipeNutrition
*/
fats?: string;
fats: string;
/**
*
* @type {string}
* @memberof RecipeNutrition
*/
proteins?: string;
proteins: string;
/**
*
* @type {string}
* @memberof RecipeNutrition
*/
calories?: string;
calories: string;
/**
*
* @type {string}
@ -1941,6 +1959,12 @@ export interface RecipeOverview {
* @memberof RecipeOverview
*/
_new?: string;
/**
*
* @type {string}
* @memberof RecipeOverview
*/
recent?: string;
}
/**
*
@ -2016,12 +2040,6 @@ export interface RecipeSteps {
* @memberof RecipeSteps
*/
name?: string;
/**
*
* @type {string}
* @memberof RecipeSteps
*/
type?: RecipeStepsTypeEnum;
/**
*
* @type {string}
@ -2089,18 +2107,6 @@ export interface RecipeSteps {
*/
numrecipe?: string;
}
/**
* @export
* @enum {string}
*/
export enum RecipeStepsTypeEnum {
Text = 'TEXT',
Time = 'TIME',
File = 'FILE',
Recipe = 'RECIPE'
}
/**
*
* @export
@ -2621,12 +2627,6 @@ export interface Step {
* @memberof Step
*/
name?: string;
/**
*
* @type {string}
* @memberof Step
*/
type?: StepTypeEnum;
/**
*
* @type {string}
@ -2694,18 +2694,6 @@ export interface Step {
*/
numrecipe?: string;
}
/**
* @export
* @enum {string}
*/
export enum StepTypeEnum {
Text = 'TEXT',
Time = 'TIME',
File = 'FILE',
Recipe = 'RECIPE'
}
/**
*
* @export
@ -3050,6 +3038,12 @@ export interface UserPreference {
* @memberof UserPreference
*/
default_page?: UserPreferenceDefaultPageEnum;
/**
*
* @type {boolean}
* @memberof UserPreference
*/
use_fractions?: boolean;
/**
*
* @type {boolean}
@ -3124,10 +3118,10 @@ export interface UserPreference {
mealplan_autoexclude_onhand?: boolean;
/**
*
* @type {Array<number>}
* @type {Array<MealPlanShared>}
* @memberof UserPreference
*/
shopping_share?: Array<number>;
shopping_share?: Array<MealPlanShared> | null;
/**
*
* @type {number}
@ -3158,6 +3152,13 @@ export interface UserPreference {
* @memberof UserPreference
*/
shopping_add_onhand?: boolean;
/**
*
* @type {boolean}
* @memberof UserPreference
*/
left_handed?: boolean;
}
/**