mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-09 16:18:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/keywords-rework

Browse Source 
# Conflicts:
#	cookbook/static/vue/js/chunk-vendors.js
#	cookbook/static/vue/js/import_response_view.js
#	cookbook/static/vue/js/offline_view.js
#	cookbook/static/vue/js/recipe_search_view.js
#	cookbook/static/vue/js/recipe_view.js
#	cookbook/static/vue/js/supermarket_view.js
#	cookbook/static/vue/js/user_file_view.js
#	cookbook/templates/sw.js
#	cookbook/views/views.py
#	vue/src/components/RecipeCard.vue
#	vue/src/locales/en.json
This commit is contained in:
vabene1111
2021-06-30 14:57:33 +02:00
parent b4e3f3b49b a508fa81c0
commit 28b67a2ba5
115 changed files with 14137 additions and 5122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
vue/src/utils/openapi/api.ts
View File

@@ -193,6 +193,18 @@ export interface ImportLog {
* @memberof ImportLog
*/
keyword?: ImportLogKeyword;
/**
*
* @type {number}
* @memberof ImportLog
*/
total_recipes?: number;
/**
*
* @type {number}
* @memberof ImportLog
*/
imported_recipes?: number;
/**
*
* @type {string}
@@ -631,7 +643,19 @@ export interface MealPlanRecipe {
* @type {string}
* @memberof MealPlanRecipe
*/
file_path?: string;
servings_text?: string;
/**
*
* @type {string}
* @memberof MealPlanRecipe
*/
rating?: string;
/**
*
* @type {string}
* @memberof MealPlanRecipe
*/
last_cooked?: string;
}
/**
*
@@ -766,6 +790,18 @@ export interface Recipe {
* @memberof Recipe
*/
servings_text?: string;
/**
*
* @type {string}
* @memberof Recipe
*/
rating?: string;
/**
*
* @type {string}
* @memberof Recipe
*/
last_cooked?: string;
}
/**
*
@@ -1047,7 +1083,19 @@ export interface RecipeOverview {
* @type {string}
* @memberof RecipeOverview
*/
file_path?: string;
servings_text?: string;
/**
*
* @type {string}
* @memberof RecipeOverview
*/
rating?: string;
/**
*
* @type {string}
* @memberof RecipeOverview
*/
last_cooked?: string;
}
/**
*
@@ -1134,6 +1182,12 @@ export interface RecipeSteps {
* @memberof RecipeSteps
*/
show_as_header?: boolean;
/**
*
* @type {StepFile}
* @memberof RecipeSteps
*/
file?: StepFile | null;
}
/**
@@ -1142,7 +1196,8 @@ export interface RecipeSteps {
*/
export enum RecipeStepsTypeEnum {
Text = 'TEXT',
Time = 'TIME'
Time = 'TIME',
File = 'FILE'
}
/**
@@ -1532,6 +1587,12 @@ export interface Step {
* @memberof Step
*/
show_as_header?: boolean;
/**
*
* @type {StepFile}
* @memberof Step
*/
file?: StepFile | null;
}
/**
@@ -1540,9 +1601,35 @@ export interface Step {
*/
export enum StepTypeEnum {
Text = 'TEXT',
Time = 'TIME'
Time = 'TIME',
File = 'FILE'
}
/**
*
* @export
* @interface StepFile
*/
export interface StepFile {
/**
*
* @type {string}
* @memberof StepFile
*/
name: string;
/**
*
* @type {any}
* @memberof StepFile
*/
file?: any;
/**
*
* @type {number}
* @memberof StepFile
*/
id?: number;
}
/**
*
* @export