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

update community

Browse Source
This commit is contained in:
einhornimmond 2021-03-10 15:56:01 +01:00
commit 8c14a07872
3 changed files with 60 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
frontend/src/App.vue
View File

@ -17,19 +17,21 @@ import icon from "./icon.js";
export default { export default {
name: 'app', name: 'app',
components: { components: {
ParticlesBg, ParticlesBg
}, },
created () { created () {
//console.log("this.$cookies.get('gdd_session_id') ", this.$cookies.get('gdd_session_id') ) //console.log("this.$cookies.get('gdd_session_id') ", this.$cookies.get('gdd_session_id') )
//console.log(" $cookies.isKey('gdd_session_id') == true", this.$cookies.isKey("gdd_session_id") == true ) console.log(" $cookies.isKey('gdd_session_id') ", this.$cookies.isKey("gdd_session_id") )
if ( this.$cookies.get('gdd_session_id') == this.$store.state.session_id ) { if ( this.$cookies.isKey('gdd_session_id') ) {
//this.$store.state.email = this.$cookies.get('gdd_u') //this.$store.state.email = this.$cookies.get('gdd_u')
console.log("login to kontooverview")
this.$router.push('/KontoOverview') this.$router.push('/KontoOverview')
}else { }else {
console.log("login to LOGIN")
this.$router.push("/Login") this.$router.push("/Login")
} }
}, },
data: function () { data() {
return { return {
config: { config: {
num: [1, 7], num: [1, 7],
@ -51,12 +53,11 @@ export default {
</script> </script>
<style> <style>
.btn { .btn {
background-color: #5A7B02; background-color: #5A7B02;
border-color: #5e72e4; border-color: #5e72e4;
} }
a, .copyright{ a, .copyright{
color: #5A7B02; color: #5A7B02;
} }
gradido-global-color-text{color: #3D443B } gradido-global-color-text{color: #3D443B }
gradido-global-color-accent{color: #047006 } gradido-global-color-accent{color: #047006 }

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

@ -59,8 +59,10 @@ export const store = new Vuex.Store({
// Asyncronous actions - used for api calls // Asyncronous actions - used for api calls
actions: { actions: {
login: async ({ dispatch, commit }, data) => { login: async ({ dispatch, commit }, data) => {
//console.log('action: login') console.log('action: login')
const result = await loginAPI.login(data.email,data.password) const result = await loginAPI.login(data.email,data.password)
console.log('result',result)
console.log('result.success',result.success)
if( result.success ){ if( result.success ){
commit('session_id', result.result.data.session_id) commit('session_id', result.result.data.session_id)
commit('email', data.email) commit('email', data.email)

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

@ -22,27 +22,53 @@
<b-form @submit="onSubmit" @reset="onReset" v-if="show"> <b-form @submit="onSubmit" @reset="onReset" v-if="show">
<b-row class="form-group"> <b-row class="form-group">
<label for="example-datetime-local-input" class="col-md-2 col-form-label form-control-label">von</label> <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"> <b-col md="10">
<base-input type="datetime-local" value="2018-11-23T10:30:00" v-model="form.from"/> <base-input type="datetime-local" value="2018-11-23T10:30:00" v-model="form.from" @change="dateDiff" />
</b-col> </b-col>
</b-row> </b-row>
<b-row class="form-group"> <b-row class="form-group">
<label for="example-datetime-local-input" class="col-md-2 col-form-label form-control-label">bis</label> <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"> <b-col md="10">
<base-input type="datetime-local" value="2018-11-23T10:30:00" v-model="form.to"/> <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-col>
</b-row> </b-row>
<b-row class="form-group"> <b-row class="form-group">
<label class="col-md-2 col-form-label form-control-label">Ort</label> <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"> <b-col md="10">
<base-input placeholder="Berlin" v-model="form.location"></base-input> <base-input placeholder="Berlin" v-model="form.location" class="form-control-lg"></base-input>
</b-col> </b-col>
</b-row> </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"> <base-input label="Beitrag">
<textarea class="form-control" id="exampleFormControlTextarea3" rows="3" v-model="form.text"></textarea> <textarea class="form-control form-control-lg" rows="3" v-model="form.text" ></textarea>
</base-input> </base-input>
<br> <br>
@ -61,6 +87,7 @@
</template> </template>
<script> <script>
export default { export default {
name: 'GDDAddWork', name: 'GDDAddWork',
data(){ data(){
@ -69,11 +96,12 @@ export default {
form: { form: {
from:'', from:'',
to: '', to: '',
hours: 0, hours: '',
text: '', text: '',
gdd: 0.00, gdd: 0.00,
location: '', location: '',
text2: '' text2: '',
sendtime: ''
}, },
timestamp: "" timestamp: ""
} }
@ -82,24 +110,23 @@ export default {
setInterval(this.getNow, 2000); setInterval(this.getNow, 2000);
}, },
methods: { methods: {
getNow: function() { dateDiff() {
const today = new Date(); this.form.hours = ((((this.$moment(this.form.to)) - (this.$moment(this.form.from)))/1000)/3600)
const date = today.getDate()+'.'+(today.getMonth()+1)+'.'+ today.getFullYear();
const time = today.getHours() + ":" + today.getMinutes();
const dateTime = date +', '+ time;
this.timestamp = new Date();
}, },
getHours: function (from,to) { getNow: function() {
const a = (to - from) //const today = new Date()
console.log("(to - from)", (to - from)) //const date = today.getDate()+'.'+(today.getMonth()+1)+'.'+ today.getFullYear();
console.log("a summe", a) //const time = today.getHours() + ":" + today.getMinutes();
//const dateTime = date +', '+ time;
this.timestamp = new Date()
}, },
onSubmit(event) { onSubmit(event) {
event.preventDefault() event.preventDefault()
console.log("onSUBMIT this.form.from >>>>", this.form.from) 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.from >>>>", this.$moment(this.form.from))
console.log("onSUBMIT this.form.to >>>>", this.form.to) console.log("onSUBMIT this.form.to >>>>", this.form.to)
// console.log("onSUBMIT >>>>", this.getHours(this.form.from, this.form.to)) // console.log("onSUBMIT >>>>", this.getHours(this.form.from, this.form.to))
this.form.sendtime = new Date()
alert(JSON.stringify(this.form)) alert(JSON.stringify(this.form))
}, },