From 7e9a82d7cfcca0f9f8e09d082476aec5c4777060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 15 Sep 2022 15:35:00 +0200 Subject: [PATCH 01/94] Update install.sh --- deployment/bare_metal/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/bare_metal/install.sh b/deployment/bare_metal/install.sh index 0fcf6d847..90b647f0e 100755 --- a/deployment/bare_metal/install.sh +++ b/deployment/bare_metal/install.sh @@ -90,7 +90,7 @@ sudo certbot # Install logrotate sudo apt-get install -y logrotate envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $SCRIPT_DIR/logrotate/gradido.conf.template > $SCRIPT_DIR/logrotate/gradido.conf -sudo mv $SCRIPT_DIR/logrotate/gradido.conf /etc/logrotate.d/gradido.conf +sudo mv $SCRIPT_DIR/logrotate/gradido.conf.template /etc/logrotate.d/gradido.conf sudo chown root:root /etc/logrotate.d/gradido.conf # Install mysql autobackup @@ -133,4 +133,4 @@ envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/admin/.env.te # Start gradido # Note: on first startup some errors will occur - nothing serious -./start.sh \ No newline at end of file +./start.sh From ef8cbacb6d248857c711de922f716ece5fd41e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 15 Sep 2022 15:42:39 +0200 Subject: [PATCH 02/94] Update install.sh --- deployment/bare_metal/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/bare_metal/install.sh b/deployment/bare_metal/install.sh index 90b647f0e..0bcea653b 100755 --- a/deployment/bare_metal/install.sh +++ b/deployment/bare_metal/install.sh @@ -90,7 +90,7 @@ sudo certbot # Install logrotate sudo apt-get install -y logrotate envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $SCRIPT_DIR/logrotate/gradido.conf.template > $SCRIPT_DIR/logrotate/gradido.conf -sudo mv $SCRIPT_DIR/logrotate/gradido.conf.template /etc/logrotate.d/gradido.conf +sudo cp $SCRIPT_DIR/logrotate/gradido.conf.template /etc/logrotate.d/gradido.conf sudo chown root:root /etc/logrotate.d/gradido.conf # Install mysql autobackup From 03672bef255551ea730807c05cb33390457d7988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 15 Sep 2022 16:27:22 +0200 Subject: [PATCH 03/94] Update install.sh --- deployment/bare_metal/install.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/deployment/bare_metal/install.sh b/deployment/bare_metal/install.sh index 0bcea653b..01b1e7a0b 100755 --- a/deployment/bare_metal/install.sh +++ b/deployment/bare_metal/install.sh @@ -4,6 +4,12 @@ # How to do this is described in detail in [setup.md](./setup.md) # Find current directory & configure paths +## For manualy use in terminal +## set -o allexport +## SCRIPT_DIR=$(pwd) +## PROJECT_ROOT=$SCRIPT_DIR/../.. +## set +o allexport +# Use here in script set -o allexport SCRIPT_PATH=$(realpath $0) SCRIPT_DIR=$(dirname $SCRIPT_PATH) From 9624a79881596f3b7c4c47ef48181f0c9672c14c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 15 Sep 2022 17:22:48 +0200 Subject: [PATCH 04/94] Update setup.md --- deployment/bare_metal/setup.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/deployment/bare_metal/setup.md b/deployment/bare_metal/setup.md index f43a3d655..7c1154862 100644 --- a/deployment/bare_metal/setup.md +++ b/deployment/bare_metal/setup.md @@ -95,5 +95,17 @@ > cp .env.dist .env > nano .env >> Adjust values accordingly + # TODO the install.sh is not yet ready to run directly - consider to use it as pattern to do it manually -> ./install.sh + +!!! ATTENTION: + +- NGINX: + - Be aware to set the values for NGINX in the following files according to your needs before you install NGINX! + - `./nginx/sites-available/gradido.conf` + - `./nginx/sites-available/update-page.conf` +- Commands in `./install.sh`: + - The commands for setting the paths in the used env variables are not working directly in the terminal, consider the out commented commands for this purpose, see below. + +Follow the commands in `./install.sh`. + From 641d2d4cc24f5276f3f1ccf3b8e6d2b79f67d625 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 16 Sep 2022 09:58:41 +0200 Subject: [PATCH 05/94] creation date better represented --- .../components/CreationTransactionList.vue | 23 ++++++++++++------- admin/src/locales/de.json | 15 +++++++++--- admin/src/locales/en.json | 14 ++++++++--- 3 files changed, 38 insertions(+), 14 deletions(-) diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue index ec5c12aa4..ba0c7be6a 100644 --- a/admin/src/components/CreationTransactionList.vue +++ b/admin/src/components/CreationTransactionList.vue @@ -2,6 +2,13 @@
{{ $t('transactionlist.title') }}
+
+ Hilfe + +
{{ $t('transactionlist.submitted') }} {{ $t('math.equals') }} {{ $t('help.transactionlist.submitted') }}
+
{{ $t('transactionlist.confirmed') }} {{ $t('math.equals') }} {{ $t('help.transactionlist.confirmed') }}
+ +
diff --git a/admin/src/components/ContributionLinkForm.vue b/admin/src/components/ContributionLinkForm.vue index a159d33d3..6daf1e299 100644 --- a/admin/src/components/ContributionLinkForm.vue +++ b/admin/src/components/ContributionLinkForm.vue @@ -163,7 +163,6 @@ export default { if (this.form.validFrom === null) return this.toastError(this.$t('contributionLink.noStartDate')) if (this.form.validTo === null) return this.toastError(this.$t('contributionLink.noEndDate')) - // alert(JSON.stringify(this.form)) this.$apollo .mutate({ mutation: createContributionLink, @@ -182,6 +181,8 @@ export default { this.link = result.data.createContributionLink.link this.toastSuccess(this.link) this.onReset() + this.$root.$emit('bv::toggle::collapse', 'newContribution') + this.$emit('get-contribution-links') }) .catch((error) => { this.toastError(error.message) diff --git a/admin/src/components/ContributionLinkList.vue b/admin/src/components/ContributionLinkList.vue index 518d7d57e..18c136199 100644 --- a/admin/src/components/ContributionLinkList.vue +++ b/admin/src/components/ContributionLinkList.vue @@ -1,12 +1,12 @@