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 backport_balance_recalculation

Browse Source
This commit is contained in:
Dario Rekowski on RockPI 2021-03-26 10:02:49 +00:00
commit 8fc5d65f22
15 changed files with 289 additions and 529 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docker-compose.override.yml
View File

@ -58,6 +58,20 @@ services:
volumes: volumes:
- /sessions - /sessions
#########################################################
## skeema for updating dbs if changes happend ###########
#########################################################
skeema:
build:
context: .
dockerfile: ./skeema/Dockerfile
target: skeema_run
container_name: skeema
depends_on:
- mariadb
networks:
- internal-net
volumes: volumes:
frontend_node_modules: frontend_node_modules:
conan: conan:

5
frontend/src/App.vue
View File

@ -39,7 +39,12 @@ export default {
//console.log('%cHey %c' + $cookies.get('gdd_u') + '', 'font-weight:bold', 'color: orange') //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('session_id', $cookies.get('gdd_session_id'))
this.$store.commit('email', $cookies.get('gdd_u')) this.$store.commit('email', $cookies.get('gdd_u'))
if ($cookies.get('gdd_lang') != 'de' || $cookies.get('gdd_lang') != 'de') {
this.$store.commit('language', 'de')
} else {
this.$store.commit('language', $cookies.get('gdd_lang')) this.$store.commit('language', $cookies.get('gdd_lang'))
}
this.$i18n.locale = $cookies.get('gdd_lang') this.$i18n.locale = $cookies.get('gdd_lang')
this.$router.push('overview') this.$router.push('overview')
} else { } else {

20
frontend/src/store/store.js
View File

@ -13,6 +13,9 @@ export const store = new Vuex.Store({
sizeDE: 'normal', sizeDE: 'normal',
sizeGB: 'big', sizeGB: 'big',
loginfail: false, loginfail: false,
row_form: true,
row_check: false,
row_thx: false,
user: { user: {
name: '', name: '',
balance: 0, balance: 0,
@ -22,7 +25,7 @@ export const store = new Vuex.Store({
session_id: '', session_id: '',
email: '', email: '',
amount: 0, amount: 0,
target_date: '2021-02-19T13:25:36+00:00', target_date: '',
memo: '', memo: '',
auto_sign: true, auto_sign: true,
}, },
@ -141,8 +144,17 @@ export const store = new Vuex.Store({
}, },
ajaxCreate: async ({ dispatch, state }) => { ajaxCreate: async ({ dispatch, state }) => {
//console.log('action: ajaxCreate') //console.log('action: ajaxCreate')
state.ajaxCreateData.amount = state.ajaxCreateData.amount * 10000 state.ajaxCreateData.amount = state.ajaxCreateData.amount * 10000
const result = await communityAPI.create($cookies.get('gdd_session_id', email, amount, memo))
const result = await communityAPI.send(
state.session_id,
state.ajaxCreateData.email,
state.ajaxCreateData.amount,
state.ajaxCreateData.memo,
)
return result
//console.log(result) //console.log(result)
}, },
ajaxListTransactions: async ({ commit, dispatch, state }) => { ajaxListTransactions: async ({ commit, dispatch, state }) => {
@ -157,8 +169,8 @@ export const store = new Vuex.Store({
// commit('session_id', $cookies.get("gdd_session_id")) // commit('session_id', $cookies.get("gdd_session_id"))
// commit('email', $cookies.get("gdd_u")) // commit('email', $cookies.get("gdd_u"))
const result = await communityAPI.balance($cookies.get('gdd_session_id')) const result = await communityAPI.balance($cookies.get('gdd_session_id'))
//console.log('accountBalance result', result) //console.log("accountBalance result", result)
//console.log('aresult.result.data.balance', result.result.data.balance) //console.log("aresult.result.data.balance", result.result.data.balance)
if (result.success) { if (result.success) {
commit('user_balance', result.result.data.balance) commit('user_balance', result.result.data.balance)
} else { } else {

210
frontend/src/views/KontoOverview/GddAddWork.vue
View File

@ -1,210 +0,0 @@
<template>
<div>
<b-row>
<b-col xl="12" md="12">
<base-button icon type="info" size="lg" v-b-toggle.collapse-2>
<span class="btn-inner--icon"><i class="ni ni-fat-add"></i></span>
<span class="btn-inner--text">
{{ $t('site.overview.add_work') }}
</span>
</base-button>
<b-collapse id="collapse-2" class="mt-2">
<b-card>
<div class="card-text">
<b-row>
<b-col>
<h1>Neuer Beitrag</h1>
<h3>{ Name der Community }</h3>
</b-col>
<b-col>
<h3>Bitte trage jede arbeit einzeln ein.</h3>
</b-col>
</b-row>
<hr />
<b-form @submit="onSubmit" @reset="onReset" v-if="show">
<b-row class="form-group">
<label
for="example-datetime-local-input"
class="col-md-2 col-form-label form-control-label form-control-lg"
>
von
</label>
<b-col md="10">
<base-input
type="datetime-local"
value="2018-11-23T10:30:00"
v-model="form.from"
@change="dateDiff"
/>
</b-col>
</b-row>
<b-row class="form-group">
<label
for="example-datetime-local-input"
class="col-md-2 col-form-label form-control-label form-control-lg"
>
bis
</label>
<b-col md="10">
<base-input
type="datetime-local"
value="2018-11-23T10:30:00"
v-model="form.to"
@change="dateDiff"
/>
</b-col>
</b-row>
<b-row class="form-group">
<label
for="example-datetime-local-input"
class="col-md-2 col-form-label form-control-label form-control-lg"
>
Stunden
</label>
<b-col md="10">
<base-input type="text" v-model="form.hours" disabled class="form-control-lg" />
</b-col>
</b-row>
<b-row class="form-group">
<label
for="example-datetime-local-input"
class="col-md-2 col-form-label form-control-label form-control-lg"
>
GDD Shöpfen
</label>
<b-col md="10">
<base-input
type="text"
:value="form.hours * 20"
disabled
class="form-control-lg"
/>
</b-col>
</b-row>
<b-row class="form-group">
<label class="col-md-2 col-form-label form-control-label form-control-lg">
Ort
</label>
<b-col md="10">
<base-input
placeholder="Berlin"
v-model="form.location"
class="form-control-lg"
></base-input>
</b-col>
</b-row>
<b-row class="form-group">
<label class="col-md-2 col-form-label form-control-label form-control-lg">
Kategorie
</label>
<b-col md="10">
<base-input>
<select class="form-control form-control-lg">
<option>Umwelt</option>
<option>Helfen</option>
<option>Verein</option>
</select>
</base-input>
</b-col>
</b-row>
<base-input label="Beitrag">
<textarea
class="form-control form-control-lg"
rows="3"
v-model="form.text"
></textarea>
</base-input>
<b-row class="form-group">
<label class="col-md-2 col-form-label form-control-label form-control-lg">
Tätigkeit
</label>
<b-col md="8">
<base-input
placeholder="Tätigkeit"
v-model="form.location"
class="form-control-lg"
></base-input>
</b-col>
<b-col md="2">
<base-input
placeholder="Stunden"
v-model="form.location"
class="form-control-lg"
></base-input>
</b-col>
</b-row>
<br />
<br />
<b-button type="submit" variant="success">
jetzt einreichen
<small>{{ timestamp }}</small>
</b-button>
<b-button type="reset" variant="danger">Cancel</b-button>
<br />
</b-form>
</div>
</b-card>
</b-collapse>
</b-col>
</b-row>
</div>
</template>
<script>
export default {
name: 'GDDAddWork',
data() {
return {
show: true,
form: {
from: '',
to: '',
hours: '',
text: '',
gdd: 0.0,
location: '',
text2: '',
sendtime: '',
},
timestamp: '',
}
},
created() {
setInterval(this.getNow, 2000)
},
methods: {
dateDiff() {
this.form.hours = (this.$moment(this.form.to) - this.$moment(this.form.from)) / 1000 / 3600
},
getNow: function () {
//const today = new Date()
//const date = today.getDate()+'.'+(today.getMonth()+1)+'.'+ today.getFullYear();
//const time = today.getHours() + ":" + today.getMinutes();
//const dateTime = date +', '+ time;
this.timestamp = new Date()
},
onSubmit(event) {
event.preventDefault()
//console.log('onSUBMIT this.form.from >>>>', this.form.from)
//console.log('onSUBMIT this.form.from >>>>', this.$moment(this.form.from))
//console.log('onSUBMIT this.form.to >>>>', this.form.to)
// console.log("onSUBMIT >>>>", this.getHours(this.form.from, this.form.to))
this.form.sendtime = new Date()
alert(JSON.stringify(this.form))
},
onReset(event) {
event.preventDefault()
// Reset our form values
// Trick to reset/clear native browser form validation state
this.show = false
this.$nextTick(() => {
this.show = true
})
},
},
}
</script>

211
frontend/src/views/KontoOverview/GddAddWork2.vue
View File

@ -1,119 +1,53 @@
<template> <template>
<div> <div class="pt-4 pb-4">
<b-tabs content-class="mt-3" fill> <b-tabs content-class="mt-3" class="display-4" fill>
<b-tab :title="names.thisMonth" active> <b-tab :title="names.thisMonth" active>
<b-row> <b-row>
<b-col cols="3"> <b-col lg="3">
<base-input label="Arbeitstunden"> <base-input label="Stunden">
<b-form-input type="number" placeholder="23" /> <b-form-input
</base-input> type="number"
<base-input label="Datum / Zeitraum"> size="lg"
<flat-pickr class="form-control" v-model="date" :config="config"></flat-pickr> placeholder="0"
</base-input> style="font-size: xx-large; padding-left: 20px"
</b-col> />
<b-col cols="9">
<base-input label="Arbeitsreport">
<textarea class="form-control" rows="5" @focus="textFocus"></textarea>
</base-input>
</b-col>
</b-row>
<b-row>
<b-col>
<button class="btn btn-info text-right" @click.prevent="newWorkForm">
weiteren Report hinzufügen
</button>
</b-col>
<b-col>
<div class="text-right">
<button class="btn btn-info text-right" @click.prevent="submitForm2">
save new Report
</button>
</div>
</b-col>
</b-row>
</b-tab>
<b-tab :title="names.lastMonth">
<b-row>
<b-col cols="3">
<base-input label="Arbeitstunden">
<b-form-input type="number" placeholder="23" />
</base-input>
<base-input label="Datum / Zeitraum">
<flat-pickr class="form-control" v-model="date" :config="lastConfig"></flat-pickr>
</base-input>
</b-col>
<b-col cols="9">
<base-input label="Arbeitsreport">
<textarea class="form-control" rows="5" @focus="textFocus"></textarea>
</base-input>
</b-col>
</b-row>
<b-row>
<b-col>
<button class="btn btn-warning text-right" @click.prevent="newWorkForm">
+ weiteren Report hinzufügen
</button>
</b-col>
<b-col>
<div class="text-right">
<button class="btn btn-info text-right" @click.prevent="submitForm2">
save new Report
</button>
</div>
</b-col>
</b-row>
<hr />
<pre>Selected date is - {{ date }}</pre>
<p>{{ days.lastMonth }} Days in {{ names.lastMonth }}</p>
<p>
Du hast diesen Monat
{{ stundenSumme > 0 ? 'schon ' : 'noch keine' }}
{{ stundenSumme > 0 ? '' + stundenSumme : '' }}
Stunden eingetragen
</p>
</b-tab>
<b-tab :title="names.beforLastMonth">
<b-row>
<b-col cols="3">
<base-input label="Arbeitstunden">
<b-form-input type="number" placeholder="23" />
</base-input> </base-input>
<base-input label="Datum / Zeitraum"> <base-input label="Datum / Zeitraum">
<flat-pickr <flat-pickr
class="form-control" class="form-control"
v-model="date" v-model="date"
:config="beforLastConfig" :config="config"
style="font-size: x-large; padding-left: 20px"
></flat-pickr> ></flat-pickr>
</base-input> </base-input>
</b-col> </b-col>
<b-col cols="9"> <b-col lg="9">
<base-input label="Arbeitsreport"> <base-input label="Arbeitsreport">
<textarea class="form-control" rows="5" @focus="textFocus"></textarea> <textarea
class="form-control"
rows="5"
@focus="textFocus"
style="font-size: x-large; padding-left: 20px"
></textarea>
</base-input> </base-input>
</b-col> </b-col>
</b-row> </b-row>
<b-row> <b-row>
<b-col> <div ref="mydiv"></div>
<button class="btn btn-warning text-right" @click.prevent="newWorkForm"> </b-row>
+ weiteren Report hinzufügen <b-row>
</button> <b-col md="6">
<b-button @click.prevent="newWorkForm" variant="warning">+ weitere Stunden</b-button>
</b-col> </b-col>
<b-col> <b-col md="6" class="text-right">
<div class="text-right"> <b-button variant="success" @click.prevent="submitForm2">Einreichen, absenden</b-button>
<button class="btn btn-info text-right" @click.prevent="submitForm3">
save new Report
</button>
</div>
</b-col> </b-col>
</b-row> </b-row>
<hr />
<pre>Selected date is - {{ date }}</pre>
<p>{{ days.beforLastMonth }} Days in {{ names.beforLastMonth }}</p>
<p>Du hast noch keine Einträge</p>
</b-tab> </b-tab>
<b-tab :title="names.lastMonth"></b-tab>
<b-tab :title="names.beforLastMonth"></b-tab>
</b-tabs> </b-tabs>
</div> </div>
</template> </template>
@ -135,32 +69,6 @@ export default {
maxDate: this.$moment().format('DD.MM.YYYY'), maxDate: this.$moment().format('DD.MM.YYYY'),
mode: 'range', mode: 'range',
}, },
lastConfig: {
altInput: false,
dateFormat: 'd-m-Y',
minDate: this.$moment()
.month(this.$moment().month() - 1)
.startOf('month')
.format('DD.MM.YYYY'),
maxDate: this.$moment()
.month(this.$moment().month() - 1)
.endOf('month')
.format('DD.MM.YYYY'),
mode: 'range',
},
beforLastConfig: {
altInput: false,
dateFormat: 'd-m-Y',
minDate: this.$moment()
.month(this.$moment().month() - 2)
.startOf('month')
.format('DD.MM.YYYY'),
maxDate: this.$moment()
.month(this.$moment().month() - 2)
.endOf('month')
.format('DD.MM.YYYY'),
mode: 'range',
},
index: 0, index: 0,
form: [], form: [],
stundenSumme: 0, stundenSumme: 0,
@ -184,6 +92,7 @@ export default {
.month(this.$moment().month() - 2) .month(this.$moment().month() - 2)
.format('MMMM'), .format('MMMM'),
}, },
formular: null,
} }
}, },
created() {}, created() {},
@ -192,21 +101,12 @@ export default {
stunden(this.form) stunden(this.form)
}, },
}, },
mounted() {},
methods: { methods: {
getTR(m, i) {
//console.log(m + '-' + i)
},
stunden(hour, i, mon) { stunden(hour, i, mon) {
let n = 0 let n = 0
//console.log('stunden(form)=>', hour)
//console.log('stunden(i)=>', i)
//console.log('stunden(mon)=>', mon)
//console.log('this.stundenSumme start=> ', this.stundenSumme)
this.stundenSumme = 0 this.stundenSumme = 0
//console.log('arr.length => ', this.form.length)
for (n; n < this.form.length; n++) { for (n; n < this.form.length; n++) {
//console.log('>arr[n]=> ', this.form[n])
if (this.form[n] > 0) { if (this.form[n] > 0) {
this.stundenSumme += parseInt(this.form[n]) this.stundenSumme += parseInt(this.form[n])
} }
@ -220,7 +120,6 @@ export default {
TextDecoded: '', TextDecoded: '',
}) })
this.index++ this.index++
//console.log('this.stundenSumme ende=> ', this.stundenSumme)
}, },
addNewMessage: function () { addNewMessage: function () {
this.messages.push({ this.messages.push({
@ -229,29 +128,55 @@ export default {
}) })
}, },
deleteNewMessage: function (event) { deleteNewMessage: function (event) {
//console.log('deleteNewMessage:event) => ', event)
//console.log("deleteNewMessage:this.events.splice(this.event) => ", this.events.splice(this.event))
this.form.splice(event, null) this.form.splice(event, null)
this.messages.splice(index, 1) this.messages.splice(index, 1)
this.index-- this.index--
}, },
submitForm: function (e) { submitForm: function (e) {
//console.log(this.messages) //console.log('submitForm')
this.messages = [{ DaysNumber: '', TextDecoded: '' }] this.messages = [{ DaysNumber: '', TextDecoded: '' }]
this.submitted = true this.submitted = true
}, },
submitForm2() {
//console.log('submitForm2 TODO')
},
submitForm3() {
//console.log('submitForm3 TODO')
},
textFocus() { textFocus() {
//console.log('textFocus TODO') //console.log('textFocus TODO')
}, },
newWorkForm() { newWorkForm() {
this.formular = `
<b-col lg="3">
<base-input label="Stunden">
<b-form-input
type="number"
size="lg"
placeholder="0"
style="font-size: xx-large; padding-left: 20px"
/>
</base-input>
<base-input label="Datum / Zeitraum">
<flat-pickr
class="form-control"
v-model="date"
:config="config"
style="font-size: xx-large; padding-left: 20px"
></flat-pickr>
</base-input>
</b-col>
<b-col lg="9">
<base-input label="Arbeitsreport">
<textarea
class="form-control"
rows="5"
@focus="textFocus"
style="font-size: x-large; padding-left: 20px"
></textarea>
</base-input>
</b-col>
`
// console.log('newWorkForm TODO') // console.log('newWorkForm TODO')
const myElement = this.$refs.mydiv
myElement.append(this.formular)
this.$compile(myElement)
this.formular = null
}, },
}, },
} }

149
frontend/src/views/KontoOverview/GddSend.vue
View File

@ -1,13 +1,13 @@
<template> <template>
<div> <div>
<b-row> <b-row v-show="$store.state.row_form">
<b-col xl="12" md="12"> <b-col xl="12" md="12">
<b-alert variant="warning" show dismissible> <b-alert variant="warning" show dismissible>
<strong>Achtung!</strong> <strong>Achtung!</strong>
Bitte überprüfe alle deine Eingaben sehr genau. Du bist alleine Verantwortlich für deine 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. Entscheidungen. Versendete Gradidos können nicht wieder zurück geholt werden.
</b-alert> </b-alert>
<b-card class="p-0 p-md-3"> <b-card class="p-0 p-md-3" style="background-color: #ebebeba3 !important">
<b-alert show variant="secondary"> <b-alert show variant="secondary">
<span class="alert-text"> <span class="alert-text">
<strong>QR Code Scanner</strong> <strong>QR Code Scanner</strong>
@ -17,9 +17,7 @@
<img src="/img/icons/gradido/qr-scan-pure.png" height="50" @click="scan = true" /> <img src="/img/icons/gradido/qr-scan-pure.png" height="50" @click="scan = true" />
</b-col> </b-col>
<b-alert v-show="scan" show variant="warning"> <b-alert v-show="scan" show variant="warning">
<span class="alert-text" @click="scan = false"> <span class="alert-text" @click="scan = false"><strong>schließen!</strong></span>
<strong>schließen!</strong>
</span>
</b-alert> </b-alert>
<div v-if="scan"> <div v-if="scan">
<!-- <b-row> <!-- <b-row>
@ -142,11 +140,57 @@
</b-card> </b-card>
</b-col> </b-col>
</b-row> </b-row>
<b-row v-show="$store.state.row_check">
<b-col>
<div class="display-4 p-4">Bestätige deine Zahlung. Prüfe bitte nochmal alle Daten!</div>
<b-list-group>
<b-list-group-item active>Meine Zahlung</b-list-group-item>
<b-list-group-item class="d-flex justify-content-between align-items-center">
{{ $store.state.ajaxCreateData.email }}
<b-badge variant="primary" pill>Empfänger</b-badge>
</b-list-group-item>
<b-list-group-item class="d-flex justify-content-between align-items-center">
{{ $store.state.ajaxCreateData.amount }} GDD
<b-badge variant="primary" pill>Betrag</b-badge>
</b-list-group-item>
<b-list-group-item class="d-flex justify-content-between align-items-center">
{{ $store.state.ajaxCreateData.memo }}
<b-badge variant="primary" pill>Nachricht</b-badge>
</b-list-group-item>
<b-list-group-item class="d-flex justify-content-between align-items-center">
{{ $moment($store.state.ajaxCreateData.target_date).format('DD.MM.YYYY - HH:mm:ss') }}
<b-badge variant="primary" pill>Datum</b-badge>
</b-list-group-item>
</b-list-group>
<hr />
<b-row>
<b-col><b-button @click="onReset">abbrechen</b-button></b-col>
<b-col class="text-right">
<b-button variant="success" @click="sendTransaction">jetzt versenden</b-button>
</b-col>
</b-row>
</b-col>
</b-row>
<b-row v-show="$store.state.row_thx">
<b-col>
<div class="display-1 p-4">
Danke
<hr />
Deine Zahlung wurde erfolgreich versendet.
</div>
<b-button variant="success" @click="onReset">schließen</b-button>
<hr />
</b-col>
</b-row>
</div> </div>
</template> </template>
<script> <script>
import { QrcodeStream, QrcodeDropZone /*, QrcodeCapture*/ } from 'vue-qrcode-reader' import { QrcodeStream, QrcodeDropZone } from 'vue-qrcode-reader'
import { BIcon } from 'bootstrap-vue' import { BIcon } from 'bootstrap-vue'
export default { export default {
@ -154,7 +198,6 @@ export default {
components: { components: {
QrcodeStream, QrcodeStream,
QrcodeDropZone, QrcodeDropZone,
// QrcodeCapture,
BIcon, BIcon,
}, },
data() { data() {
@ -167,57 +210,9 @@ export default {
amount: '', amount: '',
memo: '', memo: '',
}, },
sent: false, send: false,
} }
}, },
methods: {
sendbutton() {
this.sent = true
},
async onDecode(decodedString) {
//console.log('onDecode JSON.parse(decodedString)', JSON.parse(decodedString))
const arr = JSON.parse(decodedString)
//console.log('qr-email', arr[0].email)
//console.log('qr-amount', arr[0].amount)
this.form.email = arr[0].email
this.form.amount1 = arr[0].amount
},
async onDetect(promise) {
try {
const {
imageData, // raw image data of image/frame
content, // decoded String
location, // QR code coordinates
} = await promise
// console.log('onDetect promise',promise)
//console.log('JSON.parse(decodedString)',JSON.parse(promise) )
const arr = JSON.parse(decodedString)
} catch (error) {
// ...
}
},
async onSubmit() {
//event.preventDefault()
//console.log("onSubmit", this.form)
this.$store.state.ajaxCreateData.session_id = this.$cookies.get('gdd_session_id')
this.$store.state.ajaxCreateData.email = this.form.email
this.$store.state.ajaxCreateData.amount = this.form.amount
this.$store.state.ajaxCreateData.memo = this.form.memo
this.$store.state.ajaxCreateData.target_date = Date.now()
this.$store.dispatch('ajaxCreate')
},
onReset(event) {
event.preventDefault()
this.form.email = ''
this.form.amount = ''
this.show = false
this.$nextTick(() => {
this.show = true
})
},
},
computed: { computed: {
state() { state() {
return this.name.length >= 4 return this.name.length >= 4
@ -229,6 +224,48 @@ export default {
return 'Bitte geben Sie eine GDD Adresse ein.' return 'Bitte geben Sie eine GDD Adresse ein.'
}, },
}, },
methods: {
async onDecode(decodedString) {
//console.log('onDecode JSON.parse(decodedString)', JSON.parse(decodedString))
const arr = JSON.parse(decodedString)
//console.log('qr-email', arr[0].email)
//console.log('qr-amount', arr[0].amount)
this.form.email = arr[0].email
this.form.amount = arr[0].amount
this.scan = false
},
async onSubmit() {
//event.preventDefault()
//console.log("onSubmit", this.form)
this.$store.state.ajaxCreateData.session_id = this.$cookies.get('gdd_session_id')
this.$store.state.ajaxCreateData.email = this.form.email
this.$store.state.ajaxCreateData.amount = this.form.amount
this.$store.state.ajaxCreateData.memo = this.form.memo
this.$store.state.ajaxCreateData.target_date = Date.now()
this.$store.state.row_form = false
this.$store.state.row_check = true
this.$store.state.row_thx = false
},
sendTransaction() {
this.$store.dispatch('ajaxCreate')
this.$store.state.row_form = false
this.$store.state.row_check = false
this.$store.state.row_thx = true
},
onReset(event) {
event.preventDefault()
this.form.email = ''
this.form.amount = ''
this.show = false
this.$nextTick(() => {
this.show = true
})
this.$store.state.row_form = true
this.$store.state.row_check = false
this.$store.state.row_thx = false
},
},
} }
</script> </script>
<style> <style>

16
frontend/src/views/KontoOverview/GddStatus.vue
View File

@ -1,13 +1,23 @@
<template> <template>
<div> <div>
<b-row> <b-row v-show="$store.state.row_form">
<b-col xl="6" md="6"> <b-col xl="6" md="6">
<stats-card type="gradient-red" sub-title="balance_gdd" class="mb-4 h1"> <stats-card
type="gradient-red"
sub-title="balance_gdd"
class="mb-4 h1"
style="background-color: #ebebeba3 !important"
>
{{ $n($store.state.user.balance) }} GDD {{ $n($store.state.user.balance) }} GDD
</stats-card> </stats-card>
</b-col> </b-col>
<b-col xl="6" md="6"> <b-col xl="6" md="6">
<stats-card type="gradient-orange" sub-title="balance_gdt" class="mb-4 h1"> <stats-card
type="gradient-orange"
sub-title="balance_gdt"
class="mb-4 h1"
style="background-color: #ebebeba3 !important"
>
{{ $n($store.state.user.balance_gdt) }} GDT {{ $n($store.state.user.balance_gdt) }} GDT
</stats-card> </stats-card>
</b-col> </b-col>

16
frontend/src/views/KontoOverview/GddTable.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<b-list-group> <b-list-group v-show="$store.state.row_form">
<b-list-group-item <b-list-group-item
v-for="item in filteredItems" v-for="item in filteredItems"
:key="item.id" :key="item.id"
@ -111,12 +111,20 @@ export default {
} }
}, },
computed: { computed: {
filteredItems(a) { filteredItems() {
// console.log("filteredItems date",a.items) return this.ojectToArray(this.items).reverse()
return a.items
}, },
}, },
methods: { methods: {
ojectToArray(obj) {
let result = new Array(Object.keys(obj).length)
Object.entries(obj).forEach((entry) => {
const [key, value] = entry
result[key] = value
})
return result
},
rowClass(item, type) { rowClass(item, type) {
if (!item || type !== 'row') return if (!item || type !== 'row') return
if (item.type === 'receive') return 'table-success' if (item.type === 'receive') return 'table-success'

13
frontend/src/views/KontoOverview/GddWorkTable.vue
View File

@ -18,6 +18,11 @@
</div> </div>
</b-list-group-item> </b-list-group-item>
</b-list-group> </b-list-group>
<hr />
<b-icon icon="clock-history" class="m-1" font-scale="2" style="color: orange"></b-icon>
Wartet auf Bestätigung |
<b-icon icon="check2-all" class="m-1" font-scale="2" style="color: green"></b-icon>
bestätigt
</div> </div>
</template> </template>
@ -30,25 +35,25 @@ export default {
items: [ items: [
{ {
id: 1, id: 1,
text: 'Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum ', text: 'Zwei Säcke Plastikmüll im Wald gesammelt',
datel: '12.12.2020 14:04', datel: '12.12.2020 14:04',
status: 'submitted', status: 'submitted',
}, },
{ {
id: 2, id: 2,
text: 'Larsen Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum ', text: 'Frau Schmidt bei der Gartenarbeit geholfen.',
datel: '22.06.2020 22:23', datel: '22.06.2020 22:23',
status: 'submitted', status: 'submitted',
}, },
{ {
id: 3, id: 3,
text: 'Geneva Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum ', text: 'Ein online Kurs für nachhaltiges Mülltrennen erstellt',
datel: '15.04.2020 12:55', datel: '15.04.2020 12:55',
status: 'confirmed', status: 'confirmed',
}, },
{ {
id: 4, id: 4,
text: 'Community Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum ', text: 'Gradido bei meinen Freunden vorgestellt',
datel: '10.03.2020 18:20', datel: '10.03.2020 18:20',
status: 'confirmed', status: 'confirmed',
}, },

7
frontend/src/views/Pages/UserProfile/EditProfileForm.vue
View File

@ -1,10 +1,5 @@
<template> <template>
<card> <card style="background-color: #ebebeba3 !important">
<b-row align-v="center" slot="header">
<b-col cols="8"></b-col>
<b-col cols="4" class="text-right"></b-col>
</b-row>
<b-form @submit.prevent="updateProfile"> <b-form @submit.prevent="updateProfile">
<h6 class="heading-small text-muted mb-4">User information</h6> <h6 class="heading-small text-muted mb-4">User information</h6>

8
frontend/src/views/Pages/UserProfile/UserCard.vue
View File

@ -1,5 +1,11 @@
<template> <template>
<b-card no-body class="card-profile" alt="Image placeholder" img-top> <b-card
no-body
class="card-profile"
alt="Image placeholder"
img-top
style="background-color: #ebebeba3 !important"
>
<b-row class="justify-content-center"> <b-row class="justify-content-center">
<b-col lg="3" class="order-lg-2"> <b-col lg="3" class="order-lg-2">
<div class="card-profile-image"> <div class="card-profile-image">

46
frontend/src/views/Pages/UserProfileActivity.vue
View File

@ -1,61 +1,47 @@
<template> <template>
<div> <div>
<div <div class="header pb-7 pt-5"></div>
class="header pb-8 pt-5 pt-lg-8 d-flex align-items-center profile-header"
style="max-height: 200px"
></div>
<b-container fluid class="mt--6"> <b-container fluid class="mt--6">
<div class="display-4 mb-3">Gemeinschaftsstunden Chart</div>
<b-row> <b-row>
<b-col> <b-col>
<div> <div class="chart">
<gdd-add-work-2 /> <line-chart :height="350" :chart-data="bigLineChart.chartData"></line-chart>
</div> </div>
<br />
</b-col> </b-col>
</b-row> </b-row>
<hr /> <hr />
<div class="display-4 mt-6">Neue Gemeinschaftsstunden eintragen</div>
<b-row> <b-row>
<b-col xl="4" class="order-xl-2 mb-5"> <b-col>
community <gdd-add-work-2 />
<gdd-work-table></gdd-work-table>
</b-col>
<b-col xl="8" class="order-xl-1">
transactions
<gdd-table></gdd-table>
</b-col> </b-col>
</b-row> </b-row>
<hr />
<div class="display-4 mb-3">Meine Gemeinschaftsstunden Liste</div>
<b-row> <b-row>
<b-col xl="6" S> <b-col class="mb-5">
<div class="chart"> community
<line-chart :height="350" :chart-data="bigLineChart.chartData"></line-chart> <gdd-work-table></gdd-work-table>
</div>
</b-col>
<b-col xl="6">
<div class="chart">
<line-chart :height="350" :chart-data="bigLineChart.chartData"></line-chart>
</div>
</b-col> </b-col>
</b-row> </b-row>
</b-container> </b-container>
</div> </div>
</template> </template>
<script> <script>
import GddTable from '../../views/KontoOverview/GddTable.vue'
import GddWorkTable from '../../views/KontoOverview/GddWorkTable.vue' import GddWorkTable from '../../views/KontoOverview/GddWorkTable.vue'
import GddAddWork2 from '../../views/KontoOverview/GddAddWork2.vue' import GddAddWork2 from '../../views/KontoOverview/GddAddWork2.vue'
import * as chartConfigs from '@/components/Charts/config' import * as chartConfigs from '@/components/Charts/config'
import LineChart from '@/components/Charts/LineChart' import LineChart from '@/components/Charts/LineChart'
//import BarChart from '@/components/Charts/BarChart';
export default { export default {
components: { components: {
GddTable,
GddWorkTable, GddWorkTable,
LineChart, LineChart,
GddAddWork2, GddAddWork2,
//BarChart
}, },
data() { data() {
return { return {
@ -70,11 +56,11 @@ export default {
chartData: { chartData: {
datasets: [ datasets: [
{ {
label: 'Performance', label: 'Gemeinschaftsstunden',
data: [0, 20, 10, 30, 15, 40, 20, 60, 60], data: [30, 20, 10, 30, 65, 40, 20, 60, 70],
}, },
], ],
labels: ['May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], labels: ['2020 Aug', 'Sep', 'Okt', 'Nov', 'Dez', 'Jan', 'Feb', 'Mär 2021'],
}, },
extraOptions: chartConfigs.blueChartOptions, extraOptions: chartConfigs.blueChartOptions,
}, },

66
mariadb/Dockerfile
View File

@ -1,29 +1,12 @@
#########################################################################################################
# Build skeema
#########################################################################################################
FROM golang:1.14.4 as skeema_build
RUN go get -d -v github.com/skeema/skeema
WORKDIR /go/src/github.com/skeema/skeema
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /go/bin/skeema .
######################################################################################################### #########################################################################################################
# mariadb server # mariadb server
######################################################################################################### #########################################################################################################
From mariadb/server:10.5 as mariadb_server From mariadb/server:10.5 as mariadb_server
ENV DOCKER_WORKDIR="/docker-entrypoint-initdb.d" ENV DOCKER_WORKDIR="/docker-entrypoint-initdb.d"
#ENV DOCKER_WORKDIR="/skeema"
# copy skeema
#COPY --from=skeema_build /go/bin/skeema /usr/bin/
RUN mkdir -p ${DOCKER_WORKDIR} RUN mkdir -p ${DOCKER_WORKDIR}
WORKDIR ${DOCKER_WORKDIR} WORKDIR ${DOCKER_WORKDIR}
#COPY ./mariadb/.skeema .
#COPY ./login_server/skeema/ .
#COPY ./mariadb/.skeema.login ./gradido_login/.skeema
#COPY ./community_server/skeema/ .
#RUN for f in *.c; do cp -- "$f" "$OTHERDIR/old#$f"; done
# create databases # create databases
COPY ./mariadb/setup_dbs.sql a_setup_dbs.sql COPY ./mariadb/setup_dbs.sql a_setup_dbs.sql
@ -35,52 +18,3 @@ COPY ./community_server/skeema/ .
RUN cd ./gradido_community/ && for f in *.sql; do cp -- "$f" "../d_$f"; sed -i '1i use gradido_community;' "../d_$f"; done RUN cd ./gradido_community/ && for f in *.sql; do cp -- "$f" "../d_$f"; sed -i '1i use gradido_community;' "../d_$f"; done
RUN cd ./gradido_community/insert && for f in *.sql; do cp -- "$f" "../../e_$f"; sed -i '1i use gradido_community;' "../../e_$f"; done RUN cd ./gradido_community/insert && for f in *.sql; do cp -- "$f" "../../e_$f"; sed -i '1i use gradido_community;' "../../e_$f"; done
RUN ls -ls
#USER mysql
#VOLUME /var/lib/mysql
#RUN mysqld
#RUN mysql -e 'CREATE DATABASE gradido_login_server;'
#RUN mysql -e 'CREATE DATABASE gradido_community_server;'
#RUN skeema push
#########################################################################################################
# mariadb server selfmade
#########################################################################################################
From alpine:latest as mariadb_DIV
ENV DOCKER_WORKDIR="/skeema"
#VOLUME /var/lib/mysql
#RUN apt-get update \
# && apt-get -y --no-install-recommends install mariadb-server mariadb-client \
# && apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
RUN apk add mariadb mariadb-client
# copy skeema
COPY --from=skeema_build /go/bin/skeema /usr/bin/
RUN mkdir -p ${DOCKER_WORKDIR}
WORKDIR ${DOCKER_WORKDIR}
COPY ./mariadb/setup_dbs.sh .
COPY ./mariadb/.skeema .
COPY ./login_server/skeema/ .
COPY ./mariadb/.skeema.login ./gradido_login/.skeema
COPY ./community_server/skeema/ .
COPY ./mariadb/.skeema.community ./gradido_community/.skeema
USER mysql
#VOLUME /var/lib/mysql
#RUN mysqld
#RUN chmod +x ./setup_dbs.sh
#RUN mysql < setup_dbs.sql
#RUN skeema push
#EXPOSE 3306
#CMD ["mysld"]

5
skeema/.skeema Normal file
View File

@ -0,0 +1,5 @@
[production]
flavor=mariadb:10.5
host=mariadb
port=3306
user=root

28
skeema/Dockerfile Normal file
View File

@ -0,0 +1,28 @@
#########################################################################################################
# Build skeema
#########################################################################################################
FROM golang:1.14.4 as skeema_build
RUN go get -d -v github.com/skeema/skeema
WORKDIR /go/src/github.com/skeema/skeema
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /go/bin/skeema .
#########################################################################################################
# Run skeema
#########################################################################################################
From alpine:latest as skeema_run
ENV DOCKER_WORKDIR="/skeema"
# copy skeema
COPY --from=skeema_build /go/bin/skeema /usr/bin/
RUN mkdir -p ${DOCKER_WORKDIR}
WORKDIR ${DOCKER_WORKDIR}
COPY ./skeema/.skeema .
COPY ./login_server/skeema/ .
COPY ./mariadb/.skeema.login ./gradido_login/.skeema
COPY ./community_server/skeema/ .
COPY ./mariadb/.skeema.community ./gradido_community/.skeema
CMD skeema push