From 7c3b5c72c65ec10642eae6e0b7e839aa9e4955fb Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Thu, 29 Apr 2021 11:46:46 +0200
Subject: [PATCH 1/3] turn registration on and off

---
 frontend/Dockerfile                | 2 ++
 frontend/src/config/index.js       | 2 +-
 frontend/src/routes/router.js      | 8 ++++++++
 frontend/src/routes/routes.js      | 4 ----
 frontend/src/views/Pages/Login.vue | 4 +++-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 5ec90fe81..48b94e5dd 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -16,6 +16,8 @@ ENV BUILD_COMMIT="0000000"
 ENV NODE_ENV="production"
 ## App relevant Envs
 ENV PORT="3000"
+## Register in App  true || false
+ENV VUE_APP_ALLOW_REGISTER="true"
 
 # Labels
 LABEL org.label-schema.build-date="${BUILD_DATE}"
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 7d950b87d..32a96e5d9 100644
--- a/frontend/src/config/index.js
+++ b/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,
+  VUE_APP_ALLOW_REGISTER: process.env.VUE_APP_ALLOW_REGISTER === 'true',
 }
 
 const server = {
diff --git a/frontend/src/routes/router.js b/frontend/src/routes/router.js
index 6d2963db5..942544d8c 100644
--- a/frontend/src/routes/router.js
+++ b/frontend/src/routes/router.js
@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import VueRouter from 'vue-router'
 import routes from './routes'
+import CONFIG from '../config'
 
 Vue.use(VueRouter)
 
@@ -21,4 +22,11 @@ const router = new VueRouter({
   },
 })
 
+if (CONFIG.VUE_APP_ALLOW_REGISTER) {
+  router.addRoute({
+    path: '/register',
+    component: () => import('../views/Pages/Register.vue'),
+  })
+}
+
 export default router
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index bfaff9de6..ed5394d11 100755
--- a/frontend/src/routes/routes.js
+++ b/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'),
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index f7c002d2a..cce0931e9 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -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,6 +107,7 @@ export default {
         // rememberMe: false
       },
       loginfail: false,
+      allowRegister: CONFIG.VUE_APP_ALLOW_REGISTER,
     }
   },
   methods: {

From d473069d0ab6d8bb51cec26085708c172032f582 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Thu, 29 Apr 2021 12:06:55 +0200
Subject: [PATCH 2/3] turn registration on and off- remove VUE_APP_

---
 frontend/Dockerfile                | 2 +-
 frontend/src/config/index.js       | 2 +-
 frontend/src/routes/router.js      | 2 +-
 frontend/src/views/Pages/Login.vue | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 48b94e5dd..f09ce0e5c 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -17,7 +17,7 @@ ENV NODE_ENV="production"
 ## App relevant Envs
 ENV PORT="3000"
 ## Register in App  true || false
-ENV VUE_APP_ALLOW_REGISTER="true"
+ENV ALLOW_REGISTER="true"
 
 # Labels
 LABEL org.label-schema.build-date="${BUILD_DATE}"
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 32a96e5d9..a801debb7 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -6,7 +6,7 @@ const environment = {
   NODE_ENV: process.env.NODE_ENV,
   DEBUG: process.env.NODE_ENV !== 'production' || false,
   PRODUCTION: process.env.NODE_ENV === 'production' || false,
-  VUE_APP_ALLOW_REGISTER: process.env.VUE_APP_ALLOW_REGISTER === 'true',
+  ALLOW_REGISTER: process.env.ALLOW_REGISTER === 'true',
 }
 
 const server = {
diff --git a/frontend/src/routes/router.js b/frontend/src/routes/router.js
index 942544d8c..189516242 100644
--- a/frontend/src/routes/router.js
+++ b/frontend/src/routes/router.js
@@ -22,7 +22,7 @@ const router = new VueRouter({
   },
 })
 
-if (CONFIG.VUE_APP_ALLOW_REGISTER) {
+if (CONFIG.ALLOW_REGISTER) {
   router.addRoute({
     path: '/register',
     component: () => import('../views/Pages/Register.vue'),
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index cce0931e9..6ce466131 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -107,7 +107,7 @@ export default {
         // rememberMe: false
       },
       loginfail: false,
-      allowRegister: CONFIG.VUE_APP_ALLOW_REGISTER,
+      allowRegister: CONFIG.ALLOW_REGISTER,
     }
   },
   methods: {

From 812a1d5f67950cdf03a4d11206dc5cba16e5204b Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Thu, 29 Apr 2021 12:31:47 +0200
Subject: [PATCH 3/3] turn registration on and off- remove from dockerfile to
 .env

---
 frontend/.env.dist           | 3 ++-
 frontend/Dockerfile          | 2 --
 frontend/src/config/index.js | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/frontend/.env.dist b/frontend/.env.dist
index 7815be556..ffe4869fa 100644
--- a/frontend/.env.dist
+++ b/frontend/.env.dist
@@ -1,2 +1,3 @@
 LOGIN_API_URL=http://localhost/login_api/
-COMMUNITY_API_URL=http://localhost/api/
\ No newline at end of file
+COMMUNITY_API_URL=http://localhost/api/
+ALLOW_REGISTER=true
\ No newline at end of file
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index f09ce0e5c..5ec90fe81 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -16,8 +16,6 @@ ENV BUILD_COMMIT="0000000"
 ENV NODE_ENV="production"
 ## App relevant Envs
 ENV PORT="3000"
-## Register in App  true || false
-ENV ALLOW_REGISTER="true"
 
 # Labels
 LABEL org.label-schema.build-date="${BUILD_DATE}"
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index a801debb7..fa4bf388b 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -6,7 +6,7 @@ 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 === 'true',
+  ALLOW_REGISTER: process.env.ALLOW_REGISTER !== 'false',
 }
 
 const server = {