From 83e6f92978d33e1c226ea07dd03a64997c9b1913 Mon Sep 17 00:00:00 2001 From: paoloar77 Date: Wed, 2 Nov 2022 14:59:32 +0100 Subject: [PATCH] Version 0.5.25 Registration with no need to insert "invitante" --- .env.example.production | 2 +- _ALL_SITES/arcadei.it/.env.development | 2 +- _ALL_SITES/arcadei.it/.env.test | 6 +- _ALL_SITES/arcadei.it/db/lang/ws_it.js | 3 + _ALL_SITES/arcadei.it/db/static_data.ts | 51 ++++- .../arcadei.it/root_spec/home_tdv/home_tdv.ts | 5 - .../popolodelnuovomondo.app/.env.development | 2 +- _ALL_SITES/riso.app/.env.development | 2 +- _ALL_SITES/riso.app/.env.test | 2 +- .../terradellavisione.app/.env.development | 2 +- _ALL_SITES/terradellavisione.app/.env.test | 2 +- package.json | 8 +- public/favicon.ico | Bin 1150 -> 1150 bytes public/images/favicon-16x16.png | Bin 1282 -> 1378 bytes public/images/favicon-32x32.png | Bin 2563 -> 3372 bytes public/images/favicon.ico | Bin 1150 -> 1150 bytes quasar.conf.js | 45 +++- src-pwa/custom-service-worker.js | 28 ++- src-pwa/register-service-worker.js | 4 + src/components/CSignUp/CSignUp.vue | 7 + src/components/MyHeader/MyHeader.ts | 50 ++++- src/components/MyHeader/MyHeader.vue | 2 +- src/db/lang/ws_it.js | 42 ++-- src/db/static_data.ts | 169 +++++++++----- src/root_spec/home_arcadei/home_arcadei.ts | 30 ++- src/root_spec/home_arcadei/home_arcadei.vue | 211 +++++++++++++++++- src/root_spec/home_tdv/home_tdv.ts | 5 + termina_arcadei.it.sh | 18 ++ termina_riso.app.sh | 18 ++ 29 files changed, 569 insertions(+), 147 deletions(-) create mode 100755 termina_arcadei.it.sh create mode 100755 termina_riso.app.sh diff --git a/.env.example.production b/.env.example.production index e55cd5eb..2a4bacf0 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.24" +APP_VERSION="0.5.25" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/arcadei.it/.env.development b/_ALL_SITES/arcadei.it/.env.development index c58c5099..1a1a111c 100755 --- a/_ALL_SITES/arcadei.it/.env.development +++ b/_ALL_SITES/arcadei.it/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.24" +APP_VERSION="0.5.25" SERVICE_WORKER_FILE="service-worker.js" APP_ID="15" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/arcadei.it/.env.test b/_ALL_SITES/arcadei.it/.env.test index c49a470a..023157bc 100755 --- a/_ALL_SITES/arcadei.it/.env.test +++ b/_ALL_SITES/arcadei.it/.env.test @@ -1,11 +1,11 @@ -APP_VERSION="0.5.24" +APP_VERSION="0.5.25" SERVICE_WORKER_FILE="service-worker.js" APP_ID="15" DIRECTORY_LOCAL=newfreeplanet DIRECTORY_SERVER=test.freeplanet_serverside -SERVERDIR_WEBSITE="arcadei.riso.app" +SERVERDIR_WEBSITE="testarcadei.riso.app" SERVERPW_WEBSITE="pwdadmin@1AOK" -APP_URL="https://arcadei.riso.app" +APP_URL="https://testarcadei.riso.app" URL_FACEBOOK="" PROVA_PAOLO="" LANG_DEFAULT="it" diff --git a/_ALL_SITES/arcadei.it/db/lang/ws_it.js b/_ALL_SITES/arcadei.it/db/lang/ws_it.js index 6b7d5d05..94db79c3 100755 --- a/_ALL_SITES/arcadei.it/db/lang/ws_it.js +++ b/_ALL_SITES/arcadei.it/db/lang/ws_it.js @@ -54,6 +54,7 @@ const msg_website_it = { need_Telegram: 'Per poter utilizzare la Piattaforma occorre avere Telegram installato
', Registrazione_Con_Bot: '1) Copia questo username cliccandoci sopra:', SignUpIscrizione: 'Diventa Socio CNM', + SignUpArcadei: 'Aderisci ad Arcadei', SignUp_alreadylista: 'Registrazione per quelli che erano già nella lista di Notevole (del 2019) !', SignUp2: 'Registrazione', SignUpBot: 'Registrati', @@ -113,8 +114,10 @@ const msg_website_it = { hours: 'Ore', department: 'Uffici', title: 'Titolo', + subtitle: 'SottoTitolo', path: 'Percorso', img1: 'Immagine 1', + imgsize: 'ImgSize', contentfield: 'Testo 1', video1: 'Video 1', ratio1: 'Ratio 1', diff --git a/_ALL_SITES/arcadei.it/db/static_data.ts b/_ALL_SITES/arcadei.it/db/static_data.ts index e815e597..6b858e9b 100755 --- a/_ALL_SITES/arcadei.it/db/static_data.ts +++ b/_ALL_SITES/arcadei.it/db/static_data.ts @@ -270,6 +270,21 @@ const routes_manager: IListRoutes[] = [ onlyManager: true, onlyFacilitatore: true }, + { + active: true, + order: 10, + path: '/admin/iscrittiarcadei', + materialIcon: 'fas fa-users', + name: 'otherpages.admin.iscrittiarcadei', + component: () => import('@/rootgen/admin/iscrittiarcadei/iscrittiarcadei.vue'), + inmenu: true, + submenu: true, + level_parent: 0, + level_child: 0.5, + onlyManager: true, + onlyFacilitatore: true + }, + /* { active: true, @@ -345,6 +360,20 @@ const routes_manager: IListRoutes[] = [ onlyManager: true, onlyEditor: true }, + { + active: true, + order: 32, + path: '/admin/home', + materialIcon: 'fas fa-file-alt', + name: 'otherpages.admin.Home', + component: () => import('@/rootgen/admin/home/home.vue'), + inmenu: true, + submenu: true, + level_parent: 0, + level_child: 0.5, + onlyManager: true, + onlyEditor: true + }, { active: true, order: 30, @@ -481,7 +510,7 @@ const baseroutes: IListRoutes[] = [ inmenu: true, infooter: true, }, - { + /*{ active: true, order: 120, path: '/myprofile', @@ -491,7 +520,7 @@ const baseroutes: IListRoutes[] = [ meta: { requiresAuth: true }, inmenu: true, infooter: true, - }, + },*/ { active: true, order: 120, @@ -546,7 +575,7 @@ const baseroutes: IListRoutes[] = [ meta: { requiresAuth: true, newpage: true }, inmenu: false, infooter: false, - },{ + }, { active: true, order: 137, path: '/circuit/:path', @@ -603,7 +632,7 @@ const baseroutes: IListRoutes[] = [ }, { active: true, - order: 150, + order: 60, path: '/fundraising', materialIcon: 'fas fa-hand-holding-heart', name: 'pages.fundraising', @@ -743,7 +772,7 @@ const baseroutes: IListRoutes[] = [ materialIcon: 'account_circle', name: 'pages.SignIn', component: () => import('@/views/login/signin_noreg/signin_noreg.vue'), - inmenu: true, + inmenu: false, infooter: true }, // --- NOT IN MENU: --- @@ -794,6 +823,18 @@ const baseroutes: IListRoutes[] = [ inmenu: true, infooter: true }, + { + active: true, + order: 55, + path: '/iscrizione', + materialIcon: 'how_to_reg', + name: 'pages.SignUpArcadei', + component: () => import('@/views/login/iscrizionearcadei/iscrizionearcadei.vue'), + inmenu: true, + infooter: true, + separator: false, + onlyNotSoci: false, + }, { active: true, order: 1000, diff --git a/_ALL_SITES/arcadei.it/root_spec/home_tdv/home_tdv.ts b/_ALL_SITES/arcadei.it/root_spec/home_tdv/home_tdv.ts index a636bdb8..c6557fe8 100755 --- a/_ALL_SITES/arcadei.it/root_spec/home_tdv/home_tdv.ts +++ b/_ALL_SITES/arcadei.it/root_spec/home_tdv/home_tdv.ts @@ -28,11 +28,6 @@ export default defineComponent({ const slide2 = ref(1) const getImmagini = ref([ - { - title: '', subtitle: '', - alt: 'Elisa e Cristina insieme', - img: '../../statics/images/eventi_esterni/IMG_6035.jpg' - }, ]) const userStore = useUserStore() diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.development b/_ALL_SITES/popolodelnuovomondo.app/.env.development index 20b8fa1f..8fe750d7 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/.env.development +++ b/_ALL_SITES/popolodelnuovomondo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.24" +APP_VERSION="0.5.25" 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 7d24c195..e975170e 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.24" +APP_VERSION="0.5.25" 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 e70588fd..2c68b2d5 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="0.5.24" +APP_VERSION="0.5.25" 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 b19e3a94..dac34434 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.24" +APP_VERSION="0.5.25" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/terradellavisione.app/.env.test b/_ALL_SITES/terradellavisione.app/.env.test index e16e773a..d31d0df3 100755 --- a/_ALL_SITES/terradellavisione.app/.env.test +++ b/_ALL_SITES/terradellavisione.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="0.5.24" +APP_VERSION="0.5.25" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL=newfreeplanet diff --git a/package.json b/package.json index 27529bc7..7104a4e5 100755 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { - "name": "arcadei", + "name": "riso", "version": "0.5.3", - "description": "Arcadei è un modello di aggregazione sociale a base umanitaria finalizzato alla tutela dell’Essere Umano e dei suoi inalienabili diritti naturali. Una Piattaforma di Umani liberi e cooperanti che persegue e sviluppa modelli finalizzati all’autodeterminazione e all’ esercizio della naturale Sovranità individuale e collettiva per dare vita alle necessarie Autonomie Alimentari, Spirituali, Energetiche, Economiche e Sanitarie indispensabili allo sviluppo del libero e pieno potenziale umano.", - "productName": "Arcadei", - "author": "Surya Paolo", + "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": [], "license": "MIT", diff --git a/public/favicon.ico b/public/favicon.ico index d9f5591095721a6db11c5866a79829212c7dc433..06be8648e35ad981da2d55f40cfea92ee1cfa4ea 100644 GIT binary patch literal 1150 zcmbW1Sx=i+5Qbf;*Hx~1-OK)gUi7Ao)SF&3i2_L~lvIrz%38qSU>lc^u+?r@VuOJ| zNW#(rW;0+6n8l85Y-9MaKjVFisi9G;{)neXjrs?wqnXi}bKaTJJ9Cag@qt)Zt|)~5 zL{amhLh-Req4-pYa0$VGVB*KQR~TLSxfoUcHMi-pb+GeFAbN`%*ogn2Exro%qEza=}XWa)#nx zv#jqKSlREzo9V@N(!)cmo`F@7JJyUhT8&@SAZMPEd$&dEd=N)`2;D0!%li*FO1EKo zIYMj425atd0?BR`kJOB;sRXVDPqc|}T1D~QD(*8AYw{Cb98IDhyUikSeSW!>n4K|E?ldnjrt@ zE{^bHCbn7$#G5&kyO^BWU}I0@KhiPbsi$#fnLE8!DvZmh7xr27cd#Q>lPnEV`di@T zZiXH0gfnW66RqgGHh45>X3X_HqmgQ~wnc90#<-z2(dl$C7whL|djtD`5k_ z?YD^@tB4fzxaA)D*Oh1-w=v1}^q-iiU7w|8a|TOz2vbDQ4-3~>2#R_O&zX`2nBCI} zypHI(hUkTs7w$%`8b9OPxpK;;uA`i}#l4AZd}Y4M7sfC7rss1pL)~}^7G@&`UhlQy z&$ZypEAbZVaHl&kE!A>Me~tQ~drSpKaY*fGO*g6OEN98D<)mc5nR!Ns%gn^ChUxg% zEM#xs%4^uoHjCaGky9?D#47%noztY1SZ0N@yqjQg9(S>Y`BWw2@^_3n>)4L}$U(M_ z)mSf^Ne#|)C#h0E%<(i*a*t%rC&bCAi0R4O*v{266|dl>e3#*!Is$36cpq8QKfzyU s!j>r$H8pTr=p|ejB$V&qFssFpwFvHp@#gvjSHCc^qvpSV;Q!ix01EN>E&u=k literal 1150 zcmbVM%Wl&^6g3iS)D>%%{10Eij!)qa5F0i~2o@2oD59b*rO-!6)s`epQ|IZ#iJ!3( z+ew@>O%BI1P8%w*VWRPj@7#0lx%ZBvC=d8sTT}RaqP%#hD329IdCEx>Ez-_KQF!+A zk(}b453G*GLcGoAGYkhh`feEm_X_dIUGb7WD+akuvBR*7PJItOy9`S|L03C~UfYG; z&SEwlrm%Y)DK?4KZhRMbt&~AW{S3Xb1?_SJIyv>)H^i}jk3({eBMVOV9L>T99KL@B z_53YbQOZ`HQeOT>d%x|t!j%1N|vvnZ!=GLF1xc?IMLI(BxJ24IF@0kU3 z8+*iO;X9WSpX$DzgwWJ27}_C5LmNR~$21O5IemjpZ5tN3J*xz}bAmeaGPNTt7V}#T zqsTzByvZ0vVH=Np*1dvq?iJMBYt}A@z-u7zn`l+OLa*+u)DjqnCYq&n_N$68=rYb3 z>ctG&SDR?7o7Aue&n{7$3&%L6?Y!4N09k%^$4UK5X8DcbuHWnp*E#5Acb!Mes7CSy;=PBH1rEr;)_jCp}@&}JW)i}4!~ z_YS$nBj+F3rCI8TLPOlQaG+t})tE~G*UN7wt=C=Ld%N^J`Gy1Lk?4@DiQnCBiCX>- H{O|e)`*y>L diff --git a/public/images/favicon-16x16.png b/public/images/favicon-16x16.png index 0428de509fd75868dc23ae2e85808080e963e7eb..18de7b250883bc221c7a2ac387633bf53ddfcb23 100644 GIT binary patch delta 1032 zcmZqTdc-wBl7o$bfkFQB|HO%kcJ&NwN#5=*4F5rJ!QSPQfl{0W9+AZi417mGm~pB$ zpEOXAy~NYkmHio~s33!mr;?F70|V1nPZ!4!i_@$JZ{|sdGBiB=uVef;RYu=4#@cW0 zvaAReSEnw4a8U)lUqXABuI~}l4=6nDx->|u%cGSmbJY^ng`K^#E$ZcNf6PgL`1{EB z_Wr#gf}xTEi8H$v? zD?ToXLKC?D7MAq8+}RK^tCV?p{r(3pyO*0(Z~swLKc9Q=!H4?(6F#@>zF%|p*ayDb zn|f#Ld(_1EsQoc>{#F+)|EfQ8()a&8@$H-1Hj|cBp7W-j30JO(3c97nFJI@r{Azuw zp?z{y>IKPwt$n|~n!bO|X+8hlW!apK;ZsW7@;|IqJNbb7*r5;CFDhPdUD~a*MXc3L z>-EOSgMZ!aKi{0)5>+bx+WFV>>1*co&a|yNtv*>Z_wG`;_eHBW9gN%JrYOy!a%-xj z?_+`Tcb8t~URuvN?XzIf#7lk5Q-XHfoa3sz;9~vnIR$(BIg{6{S@20PO3K@mBQV}p zLBrVWl4RqQp6knUO1ZX7nX``9GkW{VW4uW+H-sK5hzs7bK0md6`!!&gf1WKF-RNkx z>W^Fvi`B9_GD6pqu5EqbJbz+}Wvd~Fq(ZpY#9MPF>!|W+zX_3A)1t8Ex`pNJf-RF) zM9I$7eGwm1|ETC}#?}M3n$CEogjyLTOk6%k=h>UJ{25#96xQZ%jQ+SqI@@FYi~m&) zuP^%VvHRWrUFpb!iD{kJn2HoH`W5Wjp`s)7ZY%qXYkYUvnY&i7MHSao&z^o*?u+$? z83J={)j6wPhzh-x6`dSdb#nEc3IBf2YKt;@{U%Z7%=F+t3*08upXFGiT%_63H1qn2 zOH!+THdXvl*G<=8?Rh)Nens(wyC3x8H|hlcx>;YMA3teXa#PZwO_obsKG>V&lzB|v z?y(J+GgM1lBT7;dOH!?pi&B9UgOP!ek*A?v; zHVLC9H#!cXxBVncbHP|*k))Dwx z+>{5K6Q*H#Jev4z(K{x%AR%WcVsiWcMnlWR!i=9hGHL&M#`%ZC^Sj+Ud$Cw1m&q3(nui&lN~DKRZM6vBEYr5{Y!Q7~`NA%t zSaopMJ0FWgPt5!qWp{cn>IGQU*S5R0Dk!P0+9IJhbQ~8D)Yj5$?0W9LPAwAesO_$P ztU_(jg%AS!B60N7T(+{})X7$L`33DU?CEnIOW^35saL-L$=rY8+~`-Ap5L(VwfA1{ zY=3uW$J=`XmNl~qP~IpT04A=QM#o3S#1iOCoocg6>G|t=yd9b>tMqQ2ef7JW=Fg55 z3*zza6M#`SAQK8o2^oo<`28|vtx)~(SIW@X%%PYNtXfmra<)$Btaz{`331A9nd1ot`t%1HT?Fojl#3t`+S7 zH|_ZmQEm~oe6g=}U!PvnXHe-58H6MP0T8Tj1nNPs3s5wxWJ(pF*a!eB0H`_ti|rA` zhrRlq?xT+?{x8^Ds68~WEOxGzOF@}Ts`#b=JQ#p0+PD2@zX{Z7wOWm|Noml?lt9yF qph>RL0aATaw@$8QJRGebG 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 delta 2187 zcmV;62z2+X8iN#&dVj+J01m?e$8V@)00007bV*G`2j&VE2RjPtBT{|<00)*yL_t(o z!>yNDj~rJShM#k4uj=lq-lk`18*ju(Y=h%OK|vrS1b1-BPvUnV@iVwW7!V{@_BaWS zV|(_Q-j`at>Krb{m`uiw?I_<}siborz3+FvMQE)x-zzjqYk!0gfJSHmLcH`T=F46R zf=X*1j%V!6Vk|>)wHwm%y(j-)Cd7*>ptVM$*`6%9KU%U@Y9VpTVd^o1JEdr7AgPUJ7&G+ z@z!RSm8$q^G=FEAmk6QRYSh^ZeRifXAM6eJal655y$FOvJjasf0&Gv_yuUx-)@GM} zRO8`z&cn$Zr8F(qq*O2}DmDU-tKBB0R{VYYkZ$1d#zqGz_)duL0MP8um)zMI@U!zh zLeJsu@r2#!g7Xa@%QAR4nGyLO7s8Oc$0LeL@#fYVk$>m#k4Hx|9E-QMItU?O9$=bf z-2Qr>H~VXZp2eNL0iGeTr9=qH@iJp0^qFQkmJry6!D>}9NOFF%(Wcj^ar?m`>ot#S z>#b)3JOxdowBr4}5f|Da-N5C8-2rR9!=-jazEb20B$DgBHaFM1Bzb{l7&x}Y&8;q9 z4ksKh5`W%4*X6-@#{O*nG5~^mgDF*|czvzO=Yts~f@Tn~Gg*==MaOek>5|WmhJ1WD z#IY?LDVXOglA>a>QRk!mA(g7QvC-y(gDFK-y%<1VRoojdxZJ68w1`<`1@D~e5n2|8 zAqi{?&|GOX*qz2`tvMgn$SREheB0zoH{#lQi+|6Lr}RUg(6jjDcnoO1?f01+_;N7g zZx0SgRY~2JM3zIR=93l~q35zzcR844G#rT~1eww-iWQb&vDxssH=N)Ji%P>6<2h~L z!H^o$6#V+)7LIA2dKG5?{`u&ThG(%oSZ- zx_@AvR74GrhArtw4FrO5nvs+xahl`Wl5P-iwHxuxa(${7q^pv=DtV>VCeBMD&*A*z zsf=QCIzgRNOQx-)@Gw`{&Rj2M+1hzzqlVi_?9)J02mrl*2<-6QH8b1bj zMh+as2}x0684|-V*qhEdm@m*;q0tyZ5P!K27h553_t!{DO($@9=SMv@!+@G&J$dta zRdIJPVs9Q(DcG!g)NPAZrA`5SLjlcTnbGoG@(RjT$&HN;4@NWYjptmBLV67k1Bnn| z8YaKFyoGPuPbAe^Q*P1m!?%Zh_}f{=m|jjj~^MnGD@;WFWq zgCV)L$Rh>LQxy;xQXqxNFv(bHNXr$5fL~wkZ{UMr3H`13p9#F8Y3-@Wu9(Kr!25d zgK3=83p@ym_)9HZ%Q1?#xgD1u7x2alQ_dM64}@$Mck}W`II+e>kS*ICKL4WFl4-o+;_pT%>7m zZ#d^t7%)pSG6g@sutwdsP6>ae8C`DGNJ_=|W`kc`=uuRPKi>X=KYx9^%WzfEYPgJ( zl%3H6g-M}cwaQuZOs=jq>9^_#6kiW!Y}8y{?LV}aJ1v@H4SSAPdYu7yP5I}U&TXorW3nBTv$jwiu3Oppea1jhi&uvo4N?hPlr z)@~A6f&#@juei}|a;X#Xw4LE804H`HEmLkkJm7r8Bg-><$L0Pk<6xOlRVAM7(6CK( zRdTpU7{x2DZ?w4B_K;-(LbAWixX_BY)$cwobuR$$&DfpCynnlMM6c#h6cwnF&9Kg4 zy5i9!!4VSQF>p*t+xG|@gTwiP&~wppnGBPbOFfB4NR4_L>H90ykH!CnOIxsL${3ddf#0%65HZ(FdH8eMk{4my&qYO(v zF)%GMGA}Y?Vq#)pG&4D6VKq50GdM6aHeq8hG-NYoV>UT8VlpmiV{a~SZf8N?ymbHo N002ovPDHLkV1hGO2bll> diff --git a/public/images/favicon.ico b/public/images/favicon.ico index d9f5591095721a6db11c5866a79829212c7dc433..06be8648e35ad981da2d55f40cfea92ee1cfa4ea 100644 GIT binary patch literal 1150 zcmbW1Sx=i+5Qbf;*Hx~1-OK)gUi7Ao)SF&3i2_L~lvIrz%38qSU>lc^u+?r@VuOJ| zNW#(rW;0+6n8l85Y-9MaKjVFisi9G;{)neXjrs?wqnXi}bKaTJJ9Cag@qt)Zt|)~5 zL{amhLh-Req4-pYa0$VGVB*KQR~TLSxfoUcHMi-pb+GeFAbN`%*ogn2Exro%qEza=}XWa)#nx zv#jqKSlREzo9V@N(!)cmo`F@7JJyUhT8&@SAZMPEd$&dEd=N)`2;D0!%li*FO1EKo zIYMj425atd0?BR`kJOB;sRXVDPqc|}T1D~QD(*8AYw{Cb98IDhyUikSeSW!>n4K|E?ldnjrt@ zE{^bHCbn7$#G5&kyO^BWU}I0@KhiPbsi$#fnLE8!DvZmh7xr27cd#Q>lPnEV`di@T zZiXH0gfnW66RqgGHh45>X3X_HqmgQ~wnc90#<-z2(dl$C7whL|djtD`5k_ z?YD^@tB4fzxaA)D*Oh1-w=v1}^q-iiU7w|8a|TOz2vbDQ4-3~>2#R_O&zX`2nBCI} zypHI(hUkTs7w$%`8b9OPxpK;;uA`i}#l4AZd}Y4M7sfC7rss1pL)~}^7G@&`UhlQy z&$ZypEAbZVaHl&kE!A>Me~tQ~drSpKaY*fGO*g6OEN98D<)mc5nR!Ns%gn^ChUxg% zEM#xs%4^uoHjCaGky9?D#47%noztY1SZ0N@yqjQg9(S>Y`BWw2@^_3n>)4L}$U(M_ z)mSf^Ne#|)C#h0E%<(i*a*t%rC&bCAi0R4O*v{266|dl>e3#*!Is$36cpq8QKfzyU s!j>r$H8pTr=p|ejB$V&qFssFpwFvHp@#gvjSHCc^qvpSV;Q!ix01EN>E&u=k literal 1150 zcmbVM%Wl&^6g3iS)D>%%{10Eij!)qa5F0i~2o@2oD59b*rO-!6)s`epQ|IZ#iJ!3( z+ew@>O%BI1P8%w*VWRPj@7#0lx%ZBvC=d8sTT}RaqP%#hD329IdCEx>Ez-_KQF!+A zk(}b453G*GLcGoAGYkhh`feEm_X_dIUGb7WD+akuvBR*7PJItOy9`S|L03C~UfYG; z&SEwlrm%Y)DK?4KZhRMbt&~AW{S3Xb1?_SJIyv>)H^i}jk3({eBMVOV9L>T99KL@B z_53YbQOZ`HQeOT>d%x|t!j%1N|vvnZ!=GLF1xc?IMLI(BxJ24IF@0kU3 z8+*iO;X9WSpX$DzgwWJ27}_C5LmNR~$21O5IemjpZ5tN3J*xz}bAmeaGPNTt7V}#T zqsTzByvZ0vVH=Np*1dvq?iJMBYt}A@z-u7zn`l+OLa*+u)DjqnCYq&n_N$68=rYb3 z>ctG&SDR?7o7Aue&n{7$3&%L6?Y!4N09k%^$4UK5X8DcbuHWnp*E#5Acb!Mes7CSy;=PBH1rEr;)_jCp}@&}JW)i}4!~ z_YS$nBj+F3rCI8TLPOlQaG+t})tE~G*UN7wt=C=Ld%N^J`Gy1Lk?4@DiQnCBiCX>- H{O|e)`*y>L diff --git a/quasar.conf.js b/quasar.conf.js index ae5241a1..cbf36237 100755 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -147,7 +147,7 @@ module.exports = configure((ctx) => ({ }, devServer: { https: false, - port: 8089, + port: 8084, open: false, // opens browser window automatically }, @@ -278,7 +278,10 @@ module.exports = configure((ctx) => ({ pwa: { workboxPluginMode: 'InjectManifest', // 'GenerateSW' or 'InjectManifest' workboxOptions: {}, // only for GenerateSW - + extendGenerateSWOptions (cfg) { + cfg.skipWaiting = false + cfg.clientsClaim = false + }, // for the custom service worker ONLY (/src-pwa/custom-service-worker.[js|ts]) // if using workbox in InjectManifest mode chainWebpackCustomSW(chain) { @@ -287,39 +290,59 @@ module.exports = configure((ctx) => ({ }, manifest: { - name: 'Arcadei', - short_name: 'Arcadei', - description: 'Arcadei è un modello di aggregazione sociale a base umanitaria finalizzato alla tutela dell’Essere Umano e dei suoi inalienabili diritti naturali. Una Piattaforma di Umani liberi e cooperanti che persegue e sviluppa modelli finalizzati all’autodeterminazione e all’ esercizio della naturale Sovranità individuale e collettiva per dare vita alle necessarie Autonomie Alimentari, Spirituali, Energetiche, Economiche e Sanitarie indispensabili allo sviluppo del libero e pieno potenziale umano.', + 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: '#ffffff', theme_color: '#027be3', icons: [ { - src: 'images/arcadei-android-icon-512x512.png', + src: 'images/riso-android-icon-512x512.png', sizes: '512x512', type: 'image/png', }, { - src: 'images/arcadei-android-icon-384x384.png', + src: 'images/riso-android-icon-384x384.png', sizes: '384x384', type: 'image/png', }, { - src: 'images/arcadei-android-icon-192x192.png', + src: 'images/riso-android-icon-192x192.png', sizes: '192x192', type: 'image/png', }, { - src: 'images/arcadei-android-icon-144x144.png', + src: 'images/riso-android-icon-144x144.png', sizes: '144x144', type: 'image/png', }, { - src: 'images/arcadei-android-icon-96x96.png', + src: 'images/riso-android-icon-96x96.png', sizes: '96x96', type: 'image/png', }, + { + src: 'images/riso-apple-icon-120x120.png', + sizes: '120x120', + type: 'image/png', + }, + { + src: 'images/riso-apple-icon-144x144.png', + sizes: '144x144', + type: 'image/png', + }, + { + src: 'images/riso-apple-icon-152x152.png', + sizes: '152x152', + type: 'image/png', + }, + { + src: 'images/riso-apple-icon-180x180.png', + sizes: '180x180', + type: 'image/png', + }, ], }, }, @@ -354,7 +377,7 @@ module.exports = configure((ctx) => ({ builder: { // https://www.electron.build/configuration/configuration - appId: 'Arcadei', + appId: 'Riso', }, // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index 5fb08048..4633dcf8 100755 --- a/src-pwa/custom-service-worker.js +++ b/src-pwa/custom-service-worker.js @@ -378,25 +378,33 @@ self.addEventListener('fetch', function (event) { return cachedResponse; } - const response = await fetch(event.request); + console.log('*** REQUEST', event.request); + try { + const response = await fetch(event.request); + + if (!response || response.status !== 200 || response.type !== 'basic') { + return response; + } + + if (ENABLE_DYNAMIC_CACHING) { + const responseToCache = response.clone(); + const cache = await caches.open(DYNAMIC_CACHE) + await cache.put(event.request, response.clone()); + } - if (!response || response.status !== 200 || response.type !== 'basic') { return response; + } catch (e) { + return ''; } - - if (ENABLE_DYNAMIC_CACHING) { - const responseToCache = response.clone(); - const cache = await caches.open(DYNAMIC_CACHE) - await cache.put(event.request, response.clone()); - } - - return response; })()); }); const syncStore = {} self.addEventListener('message', event => { + if (event.data && event.data.type === 'SKIP_WAITING') { + self.skipWaiting() + } if (event.data.type === 'sync') { console.log('addEventListener - message') // get a unique id to save the data diff --git a/src-pwa/register-service-worker.js b/src-pwa/register-service-worker.js index 66ad4412..7e1ea1a0 100755 --- a/src-pwa/register-service-worker.js +++ b/src-pwa/register-service-worker.js @@ -13,6 +13,10 @@ register(process.env.SERVICE_WORKER_FILE ? process.env.SERVICE_WORKER_FILE : '', registered(registration) { // registration -> a ServiceWorkerRegistration instance console.log('REGISTERED::: !!!', process.env.SERVICE_WORKER_FILE) + setInterval(() => { + registration.update() + }, 5000) // every 5 seconds + }, cached(registration) { console.log('CACHED::: Content has been cached for offline use.') diff --git a/src/components/CSignUp/CSignUp.vue b/src/components/CSignUp/CSignUp.vue index a2103ee3..4da58b07 100755 --- a/src/components/CSignUp/CSignUp.vue +++ b/src/components/CSignUp/CSignUp.vue @@ -306,8 +306,15 @@ +
+ + Utente già registrato con l'username {{signup.username}} + + +
+ diff --git a/src/components/MyHeader/MyHeader.ts b/src/components/MyHeader/MyHeader.ts index 1406c7ab..63ae5bf4 100755 --- a/src/components/MyHeader/MyHeader.ts +++ b/src/components/MyHeader/MyHeader.ts @@ -61,8 +61,34 @@ export default defineComponent({ const globalStore = useGlobalStore() const testStore = useTestStore() + const data = ref({ + registration: null, + updateExists: false, + } as any) + + const refreshing = ref(false) + const stateconn = ref(globalStore.stateConnection) + function updateAvailable(event: any) { + console.log(event) + data.value.registration = event.detail + data.value.updateExists = true + RefreshApp() // update automatically + } + + function created() { + document.addEventListener('swUpdated', updateAvailable, { once: true }) + navigator.serviceWorker.addEventListener('controllerchange', () => { + // We'll also need to add 'refreshing' to our data originally set to false. + if (refreshing.value) + return + refreshing.value = true + // Here the actual reload of the page occurs + window.location.reload() + }) + } + const { getUsernameChatByMsg, getMyUsername, @@ -81,7 +107,7 @@ export default defineComponent({ getNumMsg, getNumMsgUnread, getMsgText, - paotest } = MixinUsers(); + paotest } = MixinUsers() function isonline() { return globalStore.stateConnection === 'online' @@ -135,8 +161,8 @@ export default defineComponent({ // console.log('PRIMA $q.lang.isoName', $q.lang.isoName) // dynamic import, so loading on demand only - import(`quasar/lang/${mylang}`).then((lang) => { - $q.lang.set(lang.default) + import(`quasar/lang/${mylang}`).then((lang2: any) => { + $q.lang.set(lang2.default) import('../../statics/i18n').then(() => { // console.log('MY LANG DOPO=', $q.lang.isoName) @@ -146,9 +172,9 @@ export default defineComponent({ globalStore.addDynamicPages($router) } - function setshortlang(lang: string) { + function setshortlang(mylang: string) { static_data.lang_available.forEach((langavail) => { - if (langavail.value === lang) { + if (langavail.value === mylang) { // console.log('static_data.lang_available[indrec].short', static_data.lang_available[indrec].short, static_data.lang_available[indrec].value) langshort.value = langavail.short return langshort.value @@ -209,7 +235,6 @@ export default defineComponent({ const lang = computed({ get: () => $q.lang.isoName, set: mylang => { - const $router = useRouter() console.log('set lang', $q.lang.getLocale()) $q.lang.set(snakeToCamel(mylang)) // tools.showNotif($q, 'IMPOSTA LANG= ' + $i18n.locale) @@ -282,12 +307,19 @@ export default defineComponent({ function RefreshApp() { // Unregister Service Worker + /* navigator.serviceWorker.getRegistrations().then((registrations) => { for (const registration of registrations) { registration.unregister() } }) - window.location.reload() + window.location.reload() */ + + data.value.updateExists = false + // Make sure we only send a 'skip waiting' message if the SW is waiting + if (!data.value.registration || !data.value.registration.waiting) return + // Send message to SW to skip the waiting and activate the new SW + data.value.registration.waiting.postMessage({ type: 'SKIP_WAITING' }) } function changeIconConn() { @@ -397,7 +429,6 @@ export default defineComponent({ function clickregister() { rightDrawerOpen.value = false - const $router = useRouter() $router.replace('/signup') } @@ -444,6 +475,8 @@ export default defineComponent({ onBeforeMount(BeforeMount) onMounted(mounted) + created() + return { static_data, globalStore, @@ -493,6 +526,7 @@ export default defineComponent({ logoutHandler, isUserNotAuth, tools, + data, } }, diff --git a/src/components/MyHeader/MyHeader.vue b/src/components/MyHeader/MyHeader.vue index 6b542a93..621d3ba2 100755 --- a/src/components/MyHeader/MyHeader.vue +++ b/src/components/MyHeader/MyHeader.vue @@ -30,7 +30,7 @@ diff --git a/src/db/lang/ws_it.js b/src/db/lang/ws_it.js index 94db79c3..b412e7b8 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: 'Arcadei', - siteshortname: 'ARCADEI', - description: 'Arcadei è un modello di aggregazione sociale a base umanitaria finalizzato alla tutela dell’Essere Umano e dei suoi inalienabili diritti naturali. Una Piattaforma di Umani liberi e cooperanti che persegue e sviluppa modelli finalizzati all’autodeterminazione e all’ esercizio della naturale Sovranità individuale e collettiva per dare vita alle necessarie Autonomie Alimentari, Spirituali, Energetiche, Economiche e Sanitarie indispensabili allo sviluppo del libero e pieno potenziale umano.', - 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', }, products: { quantity: 'Quantità', @@ -54,7 +54,6 @@ const msg_website_it = { need_Telegram: 'Per poter utilizzare la Piattaforma occorre avere Telegram installato
', Registrazione_Con_Bot: '1) Copia questo username cliccandoci sopra:', SignUpIscrizione: 'Diventa Socio CNM', - SignUpArcadei: 'Aderisci ad Arcadei', SignUp_alreadylista: 'Registrazione per quelli che erano già nella lista di Notevole (del 2019) !', SignUp2: 'Registrazione', SignUpBot: 'Registrati', @@ -114,10 +113,8 @@ const msg_website_it = { hours: 'Ore', department: 'Uffici', title: 'Titolo', - subtitle: 'SottoTitolo', path: 'Percorso', img1: 'Immagine 1', - imgsize: 'ImgSize', contentfield: 'Testo 1', video1: 'Video 1', ratio1: 'Ratio 1', @@ -144,8 +141,8 @@ const msg_website_it = { color: 'Colore', }, msg: { - myAppName: 'Arcadei', - myAppDescription: 'Modello Comunitario', + myAppName: 'Riso', + myAppDescription: 'Il primo Vero Social Libero, Equo e Solidale, dove Vive Consapevolezza e Aiuto Comunitario. Gratuito', underconstruction: 'App in costruzione...', myDescriz: '', sottoTitoloApp: 'Il primo Vero Social', @@ -160,37 +157,32 @@ const msg_website_it = { + ' che intere popolazioni antiche conoscevano bene.', descrapp_pag2: '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.', + + 'Risorse Umane per poterci sostenere e vivere in Armonia con gli altri.
' + + '
R.I.S.O.
' + + 'Siamo una rete di comunità consapevoli, basata sul sostegno reciproco, la fiducia, la condivisione e l\'ascolto. \n' + + 'Coltiviamo terreno fertile per creare, in armonia con la natura, un mondo di collettività libere e autosufficienti, attraverso un circuito di scambio di esperienze umane, beni e servizi.
' + + 'Partecipa al cambiamento. RISO sei anche tu!', freesocial: { title: 'Social', descr: 'Una Community organizzata per Categorie, dove potrai unirti a Gruppi Tematici, ' + 'Condividere Esperienze e unire Competenze per organizzare e sostenere Progetti Innovativi per il Popolo.

' + 'Verranno evidenziati sviluppi Etici come l\'Auto-Produzione, la Sostenibilitá, ' + 'la Buona Salute Naturale e il Rispetto per l\'Ambiente e per tutti gli Esseri Viventi di questo ' - + 'Pianeta. Chiunque potrá esprimere il proprio Consenso o Dissenso partecipando a Sondaggi Interattivi' - + ' e realizzare insieme i Cambiamenti necessari alla nostra Società.', + + 'Pianeta.', }, freetalent: { title: 'Beni e Servizi', descr: 'Condividi i tuoi Talenti e Abilità, ' + 'Nel Dare e Ricevere, si creeranno così legami di Amicizia, Solidarietà, Cooperazione e Divertimento

' + - 'Favoriamo lo scambio locale di Beni e Servizi grazie ad un sistema di baratto organizzato, in cui la comunità stessa si pone come garante.' + 'Favoriamo lo scambio locale di Beni e Servizi dove potrai scegliere cosa chiedere in cambio (Dono, Offerta Libera, Baratto, Monete Alternative, ecc...).' }, coin: { title: 'RIS - Credito Alternativo', - descr: 'Stiamo lavorando anche per creare una sorta di "moneta alternativa" per conteggiare gli scambi che avvengono tra di noi, quando il semplice baratto risulta non applicabile.
' + - 'Partendo dalle basi del Si.Cre.Na.C.C - Sistema di Credito Naturale a Copertura Certa.
' + - 'Ciascun operatore potrà creare moneta all\'occorrenza, se il saldo del suo conto non sarà sufficiente a coprire la spesa. Potrà quindi mandare il suo conto in "scoperto", accollandosi il conseguente' + - ' Debito, accreditando l\'equivalente somma all\'operatore ricevente, il quale la annovera nel suo conto in qualità di Credito. ' + - 'L\'equilibrio tra il credito dell\'uno ed il debito dell\'altro ha come conseguenza che il debitore dovrà lavorare per rifondere il debito, mentre il ricevente potrà usare il credito come moneta.
' + - 'Per maggiori informazioni consultare il libro gratuito cliccando qui.' - - }, freeliving: { title: 'Gruppi Territoriali', - descr: 'Questo progetto vuole diffondere la creazione di Gruppi Territoriali Provinciali,' - + 'per poter favorire progetti condivisi in ambito territoriale e creare così una Rete di Fiducia fino al vicinato, come giá viene praticato in piccolo, in numerosi Ecovillaggi e Comunità del mondo.', + descr: 'Questo progetto vuole diffondere la creazione di Gruppi Territoriali Provinciali, ' + + 'per poter favorire progetti condivisi in ambito territoriale e creare così una Rete di Fiducia fino al vicinato, come giá viene praticato in piccolo, in numerosi Ecovillaggi e Comunità del mondo.', }, freecollabora: { @@ -238,9 +230,9 @@ const msg_website_it = { }, multiplatform: { title: 'Multi-piattaforma', - descr: 'E\' compatibile con Google Chrome, Firefox, Opera, Safari, iPhone, Android e PC. L\'Applicazione s\'installa facilmente, senza passare dallo store. ' + descr: 'E\' compatibile con Google Chrome, Firefox, Opera, Safari, iPhone, Android e PC. L\'Applicazione s\'installa facilmente, senza dover passare dallo store. ' + 'basta entrare sul sito www.riso.app.
' - + 'Dopo la registrazione chiederà di aggiungerlo allo schermo (o cliccare sul menu del browser "Installa APP")', + + 'Dopo la registrazione chiederà di aggiungerlo alla Schermata Home (oppure cliccare sul menu "..." del browser e scegliere "Installa APP")', }, free: { title: 'Gratuita, Open Source e Niente Pubblicità', diff --git a/src/db/static_data.ts b/src/db/static_data.ts index 6b858e9b..6418790d 100755 --- a/src/db/static_data.ts +++ b/src/db/static_data.ts @@ -7,29 +7,29 @@ import { import { func } from '@store/Modules/fieldsTable' const functionality: IFunctionality = { - PWA: false, + PWA: true, SHOW_USER_MENU: true, // Cambiare con true SHOW_PROFILE: true, SHOW_REG_BUTTON: true, ENABLE_REGISTRATION: true, - ENABLE_REG_BY_BOT: false, - ENABLE_REG_NEED_TELEGRAM: false, + ENABLE_REG_BY_BOT: true, + ENABLE_REG_NEED_TELEGRAM: true, SHOW_NEWSLETTER: false, SHOW_ONLY_POLICY: true, ENABLE_TODOS_LOADING: false, ENABLE_PROJECTS_LOADING: false, SHOW_IF_IS_SERVER_CONNECTION: false, SHOW_MESSAGES: false, - SHOW_NOTIF: false, - SHOW_COINS: false, - BOOKING_EVENTS: false, + SHOW_NOTIF: true, + SHOW_COINS: true, + BOOKING_EVENTS: true, ENABLE_ECOMMERCE: false, ENABLE_REG_ISP: true, - ENABLE_GROUPS: false, - ENABLE_CIRCUITS: false, - SHOW_COMPETENZE: false, - ENABLE_VIEW_GROUPS: false, - ENABLE_VIEW_USERS: false, + ENABLE_GROUPS: true, + ENABLE_CIRCUITS: true, + SHOW_COMPETENZE: true, + ENABLE_VIEW_GROUPS: true, + ENABLE_VIEW_USERS: true, ENABLE_VIEW_PROFILE: true, } @@ -270,21 +270,6 @@ const routes_manager: IListRoutes[] = [ onlyManager: true, onlyFacilitatore: true }, - { - active: true, - order: 10, - path: '/admin/iscrittiarcadei', - materialIcon: 'fas fa-users', - name: 'otherpages.admin.iscrittiarcadei', - component: () => import('@/rootgen/admin/iscrittiarcadei/iscrittiarcadei.vue'), - inmenu: true, - submenu: true, - level_parent: 0, - level_child: 0.5, - onlyManager: true, - onlyFacilitatore: true - }, - /* { active: true, @@ -360,20 +345,6 @@ const routes_manager: IListRoutes[] = [ onlyManager: true, onlyEditor: true }, - { - active: true, - order: 32, - path: '/admin/home', - materialIcon: 'fas fa-file-alt', - name: 'otherpages.admin.Home', - component: () => import('@/rootgen/admin/home/home.vue'), - inmenu: true, - submenu: true, - level_parent: 0, - level_child: 0.5, - onlyManager: true, - onlyEditor: true - }, { active: true, order: 30, @@ -505,12 +476,78 @@ const baseroutes: IListRoutes[] = [ path: '/', materialIcon: 'home', name: 'pages.home', - component: () => import('@src/root_spec/home_arcadei/home_arcadei.vue'), + component: () => import('@src/root/mainview/mainview.vue'), reqauth: false, 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: true, + order: 20, + path: '/events', + materialIcon: 'fas fa-bullhorn', + name: 'mypages.events', + component: () => import('@/root/eventi/eventi.vue'), + meta: { requiresAuth: true }, + inmenu: true, + infooter: true, + }, + { + active: true, + order: 100, + path: '/presentazione', + materialIcon: 'fas fa-info', + name: 'pages.presentazione', + component: () => import('@src/root/presentazione/presentazione.vue'), + reqauth: false, + inmenu: true, + infooter: true, + }, + { active: true, order: 120, path: '/myprofile', @@ -520,7 +557,7 @@ const baseroutes: IListRoutes[] = [ meta: { requiresAuth: true }, inmenu: true, infooter: true, - },*/ + }, { active: true, order: 120, @@ -532,6 +569,17 @@ const baseroutes: IListRoutes[] = [ inmenu: false, infooter: false, }, + { + active: true, + order: 130, + path: '/friends', + materialIcon: 'fas fa-user-friends', + name: 'mypages.friends', + component: () => import('@/views/user/myfriends/myfriends.vue'), + meta: { requiresAuth: true }, + inmenu: true, + infooter: true, + }, { active: functionality.ENABLE_GROUPS, order: 132, @@ -575,7 +623,7 @@ const baseroutes: IListRoutes[] = [ meta: { requiresAuth: true, newpage: true }, inmenu: false, infooter: false, - }, { + },{ active: true, order: 137, path: '/circuit/:path', @@ -632,7 +680,7 @@ const baseroutes: IListRoutes[] = [ }, { active: true, - order: 60, + order: 150, path: '/fundraising', materialIcon: 'fas fa-hand-holding-heart', name: 'pages.fundraising', @@ -722,6 +770,17 @@ const baseroutes: IListRoutes[] = [ inmenu: false, infooter: true }, + { + active: functionality.ENABLE_REGISTRATION && functionality.ENABLE_REG_NEED_TELEGRAM, + order: 1000, + path: '/signup/:invited/:usernameteleg/:idteleg', + materialIcon: 'how_to_reg', + name: 'pages.SignUp', + component: () => import('@/views/login/signup/signup.vue'), + inmenu: false, + infooter: false, + separator: false + }, { active: functionality.ENABLE_REG_BY_BOT, order: 1000, @@ -732,17 +791,17 @@ const baseroutes: IListRoutes[] = [ infooter: functionality.ENABLE_REG_BY_BOT, separator: false }, - { + /*{ active: functionality.ENABLE_REGISTRATION && !functionality.ENABLE_REG_NEED_TELEGRAM, order: 1000, path: '/signup', materialIcon: 'how_to_reg', name: 'pages.SignUp', - component: () => import('@/views/login/signup_noteleg/signup_noteleg.vue'), + component: () => import('@/views/login/signup/signup_noteleg.vue'), inmenu: false, infooter: false, separator: false - }, + },*/ { active: true, order: 1001, @@ -772,7 +831,7 @@ const baseroutes: IListRoutes[] = [ materialIcon: 'account_circle', name: 'pages.SignIn', component: () => import('@/views/login/signin_noreg/signin_noreg.vue'), - inmenu: false, + inmenu: true, infooter: true }, // --- NOT IN MENU: --- @@ -823,18 +882,6 @@ const baseroutes: IListRoutes[] = [ inmenu: true, infooter: true }, - { - active: true, - order: 55, - path: '/iscrizione', - materialIcon: 'how_to_reg', - name: 'pages.SignUpArcadei', - component: () => import('@/views/login/iscrizionearcadei/iscrizionearcadei.vue'), - inmenu: true, - infooter: true, - separator: false, - onlyNotSoci: false, - }, { active: true, order: 1000, diff --git a/src/root_spec/home_arcadei/home_arcadei.ts b/src/root_spec/home_arcadei/home_arcadei.ts index dcc6498c..34ca347d 100755 --- a/src/root_spec/home_arcadei/home_arcadei.ts +++ b/src/root_spec/home_arcadei/home_arcadei.ts @@ -13,20 +13,33 @@ import { tools } from '@src/store/Modules/tools' import { static_data } from '@src/db/static_data' import { toolsext } from '@src/store/Modules/toolsext' import { Screen } from 'quasar' -import { CCardCarousel, CEventsCalendar, CMyElem, COpenStreetMap } from '@components' +import { CCardCarousel, CEventsCalendar, COpenStreetMap } from '@components' import MixinBase from '@src/mixins/mixin-base' import { firstimagehome } from '@src/db/static_data' import MixinMetaTags from '@/mixins/mixin-metatags' export default defineComponent({ name: 'home_arcadei', - components: { Logo, LandingFooter, CMyPage, CMyElem }, + components: { Logo, LandingFooter, CMyPage, CCardCarousel, CEventsCalendar, COpenStreetMap }, setup() { + const animare = ref(0) + const slide = ref('first') + const slide2 = ref(1) + + const getImmagini = ref([ + { + title: '', subtitle: '', + alt: 'Arcadei', + img: 'images/arcadei/img1.png' + }, + ]) + const userStore = useUserStore() const globalStore = useGlobalStore() const { setValDb, getValDb } = MixinBase() + const { setmeta, getsrcbyimg } = MixinMetaTags() function getheightgallery() { if (tools.isMobile()) @@ -39,15 +52,26 @@ export default defineComponent({ // } + function getArrDisciplines() { + return globalStore.disciplines.filter((rec: any) => rec.showinhome) + } + created() return { tools, toolsext, static_data, + animare, + slide, + slide2, getheightgallery, + getArrDisciplines, + getImmagini, getValDb, - globalStore, + firstimagehome, + getsrcbyimg, + setmeta, } }, }) diff --git a/src/root_spec/home_arcadei/home_arcadei.vue b/src/root_spec/home_arcadei/home_arcadei.vue index a5f8f5b7..e64582ca 100755 --- a/src/root_spec/home_arcadei/home_arcadei.vue +++ b/src/root_spec/home_arcadei/home_arcadei.vue @@ -1,11 +1,214 @@ diff --git a/src/root_spec/home_tdv/home_tdv.ts b/src/root_spec/home_tdv/home_tdv.ts index c6557fe8..a636bdb8 100755 --- a/src/root_spec/home_tdv/home_tdv.ts +++ b/src/root_spec/home_tdv/home_tdv.ts @@ -28,6 +28,11 @@ export default defineComponent({ const slide2 = ref(1) const getImmagini = ref([ + { + title: '', subtitle: '', + alt: 'Elisa e Cristina insieme', + img: '../../statics/images/eventi_esterni/IMG_6035.jpg' + }, ]) const userStore = useUserStore() diff --git a/termina_arcadei.it.sh b/termina_arcadei.it.sh new file mode 100755 index 00000000..6b17695b --- /dev/null +++ b/termina_arcadei.it.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +site=arcadei.it + +if [ -d "__freeplanet.app" ]; then + rmdir __freeplanet.app +fi + +if [ -d "__insiemesipuo.app" ]; then + rmdir __insiemesipuo.app +fi + +if [ -d "__popolodelnuovomondo.app" ]; then + rmdir __popolodelnuovomondo.app +fi + + +source __termine.sh diff --git a/termina_riso.app.sh b/termina_riso.app.sh new file mode 100755 index 00000000..150e9d81 --- /dev/null +++ b/termina_riso.app.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +site=riso.app + +if [ -d "__freeplanet.app" ]; then + rmdir __freeplanet.app +fi + +if [ -d "__insiemesipuo.app" ]; then + rmdir __insiemesipuo.app +fi + +if [ -d "__popolodelnuovomondo.app" ]; then + rmdir __popolodelnuovomondo.app +fi + + +source __termine.sh