Merge branch 'master' into dynamic-balance

.github/ISSUE_TEMPLATE/bug_report.md

@@ -5,21 +5,5 @@ labels: bug
 title: 🐛 [Bug] 
 ---
 
-## :bug: Bugreport
+## 🐛 Bugreport
-<!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the bug is.-->
+<!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the bug is.--
-
-### Steps to reproduce the behavior
-1.
-2.
-3.
-4. ...
-5. Profit
-
-### Expected behavior
-<!-- A clear and concise description of what you expected to happen. -->
-
-### Version & Environment
-<!-- Add context about your environment and used version here. -->
-
-### Additional context
-<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/devops_ticket.md

@@ -7,18 +7,3 @@ title: 💥 [DevOps]
 
 ## 💥 DevOps ticket
 <!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the problem is.-->
-
-### Motive
-<!-- Why does this task need to be done? What can we benefit from this? -->
-
-### Related issues
-<!-- Are there any related issues to link to? Please paste them below for reference. -->
-
-### Implementation
-<!-- Please, document any ideas of how the task can be performed. -->
-
-### Validation
-<!-- How can we make sure that this task was successful? -->
-
-### Additional context
-<!-- Add other context or background about the feature request here.-->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -5,20 +5,5 @@ labels: feature
 title: 🚀 [Feature] 
 ---
 
-## :rocket: Feature
+## 🚀 Feature
 <!-- Give a short summary of the Feature. Use Screenshots if you want. -->
-
-### User Problem
-<!-- Which problem is this solving? Why do you think this is important? Who will benefit from it and how? -->
-
-### Implementation
-<!-- How do you think this feature should be implemented? How will it be used? Where in the network should it be located? Which steps and screens are involved? -->
-
-### Design & Layout
-<!-- Attach Screenshots and Sketches to illustrate your idea. -->
-
-### Validation
-<!-- How can we make sure that this feature indeed solves the above problem? How do we know if it has been accepted by the users of the network, once released? -->
-
-### Additional context
-<!-- Add other context or background about the feature request here.-->

.github/ISSUE_TEMPLATE/question.md

@@ -1,11 +1,11 @@
 ---
 name: 💬 Question
-about: If you need help understanding HumanConnection.
+about: If you need help understanding Gradido.
 labels: question
 title: 💬 [Question] 
 ---
 <!-- Chat with Team Gradido -->
 <!-- If you need an answer right away, visit the Gradido Discord: https://discord.gg/kA3zBAKQDC -->
 
-## :speech_balloon: Question
+## 💬 Question
 <!-- Describe your Question in detail. Include screenshots and drawings if needed. -->

.github/ISSUE_TEMPLATE/refactor_tickets.md

@@ -5,17 +5,5 @@ labels: refactor
 title: 🔧 [Refactor]
 ---
 
-## :zap: Refactor ticket
+## 🔧 Refactor ticket
 <!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the problem is.-->
-
-### Motive
-<!-- What is the purpose of this refactoring? If it's removing depcrecated code, please link to the deprecation notice. -->
-
-### Related issues
-<!-- Are there any related issues to link to? Please paste them below for reference. -->
-
-### Implementation
-<!-- Please, document any ideas of how the code should be refactored. -->
-
-### Additional context
-<!-- Add other context or background about the feature request here.-->

docker-compose.override.yml

@@ -8,6 +8,8 @@ services:
     image: gradido/frontend:development
     build:
       target: development
+    networks:
+      - external-net
     environment:
       - NODE_ENV="development"
       # - DEBUG=true

docker-compose.yml

@@ -15,13 +15,13 @@ services:
       context: ./frontend
       target: production
     networks:
-      - external-net
+      - internal-net
     ports:
-      - 8080:8080
+      - 3000:3000
     environment:
       # Envs used in Dockerfile
       # - DOCKER_WORKDIR="/app"
-      # - PORT="8080"
+      # - PORT=3000
       - BUILD_DATE
       - BUILD_VERSION
       - BUILD_COMMIT

frontend/.env.dist

@@ -1,3 +1,3 @@
 LOGIN_API_URL=http://localhost/login_api/
 COMMUNITY_API_URL=http://localhost/api/
-VUE_PATH=/vue
+ALLOW_REGISTER=true

frontend/Dockerfile

@@ -15,7 +15,7 @@ ENV BUILD_COMMIT="0000000"
 ## SET NODE_ENV
 ENV NODE_ENV="production"
 ## App relevant Envs
-ENV PORT="8080"
+ENV PORT="3000"
 
 # Labels
 LABEL org.label-schema.build-date="${BUILD_DATE}"
@@ -82,15 +82,14 @@ FROM base as production
 
 # Copy "binary"-files from build image
 COPY --from=build ${DOCKER_WORKDIR}/dist ./dist
-#COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules
+# We also copy the node_modules express and serve-static for the run script
-#COPY --from=build ${DOCKER_WORKDIR}/nuxt.config.js ./nuxt.config.js
+COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules
 # Copy static files
-# TODO - this should be one Folder containign all stuff needed to be copied
+COPY --from=build ${DOCKER_WORKDIR}/public ./public
-#COPY --from=build ${DOCKER_WORKDIR}/constants ./constants
-#COPY --from=build ${DOCKER_WORKDIR}/static ./static
-#COPY --from=build ${DOCKER_WORKDIR}/locales ./locales
 # Copy package.json for script definitions (lock file should not be needed)
 COPY --from=build ${DOCKER_WORKDIR}/package.json ./package.json
+# Copy run scripts run/
+COPY --from=build ${DOCKER_WORKDIR}/run ./run
 
 # Run command
 CMD /bin/sh -c "yarn run start"

frontend/package.json

@@ -3,7 +3,7 @@
   "version": "0.9.4",
   "private": true,
   "scripts": {
-    "start": "node server.js",
+    "start": "node run/server.js",
     "serve": "vue-cli-service serve --open",
     "build": "vue-cli-service build",
     "lint": "eslint --ext .js,.vue .",
@@ -69,6 +69,7 @@
     "vue-good-table": "^2.21.3",
     "vue-i18n": "^8.22.4",
     "vue-jest": "^3.0.7",
+    "vue-loading-overlay": "^3.4.2",
     "vue-moment": "^4.1.0",
     "vue-qrcode": "^0.3.5",
     "vue-qrcode-reader": "^2.3.16",

frontend/run/server.js

@@ -0,0 +1,14 @@
+// Imports
+const express = require('express')
+const serveStatic = require('serve-static')
+
+// Port
+const port = process.env.PORT || 3000
+
+// Express Server
+const app = express()
+app.use(serveStatic(__dirname + '/../dist'))
+app.listen(port)
+
+// eslint-disable-next-line no-console
+console.log(`http://frontend:${port} server started.`)

frontend/server.js

@@ -1,7 +0,0 @@
-var express = require('express')
-var serveStatic = require('serve-static')
-var app = express()
-app.use(serveStatic(__dirname + '/dist'))
-var port = process.env.PORT || 5000
-app.listen(port)
-// console.log('http://localhost:5000 server started.');

frontend/src/config/index.js

@@ -2,11 +2,11 @@
 
 // Load Package Details for some default values
 // const pkg = require('../../package')
-
 const environment = {
   NODE_ENV: process.env.NODE_ENV,
   DEBUG: process.env.NODE_ENV !== 'production' || false,
   PRODUCTION: process.env.NODE_ENV === 'production' || false,
+  ALLOW_REGISTER: process.env.ALLOW_REGISTER !== 'false',
 }
 
 const server = {

frontend/src/plugins/dashboard-plugin.js

@@ -37,6 +37,10 @@ import 'vue-good-table/dist/vue-good-table.css'
 
 import VueMoment from 'vue-moment'
 
+import Loading from 'vue-loading-overlay'
+// import the styles
+import 'vue-loading-overlay/dist/vue-loading.css'
+
 Object.keys(rules).forEach((rule) => {
   extend(rule, {
     ...rules[rule], // copies rule configuration
@@ -56,6 +60,7 @@ export default {
     Vue.use(VueQrcodeReader)
     Vue.use(VueQrcode)
     Vue.use(VueFlatPickr)
+    Vue.use(Loading)
     configure({
       classes: {
         valid: 'is-valid',

frontend/src/routes/router.js

@@ -1,11 +1,13 @@
 import Vue from 'vue'
 import VueRouter from 'vue-router'
 import routes from './routes'
+import CONFIG from '../config'
 
 Vue.use(VueRouter)
 
 // configure router
 const router = new VueRouter({
+  base: '/vue',
   routes, // short for routes: routes
   linkActiveClass: 'active',
   mode: 'history',
@@ -20,4 +22,11 @@ const router = new VueRouter({
   },
 })
 
+if (CONFIG.ALLOW_REGISTER) {
+  router.addRoute({
+    path: '/register',
+    component: () => import('../views/Pages/Register.vue'),
+  })
+}
+
 export default router

frontend/src/routes/routes.js

@@ -50,10 +50,6 @@ const routes = [
     path: '/thx',
     component: () => import('../views/Pages/thx.vue'),
   },
-  {
-    path: '/register',
-    component: () => import('../views/Pages/Register.vue'),
-  },
   {
     path: '/password',
     component: () => import('../views/Pages/ForgotPassword.vue'),

frontend/src/views/KontoOverview/GddSend.vue

@@ -10,7 +10,7 @@
             <span class="alert-text" v-html="$t('form.scann_code')"></span>
             <b-col v-show="!scan" lg="12" class="text-right">
               <a @click="toggle" class="nav-link pointer">
-                <img src="/img/icons/gradido/qr-scan-pure.png" height="50" />
+                <img src="img/icons/gradido/qr-scan-pure.png" height="50" />
               </a>
             </b-col>
 

frontend/src/views/Pages/Login.vue

@@ -67,7 +67,7 @@
                   </b-alert>
 
                   <!-- <b-form-checkbox v-model="model.rememberMe">{{ $t('site.login.remember')}}</b-form-checkbox> -->
-                  <div class="text-center">
+                  <div class="text-center" ref="submitButton">
                     <base-button type="secondary" native-type="submit" class="my-4">
                       {{ $t('site.login.signin') }}
                     </base-button>
@@ -82,7 +82,7 @@
                 {{ $t('site.login.forgot_pwd') }}
               </router-link>
             </b-col>
-            <b-col cols="6" class="text-right">
+            <b-col cols="6" class="text-right" v-show="allowRegister">
               <router-link to="/register">
                 {{ $t('site.login.new_wallet') }}
               </router-link>
@@ -95,6 +95,7 @@
 </template>
 <script>
 import loginAPI from '../../apis/loginAPI'
+import CONFIG from '../../config'
 
 export default {
   name: 'login',
@@ -106,10 +107,14 @@ export default {
         // rememberMe: false
       },
       loginfail: false,
+      allowRegister: CONFIG.ALLOW_REGISTER,
     }
   },
   methods: {
     async onSubmit() {
+      let loader = this.$loading.show({
+        container: this.$refs.submitButton,
+      })
       const result = await loginAPI.login(this.model.email, this.model.password)
       if (result.success) {
         this.$store.dispatch('login', {
@@ -117,11 +122,14 @@ export default {
           email: this.model.email,
         })
         this.$router.push('/overview')
+        loader.hide()
       } else {
+        loader.hide()
         this.loginfail = true
       }
     },
     closeAlert() {
+      loader.hide()
       this.loginfail = false
     },
   },

frontend/vue.config.js

@@ -1,17 +1,11 @@
 const path = require('path')
 const dotenv = require('dotenv-webpack')
 
-function resolveSrc(_path) {
-  return path.join(__dirname, _path)
-}
-
-let vue_path = process.env.VUE_PATH
-if (vue_path == undefined) {
-  vue_path = '/vue'
-}
-
 // vue.config.js
 module.exports = {
+  devServer: {
+    port: process.env.PORT || 3000,
+  },
   pluginOptions: {
     i18n: {
       locale: 'de',
@@ -21,12 +15,12 @@ module.exports = {
     },
   },
   lintOnSave: true,
-  publicPath: vue_path + '/',
+  publicPath: '/vue',
   configureWebpack: {
     // Set up all the aliases we use in our app.
     resolve: {
       alias: {
-        assets: resolveSrc('src/assets'),
+        assets: path.join(__dirname, 'src/assets'),
       },
     },
     plugins: [new dotenv()],
@@ -35,5 +29,5 @@ module.exports = {
     // Enable CSS source maps.
     sourceMap: process.env.NODE_ENV !== 'production',
   },
-  outputDir: path.resolve(__dirname, './dist' + vue_path),
+  outputDir: path.resolve(__dirname, './dist'),
 }

frontend/yarn.lock

@@ -13348,6 +13348,11 @@ vue-loader@^15.7.0:
     vue-hot-reload-api "^2.3.0"
     vue-style-loader "^4.1.0"
 
+vue-loading-overlay@^3.4.2:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/vue-loading-overlay/-/vue-loading-overlay-3.4.2.tgz#34792a83218df1d35dff50121ce9fac2114f1c38"
+  integrity sha512-xcB+NPjl76eA0uggm707x3ZFgrNosZXpynHipyS3K+rrK1NztOV49R1LY+/4ij5W1KYANp7eRI2EIHrxCpmWAw==
+
 vue-moment@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/vue-moment/-/vue-moment-4.1.0.tgz#092a8ff723a96c6f85a0a8e23ad30f0bf320f3b0"

nginx/nginx.conf

@@ -1,5 +1,3 @@
-
-
 server {
 
 	listen 80 ;
@@ -10,11 +8,9 @@ server {
 	#include /etc/nginx/common/protect_add_header.conf;
 	#include /etc/nginx/common/ssl.conf;	
 	
-	
 	root /var/www/cakephp/webroot;
 	index index.php;
 
-
 	location ~ \.php$ {
 	  fastcgi_pass community-server:9000;
 	  fastcgi_index index.php;
@@ -23,7 +19,6 @@ server {
 	  fastcgi_buffers 16 16k;
 	  fastcgi_buffer_size 32k;
 	  include fastcgi_params;
-
 	}
 
 	location ~ /\.ht {
@@ -31,65 +26,61 @@ server {
 	}
 
 	location /account {
-			proxy_http_version 1.1;
+		proxy_http_version 1.1;
-			proxy_set_header    Upgrade $http_upgrade;
+		proxy_set_header    Upgrade $http_upgrade;
-			proxy_set_header    Connection 'upgrade';
+		proxy_set_header    Connection 'upgrade';
-			proxy_cache_bypass  $http_upgrade;
+		proxy_cache_bypass  $http_upgrade;
-			proxy_set_header    X-Real-IP  $remote_addr;
+		proxy_set_header    X-Real-IP  $remote_addr;
-			proxy_set_header    X-Forwarded-For $remote_addr;
+		proxy_set_header    X-Forwarded-For $remote_addr;
-			proxy_set_header    Host $host;
+		proxy_set_header    Host $host;
-			rewrite  /account/(.*) /$1 break;
+		rewrite  /account/(.*) /$1 break;
-			
-			#proxy_next_upstream error timeout invalid_header http_502 non_idempotent;
-			proxy_pass          http://login-server:1200;
-			proxy_redirect      off;
-
 
+		proxy_pass          http://login-server:1200;
+		proxy_redirect      off;
 	}
 	
 	location /login_api {
-			proxy_http_version 1.1;
+		proxy_http_version 1.1;
-			proxy_set_header    Upgrade $http_upgrade;
+		proxy_set_header    Upgrade $http_upgrade;
-			proxy_set_header    Connection 'upgrade';
+		proxy_set_header    Connection 'upgrade';
-			proxy_cache_bypass  $http_upgrade;
+		proxy_cache_bypass  $http_upgrade;
-			proxy_set_header    X-Real-IP  $remote_addr;
+		proxy_set_header    X-Real-IP  $remote_addr;
-			proxy_set_header    X-Forwarded-For $remote_addr;
+		proxy_set_header    X-Forwarded-For $remote_addr;
-			proxy_set_header    Host $host;
+		proxy_set_header    Host $host;
-			rewrite  /login_api/(.*) /$1 break;
+		rewrite  /login_api/(.*) /$1 break;
 
-			proxy_pass          http://login-server:1201;
+		proxy_pass          http://login-server:1201;
-			proxy_redirect      off;
+		proxy_redirect      off;
 	}
 
 	location / {
-			try_files $uri $uri/ /index.php?$args;
+		try_files $uri $uri/ /index.php?$args;
 	}
 	
 	location /vue {
-
-		location /vue/sockjs-node {
-			rewrite  /vue/(.*) /$1;
-		}
-		location ~* \.(png) {
-			expires 1d;
-			rewrite  /vue/(.*) /$1;
-		}
-
-    #try_files /vue/$uri /vue/$uri/ /index.html;
-
 		proxy_http_version 1.1;
 		proxy_set_header   Upgrade $http_upgrade;
 		proxy_set_header   Connection 'upgrade';
 		proxy_set_header   X-Forwarded-For $remote_addr;
 		proxy_set_header   X-Real-IP  $remote_addr;
 		proxy_set_header   Host $host;
-		#rewrite  /vue/(.*) /$1 break;
 		
-		proxy_pass         http://frontend:8080;
+		proxy_pass         http://frontend:3000;
+		proxy_redirect     off;
+	}
+
+	location /sockjs-node {
+		proxy_http_version 1.1;
+		proxy_set_header   Upgrade $http_upgrade;
+		proxy_set_header   Connection 'upgrade';
+		proxy_set_header   X-Forwarded-For $remote_addr;
+		proxy_set_header   X-Real-IP  $remote_addr;
+		proxy_set_header   Host $host;
+		
+		proxy_pass         http://frontend:3000;
 		proxy_redirect     off;
 	}
 
 #	access_log /var/log/nginx/access.log main;
 
-
 }

skeema/Dockerfile

@@ -25,4 +25,4 @@ COPY ./mariadb/.skeema.login ./gradido_login/.skeema
 COPY ./community_server/db/skeema/ . 
 COPY ./mariadb/.skeema.community ./gradido_community/.skeema
 
-CMD skeema push
+CMD skeema push --allow-unsafe