Revert "using aliases for imports"

This reverts commit bdabc74.

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 = {

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 }) => {

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;
 

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";

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 = {

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";

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
 

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";
 
 /**

tsconfig.json

@@ -23,8 +23,7 @@
       "@/context/*": ["context/*"],
       "@/services/*": ["services/*"],
       "@/content/*": ["content/*"],
-      "@/helpers/*": ["helpers/*"],
-      "@/hooks/*": ["hooks/*"]
+      "@/helpers/*": ["helpers/*"]
     },
     "plugins": [
       {