surya/myprojplanet_vite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Versione 1.0.21 - RIS ITALIA

Browse Source
This commit is contained in:
Surya Paolo
2023-12-02 15:23:58 +01:00
parent 642f33ac55
commit 7f716b82b6
18 changed files with 92 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.example.production
View File

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

27
.env.test.macro.save
View File

@@ -1,27 +0,0 @@
APP_VERSION="1.0.20"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet
DIRECTORY_SERVER=test.freeplanet_serverside
SERVERDIR_WEBSITE="/riso"
APP_URL="https://risotest.piuchebuono.app"
URL_FACEBOOK=""
PROVA_PAOLO=""
LANG_DEFAULT="it"
PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF"
MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T"
MONGODB_HOST="https://piuchebuono.app:3001"
LOGO_REG='riso-logo-full.png'
TEST_NAME=""
TEST_SURNAME=""
TEST_EMAIL=""
TEST_USERNAME=""
TEST_PASSWORD=""
TEST_APORTADOR=""
PUBLICKEY_PUSH="BGXRf1TgcqocqD6J7qnRgCG7AvM2lxAoW7peb7UEzB4SxBb6DxGRdJ0UvD9ewnrB9KrSrh0-aDCODXBm7sZ1DDs"
IN_CONSTRUCTION="0"
DEBUG="1"
TELEGRAM_SUPPORT=""
PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a"
TEST_CELL=""
ISTEST=1

8
.env.test.macro → .env.test.pcb
View File

@@ -1,16 +1,16 @@
APP_VERSION="1.0.20"
APP_VERSION="1.0.21"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet
DIRECTORY_SERVER=test.freeplanet_serverside
SERVERDIR_WEBSITE="piuchebuono.app/testriso"
SERVERDIR_WEBSITE="/var/customers/webs/paolouser/testriso/"
APP_URL="https://testriso.piuchebuono.app"
URL_FACEBOOK=""
PROVA_PAOLO=""
LANG_DEFAULT="it"
PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF"
MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T"
MONGODB_HOST="https://piuchebuono.app:3001"
MONGODB_HOST="https://testriso.piuchebuono.app:3001"
LOGO_REG='riso-logo-full.png'
TEST_NAME=""
TEST_SURNAME=""
@@ -18,7 +18,7 @@ TEST_EMAIL=""
TEST_USERNAME=""
TEST_PASSWORD=""
TEST_APORTADOR=""
PUBLICKEY_PUSH="BGXRf1TgcqocqD6J7qnRgCG7AvM2lxAoW7peb7UEzB4SxBb6DxGRdJ0UvD9ewnrB9KrSrh0-aDCODXBm7sZ1DDs"
PUBLICKEY_PUSH="BJgo8XR_upbnbMLWgCAUELo6DK7dRXffYAnFOxbaMMz5favBgcQBKT-eISqouO-jRad4Sw8l5nd2wCF6KorGiTc"
IN_CONSTRUCTION="0"
DEBUG="1"
TELEGRAM_SUPPORT=""

2
.env.test.risosrv
View File

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

6
deploy_riso_on_macrotest_server.sh → deploy_riso_on_pcb_server.sh
View File

@@ -1,6 +1,6 @@
#!/bin/bash
source ./.env.test.macro
source ./.env.test.pcb
msg="*** Sincronizzazione ??? $DIRECTORY_LOCAL e $SERVERDIR_WEBSITE (Y/N) ? "
@@ -11,14 +11,14 @@ else
fi
cp .env.production .env.prod.bak
cp . env.test.macro .env.production
cp .env.test.pcb .env.production
sleep 1
npm run buildpwa
echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..."
rsync -e 'ssh -p 8822' -a dist/pwa/ root@macro:/home/$SERVERDIR_WEBSITE
rsync -e 'ssh -p 8822' -a dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE
cp .env.prod.bak .env.production

11
send_pwa_to_pcb.sh Executable file
View File

@@ -0,0 +1,11 @@
#!/bin/bash
source .env.test.pcb
cp .env.test.pcb .env.production
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
rsync -e 'ssh -p 8822' -a --exclude 'upload' dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE
echo "Finito $SERVERDIR_WEBSITE"
cp .env.prod.bak .env.production

3
src/components/CMyProfileTutorial/CMyProfileTutorial.ts
View File

@@ -339,7 +339,7 @@ export default defineComponent({
userStore.my.profile.stepTutorial = getFirstStepToFill()
indstep.value = userStore.my.profile.stepTutorial ? userStore.my.profile.stepTutorial : 1
indstep.value = userStore.my.profile.stepTutorial ? userStore.my.profile.stepTutorial : 0
if (indstep.value > numindstep.value)
indstep.value = numindstep.value
@@ -552,6 +552,7 @@ export default defineComponent({
circuititalia,
usersList,
userstoverify,
numStepCompleted,
}
},
})

14
src/components/CSignUp/CSignUp.ts
View File

@@ -120,7 +120,7 @@ export default defineComponent({
ret = !signup.username || (inputUsername.value && inputUsername.value.hasError)
} else if (slide.value === '3') {
// Password
ret = !signup.password || (!inputPassword.value && inputPassword.value.hasError) || (!inputPassword2.value && inputPassword2.value.hasError)
ret = !signup.password || (!inputPassword.value || (inputPassword.value && inputPassword.value.hasError)) || (!inputPassword2.value || (inputPassword2.value && inputPassword2.value.hasError))
}
return ret
@@ -193,6 +193,12 @@ export default defineComponent({
const usernameteleg = ref($route.params.usernameteleg)
const idteleg = ref($route.params.idteleg)
watch(() => slide.value, (to: any, from: any) => {
if (slide.value === '3') {
v$.value.$touch()
}
})
watch(() => invited, (to: any, from: any) => {
if (props.showaportador) {
console.log('changeaportador', $route.params.invited)
@@ -322,7 +328,7 @@ export default defineComponent({
signup.name = props.name_default!
}
console.log('1) aportador_solidario', signup.aportador_solidario)
// console.log('1) aportador_solidario', signup.aportador_solidario)
if (!signup.aportador_solidario)
signup.aportador_solidario = tools.getCookie(tools.APORTADOR_SOLIDARIO, signup.aportador_solidario)
@@ -333,8 +339,8 @@ export default defineComponent({
}
}
console.log('signup.aportador_solidario', signup.aportador_solidario)
console.log('getasktoverify', tools.getAskToVerifyReg())
// console.log('signup.aportador_solidario', signup.aportador_solidario)
// console.log('getasktoverify', tools.getAskToVerifyReg())
if (tools.getAskToVerifyReg()) {

1
src/components/CSignUp/CSignUp.vue
View File

@@ -501,6 +501,7 @@
<q-input
ref="inputPassword"
v-model="signup.password"
class="q-mb-md"
:type="typePassword"
rounded
outlined

7
src/components/CUserInfoAccount/CUserInfoAccount.vue
View File

@@ -37,8 +37,11 @@
>
</CSaldo>
<div v-if="onlysaldo">
<div v-for="(circnaz, ind) of circuitsnational" :key="ind">
<div v-if="onlysaldo" class="q-ma-sm">
<div v-if="circuitsnational.length === 0">
</div>
<div v-else v-for="(circnaz, ind) of circuitsnational" :key="ind">
<q-avatar v-if="userStore.getImgByCircuit(circnaz)" size="30px">
<q-img
:src="userStore.getImgByCircuit(circnaz)"

24
src/components/CUserNonVerif/CUserNonVerif.vue
View File

@@ -1,6 +1,6 @@
<template>
<div v-if="!globalStore.serverError" class="q-ma-md">
<div v-if="!globalStore.serverError" class="q-ma-sm">
<!--
<CVerifyTelegram v-if="!tools.TelegVerificato() || !tools.isUsernameTelegOk()">
@@ -13,28 +13,24 @@
</div>
<div v-if="userStore.isUserWaitingVerifAportador()" class="centeritems">
<q-banner inline-actions rounded class="bg-green text-black">
<template v-slot:avatar>
<q-icon name="info" color="primary" />
</template>
<strong class="text-h5"
>Appena sarai abilitato, dal tuo invitante
{{ tools.getAportadorSolidario() }}, ti arriverà una
<strong>notifica sulla Chat Telegram 'BOT RISO'</strong>.<br /><br />
Se non dovesse arrivarti entro 24 ore, apri il suo profilo e clicca su 'Messaggia' e scrivigli.<br />
</strong>
<q-banner inline-actions rounded class="bg-light-grey text-black">
<div class="text-h7"
>Sei in attesa di essere abilitato da
{{ tools.getAportadorSolidario() }}.<br>
Ti arriverà una notifica sulla Chat Telegram <strong>'BOT RISO'</strong>.<br /><br />
Se non dovesse arrivarti entro qualche ora, contattalo per ricordarglielo.<br />
</div>
<q-btn
rounded
class="q-ma-sm"
color="primary"
icon="fas fa-user"
:to="tools.getLinkProfileAportador()"
:label="`Apri il Profilo di ` + tools.getAportadorSolidario()"
:label="`Profilo di ` + tools.getAportadorSolidario()"
>
</q-btn>
<br><br>
<div class="text-h5"> Oppure manda un messaggio all'assistenza:</div>
<div class="text-h7"> Per supporto ed Aiuto:</div>
<q-btn
rounded
type="a"

10
src/db/static_data.ts
View File

@@ -57,6 +57,16 @@ function getDynamicPages(site: ISites): IListRoutes[] {
inmenu: true,
infooter: true,
},
{
active: true,
order: 400,
path: '/test',
materialIcon: 'fas fa-test',
name: 'mypages.test',
component: () => import('@/views/testServer/testServer.vue'),
inmenu: false,
infooter: false,
},
{
active: true,
order: 12,

10
src/router/routesAdmin.ts
View File

@@ -444,16 +444,6 @@ function getRoutesAd(site: ISites) {
inmenu: false,
infooter: false,
},
{
active: true,
order: 400,
path: '/test',
materialIcon: 'fas fa-test',
name: 'mypages.test',
component: () => import('@/views/testServer/testServer.vue'),
inmenu: false,
infooter: false,
},
{
active: true,
order: 15,

4
src/statics/lang/it.js
View File

@@ -584,7 +584,7 @@ const msg_it = {
scegli_username: 'Inserisci un nome utente per il tuo Profilo:',
scegli_password: 'Inserisci una Nuova password per accedere alla piattaforma:',
password: 'Password',
password_reg: 'Scegli una nuova Password',
password_reg: 'Password',
repeatPassword: 'Ripeti password',
terms: 'Accetto i termini della privacy',
metodopagamento: 'Metodo di Pagamento',
@@ -656,7 +656,7 @@ const msg_it = {
email: 'inserire una email valida',
errore_generico: 'Si prega di compilare correttamente i campi',
atleast: 'dev\'essere lungo almeno di',
complexity: 'deve contenere almeno 1 minuscola, 1 maiuscola, 1 cifra',
complexity: 'deve contenere 1 minuscola, 1 maiuscola, 1 cifra',
complexityUser: 'caratteri consentiti: tratteggio (_), meno (-) e il punto (.)',
notmore: 'non dev\'essere lungo più di',
char: 'caratteri',

4
src/store/Modules/tools.ts
View File

@@ -4041,7 +4041,7 @@ export const tools = {
const msg2 = t('fetch.errore_generico') + userStore.getMsgError(riscode)
this.showNotif(mythisq, msg2)
} else if (riscode === this.OK) {
$router.push('/signin')
$router.replace('/signin')
/*this.showNotif(mythisq, t('components.authentication.email_verification.link_sent', { botname: t('ws.botname') }), {
color: 'green',
textColor: 'black',
@@ -4051,7 +4051,7 @@ export const tools = {
textColor: 'black',
})
} else if (riscode === serv_constants.RIS_ISCRIZIONE_OK) {
$router.push('/')
$router.replace('/')
this.showNotif(mythisq, t('components.authentication.iscrizione_ok', { botname: this.getBotName() }), {
color: 'green',
textColor: 'black',

2
src/store/UserStore.ts
View File

@@ -59,7 +59,7 @@ export const DefaultUser: IUserFields = {
password: '',
tokens: [],
verified_email: false,
verified_by_aportador: false,
verified_by_aportador: undefined,
aportador_solidario: '',
made_gift: false,
profile: {

8
src/views/admin/dbop/dbop.vue
View File

@@ -562,6 +562,14 @@
></q-btn>
<br />
</div>
<div class="row">
<q-btn
label="GenerateVapiKey"
color="primary"
@click="EseguiFunz('GenerateVapiKey')"
></q-btn>
<br />
</div>
</template>
<script lang="ts" src="./dbop.ts">
</script>

23
src/views/user/myprofile/myprofile.vue
View File

@@ -170,6 +170,13 @@
color="green"
>online</q-badge
>
<q-badge
v-if="!tools.isVerifiedByUser(userStore.userprofile)"
align="bottom"
floating
color="red"
>Da Abilitare</q-badge
>
</q-avatar>
</div>
@@ -254,7 +261,13 @@
>({{ userStore.userprofile.profile.nationality }})</span
>
</div>
<div v-if="userStore.userprofile.profile.qualifica && userStore.userprofile._id" class="col-12 text-h8 q-mt-sm">
<div
v-if="
userStore.userprofile.profile.qualifica &&
userStore.userprofile._id
"
class="col-12 text-h8 q-mt-sm"
>
<span v-if="userStore.userprofile.profile.qualifica">
<em
><span class="qualifica">{{
@@ -263,7 +276,13 @@
>
</span>
</div>
<div v-if="userStore.userprofile._id && userStore.userprofile.profile.biografia" class="col-12 text-h8 q-mt-sm">
<div
v-if="
userStore.userprofile._id &&
userStore.userprofile.profile.biografia
"
class="col-12 text-h8 q-mt-sm"
>
{{ userStore.userprofile.profile.biografia }}
</div>
<div>