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

fix bug list circuits and transactionsenabled

Browse Source
This commit is contained in:
Paolo Arena
2022-09-24 20:21:29 +02:00
parent bc2080c42c
commit 201d148e31
29 changed files with 299 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.16"
APP_VERSION="0.5.19"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"

2
.env.example.production
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.16"
APP_VERSION="0.5.19"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

2
_ALL_SITES/popolodelnuovomondo.app/.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.16"
APP_VERSION="0.5.19"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="12"
DIRECTORY_LOCAL="newfreeplanet"

2
_ALL_SITES/riso.app/.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.16"
APP_VERSION="0.5.19"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"

2
_ALL_SITES/riso.app/.env.test
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.16"
APP_VERSION="0.5.19"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

2
_ALL_SITES/terradellavisione.app/.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.16"
APP_VERSION="0.5.19"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="14"
DIRECTORY_LOCAL="newfreeplanet"

2
_ALL_SITES/terradellavisione.app/.env.test
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.16"
APP_VERSION="0.5.19"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="14"
DIRECTORY_LOCAL=newfreeplanet

12
src/components/CFinder/CFinder.ts
View File

@@ -87,7 +87,8 @@ export default defineComponent({
*/
watch(() => myrecfiltertoggle.value, (value: any, oldval: any) => {
function updatefilter(value: any) {
if (value === tools.FILTER_MYREC) {
if (props.table === toolsext.TABMYGROUPS) {
filtercustom.value = [{
@@ -113,6 +114,15 @@ export default defineComponent({
} else {
filtercustom.value = []
}
}
watch(() => filtercustom.value, (value: any, oldval: any) => {
updatefilter(myrecfiltertoggle.value)
})
watch(() => myrecfiltertoggle.value, (value: any, oldval: any) => {
updatefilter(value)
},
)

106
src/components/CFundRaising/CFundRaising.ts
View File

@@ -1,10 +1,9 @@
import { defineComponent, ref, computed, PropType, toRef, onMounted, onBeforeUnmount } from 'vue'
import { useUserStore } from '@store/UserStore'
import { useRouter } from 'vue-router'
import { useGlobalStore } from '@store/globalStore'
import { useI18n } from '@/boot/i18n'
import { tools } from '@store/Modules/tools'
import { LandingFooter, Logo } from '@components'
import { IMyPage } from 'model'
export default defineComponent({
@@ -13,116 +12,23 @@ export default defineComponent({
props: {},
setup() {
const { t } = useI18n();
const $router = useRouter()
const visibile = ref(false)
const cardvisible = ref('hidden')
const displaycard = ref('block')
const firstClassSection = ref('fade homep-cover-img animate-fade homep-cover-img-1')
const polling: any = ref()
const slide = ref('first')
const animare = ref(0)
const rec = ref<IMyPage | null>(null)
function initprompt() {
window.addEventListener('beforeinstallprompt', (event) => {
// console.log('******************************** beforeinstallprompt fired')
event.preventDefault()
// console.log('§§§§§§§§§§§§§§§§§§§§ IMPOSTA DEFERRED PROMPT !!!!!!!!!!!!!!!!! ')
// #Todo++ IMPOSTA DEFERRED PROMPT
return false
})
}
const globalStore = useGlobalStore()
function created() {
initprompt()
animare.value = process.env.DEV ? 0 : 8000
}
async function created() {
onMounted(() => {
let primo = true
const mytime = 10000
polling.value = setInterval(() => {
firstClassSection.value = `landing_background fade homep-cover-img ${primo ? 'homep-cover-img-2' : 'homep-cover-img-1'}`
primo = !primo
rec.value = await globalStore.loadPage('/sostieni_il_progetto')
// console.log('this.firstClassSection', this.firstClassSection)
}, mytime)
})
function appname() {
return t('msg.myAppName')
}
onBeforeUnmount(() => {
console.log('beforeDestroy')
clearInterval(polling.value)
})
function meta() {
return {
keywords: { name: 'keywords', content: 'Quasar website' },
// meta tags
meta: {
mykey: { name: 'mykey', content: 'Key 1' },
description: { name: 'description', content: 'Page 1' },
keywords: { name: 'keywords', content: 'Quasar website' },
equiv: { 'http-equiv': 'Content-Type', content: 'text/html; charset=UTF-8' },
},
}
}
function mystilecard() {
return {
visibility: cardvisible.value,
display: displaycard.value,
}
}
function getPermission() {
return Notification.permission
}
function NotServiceWorker() {
return (!('serviceWorker' in navigator))
}
function PagLogin() {
$router.replace('/signin')
}
function PagReg() {
$router.replace('/signup')
}
function openCreatePostModal() {
console.log('APERTO ! openCreatePostModal')
visibile.value = !visibile.value
if (visibile.value) {
displaycard.value = 'block'
cardvisible.value = 'visible'
} else {
displaycard.value = 'block'
cardvisible.value = 'hidden'
}
}
created()
return {
t,
appname,
meta,
mystilecard,
getPermission,
NotServiceWorker,
PagLogin,
PagReg,
openCreatePostModal,
slide,
tools,
animare,
rec,
}
},
})

18
src/components/CFundRaising/CFundRaising.vue
View File

@@ -1,21 +1,7 @@
<template>
<q-page class="text-black">
<div class="landing">
<section class="bg-white">
<div class=" row justify-between items-start q-col-gutter-sm">
<div class="col-12">
<div class="feature-item" style="margin-top: 0px !important;">
<div class="text-big" style="margin: 0px !important; padding: 2px !important;" v-html="t('homepage.freesostieni.title')"></div>
<p class="feat-descr" v-html="t('homepage.freesostieni.descr')"></p></div>
<div v-if="rec" class="landing">
<p class="feat-descr" v-html="rec.content"></p>
</div>
</div>
</section>
<LandingFooter></LandingFooter>
</div>
</q-page>
</template>
<script lang="ts" src="./CFundRaising.ts">

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

@@ -1039,11 +1039,6 @@ export default defineComponent({
refresh()
})*/
watch(() => props.filtercustom, (newval, oldval) => {
// console.log('myfiltercustom change')
// refresh()
})
function isFacilitatore() {
return userStore.isFacilitatore
}

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

@@ -12,6 +12,10 @@
<q-item-label><strong>{{ circuit.name }}</strong> <span v-if="circuit.subname"> ({{ circuit.subname }})</span>
</q-item-label>
<q-item-label v-if="circuit.longdescr" caption lines="3"><em>{{ circuit.longdescr }}</em></q-item-label>
<q-item-label v-if="!circuit.transactionsEnabled" caption lines="1">
<q-icon name="fas fa-lock">
</q-icon></q-item-label>
<q-item-label lines="1">
<CSaldo
:account="account"

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

@@ -18,6 +18,7 @@
</q-item-label>
<q-item-label v-if="myrec.subname" lines="1" class="text_title">
<span>{{ myrec.subname }}</span>
<span v-if="!myrec.transactionsEnabled"><q-icon name="fas fa-lock"></q-icon></span>
</q-item-label>
<q-item-label lines="3" v-if="myrec.longdescr">{{ myrec.longdescr }}<br>
</q-item-label>

12
src/components/CPhotosGallery/CPhotosGallery.ts
View File

@@ -84,7 +84,6 @@ export default defineComponent({
}
function mounted() {
initprompt()
let primo = true
const mytime = 10000
@@ -131,17 +130,6 @@ export default defineComponent({
}
}
function initprompt() {
window.addEventListener('beforeinstallprompt', function (event) {
// console.log('******************************** beforeinstallprompt fired')
event.preventDefault()
// console.log('§§§§§§§§§§§§§§§§§§§§ IMPOSTA DEFERRED PROMPT !!!!!!!!!!!!!!!!! ')
// #Todo++ IMPOSTA DEFERRED PROMPT
return false
})
}
function getPermission() {
return Notification.permission
}

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

@@ -5,11 +5,13 @@ import { useGlobalStore } from '@store/globalStore'
import { useI18n } from '@/boot/i18n'
import { tools } from '@store/Modules/tools'
import { LandingFooter, Logo } from '@components'
import { CFundRaising } from '@/components/CFundRaising'
import { CShowContentPage } from '@/components/CShowContentPage'
export default defineComponent({
name: 'CPresentazione',
components: {Logo, LandingFooter},
components: {Logo, LandingFooter, CFundRaising, CShowContentPage},
props: {},
setup() {
const { t } = useI18n();

9
src/components/CPresentazione/CPresentazione.vue
View File

@@ -278,14 +278,14 @@
aria-hidden="true"
class="q-icon fas fa-street-view"> </i><h4>
{{ t('homepage.freeliving.title') }}</h4>
<p class="feat-descr" v-html="t('homepage.freeliving.descr')"></p></div>
<p class="feat-descr"><CShowContentPage path="/gruppi_territoriali_testo"></CShowContentPage></p></div>
</div>
<div class="col-12 col-sm-5">
<div class="feature-item"><i
aria-hidden="true"
class="q-icon fas fa-universal-access"> </i><h4>
{{ t('homepage.coin.title') }}</h4>
<p class="feat-descr" v-html="t('homepage.coin.descr')"></p></div>
<p class="feat-descr"><CShowContentPage path="/creditoris"></CShowContentPage></p></div>
</div>
</div>
</section>
@@ -299,11 +299,8 @@
<p class="feat-descr" v-html="t('homepage.freecollabora.descr')"></p></div>
</div>
<div class="col-12 col-sm-5">
<CFundRaising></CFundRaising>
<div class="feature-item" style="margin-top: 0px !important;">
<div class="text-big" style="margin: 0px !important; padding: 2px !important;" v-html="t('homepage.freesostieni.title')"></div>
<p class="feat-descr" v-html="t('homepage.freesostieni.descr')"></p>
</div>
</div>
<div class="col-12 col-sm-5">
<div class="feature-item"><i

0
src/components/CShowContentPage/CShowContentPage.scss Executable file
View File

38
src/components/CShowContentPage/CShowContentPage.ts Executable file
View File

@@ -0,0 +1,38 @@
import { defineComponent, ref, computed, PropType, toRef, onMounted, onBeforeUnmount } from 'vue'
import { useGlobalStore } from '@store/globalStore'
import { useI18n } from '@/boot/i18n'
import { tools } from '@store/Modules/tools'
import { LandingFooter, Logo } from '@components'
import { IMyPage } from 'model'
export default defineComponent({
name: 'CShowContentPage',
components: {Logo, LandingFooter},
props: {
path: {
type: String,
required: true,
},
},
setup(props) {
const { t } = useI18n();
const rec = ref<IMyPage | null>(null)
const globalStore = useGlobalStore()
async function created() {
rec.value = await globalStore.loadPage(props.path)
}
created()
return {
t,
tools,
rec,
}
},
})

12
src/components/CShowContentPage/CShowContentPage.vue Executable file
View File

@@ -0,0 +1,12 @@
<template>
<div v-if="rec">
<div v-html="rec.content"></div>
</div>
</template>
<script lang="ts" src="./CShowContentPage.ts">
</script>
<style lang="scss" scoped>
@import './CShowContentPage.scss';
</style>

1
src/components/CShowContentPage/index.ts Executable file
View File

@@ -0,0 +1 @@
export {default as CShowContentPage} from './CShowContentPage.vue'

1
src/components/index.ts
View File

@@ -64,3 +64,4 @@ export * from './CNotifSettings'
export * from './CSendCoins'
export * from './CCurrencyValue'
export * from './CNotifAtTop'
export * from './CShowContentPage'

4
src/css/app.scss
View File

@@ -1132,3 +1132,7 @@ $heightBtn: 100%;
padding-left: 1px !important;
padding-right: 1px !important;
}
.feat-descr {
font-size: 1.15rem;
}

5
src/layouts/toolbar/coinsPopover/coinsPopover.vue
View File

@@ -37,6 +37,7 @@
<q-btn flat round color="white" icon="close" @click="open = false"></q-btn>
</q-bar>
<div v-if="tools.isLogged()">
<CMyCircuits
v-model="filter"
:finder="true"
@@ -125,7 +126,8 @@
</div>
</q-item-label>
<q-item-label caption lines="2"
v-if="notif.typedir === shared_consts.TypeNotifs.TYPEDIR_CIRCUITS && notif.status === 0 && notif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_SENDCOINSREQ" v-ripple>
v-if="notif.typedir === shared_consts.TypeNotifs.TYPEDIR_CIRCUITS && notif.status === 0 && notif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_SENDCOINSREQ"
v-ripple>
<div class="row no-wrap justify-evenly">
<q-btn
@@ -179,6 +181,7 @@
<q-separator/>
</q-list>
</div>
</div>
</q-drawer>
</div>
</template>

2
src/layouts/toolbar/notifPopover/notifPopover.vue
View File

@@ -43,7 +43,7 @@
<q-btn flat round color="white" icon="close" @click="open = false"></q-btn>
</q-bar>
<div class="row justify-center margin_buttons q-gutter-lg">
<div v-if="tools.isLogged()" class="row justify-center margin_buttons q-gutter-lg">
<q-btn-toggle
v-model="show_all"
class="my-custom-toggle"

5
src/root/fundraising/fundraising.ts
View File

@@ -4,12 +4,13 @@ import {
defineComponent, ref, onBeforeUnmount, onMounted,
} from 'vue'
import { useRouter } from 'vue-router'
import { CFundRaising } from '@/components'
import { CFundRaising } from '@/components/CFundRaising'
import { LandingFooter } from '@/components'
import { tools } from '@src/store/Modules/tools'
export default defineComponent({
name: 'FundRaising',
components: { CFundRaising },
components: { CFundRaising, LandingFooter },
setup() {
const { t } = useI18n();

12
src/root/fundraising/fundraising.vue
View File

@@ -1,5 +1,17 @@
<template>
<q-page class="text-black">
<section class="bg-white">
<div class=" row justify-between items-start q-col-gutter-sm">
<div class="col-12">
<div class="feature-item" style="margin-top: 0px !important;">
<CFundRaising></CFundRaising>
</div>
</div>
</div>
</section>
</q-page>
<LandingFooter></LandingFooter>
</template>
<script lang="ts" src="./fundraising.ts">

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

@@ -5898,7 +5898,7 @@ export const tools = {
admins: [],
color: '#ff5500',
deperimento: false,
transactionsEnabled: true,
transactionsEnabled: false,
symbol: 'RIS',
fido_scoperto_default: 100,
qta_max_default: 200,

27
src/views/user/mycircuit/mycircuit.ts
View File

@@ -85,14 +85,17 @@ export default defineComponent({
}
async function loadCircuit() {
loading.value = true
// Carica il profilo di quest'utente
if (path.value) {
circuit.value = null
users_in_circuit.value = []
await userStore.loadCircuit(path.value, idnotif.value).then(({ data, status }: {data: any, status: number}) => {
console.log('data', data)
if (data) {
circuit.value = data.circuit
notifStore.setAsRead(idnotif.value)
users_in_circuit.value = data.users_in_circuit
circuit.value = data.circuit
} else {
circuit.value = null
users_in_circuit.value = []
@@ -100,17 +103,6 @@ export default defineComponent({
mystatus.value = status
loading.value = false
// filtroutente.value = [{ userId: userStore.my._id }]
})
}
}
async function mounted() {
loading.value = true
await loadCircuit()
searchList.value = []
if (circuit.value) {
filtercustom.value = [
@@ -125,9 +117,18 @@ export default defineComponent({
},
]
}
arrfilterand.value = []
filtercustom_rich.value = []
// filtroutente.value = [{ userId: userStore.my._id }]
})
}
loading.value = false
}
async function mounted() {
await loadCircuit()
}
function getImgCircuit() {

19
src/views/user/mycircuit/mycircuit.vue
View File

@@ -22,7 +22,7 @@
<div v-if="!tools.isLogged()">
<CCheckIfIsLogged></CCheckIfIsLogged>
</div>
<div>
<div v-if="circuit">
<div v-if="circuit.name" class="fit column no-wrap justify-evenly items-center content-start">
@@ -100,10 +100,10 @@
<q-tabs v-model="tabgrp" class="text-blue">
<q-tab :label="t('shared.info1')" name="info" icon="fas fa-info"></q-tab>
<q-tab v-if="userStore.IsMyCircuitByName(circuit.name)" :label="t('circuit.movements')" name="mov" icon="fas fa-coins"></q-tab>
<q-tab v-if="!!circuit.note" :label="t('circuit.page')" name="page" icon="fas fa-file-word"></q-tab>
<q-tab v-if="tools.iCanShowCircuitsMember(circuit) || tools.iAmAdminCircuit(circuit.name)"
:label="t('shared.subscribes')" name="members" icon="fas fa-users"></q-tab>
<q-tab v-if="userStore.IsMyCircuitByName(circuit.name)" :label="t('circuit.movements')" name="mov" icon="fas fa-coins"></q-tab>
<q-tab v-if="!!circuit.note" :label="t('circuit.page')" name="page" icon="fas fa-file-word"></q-tab>
</q-tabs>
<q-tab-panels v-model="tabgrp" animated>
@@ -113,7 +113,7 @@
<q-toggle v-model="tabellare" label="Tabella"></q-toggle>
<CGridTableRec
v-if="tabellare"
v-if="tabellare && !loading"
prop_mytable="movements"
prop_mytitle=""
:prop_mycolumns="colmyMovementTable"
@@ -145,7 +145,7 @@
</CGridTableRec>
<CGridTableRec
v-else
v-else-if="!loading"
prop_mytable="movements"
prop_mytitle=""
:prop_mycolumns="colmyMovement"
@@ -256,8 +256,11 @@
</CCurrencyValue>
</div>
</div>
<div :class="$q.screen.lt.sm ? '' : 'row'">
<div class="sezioni">
<q-icon name="fas fa-stats" class="iconcirc"></q-icon>
{{ t('circuit.stats') }}:<br>
</div>
<div :class="$q.screen.lt.sm ? '' : 'row'">
<div v-if="circuit.totTransato" class="sezioni">
<CCurrencyValue
:symbol="tools.getSymbolByCircuit(circuit)"
@@ -340,7 +343,7 @@
<q-tabs
v-show="tools.iAmAdminCircuit(circuit.name)"
v-model="tabmembers" class="text-blue">
<q-tab label="Tutti" name="all" icon="fas fa-users"></q-tab>
<q-tab label="Iscritti" name="all" icon="fas fa-users"></q-tab>
<q-tab v-if="tools.iAmAdminCircuit(circuit.name)" label="Richieste" name="rich" icon="fas fa-user-plus"></q-tab>
<q-tab v-if="tools.iAmAdminCircuit(circuit.name)" label="Rifiutati" name="refused" icon="fas fa-user-minus"></q-tab>
</q-tabs>
@@ -351,6 +354,7 @@
<!--<q-toggle v-model="showsaldi" :label="t('movement.showsaldi')"></q-toggle>-->
<CGridTableRec
v-if="!loading"
ref="tabMembri"
prop_mytable="users"
prop_mytitle=""
@@ -382,6 +386,7 @@
<q-tab-panel name="rich">
<CGridTableRec
v-if="!loading"
prop_mytable="circuits"
prop_mytitle=""
:prop_mycolumns="colmyUserPeople"