From 494480765cb75944426a2598041911b4b10c6f26 Mon Sep 17 00:00:00 2001
From: paoloar77 <paolo.arena77@gmail.com>
Date: Sat, 12 Mar 2022 22:21:40 +0100
Subject: [PATCH] Privacy Policy

---
 .../BannerCookies/BannerCookies.vue           | 10 ++--
 src/components/CMySelect/CMySelect.ts         |  8 +--
 src/components/CSignUp/CSignUp.ts             |  6 ++-
 src/components/CSignUp/CSignUp.vue            | 31 +++++++++--
 src/components/PagePolicy/PagePolicy.vue      |  4 +-
 src/db/lang/ws_it.js                          |  2 +-
 src/db/static_data.ts                         | 14 +++--
 src/root/policy/policy.vue                    | 14 ++---
 src/statics/lang/it.js                        |  2 +-
 src/store/Api/Instance.ts                     |  4 +-
 src/store/Modules/tools.ts                    | 10 ++++
 src/store/UserStore.ts                        | 54 +++++++++----------
 src/store/globalStore.ts                      |  4 +-
 src/views/projects/proj-list/proj-list.ts.off |  2 +-
 14 files changed, 102 insertions(+), 63 deletions(-)

diff --git a/src/components/BannerCookies/BannerCookies.vue b/src/components/BannerCookies/BannerCookies.vue
index bf8bcef4..3606e9df 100755
--- a/src/components/BannerCookies/BannerCookies.vue
+++ b/src/components/BannerCookies/BannerCookies.vue
@@ -6,11 +6,11 @@
                     {{t('cookies')}}
                     <template v-slot:action>
                         <div class="row justify-center margin_buttons_cook q-gutter-lg text-center" >
-                            <q-btn
-                              v-if="disableDecline === false" flat color="white" label="Declina"
-                                   @click="decline"></q-btn>
-                            <q-btn flat color="white" label="INFO" type="a" :href="urlInfo" @click="clickInfo"></q-btn>
-                            <q-btn flat color="white" label="OK" @click="accept"></q-btn>
+                          <q-btn label="INFO" to="/policy"></q-btn>
+                          <q-btn
+                              color="red" label="RIFIUTA"
+                              @click="decline"></q-btn>
+                            <q-btn color="green" label="ACCETTA" @click="accept"></q-btn>
                         </div>
                     </template>
                 </q-banner>
diff --git a/src/components/CMySelect/CMySelect.ts b/src/components/CMySelect/CMySelect.ts
index 98eb79d5..509bdb51 100755
--- a/src/components/CMySelect/CMySelect.ts
+++ b/src/components/CMySelect/CMySelect.ts
@@ -207,11 +207,11 @@ export default defineComponent({
               // console.log('-----------  valori.value', valori.value)
               // console.log('-----------  arrtempOpt.value', arrtempOpt.value)
 
-              localStorage.setItem(props.tablesel + num + props.optval, id)
-              localStorage.setItem(props.tablesel + num + props.optlab, tools.getValueByFunzOrVal(rec, props.optlab))
+              tools.localStSetItem(props.tablesel + num + props.optval, id)
+              tools.localStSetItem(props.tablesel + num + props.optlab, tools.getValueByFunzOrVal(rec, props.optlab))
 
               num += 1
-              localStorage.setItem(props.tablesel + 'NUM', num.toString())
+              tools.localStSetItem(props.tablesel + 'NUM', num.toString())
             }
           }
         }
@@ -222,7 +222,7 @@ export default defineComponent({
     function changeval(newval: any) {
       console.log(' ½½½½½½½ changeval', newval)
       if (props.multiple || props.multiselect_by_server) {
-        // localStorage.setItem(props.tablesel + '_' + newval, valori.value[newval])
+        // tools.localStSetItem(props.tablesel + '_' + newval, valori.value[newval])
 
         if (props.type_out === costanti.FieldType.object) {
           const arrout = []
diff --git a/src/components/CSignUp/CSignUp.ts b/src/components/CSignUp/CSignUp.ts
index 2e6bf17a..baa53660 100755
--- a/src/components/CSignUp/CSignUp.ts
+++ b/src/components/CSignUp/CSignUp.ts
@@ -7,6 +7,7 @@ import { Logo } from '../../components/logo'
 // import 'vue-country-code/dist/vue-country-code.css'
 
 import { CTitleBanner } from '../CTitleBanner'
+import { PagePolicy } from '../PagePolicy'
 import { computed, defineComponent, reactive, ref, watch } from 'vue'
 import { CSignIn } from '@/components/CSignIn'
 import { useQuasar } from 'quasar'
@@ -29,7 +30,7 @@ import { useGlobalStore } from '@store/globalStore'
 
 export default defineComponent({
   name: 'CSignUp',
-  components: { Logo, CTitleBanner },
+  components: { Logo, CTitleBanner, PagePolicy },
   props: {
     showadultcheck: {
       type: Boolean,
@@ -74,7 +75,7 @@ export default defineComponent({
     const duplicate_email = ref(false)
     const duplicate_username = ref(false)
     const visureg = ref(false)
-
+    const showpolicy = ref(false)
 
     const globalStore = useGlobalStore()
 
@@ -299,6 +300,7 @@ export default defineComponent({
       allowSubmit,
       myRuleEmail,
       visureg,
+      showpolicy,
     }
   },
 })
diff --git a/src/components/CSignUp/CSignUp.vue b/src/components/CSignUp/CSignUp.vue
index b5bee5bd..868818d4 100755
--- a/src/components/CSignUp/CSignUp.vue
+++ b/src/components/CSignUp/CSignUp.vue
@@ -204,9 +204,6 @@
 
         </q-input>
 
-        <div v-if="!tools.isMobile()"><br></div>
-
-
         <!--<vue-tel-input
           v-if="showcell"
           @country-changed="intcode_change()"
@@ -218,6 +215,34 @@
           wrapperClasses="clCellCode">
         </vue-tel-input>-->
 
+        <div class="text-center">
+          <q-btn label="Mostra Privacy" @click="showpolicy = true"></q-btn>
+        </div>
+
+        <q-dialog v-model="showpolicy">
+          <q-card class="dialog_card">
+            <q-toolbar class="bg-primary text-white">
+              <q-toolbar-title>
+                Privacy Policy
+              </q-toolbar-title>
+              <q-btn flat round color="white" icon="close" v-close-popup></q-btn>
+            </q-toolbar>
+            <q-card-section class="inset-shadow">
+              <PagePolicy
+                owneremail="info@riso.app"
+                SiteName="Riso.app"
+                ownerDataName="RISO"
+                managerData="Paolo Arena"
+                includeData="recapiti (indirizzo email, telefono (facoltativo))"
+                url="riso.app"
+                lastdataupdate="12/03/2022"
+                country="Italia"
+              >
+
+              </PagePolicy>
+            </q-card-section>
+          </q-card>
+        </q-dialog>
 
         <q-checkbox
           v-model="signup.terms"
diff --git a/src/components/PagePolicy/PagePolicy.vue b/src/components/PagePolicy/PagePolicy.vue
index 409e037e..bb9aa99f 100755
--- a/src/components/PagePolicy/PagePolicy.vue
+++ b/src/components/PagePolicy/PagePolicy.vue
@@ -429,9 +429,7 @@
               if a processing operation is in progress, obtain access to the data and information relating to the
               processing and request a copy of the data;
               obtain rectification of inaccurate data and integration of incomplete personal data;
-
-
-
+          </p>
 
 
           <p class="text-subtitle2">8. Access rights, deletion, restriction and portability.</p>
diff --git a/src/db/lang/ws_it.js b/src/db/lang/ws_it.js
index 983f42ed..14f73954 100755
--- a/src/db/lang/ws_it.js
+++ b/src/db/lang/ws_it.js
@@ -168,7 +168,7 @@ const msg_website_it = {
     },
     coin: {
       title: 'RIS - Credito Alternativo',
-      descr: '<strong>Stiamo lavorando</strong> anche per creare una sorta di "moneta alternativa" per conteggiare gli scambi che avvengono tra di noi, quand il semplice baratto risulta non applicabile.<br>' +
+      descr: '<strong>Stiamo lavorando</strong> anche per creare una sorta di "moneta alternativa" per conteggiare gli scambi che avvengono tra di noi, quando il semplice baratto risulta non applicabile.<br>' +
         'Partendo dalle basi del <strong>Si.Cre.Na.C.C - Sistema di Credito Naturale a Copertura Certa</strong>.<br>' +
         '<em>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. ' +
diff --git a/src/db/static_data.ts b/src/db/static_data.ts
index 92c57333..a60d7a96 100755
--- a/src/db/static_data.ts
+++ b/src/db/static_data.ts
@@ -12,7 +12,7 @@ const functionality: IFunctionality = {
   SHOW_REG_BUTTON: false,
   ENABLE_REGISTRATION: true, // Cambiare con true
   SHOW_NEWSLETTER: false,
-  SHOW_ONLY_POLICY: false,
+  SHOW_ONLY_POLICY: true,
   ENABLE_TODOS_LOADING: false,
   ENABLE_PROJECTS_LOADING: false,
   SHOW_IF_IS_SERVER_CONNECTION: false,
@@ -598,13 +598,16 @@ const baseroutes: IListRoutes[] = [
     infooter: false
   },
 
-  // --- NOT IN MENU: ---
-  /*{
-    order: 8,
+  {
+    active: true,
+    order: 2000,
     path: '/policy',
+    materialIcon: 'fas fa-user',
     name: 'pages.policy',
     component: () => import('@src/root/policy/policy.vue'),
-  },*/
+    inmenu: false,
+    infooter: true
+  },
   {
     active: functionality.ENABLE_REGISTRATION,
     order: 1000,
@@ -637,6 +640,7 @@ const baseroutes: IListRoutes[] = [
     inmenu: true,
     infooter: true
   },
+  // --- NOT IN MENU: ---
   {
     active: true,
     order: 1000,
diff --git a/src/root/policy/policy.vue b/src/root/policy/policy.vue
index 2c41a958..7465a3ff 100755
--- a/src/root/policy/policy.vue
+++ b/src/root/policy/policy.vue
@@ -2,13 +2,13 @@
     <q-page class="">
         <div class="landing">
             <PagePolicy
-                    owneremail=""
-                    SiteName=""
-                    ownerDataName=""
-                    managerData=""
-                    includeData="dati anagrafici (ragione sociale, nome, cognome), recapiti (telefono, indirizzo email)"
-                    url=""
-                    lastdataupdate=""
+                    owneremail="info@riso.app"
+                    SiteName="Riso.app"
+                    ownerDataName="RISO"
+                    managerData="Paolo Arena"
+                    includeData="recapiti (indirizzo email, telefono (facoltativo))"
+                    url="riso.app"
+                    lastdataupdate="12/03/2022"
                     country="Italia"
             >
 
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index 36060e24..1086928e 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -823,7 +823,7 @@ const msg_it = {
       wrongerr: 'Email non valida',
     },
     privacy_policy: 'Privacy Policy',
-    cookies: 'Usiamo i Cookie per una migliore prestazione web.',
+    cookies: 'Usiamo i Cookie per una migliore prestazione web. Accetti l\'utilizzo?',
     sites: {
       active: 'Attivo',
       idapp: 'IdApp',
diff --git a/src/store/Api/Instance.ts b/src/store/Api/Instance.ts
index d6187524..e2c24039 100755
--- a/src/store/Api/Instance.ts
+++ b/src/store/Api/Instance.ts
@@ -84,11 +84,11 @@ async function Request(type: string, path: string, payload: any): Promise<Types.
             }
             if (setAuthToken) {
               userStore.UpdatePwd(x_auth_token)
-              localStorage.setItem(toolsext.localStorage.token, x_auth_token)
+              tools.localStSetItem(toolsext.localStorage.token, x_auth_token)
             }
 
             userStore.setAuth(x_auth_token)
-            localStorage.setItem(toolsext.localStorage.token, x_auth_token)
+            tools.localStSetItem(toolsext.localStorage.token, x_auth_token)
           }
 
           globalStore.setStateConnection(ricevuto ? 'online' : 'offline')
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index d5c0c3d6..2a00185c 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -3357,8 +3357,18 @@ export const tools = {
     }
   },
 
+  localStSetItem(item: string, value : string) {
+    if (localStorage.getItem('cookie-id') === 'decline')
+      return null
+
+    localStorage.setItem(item, value)
+  },
+
   setCookie(mytok: any, value: string) {
     // console.log('setCookie', mytok, value)
+    if (localStorage.getItem('cookie-id') === 'decline')
+      return null
+
     return Cookies.set(mytok, value)
   },
 
diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts
index 000add90..2f405427 100755
--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -413,7 +413,7 @@ export const useUserStore = defineStore('UserStore', {
           // mutations.setServerCode(myres);
           if (res.data.code === serv_constants.RIS_CODE_EMAIL_VERIFIED) {
             console.log('VERIFICATO !!')
-            localStorage.setItem(toolsext.localStorage.verified_email, String(true))
+            tools.localStSetItem(toolsext.localStorage.verified_email, String(true))
           } else {
             console.log('Risultato di vreg: ', res.data.code)
           }
@@ -532,22 +532,22 @@ export const useUserStore = defineStore('UserStore', {
 
       // const expirationDate = new Date(now.getTime() + myres.data.expiresIn * 1000);
       const expirationDate = new Date(now.getTime() * 1000)
-      localStorage.setItem(toolsext.localStorage.lang, this.lang)
-      localStorage.setItem(toolsext.localStorage.userId, myuser._id)
-      localStorage.setItem(toolsext.localStorage.username, myuser.username)
-      localStorage.setItem(toolsext.localStorage.name, myuser.name)
-      localStorage.setItem(toolsext.localStorage.surname, myuser.surname)
-      localStorage.setItem(toolsext.localStorage.perm, String(myuser.perm) || '')
-      if (myuser.profile !== undefined) localStorage.setItem(toolsext.localStorage.img, (myuser.profile.img) ? String(myuser.profile.img) || '' : '')
-      else localStorage.setItem(toolsext.localStorage.img, '')
-      localStorage.setItem(toolsext.localStorage.token, this.x_auth_token)
-      localStorage.setItem(toolsext.localStorage.expirationDate, expirationDate.toString())
-      localStorage.setItem(toolsext.localStorage.isLogged, String(true))
-      localStorage.setItem(toolsext.localStorage.verified_email, String(myuser.verified_email))
-      localStorage.setItem(toolsext.localStorage.verified_by_aportador, String(myuser.verified_by_aportador))
-      localStorage.setItem(toolsext.localStorage.teleg_id, String(myuser.profile.teleg_id))
-      localStorage.setItem(toolsext.localStorage.made_gift, String(myuser.made_gift))
-      localStorage.setItem(toolsext.localStorage.wasAlreadySubOnDb, String(globalStore.wasAlreadySubOnDb))
+      tools.localStSetItem(toolsext.localStorage.lang, this.lang)
+      tools.localStSetItem(toolsext.localStorage.userId, myuser._id)
+      tools.localStSetItem(toolsext.localStorage.username, myuser.username)
+      tools.localStSetItem(toolsext.localStorage.name, myuser.name)
+      tools.localStSetItem(toolsext.localStorage.surname, myuser.surname)
+      tools.localStSetItem(toolsext.localStorage.perm, String(myuser.perm) || '')
+      if (myuser.profile !== undefined) tools.localStSetItem(toolsext.localStorage.img, (myuser.profile.img) ? String(myuser.profile.img) || '' : '')
+      else tools.localStSetItem(toolsext.localStorage.img, '')
+      tools.localStSetItem(toolsext.localStorage.token, this.x_auth_token)
+      tools.localStSetItem(toolsext.localStorage.expirationDate, expirationDate.toString())
+      tools.localStSetItem(toolsext.localStorage.isLogged, String(true))
+      tools.localStSetItem(toolsext.localStorage.verified_email, String(myuser.verified_email))
+      tools.localStSetItem(toolsext.localStorage.verified_by_aportador, String(myuser.verified_by_aportador))
+      tools.localStSetItem(toolsext.localStorage.teleg_id, String(myuser.profile.teleg_id))
+      tools.localStSetItem(toolsext.localStorage.made_gift, String(myuser.made_gift))
+      tools.localStSetItem(toolsext.localStorage.wasAlreadySubOnDb, String(globalStore.wasAlreadySubOnDb))
     },
 
     setusersList(usersList: IUserFields[]) {
@@ -560,7 +560,7 @@ export const useUserStore = defineStore('UserStore', {
       console.log('SETLANG', newstr)
       this.lang = newstr
       toolsext.setLangAtt($router, newstr)
-      localStorage.setItem(toolsext.localStorage.lang, this.lang)
+      tools.localStSetItem(toolsext.localStorage.lang, this.lang)
     },
 
     signup(authData: ISignupOptions) {
@@ -595,15 +595,15 @@ export const useUserStore = defineStore('UserStore', {
                 const now = tools.getDateNow()
                 // const expirationDate = new Date(now.getTime() + myres.data.expiresIn * 1000);
                 const expirationDate = new Date(now.getTime() * 1000)
-                localStorage.setItem(toolsext.localStorage.lang, this.lang)
-                localStorage.setItem(toolsext.localStorage.userId, newuser._id)
-                localStorage.setItem(toolsext.localStorage.username, newuser.username)
-                localStorage.setItem(toolsext.localStorage.name, newuser.name)
-                localStorage.setItem(toolsext.localStorage.surname, newuser.surname)
-                localStorage.setItem(toolsext.localStorage.token, this.x_auth_token)
-                localStorage.setItem(toolsext.localStorage.expirationDate, expirationDate.toString())
-                localStorage.setItem(toolsext.localStorage.verified_email, String(false))
-                localStorage.setItem(toolsext.localStorage.verified_by_aportador, String(false))
+                tools.localStSetItem(toolsext.localStorage.lang, this.lang)
+                tools.localStSetItem(toolsext.localStorage.userId, newuser._id)
+                tools.localStSetItem(toolsext.localStorage.username, newuser.username)
+                tools.localStSetItem(toolsext.localStorage.name, newuser.name)
+                tools.localStSetItem(toolsext.localStorage.surname, newuser.surname)
+                tools.localStSetItem(toolsext.localStorage.token, this.x_auth_token)
+                tools.localStSetItem(toolsext.localStorage.expirationDate, expirationDate.toString())
+                tools.localStSetItem(toolsext.localStorage.verified_email, String(false))
+                tools.localStSetItem(toolsext.localStorage.verified_by_aportador, String(false))
 
                 // Even if you has registered, you have to SignIn first
                 this.isLogged = false
diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts
index 1135d6d0..748d0544 100644
--- a/src/store/globalStore.ts
+++ b/src/store/globalStore.ts
@@ -432,7 +432,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
 
     setleftDrawerOpen(bool: boolean) {
       this.leftDrawerOpen = bool
-      localStorage.setItem(toolsext.localStorage.leftDrawerOpen, bool.toString())
+      tools.localStSetItem(toolsext.localStorage.leftDrawerOpen, bool.toString())
     },
 
     setCategorySel(cat: string | null) {
@@ -646,7 +646,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
           if (res)
             console.log('saveNewSubscriptionToServer: OK')
 
-          localStorage.setItem(toolsext.localStorage.wasAlreadySubOnDb, String(this.wasAlreadySubOnDb))
+          tools.localStSetItem(toolsext.localStorage.wasAlreadySubOnDb, String(this.wasAlreadySubOnDb))
         })
         .catch((e) => {
           console.log('Error during Subscription!', e)
diff --git a/src/views/projects/proj-list/proj-list.ts.off b/src/views/projects/proj-list/proj-list.ts.off
index 9c5029df..11b981aa 100755
--- a/src/views/projects/proj-list/proj-list.ts.off
+++ b/src/views/projects/proj-list/proj-list.ts.off
@@ -597,7 +597,7 @@ export default defineComponent({
       // console.log('selectGroup', selectGroup)
 
       // Set last category selected
-      // localStorage.setItem(tools.localStorage.categorySel, categoryAtt)
+      // tools.localStSetItem(tools.localStorage.categorySel, categoryAtt)
 
       checkUpdate_everytime()
     }