diff --git a/components/Current/Footer/Navigation.tsx b/components/Current/Footer/Navigation.tsx index 50bc4e56f..7bf752903 100644 --- a/components/Current/Footer/Navigation.tsx +++ b/components/Current/Footer/Navigation.tsx @@ -1,49 +1,24 @@ -import { - FooterNavigationProps, - FooterNavigationItemProps, -} from "@/types/components/current/footer" -import Link from "next/link" +import type { FooterNavigationProps } from "@/types/components/current/footer" -function NavigationItem({ linkObject, lang }: FooterNavigationItemProps) { - if (linkObject.__typename === "FooterNavigationLinksInternalLink") { - const href = `/${lang}${linkObject.internal_link.pageConnection.edges[0].node.url}` - return ( -
  • - {linkObject.internal_link.link_text} -
  • - ) - } - return ( -
  • - - {linkObject.external_link.link.title} - -
  • - ) -} - -export default function Navigation({ - linkGroups, - lang, -}: FooterNavigationProps) { +export default function Navigation({ linkGroups }: FooterNavigationProps) { return ( ) } diff --git a/components/Current/Footer/index.tsx b/components/Current/Footer/index.tsx index 7e2347659..9b98e91fa 100644 --- a/components/Current/Footer/index.tsx +++ b/components/Current/Footer/index.tsx @@ -40,7 +40,7 @@ export default async function Footer({ lang }: LangParams) { data-js-collapsible="global-footer" className="collapsible-global-footer" > - +

    diff --git a/lib/graphql/Fragments/Footer/Navigation.graphql b/lib/graphql/Fragments/Footer/Navigation.graphql index 9274a7048..10a425980 100644 --- a/lib/graphql/Fragments/Footer/Navigation.graphql +++ b/lib/graphql/Fragments/Footer/Navigation.graphql @@ -1,33 +1,9 @@ -#import "../PageLinks.graphql" - fragment Navigation on Footer { navigation { links { - ... on FooterNavigationLinksInternalLink { - __typename - internal_link { - link_text - pageConnection { - edges { - node { - __typename - ...CurrentBlocksPageLink - } - } - } - } - } - ... on FooterNavigationLinksExternalLink { - __typename - external_link { - link { - href - title - } - } - } + href + title } - title } } diff --git a/types/components/current/footer.ts b/types/components/current/footer.ts index c1c0755e2..1e2e687ad 100644 --- a/types/components/current/footer.ts +++ b/types/components/current/footer.ts @@ -1,16 +1,5 @@ -import { Lang } from "@/types/lang" -import { - ExternalLink, - InternalLink, - NavigationItem, -} from "@/types/requests/footer" +import type { NavigationItem } from "@/types/requests/footer" export type FooterNavigationProps = { linkGroups: NavigationItem[] - lang: Lang -} - -export type FooterNavigationItemProps = { - linkObject: InternalLink | ExternalLink - lang: Lang } diff --git a/types/requests/footer.ts b/types/requests/footer.ts index f30fd5a01..9b9a8162e 100644 --- a/types/requests/footer.ts +++ b/types/requests/footer.ts @@ -1,33 +1,19 @@ import type { AllRequestResponse } from "./utils/all" import type { Edges } from "./utils/edges" import type { Image } from "../image" -import type { PageLink } from "./utils/pageLink" type AppDownload = { href: string imageConnection: Edges } -export type InternalLink = { - __typename: "FooterNavigationLinksInternalLink" - internal_link: { - link_text: string - pageConnection: Edges - } -} - -export type ExternalLink = { - __typename: "FooterNavigationLinksExternalLink" - external_link: { - link: { - href: string - title: string - } - } +export type Link = { + href: string + title: string } export type NavigationItem = { - links: (ExternalLink | InternalLink)[] + links: Link[] title: string }