From d69290d1744b2123bd182de757663992b021448d Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Sun, 27 Mar 2022 22:52:38 +0200 Subject: [PATCH 1/6] README.md --- README.md | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4beae2fb..a2a2e8ab 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,76 @@ -# NewFreePlanet +
+ +# NewFreePlanet +####(FrontEnd) + +## Riso.app +**Il primo Vero Social**
+**Libero, Equo e Solidale**
+**dove Vive Consapevolezza e Aiuto Comunitario**
+ +## Uniti per Evolvere e Sperimentare +- 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.
+- E' giunta l'ora di utilizzare i nuovi strumenti Tecnologici a nostro favore, per Liberarci così piano piano dalla schiavitù del "Lavoro per generare Denaro" e trasformando le nostre Capacitá in Risorse Umane per poterci sostenere e vivere in Armonia con gli altri. +
+ +
+This app was made mixing all this languages and tools:
+ +Thanks to the Quasar Framework and TypeScript ! + +
+
+ +
+ +
+ +[![Made with Quasar](https://img.shields.io/badge/made%20with-Quasar-blue.svg?style=for-the-badge)](https://github.com/quasarframework/quasar) +[![Uses TypeScript](https://img.shields.io/badge/uses-TypeScript-3F51B5.svg?style=for-the-badge)](https://github.com/Microsoft/TypeScript) + + + +
+ +
+ +[![js-standard-style](https://cdn.rawgit.com/standard/standard/master/badge.svg)](https://github.com/standard/standard) + +[![Build](https://img.shields.io/circleci/project/github/paoloar77/freeplanet/master.svg?style=for-the-badge)](https://circleci.com/gh/paoloar77/freeplanet/tree/master) +[![Coverage](https://img.shields.io/codecov/c/github/paoloar77/freeplanet/master.svg?style=for-the-badge)](https://codecov.io/gh/paoloar77/freeplanet/branch/master) + +
+ + +## Built-in Tools 🔨 + +- [TSlint](https://github.com/palantir/tslint) TypeScript Linter configured with the [Standard](https://github.com/standard/standard) JavaScript Code Style + +## Installation 🔧 + +**System prerequisites :** +- Node.js 16.14.0 or latest +- yarn > 1.21.1 or latest + + +Clone this repository : +```bash +$ git clone git@github.com:paoloar77/newfreeplanet example +$ cd example +$ yarn +``` + +## License + +[MIT](https://opensource.org/licenses/MIT) + +Copyright (c) 2018-present, Paolo Arena -A Quasar Framework app ## Install the dependencies ```bash From 838ba4544a8f29b3cbf0844362280cd05081336d Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Sun, 27 Mar 2022 22:53:14 +0200 Subject: [PATCH 2/6] README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a2a2e8ab..51fd4e48 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@
# NewFreePlanet -####(FrontEnd) +#### (FrontEnd) ## Riso.app **Il primo Vero Social**
From 4d915851c41086c26e26674ed96d679ef4609a31 Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Sun, 27 Mar 2022 22:58:25 +0200 Subject: [PATCH 3/6] README.md --- README.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/README.md b/README.md index 51fd4e48..b98607a6 100755 --- a/README.md +++ b/README.md @@ -41,16 +41,9 @@ Thanks to the Quasar Framework and TypeScript ! [![js-standard-style](https://cdn.rawgit.com/standard/standard/master/badge.svg)](https://github.com/standard/standard) -[![Build](https://img.shields.io/circleci/project/github/paoloar77/freeplanet/master.svg?style=for-the-badge)](https://circleci.com/gh/paoloar77/freeplanet/tree/master) -[![Coverage](https://img.shields.io/codecov/c/github/paoloar77/freeplanet/master.svg?style=for-the-badge)](https://codecov.io/gh/paoloar77/freeplanet/branch/master) -
-## Built-in Tools 🔨 - -- [TSlint](https://github.com/palantir/tslint) TypeScript Linter configured with the [Standard](https://github.com/standard/standard) JavaScript Code Style - ## Installation 🔧 **System prerequisites :** From e926d1bd90ef17c8c3dbaa774100bd4ecadbc71f Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Sun, 27 Mar 2022 22:59:02 +0200 Subject: [PATCH 4/6] 3.0.13 --- .env.development | 2 +- _ALL_SITES/insiemesipuo.app/.env.development | 2 +- .../popolodelnuovomondo.app/.env.development | 2 +- _ALL_SITES/riso.app/.env.development | 2 +- _ALL_SITES/riso.app/.env.test | 2 +- package.json | 14 +++++++------- src/db/lang/ws_it.js | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.env.development b/.env.development index dbf58bf5..995eb972 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.12" +APP_VERSION="0.3.13" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/insiemesipuo.app/.env.development b/_ALL_SITES/insiemesipuo.app/.env.development index ba1ffbe8..e1b5c47c 100755 --- a/_ALL_SITES/insiemesipuo.app/.env.development +++ b/_ALL_SITES/insiemesipuo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.12" +APP_VERSION="0.3.13" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.development b/_ALL_SITES/popolodelnuovomondo.app/.env.development index 4e20ff01..59fb19d6 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/.env.development +++ b/_ALL_SITES/popolodelnuovomondo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.12" +APP_VERSION="0.3.13" SERVICE_WORKER_FILE="service-worker.js" APP_ID="12" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index e97c6de3..f84971e7 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.12" +APP_VERSION="0.3.13" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.test b/_ALL_SITES/riso.app/.env.test index 7c5d942b..1e0b7098 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="0.3.12" +APP_VERSION="0.3.13" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/package.json b/package.json index 642e1bbc..2730c6c4 100755 --- a/package.json +++ b/package.json @@ -119,15 +119,15 @@ "crypto": false }, "browserslist": [ - "last 13 Chrome versions", - "last 13 Firefox versions", + "last 16 Chrome versions", + "last 16 Firefox versions", "last 4 Edge versions", "last 13 Safari versions", - "last 14 Android versions", - "last 14 ChromeAndroid versions", - "last 14 FirefoxAndroid versions", - "last 10 iOS versions", - "last 5 Opera versions" + "last 16 Android versions", + "last 16 ChromeAndroid versions", + "last 16 FirefoxAndroid versions", + "last 12 iOS versions", + "last 7 Opera versions" ], "engines": { "node": ">= 16.14.0", diff --git a/src/db/lang/ws_it.js b/src/db/lang/ws_it.js index 14f73954..41be727b 100755 --- a/src/db/lang/ws_it.js +++ b/src/db/lang/ws_it.js @@ -145,7 +145,7 @@ const msg_website_it = { }, homepage: { descrapp_title1: 'Uniti per Evolvere e Sperimentare', - descrapp_pag1: '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. ' + + descrapp_pag1: '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.', descrapp_pag2: 'E\' giunta l\'ora di utilizzare i nuovi strumenti Tecnologici a nostro favore, per Liberarci ' From 1b090fd75bdf1021f35b61ec0244230a49f5bbb3 Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Sun, 27 Mar 2022 23:05:10 +0200 Subject: [PATCH 5/6] 3.0.13 --- .env.example.production | 27 +++++++++++++++++++++++++++ README.md | 7 +++++++ 2 files changed, 34 insertions(+) create mode 100755 .env.example.production diff --git a/.env.example.production b/.env.example.production new file mode 100755 index 00000000..d1527f19 --- /dev/null +++ b/.env.example.production @@ -0,0 +1,27 @@ +APP_VERSION="0.3.13" +SERVICE_WORKER_FILE="service-worker.js" +APP_ID="13" +DIRECTORY_LOCAL=newfreeplanet +DIRECTORY_SERVER=freeplanet_serverside +SERVERDIR_WEBSITE=riso.app +SERVERPW_WEBSITE= +APP_URL="https://riso.app" +URL_FACEBOOK="" +PROVA_PAOLO="" +LANG_DEFAULT="it" +PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" +MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" +MONGODB_HOST="https://www.freeplanet.app:3000" +LOGO_REG='riso-logo-full.png' +TEST_NAME="" +TEST_SURNAME="" +TEST_EMAIL="" +TEST_USERNAME="" +TEST_PASSWORD="" +TEST_APORTADOR="------" +PUBLICKEY_PUSH="" +DEBUG="1" +TELEGRAM_SUPPORT="" +PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" +TEST_CELL="" +ISTEST=0 diff --git a/README.md b/README.md index b98607a6..e118c5fc 100755 --- a/README.md +++ b/README.md @@ -77,12 +77,19 @@ npm run pwa ### Build the app for test Server ```bash +cp .env.example.production .env.test +nano .env.test +# and change SERVERPW_WEBSITE and PUBLICKEY_PUSH keys in this file + ./deploy_on_test_server.sh ``` ### Build the app for production ```bash +cp .env.example.production .env.production +nano .env.production +# and change SERVERPW_WEBSITE and PUBLICKEY_PUSH keys in this file ./deploy_on_production.sh ``` From 9448797fe3660947a5a52734a6ad6c7fbaedfbd1 Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Wed, 30 Mar 2022 22:48:08 +0200 Subject: [PATCH 6/6] 0.3.14: Se errore di connessione al Server: compare l'username telegram ! Se Cookie disattivati: non riesci a loggare. sui Gruppi: non si vede il Comune ! Sei stato accettato da paoloar77 a far parte del Gruppo Terraw. MSG SBAGLIATO l'immagine dell'amministratore del gruppo non compariva --- .env.development | 2 +- .env.example.production | 2 +- _ALL_SITES/insiemesipuo.app/.env.development | 2 +- .../popolodelnuovomondo.app/.env.development | 2 +- _ALL_SITES/riso.app/.env.development | 2 +- _ALL_SITES/riso.app/.env.test | 2 +- src/components/CFinder/CFinder.ts | 8 ++++- .../CMyCardGrpPopup/CMyCardGrpPopup.ts | 3 +- src/components/CMySelect/CMySelect.ts | 1 + src/components/CSignIn/CSignIn.ts | 3 +- src/components/CUserNonVerif/CUserNonVerif.ts | 2 ++ .../CUserNonVerif/CUserNonVerif.vue | 2 +- src/store/Api/Instance.ts | 4 +-- src/store/Modules/fieldsTable.ts | 6 ++-- src/store/Modules/tools.ts | 7 +++- src/store/UserStore.ts | 32 +++++++++++++++---- src/store/globalStore.ts | 6 +++- src/views/user/mygroup/mygroup.vue | 2 +- 18 files changed, 64 insertions(+), 24 deletions(-) diff --git a/.env.development b/.env.development index 995eb972..0abd33cd 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.13" +APP_VERSION="0.3.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index d1527f19..d635b0d5 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.3.13" +APP_VERSION="0.3.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/insiemesipuo.app/.env.development b/_ALL_SITES/insiemesipuo.app/.env.development index e1b5c47c..1e910e5d 100755 --- a/_ALL_SITES/insiemesipuo.app/.env.development +++ b/_ALL_SITES/insiemesipuo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.13" +APP_VERSION="0.3.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.development b/_ALL_SITES/popolodelnuovomondo.app/.env.development index 59fb19d6..d23ea078 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/.env.development +++ b/_ALL_SITES/popolodelnuovomondo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.13" +APP_VERSION="0.3.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="12" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index f84971e7..034129fb 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.13" +APP_VERSION="0.3.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.test b/_ALL_SITES/riso.app/.env.test index 1e0b7098..dba09e83 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="0.3.13" +APP_VERSION="0.3.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts index 20ae7e0a..0d0b3265 100755 --- a/src/components/CFinder/CFinder.ts +++ b/src/components/CFinder/CFinder.ts @@ -796,7 +796,13 @@ export default defineComponent({ recCatGrp: 1, } }, - + lookup5: { + lk_tab: 'cities', + lk_LF: 'idCity', + lk_FF: '_id', + lk_as: 'mycities', + af_objId_tab: '', + }, } } else if (props.table === toolsext.TABMYGOODS) { diff --git a/src/components/CMyCardGrpPopup/CMyCardGrpPopup.ts b/src/components/CMyCardGrpPopup/CMyCardGrpPopup.ts index d70696b2..ca9cf6d2 100644 --- a/src/components/CMyCardGrpPopup/CMyCardGrpPopup.ts +++ b/src/components/CMyCardGrpPopup/CMyCardGrpPopup.ts @@ -76,7 +76,8 @@ export default defineComponent({ } function condividipag() { - return tools.copyStringToClipboard($q, self.location.host + tools.getPathByGroup(myrec.value, props.table), true) + const msg = self.location.host + tools.getPathByGroup(myrec.value, props.table) + return tools.copyStringToClipboard($q, msg, true) } onMounted(mounted) diff --git a/src/components/CMySelect/CMySelect.ts b/src/components/CMySelect/CMySelect.ts index 509bdb51..9fcb1dd0 100755 --- a/src/components/CMySelect/CMySelect.ts +++ b/src/components/CMySelect/CMySelect.ts @@ -312,6 +312,7 @@ export default defineComponent({ // Check if exist other array: if (props.col) { + if (props.col.remote_table && props.col.remote_key && props.col.remote_field) { try { diff --git a/src/components/CSignIn/CSignIn.ts b/src/components/CSignIn/CSignIn.ts index 64af1f74..5b0438f1 100755 --- a/src/components/CSignIn/CSignIn.ts +++ b/src/components/CSignIn/CSignIn.ts @@ -118,13 +118,14 @@ export default defineComponent({ }) .then((riscode: number) => { if (riscode === tools.OK) { - // console.log(' -> eseguo emit(loginOk)') + console.log(' -> eseguo emit(loginOk)') emit('loginOk') globalStore.createPushSubscription() } else { + console.log(' -> eseguo emit(checkErrors)') emit('checkErrors', riscode) } diff --git a/src/components/CUserNonVerif/CUserNonVerif.ts b/src/components/CUserNonVerif/CUserNonVerif.ts index 6dd6bbd5..1b9f8f0f 100755 --- a/src/components/CUserNonVerif/CUserNonVerif.ts +++ b/src/components/CUserNonVerif/CUserNonVerif.ts @@ -23,9 +23,11 @@ export default defineComponent({ setup(props) { const userStore = useUserStore() + const globalStore = useGlobalStore() return { userStore, + globalStore, tools, } }, diff --git a/src/components/CUserNonVerif/CUserNonVerif.vue b/src/components/CUserNonVerif/CUserNonVerif.vue index 68bd4ae3..3279d25c 100755 --- a/src/components/CUserNonVerif/CUserNonVerif.vue +++ b/src/components/CUserNonVerif/CUserNonVerif.vue @@ -1,5 +1,5 @@