Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/HEAD' into kenneth/about-page
Browse files Browse the repository at this point in the history
  • Loading branch information
KennethSkylight committed Nov 27, 2023
2 parents 4fad90f + 22b4127 commit 0d94ca0
Show file tree
Hide file tree
Showing 16 changed files with 357 additions and 451 deletions.
6 changes: 3 additions & 3 deletions components/FooterUSWDS/FooterUSWDS.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ export default function FooterUSWDS() {
Home
</a>
</Link>,
<Link href='/building-block-info' key='building-block'>
<Link href='/about' key='building-block'>
<a className="font-public-sans-md padding-x-0 desktop:padding-x-05 usa-footer__primary-link text-base-lightest">
What is a building block?
</a>
</Link>,
<Link href='/product-offerings' key='product-offerings'>
<Link href='/products' key='product-offerings'>
<a className="font-public-sans-md padding-x-0 desktop:padding-x-05 usa-footer__primary-link text-base-lightest">
Our product offerings
</a>
</Link>,
<Link href='/partner-with-us' key='partner'>
<Link href='/engage-with-us' key='partner'>
<a className="font-public-sans-md padding-x-0 desktop:padding-x-05 usa-footer__primary-link text-base-lightest">
Partner with us
</a>
Expand Down
8 changes: 4 additions & 4 deletions components/NavbarUSWDS/NavbarUSWDS.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ export default function Navbar({ }) {
<span className={styles.navbarItemText}>Home</span>
</a>
</Link>,
<NavigationLink key="two" href='/about' text='What is a Building Block' router={router} onClick={onClick} />,
<NavigationLink key="three" href='/product-offerings' text='Our product offerings' router={router} onClick={onClick} />,
<NavigationLink key="four" href='/partner-with-us' text='Partner with us' router={router} onClick={onClick} />,
<NavigationLink key="two" href='/about' text='About' router={router} onClick={onClick} />,
<NavigationLink key="three" href='/products' text='Products' router={router} onClick={onClick} />,
<NavigationLink key="four" href='/engage-with-us' text='Engage with us' router={router} onClick={onClick} />,
]

return (
Expand All @@ -31,7 +31,7 @@ export default function Navbar({ }) {
<Link href='/'>
<a className="desktop:padding-1">
<span className={styles.navbarLogoText} href='/phdi-site'>
Public Health Data Infrastructure
Data Integration Building Blocks
</span>
</a>
</Link>
Expand Down
145 changes: 0 additions & 145 deletions components/product-offerings/building-blocks-links.js

This file was deleted.

135 changes: 135 additions & 0 deletions components/products/building-blocks-links.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
import styles from "../../styles/Home.module.scss";
import {Link} from "@trussworks/react-uswds";
import Image from "next/image";
import cloudIcon from "../../public/icons/cloud.svg";
import fhirConverter from "../../public/icons/fhirConverter.svg";
import locationIcon from "../../public/icons/location.svg";
import organization from "../../public/icons/organization.svg";
import link from "../../public/icons/link.svg";
import tabulation from "../../public/icons/tabulation.svg";
import validation from "../../public/icons/validation.svg";
import messageParser from "../../public/icons/messageParser.svg";


export const BuildingBlocksInfo = () => {
return (
<div
className={`grid-container margin-bottom-5 desktop:radius-md bg-white padding-y-5 desktop:padding-top-5 desktop:padding-bottom-3 padding-x-205 desktop:padding-x-5 ${styles.dynamicShadow}`}
>
<h2
className={`lg:font-semibold text-2xl lg:text-3xl margin-bottom-105 ${styles.headerText} text-accent-cool-darker`}
>
Building Blocks
</h2>
<div
className={`lg:text-base font-public-sans-xs ${styles.subBodyTextLineHeight}`}
>
<div className={`${styles.sdkInfoMaxWidth}`}>
Below, you will find a description of how the five core Building
Blocks work to clean and transform data as part of the Starter Kit
data pipeline. To see the full suite of containerized services,
check out our&nbsp;
<span>
<Link
className="font-semibold"
href="https://github.com/CDCgov/phdi/tree/main/containers"
target="_blank"
>
containers repository.
</Link>
</span>
</div>
<div className={"grid-container padding-0 flex-align-center"}>
<div className="grid-row padding-top-3">
<div
className="display-none desktop:display-inline-block margin-right-2 flex-align-self-center">
<Image alt="" src={validation}/>
</div>
<Link
className="font-semibold flex-align-self-center padding-bottom-1"
href="https://cdcgov.github.io/phdi/latest/containers/validation.html"
target='_blank'>
Validation
</Link>
Reads and validates all eCR fields of interest based on
specified, custom preferences; ensures that its XML structure is
valid, that the required fields are present and in the correct
format, and that the data is trustworthy
</div>
<div className="grid-row padding-top-3">
<div
className="display-none desktop:display-inline-block margin-right-2 flex-align-self-center">
<Image alt="" src={fhirConverter}/>
</div>
<Link
className="font-semibold flex-align-self-center padding-bottom-1"
href="https://cdcgov.github.io/phdi/latest/containers/fhir-converter.html"
target='_blank'
>
FHIR Converter
</Link>
Converts incoming messages into the FHIR (Fast Healthcare
Interoperability Resources) standard, which acts as a common
language between data streams, thereby standardizing data
streams for record linkage and making 1:1 comparisons
</div>
<div className="grid-row padding-top-3">
<div
className="display-none desktop:display-inline-block margin-right-2 flex-align-self-center">
<Image alt="" src={organization}/>
</div>
<Link
className="font-semibold flex-align-self-center padding-bottom-1"
href="https://cdcgov.github.io/phdi/latest/containers/ingestion.html"
target='_blank'>
Ingestion
</Link>
<div>
<p className={""}>Consists of two separate steps: (1) Standardization; (2)
Geocoding</p>
<p className={"padding-top-1"}><span
className={"font-semibold"}>Standardization:</span> Standardizes
data fields (including record
name, date of birth, phone number, and geolocation)
based on
preset defaults to ensure consistency</p>
<p className={"padding-top-1"}><span
className={"font-semibold"}>Geocoding:</span> Enriches
data by providing precise geographic
locations based on patient street addresses from input
data</p>
</div>
</div>
<div className="grid-row padding-top-3">
<div
className="display-none desktop:display-inline-block margin-right-2 flex-align-self-center">
<Image alt="" src={link}/>
</div>
<Link
className="font-semibold flex-align-self-center padding-bottom-1"
href="https://cdcgov.github.io/phdi/latest/containers/record-linkage.html"
target='_blank'>
Record Linkage
</Link>
Identifies multiple records referring to the same individual and
combines them into a single, more complete patient record
</div>
<div className="grid-row padding-top-3 padding-bottom-2">
<div
className="display-none desktop:display-inline-block margin-right-2 flex-align-self-center ">
<Image alt="" src={messageParser}/>
</div>
<Link
className="font-semibold flex-align-self-center padding-bottom-1"
href="https://cdcgov.github.io/phdi/latest/containers/message-parser.html"
target='_blank'>
Message Parser
</Link>
Extracts relevant data from an eCR into a tabular format (i.e.
spreadsheet); customizable depending on user needs
</div>
</div>
</div>
</div>
)
}
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
"postcss": "^8.4.17",
"tailwindcss": "^3.1.8"
}
}
}
Loading

0 comments on commit 0d94ca0

Please sign in to comment.