diff --git a/_ALL_SITES/riso.app/db/lang/ws_it.js b/_ALL_SITES/riso.app/db/lang/ws_it.js index b412e7b8..865d73d1 100755 --- a/_ALL_SITES/riso.app/db/lang/ws_it.js +++ b/_ALL_SITES/riso.app/db/lang/ws_it.js @@ -56,6 +56,7 @@ const msg_website_it = { SignUpIscrizione: 'Diventa Socio CNM', SignUp_alreadylista: 'Registrazione per quelli che erano giĆ  nella lista di Notevole (del 2019) !', SignUp2: 'Registrazione', + SignUp3: 'Reg', SignUpBot: 'Registrati', SignIn: 'Login', status: 'Statistiche', diff --git a/_ALL_SITES/riso.app/db/static_data.ts b/_ALL_SITES/riso.app/db/static_data.ts index 6418790d..fdc2e513 100755 --- a/_ALL_SITES/riso.app/db/static_data.ts +++ b/_ALL_SITES/riso.app/db/static_data.ts @@ -773,7 +773,7 @@ const baseroutes: IListRoutes[] = [ { active: functionality.ENABLE_REGISTRATION && functionality.ENABLE_REG_NEED_TELEGRAM, order: 1000, - path: '/signup/:invited/:usernameteleg/:idteleg', + path: '/signup/:invited/:usernameteleg/:idteleg/:regexpire', materialIcon: 'how_to_reg', name: 'pages.SignUp', component: () => import('@/views/login/signup/signup.vue'), @@ -813,6 +813,17 @@ const baseroutes: IListRoutes[] = [ infooter: false, separator: false }, + { + active: true, + order: 1002, + path: '/signup/:invited/:regexpire', + materialIcon: 'how_to_reg', + name: 'pages.SignUp3', + component: () => import('@/views/login/signup/signup.vue'), + inmenu: false, + infooter: false, + separator: false + }, { active: functionality.ENABLE_REGISTRATION, order: 2000, diff --git a/_ALL_SITES/riso.app/quasar.conf.js b/_ALL_SITES/riso.app/quasar.conf.js index 74072d12..cbf36237 100755 --- a/_ALL_SITES/riso.app/quasar.conf.js +++ b/_ALL_SITES/riso.app/quasar.conf.js @@ -278,7 +278,10 @@ module.exports = configure((ctx) => ({ pwa: { workboxPluginMode: 'InjectManifest', // 'GenerateSW' or 'InjectManifest' workboxOptions: {}, // only for GenerateSW - + extendGenerateSWOptions (cfg) { + cfg.skipWaiting = false + cfg.clientsClaim = false + }, // for the custom service worker ONLY (/src-pwa/custom-service-worker.[js|ts]) // if using workbox in InjectManifest mode chainWebpackCustomSW(chain) { @@ -320,6 +323,26 @@ module.exports = configure((ctx) => ({ sizes: '96x96', type: 'image/png', }, + { + src: 'images/riso-apple-icon-120x120.png', + sizes: '120x120', + type: 'image/png', + }, + { + src: 'images/riso-apple-icon-144x144.png', + sizes: '144x144', + type: 'image/png', + }, + { + src: 'images/riso-apple-icon-152x152.png', + sizes: '152x152', + type: 'image/png', + }, + { + src: 'images/riso-apple-icon-180x180.png', + sizes: '180x180', + type: 'image/png', + }, ], }, }, diff --git a/src/components/CCurrencyValue/CCurrencyValue.ts b/src/components/CCurrencyValue/CCurrencyValue.ts index 6372848c..a8aecc7d 100755 --- a/src/components/CCurrencyValue/CCurrencyValue.ts +++ b/src/components/CCurrencyValue/CCurrencyValue.ts @@ -7,6 +7,10 @@ import { useI18n } from '@/boot/i18n' export default defineComponent({ name: 'CCurrencyValue', props: { + small: { + type: Boolean, + default: false, + }, label: { type: String, required: false, diff --git a/src/components/CCurrencyValue/CCurrencyValue.vue b/src/components/CCurrencyValue/CCurrencyValue.vue index 67525e51..b40f1ae8 100755 --- a/src/components/CCurrencyValue/CCurrencyValue.vue +++ b/src/components/CCurrencyValue/CCurrencyValue.vue @@ -1,22 +1,35 @@ diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index b9cac4b2..6c0628bd 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -168,6 +168,13 @@ export default defineComponent({ return [] } }, + filterextra: { + type: Array, + required: false, + default: () => { + return [] + } + }, extraparams: { required: false, default: {}, @@ -763,6 +770,8 @@ export default defineComponent({ // @ts-ignore filtercustom, // @ts-ignore + filterextra: props.filterextra, + // @ts-ignore filter_gte, sortBy: myobj, descending, diff --git a/src/components/CMyCircuit/CMyCircuit.vue b/src/components/CMyCircuit/CMyCircuit.vue index dfaa6b0c..9ca357ba 100755 --- a/src/components/CMyCircuit/CMyCircuit.vue +++ b/src/components/CMyCircuit/CMyCircuit.vue @@ -21,7 +21,7 @@ {{ globalStore.getValueByTableSingle('statuscircuit', circuit.status) }} diff --git a/src/components/CMyRecCircuitCard/CMyRecCircuitCard.vue b/src/components/CMyRecCircuitCard/CMyRecCircuitCard.vue index ef9c2618..8fc1e1f0 100755 --- a/src/components/CMyRecCircuitCard/CMyRecCircuitCard.vue +++ b/src/components/CMyRecCircuitCard/CMyRecCircuitCard.vue @@ -22,7 +22,7 @@ {{ globalStore.getValueByTableSingle('statuscircuit', circuit.status) }} null) + const circuit = ref(null) watch(() => props.mycontact, (newval, oldval) => { console.log('watch: mycontact') @@ -91,6 +95,8 @@ export default defineComponent({ username.value = props.mycontact.username } } + + circuit.value = circuitStore.getCircuitByName(props.circuitname) } function getImgUser(profile: IUserFields) { @@ -121,6 +127,7 @@ export default defineComponent({ userStore, tools, showsendCoinTo, + circuit, } }, }) diff --git a/src/components/CMyUser/CMyUser.vue b/src/components/CMyUser/CMyUser.vue index 8e113628..5484085c 100755 --- a/src/components/CMyUser/CMyUser.vue +++ b/src/components/CMyUser/CMyUser.vue @@ -15,9 +15,21 @@ {{ contact.profile.qualifica }} {{ labelFooter }} + + + + + + + + -
{{ t('movement.pendingtransaction') }} diff --git a/src/components/CSignUp/CSignUp.ts b/src/components/CSignUp/CSignUp.ts index 4631db65..6125b7a9 100755 --- a/src/components/CSignUp/CSignUp.ts +++ b/src/components/CSignUp/CSignUp.ts @@ -281,7 +281,6 @@ export default defineComponent({ } } - function myRuleEmail(val: string) { return new Promise((resolve, reject) => { diff --git a/src/components/CSignUp/CSignUp.vue b/src/components/CSignUp/CSignUp.vue index c6d19a46..72553510 100755 --- a/src/components/CSignUp/CSignUp.vue +++ b/src/components/CSignUp/CSignUp.vue @@ -12,7 +12,7 @@
- +
diff --git a/src/css/app.scss b/src/css/app.scss index d9c8b965..58cb599a 100755 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -235,6 +235,21 @@ $heightBtn: 100%; letter-spacing: .00937em; } +.text-3d { + letter-spacing: .00937em; + font-size: 1rem; + text-shadow: 1rem 1rem 2rem #ff0; +} + +.text-currency { + padding: 2px 2px; + font-size: 0.65rem; + font-weight: bold !important; + line-height: 1.55rem; + text-shadow: .0525rem .0525rem .125rem rgb(0, 0, 0); + letter-spacing: .00937em; +} + @media (max-width: 718px) { // PER VERSIONE MOBILE @@ -734,7 +749,11 @@ $heightBtn: 100%; } .text-h8{ - font-size: 0.85rem; + font-size: 0.85rem !important; +} + +.text-h9{ + font-size: 0.65rem !important; } .bordo_stondato, .bordo_stondato_blu{ @@ -771,6 +790,16 @@ $heightBtn: 100%; border: solid 3px #49b502; } +.bordo_stondato_small{ + margin: 0px; + border-radius: 2rem; + padding-left: 4px; + padding-right: 4px; + padding-top: 0px; + padding-bottom: 0px; + border: solid 2px #49b502; +} + .bordo_stondato_pending{ margin: 4px; border-radius: 3rem; @@ -1039,16 +1068,6 @@ $heightBtn: 100%; } -.bordo_stondato_small{ - margin: 4px; - border-radius: 1rem; - padding-left: 2px; - padding-right: 2px; - padding-top: 2px; - padding-bottom: 2px; - border: solid 2px #49b502; -} - .accom_num, .accom_maxosp { font-size: 1.25rem; background-color: green; @@ -1171,3 +1190,11 @@ $heightBtn: 100%; padding: 2px; font-weight: bold; } + +.q-pa-xxs { + padding: 2px 2px; +} + +.q-pa-sm2 { + padding: 12px 12px; +} diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts index 5a98e2f7..a097a77f 100755 --- a/src/model/GlobalStore.ts +++ b/src/model/GlobalStore.ts @@ -573,6 +573,7 @@ export interface IParamsQuery { filtersearch: string filtersearch2: string filtercustom: string + filterextra?: string filter_gte: string lookup1?: IParLookup lookup2?: IParLookup diff --git a/src/rootgen/admin/importdata/importdata.ts b/src/rootgen/admin/importdata/importdata.ts index 12b2956b..9324884d 100755 --- a/src/rootgen/admin/importdata/importdata.ts +++ b/src/rootgen/admin/importdata/importdata.ts @@ -93,6 +93,7 @@ export default defineComponent({ filtersearch: '', filtersearch2: '', filtercustom: '', + filterextra: '', filter_gte: '', sortBy: myobj, descending, diff --git a/src/store/CircuitStore.ts b/src/store/CircuitStore.ts index b4efd087..ec97efce 100755 --- a/src/store/CircuitStore.ts +++ b/src/store/CircuitStore.ts @@ -68,6 +68,10 @@ export const useCircuitStore = defineStore('CircuitStore', { return 'red' }, + getCircuitByName(circuitname: string): ICircuit | undefined | null { + return this.listcircuits.find((rec: ICircuit) => rec.name === circuitname) + }, + async loadCircuits() { return Api.SendReq('/users/circuits', 'POST', null) .then((res) => { diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index f0e52eef..9a95f58d 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -2377,6 +2377,12 @@ export const colTableUsersISP = [ AddCol({ name: 'profile.teleg_id', field: 'profile', subfield: 'teleg_id', label_trans: 'reg.teleg_id', }), + AddCol({ + name: 'tokenreg', label_trans: 'reg.tokenreg', + }), + AddCol({ + name: 'date_tokenreg', label_trans: 'reg.date_tokenreg', + }), AddCol({ name: 'profile.teleg_id_old', field: 'profile', diff --git a/src/views/user/mycircuit/mycircuit.ts b/src/views/user/mycircuit/mycircuit.ts index e7d2a9dc..d8273f7e 100755 --- a/src/views/user/mycircuit/mycircuit.ts +++ b/src/views/user/mycircuit/mycircuit.ts @@ -49,13 +49,13 @@ export default defineComponent({ const path = computed(() => $route.params.path ? $route.params.path.toString() : '') const idnotif = computed(() => $route.query.idnotif ? $route.query.idnotif.toString() : '') - const filtroutente = ref([]) + const filtroutente = ref([] as any[]) const showPic = ref(false) - const circuit = ref({}) + const circuit = ref({} as ICircuit | null) const account = computed(() => circuit.value ? userStore.getAccountByCircuitId(circuit.value._id) : null) - const mystatus = ref(0) - const users_in_circuit = ref([]) + const mystatus = ref(0 as number) + const users_in_circuit = ref([] as IFriends[]) const qtarem = computed(() => account.value ? circuitStore.getRemainingCoinsToSend(account.value) : 0) const saldo = computed(() => account.value ? account.value.saldo : 0) @@ -69,11 +69,12 @@ export default defineComponent({ const tab = ref('membri') const arrfilterand: any = ref([]) + const filterextra: any = ref([]) const filtercustom: any = ref([]) const filtercustom_rich: any = ref([]) - const searchList = ref([]) + const searchList = ref([] as ISearchList[]) - const cities = ref([]) + const cities = ref([] as ICity[]) watch(() => path.value, (to: any, from: any) => { loadCircuit() @@ -105,8 +106,8 @@ export default defineComponent({ searchList.value = [] if (circuit.value) { - filtercustom.value = [ - { + filterextra.value = [ + /*{ 'profile.mycircuits': { $elemMatch: { @@ -115,6 +116,71 @@ export default defineComponent({ } } }, + + */ + + { + $match: {idapp: process.env.APP_ID, + 'profile.mycircuits': { + $elemMatch: {circuitname: {$eq: circuit.value.name}}, + }, + }, + }, + + { + $lookup: { + from: 'circuits', + as: 'circuit', + let: {circuitname: circuit.value.name, idapp: '$idapp'}, + pipeline: [ + { + $match: + { + $expr: + { + $and: + [ + {$eq: ['$name', '$$circuitname']}, + {$eq: ['$idapp', '$$idapp']}, + + ], + }, + }, + }, + ], + }, + + }, + { $unwind: '$circuit'}, + { + $project: { username: 1, profile: 1, idapp: 1, 'circuit.name': 1, 'circuit._id': 1 } + + }, + + { + $lookup: { + from: 'accounts', + as: 'account', + let: {username: '$username', idapp: '$idapp', circuitId: '$circuit._id'}, + pipeline: [ + { + $match: + { + $expr: + { + $and: + [ + {$eq: ['$$username', '$username']}, + {$eq: ['$$idapp', '$idapp']}, + {$eq: ['$$circuitId', '$circuitId']}, + ], + }, + }, + }, + ], + }, + }, + { $unwind: '$account'}, ] } arrfilterand.value = [] @@ -139,17 +205,17 @@ export default defineComponent({ } function checkifShow(col: string) { - //++Todo: checkifShow Permessi ! + // ++Todo: checkifShow Permessi ! return true } function extraparams() { - let lk_tab = 'users' - let lk_LF = 'userId' - let lk_FF = '_id' - let lk_as = 'user' - let af_objId_tab = 'myId' + const lk_tab = 'users' + const lk_LF = 'userId' + const lk_FF = '_id' + const lk_as = 'user' + const af_objId_tab = 'myId' return { lookup1: { @@ -232,6 +298,7 @@ export default defineComponent({ t, animation, arrfilterand, + filterextra, filtercustom, filtercustom_rich, searchList, diff --git a/src/views/user/mycircuit/mycircuit.vue b/src/views/user/mycircuit/mycircuit.vue index 3ef2be42..dc78ff24 100755 --- a/src/views/user/mycircuit/mycircuit.vue +++ b/src/views/user/mycircuit/mycircuit.vue @@ -132,6 +132,7 @@ noresultLabel="movimenti non trovati con questa ricerca" :arrfilters="arrfilterand" :filtercustom="filtercustom_rich" + :filterextra="filterextra" :prop_searchList="searchList" :prop_pagination="{ sortBy: 'transactionDate', descending: true, page: 1, rowsNumber: 20, rowsPerPage: 20 }" :showType="costanti.SHOW_MOVEMENTS" @@ -373,6 +374,7 @@ noresultLabel="Username non trovato" :arrfilters="arrfilterand" :filtercustom="filtercustom" + :filterextra="filterextra" :prop_searchList="searchList" :showType="costanti.SHOW_USERINFO" :showCol="false" @@ -403,6 +405,7 @@ :butt_modif_new="false" noresultLabel="Username non trovato" :arrfilters="arrfilterand" + :filterextra="filterextra" :filtercustom="filtercustom_rich" :prop_searchList="searchList" :showType="costanti.SHOW_USERINFO" @@ -435,6 +438,7 @@ noresultLabel="Username non trovato" :arrfilters="arrfilterand" :filtercustom="filtercustom_rich" + :filterextra="filterextra" :prop_searchList="searchList" :showType="costanti.SHOW_USERINFO" keyMain=""