cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

infinite loader bug fixing

Browse Source
This commit is contained in:
smilerz
2021-09-06 12:28:14 -05:00
parent 7053a857c2
commit 84744560e0
12 changed files with 247 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cookbook/static/vue/js/import_response_view.js
View File

File diff suppressed because one or more lines are too long

2
cookbook/static/vue/js/model_list_view.js
View File

File diff suppressed because one or more lines are too long

2
cookbook/static/vue/js/offline_view.js
View File

File diff suppressed because one or more lines are too long

2
cookbook/static/vue/js/recipe_search_view.js
View File

File diff suppressed because one or more lines are too long

2
cookbook/static/vue/js/recipe_view.js
View File

File diff suppressed because one or more lines are too long

2
cookbook/static/vue/js/supermarket_view.js
View File

File diff suppressed because one or more lines are too long

2
cookbook/static/vue/js/user_file_view.js
View File

File diff suppressed because one or more lines are too long

8
vue/src/apps/ModelListView/ModelListView.vue
View File

@ -103,8 +103,9 @@ export default {
methods: {
// this.genericAPI inherited from ApiMixin
resetList: function (e) {
this.items_right = []
this.items_left = []
this['items_' + e.column] = []
this[e.column + '_counts'].max = 9999 + Math.random()
this[e.column + '_counts'].current = 0
},
startAction: function (e, param) {
let source = e?.source ?? {}
@ -192,8 +193,9 @@ export default {
this['items_' + column] = this['items_' + column].concat(result.data?.results)
this[column + '_counts']['current'] = this['items_' + column].length
this[column + '_counts']['max'] = result.data.count
} else {
this[column + '_counts']['current'] = 0
this[column + '_counts']['max'] = 0
console.log('no data returned')
}
}).catch((err) => {

27
vue/src/components/GenericSplitLists.vue
View File

@ -74,6 +74,7 @@
@infinite="infiniteHandler($event, 'left')"
spinner="waveDots">
<template v-slot:no-more><span/></template>
<template v-slot:no-results><span>{{$t('No_Results')}}</span></template>
</infinite-loading>
</div>
<!-- right side cards -->
@ -84,6 +85,7 @@
@infinite="infiniteHandler($event, 'right')"
spinner="waveDots">
<template v-slot:no-more><span/></template>
<template v-slot:no-results><span>{{$t('No_Results')}}</span></template>
</infinite-loading>
</div>
</div>
@ -150,33 +152,42 @@ export default {
right_counts: {
deep: true,
handler(newVal, oldVal) {
if (newVal.current > 0) {
this.right_state.loaded()
}
if (newVal.current >= newVal.max) {
this.right_state.complete()
} else {
this.right_state.loaded()
}
}
},
left_counts: {
deep: true,
handler(newVal, oldVal) {
if (newVal.current > 0) {
this.left_state.loaded()
}
if (newVal.current >= newVal.max) {
this.left_state.complete()
} else {
this.left_state.loaded()
}
}
}
},
methods: {
resetSearch: function () {
this.search_right = ''
this.search_left = ''
if (this.search_right == '') {
this.right_page = 0
this.left_page = 0
this.right += 1
this.$emit('reset', {'column':'right'})
} else {
this.search_right = ''
}
if (this.search_left == '') {
this.left_page = 0
this.left += 1
// this.$emit('reset') doublecheck if this is necessary
this.$emit('reset', {'column':'left'})
} else {
this.search_left = ''
}
},
infiniteHandler: function($state, col) {
let params = {

3
vue/src/locales/en.json
View File

@ -123,5 +123,6 @@
"Recipe": "Recipe",
"tree_root": "Root of Tree",
"Icon": "Icon",
"Unit": "Unit"
"Unit": "Unit",
"No_Results": "No Results"
}

3
vue/src/utils/models.js
View File

@ -137,10 +137,9 @@ export class Models {
},
}
static UNIT = {
'name': i18n.t('Unit'), // *OPTIONAL: parameters will be built model -> model_type -> default
'name': i18n.t('Unit'),
'apiName': 'Unit',
'create': {
// if not defined partialUpdate will use the same parameters, prepending 'id'
'params': [['name', 'description']],
'form': {
'name': {

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

@ -119,6 +119,12 @@ export interface Food {
* @memberof Food
*/
name: string;
/**
*
* @type {string}
* @memberof Food
*/
description?: string;
/**
*
* @type {number}
@ -133,10 +139,10 @@ export interface Food {
ignore_shopping?: boolean;
/**
*
* @type {FoodSupermarketCategory}
* @type {number}
* @memberof Food
*/
supermarket_category?: FoodSupermarketCategory | null;
supermarket_category?: number | null;
/**
*
* @type {string}
@ -162,25 +168,6 @@ export interface Food {
*/
numrecipe?: string;
}
/**
*
* @export
* @interface FoodSupermarketCategory
*/
export interface FoodSupermarketCategory {
/**
*
* @type {number}
* @memberof FoodSupermarketCategory
*/
id?: number;
/**
*
* @type {string}
* @memberof FoodSupermarketCategory
*/
name: string;
}
/**
*
* @export
@ -427,10 +414,10 @@ export interface InlineResponse2001 {
previous?: string | null;
/**
*
* @type {Array<Food>}
* @type {Array<Unit>}
* @memberof InlineResponse2001
*/
results?: Array<Food>;
results?: Array<Unit>;
}
/**
*
@ -458,10 +445,10 @@ export interface InlineResponse2002 {
previous?: string | null;
/**
*
* @type {Array<RecipeOverview>}
* @type {Array<Food>}
* @memberof InlineResponse2002
*/
results?: Array<RecipeOverview>;
results?: Array<Food>;
}
/**
*
@ -489,9 +476,40 @@ export interface InlineResponse2003 {
previous?: string | null;
/**
*
* @type {Array<SupermarketCategoryRelation>}
* @type {Array<RecipeOverview>}
* @memberof InlineResponse2003
*/
results?: Array<RecipeOverview>;
}
/**
*
* @export
* @interface InlineResponse2004
*/
export interface InlineResponse2004 {
/**
*
* @type {number}
* @memberof InlineResponse2004
*/
count?: number;
/**
*
* @type {string}
* @memberof InlineResponse2004
*/
next?: string | null;
/**
*
* @type {string}
* @memberof InlineResponse2004
*/
previous?: string | null;
/**
*
* @type {Array<SupermarketCategoryRelation>}
* @memberof InlineResponse2004
*/
results?: Array<SupermarketCategoryRelation>;
}
/**
@ -742,6 +760,12 @@ export interface MealPlanRecipe {
* @memberof MealPlanRecipe
*/
last_cooked?: string;
/**
*
* @type {string}
* @memberof MealPlanRecipe
*/
_new?: string;
}
/**
*
@ -950,12 +974,24 @@ export interface RecipeBookEntry {
* @memberof RecipeBookEntry
*/
book: number;
/**
*
* @type {string}
* @memberof RecipeBookEntry
*/
book_content?: string;
/**
*
* @type {number}
* @memberof RecipeBookEntry
*/
recipe: number;
/**
*
* @type {string}
* @memberof RecipeBookEntry
*/
recipe_content?: string;
}
/**
*
@ -1182,6 +1218,12 @@ export interface RecipeOverview {
* @memberof RecipeOverview
*/
last_cooked?: string;
/**
*
* @type {string}
* @memberof RecipeOverview
*/
_new?: string;
}
/**
*
@ -1760,6 +1802,12 @@ export interface StepFood {
* @memberof StepFood
*/
name: string;
/**
*
* @type {string}
* @memberof StepFood
*/
description?: string;
/**
*
* @type {number}
@ -1774,10 +1822,10 @@ export interface StepFood {
ignore_shopping?: boolean;
/**
*
* @type {FoodSupermarketCategory}
* @type {number}
* @memberof StepFood
*/
supermarket_category?: FoodSupermarketCategory | null;
supermarket_category?: number | null;
/**
*
* @type {string}
@ -1882,6 +1930,18 @@ export interface StepUnit {
* @memberof StepUnit
*/
description?: string | null;
/**
*
* @type {string}
* @memberof StepUnit
*/
numrecipe?: string;
/**
*
* @type {string}
* @memberof StepUnit
*/
image?: string;
}
/**
*
@ -2128,6 +2188,18 @@ export interface Unit {
* @memberof Unit
*/
description?: string | null;
/**
*
* @type {string}
* @memberof Unit
*/
numrecipe?: string;
/**
*
* @type {string}
* @memberof Unit
*/
image?: string;
}
/**
*
@ -4260,7 +4332,7 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
};
},
/**
*
* optional parameters - **recipe**: id of recipe - only return books for that recipe - **book**: id of book - only return recipes in that book
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
@ -4708,10 +4780,12 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
},
/**
*
* @param {number} [page] A page number within the paginated result set.
* @param {number} [pageSize] Number of results to return per page.
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
listUnits: async (options: any = {}): Promise<RequestArgs> => {
listUnits: async (page?: number, pageSize?: number, options: any = {}): Promise<RequestArgs> => {
const localVarPath = `/api/unit/`;
// use dummy base URL string because the URL constructor only accepts absolute URLs.
const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@ -4724,6 +4798,14 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
const localVarHeaderParameter = {} as any;
const localVarQueryParameter = {} as any;
if (page !== undefined) {
localVarQueryParameter['page'] = page;
}
if (pageSize !== undefined) {
localVarQueryParameter['page_size'] = pageSize;
}
setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
@ -4933,6 +5015,47 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
options: localVarRequestOptions,
};
},
/**
*
* @param {string} id A unique integer value identifying this unit.
* @param {string} target
* @param {Unit} [unit]
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
mergeUnit: async (id: string, target: string, unit?: Unit, options: any = {}): Promise<RequestArgs> => {
// verify required parameter 'id' is not null or undefined
assertParamExists('mergeUnit', 'id', id)
// verify required parameter 'target' is not null or undefined
assertParamExists('mergeUnit', 'target', target)
const localVarPath = `/api/unit/{id}/merge/{target}/`
.replace(`{${"id"}}`, encodeURIComponent(String(id)))
.replace(`{${"target"}}`, encodeURIComponent(String(target)));
// use dummy base URL string because the URL constructor only accepts absolute URLs.
const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
let baseOptions;
if (configuration) {
baseOptions = configuration.baseOptions;
}
const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
const localVarHeaderParameter = {} as any;
const localVarQueryParameter = {} as any;
localVarHeaderParameter['Content-Type'] = 'application/json';
setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
localVarRequestOptions.data = serializeDataIfNeeded(unit, localVarRequestOptions, configuration)
return {
url: toPathString(localVarUrlObj),
options: localVarRequestOptions,
};
},
/**
*
* @param {string} id A unique integer value identifying this food.
@ -8225,7 +8348,7 @@ export const ApiApiFp = function(configuration?: Configuration) {
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async listFoods(query?: string, root?: number, tree?: number, page?: number, pageSize?: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<InlineResponse2001>> {
async listFoods(query?: string, root?: number, tree?: number, page?: number, pageSize?: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<InlineResponse2002>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.listFoods(query, root, tree, page, pageSize, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
},
@ -8280,7 +8403,7 @@ export const ApiApiFp = function(configuration?: Configuration) {
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
},
/**
*
* optional parameters - **recipe**: id of recipe - only return books for that recipe - **book**: id of book - only return recipes in that book
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
@ -8314,7 +8437,7 @@ export const ApiApiFp = function(configuration?: Configuration) {
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async listRecipes(query?: string, keywords?: string, foods?: string, books?: string, keywordsOr?: string, foodsOr?: string, booksOr?: string, internal?: string, random?: string, _new?: string, page?: number, pageSize?: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<InlineResponse2002>> {
async listRecipes(query?: string, keywords?: string, foods?: string, books?: string, keywordsOr?: string, foodsOr?: string, booksOr?: string, internal?: string, random?: string, _new?: string, page?: number, pageSize?: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<InlineResponse2003>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.listRecipes(query, keywords, foods, books, keywordsOr, foodsOr, booksOr, internal, random, _new, page, pageSize, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
},
@ -8370,7 +8493,7 @@ export const ApiApiFp = function(configuration?: Configuration) {
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async listSupermarketCategoryRelations(page?: number, pageSize?: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<InlineResponse2003>> {
async listSupermarketCategoryRelations(page?: number, pageSize?: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<InlineResponse2004>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.listSupermarketCategoryRelations(page, pageSize, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
},
@ -8412,11 +8535,13 @@ export const ApiApiFp = function(configuration?: Configuration) {
},
/**
*
* @param {number} [page] A page number within the paginated result set.
* @param {number} [pageSize] Number of results to return per page.
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async listUnits(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<Unit>>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.listUnits(options);
async listUnits(page?: number, pageSize?: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<InlineResponse2001>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.listUnits(page, pageSize, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
},
/**
@ -8479,6 +8604,18 @@ export const ApiApiFp = function(configuration?: Configuration) {
const localVarAxiosArgs = await localVarAxiosParamCreator.mergeKeyword(id, target, keyword, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
},
/**
*
* @param {string} id A unique integer value identifying this unit.
* @param {string} target
* @param {Unit} [unit]
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async mergeUnit(id: string, target: string, unit?: Unit, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Unit>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.mergeUnit(id, target, unit, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
},
/**
*
* @param {string} id A unique integer value identifying this food.
@ -9778,7 +9915,7 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
listFoods(query?: string, root?: number, tree?: number, page?: number, pageSize?: number, options?: any): AxiosPromise<InlineResponse2001> {
listFoods(query?: string, root?: number, tree?: number, page?: number, pageSize?: number, options?: any): AxiosPromise<InlineResponse2002> {
return localVarFp.listFoods(query, root, tree, page, pageSize, options).then((request) => request(axios, basePath));
},
/**
@ -9827,7 +9964,7 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
return localVarFp.listMealTypes(options).then((request) => request(axios, basePath));
},
/**
*
* optional parameters - **recipe**: id of recipe - only return books for that recipe - **book**: id of book - only return recipes in that book
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
@ -9859,7 +9996,7 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
listRecipes(query?: string, keywords?: string, foods?: string, books?: string, keywordsOr?: string, foodsOr?: string, booksOr?: string, internal?: string, random?: string, _new?: string, page?: number, pageSize?: number, options?: any): AxiosPromise<InlineResponse2002> {
listRecipes(query?: string, keywords?: string, foods?: string, books?: string, keywordsOr?: string, foodsOr?: string, booksOr?: string, internal?: string, random?: string, _new?: string, page?: number, pageSize?: number, options?: any): AxiosPromise<InlineResponse2003> {
return localVarFp.listRecipes(query, keywords, foods, books, keywordsOr, foodsOr, booksOr, internal, random, _new, page, pageSize, options).then((request) => request(axios, basePath));
},
/**
@ -9909,7 +10046,7 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
listSupermarketCategoryRelations(page?: number, pageSize?: number, options?: any): AxiosPromise<InlineResponse2003> {
listSupermarketCategoryRelations(page?: number, pageSize?: number, options?: any): AxiosPromise<InlineResponse2004> {
return localVarFp.listSupermarketCategoryRelations(page, pageSize, options).then((request) => request(axios, basePath));
},
/**
@ -9946,11 +10083,13 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
},
/**
*
* @param {number} [page] A page number within the paginated result set.
* @param {number} [pageSize] Number of results to return per page.
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
listUnits(options?: any): AxiosPromise<Array<Unit>> {
return localVarFp.listUnits(options).then((request) => request(axios, basePath));
listUnits(page?: number, pageSize?: number, options?: any): AxiosPromise<InlineResponse2001> {
return localVarFp.listUnits(page, pageSize, options).then((request) => request(axios, basePath));
},
/**
*
@ -10006,6 +10145,17 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
mergeKeyword(id: string, target: string, keyword?: Keyword, options?: any): AxiosPromise<Keyword> {
return localVarFp.mergeKeyword(id, target, keyword, options).then((request) => request(axios, basePath));
},
/**
*
* @param {string} id A unique integer value identifying this unit.
* @param {string} target
* @param {Unit} [unit]
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
mergeUnit(id: string, target: string, unit?: Unit, options?: any): AxiosPromise<Unit> {
return localVarFp.mergeUnit(id, target, unit, options).then((request) => request(axios, basePath));
},
/**
*
* @param {string} id A unique integer value identifying this food.
@ -11392,7 +11542,7 @@ export class ApiApi extends BaseAPI {
}
/**
*
* optional parameters - **recipe**: id of recipe - only return books for that recipe - **book**: id of book - only return recipes in that book
* @param {*} [options] Override http request option.
* @throws {RequiredError}
* @memberof ApiApi
@ -11537,12 +11687,14 @@ export class ApiApi extends BaseAPI {
/**
*
* @param {number} [page] A page number within the paginated result set.
* @param {number} [pageSize] Number of results to return per page.
* @param {*} [options] Override http request option.
* @throws {RequiredError}
* @memberof ApiApi
*/
public listUnits(options?: any) {
return ApiApiFp(this.configuration).listUnits(options).then((request) => request(this.axios, this.basePath));
public listUnits(page?: number, pageSize?: number, options?: any) {
return ApiApiFp(this.configuration).listUnits(page, pageSize, options).then((request) => request(this.axios, this.basePath));
}
/**
@ -11611,6 +11763,19 @@ export class ApiApi extends BaseAPI {
return ApiApiFp(this.configuration).mergeKeyword(id, target, keyword, options).then((request) => request(this.axios, this.basePath));
}
/**
*
* @param {string} id A unique integer value identifying this unit.
* @param {string} target
* @param {Unit} [unit]
* @param {*} [options] Override http request option.
* @throws {RequiredError}
* @memberof ApiApi
*/
public mergeUnit(id: string, target: string, unit?: Unit, options?: any) {
return ApiApiFp(this.configuration).mergeUnit(id, target, unit, options).then((request) => request(this.axios, this.basePath));
}
/**
*
* @param {string} id A unique integer value identifying this food.