Registrazione con scelta se Telegram o Email.

(anche da link personale)

.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="0.5.40"
+APP_VERSION="0.5.41"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"

.env.example.production

@@ -1,4 +1,4 @@
-APP_VERSION="0.5.40"
+APP_VERSION="0.5.41"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/riso.app/.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="0.5.40"
+APP_VERSION="0.5.41"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"

_ALL_SITES/riso.app/.env.production

@@ -1,4 +1,4 @@
-APP_VERSION="0.5.40"
+APP_VERSION="0.5.41"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/terradellavisione.app/.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="0.5.40"
+APP_VERSION="0.5.41"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="14"
 DIRECTORY_LOCAL="newfreeplanet"

src/components/CMyEditor/CMyEditor.ts

@@ -2,7 +2,7 @@
 import { tools } from '@store/Modules/tools'
 import { CTitleBanner } from '../CTitleBanner'
 
-import { defineComponent, onMounted, ref, toRef } from 'vue'
+import { defineComponent, onMounted, ref, toRef, watch } from 'vue'
 import { useQuasar } from 'quasar'
 
 export default defineComponent({
@@ -117,6 +117,14 @@ export default defineComponent({
       ['undo', 'redo', 'viewsource'],
     ])
 
+    watch(() => props.value, (newval, oldval) => {
+      if (props.value === undefined)
+      myvalue.value = ''
+    else
+      myvalue.value = props.value
+
+    })
+
     function changeval(newval: any) {
       // console.log('myEditor: changeval', newval)
       emit('update:value', newval)

src/components/CMyPageElem/CMyPageElem.ts

@@ -117,6 +117,7 @@ export default defineComponent({
 
     function selElemClick(myelem: IMyElem) {
       console.log('mypageelem selElemClick', myelem)
+      selElem.value = {}
       selElem.value = myelem
       visuEditor.value = !!myelem
     }

src/components/CMyPageElem/CMyPageElem.vue

@@ -27,7 +27,7 @@
             size="md"
             color="white"
             icon="close"
-            @click="visuEditor = false"
+            @click="visuEditor = false; selElem = {};"
           ></q-btn>
         </q-bar>
         <CMyEditElem

src/components/CMyPageElem2/CMyPageElem2.ts

@@ -104,6 +104,7 @@ export default defineComponent({
 
     function selElemClick(myelem: IMyElem) {
       console.log('mypageelem selElemClick', myelem)
+      selElem.value = {}
       selElem.value = myelem
       visuEditor.value = !!myelem
     }

src/components/CMyPageElem2/CMyPageElem2.vue

@@ -18,7 +18,7 @@
 
             color="white"
             icon="close"
-            @click="visuEditor = false"
+            @click="visuEditor = false; selElem = {};"
           ></q-btn>
         </q-bar>
         <CMyEditElem :myelem="selElem" :editOn="editOn" :path="rec.path">

src/components/CRegistration/CRegistration.ts

@@ -1,5 +1,5 @@
 import { tools } from '@store/Modules/tools'
-import { computed, defineComponent, reactive, ref, watch } from 'vue'
+import { computed, defineComponent, onMounted, reactive, ref, watch } from 'vue'
 import { useQuasar } from 'quasar'
 import { useI18n } from '@/boot/i18n'
 import { DefaultProfile, useUserStore } from '@store/UserStore'
@@ -10,7 +10,21 @@ import { useGlobalStore } from '@store/globalStore'
 
 export default defineComponent({
   name: 'CRegistration',
+  emits: ['regEventEmail'],
   components: {  },
+  props: {
+    invited: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    regexpire: {
+      type: String,
+      required: false,
+      default: '',
+    },
+  },
+
   setup(props, { emit }) {
     const $q = useQuasar()
     const { t } = useI18n()
@@ -36,6 +50,20 @@ export default defineComponent({
 
     }
 
+    function mounted() {
+      if (props.invited) {
+        start.value = true
+        chooseReg.value = true
+        slide.value = 'second'
+      }
+    }
+
+    function regEventEmail() {
+      emit('regEventEmail', props.invited)
+    }
+
+    onMounted(mounted)
+
     return {
       tools,
       site,
@@ -44,6 +72,7 @@ export default defineComponent({
       start,
       noInvited,
       slide,
+      regEventEmail,
     }
   },
 })

src/components/CRegistration/CRegistration.vue

@@ -101,27 +101,41 @@
                   style=""
                   class="row q-ma-sm centermydiv2 q-pa-sm justify-center"
                 >
-                  <span :class="($q.dark.isActive ? `text-white`: `text-black`) + `text-h7`"
+                  <span
+                    v-if="!invited"
+                    :class="
+                      ($q.dark.isActive ? `text-white` : `text-black`) +
+                      ` text-h7`
+                    "
                     >Chiedi alla persona che ti ha invitato su RISO il suo
-                    Username e poi :</span>
+                    Username e poi :</span
+                  >
                   <div class="row items-center">
                     <div class="col-12">
                       <q-btn
                         rounded
+                        :type="invited ? 'a' : 'button'"
                         class="flex-item-btn"
                         icon="fab fa-telegram"
                         size="md"
                         color="primary"
+                        :href="invited ? tools.getLinkBotTelegram(invited, regexpire) : ``"
                         to="/bot"
                         :label="$t('reg.bytelegram')"
                       >
-                      <q-badge color="red" align="bottom" floating>Consigliato</q-badge>
+                        <q-badge color="red" align="bottom" floating
+                          >Consigliato</q-badge
+                        >
                       </q-btn>
                     </div>
                   </div>
-                  <div :class="$q.dark.isActive ? `text-white`: `text-black` + ` col-12`"
+                  <div
-                    >oppure se non riesci ad installare Telegram:
+                    :class="
-                    </div>
+                      $q.dark.isActive ? `text-white` : `text-black` + ` col-12`
+                    "
+                  >
+                    oppure se non riesci ad installare Telegram:
+                  </div>
                   <q-btn
                     rounded
                     class="flex-item-btn"
@@ -130,7 +144,7 @@
                     size="md"
                     :color="$q.dark.isActive ? `black` : `white`"
                     :text-color="$q.dark.isActive ? `white` : `black`"
-                    to="/signup"
+                    @click="regEventEmail"
                     :label="$t('reg.byemail')"
                   >
                   </q-btn>

src/components/CSignUp/CSignUp.ts

@@ -8,6 +8,7 @@ import { Logo } from '@/components/logo'
 
 import { CTitleBanner } from '../CTitleBanner'
 import { CCopyBtn } from '../CCopyBtn'
+import { CRegistration } from '../CRegistration'
 import { PagePolicy } from '../PagePolicy'
 import { computed, defineComponent, reactive, ref, watch } from 'vue'
 import { CSignIn } from '@/components/CSignIn'
@@ -31,7 +32,7 @@ import { useGlobalStore } from '@store/globalStore'
 
 export default defineComponent({
   name: 'CSignUp',
-  components: { Logo, CTitleBanner, PagePolicy, CCopyBtn },
+  components: { Logo, CTitleBanner, PagePolicy, CCopyBtn, CRegistration },
   props: {
     showadultcheck: {
       type: Boolean,
@@ -84,6 +85,7 @@ export default defineComponent({
     const showpolicy = ref(false)
     const visubuttBOT = ref(false)
     const isalreadyReg = ref(false)
+    const needTelegram = ref(false)
 
     const typePassword = ref('password')
 
@@ -257,6 +259,8 @@ export default defineComponent({
 
     async function created() {
 
+      needTelegram.value = props.need_Telegram
+
       console.log('$route.params', $route.params)
 
       ap_iniziale.value = !!$route.params.invited ? $route.params.invited.toString() : ''
@@ -326,6 +330,13 @@ export default defineComponent({
       typePassword.value = typePassword.value === 'password' ? 'text' : 'password'
     }
 
+    function regEventEmail() {
+      // reg
+      visubuttBOT.value = false
+      needTelegram.value = false
+
+    }
+
     created()
 
     return {
@@ -351,6 +362,8 @@ export default defineComponent({
       showPassword,
       typePassword,
       ap_iniziale,
+      regEventEmail,
+      needTelegram,
     }
   },
 })

src/components/CSignUp/CSignUp.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div
-      v-if="need_Telegram && tools.isLogged() && tools.getUsername()"
+      v-if="needTelegram && tools.isLogged() && tools.getUsername()"
       class="text-center"
     >
       <q-banner rounded class="bg-green text-white" style="text-align: center">
@@ -33,28 +33,30 @@
     <div v-if="!tools.isLogged() || visureg" class="text-center">
       <div>
         <div>
-          <logo mystyle="width: 60px !important; height: 60px !important; "></logo>
+          <logo
+            mystyle="width: 60px !important; height: 60px !important; "
+          ></logo>
 
-          <div
+          <div v-if="!isalreadyReg && !(visubuttBOT && needTelegram)">
-            v-if="need_Telegram"
-            class="mybanner"
-            v-html="t('pages.need_Telegram')"
-          ></div>
-
-          <div v-if="!isalreadyReg && !(visubuttBOT && need_Telegram)">
             <CTitleBanner :title="$t('pages.SignUp')"></CTitleBanner>
           </div>
         </div>
       </div>
 
-      <div v-if="visubuttBOT && need_Telegram" class="q-gutter-md">
+      <div v-if="visubuttBOT && needTelegram" class="q-gutter-md">
         <q-banner
           rounded
           class="bg-green-5 text-white"
           style="text-align: center"
         >
           <div class="q-ma-md">
-            <q-btn
+            <CRegistration
+              :invited="signup.aportador_solidario"
+              :regexpire="regexpire"
+              @regEventEmail="regEventEmail"
+            />
+
+            <!--<q-btn
               rounded
               color="primary"
               icon="fab fa-telegram"
@@ -68,7 +70,7 @@
                 tools.getLinkBotTelegram(signup.aportador_solidario, regexpire)
               "
               target="_blank"
-            ></q-btn>
+            ></q-btn>-->
             <br />
           </div>
         </q-banner>
@@ -151,7 +153,9 @@
 
           <q-input
             v-model="signup.username"
-            :readonly="tools.getAskToVerifyReg() && !site.confpages.enableRegMultiChoice"
+            :readonly="
+              tools.getAskToVerifyReg() && !site.confpages.enableRegMultiChoice
+            "
             rounded
             outlined
             @blur="v$.username.$touch"
@@ -220,7 +224,11 @@
             <template v-slot:append>
               <q-btn
                 tabindex="-1"
-                :icon="typePassword === `password` ? `fas fa-eye-slash` : `fas fa-eye`"
+                :icon="
+                  typePassword === `password`
+                    ? `fas fa-eye-slash`
+                    : `fas fa-eye`
+                "
                 @click="showPassword"
               >
               </q-btn>
@@ -247,7 +255,11 @@
             <template v-slot:append>
               <q-btn
                 tabindex="-1"
-                :icon="typePassword === `password` ? `fas fa-eye-slash` : `fas fa-eye`"
+                :icon="
+                  typePassword === `password`
+                    ? `fas fa-eye-slash`
+                    : `fas fa-eye`
+                "
                 @click="showPassword"
               >
               </q-btn>
@@ -354,7 +366,7 @@
             >
             </q-btn>
           </div>
-          <br>
+          <br />
           Già registrato?
           <q-btn
             class="q-ma-sm"