- Bot Telegram ...

This commit is contained in:
Paolo Arena
2020-01-03 22:03:59 +01:00
parent 7b64358016
commit 9b9dcbfde1
10 changed files with 84 additions and 48 deletions

View File

@@ -206,7 +206,7 @@ export default class CGridTableRec extends Vue {
const startRow = (page - 1) * rowsPerPage const startRow = (page - 1) * rowsPerPage
const endRow = startRow + fetchCount const endRow = startRow + fetchCount
console.log('startRow', startRow) // console.log('startRow', startRow)
this.serverData = [] this.serverData = []
@@ -382,7 +382,7 @@ export default class CGridTableRec extends Vue {
public refresh() { public refresh() {
this.serverData = [] this.serverData = []
console.log('refresh') // console.log('refresh')
// console.log('this.search', this.search) // console.log('this.search', this.search)
if (!!this.search && this.search !== '') if (!!this.search && this.search !== '')
this.myfilter = this.search this.myfilter = this.search

View File

@@ -1,32 +1,34 @@
<template> <template>
<div> <div>
<q-banner <q-banner
inline-actions inline-actions
rounded dense rounded dense
:class="bgcolor+` q-my-md `+clcolor+ ` ` + myclass" :class="bgcolor+` q-my-sm `+clcolor+ ` ` + myclass"
style="text-align: center; " style="text-align: center; "
@click="myvisible = !myvisible" @click="myvisible = !myvisible"
> >
<template v-slot:avatar> <template v-slot:avatar>
<q-icon v-if="canopen" :name="icon" color="white" /> <q-icon v-if="canopen" :name="icon" color="white"/>
</template> </template>
<template v-slot:action> <template v-slot:action>
<q-icon v-if="canopen" :name="iconopen" color="white" /> <div class="cursor-pointer">
</template> <q-icon v-if="canopen" :name="iconopen" color="white"/>
<span :class="`mybanner `+ myclasstext" :style="mystyle">{{title}}</span> </div>
</q-banner> </template>
<span :class="`mybanner `+ myclasstext" :style="mystyle">{{title}}</span>
</q-banner>
<q-slide-transition> <q-slide-transition>
<div v-show="myvisible"> <div v-show="myvisible">
<slot></slot> <slot></slot>
</div> </div>
</q-slide-transition> </q-slide-transition>
</div> </div>
</template> </template>
<script lang="ts" src="./CTitleBanner.ts"> <script lang="ts" src="./CTitleBanner.ts">
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import './CTitleBanner.scss'; @import './CTitleBanner.scss';
</style> </style>

View File

@@ -340,7 +340,7 @@ export default class Header extends Vue {
return UserStore.state.isLogged return UserStore.state.isLogged
} }
get isVerified() { get isEmailVerified() {
return UserStore.state.my.verified_email return UserStore.state.my.verified_email
} }

View File

@@ -147,7 +147,7 @@
{{ $t('user.loggati') }} {{ $t('user.loggati') }}
</div> </div>
<div v-if="isLogged && !isVerified" class="text-verified">{{ <div v-if="isLogged && !isEmailVerified" class="text-verified">{{
$t('components.authentication.email_verification.verify_email') }} $t('components.authentication.email_verification.verify_email') }}
</div> </div>

View File

@@ -36,3 +36,4 @@ export * from './COpenStreetMap'
export * from './CTitleBanner' export * from './CTitleBanner'
export * from './CGallery' export * from './CGallery'
export * from './CProfile' export * from './CProfile'
export * from './CStatus'

View File

@@ -20,6 +20,7 @@ export interface IUserProfile {
teleg_id?: number teleg_id?: number
teleg_checkcode?: number teleg_checkcode?: number
paymenttypes?: IPaymentType[] paymenttypes?: IPaymentType[]
manage_telegram?: boolean
} }
export interface IPaymentType { export interface IPaymentType {

View File

@@ -124,6 +124,8 @@ const msgglobal = {
country_pay: 'Paese di Destinazione Pagamenti', country_pay: 'Paese di Destinazione Pagamenti',
username_telegram: 'Username Telegram', username_telegram: 'Username Telegram',
teleg_id: 'Telegram ID', teleg_id: 'Telegram ID',
teleg_checkcode: 'Codice Telegram',
manage_telegram: 'Gestori Telegram',
paymenttype: 'Modalità di Pagamenti Disponbili', paymenttype: 'Modalità di Pagamenti Disponbili',
img: 'Immagine', img: 'Immagine',
date_reg: 'Data Reg.', date_reg: 'Data Reg.',
@@ -506,6 +508,8 @@ const msgglobal = {
username_telegram: 'Usuario Telegram', username_telegram: 'Usuario Telegram',
teleg_id: 'Telegram ID', teleg_id: 'Telegram ID',
paymenttype: 'Métodos de pago disponibles', paymenttype: 'Métodos de pago disponibles',
teleg_checkcode: 'Codice Telegram',
manage_telegram: 'Gestori Telegram',
img: 'File image', img: 'File image',
date_reg: 'Fecha Reg.', date_reg: 'Fecha Reg.',
perm: 'Permisos', perm: 'Permisos',
@@ -877,6 +881,8 @@ const msgglobal = {
username_telegram: 'Nom d\'utilisateur du Telegram', username_telegram: 'Nom d\'utilisateur du Telegram',
teleg_id: 'Telegram ID', teleg_id: 'Telegram ID',
paymenttype: 'Méthodes de paiement disponibles', paymenttype: 'Méthodes de paiement disponibles',
teleg_checkcode: 'Codice Telegram',
manage_telegram: 'Gestori Telegram',
img: 'Fichier image', img: 'Fichier image',
date_reg: 'Date Inscript.', date_reg: 'Date Inscript.',
perm: 'Autorisations', perm: 'Autorisations',
@@ -1248,6 +1254,8 @@ const msgglobal = {
username_telegram: 'Username Telegram', username_telegram: 'Username Telegram',
teleg_id: 'Telegram ID', teleg_id: 'Telegram ID',
paymenttype: 'Available Payment Methods', paymenttype: 'Available Payment Methods',
teleg_checkcode: 'Codice Telegram',
manage_telegram: 'Gestori Telegram',
img: 'File Image', img: 'File Image',
date_reg: 'Reg. Date', date_reg: 'Reg. Date',
perm: 'Permissions', perm: 'Permissions',
@@ -1619,6 +1627,8 @@ const msgglobal = {
username_telegram: 'Username Telegram', username_telegram: 'Username Telegram',
teleg_id: 'Telegram ID', teleg_id: 'Telegram ID',
paymenttype: 'Available Payment Methods', paymenttype: 'Available Payment Methods',
teleg_checkcode: 'Codice Telegram',
manage_telegram: 'Gestori Telegram',
img: 'File Image', img: 'File Image',
date_reg: 'Reg. Date', date_reg: 'Reg. Date',
perm: 'Permissions', perm: 'Permissions',

View File

@@ -788,30 +788,39 @@ namespace Actions {
return await Api.SendReq('/loadsite/' + myuserid + '/' + process.env.APP_ID + '/' + showall, 'GET', null) return await Api.SendReq('/loadsite/' + myuserid + '/' + process.env.APP_ID + '/' + showall, 'GET', null)
.then((res) => { .then((res) => {
CalendarStore.state.bookedevent = (res.data.bookedevent) ? res.data.bookedevent : [] console.log('____________________________ res', res)
CalendarStore.state.eventlist = (res.data.eventlist) ? res.data.eventlist : [] if (res.status === 200) {
CalendarStore.state.operators = (res.data.operators) ? res.data.operators : [] CalendarStore.state.bookedevent = (res.data.bookedevent) ? res.data.bookedevent : []
CalendarStore.state.wheres = (res.data.wheres) ? res.data.wheres : [] CalendarStore.state.eventlist = (res.data.eventlist) ? res.data.eventlist : []
CalendarStore.state.contribtype = (res.data.contribtype) ? res.data.contribtype : [] CalendarStore.state.operators = (res.data.operators) ? res.data.operators : []
GlobalStore.state.settings = (res.data.settings) ? [...res.data.settings] : [] CalendarStore.state.wheres = (res.data.wheres) ? res.data.wheres : []
GlobalStore.state.disciplines = (res.data.disciplines) ? [...res.data.disciplines] : [] CalendarStore.state.contribtype = (res.data.contribtype) ? res.data.contribtype : []
GlobalStore.state.paymenttypes = (res.data.paymenttypes) ? [...res.data.paymenttypes] : [] GlobalStore.state.settings = (res.data.settings) ? [...res.data.settings] : []
GlobalStore.state.gallery = (res.data.gallery) ? [...res.data.gallery] : [] GlobalStore.state.disciplines = (res.data.disciplines) ? [...res.data.disciplines] : []
GlobalStore.state.paymenttypes = (res.data.paymenttypes) ? [...res.data.paymenttypes] : []
GlobalStore.state.gallery = (res.data.gallery) ? [...res.data.gallery] : []
if (showall) { if (showall) {
GlobalStore.state.newstosent = (res.data.newstosent) ? [...res.data.newstosent] : [] GlobalStore.state.newstosent = (res.data.newstosent) ? [...res.data.newstosent] : []
GlobalStore.state.mailinglist = (res.data.mailinglist) ? [...res.data.mailinglist] : [] GlobalStore.state.mailinglist = (res.data.mailinglist) ? [...res.data.mailinglist] : []
GlobalStore.state.mypage = (res.data.mypage) ? [...res.data.mypage] : [] GlobalStore.state.mypage = (res.data.mypage) ? [...res.data.mypage] : []
}
if (res.data.myuser) {
UserStore.mutations.authUser(res.data.myuser)
UserStore.mutations.updateLocalStorage(res.data.myuser)
}
CalendarStore.state.editable = UserStore.state.isAdmin || UserStore.state.isManager
if (res.data.myuser === null && UserStore.state.isLogged) {
// Fai Logout
UserStore.actions.logout()
GlobalStore.state.RightDrawerOpen = true
}
} }
if (res.data.myuser) {
UserStore.mutations.authUser(res.data.myuser)
UserStore.mutations.updateLocalStorage(res.data.myuser)
}
CalendarStore.state.editable = UserStore.state.isAdmin || UserStore.state.isManager
}) })
.catch((error) => { .catch((error) => {
console.log('error dbLoad', error) console.log('error dbLoad', error)

View File

@@ -48,6 +48,7 @@ export const DefaultProfile: IUserProfile = {
username_telegram: '', username_telegram: '',
teleg_id: 0, teleg_id: 0,
teleg_checkcode: 0, teleg_checkcode: 0,
manage_telegram: false,
paymenttypes: [] paymenttypes: []
} }
@@ -185,6 +186,12 @@ namespace Getters {
}, 'getRefLink') }, 'getRefLink')
const isVerificato = b.read((mystate: IUserState) => {
const teleg_ok = mystate.my.profile.teleg_id > 0
return teleg_ok
}, 'isVerificato')
export const getters = { export const getters = {
get isUserInvalid() { get isUserInvalid() {
return isUserInvalid() return isUserInvalid()
@@ -231,6 +238,9 @@ namespace Getters {
get getPaymenttypeById() { get getPaymenttypeById() {
return getPaymenttypeById() return getPaymenttypeById()
}, },
get isVerificato() {
return isVerificato()
},
} }
} }
@@ -680,6 +690,8 @@ namespace Actions {
Mutations.mutations.updateLocalStorage(myuser) Mutations.mutations.updateLocalStorage(myuser)
GlobalStore.actions.loadSite()
} }
} }

View File

@@ -406,6 +406,7 @@ export const fieldsTable = {
AddCol({ name: 'profile.country_pay', field: 'profile', subfield: 'country_pay', label_trans: 'reg.country_pay', fieldtype: tools.FieldType.nationality }), AddCol({ name: 'profile.country_pay', field: 'profile', subfield: 'country_pay', label_trans: 'reg.country_pay', fieldtype: tools.FieldType.nationality }),
AddCol({ name: 'profile.teleg_id', field: 'profile', subfield: 'teleg_id', label_trans: 'reg.teleg_id' }), AddCol({ name: 'profile.teleg_id', field: 'profile', subfield: 'teleg_id', label_trans: 'reg.teleg_id' }),
AddCol({ name: 'profile.teleg_checkcode', field: 'profile', subfield: 'teleg_checkcode', label_trans: 'reg.teleg_checkcode' }), AddCol({ name: 'profile.teleg_checkcode', field: 'profile', subfield: 'teleg_checkcode', label_trans: 'reg.teleg_checkcode' }),
AddCol({ name: 'profile.manage_telegram', field: 'profile', subfield: 'manage_telegram', label_trans: 'reg.manage_telegram', fieldtype: tools.FieldType.boolean }),
AddCol({ name: 'profile.paymenttypes', field: 'profile', subfield: 'paymenttypes', label_trans: 'reg.paymenttype', fieldtype: tools.FieldType.multiselect, jointable: 'paymenttypes' }), AddCol({ name: 'profile.paymenttypes', field: 'profile', subfield: 'paymenttypes', label_trans: 'reg.paymenttype', fieldtype: tools.FieldType.multiselect, jointable: 'paymenttypes' }),
AddCol({ name: 'profile.img', field: 'profile', subfield: 'img', label_trans: 'reg.img', sortable: false }), AddCol({ name: 'profile.img', field: 'profile', subfield: 'img', label_trans: 'reg.img', sortable: false }),
AddCol({ name: 'date_reg', label_trans: 'reg.date_reg', fieldtype: tools.FieldType.date }), AddCol({ name: 'date_reg', label_trans: 'reg.date_reg', fieldtype: tools.FieldType.date }),