From 9ce9a9003154535abc24078dcf135ac5abce6324 Mon Sep 17 00:00:00 2001 From: gofnnp Date: Tue, 15 Aug 2023 01:04:37 +0400 Subject: [PATCH] feat: change text on free period info page, fixed touch screen, add animation for Aura on create profile page --- src/components/CreateProfilePage/index.tsx | 2 + .../CreateProfilePage/styles.module.css | 71 ++++++++++++++++++- src/components/FreePeriodInfoPage/index.tsx | 5 +- .../FreePeriodInfoPage/styles.module.css | 31 +++++--- src/components/Header/styles.css | 6 ++ src/index.css | 4 ++ src/locales/dev.ts | 2 +- 7 files changed, 105 insertions(+), 16 deletions(-) diff --git a/src/components/CreateProfilePage/index.tsx b/src/components/CreateProfilePage/index.tsx index be19946..2821880 100644 --- a/src/components/CreateProfilePage/index.tsx +++ b/src/components/CreateProfilePage/index.tsx @@ -26,6 +26,7 @@ function CreateProfilePage(): JSX.Element { return (
+
diff --git a/src/components/CreateProfilePage/styles.module.css b/src/components/CreateProfilePage/styles.module.css index e79ba63..582eb62 100644 --- a/src/components/CreateProfilePage/styles.module.css +++ b/src/components/CreateProfilePage/styles.module.css @@ -3,16 +3,33 @@ flex: auto !important; background-color: #000; color: #fff; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + -o-user-select: none; + user-select: none; } .progressbar { + position: relative; width: 100%; max-width: 250px; margin: 24px auto; - background-image: url('/goosebumps-aura.png'); +} + +.aura { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + + background-image: url("/goosebumps-aura.png"); background-size: 130%; background-repeat: no-repeat; background-position: center center; + animation: appearance 3s, pulse 1s alternate infinite; } .process-items { @@ -26,7 +43,7 @@ margin-bottom: 24px; line-height: 32px; position: relative; - transition: top .4s ease-in-out; + transition: top 0.4s ease-in-out; } .process-item__pick { @@ -41,3 +58,53 @@ .process-item__label { color: red; } + +.circular-progressbar { + animation: appearance-progressbar 3s; +} + + +@keyframes appearance { + 0% { + scale: .4; + } + + 33% { + scale: .6; + } + + 66% { + scale: .8; + } + + 100% { + scale: 1; + } +} + + +@keyframes pulse { + 0% { + transform: scale(0.9); + } + 50% { + opacity: 1; + } + 100% { + transform: scale(1.1); + } +} + +@keyframes appearance-progressbar { + 0% { + opacity: 0; + } + + 80% { + opacity: 0; + } + + 100% { + opacity: 1; + } +} \ No newline at end of file diff --git a/src/components/FreePeriodInfoPage/index.tsx b/src/components/FreePeriodInfoPage/index.tsx index afea2f7..03bd7f7 100644 --- a/src/components/FreePeriodInfoPage/index.tsx +++ b/src/components/FreePeriodInfoPage/index.tsx @@ -10,11 +10,10 @@ function FreePeriodInfoPage(): JSX.Element { const handleNext = () => navigate(routes.client.createProfile()) return ( -
+
- {t('free_period_info')} + {t('touch_screen')}
- {/* Aura */}
) } diff --git a/src/components/FreePeriodInfoPage/styles.module.css b/src/components/FreePeriodInfoPage/styles.module.css index 94f2839..b955cd2 100644 --- a/src/components/FreePeriodInfoPage/styles.module.css +++ b/src/components/FreePeriodInfoPage/styles.module.css @@ -1,14 +1,25 @@ .page { - background-color: #000; - height: calc(100vh - 50px); - flex: auto; - padding-top: 22%; - background-image: url('/goosebumps-aura-click-icon-animation.png'); - background-size: 100%; - background-position: center 0; - background-repeat: no-repeat; + background-color: #000; + height: calc(100vh - 50px); + flex: auto; + padding-top: 22%; + background-image: url("/goosebumps-aura-click-icon-animation.png"); + background-size: 100%; + background-position: center 0; + background-repeat: no-repeat; } .content { - text-align: center; -} \ No newline at end of file + text-align: center; +} + +.title { + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + -o-user-select: none; + user-select: none; + color: white; + font-weight: 500; +} diff --git a/src/components/Header/styles.css b/src/components/Header/styles.css index 5da34bc..38848d1 100644 --- a/src/components/Header/styles.css +++ b/src/components/Header/styles.css @@ -8,6 +8,12 @@ height: 50px; min-height: 50px; z-index: 1; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + -o-user-select: none; + user-select: none; } .header__title { diff --git a/src/index.css b/src/index.css index d107c1d..d794387 100644 --- a/src/index.css +++ b/src/index.css @@ -118,3 +118,7 @@ a,button,div,input,select,textarea { .ta-l { text-align: left; } + +.CircularProgressbar { + position: relative; +} diff --git a/src/locales/dev.ts b/src/locales/dev.ts index 1d1bbcf..23617b4 100644 --- a/src/locales/dev.ts +++ b/src/locales/dev.ts @@ -53,7 +53,7 @@ export default { zodiac_sign_info: "According to the study, 85% of people with your Zodiac sign, , experience financial difficulties due to a loss of sexual energy.", learn_about_my_energy: "Learn about my energy", skip_for_now: "Skip for now", - free_period_info: "You won't be charged until after your free trial. Cancel anytime.", + touch_screen: "Touch the screen", money_energy: "MONEY energy", sexual_energy: "SEXUAL energy", black_energy: "BLACK energy",