WIP - sent gdd skelet, todo: api clear send not ok

This commit is contained in:
ogerly 2021-03-01 16:15:11 +01:00
parent 94d5dcb778
commit 3339f42975
5 changed files with 105 additions and 68 deletions

View File

@ -1,7 +1,6 @@
import Vue from 'vue'
import VueRouter from 'vue-router'
import routes from './routes'
import {store} from '../store/store';
Vue.use(VueRouter)

View File

@ -95,9 +95,9 @@ export const store = new Vuex.Store({
},
ajaxCreate: async ({ dispatch, state }) => {
console.log('action: ajaxCreate')
console.log(state)
console.log(state.ajaxCreateData)
const result = await communityAPI.create(
state.session_id,
state.ajaxCreateData.session_id,
state.ajaxCreateData.email,
state.ajaxCreateData.amount,
state.ajaxCreateData.memo,

View File

@ -7,73 +7,111 @@
<span class="btn-inner--text">{{ $t('site.overview.send_gradido') }} </span>
</base-button>
<b-collapse id="collapse-1" class="mt-2">
<b-card>
<p class="card-text">
<b-card >
<div v-if="scan">
<b-row>
<b-col>
<qrcode-capture @detect="onDetect" capture="user" ></qrcode-capture>
</b-col>
<b-col>
<span v-if="scan">
</b-row>
<b-row>
<qrcode-stream @decode="onDecode" @detect="onDetect" ></qrcode-stream>
<b-iconstack font-scale="5" @click="scan=false">
<b-icon stacked icon="upc-scan" variant="info" scale="0.75"></b-icon>
<b-icon stacked icon="slash-circle" variant="danger"></b-icon>
</b-iconstack>
</span>
<span v-else >
<img src="img/icons/gradido/qr-scan-pure.png" width="90" @click="scan=true"/>
scan jetzt
</span>
</b-col>
<b-alert show variant="secondary">
<span class="alert-text"><strong>QR Code Scanner</strong> - Scanne den QR Code deines Partners</span>
</b-alert>
<b-alert show variant="warning" >
<span class="alert-text" @click="scan=false"><strong>abrechen!</strong></span>
</b-alert>
</b-row>
<b-form @submit="onSubmit" @reset="onReset" v-if="show">
</div>
<validation-observer v-slot="{handleSubmit}" ref="formValidator">
<b-form role="form" @submit.prevent="handleSubmit(onSubmit)" @reset="onReset" v-if="show">
<br>
<qrcode-drop-zone id="input-0" v-model="form.img" ></qrcode-drop-zone>
<qrcode-drop-zone id="input-0" v-model="form.img"></qrcode-drop-zone>
<br>
<div>
<b-input-group
id="input-group-1"
label="Empfänger:"
label-for="input-1"
description="We'll never share your email with anyone else.">
description="We'll never share your email with anyone else."
size="lg"
class="mb-3"
>
<b-input-group-prepend>
<b-button variant="outline-primary">
<img src="img/icons/gradido/qr-scan-pure.png" width="50" @click="scan=true"/></b-button>
</b-input-group-prepend>
<b-form-input
id="input-1"
v-model="form.email"
type="email"
placeholder="E-Mail"
required></b-form-input>
<b-input-group-append>
<b-button variant="outline-primary" @click="adressbook">Adressbuch</b-button>
</b-input-group-append>
:rules="{required: true, email: true}"
required
style="font-size: xx-large; padding-left:20px"></b-form-input>
</b-input-group>
</div>
<br>
<div>
<b-input-group id="input-group-2" label="Betrag:" label-for="input-2">
<b-form-input id="input-2"
v-model="form.amount1"
type="number"
required
min="0" placeholder="0">
</b-form-input>.<h1>GDD.</h1>
<b-form-input id="input-3"
v-model="form.amount2"
type="number"
min="00" placeholder="00">
<b-input-group id="input-group-2" label="Betrag:" label-for="input-2"
size="lg"
class="mb-3"
>
<b-input-group-prepend>
<b-button variant="outline-primary">
<img src="img/icons/gradido/plus.png" width="50">
</b-button>
</b-input-group-prepend>
<b-form-input
id="input-2"
v-model="form.amount"
type="number"
placeholder="0.01"
step="0.01"
min="0.01"
max="1000"
style="font-size: xx-large; padding-left:20px">
</b-form-input>
<b-input-group-prepend>
<b-button >
<div class="h1">GDD</div>
</b-button>
</b-input-group-prepend>
</b-input-group>
<b-input-group >
<b-input-group-prepend>
<b-button >
<h1><b-icon icon="chat-right-text"></b-icon></h1>
</b-button>
</b-input-group-prepend>
<b-form-textarea v-model="form.memo"></b-form-textarea>
</b-input-group>
</div>
<br>
<b-button type="submit" variant="primary">jetzt versenden</b-button>
<b-button type="reset" variant="danger">Cancel</b-button>
<br>
</b-form>
</p>
</validation-observer>
</b-card>
</b-collapse>
</b-col>
@ -100,8 +138,8 @@ export default {
form: {
img: '',
email: '',
amount1: '',
amount2: ''
amount: '',
memo:''
}
}
},
@ -135,28 +173,31 @@ export default {
// ...
}
},
onSubmit(event) {
event.preventDefault()
alert(JSON.stringify(this.form))
this.modal = true
this.modal.h4 = 'TODO 1'
async onSubmit() {
//event.preventDefault()
console.log("onSubmit", this.form)
console.log("this.form.img", this.form.img)
console.log("this.form.email", this.form.email)
console.log("this.form.amount", this.form.amount)
console.log("this.form.memo", this.form.memo)
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.dispatch('ajaxCreate')
},
onReset(event) {
event.preventDefault()
// Reset our form values
this.form.email = ''
this.form.amount1 = ''
this.form.amount2 = ''
this.form.amount = ''
// Trick to reset/clear native browser form validation state
this.show = false
this.$nextTick(() => {
this.show = true
})
},
adressbook() {
this.modal = true
this.modaldata.h4 = 'Adressbuch'
this.modaldata.p = 'TODO ADRESSBUCH LISTE'
}
},
computed: {

View File

@ -5,24 +5,21 @@
<stats-card :title="$t('site.overview.current_balance')"
type="gradient-red"
sub-title="balance_gdd"
img="img/icons/gradido/my_gradido.png"
class="mb-4">
{{ balance_gdd }} GDD
<template slot="footer">
<span class="text-success mr-2">{{ balance_gtt }} GTT</span>
<span class="text-success mr-2">Wird immer angezeigt</span>
</template>
</stats-card>
</b-col>
<b-col xl="6" md="6">
<stats-card :title="$t('site.overview.gradido_received')"
type="gradient-orange"
sub-title="2,356 GDD"
img="img/icons/gradido/plus.png"
:sub-title="balance_gtt"
class="mb-4">
{{ balance_gtt }} GTT
<template slot="footer">
<span class="text-success mr-2">+ 12.18%</span>
<span class="text-nowrap">{{ $t('site.overview.since_last_month') }}</span>
<span class="text-nowrap">Wird nur angezeigt wenn user GTT besitzt.</span>
</template>
</stats-card>
</b-col>
@ -36,8 +33,8 @@ export default {
data(){
return {
balance_gdd: this.$store.state.user.balance,
balance_gtt: 2000,
balance_gtt: "0",
}
}
},
};
</script>

@ -1 +1 @@
Subproject commit 97b29601641c608113adad66e8b766f5169b32c3
Subproject commit 9b9115290c8d2ead756d64b70ae63a6571aa4693