Merge branch 'master' into fix-creation-for-not-checked-email

admin/package.json

@@ -28,12 +28,12 @@
     "babel-plugin-component": "^1.1.1",
     "babel-preset-env": "^1.7.0",
     "babel-preset-vue": "^2.0.2",
-    "bootstrap": "^5.1.3",
+    "bootstrap": "4.3.1",
     "bootstrap-vue": "^2.21.2",
     "core-js": "^3.6.5",
     "dotenv-webpack": "^7.0.3",
-    "graphql": "^15.6.1",
     "express": "^4.17.1",
+    "graphql": "^15.6.1",
     "identity-obj-proxy": "^3.0.0",
     "jest": "26.6.3",
     "moment": "^2.29.1",

admin/src/components/CreationFormular.vue

@@ -3,9 +3,11 @@
     {{ $t('creation_form.form') }}
     <div class="shadow p-3 mb-5 bg-white rounded">
       <b-form ref="creationForm">
-        <b-row class="m-4">
+        <div class="ml-4">
           <label>{{ $t('creation_form.select_month') }}</label>
-          <b-col class="text-left">
+        </div>
+        <b-row class="ml-4">
+          <b-col>
             <b-form-radio
               id="beforeLastMonth"
               v-model="radioSelected"
@@ -33,7 +35,7 @@
               </label>
             </b-form-radio>
           </b-col>
-          <b-col class="text-right">
+          <b-col>
             <b-form-radio
               id="currentMonth"
               v-model="radioSelected"
@@ -49,7 +51,7 @@
           </b-col>
         </b-row>
 
-        <b-row class="m-4" v-show="createdIndex != null">
+        <div class="m-4" v-show="createdIndex != null">
           <label>{{ $t('creation_form.select_value') }}</label>
           <div>
             <b-input-group prepend="GDD" append=".00">
@@ -71,8 +73,8 @@
               ></b-form-input>
             </b-input-group>
           </div>
-        </b-row>
+        </div>
-        <b-row class="m-4">
+        <div class="m-4">
           <label>{{ $t('creation_form.enter_text') }}</label>
           <div>
             <b-form-textarea
@@ -83,9 +85,9 @@
               rows="3"
             ></b-form-textarea>
           </div>
-        </b-row>
+        </div>
         <b-row class="m-4">
-          <b-col class="text-center">
+          <b-col class="text-left">
             <b-button type="reset" variant="danger" @click="$refs.creationForm.reset()">
               {{ $t('creation_form.reset') }}
             </b-button>

admin/src/components/EditCreationFormular.vue

@@ -2,8 +2,10 @@
   <div class="component-edit-creation-formular">
     <div class="shadow p-3 mb-5 bg-white rounded">
       <b-form ref="updateCreationForm">
-        <b-row class="m-4">
+        <div class="ml-4">
           <label>{{ $t('creation_form.select_month') }}</label>
+        </div>
+        <b-row class="m-4">
           <b-col class="text-left">
             <b-form-radio
               id="beforeLastMonth"
@@ -63,7 +65,7 @@
           </b-col>
         </b-row>
 
-        <b-row class="m-4">
+        <div class="m-4">
           <label>{{ $t('creation_form.select_value') }}</label>
           <div>
             <b-input-group prepend="GDD" append=".00">
@@ -85,8 +87,8 @@
               ></b-form-input>
             </b-input-group>
           </div>
-        </b-row>
+        </div>
-        <b-row class="m-4">
+        <div class="m-4">
           <label>{{ $t('creation_form.enter_text') }}</label>
           <div>
             <b-form-textarea
@@ -97,9 +99,9 @@
               rows="3"
             ></b-form-textarea>
           </div>
-        </b-row>
+        </div>
         <b-row class="m-4">
-          <b-col class="text-center">
+          <b-col class="text-left">
             <b-button type="reset" variant="danger" @click="$refs.updateCreationForm.reset()">
               {{ $t('creation_form.reset') }}
             </b-button>

admin/yarn.lock

@@ -3634,16 +3634,16 @@ bootstrap-vue@^2.21.2:
     portal-vue "^2.1.7"
     vue-functional-data-merge "^3.1.0"
 
+bootstrap@4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
+  integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==
+
 "bootstrap@>=4.5.3 <5.0.0":
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7"
   integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==
 
-bootstrap@^5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz#ba081b0c130f810fa70900acbc1c6d3c28fa8f34"
-  integrity sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"

backend/.env.dist

@@ -1,8 +1,11 @@
+# Server
 PORT=4000
 JWT_SECRET=secret123
 JWT_EXPIRES_IN=10m
 GRAPHIQL=false
 GDT_API_URL=https://gdt.gradido.net
+
+# Database
 DB_HOST=localhost
 DB_PORT=3306
 DB_USER=root
@@ -10,29 +13,34 @@ DB_PASSWORD=
 DB_DATABASE=gradido_community
 TYPEORM_LOGGING_RELATIVE_PATH=typeorm.backend.log
 
-#EMAIL=true
+# Klicktipp
-#EMAIL_USERNAME=
+KLICKTIPP=false
-#EMAIL_SENDER=
+KLICKTTIPP_API_URL=https://api.klicktipp.com
-#EMAIL_PASSWORD=
+KLICKTIPP_USER=gradido_test
-#EMAIL_SMTP_URL=
+KLICKTIPP_PASSWORD=secret321
-#EMAIL_SMTP_PORT=587
+KLICKTIPP_APIKEY_DE=SomeFakeKeyDE
-#RESEND_TIME=1 minute, 60 => 1hour, 1440 (60 minutes * 24 hours) => 24 hours 
+KLICKTIPP_APIKEY_EN=SomeFakeKeyEN
-#RESEND_TIME=
-RESEND_TIME=10
 
-#EMAIL_LINK_VERIFICATION=http://localhost/checkEmail/{code}
+# Community
-#EMAIL_LINK_SETPASSWORD=http://localhost/reset/{code}
+COMMUNITY_NAME=Gradido Entwicklung
+COMMUNITY_URL=http://localhost/
+COMMUNITY_REGISTER_URL=http://localhost/register
+COMMUNITY_DESCRIPTION=Die lokale Entwicklungsumgebung von Gradido.
 
-#KLICKTIPP_USER=
+# Login Server
-#KLICKTIPP_PASSWORD=
-#KLICKTIPP_APIKEY_DE=
-#KLICKTIPP_APIKEY_EN=
-#KLICKTIPP=true
-COMMUNITY_NAME=
-COMMUNITY_URL=
-COMMUNITY_REGISTER_URL=
-COMMUNITY_DESCRIPTION=
 LOGIN_APP_SECRET=21ffbbc616fe
 LOGIN_SERVER_KEY=a51ef8ac7ef1abf162fb7a65261acd7a
 
+# EMail
+EMAIL=false
+EMAIL_USERNAME=gradido_email
+EMAIL_SENDER=info@gradido.net
+EMAIL_PASSWORD=xxx
+EMAIL_SMTP_URL=gmail.com
+EMAIL_SMTP_PORT=587
+EMAIL_LINK_VERIFICATION=http://localhost/checkEmail/{code}
+EMAIL_LINK_SETPASSWORD=http://localhost/reset/{code}
+RESEND_TIME=10
+
+# Webhook
 WEBHOOK_ELOPAGE_SECRET=secret

backend/.env.template

@@ -1,8 +1,10 @@
-PORT=4000
+# Server
 JWT_SECRET=$JWT_SECRET
 JWT_EXPIRES_IN=10m
 GRAPHIQL=false
 GDT_API_URL=$GDT_API_URL
+
+# Database
 DB_HOST=localhost
 DB_PORT=3306
 DB_USER=$DB_USER
@@ -10,26 +12,35 @@ DB_PASSWORD=$DB_PASSWORD
 DB_DATABASE=gradido_community
 TYPEORM_LOGGING_RELATIVE_PATH=$TYPEORM_LOGGING_RELATIVE_PATH
 
+# Klicktipp
+KLICKTIPP=$KLICKTIPP
+KLICKTTIPP_API_URL=https://api.klicktipp.com
+KLICKTIPP_USER=$KLICKTIPP_USER
+KLICKTIPP_PASSWORD=$KLICKTIPP_PASSWORD
+KLICKTIPP_APIKEY_DE=$KLICKTIPP_APIKEY_DE
+KLICKTIPP_APIKEY_EN=$KLICKTIPP_APIKEY_EN
+
+# Community
+COMMUNITY_NAME=$COMMUNITY_NAME
+COMMUNITY_URL=$COMMUNITY_URL
+COMMUNITY_REGISTER_URL=$COMMUNITY_REGISTER_URL
+COMMUNITY_DESCRIPTION=$COMMUNITY_DESCRIPTION
+
+# Login Server
+LOGIN_APP_SECRET=21ffbbc616fe
+LOGIN_SERVER_KEY=a51ef8ac7ef1abf162fb7a65261acd7a
+
+# EMail
+RESEND_TIME=10
 EMAIL=$EMAIL
 EMAIL_USERNAME=$EMAIL_USERNAME
 EMAIL_SENDER=$EMAIL_SENDER
 EMAIL_PASSWORD=$EMAIL_PASSWORD
 EMAIL_SMTP_URL=$EMAIL_SMTP_URL
 EMAIL_SMTP_PORT=587
-#RESEND_TIME=1 minute, 60 => 1hour, 1440 (60 minutes * 24 hours) => 24 hours 
-RESEND_TIME=10
-
 EMAIL_LINK_VERIFICATION=$EMAIL_LINK_VERIFICATION
 EMAIL_LINK_SETPASSWORD=$EMAIL_LINK_SETPASSWORD
+RESEND_TIME=10
 
-#KLICKTIPP_USER=
+# Webhook
-#KLICKTIPP_PASSWORD=
-#KLICKTIPP_APIKEY_DE=
-#KLICKTIPP_APIKEY_EN=
-#KLICKTIPP=true
-COMMUNITY_NAME=$COMMUNITY_NAME
-COMMUNITY_URL=$COMMUNITY_URL
-COMMUNITY_REGISTER_URL=$COMMUNITY_REGISTER_URL
-COMMUNITY_DESCRIPTION=$COMMUNITY_DESCRIPTION
-
 WEBHOOK_ELOPAGE_SECRET=$WEBHOOK_ELOPAGE_SECRET

backend/src/config/index.ts

@@ -43,6 +43,7 @@ const loginServer = {
   LOGIN_SERVER_KEY: process.env.LOGIN_SERVER_KEY || 'a51ef8ac7ef1abf162fb7a65261acd7a',
 }
 
+// TODO: Hannes if I find you... this looks like blasphemy
 const resendTime = parseInt(process.env.RESEND_TIME ? process.env.RESEND_TIME : 'null')
 const email = {
   EMAIL: process.env.EMAIL === 'true' || false,

deployment/bare_metal/.env.dist

@@ -37,6 +37,12 @@ COMMUNITY_URL=https://stage1.gradido.net/
 COMMUNITY_REGISTER_URL=https://stage1.gradido.net/register
 COMMUNITY_DESCRIPTION=Gradido Development Stage1 Test Community
 
+KLICKTIPP=false
+KLICKTIPP_USER=
+KLICKTIPP_PASSWORD=
+KLICKTIPP_APIKEY_DE=
+KLICKTIPP_APIKEY_EN=
+
 # frontend
 GRAPHQL_URI=https://stage1.gradido.net/graphql
 ADMIN_AUTH_URL=https://stage1.gradido.net/admin/authenticate?token={token}