surya/myprojplanet_vite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

++ DebugOn status (to see what happened)

Browse Source 
fix visu activities
This commit is contained in:
Surya Paolo
2022-12-14 22:07:23 +01:00
parent bd0eab53ae
commit fbcd076705
22 changed files with 69 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/CGridTableRec/CGridTableRec.ts
View File

@@ -279,7 +279,12 @@ export default defineComponent({
const tablesel = ref('')
const loading = ref(false)
const editOn = ref(false)
const editOn = computed({
get: () => globalStore.editOn,
set: val => {
globalStore.editOn = val
},
})
const visupagedialog = ref(false)
const myrecdialog = ref(null)
@@ -1017,6 +1022,7 @@ export default defineComponent({
// @ts-ignore
myinfscroll.value.resume()
}
done()
}
}

7
src/components/CGridTableRec/CGridTableRec.vue
View File

@@ -1,4 +1,7 @@
<template>
<div v-if="tools.isDebugOn()">
</div>
<div :class="$q.screen.lt.sm ? `` : `q-pa-xs`" v-if="isfinishLoading">
<q-toggle
v-if="tools.isManager()"
@@ -312,7 +315,7 @@
</div>
<q-infinite-scroll
ref="myinfscroll"
v-if="shared_consts.VERTIC_SHOW_GRID.includes(myvertical)"
v-if="shared_consts.VERTIC_SHOW_GRID.includes(myvertical) && !loading"
:initial-index="0"
@load="onLoadScroll"
:offset="350"
@@ -486,7 +489,7 @@
</div>
</div>
<template v-slot:loading>
<div class="row justify-center q-my-md">
<div class="text-center">
<q-spinner-dots color="primary" size="40px" />
</div>
</template>

2
src/components/CMyCircuit/CMyCircuit.vue
View File

@@ -17,7 +17,7 @@
</q-item-label>
<q-item-label @click="naviga(tools.getPathByTableAndRec(table, circuit))" v-if="circuit.longdescr" caption lines="3"><em>{{ circuit.longdescr }}</em>
</q-item-label>
<q-item-label caption lines="1">
<q-item-label caption lines="3">
<q-chip
v-if="circuit.status !== undefined && circuit.status !== 0" :color="circuitStore.getColorCircuitClass(circuit)"
text-color="white"

4
src/components/CMyElem/CMyElem.ts
View File

@@ -1,4 +1,5 @@
import {
computed,
defineComponent, onMounted, PropType, ref, toRef, watch,
} from 'vue'
@@ -100,6 +101,8 @@ export default defineComponent({
const myel = toRef(props, 'myelem')
const newtype = ref(<any>'')
const isAppRunning = computed(() => globalStore.isAppRunning )
watch(() => myel.value.order, (value, oldval) => {
mounted()
})
@@ -280,6 +283,7 @@ export default defineComponent({
visushare,
social,
clickshare,
isAppRunning,
}
},

3
src/components/CMyElem/CMyElem.vue
View File

@@ -441,8 +441,11 @@
</div>
<div v-else-if="myel.type === shared_consts.ELEMTYPE.REGISTRATION">
<div v-if="editOn" class="elemEdit">Registrazione</div>
<div v-if="isAppRunning || $q.screen.gt.xs">
<CRegistration />
</div>
</div>
<div v-else-if="myel.type === shared_consts.ELEMTYPE.BUTTON">
<div v-if="editOn" class="elemEdit"></div>
<div

2
src/components/CMyGroup/CMyGroup.vue
View File

@@ -11,7 +11,7 @@
<q-item-section @click="naviga(tools.getPathByGroup(grp, table))">
<q-item-label><strong>{{ grp.title }}</strong> ({{ grp.groupname }})
</q-item-label>
<q-item-label v-if="grp.descr" caption lines="1"><em>{{ grp.descr }}</em></q-item-label>
<q-item-label v-if="grp.descr" caption lines="3"><em>{{ grp.descr }}</em></q-item-label>
</q-item-section>
<q-item-section side v-if="visu === costanti.MY_GROUPS">

1
src/components/CMyPopupEdit/CMyPopupEdit.scss
View File

@@ -10,7 +10,6 @@
/*border-radius: $generic-border-radius */
}
.extrafield{
color: black;
font-size: 1rem;
padding: 4px;
}

6
src/components/CMyPopupEdit/CMyPopupEdit.vue
View File

@@ -80,12 +80,12 @@
</div>
</div>
<div v-else-if="col.fieldtype === costanti.FieldType.username_chip">
<div class="q-ma-xs chip_shadow">
<div class="">
<span v-if="col.extrafield">
<span class="extrafield">{{ $t(col.extrafield) }}</span>
</span>
</div>
<div class="q-ma-xs chip_shadow">
<div
v-if="
(col.tipovisu === costanti.TipoVisu.LINK ||

4
src/components/CMyRecCard/CMyRecCard.vue
View File

@@ -34,7 +34,7 @@
</q-item-section>
<q-item-section @click="navigaExt(myrec)">
<q-item-label lines="1" class="full-width" >
<q-item-label lines="2" class="full-width" >
<span v-for="(rec, ind) of tools.getArrSubSector(table, myrec)" :key="ind">
<q-chip dense class="text-center shadow-5 glossy text-white bg-green">{{ rec.descr }}</q-chip>
</span>
@@ -49,7 +49,7 @@
</q-item-label>
<q-item-label lines="4" v-if="myrec.descr">{{ myrec.descr }}<br>
</q-item-label>
<q-item-label lines="1" style="text-align: right" class="text_user_city">
<q-item-label lines="2" style="text-align: right" class="text_user_city">
<span class="text-weight-bold">{{ getNameToShow(myrec) }}</span> -
<span v-for="(rec, ind) of myrec.mycities" :key="ind"><span v-if="ind > 0">, </span>{{ rec.comune }} ({{ rec.prov }})</span>
</q-item-label>

2
src/components/CMyRecCircuitCard/CMyRecCircuitCard.vue
View File

@@ -18,7 +18,7 @@
<q-item-label @click="naviga(tools.getPathByTableAndRec(table, circuit))"><strong>{{ circuit.name }}</strong> <span v-if="circuit.subname"> ({{ circuit.subname }})</span>
</q-item-label>
<q-item-label @click="naviga(tools.getPathByTableAndRec(table, circuit))" v-if="circuit.longdescr" caption lines="3"><em>{{ circuit.longdescr }}</em></q-item-label>
<q-item-label caption lines="1">
<q-item-label caption lines="2">
<q-chip
v-if="circuit.status !== undefined && circuit.status !== 0" :color="circuitStore.getColorCircuitClass(circuit)"
text-color="white"

2
src/components/CMySelect/CMySelect.vue
View File

@@ -48,7 +48,7 @@
@remove="scope.removeAtIndex(scope.index)"
v-if="checkIfShowRec(scope.opt)"
:color="$q.dark.isActive ? `black` : `white`"
text-color="mycol"
:text-color="$q.dark.isActive ? `white` : `black`"
class="q-my-none q-ml-xs q-mr-none"
>
<q-avatar color="primary" text-color="white" icon="" size="12px"/>

15
src/components/CRegistration/CRegistration.vue
View File

@@ -24,9 +24,8 @@
control-color="white"
navigation
padding
arrows
height="400px"
:class="($q.dark.isActive ? `text-white`: `text-black`) + ` bg-primary shadow-1 rounded-borders`"
height="500px"
:class="`text-white bg-primary shadow-1 rounded-borders`"
>
<q-carousel-slide name="start" class="column no-wrap flex-center">
<q-icon name="fas fa-user" size="56px" />
@@ -104,16 +103,9 @@
>
<span :class="($q.dark.isActive ? `text-white`: `text-black`) + `text-h7`"
>Chiedi alla persona che ti ha invitato su RISO il suo
Username e poi :</span
><br />
Username e poi :</span>
<div class="row items-center">
<div class="col-12">
<p class="text-bold text-center">
<span style="font-size: 1.5rem">👇🏻 </span> ⭐️
<span :class="$q.dark.isActive ? `text-white`: `text-black`">Consigliato ⭐️</span>
<span style="font-size: 1.5rem"> 👇🏻 </span>
</p>
<q-btn
rounded
class="flex-item-btn"
@@ -123,6 +115,7 @@
to="/bot"
:label="$t('reg.bytelegram')"
>
<q-badge color="red" align="bottom" floating>Consigliato</q-badge>
</q-btn>
</div>
</div>

2
src/components/CSaldo/CSaldo.vue
View File

@@ -20,7 +20,7 @@
</CCurrencyValue>
<div v-if="!small && account && account.notifspending && account.notifspending.length > 0" :class="`text-h5 full-width`"
<div v-if="!small && account && account.notifspending && account.notifspending.length > 0" :class="`text-h7 full-width`"
:style="(!$q.screen.lt.sm ? `min-width: 250px; ` : ``) + (color_border ? `border-color: ` + color_border + `!important;`: '')">
<div class="text-center text-h7-dense text-italic text-grey-14">
{{ t('movement.pendingtransaction') }}

2
src/components/CSkill/CSkill.vue
View File

@@ -1,6 +1,6 @@
ù<template>
<div>
<div class="q-my-sm q-gutter-xs q-py-xs">
<div class="q-my-xs">
<CGridTableRec
v-if="filtercustom.length > 0 && col && col.length > 0"
:prop_mytable="table"

1
src/model/GlobalStore.ts
View File

@@ -239,6 +239,7 @@ export interface IConfPages {
enableTodos: boolean
enableRegByBot: boolean
enableRegMultiChoice: boolean
enableDebugOn: boolean
enabledRegNeedTelegram: boolean
showViewGroups: boolean
showViewCircuits: boolean

10
src/rootgen/admin/confsite/confsite.vue
View File

@@ -583,6 +583,16 @@
:type="costanti.FieldType.boolean"
>
</CMyFieldDb>
<CMyFieldDb
table="sites"
:title="$t('confpages.enableDebugOn')"
:id="mysite._id"
:rec="mysite"
mykey="confpages"
mysubkey="enableDebugOn"
:type="costanti.FieldType.boolean"
>
</CMyFieldDb>
<CMyFieldDb
table="sites"
:title="$t('confpages.enabledRegNeedTelegram')"

1
src/statics/lang/it.js
View File

@@ -1332,6 +1332,7 @@ const msg_it = {
enableTodos: 'Mostra Todos',
enableRegByBot: 'Registratione By Bot',
enableRegMultiChoice: 'Registratione a Scelta tra Email e Telegram',
enableDebugOn: 'Attiva Debug',
enabledRegNeedTelegram: 'Reg con Telegram',
showViewGroups: 'Bott. Gruppi',
showViewUsers: 'Bott. Users',

6
src/store/Modules/tools.ts
View File

@@ -5003,6 +5003,12 @@ export const tools = {
return userStore.my.profile ? userStore.my.profile.teleg_id! > 0 : false
},
isDebugOn(): boolean {
const globalStore = useGlobalStore()
const site = globalStore.site
return (site.confpages.enableDebugOn)
},
isVerified(): boolean {
const globalStore = useGlobalStore()
const site = globalStore.site

1
src/store/globalStore.ts
View File

@@ -165,6 +165,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
enableRegByBot: false,
enableRegMultiChoice: false,
enabledRegNeedTelegram: false,
enableDebugOn: false,
showButtHome: false,
showViewGroups: false,
showViewCircuits: false,

4
src/views/user/myactivities/myactivities.vue
View File

@@ -45,8 +45,8 @@
>
<div v-if="site.confpages.showNameSurname">
<div class="text-h6">
<span v-if="checkifShow('name')"> {{ myuser.name }}</span>
<span v-if="checkifShow('surname')">{{
<span v-if="checkifShow('name') && myuser.name"> {{ myuser.name }}</span>
<span v-if="checkifShow('surname') && myuser.surname">{{
myuser.surname
}}</span>
</div>

4
src/views/user/myprofile/myprofile.ts
View File

@@ -53,6 +53,7 @@ export default defineComponent({
const username = computed(() => $route.params.username ? $route.params.username.toString() : userStore.my.username)
const idnotif = computed(() => $route.query.idnotif ? $route.query.idnotif.toString() : '')
const isDebugOn = computed(() => tools.isDebugOn())
const filtroutente = ref(<any[]>[])
const showPic = ref(false)
@@ -108,8 +109,8 @@ export default defineComponent({
}
})
}
caricato.value = true
}
}catch (e) {
console.error('ERR loadProfile', e)
}
@@ -199,6 +200,7 @@ export default defineComponent({
showsendCoinTo,
site,
listcircuitsfiltered,
isDebugOn,
}
}
})

13
src/views/user/myprofile/myprofile.vue
View File

@@ -1,4 +1,10 @@
<template>
<div v-if="isDebugOn" class="bg-red text-white">
Logged: {{tools.isLogged()}}
UserOk: {{tools.isUserOk()}}
caricato: {{caricato}}
myuser: {{myuser.username}}
</div>
<div v-if="!tools.isLogged()">
<CCheckIfIsLogged></CCheckIfIsLogged>
</div>
@@ -30,6 +36,7 @@
<div v-if="myuser">
<CNotifAtTop />
<div class="q-gutter-sm q-pa-sm q-pb-md">
<div
v-if="myuser && myuser.date_reg"
class="fit column no-wrap justify-evenly items-center content-start"
@@ -54,7 +61,7 @@
</div>
<div class="last_access">
Ultimo accesso: {{tools.timeAgo(myuser.lasttimeonline)}}
OnLine: {{tools.timeAgo(myuser.lasttimeonline)}}
</div>
<div v-if="myuser.reported">
@@ -68,8 +75,8 @@
<div v-if="site.confpages.showNameSurname">
<div class="text-h6">
<span v-if="checkifShow('name')"> {{ myuser.name }}</span>
<span v-if="checkifShow('surname')">{{ myuser.surname }}</span>
<span v-if="checkifShow('name') && myuser.name"> {{ myuser.name }}</span>
<span v-if="checkifShow('surname') && myuser.surname">{{ myuser.surname }}</span>
</div>
</div>
<div class="col-12 text-h7 text-blue text-shadow-2">