IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1227-Vergaenglichkeit-besser-darstellen

Browse Source
This commit is contained in:
Alexander Friedland 2022-01-19 15:50:05 +01:00 committed by GitHub
commit 6ae5305e67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/src/components/NavBar.vue
View File

@ -19,7 +19,7 @@
>
{{ $store.state.openCreations }} {{ $t('navbar.open_creation') }}
</b-nav-item>
<b-nav-item @click="wallet">{{ $t('navbar.wallet') }}</b-nav-item>
<b-nav-item @click="wallet">{{ $t('navbar.my-account') }}</b-nav-item>
<b-nav-item @click="logout">{{ $t('navbar.logout') }}</b-nav-item>
</b-navbar-nav>
</b-collapse>

4
admin/src/locales/de.json
View File

@ -25,10 +25,10 @@
"navbar": {
"logout": "Abmelden",
"multi_creation": "Mehrfachschöpfung",
"my-account": "Mein Konto",
"open_creation": "Offene Schöpfungen",
"overview": "Übersicht",
"user_search": "Nutzersuche",
"wallet": "Wallet"
"user_search": "Nutzersuche"
},
"not_open_creations": "Keine offenen Schöpfungen",
"open_creation": "Offene Schöpfung",

4
admin/src/locales/en.json
View File

@ -25,10 +25,10 @@
"navbar": {
"logout": "Logout",
"multi_creation": "Multiple creation",
"my-account": "My Account",
"open_creation": "Open creations",
"overview": "Overview",
"user_search": "User search",
"wallet": "Wallet"
"user_search": "User search"
},
"not_open_creations": "No open creations",
"open_creation": "Open creation",

1
frontend/src/locales/de.json
View File

@ -121,7 +121,6 @@
"overview": "Übersicht",
"privacy_policy": "Datenschutzerklärung",
"publisher": {
"infoNoRegister": "Dies ist für die Registrieung nicht nötig.",
"infoText": "Wenn dir dein Empfehlungsgeber seine Publisher-Id gegeben hat, trage sie hier ein, sonst lass das Feld bitte unverändert!",
"publisherId": "Publisher-Id"
},

1
frontend/src/locales/en.json
View File

@ -121,7 +121,6 @@
"overview": "Overview",
"privacy_policy": "Privacy policy",
"publisher": {
"infoNoRegister": "This is not necessary for registration.",
"infoText": "If your referrer has given you his publisher id, enter it here, otherwise leave the field unchanged!",
"publisherId": "PublisherID"
},

41
frontend/src/views/Pages/AccountOverview.vue
View File

@ -1,33 +1,19 @@
<template>
<div>
<div class="container-fluid">
<b-row>
<b-col class="col-6">
<b-row>
<b-col class="col-11 ml-2 p-3 bg-lightgrey">
<status
class="gdd-status-gdd"
:pending="pending"
:balance="balance"
status-text="GDD"
/>
</b-col>
</b-row>
<b-row class="ml-1 mr-1 mb-2">
<b-col class="col-6 p-3 g-border">
<status class="gdd-status-gdd" :pending="pending" :balance="balance" status-text="GDD" />
</b-col>
<b-col class="col-6 text-right bg-lightgrey">
<b-row>
<b-col class="p-3">
<status
class="gdd-status-gdt"
:pending="pending"
:balance="GdtBalance"
status-text="GDT"
/>
</b-col>
</b-row>
<b-col class="col-6 p-3 text-right g-border">
<status
class="gdd-status-gdt"
:pending="pending"
:balance="GdtBalance"
status-text="GDT"
/>
</b-col>
</b-row>
<br />
<gdd-transaction-list
:transactions="transactions"
:pageSize="5"
@ -75,3 +61,10 @@ export default {
},
}
</script>
<style>
.g-border {
border: #ffffff 2px;
border-style: inset;
border-radius: 5px;
}
</style>

1
frontend/src/views/Pages/Register.vue
View File

@ -145,7 +145,6 @@
class="text-center mt-1 shadow-lg p-3 mb-5 rounded"
>
{{ $t('publisher.infoText') }}
<span class="text-dark">{{ $t('publisher.infoNoRegister') }}</span>
<div class="text-center">
<b-icon icon="chevron-up" aria-hidden="true"></b-icon>
</div>