From 2b0db817939a18e492a4ddb41e890d2c8746d301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 20 Dec 2022 11:50:47 +0100
Subject: [PATCH] Rename 'SUPPORT_MAIL' to 'COMMUNITY_SUPPORT_MAIL' in frontend

- Increase frontend 'CONFIG_VERSION'.
---
 frontend/.env.dist                   | 6 ++----
 frontend/.env.template               | 4 +---
 frontend/src/config/index.js         | 8 ++------
 frontend/src/pages/InfoStatistic.vue | 2 +-
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/frontend/.env.dist b/frontend/.env.dist
index 4127f339a..5ce6b430d 100644
--- a/frontend/.env.dist
+++ b/frontend/.env.dist
@@ -1,4 +1,4 @@
-CONFIG_VERSION=v3.2022-09-16
+CONFIG_VERSION=v4.2022-12-20
 
 # Environment
 DEFAULT_PUBLISHER_ID=2896
@@ -12,6 +12,7 @@ COMMUNITY_NAME=Gradido Entwicklung
 COMMUNITY_URL=http://localhost/
 COMMUNITY_REGISTER_URL=http://localhost/register
 COMMUNITY_DESCRIPTION=Die lokale Entwicklungsumgebung von Gradido.
+COMMUNITY_SUPPORT_MAIL=support@supportmail.com
 
 # Meta
 META_URL=http://localhost
@@ -22,6 +23,3 @@ META_DESCRIPTION_EN="Gratitude is the currency of the new age. More and more peo
 META_KEYWORDS_DE="Grundeinkommen, Währung, Dankbarkeit, Schenk-Ökonomie, Natürliche Ökonomie des Lebens, Ökonomie, Ökologie, Potenzialentfaltung, Schenken und Danken, Kreislauf des Lebens, Geldsystem"
 META_KEYWORDS_EN="Basic Income, Currency, Gratitude, Gift Economy, Natural Economy of Life, Economy, Ecology, Potential Development, Giving and Thanking, Cycle of Life, Monetary System"
 META_AUTHOR="Bernd Hückstädt - Gradido-Akademie"
-
-# Support Mail 
-SUPPORT_MAIL=support@supportmail.com
\ No newline at end of file
diff --git a/frontend/.env.template b/frontend/.env.template
index 0b9d34b38..59e34eb80 100644
--- a/frontend/.env.template
+++ b/frontend/.env.template
@@ -12,6 +12,7 @@ COMMUNITY_NAME=$COMMUNITY_NAME
 COMMUNITY_URL=$COMMUNITY_URL
 COMMUNITY_REGISTER_URL=$COMMUNITY_REGISTER_URL
 COMMUNITY_DESCRIPTION=$COMMUNITY_DESCRIPTION
+COMMUNITY_SUPPORT_MAIL=$COMMUNITY_SUPPORT_MAIL
 
 # Meta
 META_URL=$META_URL
@@ -22,6 +23,3 @@ META_DESCRIPTION_EN=$META_DESCRIPTION_EN
 META_KEYWORDS_DE=$META_KEYWORDS_DE
 META_KEYWORDS_EN=$META_KEYWORDS_EN
 META_AUTHOR=$META_AUTHOR
-
-# Support Mail 
-SUPPORT_MAIL=$SUPPORT_MAIL
\ No newline at end of file
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 5ab5f2392..b90376672 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -8,7 +8,7 @@ const constants = {
   DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
   CONFIG_VERSION: {
     DEFAULT: 'DEFAULT',
-    EXPECTED: 'v3.2022-09-16',
+    EXPECTED: 'v4.2022-12-20',
     CURRENT: '',
   },
 }
@@ -39,6 +39,7 @@ const community = {
   COMMUNITY_REGISTER_URL: process.env.COMMUNITY_REGISTER_URL || 'http://localhost/register',
   COMMUNITY_DESCRIPTION:
     process.env.COMMUNITY_DESCRIPTION || 'Die lokale Entwicklungsumgebung von Gradido.',
+  COMMUNITY_SUPPORT_MAIL: process.env.COMMUNITY_SUPPORT_MAIL || 'support@supportmail.com',
 }
 
 const meta = {
@@ -60,10 +61,6 @@ const meta = {
   META_AUTHOR: process.env.META_AUTHOR || 'Bernd Hückstädt - Gradido-Akademie',
 }
 
-const supportmail = {
-  SUPPORT_MAIL: process.env.SUPPORT_MAIL || 'support@supportmail.com',
-}
-
 // Check config version
 constants.CONFIG_VERSION.CURRENT = process.env.CONFIG_VERSION || constants.CONFIG_VERSION.DEFAULT
 if (
@@ -83,7 +80,6 @@ const CONFIG = {
   ...endpoints,
   ...community,
   ...meta,
-  ...supportmail,
 }
 
 module.exports = CONFIG
diff --git a/frontend/src/pages/InfoStatistic.vue b/frontend/src/pages/InfoStatistic.vue
index 254a895e0..978c7fde5 100644
--- a/frontend/src/pages/InfoStatistic.vue
+++ b/frontend/src/pages/InfoStatistic.vue
@@ -89,7 +89,7 @@ export default {
       countAdminUser: null,
       itemsContributionLinks: [],
       itemsAdminUser: [],
-      supportMail: CONFIG.SUPPORT_MAIL,
+      supportMail: CONFIG.COMMUNITY_SUPPORT_MAIL,
       membersCount: '1203',
       totalUsers: null,
       totalGradidoCreated: null,