From 9a3ebc69cae129e40b2906a22fefe6120ed13ac9 Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Thu, 30 Nov 2023 19:50:18 +0100 Subject: [PATCH] bottoni fiducia --- .env.development | 6 +- _ALL_SITES/piuchebuono.app/.env.test | 10 +- _ALL_SITES/piuchebuono.app/db/static_data.ts | 132 +++++++++++++++++- now.txt | 2 +- package.json | 8 +- quasar.conf.js | 28 ++-- src/common/shared_vuejs.ts | 3 +- .../CMyProfileTutorial/CMyProfileTutorial.vue | 6 +- src/components/CSingleCart/CSingleCart.ts | 2 +- src/db/lang/ws_it.js | 11 +- src/db/static_data.ts | 93 +++++++++++- src/statics/lang/it.js | 6 +- src/store/Modules/tools.ts | 14 +- 13 files changed, 273 insertions(+), 48 deletions(-) diff --git a/.env.development b/.env.development index 68c3cf88..5324bf5c 100755 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ -APP_VERSION="1.0.21" +APP_VERSION="1.0.20" SERVICE_WORKER_FILE="service-worker.js" -APP_ID="17" +APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_SERVER="freeplanet_serverside" SERVERDIR_WEBSITE="" @@ -12,7 +12,7 @@ LANG_DEFAULT="it" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" MONGODB_HOST="https://localhost:3000" -LOGO_REG='piuchebuono-logo-full.png' +LOGO_REG='riso-logo-full.png' TEST_NAME="Paolo" TEST_SURNAME="Arena" TEST_EMAIL="" diff --git a/_ALL_SITES/piuchebuono.app/.env.test b/_ALL_SITES/piuchebuono.app/.env.test index 4cf1ba86..98879930 100755 --- a/_ALL_SITES/piuchebuono.app/.env.test +++ b/_ALL_SITES/piuchebuono.app/.env.test @@ -1,18 +1,18 @@ -APP_VERSION="1.0.21" +APP_VERSION="1.0.20" SERVICE_WORKER_FILE="service-worker.js" -APP_ID="17" +APP_ID="13" DIRECTORY_LOCAL=newfreeplanet DIRECTORY_SERVER=test.freeplanet_serverside -SERVERDIR_WEBSITE="test.piuchebuono.app" +SERVERDIR_WEBSITE="test.riso.app" SERVERPW_WEBSITE="pwdadmin@1AOK" -APP_URL="https://test.piuchebuono.app" +APP_URL="https://test.riso.app" URL_FACEBOOK="" PROVA_PAOLO="" LANG_DEFAULT="it" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" MONGODB_HOST="https://test.freeplanet.app:3001" -LOGO_REG='piuchebuono-logo-full.png' +LOGO_REG='riso-logo-full.png' TEST_NAME="" TEST_SURNAME="" TEST_EMAIL="" diff --git a/_ALL_SITES/piuchebuono.app/db/static_data.ts b/_ALL_SITES/piuchebuono.app/db/static_data.ts index c47396b6..5b666e55 100755 --- a/_ALL_SITES/piuchebuono.app/db/static_data.ts +++ b/_ALL_SITES/piuchebuono.app/db/static_data.ts @@ -22,7 +22,7 @@ const firstPage = { function getDynamicPages(site: ISites): IListRoutes[] { const baseroutes: IListRoutes[] = [ - /*{ + { active: true, order: 5, path: '/', @@ -33,7 +33,7 @@ function getDynamicPages(site: ISites): IListRoutes[] { inmenu: true, infooter: true, }, - { + /*{ active: true, order: 20, path: '/events', @@ -44,6 +44,134 @@ function getDynamicPages(site: ISites): IListRoutes[] { inmenu: true, infooter: true, },*/ + { + active: true, + order: 120, + path: '/myprofile', + materialIcon: 'fas fa-user', + name: 'pages.profile', + component: () => import('@/views/user/myprofile/myprofile.vue'), + meta: { requiresAuth: true }, + inmenu: true, + infooter: true, + }, + { + active: true, + order: 120, + path: '/editprofile', + materialIcon: 'fas fa-user', + name: 'pages.profile3', + component: () => import('@/views/user/editprofile/editprofile.vue'), + meta: { requiresAuth: true }, + inmenu: false, + infooter: false, + }, + { + active: true, + order: 130, + path: '/friends', + materialIcon: 'fas fa-user-friends', + name: 'mypages.iscritti', + component: () => import('@/views/user/myfriends/myfriends.vue'), + meta: { requiresAuth: true }, + inmenu: true, + infooter: true, + }, + { + active: site.confpages && site.confpages.enableGroups, + order: 132, + path: '/groups', + materialIcon: 'fas fa-users', + name: 'mypages.groups', + component: () => import('@/views/user/mygroups/mygroups.vue'), + meta: { requiresAuth: true }, + inmenu: true, + infooter: false, + }, + { + active: true, + order: 136, + path: '/grp/:groupname', + materialIcon: 'fas fa-user', + name: 'proj.group2', + component: () => import('@/views/user/mygroup/mygroup.vue'), + meta: { requiresAuth: true, newpage: true }, + inmenu: false, + infooter: false, + }, + { + active: true, + path: '/separator', + name: 'separator', + order: 140, + isseparator: true, + inmenu: true, + }, + { + active: true, + order: 130, + path: '/mypage/:idBacheca', + materialIcon: 'fas fa-user', + name: 'pages.mypage2', + component: () => import('@/views/user/mypagebacheca/mypagebacheca.vue'), + meta: { requiresAuth: true, newpage: true }, + inmenu: false, + infooter: false, + }, + { + active: true, + order: 130, + path: '/myservice/:idSkill', + materialIcon: '', + name: 'pages.myservice2', + component: () => import('@/views/user/myservice/myservice.vue'), + meta: { requiresAuth: true, newpage: true }, + inmenu: false, + infooter: false, + }, + { + active: true, + order: 135, + path: '/myhosps/:idHosp', + materialIcon: '', + name: 'pages.myhosps2', + component: () => import('@/views/user/mypagehosp/mypagehosp.vue'), + meta: { requiresAuth: true, newpage: true }, + inmenu: false, + infooter: false, + }, + { + active: true, + order: 132, + path: '/mygood/:idGood', + materialIcon: '', + name: 'pages.mygood2', + component: () => import('@/views/user/mypagegood/mypagegood.vue'), + meta: { requiresAuth: true, newpage: true }, + inmenu: false, + infooter: false, + }, + { + active: true, + order: 150, + path: '/fundraising', + materialIcon: 'fas fa-hand-holding-heart', + name: 'pages.fundraising', + component: () => import('@src/root/fundraising/fundraising.vue'), + inmenu: false, + infooter: false, + }, + { + active: true, + order: 80, + path: '/calendario-eventi', + materialIcon: 'event', + name: 'ris.calendario_eventi_riso', + component: () => import('@/root/calendarioeventi/calendarioeventi.vue'), + extraclass: 'isCalendar', + inmenu: false, + infooter: false + }, ] return baseroutes diff --git a/now.txt b/now.txt index e5f5d4ff..9bc58f3e 100644 --- a/now.txt +++ b/now.txt @@ -1 +1 @@ -TERMINA DI LAVORARE SU riso.app: (Sovrascrivo !) +TERMINA DI LAVORARE SU piuchebuono.app: (Sovrascrivo !) diff --git a/package.json b/package.json index 0e270b75..e760c1ab 100755 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "piuchebuono", - "version": "2.0.1", - "description": "PiuCheBuono", - "productName": "PiuCheBuono", + "name": "riso", + "version": "0.6.1", + "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/quasar.conf.js b/quasar.conf.js index b4bf3510..4fe00ed6 100755 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -147,7 +147,7 @@ module.exports = configure((ctx) => ({ }, devServer: { https: false, - port: 8088, + port: 8084, open: false, // opens browser window automatically headers: { 'Access-Control-Allow-Origin': '*', @@ -305,9 +305,9 @@ module.exports = configure((ctx) => ({ }, manifest: { - name: 'Più che Buono', - short_name: 'PiuCheBuono', - description: 'PiuCheBuono è un GAS e Bottega', + 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', @@ -317,47 +317,47 @@ module.exports = configure((ctx) => ({ start_url: "/?homescreen=1", icons: [ { - src: 'images/fv-android-icon-512x512.png', + src: 'images/riso-android-icon-512x512.png', sizes: '512x512', type: 'image/png', }, { - src: 'images/fv-android-icon-384x384.png', + src: 'images/riso-android-icon-384x384.png', sizes: '384x384', type: 'image/png', }, { - src: 'images/fv-android-icon-192x192.png', + src: 'images/riso-android-icon-192x192.png', sizes: '192x192', type: 'image/png', }, { - src: 'images/fv-android-icon-144x144.png', + src: 'images/riso-android-icon-144x144.png', sizes: '144x144', type: 'image/png', }, { - src: 'images/fv-android-icon-96x96.png', + src: 'images/riso-android-icon-96x96.png', sizes: '96x96', type: 'image/png', }, { - src: 'images/fv-apple-icon-120x120.png', + src: 'images/riso-apple-icon-120x120.png', sizes: '120x120', type: 'image/png', }, { - src: 'images/fv-apple-icon-144x144.png', + src: 'images/riso-apple-icon-144x144.png', sizes: '144x144', type: 'image/png', }, { - src: 'images/fv-apple-icon-152x152.png', + src: 'images/riso-apple-icon-152x152.png', sizes: '152x152', type: 'image/png', }, { - src: 'images/fv-apple-icon-180x180.png', + src: 'images/riso-apple-icon-180x180.png', sizes: '180x180', type: 'image/png', }, @@ -399,7 +399,7 @@ module.exports = configure((ctx) => ({ builder: { // https://www.electron.build/configuration/configuration - appId: 'PiuCheBuono', + appId: 'Riso', }, // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index fa821a88..63b84a9f 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -1098,7 +1098,8 @@ export const shared_consts = { TypeMsgTemplate: { MSG_BENVENUTO: 2010, - MS_SHARE_LINK: 2000 + MS_SHARE_LINK: 2000, + MSG_BENV_REGISTRATO: 2020, }, TypeSend: { diff --git a/src/components/CMyProfileTutorial/CMyProfileTutorial.vue b/src/components/CMyProfileTutorial/CMyProfileTutorial.vue index a11611ff..0a844f7e 100755 --- a/src/components/CMyProfileTutorial/CMyProfileTutorial.vue +++ b/src/components/CMyProfileTutorial/CMyProfileTutorial.vue @@ -292,14 +292,16 @@ -
+ + -
+ + diff --git a/src/components/CSingleCart/CSingleCart.ts b/src/components/CSingleCart/CSingleCart.ts index 56f145a6..af4ec264 100755 --- a/src/components/CSingleCart/CSingleCart.ts +++ b/src/components/CSingleCart/CSingleCart.ts @@ -41,7 +41,7 @@ export default defineComponent({ function addsubqty(addqty: boolean, subqty: boolean) { if (addqty) { - if (props.order.quantity! >= 10) + if (props.order.quantity >= 10) return false } diff --git a/src/db/lang/ws_it.js b/src/db/lang/ws_it.js index 65ee5f22..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: 'Più che Buono', - siteshortname: 'Più che Buono', - description: '', - 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', @@ -32,7 +32,6 @@ const msg_website_it = { products: 'Prodotti', productslist: 'Lista Prodotti', collabora: 'Collabora', - categories: 'Categorie', storehouses: 'Magazzino', departments: 'Uffici', orders: 'Ordini Ricevuti', @@ -124,7 +123,7 @@ const msg_website_it = { color: 'Colore', }, msg: { - myAppName: 'Più che Buono', + myAppName: 'Riso', myAppDescription: 'Il primo Vero Social Libero, Equo e Solidale, dove Vive Consapevolezza e Aiuto Comunitario. Gratuito', underconstruction: 'App in costruzione...', myDescriz: '', diff --git a/src/db/static_data.ts b/src/db/static_data.ts index 5b666e55..9fab8506 100755 --- a/src/db/static_data.ts +++ b/src/db/static_data.ts @@ -7,6 +7,30 @@ import { import { func } from '@store/Modules/fieldsTable' +// const SHOW_PROJINTHEMENU = false +// +// let arrlistafavourite = [] +// let arrlistaprojtutti = [] +// let arrlistaprojmiei = [] +// if (SHOW_PROJINTHEMENU) { +// arrlistaprojtutti = Projects.getters.listaprojects(RouteNames.projectsall) +// arrlistaprojmiei = Projects.getters.listaprojects(RouteNames.myprojects) +// arrlistafavourite = Projects.getters.listaprojects(RouteNames.favouriteprojects) +// } +// PROGETTI -> FAVORITI : + +// if (arrlistafavourite.length > 0) { +// arrMenu.push({ +// icon: 'favorite_border', +// nametranslate: 'pages.' + RouteNames.favouriteprojects, +// urlroute: RouteNames.favouriteprojects, +// level_parent: 0.0, +// level_child: 0.5, +// routes2: arrlistafavourite, +// idelem: '' +// }) +// } + const firstPage = { active: true, order: 5, @@ -33,7 +57,62 @@ function getDynamicPages(site: ISites): IListRoutes[] { inmenu: true, infooter: true, }, - /*{ + { + active: true, + order: 12, + path: '/goods', + materialIcon: 'fas fa-tshirt', + name: 'mypages.goods', + component: () => import('@/root/goods/goods.vue'), + meta: { requiresAuth: true }, + inmenu: true, + infooter: true, + }, + { + active: true, + order: 15, + path: '/services', + materialIcon: 'fas fa-house-user', + name: 'mypages.services', + component: () => import('@/root/services/services.vue'), + meta: { requiresAuth: true }, + inmenu: true, + infooter: true, + }, + { + active: true, + order: 15, + path: '/provapao', + materialIcon: 'fas fa-house-user', + name: 'mypages.provapao', + component: () => import('@/root/provapao/provapao.vue'), + meta: { requiresAuth: true }, + inmenu: false, + infooter: false, + }, + { + active: true, + order: 15, + path: '/hosps', + materialIcon: 'fas fa-bed', + name: 'mypages.hosp', + component: () => import('@/root/hosp/hosp.vue'), + meta: { requiresAuth: true }, + inmenu: true, + infooter: true, + }, + { + active: site.confpages && site.confpages.enableCircuits, + order: 16, + path: '/circuits', + materialIcon: 'fas fa-coins', + name: 'mypages.circuits', + component: () => import('@/views/user/mycircuits/mycircuits.vue'), + meta: { requiresAuth: true }, + inmenu: true, + infooter: true, + }, + { active: true, order: 20, path: '/events', @@ -43,7 +122,7 @@ function getDynamicPages(site: ISites): IListRoutes[] { meta: { requiresAuth: true }, inmenu: true, infooter: true, - },*/ + }, { active: true, order: 120, @@ -98,6 +177,16 @@ function getDynamicPages(site: ISites): IListRoutes[] { meta: { requiresAuth: true, newpage: true }, inmenu: false, infooter: false, + }, { + active: true, + order: 137, + path: '/circuit/:path', + materialIcon: 'fas fa-user', + name: 'proj.circuit2', + component: () => import('@/views/user/mycircuit/mycircuit.vue'), + meta: { requiresAuth: true, newpage: true }, + inmenu: false, + infooter: false, }, { active: true, diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index 502e8e83..4afcdf63 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -276,7 +276,9 @@ const msg_it = { addedfidocircuit: 'Fido abilitato al {circuitname}', addedcircuit: 'Aggiunto al {circuitname}', domanda_trusted: 'Accettare la Fiducia a {username}?', - trusted: 'Accettato la Fiducia', + domanda_reject: 'Non lo conosci? Vuoi rifiutare l\'accesso a {username}?', + trusted: 'Hai Accettato la Fiducia a {username}', + rejected: 'Hai Rifiutato l\'accesso a {username}', domanda_ask_friend: 'Chiedere l\'Amicizia a {username}?', domanda_ask_handshake: 'Confermi che hai conosciuto personalmente e dai la tua fiducia a {username} ?', domanda_ask_group: 'Chiedere l\'invito al Gruppo {groupname}?', @@ -293,7 +295,7 @@ const msg_it = { cancel_req_friend: 'Annullata la richiesta di Amicizia a {username}', cancel_req_group: 'Annullata la richiesta al gruppo {groupname}', domanda_rejectedtrust: 'Rifiutare la Fiducia a {username}?', - rejected: 'Rifiutato la Fiducia', + rejected: 'Hai rifiutato l\'accesso alla App a {username}', domanda_blockuser: 'Bloccare {username}?', domanda_unblockuser: 'Sbloccare {username}?', domanda_reportuser: 'Segnalare l\'utente {username}?', diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index bd0a80b5..c0cb6d8c 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -5568,22 +5568,26 @@ export const tools = { }) }, - addToMyTrust($q: any, username: string, usernameDest: string) { + addToMyTrust($q: any, username: string, usernameDest: string, value: boolean) { const userStore = useUserStore() const notifStore = useNotifStore() $q.dialog({ - message: t('db.domanda_trusted', { username: usernameDest }), + message: t(value ? 'db.domanda_trusted' : 'db.domanda_reject', { username: usernameDest }), ok: { label: t('dialog.yes'), push: true }, cancel: { label: t('dialog.cancel') }, title: t('db.domanda') }).onOk(() => { - userStore.setFriendsCmd($q, t, username, usernameDest, shared_consts.FRIENDSCMD.SETTRUST, null) + userStore.setFriendsCmd($q, t, username, usernameDest, shared_consts.FRIENDSCMD.SETTRUST, value) .then((res: any) => { if (res) { userStore.my.profile.userstoverify = userStore.my.profile.userstoverify.filter((rec: any) => rec.username !== usernameDest) - tools.showPositiveNotif($q, t('db.trusted')) + + if (value) + tools.showPositiveNotif($q, t('db.trusted', {username: usernameDest})) + else + tools.showNegativeNotif($q, t('db.rejected', {username: usernameDest})) } }) }) @@ -6884,7 +6888,7 @@ export const tools = { } else if (cmd === shared_consts.FRIENDSCMD.SETFRIEND) { tools.addToMyFriends($q, username, dest) } else if (cmd === shared_consts.FRIENDSCMD.SETTRUST) { - tools.addToMyTrust($q, username, dest) + tools.addToMyTrust($q, username, dest, value) } else if (cmd === shared_consts.FRIENDSCMD.REQFRIEND) { tools.setRequestFriendship($q, username, dest, value) } else if (cmd === shared_consts.FRIENDSCMD.REMOVE_FROM_MYFRIENDS) {