translations for login, register clean

community_server

@@ -1 +1 @@
-Subproject commit d7a8adc0943d418ea2ba25efb39210e96d292291
+Subproject commit 36ddbba5815435575b2d3c1270d738ccabc9eb54

frontend/src/components/SidebarPlugin/SideBar.vue

@@ -33,28 +33,32 @@
                         </a>
 
                         <div class=" dropdown-header noti-title">
-                            <h6 class="text-overflow m-0">Welcome!</h6>
+                            <h6 class="text-overflow m-0">{{ $t('welcome')  }}</h6>
                         </div>
+                        <router-link to="/KontoOverview" class="dropdown-item">
+                            <i class="ni ni-single-02"></i>
+                            <span>{{ $t('site.overview.account_overview')}}</span>
+                        </router-link>
                         <router-link to="/profile" class="dropdown-item">
                             <i class="ni ni-single-02"></i>
-                            <span>My profile</span>
+                            <span>{{ $t('site.navbar.my-profil')}}</span>
                         </router-link>
-                        <router-link to="/profile" class="dropdown-item">
+                        <router-link to="/profileedit" class="dropdown-item">
                             <i class="ni ni-settings-gear-65"></i>
-                            <span>Settings</span>
+                            <span>{{ $t('site.navbar.settings') }}</span>
                         </router-link>
-                        <router-link to="/profile" class="dropdown-item">
+                        <router-link to="/activity" class="dropdown-item">
                             <i class="ni ni-calendar-grid-58"></i>
-                            <span>Activity</span>
+                            <span>{{ $t('site.navbar.activity') }}</span>
                         </router-link>
                         <router-link to="/profile" class="dropdown-item">
                             <i class="ni ni-support-16"></i>
-                            <span>Support</span>
+                            <span>{{ $t('site.navbar.support') }}</span>
                         </router-link>
                         <div class="dropdown-divider"></div>
-                        <a href="#!" class="dropdown-item">
+                        <a href="#!" class="dropdown-item" @click="logout">
                             <i class="ni ni-user-run"></i>
-                            <span>Logout</span>
+                            <span>{{ $t('logout') }}</span>
                         </a>
                     </base-dropdown>
                 </ul>
@@ -163,7 +167,11 @@
       //  params: { lang: locale }
       //})
       //this.hideDropdown()
-    }
+    },
+    logout(){
+      //console.log("DashboardNavbar.vue user logout() : ")
+      this.$store.dispatch('logout')
+    }  
     },
     beforeDestroy() {
       if (this.$sidebar.showSidebar) {

frontend/src/locales/de.json

@@ -1,9 +1,44 @@
 {
   "message": "hallo gradido !!",
+  "welcome":"Willkommen!",
+  "logout":"Logout",
+  "login":"Login",
+  "signup": "Registrieren",
+  "imprint":"Impressum",
+  "privacy_policy":"Datenschutzerklärung",
+  "license":"Lizenz",
+  "back":"back",
+  "form": {
+    "firstname":"Vorname",
+    "lastname":"Nachname",
+    "email":"eMail",
+    "email_repeat":"eMail wiederholen",
+    "password":"Passwort",
+    "password_repeat":"Passwort wiederholen",
+    "amount":"Betrag",
+    "memo":"Info",
+    "message":"Nachricht",
+    "date":"Datum",
+    "from":"von",
+    "to":"bis",
+    "at":"am",
+    "time":"Zeit"
+  },
   "site": {
-     "welcome":"Willkommen!",
+    "login": {
-     "logout":"Logout",
+      "community":"Du bist die Gemeinschaft",
-     "login":"Login",
+      "remember":"merken",
+      "signin":"Anmelden",
+      "forgot_pwd":"Passwort vergessen?",
+      "new_wallet":"Neues Wallet erstellen"
+    },
+    "signup": {
+      "title": "Erstelle deine Gradido Wallet",
+      "subtitle": "Werde ein teil der Gemeinschaft!",
+      "strength":"Passwortsicherheit:",
+      "strong":"stark",
+      "agree":"habe ich gelesen und verstanden und stimme diesen zu."
+    },
       "overview":{
         "account_overview":"Kontoübersicht",
         "current_balance":"Aktueller Kontostand",
@@ -30,8 +65,7 @@
         "my-profil":"Mein Profil",
         "settings":"Einstellung",
         "activity":"Aktivität",
-        "support":"Support",
+        "support":"Support"
-        "logout":"Logout"
       },
       "sidebar" : {
          "community":"Gemeinschaft",

frontend/src/locales/en.json

@@ -1,9 +1,44 @@
 {
   "message": "hello gradido !!",
+  "welcome":"Welcome!",
+  "logout":"Logout",
+  "login":"Login",
+  "signup": "Sign up",
+  "imprint":"Imprint",
+  "privacy_policy":"Privacy policy",
+  "license":"License",
+  "back":"back",
+  "form": {
+    "firstname":"firstname",
+    "lastname":"lastname",
+    "email":"email",
+    "email_repeat":"repeat_email",
+    "password":"password",
+    "password_repeat":"repeat password",
+    "amount":"amount",
+    "memo":"memo",
+    "message":"message",
+    "date":"date",
+    "from":"from",
+    "to":"to",
+    "at":"at",
+    "time":"time"
+  },
   "site": {
-    "welcome":"Welcome!",
+    "login": {
-    "logout":"Logout",
+      "community":"You are the community",
-    "login":"Login",
+      "remember":"Remember me",
+      "signin":"Sign in",
+      "forgot_pwd":"Forgot password?",
+      "new_wallet":"Create new wallet"
+    },
+    "signup": {
+      "title": "Create your Gradido Wallet",
+      "subtitle": "Become a part of the community!",
+      "strength":"password strength:",
+      "strong":"strong",
+      "agree":"I have read and understood and agree to them the"
+    },
     "overview":{
       "account_overview":"Account overview",
       "current_balance":"Current account balance",
@@ -30,8 +65,7 @@
       "my-profil":"My Profil",
       "settings":"Settings",
       "activity":"Activity",
-      "support":"Support",
+      "support":"Support"
-      "logout":"Logout"
     },
     "sidebar" : {
        "community":"Community",

frontend/src/views/KontoOverview/GddSent.vue

@@ -131,15 +131,15 @@ export default {
   },
   methods: {
      async onDecode (decodedString) {
-           console.log('JSON.parse(decodedString)',JSON.parse(decodedString) )
+           console.log('onDecode JSON.parse(decodedString)',JSON.parse(decodedString) )
            const arr = JSON.parse(decodedString) 
-            console.log('arr',arr[0].email )
+           console.log('arr',arr[0].email )
            this.modal.h4 = 'Scan erfolgreich'
            this.modal.p = arr
            this.form.email = arr[0].email
            this.form.amount1 = arr[0].amount
-            console.log('arr mail',arr.email)
+           console.log('arr mail',arr.email)
-            console.log('arr mail',arr.amount)
+           console.log('arr mail',arr.amount)
       
           this.modals2 = true
       },
@@ -150,9 +150,9 @@ export default {
             content,      // decoded String
             location      // QR code coordinates
           } = await promise
-            console.log('promise',promise)
+            console.log('onDetect promise',promise)
-             console.log('JSON.parse(decodedString)',JSON.parse(promise) )
+            //console.log('JSON.parse(decodedString)',JSON.parse(promise) )
-           const arr = JSON.parse(decodedString) 
+            const arr = JSON.parse(decodedString) 
             console.log('arr',arr)
           
         } catch (error) {
@@ -161,26 +161,19 @@ export default {
       },
       async onSubmit() {
         //event.preventDefault()
-        console.log("onSubmit", this.form)
+        //console.log("onSubmit", this.form)
-        //console.log("this.form.img", this.form.img)
-        //console.log("this.form.email", this.form.email)
-        //console.log("this.form.amount", this.form.amount)
-        //console.log("this.form.memo", this.form.memo)
-
         this.$store.state.ajaxCreateData.session_id = this.$cookies.get('gdd_session_id')
         this.$store.state.ajaxCreateData.email = this.form.email
         this.$store.state.ajaxCreateData.amount = this.form.amount
         this.$store.state.ajaxCreateData.memo = this.form.memo
-         this.$store.state.ajaxCreateData.target_date =  Date.now()
+        this.$store.state.ajaxCreateData.target_date =  Date.now()
 
-         this.$store.dispatch('ajaxCreate')
+        this.$store.dispatch('ajaxCreate')
       },
       onReset(event) {
         event.preventDefault()
-        // Reset our form values
         this.form.email = ''
         this.form.amount = ''  
-        // Trick to reset/clear native browser form validation state
         this.show = false
         this.$nextTick(() => {
           this.show = true

frontend/src/views/KontoOverview/GddTable.vue

@@ -12,7 +12,14 @@
             </div>
              <b-collapse :id="'a'+item.transaction_id" class="mt-2">
               <b-card>
-                <p class="card-text">{{item}}</p>
+                <b-list-group>
+                  <b-list-group-item> <b-badge class="mr-4" variant="primary" pill>name</b-badge>{{item.name}}</b-list-group-item>
+                  <b-list-group-item> <b-badge class="mr-4" variant="primary" pill>type</b-badge>{{item.type}}</b-list-group-item>
+                  <b-list-group-item> <b-badge class="mr-5" variant="primary" pill>id</b-badge>{{item.transaction_id}}</b-list-group-item>
+                  <b-list-group-item> <b-badge class="mr-4" variant="primary" pill>date</b-badge>{{item.date}}</b-list-group-item>
+                  <b-list-group-item> <b-badge class="mr-4" variant="primary" pill>gdd</b-badge>{{item.balance}}</b-list-group-item>
+                  <b-list-group-item> <b-badge class="mr-4" variant="primary" pill>memo</b-badge>{{item.memo}}</b-list-group-item>
+                </b-list-group>
                 <b-button v-b-toggle="'collapse-1-inner'+ item.transaction_id" size="sm">\i/ more</b-button>
                 <b-collapse :id="'collapse-1-inner'+ item.transaction_id" class="mt-2">
                   <b-card>{{item}}</b-card>

frontend/src/views/Layout/AuthLayout_gdd.vue

@@ -18,22 +18,26 @@
             </div>
           </b-col>
           <b-col xl="6" class="col-xl-6">
-            <b-nav class="nav-footer justify-content-center justify-content-lg-end">
+            <b-nav class="nav-footer justify-content-center justify-content-xl-end">
               <b-nav-item ref="https://www.creative-tim.com" target="_blank">
                 Gradido
               </b-nav-item>
               <b-nav-item href="https://www.creative-tim.com/presentation" target="_blank">
-               Impressum
+               {{$t('imprint')}}
               </b-nav-item>
               <b-nav-item href="http://blog.creative-tim.com" target="_blank">
-                Datenschutzerklärung
+                {{$t('privacy_policy')}}
               </b-nav-item>
               <b-nav-item href="https://www.creative-tim.com/license" target="_blank">
-                License
+                 {{$t('license')}}
               </b-nav-item>
             </b-nav>
           </b-col>
         </b-row>
+         <b-row >
+            <b-col class="nav-link text-center"  @click.prevent="setLocale('en')">English</b-col>
+            <b-col class="nav-link text-center" @click.prevent="setLocale('de')">Deutsch</b-col>
+        </b-row>
       </b-container>
     </footer>
         </template>
@@ -69,6 +73,13 @@
       }
     },
     methods: {
+      setLocale(locale) {
+        this.$i18n.locale = locale
+        //this.$router.push({
+        //  params: { lang: locale }
+        //})
+        //this.hideDropdown()
+      },
       toggleNavbar() {
         document.body.classList.toggle('nav-open');
         this.showMenu = !this.showMenu;

frontend/src/views/Layout/ContentFooter.vue

@@ -12,17 +12,21 @@
             Gradido
           </b-nav-item>
           <b-nav-item href="https://gradido.net/" target="_blank">
-           Impressum
+           {{$t('imprint')}}
           </b-nav-item>
           <b-nav-item href="https://gradido.net/" target="_blank">
-            Datenschutzerklärung
+            {{$t('privacy_policy')}}
           </b-nav-item>
           <b-nav-item href="https://gradido.net/" target="_blank">
-            License
+            {{$t('license')}}
           </b-nav-item>
         </b-nav>
       </b-col>
     </b-row>
+   <b-row >
+            <b-col class="nav-link text-center"  @click.prevent="setLocale('en')">English</b-col>
+            <b-col class="nav-link text-center" @click.prevent="setLocale('de')">Deutsch</b-col>
+        </b-row>
   </footer>
 </template>
 <script>
@@ -31,7 +35,16 @@ export default {
     return {
       year: new Date().getFullYear()
     };
-  }
+  },
+  methods: {
+      setLocale(locale) {
+      this.$i18n.locale = locale
+      //this.$router.push({
+      //  params: { lang: locale }
+      //})
+      //this.hideDropdown()
+    }
+  },
 };
 </script>
 <style></style>

frontend/src/views/Layout/DashboardNavbar.vue

@@ -49,7 +49,7 @@
         <template>
 
           <b-dropdown-header class="noti-title">
-            <h6 class="text-overflow m-0"> {{ $t('site.welcome')  }}</h6>
+            <h6 class="text-overflow m-0"> {{ $t('welcome')  }}</h6>
           </b-dropdown-header>
            <b-dropdown-item href="#!" to="/KontoOverview">
             <i class="ni ni-single-02"></i>
@@ -74,7 +74,7 @@
           <div class="dropdown-divider"></div>
           <b-dropdown-item href="#!" @click="logout">
             <i class="ni ni-user-run"></i>
-            <span>{{ $t('site.logout') }}</span>
+            <span>{{ $t('logout') }}</span>
           </b-dropdown-item>
 
         </template>

frontend/src/views/Pages/Login.vue

@@ -7,7 +7,7 @@
           <b-row class="justify-content-center">
             <b-col xl="5" lg="6" md="8" class="px-5">
               <h1 class="text-white">Gradido Wallet</h1>
-              <p class="text-lead text-white">Du bist die Community</p>
+              <p class="text-lead text-white">{{ $t('site.login.community')}}</p>
             </b-col>
           </b-row>
         </div>
@@ -28,7 +28,7 @@
             <b-card-body class="px-lg-5 py-lg-5">
               
                 <div class="text-center text-muted mb-4">
-                <small>login</small>
+                <small>{{ $t('login')}}</small>
               </div>
                <validation-observer v-slot="{handleSubmit}" ref="formValidator">
                 <b-form role="form" @submit.prevent="handleSubmit(onSubmit)">
@@ -51,9 +51,9 @@
                               v-model="model.password">
                   </base-input>
 
-                  <b-form-checkbox v-model="model.rememberMe">Remember me</b-form-checkbox>
+                  <b-form-checkbox v-model="model.rememberMe">{{ $t('site.login.remember')}}</b-form-checkbox>
                   <div class="text-center">
-                    <base-button type="primary" native-type="submit" class="my-4">Sign in</base-button>
+                    <base-button type="primary" native-type="submit" class="my-4">{{ $t('site.login.signin')}}</base-button>
                   </div>
                 </b-form>
               </validation-observer>  
@@ -61,10 +61,10 @@
           </b-card>
           <b-row class="mt-3">
             <b-col cols="6">
-              <router-link to="/dashboard" class="text-light"><small>Forgot password?</small></router-link>
+              <router-link to="/dashboard" class="text-light"><small>{{ $t('site.login.forgot_pwd')}}</small></router-link>
             </b-col>
             <b-col cols="6" class="text-right">
-              <router-link to="/register" class="text-light"><small>Create new account</small></router-link>
+              <router-link to="/register" class="text-light"><small>{{ $t('site.login.new_wallet')}}</small></router-link>
             </b-col>
           </b-row>
         </b-col>

frontend/src/views/Pages/Register.vue

@@ -6,8 +6,8 @@
         <div class="header-body text-center mb-7">
           <b-row class="justify-content-center">
             <b-col xl="5" lg="6" md="8" class="px-5">
-              <h1 class="text-white">Erstelle deine Gradido Wallet</h1>
+              <h1 class="text-white">{{ $t('site.signup.title')}}</h1>
-              <p class="text-lead text-white">Werde teil der Community</p>
+              <p class="text-lead text-white">{{ $t('site.signup.subtitle')}}</p>
             </b-col>
           </b-row>
         </div>
@@ -28,14 +28,14 @@
              
             <b-card-body class="px-lg-5 py-lg-5">
               <div class="text-center text-muted mb-4">
-                <small>sign up </small>
+                <small>{{ $t('signup')}} </small>
               </div>
               <validation-observer v-slot="{handleSubmit}" ref="formValidator">
                 <b-form role="form" @submit.prevent="handleSubmit(onSubmit)">
                   <base-input alternative
                               class="mb-3"
                               prepend-icon="ni ni-hat-3"
-                              placeholder="Vorname"
+                              :placeholder="$t('form.firstname')"
                               name="Vorname"
                               :rules="{required: true}"
                               v-model="model.firstname">
@@ -43,7 +43,7 @@
                    <base-input alternative
                               class="mb-3"
                               prepend-icon="ni ni-hat-3"
-                              placeholder="Nachname"
+                              :placeholder="$t('form.lastname')"
                               name="Nachname"
                               :rules="{required: true}"
                               v-model="model.lastname">
@@ -52,7 +52,7 @@
                   <base-input alternative
                               class="mb-3"
                               prepend-icon="ni ni-email-83"
-                              placeholder="Email"
+                              :placeholder="$t('form.email')"
                               name="Email"
                               :rules="{required: true, email: true}"
                               v-model="model.email">
@@ -61,25 +61,25 @@
                   <base-input alternative
                               class="mb-3"
                               prepend-icon="ni ni-lock-circle-open"
-                              placeholder="password"
+                              :placeholder="$t('form.password')"
                               type="password"
                               name="Password"
                               :rules="{required: true, min: 6}"
                               v-model="model.password">
                   </base-input>
-                  <div class="text-muted font-italic"><small>password strength: <span
+                  <div class="text-muted font-italic"><small>{{ $t('site.signup.strength')}} <span
-                    class="text-success font-weight-700">strong</span></small></div>
+                    class="text-success font-weight-700">{{ $t('site.signup.strong')}}</span></small></div>
                   <b-row class=" my-4">
                     <b-col cols="12">
-                      <base-input :rules="{ required: { allowFalse: false } }" name=Privacy Policy>
+                      <base-input :rules="{ required: { allowFalse: false } }" name="Privacy Policy">
                         <b-form-checkbox v-model="model.agree">
-                          <span class="text-muted">I agree with the <a href="#!">Privacy Policy</a></span>
+                          <span class="text-muted"><a href="#!"> {{ $t('privacy_policy')}}</a> - {{ $t('site.signup.agree')}} </span>
                         </b-form-checkbox>
                       </base-input>
                     </b-col>
                   </b-row>
                   <div class="text-center">
-                    <b-button type="submit" variant="primary" class="mt-4">Create account</b-button>
+                    <b-button type="submit" variant="primary" class="mt-4">{{ $t('signup')}}</b-button>
                   </div>
                 </b-form>
               </validation-observer>
@@ -87,14 +87,9 @@
           </b-card>
         </b-col>
       </b-row>
-      <div class="text-center py-lg-5" >
+      <div class="text-center py-lg-4" >
-                    <b-button type="button" variant="success" class="mt-4" to="/Login">zurück</b-button>
+        <b-button type="button" variant="success" class="mt-3" to="/Login">zurück</b-button>
-                  </div>
+      </div>           
-
-                  <div>
-
- 
-</div>
     </b-container>
   </div>
 </template>
@@ -121,8 +116,7 @@
           this.model.firstname = ""
           this.model.lastname = ""
           this.model.password = ""
-          this.$router.push('/thx')
+          this.$router.push('/thx')          
-          
      }
     }
   };

login_server

@@ -1 +1 @@
-Subproject commit 66dcb3a68397662c15729d559d64b4781a5e2f40
+Subproject commit 9b9115290c8d2ead756d64b70ae63a6571aa4693