From 8e08886642048451d8c45bfca1cc5f31c1e480ca Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 23 May 2022 10:58:47 +0200
Subject: [PATCH] change review from hardi, remove welcome community name,
 refactor code

---
 frontend/src/assets/scss/gradido-template.scss |  6 +++---
 frontend/src/layouts/AuthLayout.vue            |  4 +++-
 frontend/src/locales/de.json                   |  3 +--
 frontend/src/locales/en.json                   |  3 +--
 frontend/src/pages/Login.vue                   | 16 +++-------------
 frontend/src/pages/Register.vue                |  6 +++---
 6 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/frontend/src/assets/scss/gradido-template.scss b/frontend/src/assets/scss/gradido-template.scss
index 1b7648b20..01ee24a68 100644
--- a/frontend/src/assets/scss/gradido-template.scss
+++ b/frontend/src/assets/scss/gradido-template.scss
@@ -36,6 +36,8 @@ a,
 /* Button */
 .btn {
   border-radius: 25px;
+  padding-right: 50px;
+  padding-left: 50px;
 }
 
 .btn-gradido {
@@ -46,8 +48,6 @@ a,
   border-style: none;
   box-shadow: 10px 10px 50px 10px rgb(56 56 56 / 31%);
   color: #fff;
-  padding-right: 50px;
-  padding-left: 50px;
 }
 
 .btn-gradido:hover {
@@ -59,7 +59,7 @@ a,
 }
 
 .btn-outline-gradido {
-  color: rgb(248 161 27);
+  color: rgb(140, 121, 88);
   border: 1px solid #f5b805;
 }
 
diff --git a/frontend/src/layouts/AuthLayout.vue b/frontend/src/layouts/AuthLayout.vue
index ae7adc330..bf09a1852 100644
--- a/frontend/src/layouts/AuthLayout.vue
+++ b/frontend/src/layouts/AuthLayout.vue
@@ -30,7 +30,7 @@
             <b-row class="mt-5 pl-2 pl-md-0 pl-lg-0">
               <b-col cols="9">
                 <div class="h1 mb--2">{{ $t('welcome') }}</div>
-                <div class="h1 mb-0">{{ $t('communitiesWorldWide') }}</div>
+                <div class="h1 mb-0">{{ $t('WelcomeBy', { name: communityName }) }}</div>
                 <div class="mb-0">{{ $t('1000thanks') }}</div>
               </b-col>
               <b-col cols="3" class="text-right d-none d-sm-none d-md-inline">
@@ -92,6 +92,7 @@ import NavbarSmall from '@/components/Auth/NavbarSmall.vue'
 import Carousel from '@/components/Auth/Carousel.vue'
 import LanguageSwitch from '@/components/LanguageSwitch2'
 import AuthFooter from '@/components/Auth/Footer.vue'
+import CONFIG from '@/config'
 
 export default {
   name: 'AuthLayout',
@@ -106,6 +107,7 @@ export default {
   data() {
     return {
       mobileStart: true,
+      communityName: CONFIG.COMMUNITY_NAME,
     }
   },
   methods: {
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 568b57149..c5008d978 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -18,7 +18,7 @@
     }
   },
   "back": "Zurück",
-  "communitiesWorldWide": "Gemeinden in aller Welt",
+  "WelcomeBy": "bei {name}",
   "community": {
     "choose-another-community": "Eine andere Gemeinschaft auswählen",
     "community": "Gemeinschaft",
@@ -230,7 +230,6 @@
       "heading": "Bitte gib deine E-Mail an mit der du bei Gradido angemeldet bist."
     },
     "login": {
-      "community": "Wähle deine Gemeinschaft",
       "heading": "Melde dich mit deinen Zugangsdaten an. Bewahre sie stets sicher auf!",
       "saveLogin": "Anmeldung speichern"
     },
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index d7f44dd92..2def7c4d3 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -18,7 +18,7 @@
     }
   },
   "back": "Back",
-  "communitiesWorldWide": "Communities World Wide",
+  "WelcomeBy": "by {name}",
   "community": {
     "choose-another-community": "Choose another community",
     "community": "Community",
@@ -230,7 +230,6 @@
       "heading": "Please enter the email address by which you're registered here."
     },
     "login": {
-      "community": "Choose your community",
       "heading": "Log in with your access data. Keep them safe!",
       "saveLogin": "Save login"
     },
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 97f9d7f9f..208f7941f 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -2,13 +2,6 @@
   <div class="login-form">
     <b-container v-if="enterData">
       <div class="pb-5">{{ $t('site.login.heading') }}</div>
-      <label>{{ $t('site.login.community') }}</label>
-      <b-form-select
-        v-model="selected"
-        :options="options"
-        class="selectedLanguage mb-3"
-      ></b-form-select>
-
       <validation-observer ref="observer" v-slot="{ handleSubmit }">
         <b-form @submit.stop.prevent="handleSubmit(onSubmit)">
           <b-row>
@@ -23,8 +16,9 @@
             </b-col>
           </b-row>
           <b-row>
-            <b-col>
+            <b-col class="d-flex justify-content-start">
               <b-form-checkbox
+                class="mt-3"
                 v-model="status"
                 name="checkbox-1"
                 value="saved"
@@ -39,7 +33,7 @@
               </router-link>
             </b-col>
           </b-row>
-          <div class="mt-4">
+          <div class="mt-5">
             <b-button type="submit" variant="gradido">{{ $t('login') }}</b-button>
           </div>
         </b-form>
@@ -61,7 +55,6 @@ import InputPassword from '@/components/Inputs/InputPassword'
 import InputEmail from '@/components/Inputs/InputEmail'
 import Message from '@/components/Message/Message'
 import { login } from '@/graphql/queries'
-import CONFIG from '@/config'
 
 export default {
   name: 'Login',
@@ -77,14 +70,11 @@ export default {
         password: '',
       },
       passwordVisible: false,
-      selected: '01',
-      options: [{ value: '01', text: CONFIG.COMMUNITY_NAME }],
       status: false,
       showPageMessage: false,
       errorReason: null,
       errorSubtitle: '',
       errorLinkTo: '',
-      CONFIG,
     }
   },
   methods: {
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index ea84afa9f..4ffd6ce79 100755
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -80,11 +80,11 @@
               </b-form-checkbox>
             </b-col>
 
-            <b-col>
+            <b-col class="d-flex justify-content-end">
               <b-button
-                :disabled="disabled"
                 type="submit"
-                :variant="disabled ? 'outline-light' : 'gradido'"
+                :disabled="disabled"
+                :variant="disabled ? 'outline-gradido' : 'gradido'"
               >
                 {{ $t('signup') }}
               </b-button>