From f4c1be2fc74bd94ccaeafba1ef29a7a0227159fd Mon Sep 17 00:00:00 2001 From: kristo-baricevic <108290619+kristo-baricevic@users.noreply.github.com> Date: Tue, 13 Feb 2024 14:00:44 -0500 Subject: [PATCH 1/4] commit ignore --- frontend/.gitignore | 2 ++ frontend/src/assets/chart-line-solid.svg | 1 + frontend/src/pages/Help/ChartLine.tsx | 9 +++++++++ 3 files changed, 12 insertions(+) create mode 100644 frontend/src/assets/chart-line-solid.svg create mode 100644 frontend/src/pages/Help/ChartLine.tsx diff --git a/frontend/.gitignore b/frontend/.gitignore index d67a573c..6e10711f 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -12,6 +12,8 @@ dist dist-ssr *.local +config/env/env.dev + # Editor directories and files .vscode/* !.vscode/extensions.json diff --git a/frontend/src/assets/chart-line-solid.svg b/frontend/src/assets/chart-line-solid.svg new file mode 100644 index 00000000..aef9871e --- /dev/null +++ b/frontend/src/assets/chart-line-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/pages/Help/ChartLine.tsx b/frontend/src/pages/Help/ChartLine.tsx new file mode 100644 index 00000000..9368f407 --- /dev/null +++ b/frontend/src/pages/Help/ChartLine.tsx @@ -0,0 +1,9 @@ +import React from "react"; + +const ChartLine = () => ( + + + +); + +export default React.memo(ChartLine); From 9066bce3bdf2ddb48f50f8259ac48c535e2da386 Mon Sep 17 00:00:00 2001 From: kristo-baricevic <108290619+kristo-baricevic@users.noreply.github.com> Date: Tue, 13 Feb 2024 14:18:47 -0500 Subject: [PATCH 2/4] updated DataSources --- .vscode/settings.json | 1 + frontend/src/pages/Help/ChartLine.tsx | 9 ----- frontend/src/pages/Help/DataSources.tsx | 45 +++++++++++++++++++------ frontend/src/pages/Help/HowTo.tsx | 8 ++--- frontend/src/pages/Help/LineChart.tsx | 9 +++++ 5 files changed, 49 insertions(+), 23 deletions(-) delete mode 100644 frontend/src/pages/Help/ChartLine.tsx create mode 100644 frontend/src/pages/Help/LineChart.tsx diff --git a/.vscode/settings.json b/.vscode/settings.json index c398cb0a..29d57ae1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,6 @@ { "cSpell.words": [ + "prescribers", "satoshi" ] } \ No newline at end of file diff --git a/frontend/src/pages/Help/ChartLine.tsx b/frontend/src/pages/Help/ChartLine.tsx deleted file mode 100644 index 9368f407..00000000 --- a/frontend/src/pages/Help/ChartLine.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import React from "react"; - -const ChartLine = () => ( - - - -); - -export default React.memo(ChartLine); diff --git a/frontend/src/pages/Help/DataSources.tsx b/frontend/src/pages/Help/DataSources.tsx index a4c21449..66dd7379 100644 --- a/frontend/src/pages/Help/DataSources.tsx +++ b/frontend/src/pages/Help/DataSources.tsx @@ -1,20 +1,45 @@ import Layout from "../Layout/Layout"; +import LineChart from "./LineChart"; -function DataSources() { +interface DataProps { + title: string; + paragraph: string[]; +} + +const data: DataProps = { + title: "How Do We Get Our Data?", + paragraph: [ + "Balancer gets it data from publicly available peer-reviewed research "+ + "as well as through extensive interviews with prescribers. ", + "Check back soon for more comprehensive information." + ], +}; + +function HowTo() { return ( -
-
-

-

How Do We Find Our Data?

-

- Data sources coming soon! -

+
+
+ +
+

+ {data.title} +

+
+
+

+ {data.paragraph[0]} +

+
+
+

+ {data.paragraph[1]} +

+
); } -export default DataSources; +export default HowTo; diff --git a/frontend/src/pages/Help/HowTo.tsx b/frontend/src/pages/Help/HowTo.tsx index 11a20551..7737538a 100644 --- a/frontend/src/pages/Help/HowTo.tsx +++ b/frontend/src/pages/Help/HowTo.tsx @@ -19,10 +19,10 @@ const howToData: HowToProps = { "2. Select the patient's current state.", "3. Answer 'yes' or 'no' to the questions related to patient characteristics.", "4. Check off any relevant reproductive status information.", - "5. Type out a list of the patient's current medications. ", - "6. You can separate medications with commas. It doesn't matter if you use the generic or " + - "brand name of the medication; Balancer will understand.", - "7. Type out a list of any medications you want Balancer to exclude from the recommended " + + "5. Type out a list of the patient's current medications. You can separate medications " + + "with commas. It doesn't matter if you use the generic or brand name of the medication; " + + "Balancer will understand.", + "6. Type out a list of any medications you want Balancer to exclude from the recommended " + "medications list. (For example, if a patient has already tried a particular medication " + "without success, enter the name of that medication and Balancer will be sure not to " + "suggest it in the results page.) You can separate medications with commas. Again, " + diff --git a/frontend/src/pages/Help/LineChart.tsx b/frontend/src/pages/Help/LineChart.tsx new file mode 100644 index 00000000..d3822893 --- /dev/null +++ b/frontend/src/pages/Help/LineChart.tsx @@ -0,0 +1,9 @@ +import React from "react"; + +const LineChart = () => ( + + + +); + +export default React.memo(LineChart); From 0a4a098a30489615ac9b7b34be53a11db7e8d538 Mon Sep 17 00:00:00 2001 From: kristo-baricevic <108290619+kristo-baricevic@users.noreply.github.com> Date: Thu, 22 Feb 2024 18:21:13 -0500 Subject: [PATCH 3/4] font sizes --- frontend/src/pages/Help/Help.tsx | 4 ++-- frontend/src/pages/Help/HowTo.tsx | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/src/pages/Help/Help.tsx b/frontend/src/pages/Help/Help.tsx index b5c8fdf9..c1067ed3 100644 --- a/frontend/src/pages/Help/Help.tsx +++ b/frontend/src/pages/Help/Help.tsx @@ -48,9 +48,9 @@ function Help() {
-

+

Help & Support Page -

+

diff --git a/frontend/src/pages/Help/HowTo.tsx b/frontend/src/pages/Help/HowTo.tsx index 7737538a..cd35153a 100644 --- a/frontend/src/pages/Help/HowTo.tsx +++ b/frontend/src/pages/Help/HowTo.tsx @@ -35,15 +35,15 @@ function HowTo() { return (
-

+

{howToData.title}

-

+

{howToData.paragraph[0]}

-

+

{howToData.paragraph[1]}

@@ -52,7 +52,7 @@ function HowTo() { {howToData.instructions.map((text, index) => { return (
  • {text} From b727f6aac39c3af2f88c31b1ad52bb32f0ed4283 Mon Sep 17 00:00:00 2001 From: kristo-baricevic <108290619+kristo-baricevic@users.noreply.github.com> Date: Thu, 22 Feb 2024 18:45:00 -0500 Subject: [PATCH 4/4] updated fonts and size of card --- frontend/src/pages/About/About.tsx | 10 ---------- frontend/src/pages/Help/Help.tsx | 2 -- frontend/src/pages/Help/HelpCard.tsx | 23 +++++++++++++++-------- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/frontend/src/pages/About/About.tsx b/frontend/src/pages/About/About.tsx index 3c3761cb..f280ebb3 100644 --- a/frontend/src/pages/About/About.tsx +++ b/frontend/src/pages/About/About.tsx @@ -81,16 +81,6 @@ function About() {
  • -
    -
    -
    44 million
    -
    Transactions every 24 hours
    -
    $119 million
    -
    Assets under holding
    -
    46,000
    -
    New users annually
    -
    -
    {/* Support Us section */} diff --git a/frontend/src/pages/Help/Help.tsx b/frontend/src/pages/Help/Help.tsx index c1067ed3..1765e708 100644 --- a/frontend/src/pages/Help/Help.tsx +++ b/frontend/src/pages/Help/Help.tsx @@ -61,14 +61,12 @@ function Help() { {data.icon.map((icon, index) => ( -
    -
    ))}
    diff --git a/frontend/src/pages/Help/HelpCard.tsx b/frontend/src/pages/Help/HelpCard.tsx index cc61e42d..751b0bbe 100644 --- a/frontend/src/pages/Help/HelpCard.tsx +++ b/frontend/src/pages/Help/HelpCard.tsx @@ -23,17 +23,24 @@ function HelpCard(data: HelpProps) { } setTitle(data.title); setParagraph(data.paragraph); - if (data.icon == "UserDoctor") { - setIcon(); - } else if (data.icon == "FeedbackIcon") { - setIcon(); - } else if (data.icon == "MagnifyingGlassChart") { - setIcon(); + switch (data.icon) { + case "UserDoctor": + setIcon(); + break; + case "FeedbackIcon": + setIcon(); + break; + case "MagnifyingGlassChart": + setIcon(); + break; + default: + setIcon(null); } - }, [paragraph, data, title]); + }, + [data.icon, data.title, data.paragraph]); return ( -
    +
    {icon &&
    {icon}
    }