diff --git a/.env.development b/.env.development
new file mode 100755
index 00000000..e975170e
--- /dev/null
+++ b/.env.development
@@ -0,0 +1,30 @@
+APP_VERSION="0.5.25"
+SERVICE_WORKER_FILE="service-worker.js"
+APP_ID="13"
+DIRECTORY_LOCAL="newfreeplanet"
+DIRECTORY_SERVER="freeplanet_serverside"
+SERVERDIR_WEBSITE=""
+SERVERPW_WEBSITE=""
+APP_URL="https://localhost"
+URL_FACEBOOK="https://www.facebook.com/freeplanetapp"
+PROVA_PAOLO="PROVA ENV FUNZIONA!"
+LANG_DEFAULT="it"
+PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF"
+MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T"
+MONGODB_HOST="https://localhost:3000"
+LOGO_REG='riso-logo-full.png'
+TEST_NAME="Paolo"
+TEST_SURNAME="Arena"
+TEST_EMAIL=""
+TEST_USERNAME=""
+TEST_PASSWORD=""
+TEST_APORTADOR=""
+PUBLICKEY_PUSH='BDncvMiUZmjaCG2Kr1V9N0_33hOG-AuNSbHSvL24y2dzBiUjAxKm02emx5SeJvz2IGmtRf6YqCgopeQwCwUmZw8'
+IN_CONSTRUCTION="0"
+DEBUG="1"
+TELEGRAM_SUPPORT=""
+PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a"
+TEST_CELL=""
+ISTEST=1
+INLOCALE=1
+BAK_MONGODB_HOST="http://192.168.0.200:3000"
diff --git a/inizia_arcadei.it.sh b/inizia_arcadei.it.sh
new file mode 100755
index 00000000..4905c5dc
--- /dev/null
+++ b/inizia_arcadei.it.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+site=arcadei.it
+
+if [ -d "__freeplanet.app" ]; then
+ rmdir __freeplanet.app
+fi
+
+if [ -d "__riso.app" ]; then
+ rmdir __riso.app
+fi
+
+if [ -d "__arcadei.it" ]; then
+ rmdir __arcadei.it
+fi
+
+if [ -d "__popolodelnuovomondo.app" ]; then
+ rmdir __popolodelnuovomondo.app
+fi
+
+if [ -d "__terradellavisione.app" ]; then
+ rmdir __terradellavisione.app
+fi
+
+
+source __inizia.sh
diff --git a/inizia_riso.app.sh b/inizia_riso.app.sh
new file mode 100755
index 00000000..3682b542
--- /dev/null
+++ b/inizia_riso.app.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+site=riso.app
+
+if [ -d "__freeplanet.app" ]; then
+ rmdir __freeplanet.app
+fi
+
+if [ -d "__riso.app" ]; then
+ rmdir __riso.app
+fi
+
+if [ -d "__popolodelnuovomondo.app" ]; then
+ rmdir __popolodelnuovomondo.app
+fi
+
+if [ -d "__terradellavisione.app" ]; then
+ rmdir __terradellavisione.app
+fi
+
+
+source __inizia.sh
diff --git a/src/components/CSignUp/CSignUp.ts b/src/components/CSignUp/CSignUp.ts
index ecf39263..4631db65 100755
--- a/src/components/CSignUp/CSignUp.ts
+++ b/src/components/CSignUp/CSignUp.ts
@@ -58,6 +58,11 @@ export default defineComponent({
required: false,
default: true,
},
+ regexpire: {
+ type: String,
+ required: false,
+ default: '',
+ },
need_Telegram: {
type: Boolean,
required: false,
@@ -245,11 +250,11 @@ export default defineComponent({
console.log('$route.params', $route.params)
-
signup.aportador_solidario = !!$route.params.invited ? $route.params.invited.toString() : ''
signup.username = !!$route.params.usernameteleg ? $route.params.usernameteleg.toString() : ''
+ signup.regexpire = !!$route.params.regexpire ? $route.params.regexpire.toString() : props.regexpire
if (signup.username)
- isalreadyReg.value = await tools.registeredusername(signup.username);
+ isalreadyReg.value = await tools.registeredusername(signup.username)
signup.profile.username_telegram = signup.username
if (!!$route.params.idteleg) {
signup.profile.teleg_id = $route.params.idteleg ? parseInt($route.params.idteleg.toString(), 10) : 0
diff --git a/src/components/CSignUp/CSignUp.vue b/src/components/CSignUp/CSignUp.vue
index 4da58b07..c6d19a46 100755
--- a/src/components/CSignUp/CSignUp.vue
+++ b/src/components/CSignUp/CSignUp.vue
@@ -45,17 +45,10 @@
class="bg-green-5 text-white"
style="text-align: center;"
>
-
-
-
-
-
-
- {{}}
+ :href="tools.getLinkBotTelegram(signup.aportador_solidario, regexpire)" target="_blank">
@@ -69,7 +62,7 @@
Vai su BOT RISO Telegram ed imposta l'Username di Telegram.
+ :href="tools.getLinkBotTelegram(signup.aportador_solidario, regexpire)" target="_blank">
diff --git a/src/components/CStatusReg/CStatusReg.vue b/src/components/CStatusReg/CStatusReg.vue
index bbe701a7..833c3ab8 100755
--- a/src/components/CStatusReg/CStatusReg.vue
+++ b/src/components/CStatusReg/CStatusReg.vue
@@ -14,8 +14,9 @@
-
+ -->
diff --git a/src/components/CUserNonVerif/CUserNonVerif.vue b/src/components/CUserNonVerif/CUserNonVerif.vue
index 56025b38..020e0142 100755
--- a/src/components/CUserNonVerif/CUserNonVerif.vue
+++ b/src/components/CUserNonVerif/CUserNonVerif.vue
@@ -27,7 +27,7 @@
🏁 Infine vai sul
BOT RISO Telegram e scrivi OK nel messaggio. Ti comparirà un
messaggio di Benvenuto.
+ :href="tools.getLinkBotTelegram('')" target="_blank">
Se non ci riesci vedi la
GUIDA PER IMPOSTARE
diff --git a/src/components/CVerifyTelegram/CVerifyTelegram.vue b/src/components/CVerifyTelegram/CVerifyTelegram.vue
index 34111567..026b738f 100755
--- a/src/components/CVerifyTelegram/CVerifyTelegram.vue
+++ b/src/components/CVerifyTelegram/CVerifyTelegram.vue
@@ -18,7 +18,7 @@
+ :href="tools.getLinkBotTelegram('', '')" target="_blank">
{{ $t('components.authentication.telegram.ifclose', {botname: tools.getBotName() })}}
diff --git a/src/db/lang/ws_it.js b/src/db/lang/ws_it.js
index b412e7b8..865d73d1 100755
--- a/src/db/lang/ws_it.js
+++ b/src/db/lang/ws_it.js
@@ -56,6 +56,7 @@ const msg_website_it = {
SignUpIscrizione: 'Diventa Socio CNM',
SignUp_alreadylista: 'Registrazione per quelli che erano già nella lista di Notevole (del 2019) !',
SignUp2: 'Registrazione',
+ SignUp3: 'Reg',
SignUpBot: 'Registrati',
SignIn: 'Login',
status: 'Statistiche',
diff --git a/src/db/static_data.ts b/src/db/static_data.ts
index 6418790d..fdc2e513 100755
--- a/src/db/static_data.ts
+++ b/src/db/static_data.ts
@@ -773,7 +773,7 @@ const baseroutes: IListRoutes[] = [
{
active: functionality.ENABLE_REGISTRATION && functionality.ENABLE_REG_NEED_TELEGRAM,
order: 1000,
- path: '/signup/:invited/:usernameteleg/:idteleg',
+ path: '/signup/:invited/:usernameteleg/:idteleg/:regexpire',
materialIcon: 'how_to_reg',
name: 'pages.SignUp',
component: () => import('@/views/login/signup/signup.vue'),
@@ -813,6 +813,17 @@ const baseroutes: IListRoutes[] = [
infooter: false,
separator: false
},
+ {
+ active: true,
+ order: 1002,
+ path: '/signup/:invited/:regexpire',
+ materialIcon: 'how_to_reg',
+ name: 'pages.SignUp3',
+ component: () => import('@/views/login/signup/signup.vue'),
+ inmenu: false,
+ infooter: false,
+ separator: false
+ },
{
active: functionality.ENABLE_REGISTRATION,
order: 2000,
diff --git a/src/model/signup-option.ts b/src/model/signup-option.ts
index 9a3e3a17..cee741fb 100755
--- a/src/model/signup-option.ts
+++ b/src/model/signup-option.ts
@@ -13,6 +13,7 @@ export interface ISignupOptions {
terms?: boolean
aportador_solidario?: string
profile: IUserProfile
+ regexpire?: string
// already_registered: boolean
}
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index fc844f0d..eea12fda 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -256,7 +256,7 @@ const msg_it = {
open: 'Clicca sul bottone qui sotto, si aprirà una chat Telegram speciale (chiamata BOT)',
ifclose: 'poi premi "AVVIA" o "START" e segui le istruzioni indicate.',
openbot: 'Entra qui',
- regbot: '2) Clicca qui per Registrarti',
+ regbot: 'Clicca qui per Registrarti',
},
login: {
facebook: 'Facebook',
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index 15f2ebc9..c66b02f0 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -4311,12 +4311,19 @@ export const tools = {
return false
},
- getLinkBotTelegram(): string {
+ getLinkBotTelegram(aportador_solidario: string, regexpire: string): string {
+ let mylink = ''
if (this.isTest() && !process.env.DEV) {
- return this.getValDb('TELEG_BOT_LINK_TEST', false)
+ mylink = this.getValDb('TELEG_BOT_LINK_TEST', false)
} else {
- return this.getValDb('TELEG_BOT_LINK', false)
+ mylink = this.getValDb('TELEG_BOT_LINK', false)
}
+ let add = ''
+ if (aportador_solidario) {
+ add = '?start=inv_' + aportador_solidario + '_ex_' + regexpire
+ }
+
+ return mylink + add
},
getBotName(): string {
diff --git a/src/views/login/signup/signup.ts b/src/views/login/signup/signup.ts
index c7666dea..af3cd63d 100755
--- a/src/views/login/signup/signup.ts
+++ b/src/views/login/signup/signup.ts
@@ -15,6 +15,7 @@ export default defineComponent({
const adult = ref(false)
const invited = computed(() => $route.params.invited)
+ const regexpire = computed(() => $route.params.regexpire)
// @ts-ignore
watch(() => invited, (newval, oldval) => {
@@ -31,6 +32,8 @@ export default defineComponent({
created()
- return {}
+ return {
+ regexpire
+ }
},
})
diff --git a/src/views/login/signup/signup.vue b/src/views/login/signup/signup.vue
index ff0d117d..2b17086c 100755
--- a/src/views/login/signup/signup.vue
+++ b/src/views/login/signup/signup.vue
@@ -1,10 +1,9 @@
-
+
-