diff --git a/community_server b/community_server index d7a8adc09..36ddbba58 160000 --- a/community_server +++ b/community_server @@ -1 +1 @@ -Subproject commit d7a8adc0943d418ea2ba25efb39210e96d292291 +Subproject commit 36ddbba5815435575b2d3c1270d738ccabc9eb54 diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue index 9ff6a6710..c2485a59e 100755 --- a/frontend/src/components/SidebarPlugin/SideBar.vue +++ b/frontend/src/components/SidebarPlugin/SideBar.vue @@ -33,28 +33,32 @@
-
Welcome!
+
{{ $t('welcome') }}
+ + + {{ $t('site.overview.account_overview')}} + - My profile + {{ $t('site.navbar.my-profil')}} - + - Settings + {{ $t('site.navbar.settings') }} - + - Activity + {{ $t('site.navbar.activity') }} - Support + {{ $t('site.navbar.support') }}
- + - Logout + {{ $t('logout') }} @@ -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) { diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 9aa90c698..d71afe7b5 100644 --- a/frontend/src/locales/de.json +++ b/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!", - "logout":"Logout", - "login":"Login", + "login": { + "community":"Du bist die Gemeinschaft", + "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", - "logout":"Logout" + "support":"Support" }, "sidebar" : { "community":"Gemeinschaft", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 484311492..caa7184ed 100644 --- a/frontend/src/locales/en.json +++ b/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!", - "logout":"Logout", - "login":"Login", + "login": { + "community":"You are the community", + "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", - "logout":"Logout" + "support":"Support" }, "sidebar" : { "community":"Community", diff --git a/frontend/src/views/KontoOverview/GddSent.vue b/frontend/src/views/KontoOverview/GddSent.vue index a90ceb563..a6b968375 100644 --- a/frontend/src/views/KontoOverview/GddSent.vue +++ b/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.amount) + console.log('arr mail',arr.email) + 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('JSON.parse(decodedString)',JSON.parse(promise) ) - const arr = JSON.parse(decodedString) + console.log('onDetect promise',promise) + //console.log('JSON.parse(decodedString)',JSON.parse(promise) ) + 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("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) - + //console.log("onSubmit", this.form) 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 diff --git a/frontend/src/views/KontoOverview/GddTable.vue b/frontend/src/views/KontoOverview/GddTable.vue index 82a7c0b22..7339ab1cc 100644 --- a/frontend/src/views/KontoOverview/GddTable.vue +++ b/frontend/src/views/KontoOverview/GddTable.vue @@ -12,7 +12,14 @@ -

{{item}}

+ + name{{item.name}} + type{{item.type}} + id{{item.transaction_id}} + date{{item.date}} + gdd{{item.balance}} + memo{{item.memo}} + \i/ more {{item}} diff --git a/frontend/src/views/Layout/AuthLayout_gdd.vue b/frontend/src/views/Layout/AuthLayout_gdd.vue index a58e2a791..b60d11af1 100644 --- a/frontend/src/views/Layout/AuthLayout_gdd.vue +++ b/frontend/src/views/Layout/AuthLayout_gdd.vue @@ -18,22 +18,26 @@ - + Gradido - Impressum + {{$t('imprint')}} - Datenschutzerklärung + {{$t('privacy_policy')}} - License + {{$t('license')}} + + English + Deutsch + @@ -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; diff --git a/frontend/src/views/Layout/ContentFooter.vue b/frontend/src/views/Layout/ContentFooter.vue index 2190a4a40..b354e12ef 100755 --- a/frontend/src/views/Layout/ContentFooter.vue +++ b/frontend/src/views/Layout/ContentFooter.vue @@ -12,17 +12,21 @@ Gradido - Impressum + {{$t('imprint')}} - Datenschutzerklärung + {{$t('privacy_policy')}} - License + {{$t('license')}} + + English + Deutsch + diff --git a/frontend/src/views/Layout/DashboardNavbar.vue b/frontend/src/views/Layout/DashboardNavbar.vue index 7daddd272..90d730cb2 100755 --- a/frontend/src/views/Layout/DashboardNavbar.vue +++ b/frontend/src/views/Layout/DashboardNavbar.vue @@ -49,7 +49,7 @@ diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue index 7edb033ec..b60343d26 100755 --- a/frontend/src/views/Pages/Login.vue +++ b/frontend/src/views/Pages/Login.vue @@ -7,7 +7,7 @@

Gradido Wallet

-

Du bist die Community

+

{{ $t('site.login.community')}}

 @@ -28,7 +28,7 @@
- login + {{ $t('login')}}
@@ -51,9 +51,9 @@ v-model="model.password"> - Remember me + {{ $t('site.login.remember')}}
- Sign in + {{ $t('site.login.signin')}}
@@ -61,10 +61,10 @@ - Forgot password? + {{ $t('site.login.forgot_pwd')}} - Create new account + {{ $t('site.login.new_wallet')}} diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 4ad05982c..e5dd7efb7 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -6,8 +6,8 @@
-

Erstelle deine Gradido Wallet

-

Werde teil der Community

+

{{ $t('site.signup.title')}}

+

{{ $t('site.signup.subtitle')}}
@@ -28,14 +28,14 @@
- sign up + {{ $t('signup')}}
@@ -43,7 +43,7 @@ @@ -52,7 +52,7 @@ @@ -61,25 +61,25 @@ -
password strength: strong
+
{{ $t('site.signup.strength')}} {{ $t('site.signup.strong')}}
- + - I agree with the Privacy Policy + {{ $t('privacy_policy')}} - {{ $t('site.signup.agree')}}
- Create account + {{ $t('signup')}}
@@ -87,14 +87,9 @@ -
- zurück -
- -
- - -
+
+ zurück +
@@ -121,8 +116,7 @@ this.model.firstname = "" this.model.lastname = "" this.model.password = "" - this.$router.push('/thx') - + this.$router.push('/thx') } } }; diff --git a/login_server b/login_server index 66dcb3a68..9b9115290 160000 --- a/login_server +++ b/login_server @@ -1 +1 @@ -Subproject commit 66dcb3a68397662c15729d559d64b4781a5e2f40 +Subproject commit 9b9115290c8d2ead756d64b70ae63a6571aa4693