styling and bg sync message

vue/src/components/ShoppingLineItem.vue

@@ -15,15 +15,17 @@
                     <div class="d-flex flex-column pr-2"  v-if="Object.keys(amounts).length> 0">
                         <span v-for="a in amounts" v-bind:key="a.id">
 
-                            <span><i class="fas fa-check" v-if="a.checked && !is_checked"></i><i class="fas fa-hourglass-half" v-if="a.delayed && !a.checked"></i> {{ a.amount }} {{ a.unit }}</span>
+                            <span><i class="fas fa-check" v-if="a.checked && !is_checked"></i><i class="fas fa-hourglass-half" v-if="a.delayed && !a.checked"></i> <b>{{ a.amount }} {{ a.unit }} </b></span>
                             <br/></span>
+
                     </div>
                     <div class="d-flex  flex-column flex-grow-1 align-self-center">
-                        {{ food.name }}
+                        {{ food.name }} <br/>
+                         <span v-if="info_row"><small class="text-muted">{{ info_row }}</small></span>
                     </div>
                 </div>
 
-                <span v-if="info_row"><small class="text-muted">{{ info_row }}</small></span>
+
             </div>
             <b-button variant="success" @click="useShoppingListStore().setEntriesCheckedState(entries, !is_checked, true)"
                       :class="{'btn-success': !is_checked, 'btn-warning': is_checked}">
@@ -69,7 +71,8 @@
 
                         <b-button-group class="w-100">
                             <div class="card flex-grow-1 btn-block p-2">
-                                <span><i class="fas fa-check" v-if="e.checked"></i><i class="fas fa-hourglass-half" v-if="e.delay_until !== null && !e.checked"></i> <span v-if="e.amount > 0">{{ e.amount }}</span> {{ e.unit?.name }} {{ food.name }}</span>
+                                <span><i class="fas fa-check" v-if="e.checked"></i><i class="fas fa-hourglass-half" v-if="e.delay_until !== null && !e.checked"></i> <span
+                                    v-if="e.amount > 0">{{ e.amount }}</span> {{ e.unit?.name }} {{ food.name }}</span>
                                 <span><small class="text-muted">
                                     <span v-if="e.recipe_mealplan && e.recipe_mealplan.recipe_name !== ''">
                                         <a :href="resolveDjangoUrl('view_recipe', e.recipe_mealplan.recipe)"> {{

vue/src/locales/en.json

@@ -304,7 +304,7 @@
 	"ShowRecentlyCompleted": "Show recently completed items",
 	"Completed": "Completed",
 	"OfflineAlert": "You are offline, shopping list may not syncronize.",
-	"ShoppingBackgroundSyncWarning": "Due to bad connectivity some changes could not be synchronized. Automatically retrying when connection becomes available.",
+	"ShoppingBackgroundSyncWarning": "Bad network, waiting to sync ...",
 	"shopping_share": "Share Shopping List",
 	"shopping_auto_sync": "Autosync",
 	"one_url_per_line": "One URL per line",

vue/src/utils/openapi/api.ts

@@ -4013,6 +4013,18 @@ export interface ShoppingListEntries {
      * @memberof ShoppingListEntries
      */
     unit?: FoodPropertiesFoodUnit | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof ShoppingListEntries
+     */
+    ingredient?: number | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ShoppingListEntries
+     */
+    ingredient_note?: string;
     /**
      * 
      * @type {string}
@@ -4049,12 +4061,6 @@ export interface ShoppingListEntries {
      * @memberof ShoppingListEntries
      */
     created_at?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ShoppingListEntries
-     */
-    updated_at?: string;
     /**
      * 
      * @type {string}
@@ -4098,6 +4104,18 @@ export interface ShoppingListEntry {
      * @memberof ShoppingListEntry
      */
     unit?: FoodPropertiesFoodUnit | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof ShoppingListEntry
+     */
+    ingredient?: number | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ShoppingListEntry
+     */
+    ingredient_note?: string;
     /**
      * 
      * @type {string}
@@ -4134,12 +4152,6 @@ export interface ShoppingListEntry {
      * @memberof ShoppingListEntry
      */
     created_at?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ShoppingListEntry
-     */
-    updated_at?: string;
     /**
      * 
      * @type {string}
@@ -4153,25 +4165,6 @@ export interface ShoppingListEntry {
      */
     delay_until?: string | null;
 }
-/**
- * 
- * @export
- * @interface ShoppingListEntryBulk
- */
-export interface ShoppingListEntryBulk {
-    /**
-     * 
-     * @type {Array<any>}
-     * @memberof ShoppingListEntryBulk
-     */
-    ids: Array<any>;
-    /**
-     * 
-     * @type {boolean}
-     * @memberof ShoppingListEntryBulk
-     */
-    checked: boolean;
-}
 /**
  * 
  * @export
@@ -4220,18 +4213,6 @@ export interface ShoppingListRecipe {
      * @memberof ShoppingListRecipe
      */
     mealplan_note?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ShoppingListRecipe
-     */
-    mealplan_from_date?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ShoppingListRecipe
-     */
-    mealplan_type?: string;
 }
 /**
  * 
@@ -4281,18 +4262,6 @@ export interface ShoppingListRecipeMealplan {
      * @memberof ShoppingListRecipeMealplan
      */
     mealplan_note?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ShoppingListRecipeMealplan
-     */
-    mealplan_from_date?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ShoppingListRecipeMealplan
-     */
-    mealplan_type?: string;
 }
 /**
  * 
@@ -4342,18 +4311,6 @@ export interface ShoppingListRecipes {
      * @memberof ShoppingListRecipes
      */
     mealplan_note?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ShoppingListRecipes
-     */
-    mealplan_from_date?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ShoppingListRecipes
-     */
-    mealplan_type?: string;
 }
 /**
  * 
@@ -5503,39 +5460,6 @@ export interface ViewLog {
  */
 export const ApiApiAxiosParamCreator = function (configuration?: Configuration) {
     return {
-        /**
-         * 
-         * @param {ShoppingListEntryBulk} [shoppingListEntryBulk] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        bulkShoppingListEntry: async (shoppingListEntryBulk?: ShoppingListEntryBulk, options: any = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/shopping-list-entry/bulk/`;
-            // 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(shoppingListEntryBulk, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
         /**
          * 
          * @param {AccessToken} [accessToken] 
@@ -9640,11 +9564,10 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
         },
         /**
          * 
-         * @param {string} [query] Query string matched against supermarket name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listSupermarkets: async (query?: string, options: any = {}): Promise<RequestArgs> => {
+        listSupermarkets: async (options: any = {}): Promise<RequestArgs> => {
             const localVarPath = `/api/supermarket/`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -9657,10 +9580,6 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
-            if (query !== undefined) {
-                localVarQueryParameter['query'] = query;
-            }
-
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
@@ -9820,11 +9739,10 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
         },
         /**
          * 
-         * @param {string} [query] Query string matched against user-file name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listUserFiles: async (query?: string, options: any = {}): Promise<RequestArgs> => {
+        listUserFiles: async (options: any = {}): Promise<RequestArgs> => {
             const localVarPath = `/api/user-file/`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -9837,10 +9755,6 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
-            if (query !== undefined) {
-                localVarQueryParameter['query'] = query;
-            }
-
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
@@ -14984,16 +14898,6 @@ export const ApiApiAxiosParamCreator = function (configuration?: Configuration)
 export const ApiApiFp = function(configuration?: Configuration) {
     const localVarAxiosParamCreator = ApiApiAxiosParamCreator(configuration)
     return {
-        /**
-         * 
-         * @param {ShoppingListEntryBulk} [shoppingListEntryBulk] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async bulkShoppingListEntry(shoppingListEntryBulk?: ShoppingListEntryBulk, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ShoppingListEntryBulk>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.bulkShoppingListEntry(shoppingListEntryBulk, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
         /**
          * 
          * @param {AccessToken} [accessToken] 
@@ -16208,12 +16112,11 @@ export const ApiApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @param {string} [query] Query string matched against supermarket name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listSupermarkets(query?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<Supermarket>>> {
+        async listSupermarkets(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<Supermarket>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listSupermarkets(query, options);
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listSupermarkets(options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
@@ -16260,12 +16163,11 @@ export const ApiApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @param {string} [query] Query string matched against user-file name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listUserFiles(query?: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<UserFile>>> {
+        async listUserFiles(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<UserFile>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listUserFiles(query, options);
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listUserFiles(options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
@@ -17799,15 +17701,6 @@ export const ApiApiFp = function(configuration?: Configuration) {
 export const ApiApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
     const localVarFp = ApiApiFp(configuration)
     return {
-        /**
-         * 
-         * @param {ShoppingListEntryBulk} [shoppingListEntryBulk] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        bulkShoppingListEntry(shoppingListEntryBulk?: ShoppingListEntryBulk, options?: any): AxiosPromise<ShoppingListEntryBulk> {
-            return localVarFp.bulkShoppingListEntry(shoppingListEntryBulk, options).then((request) => request(axios, basePath));
-        },
         /**
          * 
          * @param {AccessToken} [accessToken] 
@@ -18904,12 +18797,11 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         },
         /**
          * 
-         * @param {string} [query] Query string matched against supermarket name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listSupermarkets(query?: string, options?: any): AxiosPromise<Array<Supermarket>> {
+        listSupermarkets(options?: any): AxiosPromise<Array<Supermarket>> {
-            return localVarFp.listSupermarkets(query, options).then((request) => request(axios, basePath));
+            return localVarFp.listSupermarkets(options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -18951,12 +18843,11 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
         },
         /**
          * 
-         * @param {string} [query] Query string matched against user-file name.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listUserFiles(query?: string, options?: any): AxiosPromise<Array<UserFile>> {
+        listUserFiles(options?: any): AxiosPromise<Array<UserFile>> {
-            return localVarFp.listUserFiles(query, options).then((request) => request(axios, basePath));
+            return localVarFp.listUserFiles(options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -20347,17 +20238,6 @@ export const ApiApiFactory = function (configuration?: Configuration, basePath?:
  * @extends {BaseAPI}
  */
 export class ApiApi extends BaseAPI {
-    /**
-     * 
-     * @param {ShoppingListEntryBulk} [shoppingListEntryBulk] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ApiApi
-     */
-    public bulkShoppingListEntry(shoppingListEntryBulk?: ShoppingListEntryBulk, options?: any) {
-        return ApiApiFp(this.configuration).bulkShoppingListEntry(shoppingListEntryBulk, options).then((request) => request(this.axios, this.basePath));
-    }
-
     /**
      * 
      * @param {AccessToken} [accessToken] 
@@ -21690,13 +21570,12 @@ export class ApiApi extends BaseAPI {
 
     /**
      * 
-     * @param {string} [query] Query string matched against supermarket name.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof ApiApi
      */
-    public listSupermarkets(query?: string, options?: any) {
+    public listSupermarkets(options?: any) {
-        return ApiApiFp(this.configuration).listSupermarkets(query, options).then((request) => request(this.axios, this.basePath));
+        return ApiApiFp(this.configuration).listSupermarkets(options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
@@ -21747,13 +21626,12 @@ export class ApiApi extends BaseAPI {
 
     /**
      * 
-     * @param {string} [query] Query string matched against user-file name.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof ApiApi
      */
-    public listUserFiles(query?: string, options?: any) {
+    public listUserFiles(options?: any) {
-        return ApiApiFp(this.configuration).listUserFiles(query, options).then((request) => request(this.axios, this.basePath));
+        return ApiApiFp(this.configuration).listUserFiles(options).then((request) => request(this.axios, this.basePath));
     }
 
     /**