This commit is contained in:
ogerly 2022-11-26 10:37:08 +01:00
parent 9be6927603
commit 4551e4b561
27 changed files with 167 additions and 110 deletions

View File

@ -0,0 +1,16 @@
[
{
"id": "0",
"date": "22. Februar 2023",
"text": "Gradido schenkt dir Dankbarkeit im Februar",
"url": "",
"extra": "Gradido ebenet Wege zu sozialem Frieden"
},
{
"id": "1",
"date": "22. Dezember 2022",
"text": "Gradido schenkt dir Dankbarkeit im Dezember",
"url": "",
"extra": "Gradido ebenet Wege zu sozialem Frieden"
}
]

View File

@ -5,10 +5,6 @@ body {
transition: background-color 0.5s ease, color 0.5s ease; transition: background-color 0.5s ease, color 0.5s ease;
} }
.HIDE_FOR_WORK_IN_PROCESS {
display: none;
}
.pointer { .pointer {
cursor: pointer; cursor: pointer;
} }

View File

@ -9,17 +9,20 @@
<b-col> <b-col>
<div v-if="firstName" class="mr-3">{{ firstName }} {{ lastName }}</div> <div v-if="firstName" class="mr-3">{{ firstName }} {{ lastName }}</div>
<div class="small"> <div class="small">
contributionDate {{ $d(new Date(contributionDate), 'monthAndYear') }} {{ $d(new Date(contributionDate), 'monthAndYear') }}
</div> </div>
<div class="mt-3 h5">Beitragstext</div> <div class="mt-3 h5">{{ $t('contributionText') }}</div>
<div>{{ memo }}</div> <div>{{ memo }}</div>
<div v-if="state === 'IN_PROGRESS'" class="text-danger">
{{ $t('contribution.alert.answerQuestion') }}
</div>
<!-- <div class="small"> <!-- <div class="small">
contributionDate {{ $d(new Date(contributionDate), 'monthAndYear') }} contributionDate {{ $d(new Date(contributionDate), 'monthAndYear') }}
</div> </div>
<div class="small">createdAt {{ createdAt }}</div> --> <div class="small">createdAt {{ createdAt }}</div> -->
</b-col> </b-col>
<b-col cols="3"> <b-col cols="3">
<div class="small">Schöpfung</div> <div class="small">{{ $t('creation') }}</div>
<div class="small">{{ amount | GDD }}</div> <div class="small">{{ amount | GDD }}</div>
</b-col> </b-col>
<b-col cols="1" @click="visible = !visible"> <b-col cols="1" @click="visible = !visible">
@ -34,7 +37,7 @@
@click="deleteContribution({ id })" @click="deleteContribution({ id })"
> >
<b-icon icon="trash"></b-icon> <b-icon icon="trash"></b-icon>
löschen {{ $t('delete') }}
</div> </div>
</b-col> </b-col>
<b-col> <b-col>
@ -51,14 +54,14 @@
" "
> >
<b-icon icon="pencil"></b-icon> <b-icon icon="pencil"></b-icon>
bearbeiten {{ $t('edit') }}
</div> </div>
</b-col> </b-col>
<b-col> <b-col>
<div v-if="messagesCount > 0" class="pointer"> <div v-if="messagesCount > 0" class="pointer">
<b-icon icon="chat-dots" @click="visible = !visible"></b-icon> <b-icon icon="chat-dots" @click="visible = !visible"></b-icon>
Moderatorchat {{ $t('moderatorChat') }}
</div> </div>
</b-col> </b-col>
</b-row> </b-row>

View File

@ -102,10 +102,10 @@
</b-row> </b-row>
</b-col> </b-col>
<b-col> <b-col>
<div class="h3">Versandart</div> <div class="h3">{{ $t('sendMethod') }}</div>
<b-form-radio-group v-model="radioSelected"> <b-form-radio-group v-model="radioSelected">
<b-row> <b-row>
<b-col cols="9">Gdd versenden</b-col> <b-col cols="9">{{ $t('send_gdd') }}</b-col>
<b-col cols="3"> <b-col cols="3">
<b-form-radio <b-form-radio
name="shipping" name="shipping"
@ -116,7 +116,7 @@
</b-col> </b-col>
</b-row> </b-row>
<b-row> <b-row>
<b-col cols="9">Gdd versenden per Link</b-col> <b-col cols="9">{{ $t('send_per_link') }}</b-col>
<b-col cols="3"> <b-col cols="3">
<b-form-radio <b-form-radio
name="shipping" name="shipping"

View File

@ -1,6 +1,6 @@
<template> <template>
<div role="group" class="first-name"> <div role="group" class="first-name">
<label for="input-firstName">Vorname:</label> <label for="input-firstName">{{ $t('form.firstname') }}</label>
<b-form-input <b-form-input
id="input-firstName" id="input-firstName"
v-model="firstName" v-model="firstName"
@ -11,12 +11,12 @@
></b-form-input> ></b-form-input>
<!-- This will only be shown if the preceding input has an invalid state --> <!-- This will only be shown if the preceding input has an invalid state -->
<b-form-invalid-feedback id="input-live-feedback"> <!-- <b-form-invalid-feedback id="input-live-feedback">
Enter at least 3 letters Enter at least 3 letters
</b-form-invalid-feedback> </b-form-invalid-feedback> -->
<!-- This is a form text block (formerly known as help block) --> <!-- This is a form text block (formerly known as help block) -->
<b-form-text id="input-live-help">Dein Vorname</b-form-text> <!-- <b-form-text id="input-live-help">Dein Vorname</b-form-text> -->
</div> </div>
</template> </template>

View File

@ -1,6 +1,6 @@
<template> <template>
<div role="group" class="input-job"> <div role="group" class="input-job">
<label for="input-lastName">Job:</label> <label for="input-lastName"></label>
<b-form-input <b-form-input
id="input-job" id="input-job"
v-model="job" v-model="job"
@ -11,12 +11,12 @@
></b-form-input> ></b-form-input>
<!-- This will only be shown if the preceding input has an invalid state --> <!-- This will only be shown if the preceding input has an invalid state -->
<b-form-invalid-feedback id="input-live-feedback"> <!-- <b-form-invalid-feedback id="input-live-feedback">
Enter at least 3 letters Enter at least 3 letters
</b-form-invalid-feedback> </b-form-invalid-feedback> -->
<!-- This is a form text block (formerly known as help block) --> <!-- This is a form text block (formerly known as help block) -->
<b-form-text id="input-live-help">Was ist dein Beruf</b-form-text> <!-- <b-form-text id="input-live-help">Was ist dein Beruf</b-form-text> -->
</div> </div>
</template> </template>

View File

@ -1,6 +1,6 @@
<template> <template>
<div role="group" class="last-name"> <div role="group" class="last-name">
<label for="input-lastName">Nachname:</label> <label for="input-lastName">{{ $t('form.lastname') }}</label>
<b-form-input <b-form-input
id="input-lastName" id="input-lastName"
v-model="lastName" v-model="lastName"
@ -11,12 +11,12 @@
></b-form-input> ></b-form-input>
<!-- This will only be shown if the preceding input has an invalid state --> <!-- This will only be shown if the preceding input has an invalid state -->
<b-form-invalid-feedback id="input-live-feedback"> <!-- <b-form-invalid-feedback id="input-live-feedback">
Enter at least 3 letters Enter at least 3 letters
</b-form-invalid-feedback> </b-form-invalid-feedback> -->
<!-- This is a form text block (formerly known as help block) --> <!-- This is a form text block (formerly known as help block) -->
<b-form-text id="input-live-help">Dein Nachname</b-form-text> <!-- <b-form-text id="input-live-help">Dein Nachname</b-form-text> -->
</div> </div>
</template> </template>

View File

@ -8,14 +8,14 @@
<b-icon icon="house" aria-hidden="true"></b-icon> <b-icon icon="house" aria-hidden="true"></b-icon>
<span class="d-none d-lg-inline ml-2">{{ $t('navigation.overview') }}</span> <span class="d-none d-lg-inline ml-2">{{ $t('navigation.overview') }}</span>
</b-nav-item> </b-nav-item>
<b-nav-item to="/storys" class="mb-3 HIDE_FOR_WORK_IN_PROCESS"> <!-- <b-nav-item to="/storys" class="mb-3">
<b-icon icon="card-heading" aria-hidden="true"></b-icon> <b-icon icon="card-heading" aria-hidden="true"></b-icon>
<span class="d-none d-lg-inline ml-2">{{ $t('navigation.topStories') }}</span> <span class="d-none d-lg-inline ml-2">{{ $t('navigation.topStories') }}</span>
</b-nav-item> </b-nav-item> -->
<b-nav-item to="/addresses" class="mb-3 HIDE_FOR_WORK_IN_PROCESS"> <!-- <b-nav-item to="/addresses" class="mb-3">
<b-icon icon="bookmark" aria-hidden="true"></b-icon> <b-icon icon="bookmark" aria-hidden="true"></b-icon>
<span class="d-none d-lg-inline ml-2">{{ $t('navigation.adresses') }}</span> <span class="d-none d-lg-inline ml-2">{{ $t('navigation.adresses') }}</span>
</b-nav-item> </b-nav-item> -->
<b-nav-item to="/send" class="mb-3"> <b-nav-item to="/send" class="mb-3">
<b-icon icon="arrow-left-right" aria-hidden="true"></b-icon> <b-icon icon="arrow-left-right" aria-hidden="true"></b-icon>
@ -25,10 +25,10 @@
<b-icon icon="layout-text-sidebar-reverse" aria-hidden="true"></b-icon> <b-icon icon="layout-text-sidebar-reverse" aria-hidden="true"></b-icon>
<span class="d-none d-lg-inline ml-2">{{ $t('navigation.transactions') }}</span> <span class="d-none d-lg-inline ml-2">{{ $t('navigation.transactions') }}</span>
</b-nav-item> </b-nav-item>
<b-nav-item to="/profile" class="mb-3 HIDE_FOR_WORK_IN_PROCESS"> <!-- <b-nav-item to="/profile" class="mb-3 HIDE_FOR_WORK_IN_PROCESS">
<b-icon icon="person" aria-hidden="true"></b-icon> <b-icon icon="person" aria-hidden="true"></b-icon>
<span class="d-none d-lg-inline ml-2">{{ $t('navigation.profile') }}</span> <span class="d-none d-lg-inline ml-2">{{ $t('navigation.profile') }}</span>
</b-nav-item> </b-nav-item> -->
<b-nav-item to="/community" class="mb-3"> <b-nav-item to="/community" class="mb-3">
<b-icon icon="people" aria-hidden="true"></b-icon> <b-icon icon="people" aria-hidden="true"></b-icon>
<span class="d-none d-lg-inline ml-2">{{ $t('navigation.members') }}</span> <span class="d-none d-lg-inline ml-2">{{ $t('navigation.members') }}</span>
@ -36,7 +36,11 @@
</b-nav> </b-nav>
<hr /> <hr />
<b-nav vertical class="w-100"> <b-nav vertical class="w-100">
<b-nav-item <b-nav-item to="/information" class="mb-3">
<b-icon icon="info" aria-hidden="true"></b-icon>
<span class="d-none d-lg-inline ml-2">{{ $t('navigation.info') }}</span>
</b-nav-item>
<!-- <b-nav-item
@click=" @click="
lightmode = !lightmode lightmode = !lightmode
$emit('modeToggle') $emit('modeToggle')
@ -49,7 +53,7 @@
<span v-if="lightmode">{{ $t('navigation.moon') }}</span> <span v-if="lightmode">{{ $t('navigation.moon') }}</span>
<span v-else>{{ $t('navigation.sun') }}</span> <span v-else>{{ $t('navigation.sun') }}</span>
</label> </label>
</b-nav-item> </b-nav-item> -->
<b-nav-item to="/settings" class="mb-3"> <b-nav-item to="/settings" class="mb-3">
<b-icon icon="gear" aria-hidden="true"></b-icon> <b-icon icon="gear" aria-hidden="true"></b-icon>
<span class="d-none d-lg-inline ml-2">{{ $t('navigation.settings') }}</span> <span class="d-none d-lg-inline ml-2">{{ $t('navigation.settings') }}</span>

View File

@ -1,16 +1,36 @@
<template> <template>
<div class="community-news"> <div class="community-news container">
<b-card class="bg-white appBoxShadow gradido-border-radius">CommunityNews</b-card> <div v-for="item in News" :key="item.id" class="mb-5">
<b-card class="bg-white appBoxShadow gradido-border-radius">
<div class="h2 mb-5">{{ item.text }}</div>
<b-row class="my-5">
<b-col>
<div class="h4">{{ item.date }}</div>
</b-col>
<b-col>
<div class="text-right">
<b-button variant="gradido">{{ $t('auth.left.learnMore') }}</b-button>
</div>
</b-col>
</b-row>
<div class="my-5">{{ item.extra }}</div>
</b-card>
</div>
</div> </div>
</template> </template>
<script> <script>
import News from '@/assets/News/news.json'
export default { export default {
name: 'CommunityNews', name: 'CommunityNews',
data() {
return {
News,
}
},
} }
</script> </script>
<style scoped> <style scoped>
.card { .card {
min-height: 400px;
background-attachment: absolute; background-attachment: absolute;
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;

View File

@ -1,20 +1,22 @@
<template> <template>
<div> <div>
<div class="text-center"> <div class="text-center">
<b-badge class="position-absolute mt--2 ml--5 px-3" variant="success">aktiv</b-badge> <b-badge class="position-absolute mt--2 ml--5 px-3" variant="success">
{{ $t('active') }}
</b-badge>
</div> </div>
<div <div
class="community-member bg-white appBoxShadow gradido-border-radius p-4 border border-success" class="community-member bg-white appBoxShadow gradido-border-radius p-4 border border-success"
> >
<div class="h4">Du bist aktives Mitglied</div> <div class="h4">{{ $t('community.communityMember') }}</div>
<b-row> <b-row>
<b-col cols="8"> <b-col cols="8">
<div class="small">Ortsname</div> <div class="small">{{ $t('community.city') }}</div>
<div class="small">{{ CONFIG.COMMUNITY_NAME }}</div> <div class="small">{{ CONFIG.COMMUNITY_NAME }}</div>
</b-col> </b-col>
<b-col cols="4" class="border-left border-light"> <b-col cols="4" class="border-left border-light">
<b-icon icon="people" class="ml-3 mr-3"></b-icon> <b-icon icon="people" class="ml-3 mr-3"></b-icon>
1240 {{ $t('1234') }}
</b-col> </b-col>
</b-row> </b-row>
</div> </div>

View File

@ -5,7 +5,7 @@
class="position-absolute mt--2 ml--4 px-3 zindex1" class="position-absolute mt--2 ml--4 px-3 zindex1"
:variant="showStatus ? 'success' : 'light'" :variant="showStatus ? 'success' : 'light'"
> >
GDD {{ $t('GDD') }}
</b-badge> </b-badge>
</div> </div>
<div <div
@ -13,14 +13,14 @@
:class="showStatus ? 'gradido-global-border-color-accent' : 'border-light opacity-05'" :class="showStatus ? 'gradido-global-border-color-accent' : 'border-light opacity-05'"
> >
<b-row> <b-row>
<b-col cols="9" class="h4">GDD Konto</b-col> <b-col cols="9" class="h4">{{ $t('gddKonto') }}</b-col>
<b-col cols="3" class="text-center"> <b-col cols="3" class="text-center">
<div> <div>
<b-icon <b-icon
:icon="showStatus ? 'check-circle' : 'circle'" :icon="showStatus ? 'check-circle' : 'circle'"
:class="showStatus ? 'gradido-global-border-color-accent' : ''" :class="showStatus ? 'gradido-global-border-color-accent' : ''"
></b-icon> ></b-icon>
<div class="small">{{ badge ? 'aktiv' : 'inaktiv' }}</div> <div class="small">{{ badge ? $t('active') : $t('inactive') }}</div>
</div> </div>
</b-col> </b-col>
</b-row> </b-row>

View File

@ -5,7 +5,7 @@
class="position-absolute mt--2 ml--4 px-3 zindex1" class="position-absolute mt--2 ml--4 px-3 zindex1"
:variant="badge ? 'success' : 'light'" :variant="badge ? 'success' : 'light'"
> >
GDT {{ $t('GDT') }}
</b-badge> </b-badge>
</div> </div>
@ -14,20 +14,20 @@
:class="showStatus ? 'gradido-global-border-color-accent' : 'border-light opacity-05'" :class="showStatus ? 'gradido-global-border-color-accent' : 'border-light opacity-05'"
> >
<b-row> <b-row>
<b-col cols="9" class="h4">GDT Konto</b-col> <b-col cols="9" class="h4">{{ $t('gdt.gdtKonto') }}</b-col>
<b-col cols="3" class="text-center"> <b-col cols="3" class="text-center">
<div> <div>
<b-icon <b-icon
:icon="badge ? 'check-circle' : 'circle'" :icon="badge ? 'check-circle' : 'circle'"
class="gradido-global-border-color-accent" class="gradido-global-border-color-accent"
></b-icon> ></b-icon>
<div class="small">{{ badge ? 'aktiv' : 'inaktiv' }}</div> <div class="small">{{ badge ? $t('active') : $t('inactive') }}</div>
</div> </div>
</b-col> </b-col>
</b-row> </b-row>
<div> <div>
<b-icon icon="layers" class="mr-3" :variant="badge ? 'success' : 'light'"></b-icon> <b-icon icon="layers" class="mr-3" :variant="badge ? 'success' : 'light'"></b-icon>
<span :class="badge ? 'text-success' : 'text-light'">0,00 GDT</span> <span :class="badge ? 'text-success' : 'text-light'">{{ $t('GDT') }}</span>
</div> </div>
</div> </div>
</div> </div>

View File

@ -1,9 +1,15 @@
<template> <template>
<div class="nav-community"> <div class="nav-community">
<div class="d-flex justify-content-center"> <div class="d-flex justify-content-center">
<b-button variant="gradido" class="rounded-right" to="#edit">Schreiben</b-button> <b-button variant="gradido" class="rounded-right" to="#edit">
<b-button variant="gradido" class="rounded-0" to="#my">Meine Beiträge</b-button> {{ $t('community.submitContribution') }}
<b-button variant="gradido" class="rounded-left" to="#all">Community</b-button> </b-button>
<b-button variant="gradido" class="rounded-0" to="#my">
{{ $t('community.myContributions') }}
</b-button>
<b-button variant="gradido" class="rounded-left" to="#all">
{{ $t('community.community') }}
</b-button>
</div> </div>
</div> </div>
</template> </template>

View File

@ -1,14 +1,11 @@
<template> <template>
<div class="last-contributions"> <div class="last-contributions">
<b-row class="mb-5"> <b-row class="mb-5">
<b-col class="h3">Letzte Beiträge</b-col> <b-col class="h3">{{ $t('contribution.lastContribution') }}</b-col>
<b-col cols="1" class="text-right"> <b-col cols="1" class="text-right">
<b-icon icon="three-dots-vertical"></b-icon> <b-icon icon="three-dots-vertical"></b-icon>
</b-col> </b-col>
</b-row> </b-row>
<b-card class="mb-4">letzter Beitrag</b-card>
<b-card class="mb-4">vorletzter Beitrag</b-card>
<b-card class="mb-4">vor vorletzter Beitrag</b-card>
</div> </div>
</template> </template>
<script> <script>

View File

@ -1,7 +1,7 @@
<template> <template>
<div class="rightside-last-transactions"> <div class="rightside-last-transactions">
<b-row> <b-row>
<b-col>Letzte Transaktionen:</b-col> <b-col>{{ $t('transaction.lastTransactions') }}</b-col>
<b-col cols="1" class="text-right"> <b-col cols="1" class="text-right">
<b-icon icon="three-dots-vertical"></b-icon> <b-icon icon="three-dots-vertical"></b-icon>
</b-col> </b-col>

View File

@ -25,7 +25,7 @@
</div> </div>
</b-col> </b-col>
<b-col cols="3"> <b-col cols="3">
<div class="small mt-2">GDT erhalten</div> <div class="small mt-2">{{ $t('gdt.credit') }}</div>
<div class="">{{ getLinesByType.credittext }}</div> <div class="">{{ getLinesByType.credittext }}</div>
</b-col> </b-col>
<b-col cols="1"><collapse-icon class="text-right" :visible="visible" /></b-col> <b-col cols="1"><collapse-icon class="text-right" :visible="visible" /></b-col>

View File

@ -10,7 +10,7 @@
<div class="small">{{ balanceDate }}</div> <div class="small">{{ balanceDate }}</div>
</b-col> </b-col>
<b-col cols="3"> <b-col cols="3">
<div class="small">Empfangen</div> <div class="small">{{ $t('decay.types.receive') }}</div>
<div class="small">{{ amount | GDD }}</div> <div class="small">{{ amount | GDD }}</div>
</b-col> </b-col>
<b-col cols="1"><collapse-icon class="text-right" :visible="visible" /></b-col> <b-col cols="1"><collapse-icon class="text-right" :visible="visible" /></b-col>

View File

@ -6,10 +6,10 @@
</b-col> </b-col>
<b-col> <b-col>
<div>{{ $t('gdd_per_link.links_sum') }}</div> <div>{{ $t('gdd_per_link.links_sum') }}</div>
<div class="small">{{ transactionLinkCount }} offene Links</div> <div class="small">{{ transactionLinkCount }} {{ $t('gdd_per_link.links_sum') }}</div>
</b-col> </b-col>
<b-col cols="3"> <b-col cols="3">
<div class="small">Insgesamt</div> <div class="small">{{ $t('send_per_link') }}</div>
<div class="small">{{ amount | GDD }}</div> <div class="small">{{ amount | GDD }}</div>
</b-col> </b-col>
<b-col cols="1"><collapse-icon class="text-right" :visible="visible" /></b-col> <b-col cols="1"><collapse-icon class="text-right" :visible="visible" /></b-col>

View File

@ -17,7 +17,7 @@
<div class="small">{{ balanceDate }}</div> <div class="small">{{ balanceDate }}</div>
</b-col> </b-col>
<b-col cols="3"> <b-col cols="3">
<div class="small">Empfangen</div> <div class="small">{{ $t('decay.types.receive') }}</div>
<div class="small">{{ amount | GDD }}</div> <div class="small">{{ amount | GDD }}</div>
</b-col> </b-col>
<b-col cols="1"><collapse-icon class="text-right" :visible="visible" /></b-col> <b-col cols="1"><collapse-icon class="text-right" :visible="visible" /></b-col>

View File

@ -17,7 +17,7 @@
<div class="small">{{ balanceDate }}</div> <div class="small">{{ balanceDate }}</div>
</b-col> </b-col>
<b-col cols="3"> <b-col cols="3">
<div class="small">Gesendet</div> <div class="small">{{ $t('decay.types.send') }}</div>
<div class="small">{{ amount | GDD }}</div> <div class="small">{{ amount | GDD }}</div>
</b-col> </b-col>
<b-col cols="1"><collapse-icon class="text-right" :visible="visible" /></b-col> <b-col cols="1"><collapse-icon class="text-right" :visible="visible" /></b-col>

View File

@ -141,6 +141,7 @@ export default {
} }
}, },
created() { created() {
this.updateTransactions(0)
setTimeout(() => { setTimeout(() => {
this.skeleton = false this.skeleton = false
}, 1500) }, 1500)

View File

@ -14,8 +14,8 @@
</b-col> </b-col>
</b-row> </b-row>
</b-container> </b-container>
<b-container v-if="path === '/storys'"><h2>Deine Community im Überblick</h2></b-container> <!-- <b-container v-if="path === '/storys'"></b-container>
<b-container v-if="path === '/addresses'">Deine Favoriten im Überblick</b-container> <b-container v-if="path === '/addresses'"></b-container> -->
<b-container v-if="path === '/send'"> <b-container v-if="path === '/send'">
<b-row> <b-row>
<b-col cols="6"> <b-col cols="6">
@ -34,7 +34,7 @@
<b-row> <b-row>
<b-col cols="6"> <b-col cols="6">
<div> <div>
<router-link to="transaction"> <router-link to="transactions">
<gdd-amount :balance="balance" :badge="true" :showStatus="true" /> <gdd-amount :balance="balance" :badge="true" :showStatus="true" />
</router-link> </router-link>
</div> </div>
@ -66,7 +66,7 @@
</b-col> </b-col>
</b-row> </b-row>
</b-container> </b-container>
<b-container v-if="path === '/profile'"> <!-- <b-container v-if="path === '/profile'">
<b-row> <b-row>
<b-col> <b-col>
<div class="p-4 bg-white appBoxShadow gradido-border-radius"> <div class="p-4 bg-white appBoxShadow gradido-border-radius">
@ -81,9 +81,9 @@
</div> </div>
</b-col> </b-col>
</b-row> </b-row>
</b-container> </b-container> -->
<b-container v-if="path === '/community'"><nav-community /></b-container> <b-container v-if="path === '/community'"><nav-community /></b-container>
<b-container v-if="path === '/settings'">settings content header</b-container> <b-container v-if="path === '/settings'"></b-container>
</div> </div>
</template> </template>

View File

@ -117,7 +117,7 @@
<contribution-info /> <contribution-info />
<last-contributions class="mt-5" /> <last-contributions class="mt-5" />
</b-container> </b-container>
<b-container v-if="path === '/settings'">settings ride side</b-container> <b-container v-if="path === '/settings'"></b-container>
</div> </div>
</template> </template>
<script> <script>

View File

@ -3,6 +3,7 @@
"1000thanks": "1000 Dank, weil du bei uns bist!", "1000thanks": "1000 Dank, weil du bei uns bist!",
"125": "125%", "125": "125%",
"85": "85%", "85": "85%",
"1234": "1234",
"advanced-calculation": "Vorausberechnung", "advanced-calculation": "Vorausberechnung",
"auth": { "auth": {
"left": { "left": {
@ -15,15 +16,19 @@
"oneGratitude": "Für einander, für alle Menschen, für die Natur." "oneGratitude": "Für einander, für alle Menschen, für die Natur."
} }
}, },
"active": "aktiv",
"inactive": "inaktiv",
"back": "Zurück", "back": "Zurück",
"community": { "community": {
"communityMember": "Du bist aktives Mitglied",
"city": "Stadt",
"choose-another-community": "Eine andere Gemeinschaft auswählen", "choose-another-community": "Eine andere Gemeinschaft auswählen",
"community": "Gemeinschaft", "community": "Gemeinschaft",
"continue-to-registration": "Weiter zur Registrierung", "continue-to-registration": "Weiter zur Registrierung",
"current-community": "Aktuelle Gemeinschaft", "current-community": "Aktuelle Gemeinschaft",
"moderator": "Moderator", "moderator": "Moderator",
"moderators": "Moderatoren", "moderators": "Moderatoren",
"myContributions": "Meine Beiträge zum Gemeinwohl", "myContributions": "Meine Beiträge",
"noOpenContributionLinkText": "Zur Zeit gibt es keine automatischen Schöpfungen.", "noOpenContributionLinkText": "Zur Zeit gibt es keine automatischen Schöpfungen.",
"openContributionLinks": "Öffentliche Beitrags-Linkliste", "openContributionLinks": "Öffentliche Beitrags-Linkliste",
"openContributionLinkText": "Folgende {count} automatische Schöpfungen werden zur Zeit durch die Gemeinschaft „{name}“ bereitgestellt.", "openContributionLinkText": "Folgende {count} automatische Schöpfungen werden zur Zeit durch die Gemeinschaft „{name}“ bereitgestellt.",
@ -34,6 +39,7 @@
"contact": "Kontakt", "contact": "Kontakt",
"contribution": { "contribution": {
"activity": "Tätigkeit", "activity": "Tätigkeit",
"lastContribution": "Letzte Beiträge",
"alert": { "alert": {
"answerQuestion": "Bitte beantworte die Rückfrage!", "answerQuestion": "Bitte beantworte die Rückfrage!",
"communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.", "communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.",
@ -43,7 +49,6 @@
"pending": "Eingereicht und wartet auf Bestätigung", "pending": "Eingereicht und wartet auf Bestätigung",
"rejected": "abgelehnt" "rejected": "abgelehnt"
}, },
"date": "Beitrag für:",
"delete": "Beitrag löschen! Bist du sicher?", "delete": "Beitrag löschen! Bist du sicher?",
"deleted": "Der Beitrag wurde gelöscht! Wird aber sichtbar bleiben.", "deleted": "Der Beitrag wurde gelöscht! Wird aber sichtbar bleiben.",
"formText": { "formText": {
@ -58,7 +63,8 @@
"submit": "Einreichen", "submit": "Einreichen",
"submitted": "Der Beitrag wurde eingereicht.", "submitted": "Der Beitrag wurde eingereicht.",
"updated": "Der Beitrag wurde geändert.", "updated": "Der Beitrag wurde geändert.",
"yourActivity": "Bitte trage eine Tätigkeit ein!" "yourActivity": "Bitte trage eine Tätigkeit ein!",
"exhausted": "Für diesen Monat kannst du nichts mehr schöpfen."
}, },
"contribution-link": { "contribution-link": {
"thanksYouWith": "dankt dir mit", "thanksYouWith": "dankt dir mit",
@ -94,7 +100,6 @@
"session-expired": "Die Sitzung wurde aus Sicherheitsgründen beendet.", "session-expired": "Die Sitzung wurde aus Sicherheitsgründen beendet.",
"unknown-error": "Unbekannter Fehler: " "unknown-error": "Unbekannter Fehler: "
}, },
"favourites": "Favouriten",
"followUs": "folge uns:", "followUs": "folge uns:",
"footer": { "footer": {
"app_version": "App version {version}", "app_version": "App version {version}",
@ -156,6 +161,7 @@
"your_amount": "Dein Betrag" "your_amount": "Dein Betrag"
}, },
"GDD": "GDD", "GDD": "GDD",
"gddKonto": "GDD Konto",
"gdd_per_link": { "gdd_per_link": {
"choose-amount": "Wähle einen Betrag aus, welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „Jetzt generieren“ wird ein Link erstellt, den du versenden kannst.", "choose-amount": "Wähle einen Betrag aus, welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „Jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
"copy-link": "Link kopieren", "copy-link": "Link kopieren",
@ -189,6 +195,7 @@
"validUntil": "Gültig bis", "validUntil": "Gültig bis",
"validUntilDate": "Der Link ist bis zum {date} gültig." "validUntilDate": "Der Link ist bis zum {date} gültig."
}, },
"GDT": "GDT",
"gdt": { "gdt": {
"calculation": "Berechnung der Gradido Transform", "calculation": "Berechnung der Gradido Transform",
"contribution": "Beitrag", "contribution": "Beitrag",
@ -198,6 +205,7 @@
"factor": "Faktor", "factor": "Faktor",
"formula": "Berechnungsformel", "formula": "Berechnungsformel",
"funding": "Zu den Förderbeiträgen", "funding": "Zu den Förderbeiträgen",
"gdtKonto": "GDT Konto",
"gdt": "Gradido Transform", "gdt": "Gradido Transform",
"gdt-received": "Gradido Transform (GDT) erhalten", "gdt-received": "Gradido Transform (GDT) erhalten",
"no-transactions": "Du hast noch keine Gradido Transform (GDT).", "no-transactions": "Du hast noch keine Gradido Transform (GDT).",
@ -229,19 +237,13 @@
}, },
"navigation": { "navigation": {
"admin_area": "Adminbereich", "admin_area": "Adminbereich",
"adresses": "Addressen",
"community": "Gemeinschaft", "community": "Gemeinschaft",
"favourites": "Favoriten",
"info": "Information", "info": "Information",
"lightmode": "Lightmode",
"logout": "Abmelden", "logout": "Abmelden",
"members": "Mitglieder", "members": "Mitglieder",
"moon": "🌙",
"overview": "Übersicht", "overview": "Übersicht",
"profile": "Mein Profil",
"send": "Senden", "send": "Senden",
"settings": "Einstellung", "settings": "Einstellung",
"sun": "☀️",
"support": "Support", "support": "Support",
"topStories": "Top Stories", "topStories": "Top Stories",
"transactions": "Transaktionen" "transactions": "Transaktionen"
@ -249,6 +251,11 @@
"qrCode": "QR Code", "qrCode": "QR Code",
"send_gdd": "GDD versenden", "send_gdd": "GDD versenden",
"send_per_link": "GDD versenden per Link", "send_per_link": "GDD versenden per Link",
"sendMethod": "Versandart",
"contributionText": "Beitragstext",
"creation": "Schöpfung",
"edit": "bearbeiten",
"moderatorChat": "Moderator Chat",
"session": { "session": {
"extend": "Angemeldet bleiben", "extend": "Angemeldet bleiben",
"lightText": "Wenn du länger als 10 Minuten keine Aktion getätigt hast, wirst du aus Sicherheitsgründen abgemeldet.", "lightText": "Wenn du länger als 10 Minuten keine Aktion getätigt hast, wirst du aus Sicherheitsgründen abgemeldet.",
@ -321,12 +328,11 @@
"years": "Jahr" "years": "Jahr"
}, },
"transaction": { "transaction": {
"gdd-text": "Gradido Transaktionen",
"gdt-text": "GradidoTransform Transaktionen",
"nullTransactions": "Du hast noch keine Transaktionen auf deinem Konto.", "nullTransactions": "Du hast noch keine Transaktionen auf deinem Konto.",
"receiverDeleted": "Das Empfängerkonto wurde gelöscht", "receiverDeleted": "Das Empfängerkonto wurde gelöscht",
"receiverNotFound": "Empfänger nicht gefunden", "receiverNotFound": "Empfänger nicht gefunden",
"show_all": "Alle <strong>{count}</strong> Transaktionen ansehen" "show_all": "Alle <strong>{count}</strong> Transaktionen ansehen",
"lastTransactions": "Letzte Transaktionen"
}, },
"transaction-link": { "transaction-link": {
"send_you": "sendet dir" "send_you": "sendet dir"

View File

@ -3,6 +3,7 @@
"1000thanks": "1000 thanks for being with us!", "1000thanks": "1000 thanks for being with us!",
"125": "125%", "125": "125%",
"85": "85%", "85": "85%",
"1234": "1234",
"advanced-calculation": "Advanced calculation", "advanced-calculation": "Advanced calculation",
"auth": { "auth": {
"left": { "left": {
@ -15,15 +16,19 @@
"oneGratitude": "For each other, for all people, for nature." "oneGratitude": "For each other, for all people, for nature."
} }
}, },
"active": "active",
"inactive": "inactive",
"back": "Back", "back": "Back",
"community": { "community": {
"communityMember": "You are an active member",
"city": "City",
"choose-another-community": "Choose another community", "choose-another-community": "Choose another community",
"community": "Community", "community": "Community",
"continue-to-registration": "Continue to registration", "continue-to-registration": "Continue to registration",
"current-community": "Current community", "current-community": "Current community",
"moderator": "Moderator", "moderator": "Moderator",
"moderators": "Moderators", "moderators": "Moderators",
"myContributions": "My contributions to the common good", "myContributions": "My contributions",
"noOpenContributionLinkText": "Currently there are no automatic creations.", "noOpenContributionLinkText": "Currently there are no automatic creations.",
"openContributionLinks": "Open contribution-link list", "openContributionLinks": "Open contribution-link list",
"openContributionLinkText": "The following {count} automatic creations are currently provided by the \"{name}\" community.", "openContributionLinkText": "The following {count} automatic creations are currently provided by the \"{name}\" community.",
@ -34,6 +39,7 @@
"contact": "Contact", "contact": "Contact",
"contribution": { "contribution": {
"activity": "Activity", "activity": "Activity",
"lastContribution": "Last Contributions",
"alert": { "alert": {
"answerQuestion": "Please answer the question", "answerQuestion": "Please answer the question",
"communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.", "communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.",
@ -43,7 +49,6 @@
"pending": "Submitted and waiting for confirmation", "pending": "Submitted and waiting for confirmation",
"rejected": "deleted" "rejected": "deleted"
}, },
"date": "Contribution for:",
"delete": "Delete Contribution! Are you sure?", "delete": "Delete Contribution! Are you sure?",
"deleted": "The contribution has been deleted! But it will remain visible.", "deleted": "The contribution has been deleted! But it will remain visible.",
"formText": { "formText": {
@ -58,7 +63,8 @@
"submit": "Submit", "submit": "Submit",
"submitted": "The contribution was submitted.", "submitted": "The contribution was submitted.",
"updated": "The contribution was changed.", "updated": "The contribution was changed.",
"yourActivity": "Please enter an activity!" "yourActivity": "Please enter an activity!",
"exhausted": "You cannot create anything more for this month."
}, },
"contribution-link": { "contribution-link": {
"thanksYouWith": "thanks you with", "thanksYouWith": "thanks you with",
@ -94,7 +100,6 @@
"session-expired": "The session was closed for security reasons.", "session-expired": "The session was closed for security reasons.",
"unknown-error": "Unknown error: " "unknown-error": "Unknown error: "
}, },
"favourites": "Favourites",
"followUs": "follow us:", "followUs": "follow us:",
"footer": { "footer": {
"app_version": "App version {version}", "app_version": "App version {version}",
@ -156,6 +161,7 @@
"your_amount": "Your amount" "your_amount": "Your amount"
}, },
"GDD": "GDD", "GDD": "GDD",
"gddKonto": "GDD Konto",
"gdd_per_link": { "gdd_per_link": {
"choose-amount": "Select an amount that you would like to send via link. You can also enter a message. Click 'Generate now' to create a link that you can share.", "choose-amount": "Select an amount that you would like to send via link. You can also enter a message. Click 'Generate now' to create a link that you can share.",
"copy-link": "Copy link", "copy-link": "Copy link",
@ -189,6 +195,7 @@
"validUntil": "Valid until", "validUntil": "Valid until",
"validUntilDate": "The link is valid until {date}." "validUntilDate": "The link is valid until {date}."
}, },
"GDT": "GDT",
"gdt": { "gdt": {
"calculation": "Calculation of Gradido Transform", "calculation": "Calculation of Gradido Transform",
"contribution": "Contribution", "contribution": "Contribution",
@ -198,6 +205,7 @@
"factor": "Factor", "factor": "Factor",
"formula": "Calculation formula", "formula": "Calculation formula",
"funding": "To the funding contributions", "funding": "To the funding contributions",
"gdtKonto": "GDT Konto",
"gdt": "Gradido Transform", "gdt": "Gradido Transform",
"gdt-received": "Gradido Transform (GDT) received", "gdt-received": "Gradido Transform (GDT) received",
"no-transactions": "You do not have Gradido Transform (GDT) yet.", "no-transactions": "You do not have Gradido Transform (GDT) yet.",
@ -229,19 +237,13 @@
}, },
"navigation": { "navigation": {
"admin_area": "Admin Area", "admin_area": "Admin Area",
"adresses": "Addresses",
"community": "Community", "community": "Community",
"favourites": "Favourites",
"info": "Information", "info": "Information",
"lightmode": "Lightmode",
"logout": "Logout", "logout": "Logout",
"members": "Members", "members": "Members",
"moon": "🌙",
"overview": "Overview", "overview": "Overview",
"profile": "My profile",
"send": "Send", "send": "Send",
"settings": "Settings", "settings": "Settings",
"sun": "☀️",
"support": "Support", "support": "Support",
"topStories": "Top Stories", "topStories": "Top Stories",
"transactions": "Transactions" "transactions": "Transactions"
@ -249,6 +251,11 @@
"qrCode": "QR Code", "qrCode": "QR Code",
"send_gdd": "GDD send", "send_gdd": "GDD send",
"send_per_link": "GDD send via link", "send_per_link": "GDD send via link",
"sendMethod": "Send Methods",
"contributionText": "Contribution Text",
"creation": "Creation",
"edit": "edit",
"moderatorChat": "Moderator Chat",
"session": { "session": {
"extend": "Stay logged in", "extend": "Stay logged in",
"lightText": "If you have not performed any action for more than 10 minutes, you will be logged out for security reasons.", "lightText": "If you have not performed any action for more than 10 minutes, you will be logged out for security reasons.",
@ -321,12 +328,11 @@
"years": "Year" "years": "Year"
}, },
"transaction": { "transaction": {
"gdd-text": "Gradido Transactions",
"gdt-text": "GradidoTransform Transactions",
"nullTransactions": "You don't have any transactions on your account yet.", "nullTransactions": "You don't have any transactions on your account yet.",
"receiverDeleted": "The recipient account was deleted", "receiverDeleted": "The recipient account was deleted",
"receiverNotFound": "Recipient not found", "receiverNotFound": "Recipient not found",
"show_all": "View all <strong>{count}</strong> transactions." "show_all": "View all <strong>{count}</strong> transactions.",
"lastTransactions": "Last Transactions"
}, },
"transaction-link": { "transaction-link": {
"send_you": "wants to send you" "send_you": "wants to send you"

View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<b-card v-if="skeleton"> <!-- <b-card v-if="skeleton">
{{ $t('addresses') }} {{ $t('addresses') }}
<b-skeleton animation="wave" width="85%"></b-skeleton> <b-skeleton animation="wave" width="85%"></b-skeleton>
<b-skeleton animation="wave" width="55%"></b-skeleton> <b-skeleton animation="wave" width="55%"></b-skeleton>
@ -8,7 +8,7 @@
</b-card> </b-card>
<b-card v-else> <b-card v-else>
{{ $t('addresses') }} {{ $t('addresses') }}
</b-card> </b-card> -->
</div> </div>
</template> </template>
<script> <script>

View File

@ -1,7 +1,7 @@
<template> <template>
<div class="profile break"> <div class="profile break">
<b-card class="justify-content-center bg-white appBoxShadow gradido-border-radius"> <b-card class="justify-content-center bg-white appBoxShadow gradido-border-radius">
<b-form @submit.prevent="submit"> <!-- <b-form @submit.prevent="submit">
<b-row> <b-row>
<b-col> <b-col>
<first-name v-model="firstName" /> <first-name v-model="firstName" />
@ -34,27 +34,27 @@
<b-col><b-form-checkbox switch size="lg"></b-form-checkbox></b-col> <b-col><b-form-checkbox switch size="lg"></b-form-checkbox></b-col>
</b-row> </b-row>
<b-button type="submit" class="mt-5">speichern</b-button> <b-button type="submit" class="mt-5">speichern</b-button>
</b-form> </b-form> -->
</b-card> </b-card>
</div> </div>
</template> </template>
<script> <script>
import FirstName from '@/components/Inputs/FirstName.vue' // import FirstName from '@/components/Inputs/FirstName.vue'
import LastName from '@/components/Inputs/LastName.vue' // import LastName from '@/components/Inputs/LastName.vue'
import LanguageSwitch from '@/components/LanguageSwitch.vue' // import LanguageSwitch from '@/components/LanguageSwitch.vue'
import Job from '@/components/Inputs/Job.vue' // import Job from '@/components/Inputs/Job.vue'
import InputEmail from '@/components/Inputs/InputEmail.vue' // import InputEmail from '@/components/Inputs/InputEmail.vue'
import InputPassword from '@/components/Inputs/InputPassword.vue' // import InputPassword from '@/components/Inputs/InputPassword.vue'
export default { export default {
name: 'Profile', name: 'Profile',
components: { components: {
FirstName, // FirstName,
LastName, // LastName,
LanguageSwitch, // LanguageSwitch,
Job, // Job,
InputEmail, // InputEmail,
InputPassword, // InputPassword,
}, },
props: { props: {
balance: { type: Number, default: 0 }, balance: { type: Number, default: 0 },