🐛 Footer - DayJS RelativeTime Error (#926)

* Moved DayJS module extensions to root file * Removed commented imports from footer * Remove comment --------- Co-authored-by: Brady Stroud [SSW] <[email protected]>
SSWConsulting · Jul 4, 2023 · 7574560 · 7574560
1 parent a690dcd
commit 7574560
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 32 deletions.
diff --git a/components/blocks/aboutUs.tsx b/components/blocks/aboutUs.tsx
@@ -1,7 +1,5 @@
 import classNames from "classnames";
 import dayjs from "dayjs";
-import timezone from "dayjs/plugin/timezone";
-import utc from "dayjs/plugin/utc";
 import Link from "next/link";
 import { useEffect, useState } from "react";
 import type { Template } from "tinacms";
@@ -14,9 +12,6 @@ import { Container } from "../util/container";
 import { Section } from "../util/section";
 import { VideoModal } from "../videoModal";
 
-dayjs.extend(timezone);
-dayjs.extend(utc);
-
 const DAY_KEYS = {
   Sunday: 0,
   Monday: 1,

diff --git a/components/blocks/upcomingEvents.tsx b/components/blocks/upcomingEvents.tsx
@@ -1,7 +1,4 @@
 import dayjs from "dayjs";
-import isBetween from "dayjs/plugin/isBetween";
-import relativeTime from "dayjs/plugin/relativeTime";
-import utc from "dayjs/plugin/utc";
 import Image from "next/image";
 import Link from "next/link";
 import { useEffect, useState } from "react";
@@ -11,10 +8,6 @@ import { tinaField } from "tinacms/dist/react";
 import axios from "axios";
 import { EventInfo, LiveStreamBannerInfo } from "../../services/server/events";
 
-dayjs.extend(utc);
-dayjs.extend(isBetween);
-dayjs.extend(relativeTime);
-
 export const UpcomingEvents = ({ data }) => {
   const [events, setEvents] = useState([]);
   const [loading, setLoading] = useState(false);

diff --git a/components/layout/footer.tsx b/components/layout/footer.tsx
@@ -1,17 +1,10 @@
 import dayjs from "dayjs";
-import relativeTime from "dayjs/plugin/relativeTime";
-import timezone from "dayjs/plugin/timezone";
-import utc from "dayjs/plugin/utc";
 import dynamic from "next/dynamic";
 import Image from "next/image";
 import Link from "next/link";
 import { Container } from "../util/container";
 import { SocialIcons, SocialTypes } from "../util/socialIcons";
 
-dayjs.extend(timezone);
-dayjs.extend(utc);
-dayjs.extend(relativeTime);
-
 export const Footer = () => {
   return (
     <footer className="no-print w-full bg-gray-900 text-xxs text-gray-300">

diff --git a/components/liveStream/liveStreamBanner.tsx b/components/liveStream/liveStreamBanner.tsx
@@ -1,22 +1,11 @@
 import classNames from "classnames";
 import dayjs from "dayjs";
-import advancedFormat from "dayjs/plugin/advancedFormat";
-import isBetween from "dayjs/plugin/isBetween";
-import relativeTime from "dayjs/plugin/relativeTime";
-import timezone from "dayjs/plugin/timezone";
-import utc from "dayjs/plugin/utc";
 import Link from "next/link";
 import { useRouter } from "next/router";
 import { FC, useEffect, useState } from "react";
 import countdownTextFormat from "../../helpers/countdownTextFormat";
 import { LiveStreamProps } from "./useLiveStreamProps";
 
-dayjs.extend(utc);
-dayjs.extend(isBetween);
-dayjs.extend(relativeTime);
-dayjs.extend(advancedFormat);
-dayjs.extend(timezone);
-
 export const LiveStreamBanner: FC<LiveStreamProps> = ({
   countdownMins,
   liveStreamDelayMinutes,

diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -5,10 +5,10 @@ import { useRouter } from "next/router";
 import { useEffect } from "react";
 import "react-responsive-modal/styles.css";
 import "react-tooltip/dist/react-tooltip.css";
+import "ssw.megamenu/dist/style.css";
 import { Analytics } from "../components/layout/analytics";
 import * as gtag from "../lib/gtag";
 import { NEXT_SEO_DEFAULT } from "../next-seo.config";
-import "ssw.megamenu/dist/style.css";
 import "../styles.css";
 
 import ZendeskButton from "../components/zendeskButton/zendeskButton";
@@ -17,6 +17,20 @@ const zendesk = process.env.NEXT_PUBLIC_ZENDESK_CHAT_KEY;
 import "@fortawesome/fontawesome-svg-core/styles.css";
 import AzureAppInsights from "../context/app-insight-client";
 
+// DayJS module addition as per https://github.com/iamkun/dayjs/issues/1577
+import dayjs from "dayjs";
+import advancedFormat from "dayjs/plugin/advancedFormat";
+import isBetween from "dayjs/plugin/isBetween";
+import relativeTime from "dayjs/plugin/relativeTime";
+import timezone from "dayjs/plugin/timezone";
+import utc from "dayjs/plugin/utc";
+
+dayjs.extend(relativeTime);
+dayjs.extend(timezone);
+dayjs.extend(utc);
+dayjs.extend(advancedFormat);
+dayjs.extend(isBetween);
+
 const isDev = process.env.NODE_ENV === "development";
 
 const App = ({ Component, pageProps }) => {

diff --git a/pages/consulting/index.tsx b/pages/consulting/index.tsx
@@ -12,11 +12,12 @@ import { wrapGrid } from "animate-css-grid";
 import { useTina } from "tinacms/dist/react";
 import { client } from "../../.tina/__generated__/client";
 
+import { InferGetStaticPropsType } from "next";
+import { Blocks } from "../../components/blocks-renderer";
 import { Breadcrumbs } from "../../components/blocks/breadcrumbs";
 import { Layout } from "../../components/layout";
 import { Container } from "../../components/util/container";
 import { SEO } from "../../components/util/seo";
-import { InferGetStaticPropsType } from "next";
 
 const allServices = "All SSW Services";
 
@@ -97,6 +98,7 @@ export default function ConsultingIndex(
     <Layout>
       <SEO seo={{ ...seo, canonical: "/consulting" }} />
       <Container className="flex-1 pt-2">
+        <Blocks prefix={"ConsultingAfterBody"} blocks={[]} />
         <Breadcrumbs path={"/consulting"} suffix="" title={"Services"} />
         <h1 className="pt-0 text-3xl">Consulting Services</h1>
         <div className="flex flex-col md:flex-row">