diff --git a/.env.development b/.env.development index 8ba88cda..60dd1be2 100755 --- a/.env.development +++ b/.env.development @@ -1,18 +1,17 @@ APP_VERSION="1.0.61" SERVICE_WORKER_FILE="service-worker.js" -APP_ID="19" +APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_SERVER="freeplanet_serverside" SERVERDIR_WEBSITE="" SERVERPW_WEBSITE="" APP_URL="https://localhost" URL_FACEBOOK="https://www.facebook.com/freeplanetapp" -PROVA_PAOLO="PROVA ENV FUNZIONA!" LANG_DEFAULT="it" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" MONGODB_HOST="https://localhost:3000" -LOGO_REG='abitaregliiblei-logo-full.png' +LOGO_REG='riso-logo-full.png' TEST_NAME="Paolo" TEST_SURNAME="Arena" TEST_EMAIL="" @@ -25,5 +24,5 @@ DEBUG="1" TELEGRAM_SUPPORT="" PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" TEST_CELL="" -ISTEST=1 -INLOCALE=1 \ No newline at end of file +ISTEST="1" +INLOCALE="1" diff --git a/now.txt b/now.txt index e5f5d4ff..d59a86e1 100644 --- a/now.txt +++ b/now.txt @@ -1 +1 @@ -TERMINA DI LAVORARE SU riso.app: (Sovrascrivo !) +TERMINA DI LAVORARE SU abitaregliiblei.it: (Sovrascrivo !) diff --git a/package.json b/package.json index 5ada2ae7..78643b6c 100755 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "abitaregliiblei", + "name": "riso", "version": "1.0.61", - "description": "Abitare Gli Iblei", - "productName": "AbitareGliIblei", + "description": "Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.", + "productName": "Riso", "author": "Paolo Arena", "private": true, "keywords": [], diff --git a/public/favicon.ico b/public/favicon.ico index 4d890bd5..d283c964 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/images/abitaregliiblei-logo-full.png b/public/images/abitaregliiblei-logo-full.png deleted file mode 100644 index ad59d9eb..00000000 Binary files a/public/images/abitaregliiblei-logo-full.png and /dev/null differ diff --git a/public/images/agi-android-icon-144x144.png b/public/images/agi-android-icon-144x144.png deleted file mode 100644 index 5a122a20..00000000 Binary files a/public/images/agi-android-icon-144x144.png and /dev/null differ diff --git a/public/images/agi-android-icon-192x192.png b/public/images/agi-android-icon-192x192.png deleted file mode 100644 index 6b2cac7a..00000000 Binary files a/public/images/agi-android-icon-192x192.png and /dev/null differ diff --git a/public/images/agi-android-icon-36x36.png b/public/images/agi-android-icon-36x36.png deleted file mode 100644 index ff6d2131..00000000 Binary files a/public/images/agi-android-icon-36x36.png and /dev/null differ diff --git a/public/images/agi-android-icon-48x48.png b/public/images/agi-android-icon-48x48.png deleted file mode 100644 index 2e5ca221..00000000 Binary files a/public/images/agi-android-icon-48x48.png and /dev/null differ diff --git a/public/images/agi-android-icon-512x512.png b/public/images/agi-android-icon-512x512.png deleted file mode 100644 index ad59d9eb..00000000 Binary files a/public/images/agi-android-icon-512x512.png and /dev/null differ diff --git a/public/images/agi-android-icon-72x72.png b/public/images/agi-android-icon-72x72.png deleted file mode 100644 index 23660f04..00000000 Binary files a/public/images/agi-android-icon-72x72.png and /dev/null differ diff --git a/public/images/agi-android-icon-96x96.png b/public/images/agi-android-icon-96x96.png deleted file mode 100644 index 2fdf5999..00000000 Binary files a/public/images/agi-android-icon-96x96.png and /dev/null differ diff --git a/public/images/agi-appleicon-120x120.png b/public/images/agi-appleicon-120x120.png deleted file mode 100644 index 1dd065c3..00000000 Binary files a/public/images/agi-appleicon-120x120.png and /dev/null differ diff --git a/public/images/agi-appleicon-144x144.png b/public/images/agi-appleicon-144x144.png deleted file mode 100644 index 084d172c..00000000 Binary files a/public/images/agi-appleicon-144x144.png and /dev/null differ diff --git a/public/images/agi-appleicon-152x152.png b/public/images/agi-appleicon-152x152.png deleted file mode 100644 index a671ad5d..00000000 Binary files a/public/images/agi-appleicon-152x152.png and /dev/null differ diff --git a/public/images/agi-appleicon-180x180.png b/public/images/agi-appleicon-180x180.png deleted file mode 100644 index eb192136..00000000 Binary files a/public/images/agi-appleicon-180x180.png and /dev/null differ diff --git a/public/images/android-chrome-192x192.png b/public/images/android-chrome-192x192.png index 6b2cac7a..95b960e9 100644 Binary files a/public/images/android-chrome-192x192.png and b/public/images/android-chrome-192x192.png differ diff --git a/public/images/badge-96x96.png b/public/images/badge-96x96.png index 2fdf5999..d1a5cddf 100644 Binary files a/public/images/badge-96x96.png and b/public/images/badge-96x96.png differ diff --git a/public/images/favicon-16x16.png b/public/images/favicon-16x16.png index cf4dfd32..c28cef9f 100644 Binary files a/public/images/favicon-16x16.png and b/public/images/favicon-16x16.png differ diff --git a/public/images/favicon-32x32.png b/public/images/favicon-32x32.png index 696ddadf..a02e38b0 100644 Binary files a/public/images/favicon-32x32.png and b/public/images/favicon-32x32.png differ diff --git a/public/images/favicon-96x96.png b/public/images/favicon-96x96.png index 1ce7c853..f741b210 100644 Binary files a/public/images/favicon-96x96.png and b/public/images/favicon-96x96.png differ diff --git a/public/images/favicon.ico b/public/images/favicon.ico index 4d890bd5..d283c964 100644 Binary files a/public/images/favicon.ico and b/public/images/favicon.ico differ diff --git a/public/images/freeplanet-logo-full.odg b/public/images/freeplanet-logo-full.odg new file mode 100755 index 00000000..854da650 Binary files /dev/null and b/public/images/freeplanet-logo-full.odg differ diff --git a/public/images/freeplanet-logo-full.svg b/public/images/freeplanet-logo-full.svg new file mode 100755 index 00000000..b9c10df3 --- /dev/null +++ b/public/images/freeplanet-logo-full.svg @@ -0,0 +1,1186 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/images/logo.jpg b/public/images/logo.jpg deleted file mode 100644 index 74f9d5cf..00000000 Binary files a/public/images/logo.jpg and /dev/null differ diff --git a/public/images/riso-android-icon-144x144.png b/public/images/riso-android-icon-144x144.png new file mode 100644 index 00000000..37dcd661 Binary files /dev/null and b/public/images/riso-android-icon-144x144.png differ diff --git a/public/images/riso-android-icon-192x192.png b/public/images/riso-android-icon-192x192.png new file mode 100644 index 00000000..95b960e9 Binary files /dev/null and b/public/images/riso-android-icon-192x192.png differ diff --git a/public/images/riso-android-icon-36x36.png b/public/images/riso-android-icon-36x36.png new file mode 100644 index 00000000..c78a13a3 Binary files /dev/null and b/public/images/riso-android-icon-36x36.png differ diff --git a/public/images/riso-android-icon-384x384.png b/public/images/riso-android-icon-384x384.png new file mode 100644 index 00000000..ce1ffc47 Binary files /dev/null and b/public/images/riso-android-icon-384x384.png differ diff --git a/public/images/riso-android-icon-48x48.png b/public/images/riso-android-icon-48x48.png new file mode 100644 index 00000000..499e8674 Binary files /dev/null and b/public/images/riso-android-icon-48x48.png differ diff --git a/public/images/riso-android-icon-512x512.png b/public/images/riso-android-icon-512x512.png new file mode 100644 index 00000000..e1c31acd Binary files /dev/null and b/public/images/riso-android-icon-512x512.png differ diff --git a/public/images/riso-android-icon-72x72.png b/public/images/riso-android-icon-72x72.png new file mode 100644 index 00000000..f95f7320 Binary files /dev/null and b/public/images/riso-android-icon-72x72.png differ diff --git a/public/images/riso-android-icon-96x96.png b/public/images/riso-android-icon-96x96.png new file mode 100644 index 00000000..98dbf9d9 Binary files /dev/null and b/public/images/riso-android-icon-96x96.png differ diff --git a/public/images/riso-apple-icon-114x114.png b/public/images/riso-apple-icon-114x114.png new file mode 100644 index 00000000..882dd21c Binary files /dev/null and b/public/images/riso-apple-icon-114x114.png differ diff --git a/public/images/riso-apple-icon-120x120.png b/public/images/riso-apple-icon-120x120.png new file mode 100644 index 00000000..734b0503 Binary files /dev/null and b/public/images/riso-apple-icon-120x120.png differ diff --git a/public/images/riso-apple-icon-144x144.png b/public/images/riso-apple-icon-144x144.png new file mode 100644 index 00000000..923da7be Binary files /dev/null and b/public/images/riso-apple-icon-144x144.png differ diff --git a/public/images/riso-apple-icon-152x152.png b/public/images/riso-apple-icon-152x152.png new file mode 100644 index 00000000..84fd455d Binary files /dev/null and b/public/images/riso-apple-icon-152x152.png differ diff --git a/public/images/riso-apple-icon-180x180.png b/public/images/riso-apple-icon-180x180.png new file mode 100644 index 00000000..e457d906 Binary files /dev/null and b/public/images/riso-apple-icon-180x180.png differ diff --git a/public/images/riso-apple-icon-57x57.png b/public/images/riso-apple-icon-57x57.png new file mode 100644 index 00000000..f5f538db Binary files /dev/null and b/public/images/riso-apple-icon-57x57.png differ diff --git a/public/images/riso-apple-icon-60x60.png b/public/images/riso-apple-icon-60x60.png new file mode 100644 index 00000000..4121f834 Binary files /dev/null and b/public/images/riso-apple-icon-60x60.png differ diff --git a/public/images/riso-apple-icon-72x72.png b/public/images/riso-apple-icon-72x72.png new file mode 100644 index 00000000..5efd872d Binary files /dev/null and b/public/images/riso-apple-icon-72x72.png differ diff --git a/public/images/riso-apple-icon-76x76.png b/public/images/riso-apple-icon-76x76.png new file mode 100644 index 00000000..6db4b76f Binary files /dev/null and b/public/images/riso-apple-icon-76x76.png differ diff --git a/public/images/riso-apple-icon.png b/public/images/riso-apple-icon.png new file mode 100644 index 00000000..cfaeb3c0 Binary files /dev/null and b/public/images/riso-apple-icon.png differ diff --git a/public/images/riso-logo-full.png b/public/images/riso-logo-full.png new file mode 100644 index 00000000..38a9695f Binary files /dev/null and b/public/images/riso-logo-full.png differ diff --git a/quasar.conf.js b/quasar.conf.js index d9368b1b..b5ea96fb 100755 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -39,7 +39,7 @@ module.exports = configure((ctx) => ({ // --> boot files are part of "main.js" // https://v2.quasar.dev/quasar-cli/boot-files // boot: ['vue-i18n', 'vue-meta', 'axios', 'vee-validate', 'myconfig', 'local-storage', 'error-handler', 'globalroutines', 'vue-idb', 'dragula', 'guard'], - boot: ['i18n', 'axios', 'vee-validate', 'myconfig', 'local-storage', 'error-handler', 'globalroutines', 'calendar', 'social-sharing', 'timeago', 'guard'], + boot: ['i18n', 'axios', 'vee-validate', 'myconfig', 'local-storage', 'error-handler', 'globalroutines', 'calendar', 'social-sharing', 'timeago'], // https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css css: [ @@ -152,7 +152,7 @@ module.exports = configure((ctx) => ({ }, devServer: { https: false, - port: 8091, + port: 8084, open: false, // opens browser window automatically hot: false, // Disable hot module replacement headers: { @@ -311,9 +311,9 @@ module.exports = configure((ctx) => ({ }, manifest: { - name: 'Abitare gli Iblei', - short_name: 'AbitareGliIblei', - description: 'Abitare Gli Iblei', + name: 'Riso', + short_name: 'Riso', + description: 'Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.', display: 'standalone', orientation: 'portrait', background_color: '#fff', @@ -323,54 +323,54 @@ module.exports = configure((ctx) => ({ start_url: "/?homescreen=1", icons: [ { - src: 'images/agi-android-icon-512x512.png', + src: 'images/riso-android-icon-512x512.png', sizes: '512x512', type: 'image/png', }, { - src: 'images/agi-android-icon-384x384.png', + src: 'images/riso-android-icon-384x384.png', sizes: '384x384', type: 'image/png', }, { - src: 'images/agi-android-icon-192x192.png', + src: 'images/riso-android-icon-192x192.png', sizes: '192x192', type: 'image/png', }, { - src: 'images/agi-android-icon-144x144.png', + src: 'images/riso-android-icon-144x144.png', sizes: '144x144', type: 'image/png', }, { - src: 'images/agi-android-icon-96x96.png', + src: 'images/riso-android-icon-96x96.png', sizes: '96x96', type: 'image/png', }, { - src: 'images/agi-apple-icon-120x120.png', + src: 'images/riso-apple-icon-120x120.png', sizes: '120x120', type: 'image/png', }, { - src: 'images/agi-apple-icon-144x144.png', + src: 'images/riso-apple-icon-144x144.png', sizes: '144x144', type: 'image/png', }, { - src: 'images/agi-apple-icon-152x152.png', + src: 'images/riso-apple-icon-152x152.png', sizes: '152x152', type: 'image/png', }, { - src: 'images/agi-apple-icon-180x180.png', + src: 'images/riso-apple-icon-180x180.png', sizes: '180x180', type: 'image/png', }, ], related_applications: [{ "platform": "webapp", - "url": "https://www.abitaregliiblei.it/manifest.json" + "url": "https://www.riso.app/manifest.json" }] }, }, @@ -405,7 +405,7 @@ module.exports = configure((ctx) => ({ builder: { // https://www.electron.build/configuration/configuration - appId: 'AbitareGliIblei', + appId: 'Riso', }, // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain diff --git a/src/components/CDashboard/CDashboard.ts b/src/components/CDashboard/CDashboard.ts index 0c87913e..2c62ad8c 100755 --- a/src/components/CDashboard/CDashboard.ts +++ b/src/components/CDashboard/CDashboard.ts @@ -28,12 +28,12 @@ export default defineComponent({ const visustat = computed(() => { // @ts-ignore - return costanti.MAINCARDS.filter((rec: IMainCard) => rec.visuonstat) + return costanti.MAINCARDS.filter((rec: IMainCard) => rec.visuonstat && !rec.forgroup) }) const visulinks = computed(() => { // @ts-ignore - return costanti.MAINCARDS.filter((rec: IMainCard) => rec.link) + return costanti.MAINCARDS.filter((rec: IMainCard) => rec.link && !rec.forgroup) }) return { diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index b61ad37c..7d99e7ac 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -1630,7 +1630,7 @@ export default defineComponent({ } function mounted() { - console.log('mounted...') + // console.log('mounted...') try { searchList.value = props.prop_searchList diff --git a/src/components/CMyCardService/CMyCardService.ts b/src/components/CMyCardService/CMyCardService.ts index c4eb4bd8..24d931df 100644 --- a/src/components/CMyCardService/CMyCardService.ts +++ b/src/components/CMyCardService/CMyCardService.ts @@ -156,7 +156,7 @@ export default defineComponent({ const largeHeight = ref('100vh') const cardStyle = computed(() => ({ - height: isSmall.value ? smallHeight.value : largeHeight.value, + // height: isSmall.value ? smallHeight.value : largeHeight.value, transition: 'height 0.3s ease-in-out' })) @@ -165,13 +165,13 @@ export default defineComponent({ let queryreact = {} if (usersList.value.tipofavbook === costanti.TIPOFAVBOOK.SEEN) { - queryreact = {seen: true} + queryreact = { seen: true } } else if (usersList.value.tipofavbook === costanti.TIPOFAVBOOK.FAVORITE) { - queryreact = {fav: true} + queryreact = { fav: true } } else if (usersList.value.tipofavbook === costanti.TIPOFAVBOOK.BOOKMARK) { - queryreact = {book: true} + queryreact = { book: true } } else if (usersList.value.tipofavbook === costanti.TIPOFAVBOOK.ATTEND) { - queryreact = {attend: true} + queryreact = { attend: true } } return [{ @@ -195,7 +195,7 @@ export default defineComponent({ myrec.value = ris notifStore.setAsRead(idnotif.value) }).catch((err) => { - + }) } else { @@ -221,7 +221,7 @@ export default defineComponent({ async function mounted() { load() await nextTick() - + } function updateCard() { @@ -644,7 +644,7 @@ export default defineComponent({ function toggleShowScheda() { // updateCard() isSmall.value = !isSmall.value - + } function showInMap(rec: any) { diff --git a/src/components/CMyCardService/CMyCardService.vue b/src/components/CMyCardService/CMyCardService.vue index f5d14b4c..8468b7f5 100644 --- a/src/components/CMyCardService/CMyCardService.vue +++ b/src/components/CMyCardService/CMyCardService.vue @@ -655,8 +655,9 @@ diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.ts b/src/components/CMyPopupEdit/CMyPopupEdit.ts index afe4ee92..103700b8 100755 --- a/src/components/CMyPopupEdit/CMyPopupEdit.ts +++ b/src/components/CMyPopupEdit/CMyPopupEdit.ts @@ -273,7 +273,7 @@ export default defineComponent({ }) */ function crea() { - console.log('crea', isFieldDb(), 'props.mycol', props.mycol) + // console.log('crea', isFieldDb(), 'props.mycol', props.mycol) if (props.mycol && props.mycol.name && props.mycol.name !== 'test') { col.value = { ...props.mycol } @@ -318,7 +318,7 @@ export default defineComponent({ } } - console.log('popupedit myvalue.value: ', myvalue.value) + // console.log('popupedit myvalue.value: ', myvalue.value) if (props.tablesel) { // let obj = tools.getParamsByTable(props.table) @@ -469,7 +469,7 @@ export default defineComponent({ try { - console.log('mounted', 'isFieldDb()', myrow.value) + // console.log('mounted', 'isFieldDb()', myrow.value) if (isFieldDb() && !props.isrec) { // console.log(' . none...') } else { @@ -488,7 +488,7 @@ export default defineComponent({ myvalue.value = myrow.value } } - console.log('props.field', props.field, 'props.subfield', props.subfield, 'myvalue: ', myvalue) + // console.log('props.field', props.field, 'props.subfield', props.subfield, 'myvalue: ', myvalue) } } catch (e) { diff --git a/src/components/CMyProfileTutorial/CMyProfileTutorial.ts b/src/components/CMyProfileTutorial/CMyProfileTutorial.ts index eafe2e62..f1f5563c 100755 --- a/src/components/CMyProfileTutorial/CMyProfileTutorial.ts +++ b/src/components/CMyProfileTutorial/CMyProfileTutorial.ts @@ -75,6 +75,7 @@ export default defineComponent({ const contact = ref(null) const filtroutente = ref([]) + const showBanner_utenti_verif = ref(true) const usersList = ref({ show: false, title: '', list: [] }) @@ -199,7 +200,7 @@ export default defineComponent({ ]) const numindstep = computed(() => arrStep.value.length) - + watch(() => indstep.value, (newval: number, oldval: number) => { if (indstep.value >= 0) @@ -582,6 +583,7 @@ export default defineComponent({ numStepCompleted, globalStore, prStep, + showBanner_utenti_verif, } }, }) diff --git a/src/components/CMyProfileTutorial/CMyProfileTutorial.vue b/src/components/CMyProfileTutorial/CMyProfileTutorial.vue index 7f700fa5..6758303a 100755 --- a/src/components/CMyProfileTutorial/CMyProfileTutorial.vue +++ b/src/components/CMyProfileTutorial/CMyProfileTutorial.vue @@ -87,9 +87,13 @@ :db_rec="contact" > - + - +
@@ -288,8 +298,9 @@ inline-actions class="bg-red text-white" v-if=" - userStore.my.profile.calc.numGoodsAndServices <= 0 && !nascondiavviso - && tools.visualizzaHomeApp() + userStore.my.profile.calc.numGoodsAndServices <= 0 && + !nascondiavviso && + tools.visualizzaHomeApp() " > diff --git a/src/components/CMyToggleList/CMyToggleList.ts b/src/components/CMyToggleList/CMyToggleList.ts index 4fbe5fca..4967761a 100755 --- a/src/components/CMyToggleList/CMyToggleList.ts +++ b/src/components/CMyToggleList/CMyToggleList.ts @@ -56,7 +56,7 @@ export default defineComponent({ } function mounted() { - console.log('mounted') + // console.log('mounted') myarrvalues.value = [] // console.log('value', value) diff --git a/src/components/CPhotosGallery/CPhotosGallery.ts b/src/components/CPhotosGallery/CPhotosGallery.ts index ef05db92..bdb10a47 100755 --- a/src/components/CPhotosGallery/CPhotosGallery.ts +++ b/src/components/CPhotosGallery/CPhotosGallery.ts @@ -102,7 +102,6 @@ export default defineComponent({ } function beforeDestroy() { - console.log('beforeDestroy') clearInterval(polling.value) } diff --git a/src/components/CPresentazione/CPresentazione.ts b/src/components/CPresentazione/CPresentazione.ts index 70a21d6b..10f0c91b 100755 --- a/src/components/CPresentazione/CPresentazione.ts +++ b/src/components/CPresentazione/CPresentazione.ts @@ -13,7 +13,7 @@ import { static_data } from '@src/db/static_data' export default defineComponent({ name: 'CPresentazione', - components: {Logo, LandingFooter, CFundRaising, CShowContentPage}, + components: { Logo, LandingFooter, CFundRaising, CShowContentPage }, props: {}, setup() { const { t } = useI18n(); @@ -49,7 +49,6 @@ export default defineComponent({ } onBeforeUnmount(() => { - console.log('beforeDestroy') clearInterval(polling.value) }) diff --git a/src/db/lang/ws_it.js b/src/db/lang/ws_it.js index 31f26ec6..c7366e95 100755 --- a/src/db/lang/ws_it.js +++ b/src/db/lang/ws_it.js @@ -1,9 +1,9 @@ const msg_website_it = { ws: { - sitename: 'AbitareGliIblei', - siteshortname: 'AbitareGliIblei', - description: 'Abitare Gli Iblei', - keywords: '', + sitename: 'Riso', + siteshortname: 'RISO', + description: 'Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.', + keywords: 'riso, piattaforma di scambio, rete italiana scambio orizzontale, riso app, riso piattaforma, scambio e baratto, momenta RIS', }, hours: { descr: 'Descrizione', @@ -84,7 +84,6 @@ const msg_website_it = { eventodef: 'Evento:', prova: 'prova', dbop: 'Operazioni', - server: 'Server', projall: 'Comunitari', groups: 'Lista Gruppi', projectsShared: 'Condivisi da me', diff --git a/src/db/static_data.ts b/src/db/static_data.ts index fcc1a07a..2efff3dd 100755 --- a/src/db/static_data.ts +++ b/src/db/static_data.ts @@ -68,7 +68,7 @@ function getDynamicPages(site: ISites): IListRoutes[] { infooter: false, }, { - active: site.confpages && site.confpages.enableGoods, + active: true, order: 12, path: '/goods', materialIcon: 'fas fa-tshirt', @@ -79,7 +79,7 @@ function getDynamicPages(site: ISites): IListRoutes[] { infooter: true, }, { - active: site.confpages && site.confpages.enableServices, + active: true, order: 15, path: '/services', materialIcon: 'fas fa-house-user', @@ -90,7 +90,7 @@ function getDynamicPages(site: ISites): IListRoutes[] { infooter: true, }, { - active: site.confpages && site.confpages.enableActivities, + active: true, order: 15, path: '/activities', materialIcon: 'fas fa-house-user', @@ -112,7 +112,7 @@ function getDynamicPages(site: ISites): IListRoutes[] { infooter: false, }, { - active: site.confpages && site.confpages.enableHosps, + active: true, order: 15, path: '/hosps', materialIcon: 'fas fa-bed', @@ -134,7 +134,7 @@ function getDynamicPages(site: ISites): IListRoutes[] { infooter: true, }, { - active: site.confpages && site.confpages.enableEvents, + active: true, order: 20, path: '/events', materialIcon: 'fas fa-bullhorn', @@ -156,7 +156,7 @@ function getDynamicPages(site: ISites): IListRoutes[] { infooter: false, }, { - active: site.confpages && site.confpages.showProfile, + active: true, order: 120, path: '/myprofile', materialIcon: 'fas fa-user', @@ -178,7 +178,7 @@ function getDynamicPages(site: ISites): IListRoutes[] { infooter: false, }, { - active: site.confpages && site.confpages.showiscrittiMenu, + active: true, order: 130, path: '/friends', materialIcon: 'fas fa-user-friends', @@ -209,7 +209,7 @@ function getDynamicPages(site: ISites): IListRoutes[] { meta: { requiresAuth: true, newpage: true }, inmenu: false, infooter: false, - }, + }, { active: true, order: 137, @@ -294,18 +294,6 @@ function getDynamicPages(site: ISites): IListRoutes[] { inmenu: false, infooter: false }, - - { - active: true, - order: 1000, - path: '/404error', - materialIcon: 'fas fa-calendar-plus', - name: 'otherpages.error404', - component: () => import('@/root/My404page/My404page.vue'), - inmenu: false, - infooter: false - }, - ] return baseroutes diff --git a/src/layouts/toolbar/notifPopover/notifPopover.ts b/src/layouts/toolbar/notifPopover/notifPopover.ts index 661e2769..55c195e6 100755 --- a/src/layouts/toolbar/notifPopover/notifPopover.ts +++ b/src/layouts/toolbar/notifPopover/notifPopover.ts @@ -56,7 +56,7 @@ export default defineComponent({ const num_notifs_unread = computed(() => notifStore.getnumNotifUnread()) // const usernotifs = computed(() => userStore.my.profile.notifs) - const polling = ref( null) + const polling = ref(null) const eseguipolling = ref(true) const notifsel = ref({ @@ -65,11 +65,11 @@ export default defineComponent({ }) const open = computed({ - get () { + get() { return props.modelValue }, - set (value) { + set(value) { return emit('update:modelValue', value) } }) @@ -106,7 +106,6 @@ export default defineComponent({ } function beforeDestroy() { - console.log('beforeDestroy') if (polling.value) clearInterval(polling.value) } diff --git a/src/rootgen/admin/newsletter/newsletter.ts b/src/rootgen/admin/newsletter/newsletter.ts index 7b5c8f60..42087489 100755 --- a/src/rootgen/admin/newsletter/newsletter.ts +++ b/src/rootgen/admin/newsletter/newsletter.ts @@ -1,4 +1,4 @@ -import { defineComponent, ref, onMounted, watch, computed } from 'vue' +import { defineComponent, ref, onMounted, watch, computed } from 'vue' import { tools } from '@src/store/Modules/tools' @@ -49,14 +49,14 @@ export default defineComponent({ const myrisimport = ref('') const errimport = ref(false) const okimport = ref(false) - const newsstate = ref ({}) + const newsstate = ref({}) const percsubscribed = ref(0.0) - const polling = ref( null) + const polling = ref(null) const tab = ref('') const emailtextheader = ref('') const eseguipolling = ref(false) - const idparam = computed( () => $route.params.idparam ? $route.params.idparam.toString() : '') + const idparam = computed(() => $route.params.idparam ? $route.params.idparam.toString() : '') async function mounted() { await load() @@ -101,7 +101,6 @@ export default defineComponent({ } function beforeDestroy() { - console.log('beforeDestroy') if (polling.value) clearInterval(polling.value) } diff --git a/src/store/Modules/costanti.ts b/src/store/Modules/costanti.ts index 688a6b39..88a0c61a 100755 --- a/src/store/Modules/costanti.ts +++ b/src/store/Modules/costanti.ts @@ -275,6 +275,7 @@ export const costanti = { visuonstat: true, small: false, showfavorite: true, + forgroup: true, }, ],