diff --git a/.env.development b/.env.development index f53ac64c..aa728c17 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.49" +APP_VERSION="0.5.51" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 9639d932..4944e77a 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.49" +APP_VERSION="0.5.51" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index f53ac64c..aa728c17 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.49" +APP_VERSION="0.5.51" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.production b/_ALL_SITES/riso.app/.env.production index f15a035e..27566e35 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.49" +APP_VERSION="0.5.51" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development index a569f0e7..f17cd9e9 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.49" +APP_VERSION="0.5.51" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/src/App.ts b/src/App.ts index 88eda102..a735ffc9 100755 --- a/src/App.ts +++ b/src/App.ts @@ -82,6 +82,8 @@ export default { darkcookie.value = tools.getCookie('darkmode', false, false, false) === '-1' scroll() + tools.initprompt() + tools.checkApp() } diff --git a/src/common/shared_nodejs.js b/src/common/shared_nodejs.js index 78490d4b..d2d15ddd 120000 --- a/src/common/shared_nodejs.js +++ b/src/common/shared_nodejs.js @@ -1 +1 @@ -/home/paolo/myproject/freeplanet_serverside/src/server/tools/shared_nodejs.js \ No newline at end of file +../../../freeplanet_serverside/src/server/tools/shared_nodejs.js \ No newline at end of file diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 12db9345..b5fe710b 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -171,8 +171,8 @@ export const shared_consts = { TABLES_WITH_SORTING: ['mybachecas', 'myhosps'], TABLES_REC_ID: ['skills', 'goods', 'subskills', 'myskills', 'mybachecas', 'myhosps', 'mygoods'], - // costanti.VISUTABLE_SCHEDA_USER, VISUTABLE_SCHEDA_GROUP, VISUTABLE_USER_TABGROUP, VISUTABLE_USER_TABCIRCUIT - VERTIC_SHOW_GRID: [-1, 2, -3, -4, -5], + // costanti.VISUTABLE_SCHEDA_USER, VISUTABLE_SCHEDA_GROUP, VISUTABLE_USER_TABGROUP, VISUTABLE_USER_TABCIRCUIT, VISUTABLE_GROUP_CIRCUIT + VERTIC_SHOW_GRID: [-1, 2, -3, -4, -5, -6], TABLES_UPDATE_LASTIFIED: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'bots'], TABLES_FINDER: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'mygroups'], @@ -1216,6 +1216,11 @@ export const shared_consts = { FASE3_MONETA_ABILITATA: 3, }, + CIRCUIT_PARAMS: { + SCOPERTO_MIN_GRP: 200, + SCOPERTO_MAX_GRP: 500, + }, + FontsInstalled: [ { label: 'Arial', diff --git a/src/components/CCheckAppRunning/CCheckAppRunning.ts b/src/components/CCheckAppRunning/CCheckAppRunning.ts index 4357b6e7..1337b148 100755 --- a/src/components/CCheckAppRunning/CCheckAppRunning.ts +++ b/src/components/CCheckAppRunning/CCheckAppRunning.ts @@ -25,22 +25,24 @@ export default defineComponent({ const deferredPrompt = computed(() => globalStore.deferredPrompt) - function initprompt() { - window.addEventListener('beforeinstallprompt', (event) => { - event.preventDefault() - console.log('beforeinstallprompt !') - // Stash the event so it can be triggered later. - globalStore.deferredPrompt = event - }) - } - function installApp() { - if (globalStore.deferredPrompt) - globalStore.deferredPrompt.prompt() + if (globalStore.deferredPrompt) { + globalStore.deferredPrompt.prompt() + + // Wait for the user to respond to the prompt + globalStore.deferredPrompt.userChoice.then((choiceResult: any)=>{ + if (choiceResult.outcome === 'accepted') { + globalStore.deferredPrompt = null; + // console.log('User accepted the A2HS prompt'); + } else { + // console.log('User dismissed the A2HS prompt'); + } + }); + } + } function mounted() { - initprompt() tools.checkApp() } diff --git a/src/components/CCurrencyValue/CCurrencyValue.vue b/src/components/CCurrencyValue/CCurrencyValue.vue index bba9aa14..11dc4a20 100755 --- a/src/components/CCurrencyValue/CCurrencyValue.vue +++ b/src/components/CCurrencyValue/CCurrencyValue.vue @@ -9,8 +9,8 @@
-
+
{{ symbol }} @@ -41,7 +41,7 @@ diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts index 35ab3911..029b4009 100755 --- a/src/components/CFinder/CFinder.ts +++ b/src/components/CFinder/CFinder.ts @@ -135,8 +135,8 @@ export default defineComponent({ */ watch(() => myrecfiltertoggle.value, (value: any, oldval: any) => { - updatefilter(value) - }, + updatefilter(value) + }, ) const mypagination = computed(() => { @@ -1115,6 +1115,8 @@ export default defineComponent({ status: 1, transactionsEnabled: 1, qta_max_default: 1, + fido_scoperto_default_grp: 1, + qta_max_default_grp: 1, valuta_per_euro: 1, symbol: 1, idCity: 1, @@ -1239,7 +1241,7 @@ export default defineComponent({ username: 1, name: 1, surname: 1, -lasttimeonline: 1, + lasttimeonline: 1, comune: 1, mycities: 1, 'profile.img': 1, @@ -1310,7 +1312,7 @@ lasttimeonline: 1, username: 1, name: 1, surname: 1, -lasttimeonline: 1, + lasttimeonline: 1, comune: 1, mycities: 1, 'profile.img': 1, @@ -1358,7 +1360,7 @@ lasttimeonline: 1, username: 1, name: 1, surname: 1, -lasttimeonline: 1, + lasttimeonline: 1, comune: 1, mycities: 1, 'profile.img': 1, diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index 26608527..66fe834b 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -321,6 +321,7 @@ :offset="350" debounce="300" > +
, @@ -28,7 +31,12 @@ export default defineComponent({ visu: { type: Number, required: true, - } + }, + circuitname: { + type: String, + required: false, + default: '', + }, }, setup(props, { emit }) { @@ -40,11 +48,16 @@ export default defineComponent({ const $route = useRoute() const groupname = ref('') + const circuitStore = useCircuitStore() + + const showsendCoinTo = ref(false) const grp = ref(null) const table = ref(toolsext.TABMYGROUPS) + const circuit = ref(null) + watch(() => props.mygrp, (newval, oldval) => { mounted() }) @@ -62,6 +75,7 @@ export default defineComponent({ groupname.value = props.mygrp.groupname } } + circuit.value = circuitStore.getCircuitByName(props.circuitname) } function getImgGroup(group: IMyGroup) { @@ -93,6 +107,8 @@ export default defineComponent({ tools, table, myusername, + circuit, + showsendCoinTo, } }, }) diff --git a/src/components/CMyGroup/CMyGroup.vue b/src/components/CMyGroup/CMyGroup.vue index 1876cd6e..48f75f47 100755 --- a/src/components/CMyGroup/CMyGroup.vue +++ b/src/components/CMyGroup/CMyGroup.vue @@ -2,130 +2,435 @@
- + - + - {{ grp.title }} ({{ grp.groupname }}) + {{ grp.title }} ({{ grp.groupname }}) + + {{ grp.descr }} + + + - {{ grp.descr }} - - + + + + + + - - {{ $t('groups.remove_from_mygroups') }} + + {{ + $t('groups.remove_from_mygroups') + }} - - - {{ $t('groups.delete_group') }} + + + {{ + $t('groups.delete_group') + }} - - {{ $t('groups.block_group') }} + + {{ + $t('groups.block_group') + }} - - - - + + - - - {{ $t('groups.ask_group') }} + + + {{ + $t('groups.ask_group') + }} - - - {{ $t('shared.refuse_ask') }} + + + {{ + $t('shared.refuse_ask') + }} - - {{ $t('shared.cancel_ask') }} + + {{ + $t('shared.cancel_ask') + }} - - - {{ $t('groups.exit_group') }} + + + {{ + $t('groups.exit_group') + }} - - - {{ $t('groups.delete_group') }} + + + {{ + $t('groups.delete_group') + }} - - - + - - {{ $t('groups.reject_ask_group') }} + + {{ + $t('groups.reject_ask_group') + }} - - - + - - {{ $t('shared.refuse_ask') }} + + {{ + $t('shared.refuse_ask') + }} - - {{ $t('shared.cancel_ask') }} + + {{ + $t('shared.cancel_ask') + }} - - - - + + - - - {{ $t('groups.ask_group') }} + + + {{ + $t('groups.ask_group') + }} - - - {{ $t('shared.refuse_ask') }} + + + {{ + $t('shared.refuse_ask') + }} - - {{ $t('shared.cancel_ask') }} + + {{ + $t('shared.cancel_ask') + }} - - - {{ $t('groups.exit_group') }} + + + {{ + $t('groups.exit_group') + }} - - - {{ $t('groups.delete_group') }} + + + {{ + $t('groups.delete_group') + }} @@ -138,11 +443,20 @@
+
+ + +
diff --git a/src/components/CMyGroups/CMyGroups.ts b/src/components/CMyGroups/CMyGroups.ts index 9976947e..60994466 100755 --- a/src/components/CMyGroups/CMyGroups.ts +++ b/src/components/CMyGroups/CMyGroups.ts @@ -44,6 +44,11 @@ export default defineComponent({ required: false, default: 0, }, + circuitname: { + type: String, + required: false, + default: '', + }, }, setup(props, { emit }) { const userStore = useUserStore() diff --git a/src/components/CMyGroups/CMyGroups.vue b/src/components/CMyGroups/CMyGroups.vue index 9f419cbf..65217e32 100755 --- a/src/components/CMyGroups/CMyGroups.vue +++ b/src/components/CMyGroups/CMyGroups.vue @@ -27,7 +27,7 @@ class="q-my-sm" clickable > - +
@@ -35,7 +35,7 @@
- +
diff --git a/src/components/CMyRecGrpCard/CMyRecGrpCard.vue b/src/components/CMyRecGrpCard/CMyRecGrpCard.vue index 756b1c0d..6af08539 100755 --- a/src/components/CMyRecGrpCard/CMyRecGrpCard.vue +++ b/src/components/CMyRecGrpCard/CMyRecGrpCard.vue @@ -11,12 +11,7 @@ img-class="imgprofile" height="60px"/> - - - {{ fieldsTable.getValByTabAndId(table, 'adType', myrec.adType) }} - - + @@ -37,11 +32,10 @@ {{ myrec.descr }}
 - + - + - {{ tools.getNameToShow(myrec) }} - , {{ rec.comune }} diff --git a/src/components/CMyUser/CMyUser.vue b/src/components/CMyUser/CMyUser.vue index 5a3e5561..d225efb0 100755 --- a/src/components/CMyUser/CMyUser.vue +++ b/src/components/CMyUser/CMyUser.vue @@ -33,7 +33,7 @@ -
diff --git a/src/components/CSendCoins/CSendCoins.ts b/src/components/CSendCoins/CSendCoins.ts index b3e6fba4..018baf14 100755 --- a/src/components/CSendCoins/CSendCoins.ts +++ b/src/components/CSendCoins/CSendCoins.ts @@ -1,6 +1,6 @@ import { computed, defineComponent, onMounted, PropType, ref, watch } from 'vue' -import { IAccount, ICircuit, IOperators, ISendCoin, ISpecialField, IUserFields } from '../../model' +import { IAccount, ICircuit, IMyGroup, IOperators, ISendCoin, ISpecialField, IUserFields } from '../../model' import { tools } from '@store/Modules/tools' import { CSaldo } from '@/components/CSaldo' import { useUserStore } from '@store/UserStore' @@ -24,7 +24,18 @@ export default defineComponent({ }, to_user: { type: Object as PropType, - required: true, + required: false, + default: null + }, + to_group: { + type: Object as PropType, + required: false, + default: null, + }, + from_group: { + type: Object as PropType, + required: false, + default: null, }, }, components: { CSaldo, CMyUserOnlyView }, @@ -36,10 +47,9 @@ export default defineComponent({ const userStore = useUserStore() const circuitStore = useCircuitStore() - const from_username = ref(userStore.my.username) const circuitsel = ref('') - const qty = ref('') + const qty = ref('') const causal = ref('') const bothcircuits = ref([]) @@ -111,7 +121,25 @@ export default defineComponent({ // .... if (props.to_user) { console.log('user', props.to_user) - bothcircuits.value = userStore.IsMyCircuitByUser(props.to_user) + bothcircuits.value = userStore.getMyCircuitsInCommonByUser(props.to_user) + + if (props.circuitname) { + circuitsel.value = props.circuitname + } else { + circuitsel.value = tools.getCookie(tools.CIRCUIT_USE, bothcircuits.value[0]) + } + if (!userStore.IsMyCircuitByName(circuitsel.value)) { + circuitsel.value = bothcircuits.value[0] + } + + aggiorna() + + show.value = true + } + + if (props.to_group) { + console.log('group', props.to_group) + bothcircuits.value = userStore.getMyCircuitsInCommonByGroup(props.to_group) if (props.circuitname) { circuitsel.value = props.circuitname @@ -133,16 +161,25 @@ export default defineComponent({ } function sendCoin() { - console.log('sendcoin', qty.value, props.to_user.username) + console.log('sendcoin', qty.value, props.to_group ? props.to_group.groupname : props.to_user.username) - if (props.to_user.username && qty.value && circuitloaded.value) { - const myrecsendcoin: ISendCoin = { + let ok = (props.to_user && props.to_user.username) || (props.to_group && props.to_group.groupname) + + if (ok && qty.value && circuitloaded.value) { + let myrecsendcoin: ISendCoin = { qty: tools.convstrToNum(qty.value), - dest: props.to_user.username, + dest: '', + groupdest: '', + grouporig: '', circuitname: circuitsel.value, causal: causal.value, symbol: circuitloaded.value.symbol, } + + myrecsendcoin.groupdest = props.to_group ? props.to_group.groupname : '' + myrecsendcoin.dest = props.to_user ? props.to_user.username : '' + myrecsendcoin.grouporig = props.from_group ? props.from_group.groupname : '' + if (myrecsendcoin) { tools.sendCoinsByCircuit($q, circuitloaded.value, myrecsendcoin) .then((ris: any) => { diff --git a/src/components/CSendCoins/CSendCoins.vue b/src/components/CSendCoins/CSendCoins.vue index e7319b48..d957ed76 100755 --- a/src/components/CSendCoins/CSendCoins.vue +++ b/src/components/CSendCoins/CSendCoins.vue @@ -93,7 +93,7 @@ diff --git a/src/components/CSignIn/CSignIn-validate.ts b/src/components/CSignIn/CSignIn-validate.ts index 391ed568..5a0686b7 100755 --- a/src/components/CSignIn/CSignIn-validate.ts +++ b/src/components/CSignIn/CSignIn-validate.ts @@ -13,7 +13,7 @@ export const validations = computed(() => { }, username: { required, - minLength: minLength(6), + minLength: minLength(3), }, }, } diff --git a/src/components/CSignUp/CSignUp.ts b/src/components/CSignUp/CSignUp.ts index 41fd9fd6..352bd93d 100755 --- a/src/components/CSignUp/CSignUp.ts +++ b/src/components/CSignUp/CSignUp.ts @@ -10,7 +10,7 @@ import { CTitleBanner } from '../CTitleBanner' import { CCopyBtn } from '../CCopyBtn' import { CRegistration } from '../CRegistration' import { PagePolicy } from '../PagePolicy' -import { computed, defineComponent, reactive, ref, watch } from 'vue' +import { computed, defineComponent, onMounted, reactive, ref, watch } from 'vue' import { CSignIn } from '@/components/CSignIn' import { useQuasar } from 'quasar' import { useI18n } from '@/boot/i18n' @@ -64,11 +64,26 @@ export default defineComponent({ required: false, default: '', }, + name_default: { + type: String, + required: false, + default: '', + }, + username_default: { + type: String, + required: false, + default: '', + }, need_Telegram: { type: Boolean, required: false, default: false, }, + collettivo: { + type: Boolean, + required: false, + default: false, + }, }, setup(props, { emit }) { const $q = useQuasar() @@ -143,10 +158,13 @@ export default defineComponent({ }, username: { required, - minLength: minLength(6), + minLength: minLength(3), complexityUser, registereduser, }, + name: { + required: props.collettivo ? true : false, + }, terms: { required, }, @@ -296,6 +314,11 @@ export default defineComponent({ signup.profile.teleg_id = $route.params.idteleg ? parseInt($route.params.idteleg.toString(), 10) : 0 } + if (props.collettivo) { + signup.username = props.username_default! + signup.name = props.name_default! + } + console.log('1) aportador_solidario', signup.aportador_solidario) if (!signup.aportador_solidario) diff --git a/src/components/CSignUp/CSignUp.vue b/src/components/CSignUp/CSignUp.vue index a420a2ec..98309773 100755 --- a/src/components/CSignUp/CSignUp.vue +++ b/src/components/CSignUp/CSignUp.vue @@ -1,7 +1,9 @@