From 84613af035019c91a93ca12863783018bece2528 Mon Sep 17 00:00:00 2001 From: mahula Date: Fri, 25 Nov 2022 17:38:25 +0100 Subject: [PATCH 1/4] disable submit button of contribution messages formular until submit request is finished --- .../ContributionMessagesFormular.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue index c9c285eef..5fd9acf49 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue +++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue @@ -38,10 +38,12 @@ export default { form: { text: '', }, + isSubmitting: false, } }, methods: { onSubmit(event) { + this.isSubmitting = true this.$apollo .mutate({ mutation: adminCreateContributionMessage, @@ -55,9 +57,11 @@ export default { this.$emit('update-state', this.contributionId) this.form.text = '' this.toastSuccess(this.$t('message.request')) + this.isSubmitting = false }) .catch((error) => { this.toastError(error.message) + this.isSubmitting = false }) }, onReset(event) { @@ -66,10 +70,7 @@ export default { }, computed: { disabled() { - if (this.form.text !== '') { - return false - } - return true + return this.form.text === '' || this.isSubmitting }, }, } From 06fd7c9b9a424d0b27c0ca0d77402eb34acf7c27 Mon Sep 17 00:00:00 2001 From: mahula Date: Fri, 25 Nov 2022 17:41:04 +0100 Subject: [PATCH 2/4] disable submit button of contribution messages formular until submit request is finished in wallet --- .../ContributionMessagesFormular.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue index c601de4f5..8667f7a0f 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue +++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue @@ -38,10 +38,12 @@ export default { form: { text: '', }, + isSubmitting: false, } }, methods: { onSubmit() { + this.isSubmitting = true this.$apollo .mutate({ mutation: createContributionMessage, @@ -55,9 +57,11 @@ export default { this.$emit('update-state', this.contributionId) this.form.text = '' this.toastSuccess(this.$t('message.reply')) + this.isSubmitting = false }) .catch((error) => { this.toastError(error.message) + this.isSubmitting = false }) }, onReset() { @@ -66,10 +70,7 @@ export default { }, computed: { disabled() { - if (this.form.text !== '') { - return false - } - return true + return this.form.text === '' || this.isSubmitting }, }, } From 403e68480c0cb7efa3f84544028398fb5a774d76 Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 29 Nov 2022 11:05:26 +0100 Subject: [PATCH 3/4] change variable name to our standard naming --- .../ContributionMessagesFormular.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue index 5fd9acf49..3a5d6e0b8 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue +++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue @@ -38,12 +38,12 @@ export default { form: { text: '', }, - isSubmitting: false, + loading: false, } }, methods: { onSubmit(event) { - this.isSubmitting = true + this.loading = true this.$apollo .mutate({ mutation: adminCreateContributionMessage, @@ -57,11 +57,11 @@ export default { this.$emit('update-state', this.contributionId) this.form.text = '' this.toastSuccess(this.$t('message.request')) - this.isSubmitting = false + this.loading = false }) .catch((error) => { this.toastError(error.message) - this.isSubmitting = false + this.loading = false }) }, onReset(event) { @@ -70,7 +70,7 @@ export default { }, computed: { disabled() { - return this.form.text === '' || this.isSubmitting + return this.form.text === '' || this.loading }, }, } From 10ad42babe2dde7f37b2c8f955f19668c0c8eb97 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 29 Nov 2022 16:37:25 +0100 Subject: [PATCH 4/4] missing files to be copied --- backend/Dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/backend/Dockerfile b/backend/Dockerfile index 6225a4cd7..c09e5aaf8 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -98,10 +98,18 @@ COPY --from=build ${DOCKER_WORKDIR}/../database/build ../database/build # We also copy the node_modules express and serve-static for the run script COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules COPY --from=build ${DOCKER_WORKDIR}/../database/node_modules ../database/node_modules + # Copy static files # COPY --from=build ${DOCKER_WORKDIR}/public ./public # Copy package.json for script definitions (lock file should not be needed) COPY --from=build ${DOCKER_WORKDIR}/package.json ./package.json +# Copy tsconfig.json to provide alias path definitions +COPY --from=build ${DOCKER_WORKDIR}/tsconfig.json ./tsconfig.json +# Copy log4js-config.json to provide log configuration +COPY --from=build ${DOCKER_WORKDIR}/log4js-config.json ./log4js-config.json +# Copy memonic type since its referenced in the sources +# TODO: remove +COPY --from=build ${DOCKER_WORKDIR}/src/config/mnemonic.uncompressed_buffer13116.txt ./src/config/mnemonic.uncompressed_buffer13116.txt # Copy run scripts run/ # COPY --from=build ${DOCKER_WORKDIR}/run ./run