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

feat(homepageHeader): initial commit #21

Merged
merged 29 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
6713133
feat(homepageHeader): initial commit
jarvisraymond-uchicago Jan 21, 2025
927205a
feat(homepageHeader): Added footer component, fixed svg duplicate ID …
jarvisraymond-uchicago Jan 27, 2025
8cf98c9
feat(homepageHeader): Removed unneeded imports
jarvisraymond-uchicago Jan 27, 2025
b148566
spike(storyBookAccessibilityCI): Added need libraries
jarvisraymond-uchicago Jan 6, 2025
c1f44e3
spike(storyBookAccessibilityCI): Updated yaml for CI and added ESLINT…
jarvisraymond-uchicago Jan 7, 2025
7b43574
spike(storyBookAccessibilityCI): resolved accessibility issues to che…
jarvisraymond-uchicago Jan 7, 2025
de29298
spike(storyBookAccessibilityCI): added tailwind styles, support for S…
jarvisraymond-uchicago Jan 8, 2025
b90dc84
spike(storyBookAccessibilityCI): added tests for HealButtonLink, fixe…
jarvisraymond-uchicago Jan 8, 2025
6d187b8
spike(storyBookAccessibilityCI): fixed eslint errors in HEALBUTTONLINK
jarvisraymond-uchicago Jan 8, 2025
973fb32
spike(storyBookAccessibilityCI): updated ci.yaml
jarvisraymond-uchicago Jan 8, 2025
66e6563
spike(storyBookAccessibilityCI): Added tests and stories
jarvisraymond-uchicago Jan 9, 2025
ba17630
spike(storyBookAccessibilityCI): Removed boiler plate files
jarvisraymond-uchicago Jan 10, 2025
4dac24e
spike(storyBookAccessibilityCI): Updated unit tests to pass
jarvisraymond-uchicago Jan 14, 2025
509007e
spike(storyBookAccessibilityCI): Added storybook story for Quote Spot…
jarvisraymond-uchicago Jan 14, 2025
707fb4d
spike(storyBookAccessibilityCI): Removed unneeded import to fix lint …
jarvisraymond-uchicago Jan 14, 2025
a712d3f
spike(storyBookAccessibilityCI): Fixed storybook story test logic
jarvisraymond-uchicago Jan 14, 2025
d34cb20
spike(storyBookAccessibilityCI): Fixed lint issue
jarvisraymond-uchicago Jan 14, 2025
73421d3
Merge branch 'main' into feat/homepageHeader
jarvisraymond-uchicago Jan 27, 2025
a5cc650
feat(homepageHeader): rebased home and HealHeader for merge conflict
jarvisraymond-uchicago Jan 27, 2025
bd5b08f
feat(homepageHeader): Resolved merge conflicts on healbuttonlink stories
jarvisraymond-uchicago Jan 27, 2025
84e5e7a
feat(homepageHeader): fixed merge conflict on preview
jarvisraymond-uchicago Jan 27, 2025
2d90bfe
feat(homepageHeader): Removed merge conflict markers
jarvisraymond-uchicago Jan 27, 2025
3f3d046
feat(homepageHeader): Added storybook stories for new components
jarvisraymond-uchicago Jan 27, 2025
0f26ae8
feat(homepageHeader): Updated stories to check for data-testid, updat…
jarvisraymond-uchicago Jan 28, 2025
db665da
feat(homepageHeader): added mobile styles
jarvisraymond-uchicago Jan 28, 2025
af752d1
feat(homepageHeader): Cleaned up styles to better match design
jarvisraymond-uchicago Jan 28, 2025
b450045
feat(homepageHeader): Added items-center to link class names so Help …
jarvisraymond-uchicago Jan 28, 2025
8f3554d
feat(homepageHeader): Additional tweaks to better match design in des…
jarvisraymond-uchicago Jan 28, 2025
144aa22
feat(homepageHeader): removed dead code
jarvisraymond-uchicago Jan 28, 2025
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
8 changes: 4 additions & 4 deletions config/heal/home/SlideData.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import IconHdd from '../../../src/lib/Home/Assets/Icons/Icon-Hdd.svg';
import IconAnalyses from '../../../src/lib/Home/Assets/Icons/Icon-Analyses.svg';
import IconHdd from '../../../public/icons/HealIcons/Icon-Hdd.svg';
import IconAnalyses from '../../../public/icons/HealIcons/Icon-Analyses.svg';

export const slideData = [
{
href: 'https://www.askjeeves.com',
href: 'https://healdata.org',
icon: IconHdd,
text: 'View the latest studies who have shared their data!',
},
{
href: 'https://www.spacejam.com/1996/',
href: 'https://healdata.org',
icon: IconAnalyses,
text: 'Explore example analyses!',
},
Expand Down
20 changes: 10 additions & 10 deletions config/heal/home/resourceCalloutData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@ export const resourceCalloutsData = [
{
title: 'Resources for HEAL Investigators',
links: [
{ title: 'Select a Repository', href: 'https://www.spacejam.com/1996/' },
{ title: 'Select a Repository', href: 'https://healdata.org' },
{
title: 'Register Your Study',
href: 'https://www.spacejam.com/1996/cmp/pressbox/pressboxframes.html',
href: 'https://healdata.org',
},
{
title: 'Submit Study-Level Metadata',
href: 'https://www.spacejam.com/1996/cmp/lineup/lineupframes.html',
href: 'https://healdata.org',
},
{
title: 'Submit Variable-Level Metadata',
href: 'https://www.spacejam.com/1996/cmp/junior/juniorframes.html',
href: 'https://healdata.org',
},
{
title: 'Link Data to the HEAL Platform',
href: 'https://www.spacejam.com/1996/cmp/souvenirs/souvenirsframes.html',
href: 'https://healdata.org',
},
],
},
Expand All @@ -26,24 +26,24 @@ export const resourceCalloutsData = [
links: [
{
title: 'Browse Studies and Data',
href: 'https://www.spacejam.com/1996/cmp/jamcentral/jamcentralframes.html',
href: 'https://healdata.org',
},
{
title: 'Request Access to Workspaces',
href: 'https://www.spacejam.com/1996/cmp/bball/bballframes.html',
href: 'https://healdata.org',
},
{
title: 'Explore Example Analyses',
href: 'https://www.spacejam.com/1996/cmp/tunes/tunesframes.html',
href: 'https://healdata.org',
},
{
title: 'View answers to FAQs',
href: 'https://www.spacejam.com/1996/cmp/jump/jumpframes.html',
href: 'https://healdata.org',
},
{
title:
'Watch tutorial videos to learn how to interact with the HEAL Platform',
href: 'https://www.spacejam.com/1996/cmp/behind/behindframes.html',
href: 'https://healdata.org',
},
],
},
Expand Down
19 changes: 19 additions & 0 deletions public/icons/HealIcons/Icon-Analyses-Nav.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added public/images/footer-nih-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
17 changes: 17 additions & 0 deletions src/lib/HealNav/HealFooter.stories.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import type { Meta, StoryObj } from '@storybook/react';
import { within, expect } from '@storybook/test';
import HealFooter from './HealFooter';

const meta = {
title: 'HomePage/HealFooter',
component: HealFooter,
} satisfies Meta<typeof HealFooter>;

export default meta;
type Story = StoryObj<typeof meta>;
export const Default: Story = {
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
await expect(canvas.getByTestId('heal-footer')).toBeInTheDocument();
},
};
99 changes: 99 additions & 0 deletions src/lib/HealNav/HealFooter.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
import Image from 'next/image';
import gen3Logo from '../../../public/images/gen3.png';
import ctdsLogo from '../../../public/images/ctds-logo.png';
import footerNihLogo from '../../../public/images/footer-nih-logo.png';

jarvisraymond-uchicago marked this conversation as resolved.
Show resolved Hide resolved
const HealFooter: React.FC = () => {
return (
<footer
data-testid="heal-footer"
className="bg-heal-dark_background min-h-[212px] text-white "
>
<div className="container mx-auto px-6 py-12 flex justify-between">
<div className="flex flex-wrap max-w-[400px] text-sm">
<div className="mb-3">
<a
href="https://ctds.uchicago.edu/gen3"
className="hover:opacity-85"
>
<Image
src={gen3Logo}
alt="GEN3"
className="w-[20%] sm:w-[58px] border-r-1 border-heal-blue_accent pr-2 sm:pr-3 inline"
/>
</a>
<a href="https://ctds.uchicago.edu/" className="hover:opacity-85">
<Image
src={ctdsLogo}
alt="Center for Translational Data Science at the University of Chicago"
className="w-[40%] sm:w-[105px] border-r-1 border-heal-blue_accent px-2 sm:px-3 inline"
/>
</a>
<a href="https://heal.nih.gov/" className="hover:opacity-85">
<Image
src={footerNihLogo}
alt="NIH HEAL INITIATIVE"
className="w-[20%] sm:w-[45px] pl-2 sm:pl-3 inline"
/>
</a>
</div>
<div>
The HEAL Data Platform is funded by the NIH HEAL Initiative. NIH
HEAL Initiative and Helping to End Addiction Long-term are service
marks of the U.S. Department of Health and Human Services.
</div>
<div className="mt-3">
<a
href="https://healdata.org"
className="underline hover:opacity-85"
>
NIH HEAL Initiative
</a>
<span className="hidden md:inline">&nbsp;|&nbsp;</span>
<a
href="https://healdata.org"
className="underline hover:opacity-85 block sm:inline mt-3 sm:mt-0"
>
HHS Responsible Disclosure Form
</a>
</div>
</div>

<div className="block md:flex justify-between max-w-[225px] ml-8 md:ml-0 md:mr-8">
<div className="flex-wrap mr-14 mb-8 md:mb-0">
<div className="mb-3 font-bold">PLATFORM</div>
<ul className="text-sm">
<li>
<a className="hover:underline" href="https://healdata.org/">
About HEAL
</a>
</li>
<li>
<a className="hover:underline" href="https://healdata.org/">
Contact Us
</a>
</li>
</ul>
</div>
<div className="flex-wrap">
<div className="mb-3 font-bold">HELP</div>
<ul className="text-sm">
<li>
<a className="hover:underline" href="https://healdata.org/">
Documentation
</a>
</li>
<li>
<a className="hover:underline" href="https://healdata.org/">
FAQ
</a>
</li>
</ul>
</div>
</div>
</div>
</footer>
);
};

export default HealFooter;
Loading