From 8f5b0178572a10077f6c51d18f14fc64bd4cc337 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Sun, 1 May 2022 21:51:57 +0200 Subject: [PATCH 1/4] dont build arm --- .github/workflows/docker-publish-latest.yml | 1 + .github/workflows/docker-publish-release.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/docker-publish-latest.yml b/.github/workflows/docker-publish-latest.yml index 07ab1869..e48bb307 100644 --- a/.github/workflows/docker-publish-latest.yml +++ b/.github/workflows/docker-publish-latest.yml @@ -38,6 +38,7 @@ jobs: with: publish: true imageName: vabene1111/recipes + platform: linux/amd64,linux/arm64 tag: latest dockerUser: ${{ secrets.DOCKER_USERNAME }} dockerPassword: ${{ secrets.DOCKER_PASSWORD }} diff --git a/.github/workflows/docker-publish-release.yml b/.github/workflows/docker-publish-release.yml index 636ed576..1b79b34d 100644 --- a/.github/workflows/docker-publish-release.yml +++ b/.github/workflows/docker-publish-release.yml @@ -40,6 +40,7 @@ jobs: with: publish: true imageName: vabene1111/recipes + platform: linux/amd64,linux/arm64 tag: ${{ steps.get_version.outputs.VERSION }} dockerUser: ${{ secrets.DOCKER_USERNAME }} dockerPassword: ${{ secrets.DOCKER_PASSWORD }} From a8c9689b43484d7ea39375cf12a4cf15acadf4e1 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Wed, 4 May 2022 14:47:53 +0200 Subject: [PATCH 2/4] fixed ability to disabled auto sync --- .../ShoppingListView/ShoppingListView.vue | 36 +++++++++++-------- vue/yarn.lock | 5 --- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue index a08e8ca5..0706a768 100644 --- a/vue/src/apps/ShoppingListView/ShoppingListView.vue +++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue @@ -291,7 +291,10 @@ aria-hidden="true"> - {{ supermarket.description }} + {{ + supermarket.description + }} @@ -1026,20 +1029,23 @@ export default { "settings.shopping_auto_sync": function (newVal, oldVal) { clearInterval(this.autosync_id) this.autosync_id = undefined - if (!newVal) { - window.removeEventListener("online", this.updateOnlineStatus) - window.removeEventListener("offline", this.updateOnlineStatus) - return - } else if (oldVal === 0 && newVal > 0) { - window.addEventListener("online", this.updateOnlineStatus) - window.addEventListener("offline", this.updateOnlineStatus) - } - this.autosync_id = setInterval(() => { - if (this.online && !this.auto_sync_running) { - this.auto_sync_running = true - this.getShoppingList(true) + if (this.settings.shopping_auto_sync > 0) { + if (!newVal) { + window.removeEventListener("online", this.updateOnlineStatus) + window.removeEventListener("offline", this.updateOnlineStatus) + return + } else if (oldVal === 0 && newVal > 0) { + window.addEventListener("online", this.updateOnlineStatus) + window.addEventListener("offline", this.updateOnlineStatus) } - }, this.settings.shopping_auto_sync * 1000) + this.autosync_id = setInterval(() => { + if (this.online && !this.auto_sync_running) { + this.auto_sync_running = true + this.getShoppingList(true) + } + }, this.settings.shopping_auto_sync * 1000) + } + }, "settings.default_delay": function (newVal, oldVal) { this.delay = Number(newVal) @@ -1618,7 +1624,7 @@ export default { this.editing_supermarket_categories.forEach((element, index) => { let apiClient = new ApiApiFactory() - + console.log(`relation id ${element.relation_id} order ${element.order} element ${element.order}`) promises.push(apiClient.partialUpdateSupermarketCategoryRelation(element.relation_id, {order: element.order})) }) return Promise.all(promises).then(() => { diff --git a/vue/yarn.lock b/vue/yarn.lock index 371d69f4..bf4fc6a6 100644 --- a/vue/yarn.lock +++ b/vue/yarn.lock @@ -12697,11 +12697,6 @@ vue-infinite-loading@^2.4.5: resolved "https://registry.yarnpkg.com/vue-infinite-loading/-/vue-infinite-loading-2.4.5.tgz#cc20fd40af7f20188006443c99b60470cf1de1b3" integrity sha512-xhq95Mxun060bRnsOoLE2Be6BR7jYwuC89kDe18+GmCLVrRA/dU0jrGb12Xu6NjmKs+iTW0AA6saSEmEW4cR7g== -vue-jstree@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/vue-jstree/-/vue-jstree-2.1.6.tgz#44827ad72953ed77da6590ce4e8f37f7787f8653" - integrity sha512-vtUmhLbfE2JvcnYNRXauJPkNJSRO/f9BTsbxV+ESXP/mMQPVUIYI4EkSHKSEOxVDHTU7SfLp/AxplmaAl6ctcg== - "vue-loader-v16@npm:vue-loader@^16.1.0": version "16.8.3" resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-16.8.3.tgz#d43e675def5ba9345d6c7f05914c13d861997087" From bfc42638a46ea87725e89c44405878e9a37dcbca Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Wed, 4 May 2022 15:00:39 +0200 Subject: [PATCH 3/4] fixed supermarket category ordering --- vue/src/apps/ShoppingListView/ShoppingListView.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue index 0706a768..5045e538 100644 --- a/vue/src/apps/ShoppingListView/ShoppingListView.vue +++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue @@ -1624,8 +1624,7 @@ export default { this.editing_supermarket_categories.forEach((element, index) => { let apiClient = new ApiApiFactory() - console.log(`relation id ${element.relation_id} order ${element.order} element ${element.order}`) - promises.push(apiClient.partialUpdateSupermarketCategoryRelation(element.relation_id, {order: element.order})) + promises.push(apiClient.partialUpdateSupermarketCategoryRelation(element.relation_id, {order: index})) }) return Promise.all(promises).then(() => { From 68f272bc2533e04e55028d6f5413655a3d1f0ea1 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Wed, 4 May 2022 15:20:40 +0200 Subject: [PATCH 4/4] fixed adding supermarket category to supermarket frontend desync --- vue/src/apps/ShoppingListView/ShoppingListView.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue index 5045e538..eca16af6 100644 --- a/vue/src/apps/ShoppingListView/ShoppingListView.vue +++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue @@ -1452,6 +1452,7 @@ export default { if (supermarket.editing) { this.$set(this.supermarkets[index], "editing", false) + this.$set(this.supermarkets[index], "category_to_supermarket", this.editing_supermarket_categories) this.editing_supermarket_categories = [] let apiClient = new ApiApiFactory()