Merge branch 'develop' into 'main'

develop

See merge request witapp/aura-webapp!654
This commit is contained in:
Daniil Chemerkin 2025-03-02 18:23:56 +00:00
commit de74e1a261
2 changed files with 38 additions and 23 deletions

View File

@ -11,16 +11,16 @@ function WhatIncluded() {
<Title variant="h3" className={styles.title}> <Title variant="h3" className={styles.title}>
{translate("/trial-payment.what_included.title")} {translate("/trial-payment.what_included.title")}
</Title> </Title>
<div className={styles.row}> {/*<div className={styles.row}>*/}
<img src={`${compatibilityV3Prefix}/hand.svg`} alt="Hand" /> {/* <img src={`${compatibilityV3Prefix}/hand.svg`} alt="Hand" />*/}
<p className={styles.text}> {/* <p className={styles.text}>*/}
{translate("/trial-payment.what_included.point1", { {/* {translate("/trial-payment.what_included.point1", {*/}
bold: ( {/* bold: (*/}
<b>{translate("/trial-payment.what_included.point1_bold")}</b> {/* <b>{translate("/trial-payment.what_included.point1_bold")}</b>*/}
), {/* ),*/}
})} {/* })}*/}
</p> {/* </p>*/}
</div> {/*</div>*/}
<div className={styles.row}> <div className={styles.row}>
<img src={`${compatibilityV3Prefix}/1_1.svg`} alt="1 : 1" /> <img src={`${compatibilityV3Prefix}/1_1.svg`} alt="1 : 1" />
<p className={styles.text}> <p className={styles.text}>

View File

@ -2,9 +2,9 @@ import Title from "@/components/Title";
import AppNumberOne from "../../components/AppNumberOne"; import AppNumberOne from "../../components/AppNumberOne";
import Button from "../../components/Button"; import Button from "../../components/Button";
import styles from "./styles.module.scss"; import styles from "./styles.module.scss";
import HowWork from "../../components/HowWork"; // import HowWork from "../../components/HowWork";
import WhatIncluded from "../../components/WhatIncluded"; import WhatIncluded from "../../components/WhatIncluded";
import PalmsSayAbout from "../../components/PalmsSayAbout"; // import PalmsSayAbout from "../../components/PalmsSayAbout";
import Reviews from "../../components/Reviews"; import Reviews from "../../components/Reviews";
import { compatibilityV3Prefix } from "@/routes"; import { compatibilityV3Prefix } from "@/routes";
import Footer from "../../components/Footer"; import Footer from "../../components/Footer";
@ -18,7 +18,7 @@ import Header from "./components/Header";
import YourAccessCode from "./components/YourAccessCode"; import YourAccessCode from "./components/YourAccessCode";
import { images } from "../../data"; import { images } from "../../data";
import CopyCode from "./components/CopyCode"; import CopyCode from "./components/CopyCode";
import EnterCode from "./components/EnterCode"; // import EnterCode from "./components/EnterCode";
import { copyToClipboard } from "@/services/data"; import { copyToClipboard } from "@/services/data";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
import { selectors } from "@/store"; import { selectors } from "@/store";
@ -76,6 +76,9 @@ function TryApp() {
<> <>
<Header classNameContainer={isHeaderVisible ? styles.headerVisible : ""} onButtonClick={downloadApp} /> <Header classNameContainer={isHeaderVisible ? styles.headerVisible : ""} onButtonClick={downloadApp} />
<AppNumberOne /> <AppNumberOne />
<Title className={styles["information-title"]}>
{translate("/trial-payment.information-title")}
</Title>
{/* <PalmPhoto /> */} {/* <PalmPhoto /> */}
<div <div
className={`${styles["zodiac-images"]} ${relationshipStatus !== "single" ? styles["with-partner"] : ""}`} className={`${styles["zodiac-images"]} ${relationshipStatus !== "single" ? styles["with-partner"] : ""}`}
@ -143,34 +146,34 @@ function TryApp() {
<img src={images("apple-icon.png")} alt="Apple icon" /> <img src={images("apple-icon.png")} alt="Apple icon" />
{translate("/try-app.get_prediction_in_app")} {translate("/try-app.get_prediction_in_app")}
</Button> */} </Button> */}
<Title className={styles["how-work"]}> {/* <Title className={styles["how-work"]}>
{translate("/try-app.how_work.title")} {translate("/try-app.how_work.title")}
</Title> </Title>
<HowWork /> <HowWork /> */}
{/* <MoneyBackGuarantee /> */} {/* <MoneyBackGuarantee /> */}
{/* <EnterCode /> */} {/* <EnterCode /> */}
<Title variant="h2" className={styles.title} style={{ {/* <Title variant="h2" className={styles.title} style={{
fontSize: "26px" fontSize: "26px"
}}> }}>
{translate("/try-app.your_palm_reading_is_ready")} {translate("/try-app.your_palm_reading_is_ready")}
</Title> </Title>
<p className={styles.instructionPoint2}>{translate("/try-app.instruction_point_4")}</p> <p className={styles.instructionPoint2}>{translate("/try-app.instruction_point_4")}</p>
<CopyCode variant="black" /> <CopyCode variant="black" />
<p className={styles.instructionPoint2} style={{ marginTop: "24px" }}>{translate("/try-app.instruction_point_5")}</p> <p className={styles.instructionPoint2} style={{ marginTop: "24px" }}>{translate("/try-app.instruction_point_5")}</p> */}
{/* <Button className={styles["begin-trial"]} onClick={downloadApp}> {/* <Button className={styles["begin-trial"]} onClick={downloadApp}>
{translate("/try-app.get-my-reading-in-app")} {translate("/try-app.get-my-reading-in-app")}
</Button> */} </Button> */}
<Button className={styles.getPredictionInApp} onClick={downloadApp}> {/* <Button className={styles.getPredictionInApp} onClick={downloadApp}>
<img src={images("apple-icon.png")} alt="Apple icon" /> <img src={images("apple-icon.png")} alt="Apple icon" />
{translate("/try-app.get_prediction_in_app")} {translate("/try-app.get_prediction_in_app")}
</Button> </Button> */}
<WhatIncluded /> <WhatIncluded />
<PalmsSayAbout /> {/* <PalmsSayAbout /> */}
{/* <EnterCode /> {/* <EnterCode />
<Button className={styles["discover-more"]} onClick={downloadApp}> <Button className={styles["discover-more"]} onClick={downloadApp}>
{translate("/try-app.get-my-reading-in-app")} {translate("/try-app.get-my-reading-in-app")}
</Button> */} </Button> */}
<Title variant="h2" className={styles.title} style={{ {/* <Title variant="h2" className={styles.title} style={{
fontSize: "26px" fontSize: "26px"
}}> }}>
{translate("/try-app.your_palm_reading_is_ready")} {translate("/try-app.your_palm_reading_is_ready")}
@ -180,16 +183,28 @@ function TryApp() {
<p className={styles.instructionPoint2} style={{ marginTop: "24px" }}>{translate("/try-app.instruction_point_5")}</p> <p className={styles.instructionPoint2} style={{ marginTop: "24px" }}>{translate("/try-app.instruction_point_5")}</p>
<Button className={styles["begin-trial"]} onClick={downloadApp}> <Button className={styles["begin-trial"]} onClick={downloadApp}>
{translate("/try-app.get-my-reading-in-app")} {translate("/try-app.get-my-reading-in-app")}
</Button> </Button> */}
<Title className={styles["why-love"]}> <Title className={styles["why-love"]}>
{translate("/try-app.why_love", { {translate("/try-app.why_love", {
color: <span>{translate("/try-app.why_love_color")}</span>, color: <span>{translate("/try-app.why_love_color")}</span>,
})} })}
</Title> </Title>
<Reviews /> <Reviews />
<EnterCode style={{ marginTop: "42px" }} /> {/* <EnterCode style={{ marginTop: "42px" }} />
<Button className={styles["success-story"]} onClick={downloadApp}> <Button className={styles["success-story"]} onClick={downloadApp}>
{translate("/try-app.get-my-reading-in-app")} {translate("/try-app.get-my-reading-in-app")}
</Button> */}
<Title variant="h2" className={styles.title} style={{
fontSize: "26px",
marginTop: "42px"
}}>
{translate("/try-app.your_palm_reading_is_ready")}
</Title>
<p className={styles.instructionPoint2}>{translate("/try-app.instruction_point_4")}</p>
<CopyCode variant="black" />
<p className={styles.instructionPoint2} style={{ marginTop: "24px" }}>{translate("/try-app.instruction_point_5")}</p>
<Button className={styles["begin-trial"]} onClick={downloadApp}>
{translate("/try-app.get-my-reading-in-app")}
</Button> </Button>
<Title className={styles["as-seen-in"]}> <Title className={styles["as-seen-in"]}>
{translate("/try-app.as_seen_in", { {translate("/try-app.as_seen_in", {