Skip to content

Commit bead381

Browse files
committed
fix: extract NavBarVariant to separate file to prevent circular imports
1 parent 5c98725 commit bead381

File tree

10 files changed

+21
-18
lines changed

10 files changed

+21
-18
lines changed

web/src/components/navbar/NavBar.tsx

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,7 @@ import { useUserData } from "@/lib/data-hooks/useUserData";
44
import { Task } from "@businessnjgovnavigator/shared/types";
55
import { ReactElement, useEffect, useState } from "react";
66

7-
export enum NavBarVariant {
8-
LOGO_ONLY = "LOGO_ONLY",
9-
LOGO_WITH_TEXT = "LOGO_WITH_TEXT",
10-
MINIMAL_WITH_LOGIN = "MINIMAL_WITH_LOGIN",
11-
FULL_LANDING = "FULL_LANDING",
12-
MINIMAL_WITH_DISABLED_DROPDOWN = "MINIMAL_WITH_DISABLED_DROPDOWN",
13-
FULL_AUTHENTICATED = "FULL_AUTHENTICATED",
14-
FULL_GUEST = "FULL_GUEST",
15-
}
7+
import { NavBarVariant } from "@/components/navbar/NavBarTypes";
168

179
type Props = {
1810
variant: NavBarVariant;
@@ -22,7 +14,6 @@ type Props = {
2214
hideMiniRoadmap?: boolean;
2315
previousBusinessId?: string | undefined;
2416
};
25-
2617
export const NavBar = (props: Props): ReactElement => {
2718
const [scrolled, setScrolled] = useState(false);
2819
const { userData } = useUserData();
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
export enum NavBarVariant {
2+
LOGO_ONLY = "LOGO_ONLY",
3+
LOGO_WITH_TEXT = "LOGO_WITH_TEXT",
4+
MINIMAL_WITH_LOGIN = "MINIMAL_WITH_LOGIN",
5+
FULL_LANDING = "FULL_LANDING",
6+
MINIMAL_WITH_DISABLED_DROPDOWN = "MINIMAL_WITH_DISABLED_DROPDOWN",
7+
FULL_AUTHENTICATED = "FULL_AUTHENTICATED",
8+
FULL_GUEST = "FULL_GUEST",
9+
}

web/src/components/navbar/desktop/NavBarDesktop.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { NavBarVariant } from "@/components/navbar/NavBar";
1+
import { NavBarVariant } from "@/components/navbar/NavBarTypes";
22
import { NavBarDesktop } from "@/components/navbar/desktop/NavBarDesktop";
33
import { randomPublicFilingLegalStructure } from "@/test/factories";
44
import { useMockRouter } from "@/test/mock/mockRouter";

web/src/components/navbar/desktop/NavBarDesktop.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ButtonIcon } from "@/components/ButtonIcon";
22
import { NavBarLoginButton } from "@/components/navbar/NavBarLoginButton";
3-
import { NavBarVariant } from "@/components/navbar/NavBar";
3+
import { NavBarVariant } from "@/components/navbar/NavBarTypes";
44
import { NavBarDesktopDropDown } from "@/components/navbar/desktop/NavBarDesktopDropDown";
55
import { NavBarDesktopHomeLogo } from "@/components/navbar/desktop/NavBarDesktopHomeLogo";
66
import { NavBarDesktopQuickLinks } from "@/components/navbar/desktop/NavBarDesktopQuickLinks";

web/src/components/navbar/mobile/NavBarMobile.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { NavBarVariant } from "@/components/navbar/NavBar";
1+
import { NavBarVariant } from "@/components/navbar/NavBarTypes";
22
import { NavBarMobile } from "@/components/navbar/mobile/NavBarMobile";
33
import { generateRoadmap, generateStep, generateTask } from "@/test/factories";
44
import { useMockRouter } from "@/test/mock/mockRouter";

web/src/components/navbar/mobile/NavBarMobile.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable react/jsx-key */
22
import { NavBarLoginButton } from "@/components/navbar/NavBarLoginButton";
3-
import { NavBarVariant } from "@/components/navbar/NavBar";
3+
import { NavBarVariant } from "@/components/navbar/NavBarTypes";
44
import { NavBarLogoOnlyMobile } from "@/components/navbar/mobile/NavBarLogoOnlyMobile";
55
import { NavBarMobileAccountSlideOutMenu } from "@/components/navbar/mobile/NavBarMobileAccountSlideOutMenu";
66
import { NavBarMobileHomeLogo } from "@/components/navbar/mobile/NavBarMobileHomeLogo";

web/src/components/njwds-layout/PageSkeleton.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { BetaBar } from "@/components/BetaBar";
22
import { LegalMessage } from "@/components/LegalMessage";
33
import { PageFooter } from "@/components/PageFooter";
44
import { SkipToMainContent } from "@/components/SkipToMainContent";
5-
import { NavBar, NavBarVariant } from "@/components/navbar/NavBar";
5+
import { NavBar } from "@/components/navbar/NavBar";
6+
import { NavBarVariant } from "@/components/navbar/NavBarTypes";
67
import { Banner } from "@/components/njwds/Banner";
78
import { AuthContext } from "@/contexts/authContext";
89
import { ROUTES } from "@/lib/domain-logic/routes";

web/src/lib/cms/previews/NavBarPreview.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { NavBarVariant } from "@/components/navbar/NavBar";
1+
import { NavBarVariant } from "@/components/navbar/NavBarTypes";
22
import { NavBarDesktop } from "@/components/navbar/desktop/NavBarDesktop";
33
import { NavBarMobile } from "@/components/navbar/mobile/NavBarMobile";
44
import { PreviewProps } from "@/lib/cms/helpers/previewHelpers";

web/src/pages/starter-kits/[starterKitsUrl].tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { NavBar, NavBarVariant } from "@/components/navbar/NavBar";
1+
import { NavBar } from "@/components/navbar/NavBar";
2+
import { NavBarVariant } from "@/components/navbar/NavBarTypes";
23
import { PageSkeleton } from "@/components/njwds-layout/PageSkeleton";
34
import { StarterKitsBody } from "@/components/starter-kits/StarterKitsBody";
45
import {

web/src/pages/starter-kits/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { NavBar, NavBarVariant } from "@/components/navbar/NavBar";
1+
import { NavBar } from "@/components/navbar/NavBar";
2+
import { NavBarVariant } from "@/components/navbar/NavBarTypes";
23
import { PageSkeleton } from "@/components/njwds-layout/PageSkeleton";
34
import { SingleColumnContainer } from "@/components/njwds/SingleColumnContainer";
45
import { PageCircularIndicator } from "@/components/PageCircularIndicator";

0 commit comments

Comments
 (0)