From 0f7200d46529322b07242f4a7b75a8cd0773c755 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 19 Mar 2021 15:50:08 +0100 Subject: [PATCH 1/5] sprache angepasst, for login, pwd, sigin --- frontend/package.json | 1 + frontend/src/App.vue | 3 + frontend/src/locales/de.json | 4 +- frontend/src/locales/en.json | 6 +- frontend/src/main.js | 2 +- frontend/src/plugins/dashboard-plugin.js | 4 + frontend/src/store/store.js | 22 ++- frontend/src/views/Layout/AuthLayout.vue | 3 - frontend/src/views/Layout/AuthLayout_gdd.vue | 46 ++---- frontend/src/views/Layout/ContentFooter.vue | 22 +-- frontend/src/views/Layout/DashboardLayout.vue | 8 +- frontend/src/views/Pages/Password.vue | 6 +- .../src/views/Pages/UserProfileActivity.vue | 58 +++++++- frontend/src/views/Starter/SampleFooter.vue | 37 ----- frontend/src/views/Starter/SampleLayout.vue | 77 ---------- frontend/src/views/Starter/SampleNavbar.vue | 137 ------------------ frontend/src/views/Starter/SamplePage.vue | 95 ------------ frontend/yarn.lock | 5 + 18 files changed, 125 insertions(+), 411 deletions(-) delete mode 100644 frontend/src/views/Starter/SampleFooter.vue delete mode 100755 frontend/src/views/Starter/SampleLayout.vue delete mode 100644 frontend/src/views/Starter/SampleNavbar.vue delete mode 100755 frontend/src/views/Starter/SamplePage.vue diff --git a/frontend/package.json b/frontend/package.json index 420d5ebce..078967bf1 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -41,6 +41,7 @@ "vue-clickaway": "^2.2.2", "vue-clipboard2": "^0.3.0", "vue-cookies": "^1.7.4", + "vue-country-flag": "^2.0.3", "vue-flatpickr-component": "^8.1.2", "vue-good-table": "^2.21.3", "vue-i18n": "^8.22.4", diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 925cb52f6..2756c5314 100755 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -19,11 +19,14 @@ export default { ParticlesBg }, created () { + console.log( "xx", $cookies.get("gdd_lang")) console.log('%cWillkommen bei Gradido %cgreen text', 'font-weight:bold', 'color: green') if ( $cookies.isKey("gdd_session_id") == true) { console.log('%cHey %c'+$cookies.get("gdd_u")+'', 'font-weight:bold', 'color: orange') this.$store.commit('session_id', $cookies.get("gdd_session_id")) this.$store.commit('email', $cookies.get("gdd_u")) + this.$store.commit('language', $cookies.get("gdd_lang")) + this.$i18n.locale = $cookies.get("gdd_lang") this.$router.push("overview") }else { console.log("app.vue to Logout") diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 4b3088866..efec06a10 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -1,13 +1,13 @@ { "message": "hallo gradido !!", "welcome":"Willkommen!", - "logout":"Logout", + "logout":"Abmelden", "login":"Login", "signup": "Registrieren", "imprint":"Impressum", "privacy_policy":"Datenschutzerklärung", - "license":"Lizenz", "back":"zurück", + "sent":"Senden", "transactions":"Transaktionen", "language":"Sprachen", "languages":{ diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index e5757458c..37b510d7e 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -4,10 +4,10 @@ "logout":"Logout", "login":"Login", "signup": "Sign up", - "imprint":"Imprint", + "imprint":"Legal notice", "privacy_policy":"Privacy policy", - "license":"License", "back":"back", + "sent":"Sent", "transactions":"transactions", "language":"Language", "languages":{ @@ -40,7 +40,7 @@ "site": { "login": { "community":"You are the community", - "remember":"Remember me", + "remember":"Remember password", "signin":"Sign in", "forgot_pwd":"Forgot password?", "new_wallet":"Create new wallet" diff --git a/frontend/src/main.js b/frontend/src/main.js index d98768a6e..78d03e58f 100755 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -14,7 +14,7 @@ import router from './routes/router'; Vue.use(DashboardPlugin); Vue.config.productionTip = false; Vue.use(VueCookies); - + /* eslint-disable no-new */ new Vue({ diff --git a/frontend/src/plugins/dashboard-plugin.js b/frontend/src/plugins/dashboard-plugin.js index a903cab74..67b161292 100755 --- a/frontend/src/plugins/dashboard-plugin.js +++ b/frontend/src/plugins/dashboard-plugin.js @@ -37,6 +37,9 @@ import 'vue-good-table/dist/vue-good-table.css'; import VueMoment from 'vue-moment'; +import CountryFlag from 'vue-country-flag' + + Object.keys(rules).forEach(rule => { extend(rule, { ...rules[rule], // copies rule configuration @@ -56,6 +59,7 @@ export default { Vue.use(VueQrcodeReader); Vue.use(VueQrcode); Vue.use(VueFlatPickr); + Vue.use(CountryFlag); configure({ classes: { valid: 'is-valid', diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js index c33fbb338..bf4b610bb 100644 --- a/frontend/src/store/store.js +++ b/frontend/src/store/store.js @@ -7,11 +7,13 @@ import communityAPI from '../apis/communityAPI' import axios from 'axios' //import CONFIG from '../config' - export const store = new Vuex.Store({ state: { session_id: null, email: null, + language: 'en', + sizeDE: 'normal', + sizeGB: 'big', user : { name:"", balance: 0, @@ -43,6 +45,19 @@ export const store = new Vuex.Store({ }, // Syncronous mutation of the state mutations: { + language: (state, language) => { + console.log('mutation: language', language) + state.language = language + $cookies.set('gdd_lang', language); + if (state.language == "de") { + state.sizeDE = 'big' + state.sizeGB = 'normal' + } else { + state.sizeDE = 'normal' + state.sizeGB = 'big' + } + + }, email: (state, email) => { //console.log('mutation: email') state.email = email @@ -77,12 +92,14 @@ export const store = new Vuex.Store({ // console.log('result.data.state',result.data.state) // console.log('result.data.session_id',result.data.session_id) - + if( result.success){ commit('session_id', result.result.data.session_id) commit('email', data.email) $cookies.set('gdd_session_id', result.result.data.session_id); $cookies.set('gdd_u', data.email); + + router.push('/overview') } else { // Register failed, we perform a logout @@ -128,6 +145,7 @@ export const store = new Vuex.Store({ commit('email', null) $cookies.remove('gdd_session_id'); $cookies.remove('gdd_u'); + $cookies.remove('gdd_lang'); router.push('/Login') }, ajaxCreate: async ({ dispatch, state }) => { diff --git a/frontend/src/views/Layout/AuthLayout.vue b/frontend/src/views/Layout/AuthLayout.vue index 089950afd..90b519392 100755 --- a/frontend/src/views/Layout/AuthLayout.vue +++ b/frontend/src/views/Layout/AuthLayout.vue @@ -61,9 +61,6 @@ Datenschutzerklärung - - License - diff --git a/frontend/src/views/Layout/AuthLayout_gdd.vue b/frontend/src/views/Layout/AuthLayout_gdd.vue index b53eb676f..4dee33b6e 100644 --- a/frontend/src/views/Layout/AuthLayout_gdd.vue +++ b/frontend/src/views/Layout/AuthLayout_gdd.vue @@ -2,47 +2,23 @@
diff --git a/frontend/src/views/Starter/SampleFooter.vue b/frontend/src/views/Starter/SampleFooter.vue deleted file mode 100644 index 7786a507c..000000000 --- a/frontend/src/views/Starter/SampleFooter.vue +++ /dev/null @@ -1,37 +0,0 @@ - - - diff --git a/frontend/src/views/Starter/SampleLayout.vue b/frontend/src/views/Starter/SampleLayout.vue deleted file mode 100755 index 5b3d69f21..000000000 --- a/frontend/src/views/Starter/SampleLayout.vue +++ /dev/null @@ -1,77 +0,0 @@ - - diff --git a/frontend/src/views/Starter/SampleNavbar.vue b/frontend/src/views/Starter/SampleNavbar.vue deleted file mode 100644 index 859f4464b..000000000 --- a/frontend/src/views/Starter/SampleNavbar.vue +++ /dev/null @@ -1,137 +0,0 @@ - - - diff --git a/frontend/src/views/Starter/SamplePage.vue b/frontend/src/views/Starter/SamplePage.vue deleted file mode 100755 index e0dee359f..000000000 --- a/frontend/src/views/Starter/SamplePage.vue +++ /dev/null @@ -1,95 +0,0 @@ - - - diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 06586d16a..aecec84d1 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -9626,6 +9626,11 @@ vue-cookies@^1.7.4: resolved "https://registry.yarnpkg.com/vue-cookies/-/vue-cookies-1.7.4.tgz#d241d0a0431da0795837651d10b4d73e7c8d3e8d" integrity sha512-mOS5Btr8V9zvAtkmQ7/TfqJIropOx7etDAgBywPCmHjvfJl2gFbH2XgoMghleLoyyMTi5eaJss0mPN7arMoslA== +vue-country-flag@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/vue-country-flag/-/vue-country-flag-2.0.3.tgz#f644d8f5150a97f473f0c13e04622c6ede37d1de" + integrity sha512-QZM3hNNhnGU+G1qnpq1BiICE4Zh91UA++/UpM0go8XbxkVxTiPy4asWY07vL/3PtW8M69YqWVbhwG13rzvNwkA== + vue-eslint-parser@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1" From c831fdca6a96327ce920afd50d1f9e24bdd02880 Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 22 Mar 2021 16:06:10 +0100 Subject: [PATCH 2/5] clear for deploy phase 1 WIP --- frontend/src/routes/routes.js | 7 ++- frontend/src/views/KontoOverview/GddSent.vue | 53 +++++++++++++------ .../src/views/KontoOverview/GddStatus.vue | 11 ++-- frontend/src/views/Layout/ContentFooter.vue | 5 +- frontend/src/views/Pages/Explorer.vue | 28 ++++++++++ 5 files changed, 79 insertions(+), 25 deletions(-) create mode 100644 frontend/src/views/Pages/Explorer.vue diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js index 4acb71d90..256758d3a 100755 --- a/frontend/src/routes/routes.js +++ b/frontend/src/routes/routes.js @@ -26,6 +26,11 @@ const routes = [ { path: '/password', component: () => import('../views/Pages/Password.vue') + }, + { + path: '/explorer', + name: 'Explorer', + component: () => import('../views/Pages/Explorer.vue'), } ] }, @@ -68,7 +73,7 @@ const routes = [ meta: { requiresAuth: true } - } + } ] } ]; diff --git a/frontend/src/views/KontoOverview/GddSent.vue b/frontend/src/views/KontoOverview/GddSent.vue index b0a153b3b..2d2a858c7 100644 --- a/frontend/src/views/KontoOverview/GddSent.vue +++ b/frontend/src/views/KontoOverview/GddSent.vue @@ -6,6 +6,9 @@ {{ $t('site.overview.send_gradido') }} + + Achtung! Bitte überprüfe alle deine Eingaben sehr genau. Du bist alleine Verantwortlich für deine Entscheidungen. Versendete Gradidos können nicht wieder zurück geholt werden. +
@@ -28,6 +31,10 @@
+ + Empfänger + + - - + +
+ + Betrag + + + maximale anzahl GDD zum versenden erreicht! + - - +
GDD
 - - -
GDD
- + {{$store.state.user.balance}} + - + + + Nachricht für den Empfänger (optional) + + - - + + - +
+ {{$refs.observer}}
+ + + + {{$t('form.send_now')}} {{$t('form.cancel')}}
@@ -110,17 +129,21 @@ export default { }, data(){ return { - scan: false, + scan: false, show: true, form: { img: '', email: '', amount: '', memo:'' - } + }, + sent: false, } }, methods: { + sendbutton(){ + this.sent = true + }, async onDecode (decodedString) { console.log('onDecode JSON.parse(decodedString)',JSON.parse(decodedString) ) const arr = JSON.parse(decodedString) diff --git a/frontend/src/views/KontoOverview/GddStatus.vue b/frontend/src/views/KontoOverview/GddStatus.vue index 048e40a78..13d60fd13 100644 --- a/frontend/src/views/KontoOverview/GddStatus.vue +++ b/frontend/src/views/KontoOverview/GddStatus.vue @@ -4,7 +4,8 @@ + class="mb-4" + style="font-size: -webkit-xxx-large"> {{ $n($store.state.user.balance) }} GDD @@ -22,12 +23,6 @@ \ No newline at end of file diff --git a/frontend/src/views/Layout/ContentFooter.vue b/frontend/src/views/Layout/ContentFooter.vue index d7c9d3e77..fb913523e 100755 --- a/frontend/src/views/Layout/ContentFooter.vue +++ b/frontend/src/views/Layout/ContentFooter.vue @@ -3,7 +3,7 @@
- © {{year}} Gradido Wallet + © {{year}} Gradido Wallet
@@ -17,6 +17,9 @@ {{$t('privacy_policy')}} + + GDD-Explorer + diff --git a/frontend/src/views/Pages/Explorer.vue b/frontend/src/views/Pages/Explorer.vue new file mode 100644 index 000000000..edd6dbcc0 --- /dev/null +++ b/frontend/src/views/Pages/Explorer.vue @@ -0,0 +1,28 @@ + From 7a20a5d2078edd6b78106f63924db95868a504f5 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 19 Mar 2021 15:50:08 +0100 Subject: [PATCH 3/5] sprache angepasst, for login, pwd, sigin --- frontend/package.json | 1 + frontend/src/App.vue | 3 + frontend/src/locales/de.json | 4 +- frontend/src/locales/en.json | 6 +- frontend/src/main.js | 2 +- frontend/src/plugins/dashboard-plugin.js | 4 + frontend/src/store/store.js | 22 ++- frontend/src/views/Layout/AuthLayout.vue | 3 - frontend/src/views/Layout/AuthLayout_gdd.vue | 46 ++---- frontend/src/views/Layout/ContentFooter.vue | 22 +-- frontend/src/views/Layout/DashboardLayout.vue | 8 +- frontend/src/views/Pages/Password.vue | 6 +- .../src/views/Pages/UserProfileActivity.vue | 58 +++++++- frontend/src/views/Starter/SampleFooter.vue | 37 ----- frontend/src/views/Starter/SampleLayout.vue | 77 ---------- frontend/src/views/Starter/SampleNavbar.vue | 137 ------------------ frontend/src/views/Starter/SamplePage.vue | 95 ------------ frontend/yarn.lock | 5 + 18 files changed, 125 insertions(+), 411 deletions(-) delete mode 100644 frontend/src/views/Starter/SampleFooter.vue delete mode 100755 frontend/src/views/Starter/SampleLayout.vue delete mode 100644 frontend/src/views/Starter/SampleNavbar.vue delete mode 100755 frontend/src/views/Starter/SamplePage.vue diff --git a/frontend/package.json b/frontend/package.json index 5100e736a..95dcda5ec 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -41,6 +41,7 @@ "vue-clickaway": "^2.2.2", "vue-clipboard2": "^0.3.0", "vue-cookies": "^1.7.4", + "vue-country-flag": "^2.0.3", "vue-flatpickr-component": "^8.1.2", "vue-good-table": "^2.21.3", "vue-i18n": "^8.22.4", diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 925cb52f6..2756c5314 100755 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -19,11 +19,14 @@ export default { ParticlesBg }, created () { + console.log( "xx", $cookies.get("gdd_lang")) console.log('%cWillkommen bei Gradido %cgreen text', 'font-weight:bold', 'color: green') if ( $cookies.isKey("gdd_session_id") == true) { console.log('%cHey %c'+$cookies.get("gdd_u")+'', 'font-weight:bold', 'color: orange') this.$store.commit('session_id', $cookies.get("gdd_session_id")) this.$store.commit('email', $cookies.get("gdd_u")) + this.$store.commit('language', $cookies.get("gdd_lang")) + this.$i18n.locale = $cookies.get("gdd_lang") this.$router.push("overview") }else { console.log("app.vue to Logout") diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 4b3088866..efec06a10 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -1,13 +1,13 @@ { "message": "hallo gradido !!", "welcome":"Willkommen!", - "logout":"Logout", + "logout":"Abmelden", "login":"Login", "signup": "Registrieren", "imprint":"Impressum", "privacy_policy":"Datenschutzerklärung", - "license":"Lizenz", "back":"zurück", + "sent":"Senden", "transactions":"Transaktionen", "language":"Sprachen", "languages":{ diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index e5757458c..37b510d7e 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -4,10 +4,10 @@ "logout":"Logout", "login":"Login", "signup": "Sign up", - "imprint":"Imprint", + "imprint":"Legal notice", "privacy_policy":"Privacy policy", - "license":"License", "back":"back", + "sent":"Sent", "transactions":"transactions", "language":"Language", "languages":{ @@ -40,7 +40,7 @@ "site": { "login": { "community":"You are the community", - "remember":"Remember me", + "remember":"Remember password", "signin":"Sign in", "forgot_pwd":"Forgot password?", "new_wallet":"Create new wallet" diff --git a/frontend/src/main.js b/frontend/src/main.js index d98768a6e..78d03e58f 100755 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -14,7 +14,7 @@ import router from './routes/router'; Vue.use(DashboardPlugin); Vue.config.productionTip = false; Vue.use(VueCookies); - + /* eslint-disable no-new */ new Vue({ diff --git a/frontend/src/plugins/dashboard-plugin.js b/frontend/src/plugins/dashboard-plugin.js index a903cab74..67b161292 100755 --- a/frontend/src/plugins/dashboard-plugin.js +++ b/frontend/src/plugins/dashboard-plugin.js @@ -37,6 +37,9 @@ import 'vue-good-table/dist/vue-good-table.css'; import VueMoment from 'vue-moment'; +import CountryFlag from 'vue-country-flag' + + Object.keys(rules).forEach(rule => { extend(rule, { ...rules[rule], // copies rule configuration @@ -56,6 +59,7 @@ export default { Vue.use(VueQrcodeReader); Vue.use(VueQrcode); Vue.use(VueFlatPickr); + Vue.use(CountryFlag); configure({ classes: { valid: 'is-valid', diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js index c33fbb338..bf4b610bb 100644 --- a/frontend/src/store/store.js +++ b/frontend/src/store/store.js @@ -7,11 +7,13 @@ import communityAPI from '../apis/communityAPI' import axios from 'axios' //import CONFIG from '../config' - export const store = new Vuex.Store({ state: { session_id: null, email: null, + language: 'en', + sizeDE: 'normal', + sizeGB: 'big', user : { name:"", balance: 0, @@ -43,6 +45,19 @@ export const store = new Vuex.Store({ }, // Syncronous mutation of the state mutations: { + language: (state, language) => { + console.log('mutation: language', language) + state.language = language + $cookies.set('gdd_lang', language); + if (state.language == "de") { + state.sizeDE = 'big' + state.sizeGB = 'normal' + } else { + state.sizeDE = 'normal' + state.sizeGB = 'big' + } + + }, email: (state, email) => { //console.log('mutation: email') state.email = email @@ -77,12 +92,14 @@ export const store = new Vuex.Store({ // console.log('result.data.state',result.data.state) // console.log('result.data.session_id',result.data.session_id) - + if( result.success){ commit('session_id', result.result.data.session_id) commit('email', data.email) $cookies.set('gdd_session_id', result.result.data.session_id); $cookies.set('gdd_u', data.email); + + router.push('/overview') } else { // Register failed, we perform a logout @@ -128,6 +145,7 @@ export const store = new Vuex.Store({ commit('email', null) $cookies.remove('gdd_session_id'); $cookies.remove('gdd_u'); + $cookies.remove('gdd_lang'); router.push('/Login') }, ajaxCreate: async ({ dispatch, state }) => { diff --git a/frontend/src/views/Layout/AuthLayout.vue b/frontend/src/views/Layout/AuthLayout.vue index 089950afd..90b519392 100755 --- a/frontend/src/views/Layout/AuthLayout.vue +++ b/frontend/src/views/Layout/AuthLayout.vue @@ -61,9 +61,6 @@ Datenschutzerklärung - - License - diff --git a/frontend/src/views/Layout/AuthLayout_gdd.vue b/frontend/src/views/Layout/AuthLayout_gdd.vue index b53eb676f..4dee33b6e 100644 --- a/frontend/src/views/Layout/AuthLayout_gdd.vue +++ b/frontend/src/views/Layout/AuthLayout_gdd.vue @@ -2,47 +2,23 @@
diff --git a/frontend/src/views/Starter/SampleFooter.vue b/frontend/src/views/Starter/SampleFooter.vue deleted file mode 100644 index 7786a507c..000000000 --- a/frontend/src/views/Starter/SampleFooter.vue +++ /dev/null @@ -1,37 +0,0 @@ - - - diff --git a/frontend/src/views/Starter/SampleLayout.vue b/frontend/src/views/Starter/SampleLayout.vue deleted file mode 100755 index 5b3d69f21..000000000 --- a/frontend/src/views/Starter/SampleLayout.vue +++ /dev/null @@ -1,77 +0,0 @@ - - diff --git a/frontend/src/views/Starter/SampleNavbar.vue b/frontend/src/views/Starter/SampleNavbar.vue deleted file mode 100644 index 859f4464b..000000000 --- a/frontend/src/views/Starter/SampleNavbar.vue +++ /dev/null @@ -1,137 +0,0 @@ - - - diff --git a/frontend/src/views/Starter/SamplePage.vue b/frontend/src/views/Starter/SamplePage.vue deleted file mode 100755 index e0dee359f..000000000 --- a/frontend/src/views/Starter/SamplePage.vue +++ /dev/null @@ -1,95 +0,0 @@ - - - diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 06586d16a..aecec84d1 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -9626,6 +9626,11 @@ vue-cookies@^1.7.4: resolved "https://registry.yarnpkg.com/vue-cookies/-/vue-cookies-1.7.4.tgz#d241d0a0431da0795837651d10b4d73e7c8d3e8d" integrity sha512-mOS5Btr8V9zvAtkmQ7/TfqJIropOx7etDAgBywPCmHjvfJl2gFbH2XgoMghleLoyyMTi5eaJss0mPN7arMoslA== +vue-country-flag@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/vue-country-flag/-/vue-country-flag-2.0.3.tgz#f644d8f5150a97f473f0c13e04622c6ede37d1de" + integrity sha512-QZM3hNNhnGU+G1qnpq1BiICE4Zh91UA++/UpM0go8XbxkVxTiPy4asWY07vL/3PtW8M69YqWVbhwG13rzvNwkA== + vue-eslint-parser@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1" From 48b5b02946ae4f77e98bed3d75853f7a773f246b Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 22 Mar 2021 16:06:10 +0100 Subject: [PATCH 4/5] clear for deploy phase 1 WIP --- frontend/src/routes/routes.js | 7 ++- frontend/src/views/KontoOverview/GddSent.vue | 53 +++++++++++++------ .../src/views/KontoOverview/GddStatus.vue | 11 ++-- frontend/src/views/Layout/ContentFooter.vue | 5 +- frontend/src/views/Pages/Explorer.vue | 28 ++++++++++ 5 files changed, 79 insertions(+), 25 deletions(-) create mode 100644 frontend/src/views/Pages/Explorer.vue diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js index 4acb71d90..256758d3a 100755 --- a/frontend/src/routes/routes.js +++ b/frontend/src/routes/routes.js @@ -26,6 +26,11 @@ const routes = [ { path: '/password', component: () => import('../views/Pages/Password.vue') + }, + { + path: '/explorer', + name: 'Explorer', + component: () => import('../views/Pages/Explorer.vue'), } ] }, @@ -68,7 +73,7 @@ const routes = [ meta: { requiresAuth: true } - } + } ] } ]; diff --git a/frontend/src/views/KontoOverview/GddSent.vue b/frontend/src/views/KontoOverview/GddSent.vue index b0a153b3b..2d2a858c7 100644 --- a/frontend/src/views/KontoOverview/GddSent.vue +++ b/frontend/src/views/KontoOverview/GddSent.vue @@ -6,6 +6,9 @@ {{ $t('site.overview.send_gradido') }} + + Achtung! Bitte überprüfe alle deine Eingaben sehr genau. Du bist alleine Verantwortlich für deine Entscheidungen. Versendete Gradidos können nicht wieder zurück geholt werden. +
@@ -28,6 +31,10 @@
+ + Empfänger + + - - + +
+ + Betrag + + + maximale anzahl GDD zum versenden erreicht! + - - +
GDD
 - - -
GDD
- + {{$store.state.user.balance}} + - + + + Nachricht für den Empfänger (optional) + + - - + + - +
+ {{$refs.observer}}
+ + + + {{$t('form.send_now')}} {{$t('form.cancel')}}
@@ -110,17 +129,21 @@ export default { }, data(){ return { - scan: false, + scan: false, show: true, form: { img: '', email: '', amount: '', memo:'' - } + }, + sent: false, } }, methods: { + sendbutton(){ + this.sent = true + }, async onDecode (decodedString) { console.log('onDecode JSON.parse(decodedString)',JSON.parse(decodedString) ) const arr = JSON.parse(decodedString) diff --git a/frontend/src/views/KontoOverview/GddStatus.vue b/frontend/src/views/KontoOverview/GddStatus.vue index 048e40a78..13d60fd13 100644 --- a/frontend/src/views/KontoOverview/GddStatus.vue +++ b/frontend/src/views/KontoOverview/GddStatus.vue @@ -4,7 +4,8 @@ + class="mb-4" + style="font-size: -webkit-xxx-large"> {{ $n($store.state.user.balance) }} GDD @@ -22,12 +23,6 @@ \ No newline at end of file diff --git a/frontend/src/views/Layout/ContentFooter.vue b/frontend/src/views/Layout/ContentFooter.vue index d7c9d3e77..fb913523e 100755 --- a/frontend/src/views/Layout/ContentFooter.vue +++ b/frontend/src/views/Layout/ContentFooter.vue @@ -3,7 +3,7 @@
- © {{year}} Gradido Wallet + © {{year}} Gradido Wallet
@@ -17,6 +17,9 @@ {{$t('privacy_policy')}} + + GDD-Explorer + diff --git a/frontend/src/views/Pages/Explorer.vue b/frontend/src/views/Pages/Explorer.vue new file mode 100644 index 000000000..edd6dbcc0 --- /dev/null +++ b/frontend/src/views/Pages/Explorer.vue @@ -0,0 +1,28 @@ + From 43a011ab2841353288b829ac10eaf0279b86cce0 Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 22 Mar 2021 19:47:37 +0100 Subject: [PATCH 5/5] sprachen angepasst --- frontend/src/locales/de.json | 2 +- frontend/src/locales/en.json | 2 +- frontend/src/views/Pages/Login.vue | 2 +- frontend/src/views/Pages/Register.vue | 1 + frontend/src/views/Pages/UserProfileActivity.vue | 3 +-- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index efec06a10..ce500351d 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -38,7 +38,7 @@ }, "site": { "login": { - "community":"Du bist die Gemeinschaft", + "community":"Tausend Dank, weil du bei uns bist!", "remember":"Passwort merken", "signin":"Anmelden", "forgot_pwd":"Passwort vergessen?", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 37b510d7e..4fb4c14d9 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -39,7 +39,7 @@ }, "site": { "login": { - "community":"You are the community", + "community":"A thousand thanks for being with us!", "remember":"Remember password", "signin":"Sign in", "forgot_pwd":"Forgot password?", diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue index 71c1616f6..e8515debc 100755 --- a/frontend/src/views/Pages/Login.vue +++ b/frontend/src/views/Pages/Login.vue @@ -6,7 +6,7 @@
-

Gradido Wallet

+

Gradido

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

 diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index d6592addd..a286ecf05 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -99,6 +99,7 @@ lastname: '', email: '', password: '', + password2: '', agree: false } } diff --git a/frontend/src/views/Pages/UserProfileActivity.vue b/frontend/src/views/Pages/UserProfileActivity.vue index 830444daf..4c38860da 100644 --- a/frontend/src/views/Pages/UserProfileActivity.vue +++ b/frontend/src/views/Pages/UserProfileActivity.vue @@ -65,8 +65,7 @@ GddTable, GddWorkTable, LineChart, - BarChart, - + BarChart }, data(){ return {