Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Edit Info Modal design #253

Merged
merged 4 commits into from
Jul 14, 2024
Merged

Edit Info Modal design #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d7ce196
Changed text alignment
IraSoro Jul 10, 2024
4a4cf3e
Removed dots in the list items
IraSoro Jul 10, 2024
c06d598
Added css file, move styles to css
IraSoro Jul 11, 2024
79b057b
Returned the dots and changed their color
IraSoro Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions src/modals/InfoModal.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
div.info-screen {
max-width: 400px;
margin-left: auto;
margin-right: auto;
}

/* basic */
p.info-title-basic {
font-weight: bold;
font-size: 25px;
margin-bottom: 24px;
color: var(--ion-color-dark-basic);
}

li.info-item-basic {
font-size: 16px;
margin-bottom: 20px;
color: var(--ion-color-text-basic);
}

li.info-item-basic::marker {
color: var(--ion-color-dark-basic);
}

span.info-item-basic {
color: var(--ion-color-less-dark-basic);
font-weight: bold;
}

/* dark */
p.info-title-dark {
font-weight: bold;
font-size: 25px;
margin-bottom: 24px;
color: var(--ion-color-dark-dark);
}

li.info-item-dark {
font-size: 16px;
margin-bottom: 20px;
color: var(--ion-color-text-dark);
}

li.info-item-dark::marker {
color: var(--ion-color-dark-dark);
}

span.info-item-dark {
color: var(--ion-color-less-dark-dark);
font-weight: bold;
}
157 changes: 52 additions & 105 deletions src/modals/InfoModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import {
getPregnancyChance,
} from "../state/CalculationLogics";

import "./InfoModal.css";

interface PropsInfoModal {
isOpen: boolean;
setIsOpen: (newIsOpen: boolean) => void;
Expand Down Expand Up @@ -38,112 +40,57 @@ const InfoModal = (props: PropsInfoModal) => {
className="ion-padding"
color={`transparent-${theme}`}
>
<p
style={{
fontWeight: "bold",
fontSize: "25px",
color: `var(--ion-color-dark-${theme})`,
marginBottom: "24px",
}}
>
{`${t("Days", {
postProcess: "interval",
count: 1, // NOTE: to indicate which day is in the account, you need to write the day as if in the singular
})} `}
{cycles.length === 1 ? (
currentDay
) : (
<>
{currentDay}/{lengthOfCycle}
</>
)}
</p>
<ul>
<li
style={{
fontSize: "16px",
color: `var(--ion-color-text-${theme})`,
marginBottom: "20px",
}}
>
<span
style={{
color: `var(--ion-color-less-dark-${theme})`,
fontWeight: "bold",
}}
>
{phase.title}
</span>
<span> {t("is current phase of cycle")}</span>
</li>
<li
style={{
fontSize: "16px",
color: `var(--ion-color-text-${theme})`,
marginBottom: "20px",
}}
>
<span>{t("Ovulation")}</span>
<span
style={{
color: `var(--ion-color-less-dark-${theme})`,
fontWeight: "bold",
}}
>
{` ${ovulationStatus}`}
</span>
</li>
<li
style={{
fontSize: "16px",
color: `var(--ion-color-text-${theme})`,
marginBottom: "20px",
}}
>
<span
style={{
color: `var(--ion-color-less-dark-${theme})`,
fontWeight: "bold",
}}
>
{pregnancyChance}
</span>
<span> {t("chance of getting pregnant")}</span>
</li>
</ul>
<p
style={{
fontWeight: "bold",
fontSize: "25px",
color: `var(--ion-color-dark-${theme})`,
marginBottom: "24px",
}}
>
{t("Frequent symptoms")}
</p>
<ul>
{phase.symptoms.map((item, idx) => (
<li
style={{
fontSize: "16px",
color: `var(--ion-color-text-${theme})`,
marginBottom: "20px",
}}
key={idx}
>
{item}
<div className="info-screen">
<p className={`info-title-${theme}`}>
{`${t("Days", {
postProcess: "interval",
count: 1, // NOTE: to indicate which day is in the account, you need to write the day as if in the singular
})} `}
{cycles.length === 1 ? (
currentDay
) : (
<>
{currentDay}/{lengthOfCycle}
</>
)}
</p>
<ul>
<li className={`info-item-${theme}`}>
<span className={`info-item-${theme}`}>{phase.title}</span>
<span> {t("is current phase of cycle")}</span>
</li>
<li className={`info-item-${theme}`}>
<span>{t("Ovulation")}</span>
<span className={`info-item-${theme}`}>
{` ${ovulationStatus}`}
</span>
</li>
))}
</ul>
<IonCol>
<IonButton
className="main"
color={`dark-${theme}`}
onClick={() => props.setIsOpen(false)}
>
OK
</IonButton>
</IonCol>
<li className={`info-item-${theme}`}>
<span className={`info-item-${theme}`}>{pregnancyChance}</span>
<span> {t("chance of getting pregnant")}</span>
</li>
</ul>
<p className={`info-title-${theme}`}>{t("Frequent symptoms")}</p>
<ul>
{phase.symptoms.map((item, idx) => (
<li
className={`info-item-${theme}`}
key={idx}
>
{item}
</li>
))}
</ul>
<IonCol>
<IonButton
className="main"
color={`dark-${theme}`}
onClick={() => props.setIsOpen(false)}
>
OK
</IonButton>
</IonCol>
</div>
</IonContent>
</IonModal>
);
Expand Down
Loading