From 2bb3f552c454686625e04b849fe11f2a0ad3fc1a Mon Sep 17 00:00:00 2001 From: Aaron Couch Date: Thu, 16 May 2024 19:29:37 -0400 Subject: [PATCH] Update uswds sprite and content folders --- frontend/public/img/uswds-sprite.svg | 1 + .../content => app/process}/ProcessIntro.tsx | 0 .../content => app/process}/ProcessInvolved.tsx | 0 .../content => app/process}/ProcessMilestones.tsx | 0 frontend/src/app/process/page.tsx | 6 +++--- .../content => app/research}/ResearchArchetypes.tsx | 0 .../content => app/research}/ResearchImpact.tsx | 0 .../content => app/research}/ResearchIntro.tsx | 0 .../content => app/research}/ResearchMethodology.tsx | 0 .../content => app/research}/ResearchThemes.tsx | 0 frontend/src/app/research/page.tsx | 10 +++++----- frontend/src/components/USWDSIcon.tsx | 2 +- frontend/stories/components/ProcessContent.stories.tsx | 2 +- frontend/stories/components/ReaserchImpact.stories.tsx | 2 +- frontend/stories/components/ReaserchIntro.stories.tsx | 2 +- frontend/stories/components/ReaserchThemes.stories.tsx | 2 +- .../stories/components/ResearchArchetypes.stories.tsx | 2 +- .../stories/components/ResearchMethodology.stories.tsx | 2 +- frontend/tests/components/ProcessIntro.test.tsx | 2 +- frontend/tests/components/ProcessInvolved.test.tsx | 2 +- frontend/tests/components/ProcessMilestones.test.tsx | 2 +- frontend/tests/components/ResearchArchetypes.test.tsx | 2 +- frontend/tests/components/ResearchImpact.test.tsx | 2 +- frontend/tests/components/ResearchIntro.test.tsx | 2 +- frontend/tests/components/ResearchMethodology.test.tsx | 2 +- frontend/tests/components/ResearchThemes.test.tsx | 2 +- 26 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 frontend/public/img/uswds-sprite.svg rename frontend/src/{components/content => app/process}/ProcessIntro.tsx (100%) rename frontend/src/{components/content => app/process}/ProcessInvolved.tsx (100%) rename frontend/src/{components/content => app/process}/ProcessMilestones.tsx (100%) rename frontend/src/{components/content => app/research}/ResearchArchetypes.tsx (100%) rename frontend/src/{components/content => app/research}/ResearchImpact.tsx (100%) rename frontend/src/{components/content => app/research}/ResearchIntro.tsx (100%) rename frontend/src/{components/content => app/research}/ResearchMethodology.tsx (100%) rename frontend/src/{components/content => app/research}/ResearchThemes.tsx (100%) diff --git a/frontend/public/img/uswds-sprite.svg b/frontend/public/img/uswds-sprite.svg new file mode 100644 index 0000000000..8ae1eca922 --- /dev/null +++ b/frontend/public/img/uswds-sprite.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/components/content/ProcessIntro.tsx b/frontend/src/app/process/ProcessIntro.tsx similarity index 100% rename from frontend/src/components/content/ProcessIntro.tsx rename to frontend/src/app/process/ProcessIntro.tsx diff --git a/frontend/src/components/content/ProcessInvolved.tsx b/frontend/src/app/process/ProcessInvolved.tsx similarity index 100% rename from frontend/src/components/content/ProcessInvolved.tsx rename to frontend/src/app/process/ProcessInvolved.tsx diff --git a/frontend/src/components/content/ProcessMilestones.tsx b/frontend/src/app/process/ProcessMilestones.tsx similarity index 100% rename from frontend/src/components/content/ProcessMilestones.tsx rename to frontend/src/app/process/ProcessMilestones.tsx diff --git a/frontend/src/app/process/page.tsx b/frontend/src/app/process/page.tsx index d2bbebb81d..08e20efd88 100644 --- a/frontend/src/app/process/page.tsx +++ b/frontend/src/app/process/page.tsx @@ -5,9 +5,9 @@ import BetaAlert from "src/components/AppBetaAlert"; import Breadcrumbs from "src/components/Breadcrumbs"; import PageSEO from "src/components/PageSEO"; import { Metadata } from "next"; -import ProcessIntro from "src/components/content/ProcessIntro"; -import ProcessInvolved from "src/components/content/ProcessInvolved"; -import ProcessMilestones from "src/components/content/ProcessMilestones"; +import ProcessIntro from "src/app/process/ProcessIntro"; +import ProcessInvolved from "src/app/process/ProcessInvolved"; +import ProcessMilestones from "src/app/process/ProcessMilestones"; import { useTranslations } from "next-intl"; import { unstable_setRequestLocale } from "next-intl/server"; diff --git a/frontend/src/components/content/ResearchArchetypes.tsx b/frontend/src/app/research/ResearchArchetypes.tsx similarity index 100% rename from frontend/src/components/content/ResearchArchetypes.tsx rename to frontend/src/app/research/ResearchArchetypes.tsx diff --git a/frontend/src/components/content/ResearchImpact.tsx b/frontend/src/app/research/ResearchImpact.tsx similarity index 100% rename from frontend/src/components/content/ResearchImpact.tsx rename to frontend/src/app/research/ResearchImpact.tsx diff --git a/frontend/src/components/content/ResearchIntro.tsx b/frontend/src/app/research/ResearchIntro.tsx similarity index 100% rename from frontend/src/components/content/ResearchIntro.tsx rename to frontend/src/app/research/ResearchIntro.tsx diff --git a/frontend/src/components/content/ResearchMethodology.tsx b/frontend/src/app/research/ResearchMethodology.tsx similarity index 100% rename from frontend/src/components/content/ResearchMethodology.tsx rename to frontend/src/app/research/ResearchMethodology.tsx diff --git a/frontend/src/components/content/ResearchThemes.tsx b/frontend/src/app/research/ResearchThemes.tsx similarity index 100% rename from frontend/src/components/content/ResearchThemes.tsx rename to frontend/src/app/research/ResearchThemes.tsx diff --git a/frontend/src/app/research/page.tsx b/frontend/src/app/research/page.tsx index 212cb48a53..2d5a1f9303 100644 --- a/frontend/src/app/research/page.tsx +++ b/frontend/src/app/research/page.tsx @@ -1,13 +1,13 @@ import { RESEARCH_CRUMBS } from "src/constants/breadcrumbs"; -import ResearchIntro from "src/components/content/ResearchIntro"; +import ResearchIntro from "src/app/research/ResearchIntro"; import Breadcrumbs from "src/components/Breadcrumbs"; import PageSEO from "src/components/PageSEO"; import BetaAlert from "src/components/AppBetaAlert"; -import ResearchArchetypes from "src/components/content/ResearchArchetypes"; -import ResearchImpact from "src/components/content/ResearchImpact"; -import ResearchMethodology from "src/components/content/ResearchMethodology"; -import ResearchThemes from "src/components/content/ResearchThemes"; +import ResearchArchetypes from "src/app/research/ResearchArchetypes"; +import ResearchImpact from "src/app/research/ResearchImpact"; +import ResearchMethodology from "src/app/research/ResearchMethodology"; +import ResearchThemes from "src/app/research/ResearchThemes"; import { Metadata } from "next"; import { useTranslations } from "next-intl"; import { unstable_setRequestLocale } from "next-intl/server"; diff --git a/frontend/src/components/USWDSIcon.tsx b/frontend/src/components/USWDSIcon.tsx index 74bfca95dd..a47b839cee 100644 --- a/frontend/src/components/USWDSIcon.tsx +++ b/frontend/src/components/USWDSIcon.tsx @@ -1,4 +1,4 @@ -import SpriteSVG from "public/uswds/img/sprite.svg"; +import SpriteSVG from "public/img/uswds-sprite.svg"; interface IconProps { name: string; diff --git a/frontend/stories/components/ProcessContent.stories.tsx b/frontend/stories/components/ProcessContent.stories.tsx index 50284590f7..bff08bd1f8 100644 --- a/frontend/stories/components/ProcessContent.stories.tsx +++ b/frontend/stories/components/ProcessContent.stories.tsx @@ -1,5 +1,5 @@ import { Meta } from "@storybook/react"; -import ProcessContent from "src/components/content/ProcessIntro"; +import ProcessContent from "src/app/process/ProcessIntro"; const meta: Meta = { title: "Components/Content/Process Content", diff --git a/frontend/stories/components/ReaserchImpact.stories.tsx b/frontend/stories/components/ReaserchImpact.stories.tsx index fc89b95d90..7eed38bc7e 100644 --- a/frontend/stories/components/ReaserchImpact.stories.tsx +++ b/frontend/stories/components/ReaserchImpact.stories.tsx @@ -1,5 +1,5 @@ import { Meta } from "@storybook/react"; -import ResearchImpact from "src/components/content/ResearchImpact"; +import ResearchImpact from "src/app/research/ResearchImpact"; const meta: Meta = { title: "Components/Content/Research Impact Content", diff --git a/frontend/stories/components/ReaserchIntro.stories.tsx b/frontend/stories/components/ReaserchIntro.stories.tsx index 15c718a3ee..e4ad41b41f 100644 --- a/frontend/stories/components/ReaserchIntro.stories.tsx +++ b/frontend/stories/components/ReaserchIntro.stories.tsx @@ -1,5 +1,5 @@ import { Meta } from "@storybook/react"; -import ResearchIntro from "src/components/content/ResearchIntro"; +import ResearchIntro from "src/app/research/ResearchIntro"; const meta: Meta = { title: "Components/Content/Research Intro Content", diff --git a/frontend/stories/components/ReaserchThemes.stories.tsx b/frontend/stories/components/ReaserchThemes.stories.tsx index c83e1e673c..7c9b140e22 100644 --- a/frontend/stories/components/ReaserchThemes.stories.tsx +++ b/frontend/stories/components/ReaserchThemes.stories.tsx @@ -1,5 +1,5 @@ import { Meta } from "@storybook/react"; -import ResearchThemes from "src/components/content/ResearchThemes"; +import ResearchThemes from "src/app/research/ResearchThemes"; const meta: Meta = { title: "Components/Content/Research Themes Content", diff --git a/frontend/stories/components/ResearchArchetypes.stories.tsx b/frontend/stories/components/ResearchArchetypes.stories.tsx index a45c469af1..ccf9d23427 100644 --- a/frontend/stories/components/ResearchArchetypes.stories.tsx +++ b/frontend/stories/components/ResearchArchetypes.stories.tsx @@ -1,5 +1,5 @@ import { Meta } from "@storybook/react"; -import ResearchArchetypes from "src/components/content/ResearchArchetypes"; +import ResearchArchetypes from "src/app/research/ResearchArchetypes"; const meta: Meta = { title: "Components/Content/Research Archetypes Content", diff --git a/frontend/stories/components/ResearchMethodology.stories.tsx b/frontend/stories/components/ResearchMethodology.stories.tsx index 4ccefc39b7..5a77b547a5 100644 --- a/frontend/stories/components/ResearchMethodology.stories.tsx +++ b/frontend/stories/components/ResearchMethodology.stories.tsx @@ -1,5 +1,5 @@ import { Meta } from "@storybook/react"; -import ResearchMethodology from "src/components/content/ResearchMethodology"; +import ResearchMethodology from "src/app/research/ResearchMethodology"; const meta: Meta = { title: "Components/Content/Research Methodology Content", diff --git a/frontend/tests/components/ProcessIntro.test.tsx b/frontend/tests/components/ProcessIntro.test.tsx index c557dfd520..12a3437b1f 100644 --- a/frontend/tests/components/ProcessIntro.test.tsx +++ b/frontend/tests/components/ProcessIntro.test.tsx @@ -1,5 +1,5 @@ import { render, screen } from "tests/react-utils"; -import ProcessIntro from "src/components/content/ProcessIntro"; +import ProcessIntro from "src/app/process/ProcessIntro"; describe("Process Content", () => { it("Renders without errors", () => { diff --git a/frontend/tests/components/ProcessInvolved.test.tsx b/frontend/tests/components/ProcessInvolved.test.tsx index 9ac8744262..d72cbebbbc 100644 --- a/frontend/tests/components/ProcessInvolved.test.tsx +++ b/frontend/tests/components/ProcessInvolved.test.tsx @@ -1,5 +1,5 @@ import { render, screen } from "tests/react-utils"; -import ProcessInvolved from "src/components/content/ProcessInvolved"; +import ProcessInvolved from "src/app/process/ProcessInvolved"; describe("Process Content", () => { it("Renders without errors", () => { diff --git a/frontend/tests/components/ProcessMilestones.test.tsx b/frontend/tests/components/ProcessMilestones.test.tsx index 1d322533c1..74ed68c381 100644 --- a/frontend/tests/components/ProcessMilestones.test.tsx +++ b/frontend/tests/components/ProcessMilestones.test.tsx @@ -1,5 +1,5 @@ import { render, screen } from "tests/react-utils"; -import ProcessMilestones from "src/components/content/ProcessMilestones"; +import ProcessMilestones from "src/app/process/ProcessMilestones"; describe("Process Content", () => { it("Renders without errors", () => { diff --git a/frontend/tests/components/ResearchArchetypes.test.tsx b/frontend/tests/components/ResearchArchetypes.test.tsx index ee40469c29..8910bb06d3 100644 --- a/frontend/tests/components/ResearchArchetypes.test.tsx +++ b/frontend/tests/components/ResearchArchetypes.test.tsx @@ -1,5 +1,5 @@ import { render, screen } from "tests/react-utils"; -import ResearchArchetypes from "src/components/content/ResearchArchetypes"; +import ResearchArchetypes from "src/app/research/ResearchArchetypes"; describe("Research Content", () => { it("Renders without errors", () => { diff --git a/frontend/tests/components/ResearchImpact.test.tsx b/frontend/tests/components/ResearchImpact.test.tsx index 60058f27c9..47b9dd807c 100644 --- a/frontend/tests/components/ResearchImpact.test.tsx +++ b/frontend/tests/components/ResearchImpact.test.tsx @@ -1,5 +1,5 @@ import { render, screen } from "tests/react-utils"; -import ResearchImpact from "src/components/content/ResearchImpact"; +import ResearchImpact from "src/app/research/ResearchImpact"; describe("Research Content", () => { it("Renders without errors", () => { diff --git a/frontend/tests/components/ResearchIntro.test.tsx b/frontend/tests/components/ResearchIntro.test.tsx index 82df398ef2..de500ca853 100644 --- a/frontend/tests/components/ResearchIntro.test.tsx +++ b/frontend/tests/components/ResearchIntro.test.tsx @@ -1,5 +1,5 @@ import { render, screen } from "tests/react-utils"; -import ResearchIntro from "src/components/content/ResearchIntro"; +import ResearchIntro from "src/app/research/ResearchIntro"; describe("Research Content", () => { it("Renders without errors", () => { diff --git a/frontend/tests/components/ResearchMethodology.test.tsx b/frontend/tests/components/ResearchMethodology.test.tsx index e555d113b2..4388ed4f10 100644 --- a/frontend/tests/components/ResearchMethodology.test.tsx +++ b/frontend/tests/components/ResearchMethodology.test.tsx @@ -1,5 +1,5 @@ import { render, screen } from "tests/react-utils"; -import ResearchMethodology from "src/components/content/ResearchMethodology"; +import ResearchMethodology from "src/app/research/ResearchMethodology"; describe("Research Content", () => { it("Renders without errors", () => { diff --git a/frontend/tests/components/ResearchThemes.test.tsx b/frontend/tests/components/ResearchThemes.test.tsx index 6ee9a07baf..ecf35296ea 100644 --- a/frontend/tests/components/ResearchThemes.test.tsx +++ b/frontend/tests/components/ResearchThemes.test.tsx @@ -1,5 +1,5 @@ import { render, screen } from "tests/react-utils"; -import ResearchThemes from "src/components/content/ResearchThemes"; +import ResearchThemes from "src/app/research/ResearchThemes"; describe("Research Content", () => { it("Renders without errors", () => {