Merge branch 'develop' of https://github.com/vabene1111/recipes into develop

2021-10-13 15:04:03 +02:00 · 2021-10-13 15:04:03 +02:00 · 4324dd61cf
commit 4324dd61cf
parent 1b1945d954 a5a7d6fcdb
10 changed files with 204 additions and 28 deletions
--- a/.gitignore
+++ b/.gitignore
@ -83,3 +83,4 @@ vue/yarn.lock
 vetur.config.js
 cookbook/static/vue
 vue/webpack-stats.json
+cookbook/templates/sw.js
--- a/cookbook/locale/hy/LC_MESSAGES/django.po
+++ b/cookbook/locale/hy/LC_MESSAGES/django.po
@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-09 18:01+0100\n"
-"PO-Revision-Date: 2021-04-12 20:22+0000\n"
+"PO-Revision-Date: 2021-10-13 12:50+0000\n"
 "Last-Translator: Hrachya Kocharyan <hkocharyan@ctemplar.com>\n"
 "Language-Team: Armenian <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/hy/>\n"
@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Weblate 4.5.3\n"
+"X-Generator: Weblate 4.8\n"

 #: .\cookbook\filters.py:22 .\cookbook\templates\base.html:87
 #: .\cookbook\templates\forms\edit_internal_recipe.html:219
@ -79,7 +79,7 @@ msgid ""
 "mobile data. If lower than instance limit it is reset when saving."
 msgstr ""
 "0-ն կանջատի ավտոմատ սինքրոնացումը։ Գնումների ցուցակը թարմացվում է "
-"յուրաքանչյուր սահմանված վարկյանը մեկ, մեկ ուրիշի կատարած փոփոխությունները "
+"յուրաքանչյուր սահմանված վարկյանը մեկ, ուրիշի կատարած փոփոխությունները "
 "սինքրոնացնելու համար։ Հարմար է, երբ մեկից ավել մարդ է կատարում գնումները, "
 "բայց կարող է օգտագործել բջջային ինտերնետ։"

--- a/cookbook/templates/sw.js
+++ b/cookbook/templates/sw.js
--- a/vue/src/apps/MealPlanView/MealPlanView.vue
+++ b/vue/src/apps/MealPlanView/MealPlanView.vue
@ -22,7 +22,8 @@
              <template #header="{ headerProps }">
                <meal-plan-calender-header
                    :header-props="headerProps"
-                    @input="setShowDate" @delete-dragged="deleteEntry(dragged_item)"/>
+                    @input="setShowDate" @delete-dragged="deleteEntry(dragged_item)"
+                    @create-new="createEntryClick(new Date())"/>
              </template>
            </calendar-view>
          </div>
@ -67,10 +68,57 @@
          </div>
          <div class="col-6">
            <h5>{{ $t('Meal_Types') }}</h5>
-            <b-form>
-
-            </b-form>
-            <recipe-card :recipe="recipe_viewed" v-if="false"></recipe-card>
+            <div>
+              <draggable :list="meal_types" group="meal_types"
+                         :empty-insert-threshold="10" handle=".handle" @sort="sortMealTypes()">
+                <b-card no-body class="mt-1" v-for="(meal_type, index) in meal_types" v-hover :key="meal_type.id">
+                  <b-card-header class="p-4">
+                    <div class="row">
+                      <div class="col-2 handle">
+                        <button type="button" class="btn btn-lg shadow-none"><i class="fas fa-arrows-alt-v "></i>
+                        </button>
+                      </div>
+                      <div class="col-10">
+                        <h5>{{ meal_type.icon }} {{ meal_type.name }}<span class="float-right text-primary"><i
+                            class="fa" v-bind:class="{ 'fa-pen': !meal_type.editing, 'fa-save': meal_type.editing }"
+                            @click="editOrSaveMealType(index)"
+                            aria-hidden="true"></i></span></h5>
+                      </div>
+                    </div>
+                  </b-card-header>
+                  <b-card-body class="p-4" v-if="meal_type.editing">
+                    <div class="form-group">
+                      <label>{{ $t('Name') }}</label>
+                      <input class="form-control"
+                             placeholder="Name" v-model="meal_type.name">
+                    </div>
+                    <div class="form-group">
+                      <emoji-input :field="'icon'" :label="$t('Icon')" :value="meal_type.icon"></emoji-input>
+                    </div>
+                    <div class="form-group">
+                      <label>{{ $t('Color') }}</label>
+                      <input class="form-control" type="color"
+                             name="Name" :value="meal_type.color" @change="meal_type.color = $event.target.value">
+                    </div>
+                    <b-form-checkbox
+                        id="checkbox-1"
+                        v-model="meal_type.default"
+                        name="default_checkbox"
+                        class="mb-2">
+                      {{ $t('Default') }}
+                    </b-form-checkbox>
+                    <button class="btn btn-danger" @click="deleteMealType(index)">{{ $t('Delete') }}</button>
+                    <button class="btn btn-primary float-right" @click="editOrSaveMealType(index)">{{
+                        $t('Save')
+                      }}
+                    </button>
+                  </b-card-body>
+                </b-card>
+              </draggable>
+              <button class="btn btn-success float-right mt-1" @click="newMealType"><i class="fas fa-plus"></i>
+                {{ $t('New_Meal_Type') }}
+              </button>
+            </div>
          </div>
        </div>
      </b-tab>
@ -119,6 +167,8 @@ import {ApiMixin, StandardToasts} from "@/utils/utils";
 import MealPlanEditModal from "../../components/MealPlanEditModal";
 import VueCookies from "vue-cookies";
 import MealPlanCalenderHeader from "@/components/MealPlanCalenderHeader";
+import EmojiInput from "../../components/Modals/EmojiInput";
+import draggable from 'vuedraggable'

 Vue.prototype.moment = moment
 Vue.use(BootstrapVue)
@ -131,11 +181,12 @@ export default {
  components: {
    MealPlanEditModal,
    MealPlanCard,
-    RecipeCard,
    CalendarView,
    ContextMenu,
    ContextMenuItem,
-    MealPlanCalenderHeader
+    MealPlanCalenderHeader,
+    EmojiInput,
+    draggable
  },
  mixins: [CalendarMathMixin, ApiMixin],
  data: function () {
@ -171,6 +222,7 @@ export default {
          title_placeholder: this.$t('Title')
        }
      },
+      current_period: null,
      entryEditing: {},
      edit_modal_show: false
    }
@ -231,6 +283,7 @@ export default {
        this.settings = Object.assign({}, this.settings, this.$cookies.get(SETTINGS_COOKIE_NAME))
      }
    })
+    this.$root.$on('change', this.updateEmoji);
  },
  watch: {
    settings: {
@ -241,6 +294,69 @@ export default {
    },
  },
  methods: {
+    newMealType() {
+      let apiClient = new ApiApiFactory()
+
+      apiClient.createMealType({name: "Mealtype"}).then(e => {
+        this.periodChangedCallback(this.current_period)
+      }).catch(error => {
+        StandardToasts.makeStandardToast(StandardToasts.FAIL_UPDATE)
+      })
+
+      this.refreshMealTypes()
+    },
+    sortMealTypes() {
+      this.meal_types.forEach(function (element, index) {
+        element.order = index
+      });
+      let updated = 0
+      this.meal_types.forEach((meal_type) => {
+        let apiClient = new ApiApiFactory()
+
+        apiClient.updateMealType(meal_type.id, meal_type).then(e => {
+          if (updated === (this.meal_types.length - 1)) {
+            this.periodChangedCallback(this.current_period)
+          } else {
+            updated++
+          }
+        }).catch(error => {
+          StandardToasts.makeStandardToast(StandardToasts.FAIL_UPDATE)
+        })
+      })
+    },
+    editOrSaveMealType(index) {
+      let meal_type = this.meal_types[index]
+      if (meal_type.editing) {
+        this.$set(this.meal_types[index], 'editing', false)
+        let apiClient = new ApiApiFactory()
+
+        apiClient.updateMealType(this.meal_types[index].id, this.meal_types[index]).then(e => {
+          this.periodChangedCallback(this.current_period)
+          StandardToasts.makeStandardToast(StandardToasts.SUCCESS_UPDATE)
+        }).catch(error => {
+          StandardToasts.makeStandardToast(StandardToasts.FAIL_UPDATE)
+        })
+      } else {
+        this.$set(this.meal_types[index], 'editing', true)
+      }
+    },
+    deleteMealType(index) {
+      let apiClient = new ApiApiFactory()
+
+      apiClient.destroyMealType(this.meal_types[index].id).then(e => {
+        this.periodChangedCallback(this.current_period)
+        StandardToasts.makeStandardToast(StandardToasts.SUCCESS_DELETE)
+      }).catch(error => {
+        StandardToasts.makeStandardToast(StandardToasts.FAIL_DELETE)
+      })
+    },
+    updateEmoji: function (field, value) {
+      this.meal_types.forEach((meal_type) => {
+        if (meal_type.editing) {
+          meal_type.icon = value
+        }
+      })
+    },
    editEntry(edit_entry) {
      if (edit_entry.id !== -1) {
        this.plan_entries.forEach((entry, index) => {
@ -322,6 +438,7 @@ export default {
      }
    },
    periodChangedCallback(date) {
+      this.current_period = date
      let apiClient = new ApiApiFactory()

      apiClient.listMealPlans({
@ -338,6 +455,9 @@ export default {
      let apiClient = new ApiApiFactory()

      apiClient.listMealTypes().then(result => {
+        result.data.forEach((meal_type) => {
+          meal_type.editing = false
+        })
        this.meal_types = result.data
      })
    },
@ -371,6 +491,18 @@ export default {
        entry: plan_entry
      }
    }
+  },
+  directives: {
+    hover: {
+      inserted: function (el) {
+        el.addEventListener('mouseenter', () => {
+          el.classList.add("shadow")
+        });
+        el.addEventListener('mouseleave', () => {
+          el.classList.remove("shadow")
+        });
+      }
+    }
  }
 }
 </script>
--- a/vue/src/components/MealPlanCalenderHeader.vue
+++ b/vue/src/components/MealPlanCalenderHeader.vue
@ -43,7 +43,8 @@
      <slot name="label">{{ headerProps.periodLabel }}</slot>
    </div>
    <div class="actionArea d-none d-sm-flex">
-      <span class="delete-area text-danger p-1 mr-2" @drop.prevent="onDeleteDrop($event)"
+      <button class="btn btn-success plus-button pt-1 pb-1" @click="$emit('create-new')"><i class="fas fa-plus"></i></button>
+      <span class="delete-area text-danger p-1 mr-2 ml-2" @drop.prevent="onDeleteDrop($event)"
            @dragenter.prevent="onDeleteDragEnter($event)" @dragleave.prevent="onDeleteDragLeave($event)" @dragover.prevent="onDeleteDragEnter"><i
          class="fas fa-trash"></i> {{ $t('Drag_Here_To_Delete') }}</span>
    </div>
@ -107,6 +108,13 @@ export default {
  font-size: 1.5em;
 }

+.plus-button {
+  border-style: dotted;
+  margin-left: auto;
+  order: 1;
+  user-select: none
+}
+
 .delete-area {
  border-style: dotted;
  margin-left: auto;
--- a/vue/src/components/Modals/EmojiInput.vue
+++ b/vue/src/components/Modals/EmojiInput.vue
@ -1,15 +1,15 @@
 <template>
    <div>
-        <b-form-group 
+        <b-form-group
            v-bind:label="label"
            class="mb-3">
-          <twemoji-textarea 
+          <twemoji-textarea
            :ref="'_edit_' + id"
            :initialContent="value"
-            :emojiData="emojiDataAll" 
+            :emojiData="emojiDataAll"
            :emojiGroups="emojiGroups"
            triggerType="hover"
-            recentEmojisFeat="true"
+            :recentEmojisFeat="true"
            recentEmojisStorage="local"
            @contentChanged="setIcon"
           />
@ -59,7 +59,7 @@ export default {
  },
  methods: {
    prepareEmoji: function() {
-      this.$refs['_edit_' + this.id].addText(this.this_item.icon || ''); 
+      this.$refs['_edit_' + this.id].addText(this.this_item.icon || '');
      this.$refs['_edit_' + this.id].blur()
      document.getElementById('btn-emoji-default').disabled = true;
    },
--- a/vue/src/locales/de.json
+++ b/vue/src/locales/de.json
@ -27,7 +27,7 @@
    "min": "Min",
    "Servings": "Portionen",
    "Waiting": "Wartezeit",
-    "Preparation": "Vorbereitung",
+    "Preparation": "Zubereitung",
    "Edit": "Bearbeiten",
    "Open": "Öffnen",
    "Save": "Speichern",
@ -162,5 +162,10 @@
    "Recipes_per_page": "Rezepte pro Seite",
    "Manage_Books": "Bücher Verwalten",
    "delete_confirmation": "Soll {source} wirklich gelöscht werden?",
-    "merge_selection": "Ersetze alle vorkommen von {source} mit dem ausgewählten {type}."
+    "merge_selection": "Ersetze alle vorkommen von {source} mit dem ausgewählten {type}.",
+    "Plan_Period_To_Show": "Wochen, Monate oder Jahre anzeigen",
+    "Title": "Titel",
+    "Week": "Wocje",
+    "Month": "Monat",
+    "Year": "Jahr"
 }
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@ -183,5 +183,7 @@
  "Clone": "Clone",
  "Drag_Here_To_Delete": "Drag here to delete",
  "Meal_Type_Required": "Meal type is required",
-  "Title_or_Recipe_Required": "Title or recipe selection required"
+  "Title_or_Recipe_Required": "Title or recipe selection required",
+  "Color": "Color",
+  "New_Meal_Type": "New Meal type"
 }
--- a/vue/src/locales/hy.json
+++ b/vue/src/locales/hy.json
@ -66,11 +66,38 @@
    "Save": "",
    "Step": "",
    "Search": "",
-    "Import": "",
-    "Print": "",
-    "Settings": "",
-    "or": "",
-    "and": "",
-    "Information": "",
-    "Download": ""
+    "Import": "Ներմուծել",
+    "Print": "Տպել",
+    "Settings": "Կարգավորումներ",
+    "or": "կամ",
+    "and": "և",
+    "Information": "Տեղեկություն",
+    "Download": "Ներբեռնել",
+    "Merge": "Միացնել",
+    "Parent": "Ծնող",
+    "create_rule": "և ստեղծել ավտոմատացում",
+    "Food": "Սննդամթերք",
+    "Name": "Անուն",
+    "Description": "Նկարագրություն",
+    "Recipe": "Բաղադրատոմս",
+    "Empty": "Դատարկ",
+    "No_Results": "Արդյունքներ չկան",
+    "Automate": "Ավտոմատացնել",
+    "Create_New_Food": "Ավելացնել նոր սննդամթերք",
+    "Create_New_Keyword": "Ավելացնել նոր բանալի բառ",
+    "Create_New_Shopping Category": "Ստեղծել գնումների նոր կատեգորիա",
+    "Recipe_Book": "Բաղադրատոմսերի գիրք",
+    "Move": "Տեղափոխել",
+    "Create": "Ստեղծել",
+    "Advanced Search Settings": "Ընդլայնված փնտրման կարգավորումներ",
+    "View": "Դիտել",
+    "Recipes": "Բաղադրատոմսեր",
+    "Shopping_list": "Գնումների ցուցակ",
+    "delete_confirmation": "Համոզվա՞ծ եք, որ ուզում եք ջնջել։",
+    "Shopping_Category": "Գնումների կատեգորիա",
+    "Edit_Food": "Խմբագրել սննդամթերքը",
+    "Move_Food": "Տեղափոխել սննդամթերքը",
+    "New_Food": "Նոր սննդամթերք",
+    "Hide_Food": "Թաքցնել սննդամթերքը",
+    "Delete_Food": "Ջնջել սննդամթերքը"
 }
--- a/vue/src/locales/it.json
+++ b/vue/src/locales/it.json
@ -180,5 +180,7 @@
    "Meal_Type_Required": "Il tipo di pasto è richiesto",
    "Periods": "Periodi",
    "Meal_Type": "Tipo di pasto",
-    "Title_or_Recipe_Required": "Sono richiesti titolo o ricetta"
+    "Title_or_Recipe_Required": "Sono richiesti titolo o ricetta",
+    "Create_Meal_Plan_Entry": "Crea voce nel piano alimentare",
+    "Edit_Meal_Plan_Entry": "Modifica voce del piano alimentare"
 }