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.

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

eCR Viewer page layout #49

Merged
merged 28 commits into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
0bbb30a
wip ecr viewer layout
jakewheeler Nov 15, 2024
5640f7e
Merge branch 'next' into jw/ecr-viewer-page
jakewheeler Nov 15, 2024
c6b97ce
add more content
jakewheeler Nov 18, 2024
35afd68
wip side nav
jakewheeler Nov 18, 2024
0d73fee
remove unused imports
jakewheeler Nov 18, 2024
b6ddca4
clean up in page nav
jakewheeler Nov 18, 2024
5e29b95
Merge branch 'next' into jw/ecr-viewer-page
jakewheeler Nov 18, 2024
67c4f10
wip github nav
jakewheeler Nov 18, 2024
9466642
custom colors for getting started and faqs sections
jakewheeler Nov 18, 2024
ebf1c47
more styling fixes
jakewheeler Nov 18, 2024
cba0a8f
clean up styles
jakewheeler Nov 18, 2024
634695c
add keys to array
jakewheeler Nov 18, 2024
324b5ab
placeholder hover bg color for accordion items
jakewheeler Nov 18, 2024
0750e06
add remaining accordion content
jakewheeler Nov 18, 2024
fd453d1
fix list styles
jakewheeler Nov 18, 2024
cdf89b0
continued styling cleanup
jakewheeler Nov 19, 2024
404d7a8
sticky nav as outlined in design
jakewheeler Nov 19, 2024
19a5eb5
Merge branch 'next' into jw/ecr-viewer-page
jakewheeler Nov 19, 2024
28f05fd
make layout changes on lg instead of md
jakewheeler Nov 19, 2024
2c5e0ef
adjust grid size, ensure lists are full width
jakewheeler Nov 19, 2024
78581ae
add new list content
jakewheeler Nov 19, 2024
2ab8cc6
styling clean up
jakewheeler Nov 19, 2024
d665e74
fix incorrect html
jakewheeler Nov 19, 2024
cc57b1b
update overview content
jakewheeler Nov 20, 2024
5b96075
add new content, continue improving styling
jakewheeler Nov 20, 2024
9f8355f
Merge branch 'next' into jw/ecr-viewer-page
jakewheeler Nov 20, 2024
743ee6b
continued styling improvements
jakewheeler Nov 20, 2024
5888bb4
remove demo and add product features to nav
jakewheeler Nov 20, 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
Binary file added public/images/ecr-viewer_how-it-works.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/app/components/Footer/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default function Footer() {
<NavigationLink key="one" href="/" onClick={onClick}>
Home
</NavigationLink>,
<NavigationLink key="two" href="/our-products" onClick={onClick}>
<NavigationLink key="two" href="/products" onClick={onClick}>
Our products
</NavigationLink>,
<NavigationLink key="three" href="/case-studies" onClick={onClick}>
Expand Down
3 changes: 1 addition & 2 deletions src/app/components/Header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const specialContent: SpecialContent = {
const navigationItems = [
{
key: 'products',
href: '/our-products',
href: '/products',
text: 'Our products',
},
{
Expand Down Expand Up @@ -106,7 +106,6 @@ export default function Header() {
/>
</div>
</USWDSHeader>

{customContent && (
<Hero
header={customContent.heroHeader}
Expand Down
8 changes: 2 additions & 6 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const homeContent = {
description:
'DIBBs products help jurisdictions make the most of their data. From improving the usability of electronic case reporting (eCR) data to streamlining data collection from healthcare providers without the need for a direct connection, our products save jurisdictions time and effort for case investigation and analysis.',
ctaText: 'Find out more about our products',
ctaHref: '/our-products',
ctaHref: '/products',
},
jurisdictions: {
title: 'Jurisdictions working with DIBBs',
Expand Down Expand Up @@ -104,11 +104,7 @@ function ValueSection() {
<p className="text-base font-normal leading-relaxed text-[#224a58] xl:max-w-[28.13rem]">
{valueSection.description}
</p>
<LinkButton
href={valueSection.ctaHref}
variant="primary"
className="justify-self-start"
>
<LinkButton href={valueSection.ctaHref} variant="primary">
{valueSection.ctaText}
</LinkButton>
</div>
Expand Down
23 changes: 0 additions & 23 deletions src/app/product-detail/page.tsx

This file was deleted.

664 changes: 664 additions & 0 deletions src/app/products/ecr-viewer/page.tsx

Large diffs are not rendered by default.

28 changes: 28 additions & 0 deletions src/app/products/ecr-viewer/styles.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
li.usa-process-list__item {
border-left-color: #dae9ee;

&:before {
background-color: var(--background);
color: #6499af;
box-shadow: 0 0;
border-color: #6499af;
}

h4 {
color: #224a58;
}
}

button.usa-accordion__button {
background-color: #dae9ee;

&:hover {
background-color: #cce0e7; // placeholder color
}
}

.list__full-width {
li {
min-width: 100%;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function StandaloneProducts() {
clinical information for conditions present in the eCR."
imgSrc={`${basePath}/images/placeholder.png`}
linkText="Learn more about eCR Viewer"
linkToHref="#"
linkToHref="/products/ecr-viewer"
/>
<ProductCard
title="Query Connector"
Expand Down
2 changes: 1 addition & 1 deletion src/app/resources/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default function ProductDetail() {
<Link href="/">Home</Link>
</li>
<li>
<Link href="/our-products">Our products</Link>
<Link href="/products">Our products</Link>
</li>
<li>
<Link href="/product-detail">Product detail</Link>
Expand Down
Loading