gofnnp/w-aura
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'main'

Browse Source 
Develop - Add cookie for EU and fix some palmistry new bugs

See merge request witapp/aura-webapp!388
This commit is contained in:
Daniil Chemerkin 2024-09-10 14:27:25 +00:00
commit 5be54aea7c
26 changed files with 199 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
index.html
View File

@ -1,11 +1,40 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<style>.varioqub-antiflicker {opacity: 0 !important;}</style> <!-- Start cookieyes banner -->
<script
id="cookieyes"
type="text/javascript"
src="https://cdn-cookieyes.com/client_data/818f2bf465f49092b0fd7078/script.js"
></script>
<!-- End cookieyes banner -->
<style>
.varioqub-antiflicker {
opacity: 0 !important;
}
</style>
<script> <script>
(function(a,n,t,i,f,li,c,k,e,r){ (function (a, n, t, i, f, li, c, k, e, r) {
a[t]=a[t]||function(){(a[t].a=a[t].a||[]).push(arguments)};n.classList.add(i);c=function(){n.classList.remove(i)};li.callback=c;a[t].antiFlicker=li;setTimeout(c,f); a[t] =
})(window, document.documentElement, 'ymab', 'varioqub-antiflicker', 4000, { 'metrika.XXXX': true }); a[t] ||
function () {
(a[t].a = a[t].a || []).push(arguments);
};
n.classList.add(i);
c = function () {
n.classList.remove(i);
};
li.callback = c;
a[t].antiFlicker = li;
setTimeout(c, f);
})(
window,
document.documentElement,
"ymab",
"varioqub-antiflicker",
4000,
{ "metrika.XXXX": true }
);
</script> </script>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta <meta
@ -116,12 +145,29 @@
<!-- Klaviyo Metric --> <!-- Klaviyo Metric -->
<!-- Varioqub experiments --> <!-- Varioqub experiments -->
<script type="text/javascript"> <script type="text/javascript">
(function(e, x, pe, r, i, me, nt){ (function (e, x, pe, r, i, me, nt) {
e[i]=e[i]||function(){(e[i].a=e[i].a||[]).push(arguments)}, (e[i] =
me=x.createElement(pe),me.async=1,me.src=r,nt=x.getElementsByTagName(pe)[0],nt.parentNode.insertBefore(me,nt)}) e[i] ||
(window, document, 'script', 'https://abt.s3.yandex.net/expjs/latest/exp.js', 'ymab'); function () {
ymab('metrika.95799066', 'setConfig', { enableJS: true, enableWatch: true }); (e[i].a = e[i].a || []).push(arguments);
ymab('metrika.95799066', 'init'/*, {clientFeatures}, {callback}*/); }),
(me = x.createElement(pe)),
(me.async = 1),
(me.src = r),
(nt = x.getElementsByTagName(pe)[0]),
nt.parentNode.insertBefore(me, nt);
})(
window,
document,
"script",
"https://abt.s3.yandex.net/expjs/latest/exp.js",
"ymab"
);
ymab("metrika.95799066", "setConfig", {
enableJS: true,
enableWatch: true,
});
ymab("metrika.95799066", "init" /*, {clientFeatures}, {callback}*/);
</script> </script>
<!-- Varioqub experiments --> <!-- Varioqub experiments -->
<!-- Yandex.Metrika counter --> <!-- Yandex.Metrika counter -->

4
public/locales/v1/de/female_de.json
View File

@ -540,10 +540,10 @@
"special_offer": "Sonderangebot", "special_offer": "Sonderangebot",
"title": "Personalisierte Lektüre für <price>", "title": "Personalisierte Lektüre für <price>",
"total_today": "Gesamtbetrag heute", "total_today": "Gesamtbetrag heute",
"cost": "Ihre Kosten alle 2 Wochen nach der Testphase" "cost": "Ihre Kosten alle 1 Wochen nach der Testphase"
}, },
"policy_link": "Abonnement-Richtlinie", "policy_link": "Abonnement-Richtlinie",
"subscription_policy": "Sie melden sich für ein 2-wöchiges Abonnement an. Durch die Fortsetzung stimmen Sie zu, dass, wenn Sie nicht vor dem Ende der <trialDuration>-tägigen Testphase für <trialPrice> kündigen, Ihnen automatisch alle 2 Wochen <price> berechnet wird, bis Sie in den Einstellungen kündigen. Erfahren Sie mehr über die Kündigungs- und Rückerstattungsrichtlinie in <policyLink>", "subscription_policy": "Sie melden sich für ein 1-wöchige Abonnement an. Durch die Fortsetzung stimmen Sie zu, dass, wenn Sie nicht vor dem Ende der <trialDuration>-tägigen Testphase für <trialPrice> kündigen, Ihnen automatisch alle 1 Wochen <price> berechnet wird, bis Sie in den Einstellungen kündigen. Erfahren Sie mehr über die Kündigungs- und Rückerstattungsrichtlinie in <policyLink>",
"your_reading": "Ihre Lektüre", "your_reading": "Ihre Lektüre",
"content": "Inhalt", "content": "Inhalt",
"content_list": { "content_list": {

4
public/locales/v1/de/male_de.json
View File

@ -543,10 +543,10 @@
"special_offer": "Sonderangebot", "special_offer": "Sonderangebot",
"title": "Personalisierte Lesung für <price>", "title": "Personalisierte Lesung für <price>",
"total_today": "Heute gesamt", "total_today": "Heute gesamt",
"cost": "Deine Kosten pro 2 Wochen nach der Probezeit" "cost": "Deine Kosten pro 1 Wochen nach der Probezeit"
}, },
"policy_link": "Abonnementbedingungen", "policy_link": "Abonnementbedingungen",
"subscription_policy": "Du schließt ein 2-wöchentliches Abonnement ab. Indem du fortfährst, stimmst du zu, dass, wenn du nicht vor Ablauf der <trialDuration>-tägigen Probezeit für den <trialPrice> kündigst, dir automatisch alle 2 Wochen <price> berechnet wird, bis du in den Einstellungen kündigst. Erfahre mehr über Kündigungs- und Rückerstattungsrichtlinien in <policyLink>", "subscription_policy": "Du schließt ein 1-wöchentlichen Abonnement ab. Indem du fortfährst, stimmst du zu, dass, wenn du nicht vor Ablauf der <trialDuration>-tägigen Probezeit für den <trialPrice> kündigst, dir automatisch alle 1 Wochen <price> berechnet wird, bis du in den Einstellungen kündigst. Erfahre mehr über Kündigungs- und Rückerstattungsrichtlinien in <policyLink>",
"your_reading": "Deine Lesung", "your_reading": "Deine Lesung",
"content": "Inhalt", "content": "Inhalt",
"content_list": { "content_list": {

4
public/locales/v1/en/female_en.json
View File

@ -546,10 +546,10 @@
"special_offer": "Special offer", "special_offer": "Special offer",
"title": "Personalized reading for <price>", "title": "Personalized reading for <price>",
"total_today": "Total today", "total_today": "Total today",
"cost": "Your cost per 2 weeks after trial" "cost": "Your cost per 1 week after trial"
}, },
"policy_link": "Subscription policy", "policy_link": "Subscription policy",
"subscription_policy": "You are enrolling in 2 weeks subscription. By continuing you agree that if you don't cancel prior to the end of the <trialDuration>-day trial for the <trialPrice> you will automatically be charged <price> every 2 weeks until you cancel in settings. Learn more about cancellation and refund policy in <policyLink>", "subscription_policy": "You are enrolling in 1 week subscription. By continuing you agree that if you don't cancel prior to the end of the <trialDuration>-day trial for the <trialPrice> you will automatically be charged <price> every 1 week until you cancel in settings. Learn more about cancellation and refund policy in <policyLink>",
"your_reading": "Your reading", "your_reading": "Your reading",
"content": "Content", "content": "Content",
"content_list": { "content_list": {

4
public/locales/v1/en/male_en.json
View File

@ -546,10 +546,10 @@
"special_offer": "Special offer", "special_offer": "Special offer",
"title": "Personalized reading for <price>", "title": "Personalized reading for <price>",
"total_today": "Total today", "total_today": "Total today",
"cost": "Your cost per 2 weeks after trial" "cost": "Your cost per 1 week after trial"
}, },
"policy_link": "Subscription policy", "policy_link": "Subscription policy",
"subscription_policy": "You are enrolling in 2 weeks subscription. By continuing you agree that if you don't cancel prior to the end of the <trialDuration>-day trial for the <trialPrice> you will automatically be charged <price> every 2 weeks until you cancel in settings. Learn more about cancellation and refund policy in <policyLink>", "subscription_policy": "You are enrolling in 1 week subscription. By continuing you agree that if you don't cancel prior to the end of the <trialDuration>-day trial for the <trialPrice> you will automatically be charged <price> every 1 week until you cancel in settings. Learn more about cancellation and refund policy in <policyLink>",
"your_reading": "Your reading", "your_reading": "Your reading",
"content": "Content", "content": "Content",
"content_list": { "content_list": {

6
public/locales/v1/es/female_es.json
View File

@ -543,10 +543,10 @@
"special_offer": "Oferta especial", "special_offer": "Oferta especial",
"title": "Lectura personalizada por <price>", "title": "Lectura personalizada por <price>",
"total_today": "Total hoy", "total_today": "Total hoy",
"cost": "Tu costo cada 2 semanas después de la prueba" "cost": "Tu costo cada 1 semana después de la prueba"
}, },
"policy_link": "Política de suscripción", "policy_link": "Política de suscripción",
"subscription_policy": "Te estás inscribiendo en una suscripción de 2 semanas. Al continuar, aceptas que si no cancelas antes del final del período de prueba de <trialDuration> días por <trialPrice>, se te cobrará automáticamente <price> cada 2 semanas hasta que canceles en la configuración. Obtén más información sobre la política de cancelación y reembolso en <policyLink>", "subscription_policy": "Te estás inscribiendo en una suscripción de 1 semana. Al continuar, aceptas que si no cancelas antes del final del período de prueba de <trialDuration> días por <trialPrice>, se te cobrará automáticamente <price> cada 1 semana hasta que canceles en la configuración. Obtén más información sobre la política de cancelación y reembolso en <policyLink>",
"your_reading": "Tu lectura", "your_reading": "Tu lectura",
"content": "Contenido", "content": "Contenido",
"content_list": { "content_list": {
@ -886,4 +886,4 @@
"app_number_one": "La aplicación de astrología #1 confiada por más de <color>" "app_number_one": "La aplicación de astrología #1 confiada por más de <color>"
} }
} }
} }

4
public/locales/v1/es/male_es.json
View File

@ -543,10 +543,10 @@
"special_offer": "Oferta especial", "special_offer": "Oferta especial",
"title": "Lectura personalizada por <price>", "title": "Lectura personalizada por <price>",
"total_today": "Total hoy", "total_today": "Total hoy",
"cost": "Tu costo por 2 semanas después del período de prueba" "cost": "Tu costo por 1 semana después del período de prueba"
}, },
"policy_link": "Política de suscripción", "policy_link": "Política de suscripción",
"subscription_policy": "Te estás inscribiendo en una suscripción de 2 semanas. Al continuar, aceptas que si no cancelas antes del final del período de prueba de <trialDuration> días por <trialPrice>, se te cobrará automáticamente <price> cada 2 semanas hasta que lo canceles en configuraciones. Obtén más información sobre la política de cancelación y reembolso en <policyLink>", "subscription_policy": "Te estás inscribiendo en una suscripción de 1 semana. Al continuar, aceptas que si no cancelas antes del final del período de prueba de <trialDuration> días por <trialPrice>, se te cobrará automáticamente <price> cada 1 semana hasta que lo canceles en configuraciones. Obtén más información sobre la política de cancelación y reembolso en <policyLink>",
"your_reading": "Tu lectura", "your_reading": "Tu lectura",
"content": "Contenido", "content": "Contenido",
"content_list": { "content_list": {

4
public/locales/v1/fr/female_fr.json
View File

@ -543,10 +543,10 @@
"special_offer": "Offre spéciale", "special_offer": "Offre spéciale",
"title": "Lecture personnalisée pour <price>", "title": "Lecture personnalisée pour <price>",
"total_today": "Total aujourd'hui", "total_today": "Total aujourd'hui",
"cost": "Votre coût toutes les 2 semaines après l'essai" "cost": "Votre coût toutes les 1 semaine après l'essai"
}, },
"policy_link": "Politique d'abonnement", "policy_link": "Politique d'abonnement",
"subscription_policy": "Vous souscrivez à un abonnement de 2 semaines. En continuant, vous acceptez que si vous ne résiliez pas avant la fin de l'essai de <trialDuration> jours pour <trialPrice>, vous serez automatiquement facturé <price> toutes les 2 semaines jusqu'à ce que vous annuliez dans les paramètres. En savoir plus sur la politique d'annulation et de remboursement dans <policyLink>", "subscription_policy": "Vous souscrivez à un abonnement de 1 semaine. En continuant, vous acceptez que si vous ne résiliez pas avant la fin de l'essai de <trialDuration> jours pour <trialPrice>, vous serez automatiquement facturé <price> toutes les 1 semaine jusqu'à ce que vous annuliez dans les paramètres. En savoir plus sur la politique d'annulation et de remboursement dans <policyLink>",
"your_reading": "Votre lecture", "your_reading": "Votre lecture",
"content": "Contenu", "content": "Contenu",
"content_list": { "content_list": {

4
public/locales/v1/fr/male_fr.json
View File

@ -540,10 +540,10 @@
"special_offer": "Offre spéciale", "special_offer": "Offre spéciale",
"title": "Lecture personnalisée pour <price>", "title": "Lecture personnalisée pour <price>",
"total_today": "Total aujourd'hui", "total_today": "Total aujourd'hui",
"cost": "Votre coût par 2 semaines après l'essai" "cost": "Votre coût par 1 semaine après l'essai"
}, },
"policy_link": "Politique d'abonnement", "policy_link": "Politique d'abonnement",
"subscription_policy": "Vous vous inscrivez à un abonnement de 2 semaines. En continuant, vous acceptez que si vous ne vous désabonnez pas avant la fin de l'essai de <trialDuration> jours pour <trialPrice>, vous serez automatiquement facturé <price> toutes les 2 semaines jusqu'à ce que vous annuliez dans les paramètres. Découvrez-en plus sur la politique d'annulation et de remboursement dans <policyLink>", "subscription_policy": "Vous vous inscrivez à un abonnement de 1 semaine. En continuant, vous acceptez que si vous ne vous désabonnez pas avant la fin de l'essai de <trialDuration> jours pour <trialPrice>, vous serez automatiquement facturé <price> toutes les 1 semaine jusqu'à ce que vous annuliez dans les paramètres. Découvrez-en plus sur la politique d'annulation et de remboursement dans <policyLink>",
"your_reading": "Votre lecture", "your_reading": "Votre lecture",
"content": "Contenu", "content": "Contenu",
"content_list": { "content_list": {

4
public/locales/v1/hi/female_hi.json
View File

@ -543,10 +543,10 @@
"special_offer": "विशेष प्रस्ताव", "special_offer": "विशेष प्रस्ताव",
"title": "<price> में व्यक्तिगत रीडिंग", "title": "<price> में व्यक्तिगत रीडिंग",
"total_today": "आज कुल", "total_today": "आज कुल",
"cost": "ट्रायल के बाद हर 2 सप्ताह के लिए आपकी लागत" "cost": "ट्रायल के बाद हर 1 सप्ताह के लिए आपकी लागत"
}, },
"policy_link": "सदस्यता नीति", "policy_link": "सदस्यता नीति",
"subscription_policy": "आप 2 सप्ताह की सदस्यता में नामांकित हो रहे हैं। जारी रखते हुए आप सहमत होते हैं कि यदि आप <trialDuration>-दिन की ट्रायल अवधि के अंत से पहले <trialPrice> के लिए रद्द नहीं करते हैं, तो आपको स्वचालित रूप से हर 2 सप्ताह में <price> का शुल्क लगाया जाएगा जब तक आप सेटिंग्स में रद्द नहीं करते। <policyLink> में रद्दीकरण और रिफंड नीति के बारे में और जानें।", "subscription_policy": "आप 1 सप्ताह की सदस्यता में नामांकित हो रहे हैं। जारी रखते हुए आप सहमत होते हैं कि यदि आप <trialDuration>-दिन की ट्रायल अवधि के अंत से पहले <trialPrice> के लिए रद्द नहीं करते हैं, तो आपको स्वचालित रूप से हर 1 सप्ताह में <price> का शुल्क लगाया जाएगा जब तक आप सेटिंग्स में रद्द नहीं करते। <policyLink> में रद्दीकरण और रिफंड नीति के बारे में और जानें।",
"your_reading": "आपकी रीडिंग", "your_reading": "आपकी रीडिंग",
"content": "सामग्री", "content": "सामग्री",
"content_list": { "content_list": {

4
public/locales/v1/hi/male_hi.json
View File

@ -540,10 +540,10 @@
"special_offer": "विशेष प्रस्ताव", "special_offer": "विशेष प्रस्ताव",
"title": "<price> के लिए व्यक्तिगत पठन", "title": "<price> के लिए व्यक्तिगत पठन",
"total_today": "आज कुल", "total_today": "आज कुल",
"cost": "प्रारंभिक परीक्षण के बाद प्रत्येक 2 सप्ताह की लागत" "cost": "प्रारंभिक परीक्षण के बाद प्रत्येक 1 सप्ताह की लागत"
}, },
"policy_link": "सदस्यता नीति", "policy_link": "सदस्यता नीति",
"subscription_policy": "आप 2 सप्ताह की सदस्यता में नामांकन कर रहे हैं। यदि आप <trialDuration>-दिन के परीक्षण के अंत से पहले <trialPrice> को रद्द नहीं करते हैं तो आपसे <price> का स्वचालित रूप से हर 2 सप्ताह में शुल्क लिया जाएगा जब तक आप सेटिंग्स में रद्द नहीं करते। रद्द करने और वापसी नीति के बारे में अधिक जानने के लिए <policyLink> देखें", "subscription_policy": "आप 1 सप्ताह की सदस्यता में नामांकन कर रहे हैं। यदि आप <trialDuration>-दिन के परीक्षण के अंत से पहले <trialPrice> को रद्द नहीं करते हैं तो आपसे <price> का स्वचालित रूप से हर 1 सप्ताह में शुल्क लिया जाएगा जब तक आप सेटिंग्स में रद्द नहीं करते। रद्द करने और वापसी नीति के बारे में अधिक जानने के लिए <policyLink> देखें",
"your_reading": "आपका पठन", "your_reading": "आपका पठन",
"content": "सामग्री", "content": "सामग्री",
"content_list": { "content_list": {

4
public/locales/v1/pt-br/female_pt-br.json
View File

@ -543,10 +543,10 @@
"special_offer": "Oferta especial", "special_offer": "Oferta especial",
"title": "Leitura personalizada por <price>", "title": "Leitura personalizada por <price>",
"total_today": "Total hoje", "total_today": "Total hoje",
"cost": "Seu custo por 2 semanas após o teste" "cost": "Seu custo por 1 semana após o teste"
}, },
"policy_link": "Política de assinatura", "policy_link": "Política de assinatura",
"subscription_policy": "Você está se inscrevendo em uma assinatura de 2 semanas. Ao continuar, você concorda que, se não cancelar antes do final do período de teste de <trialDuration> dias por <trialPrice>, será cobrada automaticamente a cada 2 semanas pelo valor de <price> até que cancele nas configurações. Saiba mais sobre a política de cancelamento e reembolso em <policyLink>", "subscription_policy": "Você está se inscrevendo em uma assinatura de 1 semana. Ao continuar, você concorda que, se não cancelar antes do final do período de teste de <trialDuration> dias por <trialPrice>, será cobrada automaticamente a cada 1 semana pelo valor de <price> até que cancele nas configurações. Saiba mais sobre a política de cancelamento e reembolso em <policyLink>",
"your_reading": "Sua leitura", "your_reading": "Sua leitura",
"content": "Conteúdo", "content": "Conteúdo",
"content_list": { "content_list": {

4
public/locales/v1/pt-br/male_pt-br.json
View File

@ -540,10 +540,10 @@
"special_offer": "Oferta especial", "special_offer": "Oferta especial",
"title": "Leitura personalizada por <price>", "title": "Leitura personalizada por <price>",
"total_today": "Total hoje", "total_today": "Total hoje",
"cost": "Seu custo a cada 2 semanas após o teste" "cost": "Seu custo a cada 1 semana após o teste"
}, },
"policy_link": "Política de Assinatura", "policy_link": "Política de Assinatura",
"subscription_policy": "Você está se inscrevendo em uma assinatura de 2 semanas. Ao continuar, você concorda que, se não cancelar antes do final do teste de <trialDuration> dias por <trialPrice>, será cobrado automaticamente <price> a cada 2 semanas até que cancele nas configurações. Saiba mais sobre a política de cancelamento e reembolso em <policyLink>", "subscription_policy": "Você está se inscrevendo em uma assinatura de 1 semana. Ao continuar, você concorda que, se não cancelar antes do final do teste de <trialDuration> dias por <trialPrice>, será cobrado automaticamente <price> a cada 1 semana até que cancele nas configurações. Saiba mais sobre a política de cancelamento e reembolso em <policyLink>",
"your_reading": "Sua leitura", "your_reading": "Sua leitura",
"content": "Conteúdo", "content": "Conteúdo",
"content_list": { "content_list": {

4
public/locales/v1/pt-pt/female_pt-pt.json
View File

@ -543,10 +543,10 @@
"special_offer": "Oferta especial", "special_offer": "Oferta especial",
"title": "Leitura personalizada por <price>", "title": "Leitura personalizada por <price>",
"total_today": "Total hoje", "total_today": "Total hoje",
"cost": "Custo por cada 2 semanas após o período experimental" "cost": "Custo por cada 1 semana após o período experimental"
}, },
"policy_link": "Política de subscrição", "policy_link": "Política de subscrição",
"subscription_policy": "Estás a inscrever-te numa subscrição de 2 semanas. Ao continuar, concordas que, se não cancelares antes do final do período experimental de <trialDuration> dias por <trialPrice>, serás automaticamente cobrada <price> a cada 2 semanas até cancelares nas configurações. Sabe mais sobre a política de cancelamento e reembolso em <policyLink>", "subscription_policy": "Estás a inscrever-te numa subscrição de 1 semana. Ao continuar, concordas que, se não cancelares antes do final do período experimental de <trialDuration> dias por <trialPrice>, serás automaticamente cobrada <price> a cada 1 semana até cancelares nas configurações. Sabe mais sobre a política de cancelamento e reembolso em <policyLink>",
"your_reading": "A tua leitura", "your_reading": "A tua leitura",
"content": "Conteúdo", "content": "Conteúdo",
"content_list": { "content_list": {

4
public/locales/v1/pt-pt/male_pt-pt.json
View File

@ -543,10 +543,10 @@
"special_offer": "Oferta especial", "special_offer": "Oferta especial",
"title": "Leitura personalizada por <price>", "title": "Leitura personalizada por <price>",
"total_today": "Total hoje", "total_today": "Total hoje",
"cost": "O teu custo por 2 semanas após o teste" "cost": "O teu custo por 1 semana após o teste"
}, },
"policy_link": "Política de subscrição", "policy_link": "Política de subscrição",
"subscription_policy": "Estás a inscrever-te numa subscrição de 2 semanas. Ao continuar, concordas que se não cancelares antes do final do teste de <trialDuration> dias por <trialPrice>, serás automaticamente cobrado <price> a cada 2 semanas até que canceles nas definições. Sabe mais sobre a política de cancelamento e reembolso na <policyLink>", "subscription_policy": "Estás a inscrever-te numa subscrição de 1 semana. Ao continuar, concordas que se não cancelares antes do final do teste de <trialDuration> dias por <trialPrice>, serás automaticamente cobrado <price> a cada 1 semana até que canceles nas definições. Sabe mais sobre a política de cancelamento e reembolso na <policyLink>",
"your_reading": "A tua leitura", "your_reading": "A tua leitura",
"content": "Conteúdo", "content": "Conteúdo",
"content_list": { "content_list": {

4
public/locales/v1/ru/female_ru.json
View File

@ -543,10 +543,10 @@
"special_offer": "Специальное предложение", "special_offer": "Специальное предложение",
"title": "Персонализированный прогноз за <price>", "title": "Персонализированный прогноз за <price>",
"total_today": "Итого сегодня", "total_today": "Итого сегодня",
"cost": "Ваша стоимость каждые 2 недели после окончания пробного периода" "cost": "Ваша стоимость каждую неделю после окончания пробного периода"
}, },
"policy_link": "Политика подписки", "policy_link": "Политика подписки",
"subscription_policy": "Вы оформляете подписку на 2 недели. Продолжая, вы соглашаетесь с тем, что если не отмените свою подписку до конца <trialDuration>-дневного пробного периода за <trialPrice>, то с вас автоматически будет списываться <price> каждые 2 недели до тех пор, пока вы не отмените подписку в настройках. Узнайте больше о политике отмены и возврата в <policyLink>", "subscription_policy": "Вы оформляете подписку на 1 неделю. Продолжая, вы соглашаетесь с тем, что если не отмените свою подписку до конца <trialDuration>-дневного пробного периода за <trialPrice>, то с вас автоматически будет списываться <price> каждую неделю до тех пор, пока вы не отмените подписку в настройках. Узнайте больше о политике отмены и возврата в <policyLink>",
"your_reading": "Ваш прогноз", "your_reading": "Ваш прогноз",
"content": "Содержание", "content": "Содержание",
"content_list": { "content_list": {

4
public/locales/v1/ru/male_ru.json
View File

@ -543,10 +543,10 @@
"special_offer": "Специальное предложение", "special_offer": "Специальное предложение",
"title": "Персонализированный прогноз за <price>", "title": "Персонализированный прогноз за <price>",
"total_today": "Всего сегодня", "total_today": "Всего сегодня",
"cost": "Ваша стоимость за 2 недели после пробного периода" "cost": "Ваша стоимость за 1 неделю после пробного периода"
}, },
"policy_link": "Политика подписки", "policy_link": "Политика подписки",
"subscription_policy": "Вы подписываетесь на 2-недельную подписку. Продолжая, вы соглашаетесь с тем, что если не отмените подписку до конца <trialDuration>-дневного пробного периода за <trialPrice>, с вас автоматически будет списываться <price> каждые 2 недели до тех пор, пока вы не отмените подписку в настройках. Узнайте больше о политике отмены и возврата в <policyLink>", "subscription_policy": "Вы подписываетесь на 1-недельную подписку. Продолжая, вы соглашаетесь с тем, что если не отмените подписку до конца <trialDuration>-дневного пробного периода за <trialPrice>, с вас автоматически будет списываться <price> каждую неделю до тех пор, пока вы не отмените подписку в настройках. Узнайте больше о политике отмены и возврата в <policyLink>",
"your_reading": "Ваш прогноз", "your_reading": "Ваш прогноз",
"content": "Содержание", "content": "Содержание",
"content_list": { "content_list": {

4
src/api/resources/Paywall.ts
View File

@ -15,7 +15,8 @@ export enum EPlacementKeys {
"aura.placement.redesign.main" = "aura.placement.redesign.main", "aura.placement.redesign.main" = "aura.placement.redesign.main",
"aura.placement.email.marketing" = "aura.placement.email.marketing", "aura.placement.email.marketing" = "aura.placement.email.marketing",
"aura.placement.secret.discount" = "aura.placement.secret.discount", "aura.placement.secret.discount" = "aura.placement.secret.discount",
"aura.placement.palmistry.main" = "aura.placement.palmistry.main" "aura.placement.palmistry.main" = "aura.placement.palmistry.main",
"aura.placement.palmistry.redesign" = "aura.placement.palmistry.redesign"
} }
export interface ResponseGetSuccess { export interface ResponseGetSuccess {
@ -55,6 +56,7 @@ export interface IPaywallProduct {
trialDuration: number; trialDuration: number;
trialPrice: number; trialPrice: number;
trialPriceId: string; trialPriceId: string;
currency?: string;
} }
interface IPaywallProperties { interface IPaywallProperties {

3
src/api/resources/User.ts
View File

@ -136,7 +136,8 @@ export enum ESourceAuthorization {
"aura.palmistry" = "aura.palmistry", "aura.palmistry" = "aura.palmistry",
"aura.chat" = "aura.chat", "aura.chat" = "aura.chat",
"aura.moons" = "aura.moons", "aura.moons" = "aura.moons",
"aura.main.new" = "aura.main.new" "aura.main.new" = "aura.main.new",
"aura.palmistry.new" = "aura.palmistry.new"
} }
export enum EGender { export enum EGender {

4
src/components/PalmistryV1/components/PaymentModal/index.tsx
View File

@ -39,7 +39,9 @@ function PaymentModal(props: HTMLAttributes<HTMLDivElement>) {
setHeight={setHeight} setHeight={setHeight}
activeProduct={activeProductFromStore} activeProduct={activeProductFromStore}
returnUrl={returnUrl} returnUrl={returnUrl}
placementKey={EPlacementKeys["aura.placement.palmistry.main"]} placementKey={
EPlacementKeys["aura.placement.palmistry.redesign"]
}
/> />
)} )}

2
src/components/PalmistryV1/pages/Email/index.tsx
View File

@ -54,7 +54,7 @@ function Email() {
const authorize = async () => { const authorize = async () => {
metricService.reachGoal(EGoals.LEAD, [EMetrics.FACEBOOK]); metricService.reachGoal(EGoals.LEAD, [EMetrics.FACEBOOK]);
await authorization(email, ESourceAuthorization["aura.palmistry"]); await authorization(email, ESourceAuthorization["aura.palmistry.new"]);
}; };
useEffect(() => { useEffect(() => {

2
src/components/PalmistryV1/pages/Payment/index.tsx
View File

@ -32,7 +32,7 @@ function Payment() {
useEffect(() => { useEffect(() => {
if (subscriptionStatus !== "subscribed") return; if (subscriptionStatus !== "subscribed") return;
const timer = setTimeout(() => { const timer = setTimeout(() => {
navigate(routes.client.palmistryDiscount()); navigate(routes.client.skipTrial());
}, 1500); }, 1500);
return () => clearTimeout(timer); return () => clearTimeout(timer);
}, [navigate, subscriptionStatus]); }, [navigate, subscriptionStatus]);

2
src/components/PalmistryV1/pages/TrialChoice/index.tsx
View File

@ -19,7 +19,7 @@ function TrialChoice() {
const navigate = useNavigate(); const navigate = useNavigate();
const dispatch = useDispatch(); const dispatch = useDispatch();
const { products, isLoading, currency, getText } = usePaywall({ const { products, isLoading, currency, getText } = usePaywall({
placementKey: EPlacementKeys["aura.placement.palmistry.main"], placementKey: EPlacementKeys["aura.placement.palmistry.redesign"],
localesPlacement: ELocalesPlacement.V1, localesPlacement: ELocalesPlacement.V1,
}); });

2
src/components/palmistry/palmistry-container/palmistry-container.css
View File

@ -424,7 +424,7 @@
max-width: 400px; max-width: 400px;
min-width: 250px; min-width: 250px;
outline: none; outline: none;
padding: 12px 12px 5px; padding: 12px 12px 15px;
transition: border-color 0.3s ease; transition: border-color 0.3s ease;
width: 100%; width: 100%;
} }

95
src/hooks/paywall/defaultPaywalls.ts
View File

@ -512,5 +512,100 @@ export const defaultPaywalls: { [key in EPlacementKeys]: IPaywall } = {
"_id": "664542bbfe0a8eb4ee0b4f29" "_id": "664542bbfe0a8eb4ee0b4f29"
} }
] ]
},
"aura.placement.palmistry.redesign": {
"_id": "66565a0ee4ad13456f7d0079",
"key": "aura.paywall.palmistry.main",
"name": "Palmistry Redesign",
"properties": [
{
"key": "text.0",
"value": "We've helped millions of people to\nreveal the destiny of their love life\nand what the future holds for them\nand their families.",
"_id": "664542bbfe0a8eb4ee0b4f27"
},
{
"key": "text.1",
"value": "It costs us $13.21 to compensate our AURA\nemployees for the trial, but please choose the\namount you are comfortable with.",
"_id": "664542bbfe0a8eb4ee0b4f29"
}
],
"products": [
{
"_id": "65ff043dfc0fcfc4be550035",
"key": "compatibility.pdf.trial.0",
"productId": "prod_PnStTEBzrPLgvL",
"name": "Сompatibility AURA | Trial $0.99",
"priceId": "price_1PpFiwIlX4lgwUxruq9bpp0j",
"type": "subscription",
"description": "Description",
"discountPrice": null,
"discountPriceId": null,
"isDiscount": false,
"isFreeTrial": false,
"isTrial": true,
"price": 1900,
"trialDuration": 7,
"trialPrice": 99,
"trialPriceId": "price_1PpFoNIlX4lgwUxrP4l0lbE5",
"currency": "usd"
},
{
"_id": "66420b6e859ff1199d3a6e88",
"key": "compatibility.pdf.trial.1",
"productId": "prod_PnStTEBzrPLgvL",
"name": "Сompatibility AURA | Trial $5.00",
"priceId": "price_1PpFiwIlX4lgwUxruq9bpp0j",
"type": "subscription",
"description": "Description",
"discountPrice": null,
"discountPriceId": null,
"isDiscount": false,
"isFreeTrial": false,
"isTrial": true,
"price": 1900,
"trialDuration": 7,
"trialPrice": 500,
"trialPriceId": "price_1PpFpMIlX4lgwUxrKX7uwKMa",
"currency": "usd"
},
{
"_id": "66420be1859ff1199d3a6e89",
"key": "compatibility.pdf.trial.2",
"productId": "prod_PnStTEBzrPLgvL",
"name": "Сompatibility AURA | Trial $9.00",
"priceId": "price_1PpFiwIlX4lgwUxruq9bpp0j",
"type": "subscription",
"description": "Description",
"discountPrice": null,
"discountPriceId": null,
"isDiscount": false,
"isFreeTrial": false,
"isTrial": true,
"price": 1900,
"trialDuration": 7,
"trialPrice": 900,
"trialPriceId": "price_1PpFpiIlX4lgwUxrGp2qwZph",
"currency": "usd"
},
{
"_id": "66420c1c859ff1199d3a6e8a",
"key": "compatibility.pdf.trial.3",
"productId": "prod_PnStTEBzrPLgvL",
"name": "Сompatibility AURA | Trial $13.76",
"priceId": "price_1PpFiwIlX4lgwUxruq9bpp0j",
"type": "subscription",
"description": "Description",
"discountPrice": null,
"discountPriceId": null,
"isDiscount": false,
"isFreeTrial": false,
"isTrial": true,
"price": 1900,
"trialDuration": 7,
"trialPrice": 1200,
"trialPriceId": "price_1PqzysIlX4lgwUxrai849j9H",
"currency": "usd"
}
]
} }
} }

4
src/store/paywalls.ts
View File

@ -23,13 +23,15 @@ const initialState: TPaywalls = {
"aura.placement.email.marketing": null, "aura.placement.email.marketing": null,
"aura.placement.secret.discount": null, "aura.placement.secret.discount": null,
"aura.placement.palmistry.main": null, "aura.placement.palmistry.main": null,
"aura.placement.palmistry.redesign": null,
isMustUpdate: { isMustUpdate: {
"aura.placement.v1.mike": true, "aura.placement.v1.mike": true,
"aura.placement.main": true, "aura.placement.main": true,
"aura.placement.redesign.main": true, "aura.placement.redesign.main": true,
"aura.placement.email.marketing": true, "aura.placement.email.marketing": true,
"aura.placement.secret.discount": true, "aura.placement.secret.discount": true,
"aura.placement.palmistry.main": true "aura.placement.palmistry.main": true,
"aura.placement.palmistry.redesign": true,
}, },
} }