diff --git a/frontend/src/apis/communityAPI.js b/frontend/src/apis/communityAPI.js
index 9c8b502ff..54eb37df3 100644
--- a/frontend/src/apis/communityAPI.js
+++ b/frontend/src/apis/communityAPI.js
@@ -38,7 +38,7 @@ const communityAPI = {
transactions: async (session_id) => {
return apiGet(CONFIG.COMMUNITY_API_STATE_BALANCE_URL + 'ajaxListTransactions/' + session_id)
},
- create: async (session_id, email, amount, memo, target_date = new Date()) => {
+ /*create: async (session_id, email, amount, memo, target_date = new Date() ) => {
const payload = {
session_id,
email,
@@ -48,6 +48,16 @@ const communityAPI = {
auto_sign: true,
}
return apiPost(CONFIG.COMMUNITY_API_TRANSACTION_CREATION_URL + 'ajaxCreate/', payload)
+ },*/
+ send: async (session_id, email, amount, memo) => {
+ const payload = {
+ session_id,
+ email,
+ amount,
+ memo,
+ auto_sign: true,
+ }
+ return apiPost(CONFIG.COMMUNITY_API_TRANSACTION_SEND_COINS + 'ajaxCreate/', payload)
},
}
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 29a03bed5..334086c38 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -13,9 +13,8 @@ const server = {
LOGIN_API_URL: process.env.LOGIN_API_URL || 'http://localhost/login_api/',
COMMUNITY_API_STATE_BALANCE_URL:
process.env.COMMUNITY_API_STATE_BALANCE_URL || 'http://localhost/state-balances/',
- COMMUNITY_API_TRANSACTION_CREATION_URL:
- process.env.COMMUNITY_API_TRANSACTION_CREATION_URL || 'http://localhost/transaction-creations/',
- // TODO is this the right API call? what does it do?
+ // Schöpfung
+ // COMMUNITY_API_TRANSACTION_CREATION_URL: process.env.COMMUNITY_API_TRANSACTION_CREATION_URL || 'http://localhost/transaction-creations/',
COMMUNITY_API_TRANSACTION_SEND_COINS:
process.env.COMMUNITY_API_TRANSACTION_SEND_COINS || 'http://localhost/transaction-send-coins/',
}
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index fd6e6085a..d6337efae 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -6,7 +6,7 @@
"signup": "Registrieren",
"imprint":"Impressum",
"privacy_policy":"Datenschutzerklärung",
- "back":"zurück",
+ "back":"Zurück",
"sent":"Senden",
"transactions":"Transaktionen",
"language":"Language",
@@ -15,7 +15,7 @@
"en": "English"
},
"form": {
- "cancel":"abbrechen",
+ "cancel":"Abbrechen",
"firstname":"Vorname",
"lastname":"Nachname",
"email":"eMail",
@@ -29,7 +29,7 @@
"from":"von",
"to":"bis",
"at":"am",
- "send_now":"jetzt versenden"
+ "send_now":"Jetzt versenden"
},
"transaction":{
"show_part": "Die letzten {count} Transaktionen",
@@ -54,7 +54,7 @@
"password": {
"title": "Passwort zurücksetzen",
"subtitle": "Wenn du dein Passwort vergessen hast, kannst du es hier zurücksetzen.",
- "reset_now": "jetzt zurücksetzen"
+ "reset_now": "Jetzt zurücksetzen"
},
"thx": {
"title": "Danke!",
@@ -68,7 +68,7 @@
},
"navbar" : {
"my-profil":"Mein Profil",
- "settings":"Einstellung",
+ "settings":"Einstellungen",
"activity":"Aktivität",
"support":"Support"
},
@@ -80,19 +80,19 @@
},
"landing1" : {
"explore": "Erkunden Sie Gradido",
- "text": "Gesundes Geld für eine gesunde Welt - Das Gradido-Modell kann weltweiten Wohlstand und Frieden schaffen",
+ "text": "Gesundes Geld für eine gesunde Welt — Das Gradido-Modell kann weltweiten Wohlstand und Frieden schaffen",
"link": "Seiten erkunden"
},
"404" : {
"ooops" : "Ooops!",
"text" : "Seite nicht gefunden. Aber keine Sorge, wir haben noch viele andere Seiten zum Erkunden",
- "back" : "zurück zur Übersicht!"
+ "back" : "Zurück zur Übersicht!"
}
},
"admin": {
"site": {
"overview": {
- "created": "created",
+ "created": "Schöpfen",
"transience" : "Transience",
"exchanged": "Exchanged",
"members" : "Members"
@@ -102,4 +102,4 @@
"nav": {
"features": "Neuigkeiten"
}
-}
\ No newline at end of file
+}
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 21ece848a..0961a1fc1 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -6,9 +6,9 @@
"signup": "Sign up",
"imprint":"Legal notice",
"privacy_policy":"Privacy policy",
- "back":"back",
+ "back":"Back",
"sent":"Send",
- "transactions":"transactions",
+ "transactions":"Transactions",
"language":"Sprache",
"languages":{
"de": "Deutsch",
@@ -19,9 +19,9 @@
"firstname":"Firstname",
"lastname":"Lastname",
"email":"Email",
- "email_repeat":"repeat_email",
+ "email_repeat":"Repeat Email",
"password":"Password",
- "password_repeat":"repeat password",
+ "password_repeat":"Repeat password",
"amount":"Amount",
"memo":"Memo",
"message":"Message",
@@ -30,7 +30,7 @@
"to":"to",
"at":"at",
"time":"Time",
- "send_now":"send now"
+ "send_now":"Send now"
},
"transaction":{
"show_part": "The last {count} transactions",
@@ -48,18 +48,18 @@
"signup": {
"title": "Create your Gradido account",
"subtitle": "Become a part of the community!",
- "strength":"password strength:",
+ "strength":"Password strength:",
"strong":"strong",
- "agree":"I have read and understood and agree to them the"
+ "agree":"I have read and understood and agree to them"
},
"password": {
- "title": "reset password",
+ "title": "Reset password",
"subtitle": "If you have forgotten your password, you can reset it here.",
- "reset_now": "reset now"
+ "reset_now": "Reset now"
},
"thx": {
- "title": "Thank you",
- "subtitle": "We have sent you an eMail."
+ "title": "Thank you!",
+ "subtitle": "We have sent you an email."
},
"overview":{
"account_overview":"Account overview",
@@ -68,7 +68,7 @@
"add_work":"New Community Contribution"
},
"navbar" : {
- "my-profil":"My Profil",
+ "my-profil":"My profile",
"settings":"Settings",
"activity":"Activity",
"support":"Support"
@@ -76,16 +76,17 @@
"sidebar" : {
"community":"Community",
"members_area":"Members area",
- "membership":"Membership"
+ "membership":"Membership",
+ "language":"Languages"
},
"landing1" : {
"explore":"Explore Gradido",
- "text":"If you want to get inspiration or just show something directly to your clients, you can jump start your development with our pre-built example pages.",
+ "text":"Healthy money for a healthy world — the Gradido model can create global prosperity and peace",
"link":"Explore pages"
},
"404" : {
"ooops" : "Ooops!",
- "text" : "Page not found. Don't worry though, we have plenty of other pages to explore",
+ "text" : "Page not found. Do not worry though, we have plenty of other pages to explore",
"back" : "Back to dashboard!"
}
},
diff --git a/frontend/src/views/Layout/DashboardLayout.vue b/frontend/src/views/Layout/DashboardLayout.vue
index 5bd780f47..767f45e77 100755
--- a/frontend/src/views/Layout/DashboardLayout.vue
+++ b/frontend/src/views/Layout/DashboardLayout.vue
@@ -4,28 +4,20 @@
-
- {{ $t('sent') }}
-
+ {{ $t('sent') }}
- Transaktionen
+ {{ $t('transactions') }}
-
- {{ $t('site.navbar.my-profil') }}
-
+ {{ $t('site.navbar.my-profil') }}
-
- {{ $t('site.navbar.settings') }}
-
+ {{ $t('site.navbar.settings') }}
-
- {{ $t('site.navbar.activity') }}
-
+ {{ $t('site.navbar.activity') }}
@@ -43,7 +35,6 @@