Commit Graph

450 Commits

Author SHA1 Message Date
yury
5ca0a636cc feat: Change payment window on palmistry/payment 2024-06-25 04:24:52 +03:00
ead30aa974 onboarding-edits
change loader
2024-06-25 03:52:21 +04:00
966716fd61 play-pause-yandex-triggers
add triggers to play/pause control
2024-06-25 02:39:31 +04:00
Денис Катаев
8499eef3c2 Merge branch 'develop' into 'hide-lotti-from-yandex'
# Conflicts:
#   src/components/pages/ABDesign/v1/pages/TrialPayment/components/PersonalVideo/index.tsx
2024-06-24 22:34:23 +00:00
98702c8fcf hide-lottie-from-yandex
hide lottie from webvisor, add reachGoals
2024-06-25 02:23:56 +04:00
0bdcd91b8d play-pause-button
add play/pause control to personal video
2024-06-25 01:41:53 +04:00
c7a4e545d0 fix blur button 2024-06-24 22:19:22 +04:00
005b44324a AW-119-personal-video-edits
add video preview and change loading on /v1/onboarding page
2024-06-24 18:29:36 +04:00
1430b67f31 AW-119-personal-video
show generated personal video on /v1/trial-payment page
2024-06-24 17:06:52 +04:00
yury
386798682a feat: fix button width 2024-06-22 11:15:46 +03:00
yury
53ea9ae8e0 feat: add blur only one page 2024-06-22 10:58:33 +03:00
yury
175f75f068 feat: fix blur 2024-06-22 05:06:32 +03:00
yury
fb864abe80 feat: fix blur 2024-06-22 05:01:43 +03:00
yury
101b451a38 feat: fix blur 2024-06-22 04:52:46 +03:00
yury
aebd1cf0e8 feat: fix blur size 2024-06-22 02:12:29 +03:00
yury
5568539ee4 feat: Add Blur component and add blur on page v1/questionnaire/relationships/currentlyAffecting 2024-06-22 00:03:54 +03:00
7ea45de6a2 AW-115-lottie-optimization-edits
preload, fix height animation container
2024-06-21 05:43:36 +04:00
959f42dfbe AW-115-lottie-optimization
using @lottiefiles/dotlottie-react , preload animations, save animations to indexedDB
2024-06-21 03:34:21 +04:00
Денис Катаев
8c9afc4aeb AW-114-payment-preloading 2024-06-17 23:01:46 +00:00
Денис Катаев
e200667823 AW-105-palmistry-points-edits 2024-06-17 22:17:26 +00:00
Daniil Chemerkin
524de968e6 Merge branch 'AW-105-palmistry-points' into 'develop'
AW-105-palmistry-points

See merge request witapp/aura-webapp!183
2024-06-17 21:34:26 +00:00
Денис Катаев
d38ee696d1 AW-105-palmistry-points 2024-06-17 21:34:26 +00:00
Daniil Chemerkin
6a965cd1ef Merge branch 'AW-111-auth-bug' into 'develop'
AW-111-auth-bug

See merge request witapp/aura-webapp!182
2024-06-17 21:34:17 +00:00
Денис Катаев
7a77e3f059 AW-111-auth-bug 2024-06-17 21:34:17 +00:00
Daniil Chemerkin
5d92220adc Revert "Merge branch 'AW-103-lottie' into 'develop'" 2024-06-17 21:34:01 +00:00
Денис Катаев
27e989d784 AW-103-lottie 2024-06-16 23:11:48 +00:00
Денис Катаев
f3a60806ed AW-112-google-pay-bug 2024-06-16 17:58:36 +00:00
dev.daminik00
b318eaf7bc change "" to `` 2024-06-14 23:46:11 +02:00
Daniil Chemerkin
bafd8cda00 Develop 2024-06-13 00:59:26 +00:00
Daniil Chemerkin
306204f126 Develop 2024-06-06 23:15:42 +00:00
Daniil Chemerkin
7946e9ffb2 Merge branch 'AW-97-yandex-metric-optimization' into 'develop'
AW-97-yandex-metric-optimization

See merge request witapp/aura-webapp!163
2024-06-03 16:59:51 +00:00
Денис Катаев
663b887a04 AW-97-yandex-metric-optimization 2024-06-03 16:59:51 +00:00
Денис Катаев
7b25d989a4 AW-98-parameters-new-payment 2024-06-03 16:59:41 +00:00
Денис Катаев
ea4ed6e4d6 AW-92-trial-payment-page-v1 2024-06-02 00:06:12 +00:00
Денис Катаев
3c271ab42c AW-91-bug-video-background 2024-06-01 23:44:29 +00:00
Денис Катаев
8a601b03c1 AW-90-bug-payment-discount-page 2024-06-01 23:28:46 +00:00
Денис Катаев
9c3c5b14d3 edits 2024-06-01 22:39:58 +00:00
dev.daminik00
c66b6410b1 update images 2024-06-01 02:11:43 +02:00
dev.daminik00
94dbeea433 Merge branch 'refs/heads/main' into develop
# Conflicts:
#	index.html
#	src/components/pages/ABDesign/v1/pages/TrialPayment/components/PaymentModal/index.tsx
#	src/components/pages/PaymentWithEmailPage/index.tsx
#	src/components/pages/TrialPayment/components/PaymentModal/index.tsx
2024-06-01 00:40:02 +02:00
Daniil Chemerkin
eceea48644 Merge branch 'new-images-compatibility' into 'develop'
new-images-compatibility

See merge request witapp/aura-webapp!150
2024-05-31 10:06:38 +00:00
Денис Катаев
872fe16511 new-images-compatibility 2024-05-31 10:06:38 +00:00
Daniil Chemerkin
fcb60fc459 Merge branch 'new-payment-method' into 'develop'
new-payment-method

See merge request witapp/aura-webapp!149
2024-05-31 10:06:28 +00:00
Денис Катаев
8992ed788c new-payment-method 2024-05-31 10:06:28 +00:00
Денис Катаев
e6018dedb4 metric-data-gender 2024-05-31 10:06:18 +00:00
Денис Катаев
fb26f56598 hotfix-yandex-metric-loading 2024-05-28 04:39:03 +00:00
Денис Катаев
a64c98914a images-zodiacSigns-leo 2024-05-27 22:21:53 +00:00
Daniil Chemerkin
f06bb85bae Merge branch 'AW-82-singlePaymentProductsBugDev' into 'develop'
AW-82-singlePaymentProductsBugDev

See merge request witapp/aura-webapp!145
2024-05-27 20:43:52 +00:00
Денис Катаев
44afa048a8 AW-82-singlePaymentProductsBugDev 2024-05-27 20:43:52 +00:00
Денис Катаев
3ee9e0fe90 AW-84-AW-85-defaultContent-loadContent 2024-05-27 20:43:33 +00:00
Денис Катаев
5f8bf9aeb2 hotfix-yandex-metric-2 2024-05-21 11:12:55 +00:00
Денис Катаев
ff9fce9483 AW-79-AW-80-AW-81-newPaymentMethod-Placement 2024-05-20 14:24:53 +00:00
32534bbb14 hotfix-returnUrl 2024-05-19 00:07:54 +04:00
Daniil Chemerkin
8dea221cc3 Develop 2024-05-17 16:29:26 +00:00
a8e26611d3 Merge branch 'main' of https://gitlab.com/witapp/aura-webapp into develop 2024-05-17 20:25:28 +04:00
Денис Катаев
e0adecbbc0 trello-edits 2024-05-16 08:23:03 +00:00
Daniil Chemerkin
63cd2e5798 Develop 2024-05-14 22:59:10 +00:00
Денис Катаев
e1fdd45ecd develop-genderDataSeparation 2024-05-14 20:44:53 +00:00
Daniil Chemerkin
e8bec3ceef redesignAB 2024-05-14 20:18:56 +00:00
Daniil Chemerkin
f36c9a7fc7 Develop 2024-05-10 20:09:11 +00:00
Денис Катаев
ac876a67ed AW-70-paymentResultPage 2024-05-10 20:05:43 +00:00
Daniil Chemerkin
c9a6f71b82 Develop 2024-05-06 21:42:06 +00:00
Daniil Chemerkin
b7c35f824d Merge branch 'AW-69-additional-purchases' into 'develop'
AW-69-additional-purchases

See merge request witapp/aura-webapp!121
2024-05-06 19:48:45 +00:00
Денис Катаев
f3abf257db AW-69-additional-purchases 2024-05-06 19:48:45 +00:00
Денис Катаев
f22bd2cbea AW-68-userIdYandexMetric 2024-05-06 19:48:29 +00:00
dev.daminik00
1f51ec4ec2 update stripe trial 2024-05-05 00:55:20 +02:00
dev.daminik00
72426a65de update stripe trial 2024-05-05 00:49:08 +02:00
Daniil Chemerkin
845725f9f3 Merge branch 'AW-58-newJWTTokenMethod' into 'develop'
AW-58-newJWTTokenMethod

See merge request witapp/aura-webapp!117
2024-05-04 20:11:35 +00:00
Денис Катаев
3a87ee5c93 AW-58-newJWTTokenMethod 2024-05-04 20:11:35 +00:00
Денис Катаев
2d7be6a578 AW-51-newAuthentication 2024-05-04 20:11:24 +00:00
Daniil Chemerkin
57eb7ab913 Merge branch 'AW-47-duplicateSubscriptionPlans' into 'develop'
AW-47-duplicateSubscriptionPlans

See merge request witapp/aura-webapp!108
2024-04-25 14:35:22 +00:00
Денис Катаев
0920d84843 AW-47-duplicateSubscriptionPlans 2024-04-25 14:35:22 +00:00
Денис Катаев
b51fc34b7f AW-46-changePaymentForm 2024-04-25 14:35:13 +00:00
Денис Катаев
38e1779cf6 AW-45-deletePayPal 2024-04-24 14:53:38 +00:00
Денис Катаев
b5ab8415ac AW-42-UTMParameters 2024-04-22 22:46:11 +00:00
Денис Катаев
f7af37c861 AW-41-addFreeTrial 2024-04-22 22:20:54 +00:00
Денис Катаев
fc21cc90b0 AW-31-addEnvVariables 2024-04-22 17:35:23 +00:00
Денис Катаев
b5aabf16cc AW-22-deleteChargebee 2024-04-19 16:30:40 +00:00
Денис Катаев
74d76a17e2 AW-28-displayPaymentErrors 2024-04-18 21:54:57 +00:00
Денис Катаев
d590d157f3 AW-6-changeCameraSize-cameraButton 2024-04-18 19:56:00 +00:00
Daniil Chemerkin
daec6325b6 Merge branch 'main' into 'develop'
# Conflicts:
#   src/components/App/index.tsx
#   src/components/BirthdayPage/index.tsx
#   src/components/pages/BirthPlacePage/index.tsx
#   src/routes.ts
2024-04-17 23:29:42 +00:00
e1e506312c fix short path 2024-04-18 00:10:16 +04:00
11c3091269 fix ShortPathOutlet 2024-04-16 23:51:28 +04:00
782dd0fb51 fix always reload payment page 2024-04-16 22:49:07 +04:00
Daniil Chemerkin
c9b737a660 Develop 2024-04-16 17:51:32 +00:00
578c7486d0 fix build 2024-04-16 21:15:57 +04:00
Daniil Chemerkin
f1254d9c2e Develop 2024-04-16 16:58:07 +00:00
Денис Катаев
1ec7135014 Merge branch 'main' into 'develop'
# Conflicts:
#   src/components/App/index.tsx
#   src/components/pages/AdditionalPurchases/pages/AddConsultation/index.tsx
#   src/components/pages/AdditionalPurchases/pages/AddReport/index.tsx
#   src/components/pages/AdditionalPurchases/pages/UnlimitedReadings/index.tsx
#   src/components/pages/Gender/index.tsx
#   src/components/pages/PaymentWithEmailPage/index.tsx
#   src/routes.ts
#   src/services/singlePayment/index.ts
2024-04-16 06:18:30 +00:00
200541f74e fix path bug 2024-04-15 22:55:00 +04:00
ca758e2dfa remove request to hint and remove upload from device 2024-04-15 21:33:16 +04:00
d0bbb296b7 fix: force parameter 2024-04-15 20:39:13 +04:00
95628ba2cf add lines drawing 2024-04-15 19:36:18 +04:00
Денис Катаев
e9afdd802d Epe short path 2024-04-12 22:52:44 +00:00
Денис Катаев
1095ab5d29 Epe short path 2024-04-11 15:54:10 +00:00
1ecd01b518 add jwtToken to epe short path 2024-04-10 00:32:29 +04:00
Денис Катаев
4667e066e0 Preview/advisor short path 2024-04-09 19:19:05 +00:00
Денис Катаев
ef239432d5 add short path for advisor chat 2024-04-09 16:46:50 +00:00
Денис Катаев
73380e0883 Preview/advisors 2024-04-06 20:40:38 +00:00
Денис Катаев
25022ab387 Fix/api host 2024-04-05 20:00:57 +00:00
Daniil Chemerkin
a3b215d6e3 Merge branch 'fix/apiHost' into 'develop'
change api host

See merge request witapp/aura-webapp!73
2024-04-05 19:59:15 +00:00
fbd99cf3c9 change api host 2024-04-05 23:56:05 +04:00
e2a230af88 add key of product 2024-04-05 18:42:11 +04:00
Daniil Chemerkin
2ee80ee89f Develop 2024-04-03 16:49:24 +00:00
Денис Катаев
f088690aa5 Preview/additional purchases 2024-04-03 11:17:58 +00:00
Daniil Chemerkin
6f01a0abea Revert "Merge branch 'preview/additional-purchases' into 'develop'" 2024-04-03 00:03:25 +00:00
Денис Катаев
abf1deee48 feat: add payment, add test page with background video 2024-04-02 23:53:44 +00:00
Денис Катаев
078ccc920e Revert "fix: remove double image key and update filter of subscription plans" 2024-04-02 23:46:48 +00:00
Daniil Chemerkin
000f28190b Develop 2024-04-02 22:03:16 +00:00
Денис Катаев
4a14459cf0 Revert "fix: remove double image key and update filter of subscription plans" 2024-03-27 19:20:25 +00:00
Денис Катаев
238160d610 Preview/advisors 2024-03-27 18:49:58 +00:00
Евгений Пономарев
14dcd3b057 Palmistry discount page 2024-03-25 23:09:06 +00:00
2b5ebed85e fix: merge conflict 2024-03-25 01:32:46 +04:00
Евгений Пономарев
974453cb74 Payment on palmistry/discount page 2024-03-24 21:14:13 +00:00
Денис Катаев
6fbc1c3a21 Revert "fix: remove double image key and update filter of subscription plans" 2024-03-24 21:01:16 +00:00
Victor Ershov
5bd1896465 Merge branch 'hotfix/subPlans' into 'develop'
fix: remove double image key, filter subscription plans

See merge request witapp/aura-webapp!58
2024-03-22 19:59:11 +00:00
Victor Ershov
4c03ec7b61 Merge branch 'hotfix/subPlans' into 'main'
fix: remove double image key, filter subscription plans

See merge request witapp/aura-webapp!57
2024-03-22 19:58:52 +00:00
4deed550cd fix: remove double image key, filter subscription plans 2024-03-22 23:45:25 +04:00
Евгений Пономарев
21de1c6322 Palmistry 2024-03-22 00:28:03 +00:00
Victor Ershov
fa952a75e8 Merge branch 'hotfix/discount-text' into 'develop'
fix: text on discount page

See merge request witapp/aura-webapp!55
2024-03-21 23:03:46 +00:00
3c944745ba fix: text on discount page 2024-03-22 02:26:14 +04:00
Evgenij Ponomarev
99ace176e4 Add new screens in palmistry 2024-03-20 00:59:03 +03:00
Evgenij Ponomarev
d6022cd880 Update birthdate in store 2024-03-12 03:02:50 +07:00
Evgenij Ponomarev
544f26f019 Redirect to home if subscribed 2024-03-12 02:28:51 +07:00
Evgenij Ponomarev
c72e1e9e39 Improve work with subscription plans 2024-03-12 01:10:58 +07:00
Evgenij Ponomarev
28bf5f4778 Fix photo modal 2024-03-11 03:14:04 +07:00
Evgenij Ponomarev
b547d0d51d Fix payment page 2024-03-11 02:44:19 +07:00
Evgenij Ponomarev
40adddb432 Fix build errors 2024-03-11 02:19:05 +07:00
Evgenij Ponomarev
ee47242834 Fix hasNoHeader function 2024-03-11 02:08:20 +07:00
Evgenij Ponomarev
3af1919ef7 Complete palmistry transition 2024-03-11 02:08:19 +07:00
Денис Катаев
866f798117 Preview/additional purchases 2024-03-10 18:30:49 +00:00
Денис Катаев
3aee33898c Preview/discount pages 2024-02-29 15:44:41 +00:00
Денис Катаев
733561a56c Preview/discount pages 2024-02-28 19:18:22 +00:00
Денис Катаев
737cda9770 Preview/discount pages 2024-02-24 01:29:01 +00:00
Денис Катаев
23e674ca78 Preview/discount pages 2024-02-21 21:15:03 +00:00
Денис Катаев
ca220dfdf7 Preview/discount pages 2024-02-21 06:24:50 +00:00
Денис Катаев
e99343a17d Preview/discount pages 2024-02-19 07:00:07 +00:00
Денис Катаев
08b4113c09 Preview/discount pages 2024-02-18 16:54:33 +00:00
Денис Катаев
a46b3a812d Preview/discount pages 2024-02-17 23:29:48 +00:00
Денис Катаев
339ec70766 Preview/discount pages 2024-02-16 14:36:03 +00:00
Денис Катаев
ee71102bad Preview/discount pages 2024-02-14 06:42:15 +00:00
Денис Катаев
a6ea20283d Preview/discount pages 2024-02-13 22:23:12 +00:00
Денис Катаев
fae4569c4f Preview/discount pages 2024-02-11 05:44:06 +00:00
Денис Катаев
1ccc5aa835 Preview/discount pages 2024-02-10 02:30:02 +00:00
Денис Катаев
88f971e88c feat: add yandex metric, smartlook manage 2024-02-07 22:43:54 +00:00
Денис Катаев
6aa8db35d4 feat: add information with partner on trial payment page 2024-02-07 18:04:49 +00:00
Денис Катаев
1028742891 feat: add react-ga4 2024-02-04 23:42:08 +00:00
Денис Катаев
e8b28cd54a feat: add google tag manager 2024-02-04 20:22:53 +00:00
Денис Катаев
8ea2886cf5 fix: subscription route protected 2024-02-04 19:21:23 +00:00
Денис Катаев
2ab0e08918 fix: days of trial period 2024-02-04 17:53:55 +00:00
Денис Катаев
ce1e853f68 feat: some edits 2024-02-04 01:09:49 +00:00
Денис Катаев
cbe40bc7b2 fix: change api url 2024-01-31 19:22:29 +00:00
Денис Катаев
2d6144f0fb feat: some edits 2024-01-31 18:49:27 +00:00
Денис Катаев
415d9c4d7b feat: add and change pages after questionnaire path 2024-01-30 17:59:31 +00:00
Денис Катаев
3520f9f181 fix: payment status 2024-01-23 18:27:22 +00:00
Денис Катаев
037e1078ec feat: questionnaire 2024-01-23 00:15:05 +00:00
Денис Катаев
3c381c9ab9 Questionnaire 2024-01-16 23:32:02 +00:00
c086b6cf3b fix: remove commit 2023-12-31 04:49:54 +04:00
Денис Катаев
37833a888f Questionnaire 2023-12-31 00:33:55 +00:00
Денис Катаев
e9e35f81d3 feat: add modal with required data 2023-12-21 23:21:51 +00:00
Денис Катаев
0f3e376484 fix: paymentRequest 2023-12-21 04:06:33 +00:00
Денис Катаев
d9d8d54dba fix: ref subscription url 2023-12-19 04:00:53 +00:00
Денис Катаев
ac08b62ca2 fix: fix build 2023-12-18 22:23:12 +00:00
Денис Катаев
19d5fa3430 fix: fix double request 2023-12-17 20:48:57 +00:00
Денис Катаев
59783fb846 fix: add timeout createSubscriptionReceipt stripe 2023-12-15 18:45:21 +00:00
Денис Катаев
829f9882b0 fix: payPal redirect 2023-12-15 17:33:50 +00:00
Денис Катаев
99c61bdce9 feat: add payPal button 2023-12-14 21:22:46 +00:00
Денис Катаев
bf8dfd046b feat: add yandex metric, smartlook manage, add payment buttons 2023-12-12 17:28:36 +00:00
Денис Катаев
1db2ca1151 feat: add yandex metric, smartlook manage 2023-12-08 02:25:53 +00:00
Денис Катаев
dbc6ecdcc8 Clone 2023-12-06 02:12:25 +00:00
Денис Катаев
71d1be6416 Clone 2023-12-04 21:08:23 +00:00
Денис Катаев
a6f0750c66 Clone 2023-12-04 20:02:21 +00:00
Денис Катаев
6dc257dfe0 Clone 2023-12-04 19:23:35 +00:00
Денис Катаев
2b1b29566d Draft: Clone 2023-12-02 20:39:29 +00:00
2898fe7960 feat: remove cross button 2023-12-02 22:40:14 +04:00
65e57e42b8 fix: fix build 2023-12-02 01:39:47 +04:00
490bf6f8da feat: changed the order of the pages add auth form to subscription page 2023-12-02 01:38:30 +04:00
ea93569c03 fix: edits 2023-11-26 03:00:26 +04:00
e8cc034e92 fix: edits 2023-11-26 02:59:15 +04:00
2a59a7e597 feat: add EnergyVampirism, MoonPhaseTracker, NameHoroscope, PredictionMoon, Thermal, WallpapersZodiacSign, 2023-11-26 02:48:31 +04:00
bb815df7f7 fix: fix build 2023-11-24 05:27:58 +04:00
16d79d3f3a feat: add besties horoscope result page 2023-11-24 05:25:42 +04:00
0f6f8f7e72 feat: add magic ball page and home button, add besties horoscope slider 2023-11-23 06:05:52 +04:00
f90d66f3ba fix: fix build 2023-11-22 02:20:46 +04:00
a7d5ccff43 feat: add magic ball page 2023-11-22 02:16:45 +04:00
Bega Jumayev
c6fe5b4ff1 Draft: Preview stripe payment 2023-11-21 03:13:30 +00:00
Begmuhommet
44180711be 🚑 Fix bug with stripe payment 2023-11-19 10:58:56 +08:00
Anton
0958401b3b Probably fixes losing query params when deployed via Amplify. 2023-11-17 00:56:30 +03:00
f355ff391c feat: add information of subscription plan on stripe page, fix private bug 2023-11-16 05:00:46 +04:00
8db05c3fd4 feat: add authorization with apple and google, add payment systems, minor edits, fixed bugs 2023-11-16 02:29:49 +04:00
5b856aea74 fix: modal styles 2023-10-26 23:13:40 +04:00
1fc35e973d feat: add success and fail payment pages, fix payment system 2023-10-22 04:16:48 +04:00
237dec5681 fix: build error 2023-10-19 03:15:35 +04:00
3d1361b57f feat: add stripe payment 2023-10-19 03:10:27 +04:00
196cdb614b fix: image resolution finger 2023-10-16 20:14:36 +04:00
b9ff3a1ab8 fix: compatibility onboarding, payment method page text 2023-10-16 18:18:33 +04:00
8860ca943f fix: build error 2023-10-11 01:45:49 +04:00
7ce001cc8f fix: breath page, onboarding compatibility, create profile items size, home page 2023-10-11 01:44:21 +04:00
a27b79e0eb fix: fix error store and edits 2023-10-06 21:20:21 +04:00
844d5d1295 feat: navbar onboarding, add blur name input from done button on compatibility page, fix cross button on compatibility page, add menu button to home page, replace download button moon page, fix percents 2023-10-06 00:34:38 +04:00
2fc26aceb0 feat: onboarding home and compatibility pages 2023-10-04 01:51:12 +04:00
73a9da6a4e feat: background blur compatibility, subscription page text from translation v2 2023-09-29 23:27:57 +04:00