fixed and updates openapi shema

cookbook/views/api.py

@@ -288,7 +288,7 @@ class RecipeSchema(AutoSchema):
 
     def get_path_parameters(self, path, method):
         if not is_list_view(path, method, self.view):
-            return []
+            return super(RecipeSchema, self).get_path_parameters(path,method)
 
         parameters = super().get_path_parameters(path, method)
         parameters.append({

vue/src/apps/RecipeSearchView/RecipeSearchView.vue

@@ -51,7 +51,8 @@
                     </div>
 
                     <div class="col-md-1" style="position: relative; margin-top: 1vh">
-                      <button id="id_settings_button" class="btn btn-primary btn-block"><i class="fas fa-cog"></i></button>
+                      <button id="id_settings_button" class="btn btn-primary btn-block"><i class="fas fa-cog"></i>
+                      </button>
                     </div>
 
 
@@ -92,7 +93,9 @@
                     </div>
                     <div class="row" style="margin-top: 1vh">
                       <div class="col-12" style="text-align: right">
-                        <b-button size="sm" variant="secondary" style="margin-right:8px" @click="$root.$emit('bv::hide::popover')">{{$t('Close')}}</b-button>
+                        <b-button size="sm" variant="secondary" style="margin-right:8px"
+                                  @click="$root.$emit('bv::hide::popover')">{{ $t('Close') }}
+                        </b-button>
                       </div>
                     </div>
                   </b-popover>
@@ -274,7 +277,7 @@ export default {
       }
 
       this.loadMealPlan()
-    this.loadRecentlyViewed()
+      this.loadRecentlyViewed()
     })
 
     this.refreshData()
@@ -287,11 +290,9 @@ export default {
       deep: true
     },
     'settings.show_meal_plan': function () {
-      console.log('Test')
       this.loadMealPlan()
     },
     'settings.recently_viewed': function () {
-      console.log('RV')
       this.loadRecentlyViewed()
     },
   },
@@ -299,27 +300,25 @@ export default {
     refreshData: function () {
       let apiClient = new ApiApiFactory()
 
-      apiClient.listRecipes({
+      apiClient.listRecipes(
-        query: {
+          this.search_input,
-          query: this.search_input,
+          this.search_keywords.map(function (A) {
-          keywords: this.search_keywords.map(function (A) {
             return A["id"];
           }),
-          foods: this.search_foods.map(function (A) {
+          this.search_foods.map(function (A) {
             return A["id"];
           }),
-          books: this.search_books.map(function (A) {
+          this.search_books.map(function (A) {
             return A["id"];
           }),
+          this.settings.search_keywords_or,
+          this.settings.search_foods_or,
+          this.settings.search_books_or,
 
-          keywords_or: this.settings.search_keywords_or,
+          this.search_internal,
-          foods_or: this.settings.search_foods_or,
+          undefined,
-          books_or: this.settings.search_books_or,
+          this.pagination_page,
-
+      ).then(result => {
-          internal: this.search_internal,
-          page: this.pagination_page,
-        }
-      }).then(result => {
         this.recipes = result.data.results
         this.pagination_count = result.data.count
       })

vue/src/utils/openapi/.openapi-generator/FILES

@@ -1,4 +1,3 @@
 api.ts
-base.ts
 common.ts
 configuration.ts

vue/src/utils/openapi/api.ts

@@ -21,6 +21,43 @@ import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObj
 // @ts-ignore
 import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from './base';
 
+/**
+ * 
+ * @export
+ * @interface BookmarkletImport
+ */
+export interface BookmarkletImport {
+    /**
+     * 
+     * @type {number}
+     * @memberof BookmarkletImport
+     */
+    id?: number;
+    /**
+     * 
+     * @type {string}
+     * @memberof BookmarkletImport
+     */
+    url?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof BookmarkletImport
+     */
+    html: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof BookmarkletImport
+     */
+    created_by?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof BookmarkletImport
+     */
+    created_at?: string;
+}
 /**
  * 
  * @export
@@ -273,6 +310,37 @@ export interface Ingredient {
      */
     no_amount?: boolean;
 }
+/**
+ * 
+ * @export
+ * @interface InlineResponse200
+ */
+export interface InlineResponse200 {
+    /**
+     * 
+     * @type {number}
+     * @memberof InlineResponse200
+     */
+    count?: number;
+    /**
+     * 
+     * @type {string}
+     * @memberof InlineResponse200
+     */
+    next?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof InlineResponse200
+     */
+    previous?: string | null;
+    /**
+     * 
+     * @type {Array<RecipeOverview>}
+     * @memberof InlineResponse200
+     */
+    results?: Array<RecipeOverview>;
+}
 /**
  * 
  * @export
@@ -342,10 +410,10 @@ export interface MealPlan {
     title?: string;
     /**
      * 
-     * @type {number}
+     * @type {MealPlanRecipe}
      * @memberof MealPlan
      */
-    recipe?: number | null;
+    recipe?: MealPlanRecipe | null;
     /**
      * 
      * @type {string}
@@ -401,6 +469,91 @@ export interface MealPlan {
      */
     meal_type_name?: string;
 }
+/**
+ * 
+ * @export
+ * @interface MealPlanRecipe
+ */
+export interface MealPlanRecipe {
+    /**
+     * 
+     * @type {number}
+     * @memberof MealPlanRecipe
+     */
+    id?: number;
+    /**
+     * 
+     * @type {string}
+     * @memberof MealPlanRecipe
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof MealPlanRecipe
+     */
+    description?: string | null;
+    /**
+     * 
+     * @type {any}
+     * @memberof MealPlanRecipe
+     */
+    image?: any;
+    /**
+     * 
+     * @type {Array<RecipeOverviewKeywords>}
+     * @memberof MealPlanRecipe
+     */
+    keywords: Array<RecipeOverviewKeywords>;
+    /**
+     * 
+     * @type {number}
+     * @memberof MealPlanRecipe
+     */
+    working_time?: number;
+    /**
+     * 
+     * @type {number}
+     * @memberof MealPlanRecipe
+     */
+    waiting_time?: number;
+    /**
+     * 
+     * @type {string}
+     * @memberof MealPlanRecipe
+     */
+    created_by?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof MealPlanRecipe
+     */
+    created_at?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof MealPlanRecipe
+     */
+    updated_at?: string;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof MealPlanRecipe
+     */
+    internal?: boolean;
+    /**
+     * 
+     * @type {number}
+     * @memberof MealPlanRecipe
+     */
+    servings?: number;
+    /**
+     * 
+     * @type {string}
+     * @memberof MealPlanRecipe
+     */
+    file_path?: string;
+}
 /**
  * 
  * @export
@@ -1726,7 +1879,8 @@ export enum UserPreferenceDefaultPageEnum {
     */
 export enum UserPreferenceSearchStyleEnum {
     Small = 'SMALL',
-    Large = 'LARGE'
+    Large = 'LARGE',
+    New = 'NEW'
 }
 
 /**
@@ -1767,6 +1921,39 @@ export interface ViewLog {
  */
 export const ApiApiAxiosParamCreator = function (configuration?: Configuration) {
     return {
+        /**
+         * 
+         * @param {BookmarkletImport} [bookmarkletImport] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createBookmarkletImport: async (bookmarkletImport?: BookmarkletImport, options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/bookmarklet-import/`;
+            // 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: 'POST', ...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(bookmarkletImport, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @param {CookLog} [cookLog] 
@@ -2427,6 +2614,39 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this bookmarklet import.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyBookmarkletImport: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('destroyBookmarkletImport', 'id', id)
+            const localVarPath = `/api/bookmarklet-import/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // 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: 'DELETE', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this cook log.
@@ -3129,6 +3349,35 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listBookmarkletImports: async (options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/bookmarklet-import/`;
+            // 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: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @param {*} [options] Override http request option.
@@ -3391,11 +3640,22 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
             };
         },
         /**
-         * optional parameters  - **query**: search recipes for a string contained              in the recipe name (case in-sensitive) - **limit**: limits the amount of returned results
+         * 
+         * @param {string} [query] Query string matched (fuzzy) against recipe name. In the future also fulltext search.
+         * @param {string} [keywords] Id of keyword a recipe should have. For multiple repeat parameter.
+         * @param {string} [foods] Id of food a recipe should have. For multiple repeat parameter.
+         * @param {string} [books] Id of book a recipe should have. For multiple repeat parameter.
+         * @param {string} [keywordsOr] If recipe should have all (AND) or any (OR) of the provided keywords.
+         * @param {string} [foodsOr] If recipe should have all (AND) or any (OR) any of the provided foods.
+         * @param {string} [booksOr] If recipe should be in all (AND) or any (OR) any of the provided books.
+         * @param {string} [internal] true or false. If only internal recipes should be returned or not.
+         * @param {string} [random] true or false. returns the results in randomized order.
+         * @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}
          */
-        listRecipes: async (options: any = {}): Promise<RequestArgs> => {
+        listRecipes: async (query?: string, keywords?: string, foods?: string, books?: string, keywordsOr?: string, foodsOr?: string, booksOr?: string, internal?: string, random?: string, page?: number, pageSize?: number, options: any = {}): Promise<RequestArgs> => {
             const localVarPath = `/api/recipe/`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -3408,6 +3668,50 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            if (query !== undefined) {
+                localVarQueryParameter['query'] = query;
+            }
+
+            if (keywords !== undefined) {
+                localVarQueryParameter['keywords'] = keywords;
+            }
+
+            if (foods !== undefined) {
+                localVarQueryParameter['foods'] = foods;
+            }
+
+            if (books !== undefined) {
+                localVarQueryParameter['books'] = books;
+            }
+
+            if (keywordsOr !== undefined) {
+                localVarQueryParameter['keywords_or'] = keywordsOr;
+            }
+
+            if (foodsOr !== undefined) {
+                localVarQueryParameter['foods_or'] = foodsOr;
+            }
+
+            if (booksOr !== undefined) {
+                localVarQueryParameter['books_or'] = booksOr;
+            }
+
+            if (internal !== undefined) {
+                localVarQueryParameter['internal'] = internal;
+            }
+
+            if (random !== undefined) {
+                localVarQueryParameter['random'] = random;
+            }
+
+            if (page !== undefined) {
+                localVarQueryParameter['page'] = page;
+            }
+
+            if (pageSize !== undefined) {
+                localVarQueryParameter['page_size'] = pageSize;
+            }
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
@@ -3767,6 +4071,43 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this bookmarklet import.
+         * @param {BookmarkletImport} [bookmarkletImport] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateBookmarkletImport: async (id: string, bookmarkletImport?: BookmarkletImport, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('partialUpdateBookmarkletImport', 'id', id)
+            const localVarPath = `/api/bookmarklet-import/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // 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: 'PATCH', ...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(bookmarkletImport, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this cook log.
@@ -4507,6 +4848,39 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this bookmarklet import.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveBookmarkletImport: async (id: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('retrieveBookmarkletImport', 'id', id)
+            const localVarPath = `/api/bookmarklet-import/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // 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: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this cook log.
@@ -5233,6 +5607,43 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this bookmarklet import.
+         * @param {BookmarkletImport} [bookmarkletImport] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateBookmarkletImport: async (id: string, bookmarkletImport?: BookmarkletImport, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            assertParamExists('updateBookmarkletImport', 'id', id)
+            const localVarPath = `/api/bookmarklet-import/{id}/`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // 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(bookmarkletImport, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this cook log.
@@ -5983,6 +6394,16 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
 export const ApiApiFp = function(configuration?: Configuration) {
     const localVarAxiosParamCreator = ApiApiAxiosParamCreator(configuration)
     return {
+        /**
+         * 
+         * @param {BookmarkletImport} [bookmarkletImport] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async createBookmarkletImport(bookmarkletImport?: BookmarkletImport, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<BookmarkletImport>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.createBookmarkletImport(bookmarkletImport, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {CookLog} [cookLog] 
@@ -6183,6 +6604,16 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.createViewLog(viewLog, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this bookmarklet import.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async destroyBookmarkletImport(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.destroyBookmarkletImport(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this cook log.
@@ -6394,6 +6825,15 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.imageRecipe(id, image, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async listBookmarkletImports(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<BookmarkletImport>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listBookmarkletImports(options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {*} [options] Override http request option.
@@ -6476,12 +6916,23 @@ export const ApiApiFp = function(configuration?: Configuration) {
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
-         * optional parameters  - **query**: search recipes for a string contained              in the recipe name (case in-sensitive) - **limit**: limits the amount of returned results
+         * 
+         * @param {string} [query] Query string matched (fuzzy) against recipe name. In the future also fulltext search.
+         * @param {string} [keywords] Id of keyword a recipe should have. For multiple repeat parameter.
+         * @param {string} [foods] Id of food a recipe should have. For multiple repeat parameter.
+         * @param {string} [books] Id of book a recipe should have. For multiple repeat parameter.
+         * @param {string} [keywordsOr] If recipe should have all (AND) or any (OR) of the provided keywords.
+         * @param {string} [foodsOr] If recipe should have all (AND) or any (OR) any of the provided foods.
+         * @param {string} [booksOr] If recipe should be in all (AND) or any (OR) any of the provided books.
+         * @param {string} [internal] true or false. If only internal recipes should be returned or not.
+         * @param {string} [random] true or false. returns the results in randomized order.
+         * @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 listRecipes(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<RecipeOverview>>> {
+        async listRecipes(query?: string, keywords?: string, foods?: string, books?: string, keywordsOr?: string, foodsOr?: string, booksOr?: string, internal?: string, random?: string, page?: number, pageSize?: number, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<InlineResponse200>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listRecipes(options);
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listRecipes(query, keywords, foods, books, keywordsOr, foodsOr, booksOr, internal, random, page, pageSize, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
@@ -6592,6 +7043,17 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listViewLogs(options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this bookmarklet import.
+         * @param {BookmarkletImport} [bookmarkletImport] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async partialUpdateBookmarkletImport(id: string, bookmarkletImport?: BookmarkletImport, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<BookmarkletImport>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateBookmarkletImport(id, bookmarkletImport, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this cook log.
@@ -6812,6 +7274,16 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.partialUpdateViewLog(id, viewLog, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this bookmarklet import.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async retrieveBookmarkletImport(id: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<BookmarkletImport>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveBookmarkletImport(id, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this cook log.
@@ -7032,6 +7504,17 @@ export const ApiApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.retrieveViewLog(id, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this bookmarklet import.
+         * @param {BookmarkletImport} [bookmarkletImport] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async updateBookmarkletImport(id: string, bookmarkletImport?: BookmarkletImport, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<BookmarkletImport>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.updateBookmarkletImport(id, bookmarkletImport, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this cook log.
@@ -7262,6 +7745,15 @@ export const ApiApiFp = function(configuration?: Configuration) {
 export const ApiApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
     const localVarFp = ApiApiFp(configuration)
     return {
+        /**
+         * 
+         * @param {BookmarkletImport} [bookmarkletImport] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        createBookmarkletImport(bookmarkletImport?: BookmarkletImport, options?: any): AxiosPromise<BookmarkletImport> {
+            return localVarFp.createBookmarkletImport(bookmarkletImport, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {CookLog} [cookLog] 
@@ -7442,6 +7934,15 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         createViewLog(viewLog?: ViewLog, options?: any): AxiosPromise<ViewLog> {
             return localVarFp.createViewLog(viewLog, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this bookmarklet import.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        destroyBookmarkletImport(id: string, options?: any): AxiosPromise<void> {
+            return localVarFp.destroyBookmarkletImport(id, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this cook log.
@@ -7632,6 +8133,14 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         imageRecipe(id: string, image?: any, options?: any): AxiosPromise<RecipeImage> {
             return localVarFp.imageRecipe(id, image, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        listBookmarkletImports(options?: any): AxiosPromise<Array<BookmarkletImport>> {
+            return localVarFp.listBookmarkletImports(options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {*} [options] Override http request option.
@@ -7705,12 +8214,23 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
             return localVarFp.listRecipeBooks(options).then((request) => request(axios, basePath));
         },
         /**
-         * optional parameters  - **query**: search recipes for a string contained              in the recipe name (case in-sensitive) - **limit**: limits the amount of returned results
+         * 
+         * @param {string} [query] Query string matched (fuzzy) against recipe name. In the future also fulltext search.
+         * @param {string} [keywords] Id of keyword a recipe should have. For multiple repeat parameter.
+         * @param {string} [foods] Id of food a recipe should have. For multiple repeat parameter.
+         * @param {string} [books] Id of book a recipe should have. For multiple repeat parameter.
+         * @param {string} [keywordsOr] If recipe should have all (AND) or any (OR) of the provided keywords.
+         * @param {string} [foodsOr] If recipe should have all (AND) or any (OR) any of the provided foods.
+         * @param {string} [booksOr] If recipe should be in all (AND) or any (OR) any of the provided books.
+         * @param {string} [internal] true or false. If only internal recipes should be returned or not.
+         * @param {string} [random] true or false. returns the results in randomized order.
+         * @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}
          */
-        listRecipes(options?: any): AxiosPromise<Array<RecipeOverview>> {
+        listRecipes(query?: string, keywords?: string, foods?: string, books?: string, keywordsOr?: string, foodsOr?: string, booksOr?: string, internal?: string, random?: string, page?: number, pageSize?: number, options?: any): AxiosPromise<InlineResponse200> {
-            return localVarFp.listRecipes(options).then((request) => request(axios, basePath));
+            return localVarFp.listRecipes(query, keywords, foods, books, keywordsOr, foodsOr, booksOr, internal, random, page, pageSize, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -7808,6 +8328,16 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         listViewLogs(options?: any): AxiosPromise<Array<ViewLog>> {
             return localVarFp.listViewLogs(options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this bookmarklet import.
+         * @param {BookmarkletImport} [bookmarkletImport] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        partialUpdateBookmarkletImport(id: string, bookmarkletImport?: BookmarkletImport, options?: any): AxiosPromise<BookmarkletImport> {
+            return localVarFp.partialUpdateBookmarkletImport(id, bookmarkletImport, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this cook log.
@@ -8008,6 +8538,15 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         partialUpdateViewLog(id: string, viewLog?: ViewLog, options?: any): AxiosPromise<ViewLog> {
             return localVarFp.partialUpdateViewLog(id, viewLog, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this bookmarklet import.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        retrieveBookmarkletImport(id: string, options?: any): AxiosPromise<BookmarkletImport> {
+            return localVarFp.retrieveBookmarkletImport(id, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this cook log.
@@ -8206,6 +8745,16 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         retrieveViewLog(id: string, options?: any): AxiosPromise<ViewLog> {
             return localVarFp.retrieveViewLog(id, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @param {string} id A unique integer value identifying this bookmarklet import.
+         * @param {BookmarkletImport} [bookmarkletImport] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        updateBookmarkletImport(id: string, bookmarkletImport?: BookmarkletImport, options?: any): AxiosPromise<BookmarkletImport> {
+            return localVarFp.updateBookmarkletImport(id, bookmarkletImport, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {string} id A unique integer value identifying this cook log.
@@ -8416,6 +8965,17 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
  * @extends {BaseAPI}
  */
 export class ApiApi extends BaseAPI {
+    /**
+     * 
+     * @param {BookmarkletImport} [bookmarkletImport] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public createBookmarkletImport(bookmarkletImport?: BookmarkletImport, options?: any) {
+        return ApiApiFp(this.configuration).createBookmarkletImport(bookmarkletImport, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {CookLog} [cookLog] 
@@ -8636,6 +9196,17 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).createViewLog(viewLog, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this bookmarklet import.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public destroyBookmarkletImport(id: string, options?: any) {
+        return ApiApiFp(this.configuration).destroyBookmarkletImport(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {string} id A unique integer value identifying this cook log.
@@ -8868,6 +9439,16 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).imageRecipe(id, image, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public listBookmarkletImports(options?: any) {
+        return ApiApiFp(this.configuration).listBookmarkletImports(options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {*} [options] Override http request option.
@@ -8959,13 +9540,24 @@ export class ApiApi extends BaseAPI {
     }
 
     /**
-     * optional parameters  - **query**: search recipes for a string contained              in the recipe name (case in-sensitive) - **limit**: limits the amount of returned results
+     * 
+     * @param {string} [query] Query string matched (fuzzy) against recipe name. In the future also fulltext search.
+     * @param {string} [keywords] Id of keyword a recipe should have. For multiple repeat parameter.
+     * @param {string} [foods] Id of food a recipe should have. For multiple repeat parameter.
+     * @param {string} [books] Id of book a recipe should have. For multiple repeat parameter.
+     * @param {string} [keywordsOr] If recipe should have all (AND) or any (OR) of the provided keywords.
+     * @param {string} [foodsOr] If recipe should have all (AND) or any (OR) any of the provided foods.
+     * @param {string} [booksOr] If recipe should be in all (AND) or any (OR) any of the provided books.
+     * @param {string} [internal] true or false. If only internal recipes should be returned or not.
+     * @param {string} [random] true or false. returns the results in randomized order.
+     * @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 listRecipes(options?: any) {
+    public listRecipes(query?: string, keywords?: string, foods?: string, books?: string, keywordsOr?: string, foodsOr?: string, booksOr?: string, internal?: string, random?: string, page?: number, pageSize?: number, options?: any) {
-        return ApiApiFp(this.configuration).listRecipes(options).then((request) => request(this.axios, this.basePath));
+        return ApiApiFp(this.configuration).listRecipes(query, keywords, foods, books, keywordsOr, foodsOr, booksOr, internal, random, page, pageSize, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
@@ -9088,6 +9680,18 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).listViewLogs(options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this bookmarklet import.
+     * @param {BookmarkletImport} [bookmarkletImport] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public partialUpdateBookmarkletImport(id: string, bookmarkletImport?: BookmarkletImport, options?: any) {
+        return ApiApiFp(this.configuration).partialUpdateBookmarkletImport(id, bookmarkletImport, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {string} id A unique integer value identifying this cook log.
@@ -9328,6 +9932,17 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).partialUpdateViewLog(id, viewLog, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this bookmarklet import.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public retrieveBookmarkletImport(id: string, options?: any) {
+        return ApiApiFp(this.configuration).retrieveBookmarkletImport(id, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {string} id A unique integer value identifying this cook log.
@@ -9570,6 +10185,18 @@ export class ApiApi extends BaseAPI {
         return ApiApiFp(this.configuration).retrieveViewLog(id, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @param {string} id A unique integer value identifying this bookmarklet import.
+     * @param {BookmarkletImport} [bookmarkletImport] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ApiApi
+     */
+    public updateBookmarkletImport(id: string, bookmarkletImport?: BookmarkletImport, options?: any) {
+        return ApiApiFp(this.configuration).updateBookmarkletImport(id, bookmarkletImport, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {string} id A unique integer value identifying this cook log.