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

Update header and rename pages for dibbs site #12

Merged
merged 4 commits into from
Nov 20, 2023
Merged

Update header and rename pages for dibbs site #12

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b54c459
Update header and rename pages for dibbs site
gordonfarrell Nov 15, 2023
21656e6
merge main into branch
gordonfarrell Nov 20, 2023
6dd37e6
lighthouse
gordonfarrell Nov 20, 2023
ac0071f
lighthouse
gordonfarrell Nov 20, 2023
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
6 changes: 3 additions & 3 deletions components/FooterUSWDS/FooterUSWDS.js
View file
Open in desktop
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
View file
Open in desktop
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='/building-block-info' 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
0 ...roduct-offerings/building-blocks-links.js → components/products/building-blocks-links.js
View file
Open in desktop
File renamed without changes.
0 ...fferings/software-development-kit-info.js → ...products/software-development-kit-info.js
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions pages/building-block-info.js → pages/about.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import organizationIcon from '../public/icons/organization.svg';
import Link from 'next/link';
import Head from 'next/head';

export default function BuildingBlockInfo() {
export default function About() {
return (
<div>
<Head>
<title>Building Blocks - Public Health Data Infrastructure</title>
<title>Building Blocks - Data Integration Building Blocks</title>
</Head>
<div className="grid-container padding-x-205 margin-y-5 desktop:padding-top-5 maxw-widescreen desktop:padding-x-9 desktop:margin-y-7 desktop:margin-y-0">
<div className="grid-row">
Expand Down Expand Up @@ -200,7 +200,7 @@ export default function BuildingBlockInfo() {
You can now test out Building Blocks in your
jurisdiction&apos;s data environment
</p>
<Link href="/product-offerings">
<Link href="/products">
<Button
outline
className={`${styles.buttonAccent} desktop:padding-x-4 padding-y-2`}
Expand Down
2 changes: 1 addition & 1 deletion pages/partner-with-us.js → pages/engage-with-us.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default function GetInvolved() {
return (
<>
<Head>
<title>Partner with us - Public Health Data Infrastructure</title>
<title>Engage with us - Data Integration Building Blocks</title>
</Head>
<div className="desktop:padding-bottom-9 desktop:padding-top-3">
<div className="grid-container padding-0 maxw-desktop-lg">
Expand Down
8 changes: 4 additions & 4 deletions pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default function Home() {
return (
<div>
<Head>
<title>Public Health Data Infrastructure</title>
<title>Data Integration Building Blocks</title>
</Head>
<div className="grid-container margin-y-5 desktop:margin-y-0 maxw-desktop-lg padding-x-205 desktop:padding-x-0">
<div className="grid-row desktop:display-none">
Expand All @@ -34,7 +34,7 @@ export default function Home() {
<h1
className={`${styles.headerText} ${styles.dynamicHeader} header-line-height text-accent-cool-darker font-bold maxw-mobile-lg padding-x-1 desktop:padding-x-0`}
>
Reponse-ready public health data systems
Response-ready public health data systems
</h1>
<p
className={`font-public-sans line-height-sans-6 font-semibold ${styles.letterSpacingNeg1} padding-right-1 desktop:padding-right-0`}
Expand Down Expand Up @@ -112,7 +112,7 @@ export default function Home() {
<br />
<br />
<div className="font-semibold text-underline text-primary link">
<Link href="/building-block-info">
<Link href="/about">
More about Building Blocks ›
</Link>
</div>
Expand Down Expand Up @@ -193,7 +193,7 @@ export default function Home() {
and share public health data.
</p>
<div className="text-center margin-top-3 width-card-lg margin-x-auto">
<Link href="/partner-with-us">
<Link href="/engage-with-us">
<Button
outline
className={`${styles.buttonAccent} desktop:padding-x-4 padding-y-2`}
Expand Down
10 changes: 5 additions & 5 deletions pages/product-offerings.js → pages/products.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import styles from '../styles/Home.module.scss';
import productOfferingsImage from '../public/products.svg';
import mobileProductOfferingsImage from '../public/mobile/product-offerings.svg';
import {SoftwareDevelopmentKitInfo} from "../components/product-offerings/software-development-kit-info";
import {BuildingBlocksInfo} from "../components/product-offerings/building-blocks-links";
import mobileProductOfferingsImage from '../public/mobile/products.svg';
import {SoftwareDevelopmentKitInfo} from "../components/products/software-development-kit-info";
import {BuildingBlocksInfo} from "../components/products/building-blocks-links";

import awsImage from '../public/icons/aws.svg';
import azureImage from '../public/icons/azure.svg';
Expand All @@ -16,7 +16,7 @@ export default function ProductOffering() {
return (
<div>
<Head>
<title>Our product offerings - Public Health Data Infrastructure</title>
<title>Our product offerings - Data Integration Building Blocks</title>
</Head>
<div className="grid-container padding-x-205 margin-y-5 desktop:margin-bottom-0 desktop:margin-top-9">
<div className="grid-row">
Expand All @@ -35,7 +35,7 @@ export default function ProductOffering() {
<div className="desktop:grid-col-6 margin-top-2 desktop:margin-top-0">
<div className="desktop:margin-left-8 desktop:padding-top-8">
<h1 className={`header-line-height ${styles.headerText} text-accent-cool-darker font-bold text-3xl lg:text-4xl margin-bottom-2`}>
Our product offerings
Our products
</h1>
<p className="text-base-darkest font-semibold">
Our products create a data architecture that is:{' '}
Expand Down
0 public/mobile/product-offerings.svg → public/mobile/products.svg
View file
Open in desktop
File renamed without changes
Loading