From 7fd4149f0aa9681674d143be2bcc6eac050b427e Mon Sep 17 00:00:00 2001 From: andrewwaltosssw Date: Tue, 18 Jun 2024 09:43:15 +1000 Subject: [PATCH] Revert "using aliases for imports" This reverts commit bdabc748f654ce83f5c1b7989c88ff181e156048. --- app/live-steam-banner/liveStreamWidget.tsx | 2 +- components/blocks/upcomingEvents.tsx | 2 +- components/filter/events.tsx | 10 +++++----- components/layout/layout.tsx | 2 +- components/liveStream/liveStreamBanner.tsx | 4 ++-- components/liveStream/liveStreamWidget.tsx | 4 ++-- pages/events/index.tsx | 14 +++++++------- services/server/events.ts | 4 ++-- tsconfig.json | 3 +-- 9 files changed, 22 insertions(+), 23 deletions(-) diff --git a/app/live-steam-banner/liveStreamWidget.tsx b/app/live-steam-banner/liveStreamWidget.tsx index 5092bf3820..68d2eecaf7 100644 --- a/app/live-steam-banner/liveStreamWidget.tsx +++ b/app/live-steam-banner/liveStreamWidget.tsx @@ -15,7 +15,7 @@ import Script from "next/script"; import { useEffect, useState } from "react"; import { TfiAngleDown, TfiAngleUp } from "react-icons/tfi"; import { Tooltip } from "react-tooltip"; -import { LiveStreamProps } from "@/hooks/useLiveStreamProps"; +import { LiveStreamProps } from "../../hooks/useLiveStreamProps"; import { TinaMarkdown } from "tinacms/dist/rich-text"; type LiveStreamWidgetProps = { diff --git a/components/blocks/upcomingEvents.tsx b/components/blocks/upcomingEvents.tsx index 8637edebd6..c693db55ba 100644 --- a/components/blocks/upcomingEvents.tsx +++ b/components/blocks/upcomingEvents.tsx @@ -8,7 +8,7 @@ import { tinaField } from "tinacms/dist/react"; import { useFormatDates } from "../../hooks/useFormatDates"; import { CustomLink } from "../customLink"; import { EventsRelativeBox } from "../events/eventsRelativeBox"; -import client from "@/tina/client"; +import client from "../../tina/__generated__/client"; import { EventTrimmed } from "../filter/events"; export const UpcomingEvents = ({ data }) => { diff --git a/components/filter/events.tsx b/components/filter/events.tsx index 1e4db85ae8..52dbacf889 100644 --- a/components/filter/events.tsx +++ b/components/filter/events.tsx @@ -7,7 +7,11 @@ import { FaSpinner } from "react-icons/fa"; import type { Event, WithContext } from "schema-dts"; import { TinaMarkdown, TinaMarkdownContent } from "tinacms/dist/rich-text"; -import { useEvents } from "@/hooks/useEvents"; +import { useEvents } from "../../hooks/useEvents"; +import { + useFetchFutureEvents, + useFetchPastEvents, +} from "../../hooks/useFetchEvents"; import { useFormatDates } from "../../hooks/useFormatDates"; import { UtilityButton } from "../blocks"; import { componentRenderer } from "../blocks/mdxComponentRenderer"; @@ -16,10 +20,6 @@ import { EventsRelativeBox } from "../events/eventsRelativeBox"; import { CITY_MAP } from "../util/constants/country"; import { sswOrganisation } from "../util/constants/json-ld"; import { FilterBlock } from "./FilterBlock"; -import { - useFetchFutureEvents, - useFetchPastEvents, -} from "@/hooks/useFetchEvents"; const EVENTS_JSON_LD_LIMIT = 5; diff --git a/components/layout/layout.tsx b/components/layout/layout.tsx index 260b75578e..2b8cc320f5 100644 --- a/components/layout/layout.tsx +++ b/components/layout/layout.tsx @@ -1,7 +1,7 @@ import classNames from "classnames"; import Head from "next/head"; import { useRouter } from "next/router"; -import { useLiveStreamProps } from "@/hooks/useLiveStreamProps"; +import { useLiveStreamProps } from "../../hooks/useLiveStreamProps"; import { Footer } from "./footer/footer"; import { PreFooter } from "./footer/pre-footer"; import { Theme } from "./theme"; diff --git a/components/liveStream/liveStreamBanner.tsx b/components/liveStream/liveStreamBanner.tsx index de886a54f3..537335c4ab 100644 --- a/components/liveStream/liveStreamBanner.tsx +++ b/components/liveStream/liveStreamBanner.tsx @@ -3,8 +3,8 @@ import classNames from "classnames"; import dayjs from "dayjs"; import { useEffect, useState } from "react"; -import countdownTextFormat from "@/helpers/countdownTextFormat"; -import { LiveStreamProps } from "@/hooks/useLiveStreamProps"; +import countdownTextFormat from "../../helpers/countdownTextFormat"; +import { LiveStreamProps } from "../../hooks/useLiveStreamProps"; import { CustomLink } from "../customLink"; type LiveStreamBannerProps = { diff --git a/components/liveStream/liveStreamWidget.tsx b/components/liveStream/liveStreamWidget.tsx index 8f34fe1c9a..394e8934a2 100644 --- a/components/liveStream/liveStreamWidget.tsx +++ b/components/liveStream/liveStreamWidget.tsx @@ -12,8 +12,8 @@ import { Tooltip } from "react-tooltip"; import layoutData, { default as globals, } from "../../content/global/index.json"; -import { getYouTubeId } from "@/helpers/embeds"; -import { LiveStreamProps } from "@/hooks/useLiveStreamProps"; +import { getYouTubeId } from "../../helpers/embeds"; +import { LiveStreamProps } from "../../hooks/useLiveStreamProps"; import { InlineJotForm } from "../blocks"; import { CustomLink } from "../customLink"; import { YouTubeEmbed } from "../embeds/youtubeEmbed"; diff --git a/pages/events/index.tsx b/pages/events/index.tsx index 2be6b09b2d..9a9d5d0c64 100644 --- a/pages/events/index.tsx +++ b/pages/events/index.tsx @@ -3,12 +3,12 @@ import { useRouter } from "next/router"; import type { InferGetStaticPropsType } from "next"; import { useTina } from "tinacms/dist/react"; import { TinaMarkdown } from "tinacms/dist/rich-text"; -import { Blocks } from "@/components/blocks-renderer"; -import { componentRenderer } from "@/components/blocks/mdxComponentRenderer"; -import { EventsFilter } from "@/components/filter/events"; -import { Layout } from "@/components/layout"; -import { Container } from "@/components/util/container"; -import { SEO } from "@/components/util/seo"; +import { Blocks } from "../../components/blocks-renderer"; +import { componentRenderer } from "../../components/blocks/mdxComponentRenderer"; +import { EventsFilter } from "../../components/filter/events"; +import { Layout } from "../../components/layout"; +import { Container } from "../../components/util/container"; +import { SEO } from "../../components/util/seo"; import { HydrationBoundary, QueryClient, @@ -17,7 +17,7 @@ import { import { FUTURE_EVENTS_QUERY_KEY, getFutureEvents, -} from "@/hooks/useFetchEvents"; +} from "../../hooks/useFetchEvents"; const ISR_TIME = 60 * 60; // 1 hour diff --git a/services/server/events.ts b/services/server/events.ts index 22bd5d33ed..d183ad2510 100644 --- a/services/server/events.ts +++ b/services/server/events.ts @@ -1,5 +1,5 @@ -import { EventTrimmed } from "@/components/filter/events"; -import client from "@/tina/client"; +import { EventTrimmed } from "../../components/filter/events"; +import client from "../../tina/__generated__/client"; import { TinaMarkdownContent } from "tinacms/dist/rich-text"; /** diff --git a/tsconfig.json b/tsconfig.json index fa40711681..61ec1e8aad 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -23,8 +23,7 @@ "@/context/*": ["context/*"], "@/services/*": ["services/*"], "@/content/*": ["content/*"], - "@/helpers/*": ["helpers/*"], - "@/hooks/*": ["hooks/*"] + "@/helpers/*": ["helpers/*"] }, "plugins": [ {