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 @@