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

Feature/111 final text changes #112

Merged
merged 7 commits into from
Nov 11, 2024
Merged

Feature/111 final text changes #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
58bec15
[#111] Update translations w/ final text changes
ifirmawan Nov 11, 2024
126d966
[#111] Change color headings Resources page to orange
ifirmawan Nov 11, 2024
5fa85ef
[#111] Replace text underneath "About the PAT" & Dashboard subtitle
ifirmawan Nov 11, 2024
f367466
[#111] Replace help texts: Step 1 & Step 3
ifirmawan Nov 11, 2024
18d7da6
[#111] Replace text step 3
ifirmawan Nov 11, 2024
203f794
[#111] Replace text step 4
ifirmawan Nov 11, 2024
29c20bf
[#111] Replace text step 5
ifirmawan Nov 11, 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
2 changes: 1 addition & 1 deletion frontend/src/app/[locale]/dashboard/(with-header)/pat-resources/page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const ResourcesPage = () => {
<List.Item key={item.id}>
<List.Item.Meta
title={
<h3 className="font-bold text-lg xl:text-xl">
<h3 className="font-bold text-lg xl:text-xl text-primary-dark">
{t(`resource${item.id}`)}
</h3>
}
Expand Down
9 changes: 8 additions & 1 deletion frontend/src/app/[locale]/dashboard/page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const PageTitle = () => {
return (
<div className="w-full space-y-2">
<h1 className="font-bold text-xl xl:text-2xl">{t("title")}</h1>
<p className="w-11/12 text-sm xl:text-base">{t("subtitle")}</p>
<i className="w-11/12 text-sm xl:text-base">{t("subtitle")}</i>
</div>
);
};
Expand Down Expand Up @@ -154,6 +154,13 @@ const AboutCard = ({ isEmpty = false }) => {
</h2>
<div className="mb-8 max-h-[450px] text-sm xl:text-base overflow-y-scroll">
<p className="whitespace-pre-line">{t("aboutDescription")}</p>
<ul className="list-disc ml-8">
<li>{t("aboutText1")}</li>
<li>{t("aboutText2")}</li>
<li>{t("aboutText3")}</li>
<li>{t("aboutText4")}</li>
</ul>
<p className="whitespace-pre-line">{t("aboutTextEnd")}</p>
</div>
<a
href={PARTOS.PATGuidelineLink}
Expand Down
61 changes: 52 additions & 9 deletions frontend/src/components/Modals/HelpModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,57 @@ const StepHelpText = ({ step }) => {
<strong className="text-xl">{t("titleStep1")}</strong>
</div>
<p>{t("helpStep1Text1")}</p>
<p>{t("helpStep1Text2")}</p>
<p>{t("helpStep1Text3")}</p>
<p>{t("helpStep1Text4")}</p>
<ul className="list-disc ml-8">
<li>{t("helpStep1a")}</li>
<li>{t("helpStep1b")}</li>
<li>{t("helpStep1c")}</li>
<p>
{t.rich("helpStep1Text2", {
b: (token) => (
<>
<b>{token}</b>
<br />
</>
),
})}
</p>
<ul className="list-disc ml-8 text-sm xl:text-base">
<li>
<i>{t("helpStep1Text2a")}</i>
</li>
<li>
<i>{t("helpStep1Text2b")}</i>
</li>
<li>
<i>{t("helpStep1Text2c")}</i>
</li>
</ul>
<p>
{t.rich("helpStep1Text3", {
b: (token) => <b>{token}</b>,
})}
</p>
<ul className="list-disc ml-8 text-sm xl:text-base">
<li>{t("helpStep1Text3a")}</li>
<li>{t("helpStep1Text3b")}</li>
</ul>
<p>
{t.rich("helpStep1Text4", {
b: (token) => <b>{token}</b>,
})}
</p>
<ul className="list-disc ml-8 text-sm xl:text-base">
<li>{t("helpStep1Text4a")}</li>
<li>{t("helpStep1Text4b")}</li>
<li>{t("helpStep1Text4c")}</li>
</ul>
<br />
<p className="whitespace-pre-line">
{t.rich("helpStep1Text5", {
b: (token) => <b>{token}</b>,
})}
</p>
<ul className="list-disc ml-8 text-sm xl:text-base">
<li>{t("helpStep1Text5a")}</li>
<li>{t("helpStep1Text5b")}</li>
<li>{t("helpStep1Text5c")}</li>
</ul>
<p>{t("helpStep1Text5")}</p>
<p>{t("helpStep1TextEnd")}</p>
</div>
);
Expand All @@ -41,10 +83,11 @@ const StepHelpText = ({ step }) => {
<strong className="text-xl">{t("titleStep3")}</strong>
</div>
<p>{t("helpStep3")}</p>
<ul className="list-disc ml-8">
<ul className="list-disc ml-8 text-sm xl:text-base">
<li>{t("helpStep3a")}</li>
<li>{t("helpStep3b")}</li>
</ul>
<p>{t("helpStep3End")}</p>
</div>
);
case 4:
Expand Down
10 changes: 9 additions & 1 deletion frontend/src/components/SessionWizard/Step3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,15 @@ const StepThree = ({ patSession = {}, isEditable = false }, ref) => {

return (
<div className="w-full space-y-6">
<p className="w-full whitespace-pre-line">{t("step3Desc")}</p>
<div className="w-full space-y-2 whitespace-pre-line">
<strong>{t("step3Title")}</strong>
<p>{t("step3Desc")}</p>
<ul className="list-disc ml-8">
<li>{t("step3Text1")}</li>
<li>{t("step3Text2")}</li>
</ul>
<p>{t("step3TextEnd")}</p>
</div>
<Form
ref={ref}
component={false}
Expand Down
28 changes: 18 additions & 10 deletions frontend/src/components/SessionWizard/Step4.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,16 +100,24 @@ const StepFour = ({ patSession = {}, isEditable = false }, ref) => {

return (
<div className="w-full space-y-6">
<p>
{t.rich("step4Desc", {
italic: (token) => (
<>
<i>{token}</i>
<br />
</>
),
})}
</p>
<div className="w-full space-y-2 whitespace-pre-line">
<strong>{t("step4Title")}</strong>
<p>
{t.rich("step4Desc", {
italic: (token) => (
<>
<i>{token}</i>
<br />
</>
),
})}
</p>
<ul className="list-disc ml-8 text-sm xl:text-base">
<li>{t("step4Text1")}</li>
<li>{t("step4Text2")}</li>
</ul>
<p>{t("step4TextEnd")}</p>
</div>
<Form
ref={ref}
component={false}
Expand Down
6 changes: 5 additions & 1 deletion frontend/src/components/SessionWizard/Step5.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,11 @@ const StepFive = ({ patSession = {}, isEditable = false }, ref) => {
<div className="w-full space-y-6">
<div className="w-full space-y-2 whitespace-pre-line">
<strong>{t("step5Title")}</strong>
<p>{t("step5Desc")}</p>
<p>
{t.rich("step5Desc", {
italic: (token) => <i>{token}</i>,
})}
</p>
</div>
<Form
ref={ref}
Expand Down
Loading