Skip to content

Commit 16a2cf2

Browse files
nathanrodnathanrod
authored
Merge pull request #938 from ivpn/feat/improve-additional-services-ux
Feat/improve additional services ux
2 parents 04860ce + d9d9084 commit 16a2cf2

4 files changed

Lines changed: 52 additions & 22 deletions

File tree

‎src/themes/ivpn-v3/assets/js/views/Account/Services/DnsService.vue‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,20 @@
88
<p>{{ $t('account.services.dns.betaDescription3') }}</p>
99
<p>{{ $t('account.services.dns.betaDescription4') }}</p>
1010
<p>{{ $t('account.services.dns.betaDescription5') }}</p>
11-
<p v-if="subId">
11+
<p v-if="!generated">
12+
<p>
13+
{{ $t('account.services.dns.follow') }}
14+
</p>
15+
<a class="btn btn-solid btn-big" @click="add">{{ $t('account.services.dns.generate') }}</a>
16+
</p>
17+
<p v-else>
18+
<p>
1219
{{ $t('account.services.dns.follow') }}<br>
13-
<a target="_blank" :href="'https://app.moddns.net/signup/' + subId">https://app.moddns.net/signup/{{ subId }}</a>
20+
</p>
21+
<p>
22+
{{ $t('account.services.dns.signup') }} <a target="_blank" :href="'https://app.moddns.net/signup/' + subId">https://app.moddns.net/signup/{{ subId }}</a><br>
23+
{{ $t('account.services.dns.expireNote') }}
24+
</p>
1425
</p>
1526
<p>{{ $t('account.services.dns.feedback') }} <a href="mailto:moddns@ivpn.net">moddns@ivpn.net</a>.</p>
1627
</div>
@@ -46,6 +57,7 @@ export default {
4657
subIdDeletedAt: "",
4758
store: false,
4859
success: "",
60+
generated: false,
4961
};
5062
},
5163
computed: {
@@ -66,10 +78,6 @@ export default {
6678
this.subId = this.account["dns_service_id"];
6779
this.subIdDeletedAt = this.account["dns_service_deleted_at"];
6880
this.loaded = true;
69-
70-
if (!this.subIdDeletedAt) {
71-
this.add();
72-
}
7381
},
7482
mounted() {
7583
useI18n().locale.value = window.location.href.split("/")[3];
@@ -78,8 +86,9 @@ export default {
7886
methods: {
7987
async add() {
8088
let res = await this.$store.dispatch("account/addDnsSubscription");
81-
if (res && !this.subId) {
89+
if (res ) {
8290
this.subId = res.id;
91+
this.generated = true;
8392
}
8493
},
8594
},

‎src/themes/ivpn-v3/assets/js/views/Account/Services/EmailService.vue‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,20 @@
88
<p>{{ $t('account.services.mail.betaDescription3') }}</p>
99
<p>{{ $t('account.services.mail.betaDescription4') }}</p>
1010
<p>{{ $t('account.services.mail.betaDescription5') }}</p>
11-
<p v-if="subId">
11+
<p v-if="!generated">
12+
<p>
13+
{{ $t('account.services.mail.follow') }}
14+
</p>
15+
<a class="btn btn-solid btn-big" @click="add">{{ $t('account.services.mail.generate') }}</a>
16+
</p>
17+
<p v-else>
18+
<p>
1219
{{ $t('account.services.mail.follow') }}<br>
13-
<a target="_blank" :href="'https://app.mailx.net/signup/' + subId">https://app.mailx.net/signup/{{ subId }}</a>
20+
</p>
21+
<p>
22+
{{ $t('account.services.mail.signup') }} <a target="_blank" :href="'https://app.mailx.net/signup/' + subId">https://app.mailx.net/signup/{{ subId }}</a><br>
23+
{{ $t('account.services.mail.expireNote') }}
24+
</p>
1425
</p>
1526
<p>{{ $t('account.services.mail.feedback') }} <a href="mailto:mailx@ivpn.net">mailx@ivpn.net</a>.</p>
1627
</div>
@@ -46,6 +57,7 @@ export default {
4657
subIdDeletedAt: "",
4758
store: false,
4859
success: "",
60+
generated: false,
4961
};
5062
},
5163
computed: {
@@ -66,10 +78,6 @@ export default {
6678
this.subId = this.account["email_service_id"];
6779
this.subIdDeletedAt = this.account["email_service_deleted_at"];
6880
this.loaded = true;
69-
70-
if (!this.subIdDeletedAt) {
71-
this.add();
72-
}
7381
},
7482
mounted() {
7583
useI18n().locale.value = window.location.href.split("/")[3];
@@ -78,8 +86,9 @@ export default {
7886
methods: {
7987
async add() {
8088
let res = await this.$store.dispatch("account/addEmailSubscription");
81-
if (res && !this.subId) {
89+
if (res) {
8290
this.subId = res.id;
91+
this.generated = true;
8392
}
8493
},
8594
},

‎src/themes/ivpn-v3/locales/en.json‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,15 @@
124124
"betaDescription3": "Mailx is currently in beta and available for registration to selected IVPN customers for free. Mailx will stay free for beta participants after launch as long as they have an active IVPN subscription.",
125125
"betaDescription4": "After successful registration Mailx specific identifiers are deleted from IVPN systems, so your accounts are not linked together.",
126126
"betaDescription5": "Beta Disclaimer: This service is in active development. You may encounter occasional downtime or delivery delays. Do not rely on Mailx for mission-critical delivery until the full release.",
127-
"follow": "Please follow the unique registration link below to start testing Mailx:",
127+
"follow": "Request a unique registration link below to start testing Mailx:",
128128
"feedback": "We welcome your feedback about the service via",
129129
"signed": "You have signed up to Mailx, an e-mail aliasing service developed by IVPN.",
130130
"access": "Access the Mailx service dashboard",
131131
"here": "here",
132-
"submit": "Please submit your feedback, requests and any issues you encounter through one of the following channels:"
132+
"submit": "Please submit your feedback, requests and any issues you encounter through one of the following channels:",
133+
"generate": "Generate",
134+
"signup": "Sign up to Mailx beta through this link:",
135+
"expireNote": "Note: This URL expires 15 minutes after generation."
133136
},
134137
"dns":{
135138
"betaTitle": "ModDNS",
@@ -138,12 +141,15 @@
138141
"betaDescription3": "ModDNS is currently in beta and available for registration to selected IVPN customers for free. The service will stay free for beta participants after launch as long as they have an active IVPN subscription.",
139142
"betaDescription4": "After successful registration, modDNS specific identifiers are deleted from IVPN systems, ensuring your accounts are not linked together.",
140143
"betaDescription5": "Beta Disclaimer: This service is in active development. You may encounter occasional downtime or delivery delays. Do not rely on ModDNS for mission-critical services until the full release.",
141-
"follow": "To start testing modDNS, follow the unique registration link below:",
144+
"follow": "Request a unique registration link below to start testing modDNS:",
142145
"feedback": "We welcome your feedback about the service via",
143146
"signed": "You have signed up to ModDNS, a private, secure DNS service developed by IVPN.",
144147
"access": "Access the ModDNS service dashboard",
145148
"here": "here",
146-
"submit": "Please submit your feedback, requests and any issues you encounter through one of the following channels:"
149+
"submit": "Please submit your feedback, requests and any issues you encounter through one of the following channels:",
150+
"generate": "Generate",
151+
"signup": "Sign up to ModDNS beta through this link:",
152+
"expireNote": "Note: This URL expires 15 minutes after generation."
147153
}
148154
},
149155
"greetings": "Your account has been created!",

‎src/themes/ivpn-v3/locales/es.json‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,15 @@
124124
"betaDescription3": "Mailx está actualmente en beta y disponible para el registro de clientes seleccionados de IVPN de forma gratuita. Mailx seguirá siendo gratuito para los participantes de la beta después del lanzamiento mientras tengan una suscripción activa a IVPN.",
125125
"betaDescription4": "Después del registro exitoso, los identificadores específicos de Mailx se eliminan de los sistemas de IVPN, por lo que tus cuentas no están vinculadas entre sí.",
126126
"betaDescription5": "Descargo de responsabilidad de la beta: Este servicio está en desarrollo activo. Puedes experimentar interrupciones ocasionales o retrasos en la entrega. No confíes en Mailx para entregas críticas hasta el lanzamiento completo.",
127-
"follow": "Por favor, sigue el enlace de registro único a continuación para comenzar a probar Mailx:",
127+
"follow": "Solicita un enlace de registro único a continuación para comenzar a probar Mailx:",
128128
"feedback": "Agradecemos tus comentarios sobre el servicio a través de",
129129
"signed": "Te has registrado en Mailx, un servicio de alias de correo electrónico desarrollado por IVPN.",
130130
"access": "Accede al panel de control del servicio Mailx",
131131
"here": "aquí",
132-
"submit": "Por favor, envía tus comentarios, solicitudes y cualquier problema que encuentres a través de uno de los siguientes canales:"
132+
"submit": "Por favor, envía tus comentarios, solicitudes y cualquier problema que encuentres a través de uno de los siguientes canales:",
133+
"generate": "Generar",
134+
"signup": "Regístrate en la beta de Mailx a través de este enlace:",
135+
"expireNote": "Nota: Esta URL expira 15 minutos después de su generación."
133136
},
134137
"dns":{
135138
"betaTitle": "ModDNS",
@@ -138,12 +141,15 @@
138141
"betaDescription3": "ModDNS está actualmente en beta y disponible para el registro en clientes seleccionados de IVPN de forma gratuita. El servicio seguirá siendo gratuito para los participantes de la beta después del lanzamiento mientras tengan una suscripción activa a IVPN.",
139142
"betaDescription4": "Después del registro, los identificadores específicos de ModDNS se eliminan de los sistemas de IVPN, por lo que tus cuentas no están vinculadas entre sí.",
140143
"betaDescription5": "Descargo de responsabilidad de la beta: Este servicio está en desarrollo activo. Puedes experimentar interrupciones ocasionales o retrasos en la entrega. No confíes en ModDNS para servicios críticos hasta el lanzamiento completo.",
141-
"follow": "Para comenzar a probar modDNS, sigue el enlace de registro único a continuación:",
144+
"follow": "Solicita un enlace de registro único a continuación para comenzar a probar ModDNS:",
142145
"feedback": "Agradecemos tus comentarios sobre el servicio a través de",
143146
"signed": "Te has registrado en ModDNS, un servicio de DNS privado y seguro desarrollado por IVPN.",
144147
"access": "Accede al panel de control del servicio ModDNS",
145148
"here": "aquí",
146-
"submit": "Por favor, envía tus comentarios, solicitudes y cualquier problema que encuentres a través de uno de los siguientes canales:"
149+
"submit": "Por favor, envía tus comentarios, solicitudes y cualquier problema que encuentres a través de uno de los siguientes canales:",
150+
"generate": "Generar",
151+
"signup": "Regístrate en la beta de ModDNS a través de este enlace:",
152+
"expireNote": "Nota: Esta URL expira 15 minutos después de su generación."
147153
}
148154
},
149155
"greetings": "¡Tu cuenta ha sido creada!",

0 commit comments

Comments
 (0)