Skip to content

Commit 8c2b061

Browse files
authored
TinaCMS - Adding lock file (SSWConsulting#2453)
* Tina - Adding lockfile * Adding module path rendering * Fixing the path for the Tina client * Updating the megamenu api for the Tina's client reference * Fixing modular path issue within Tina * Fixing lint issues * Removing unused variable from the opportunity collection * Adding TODO to use alias with the Tina issue * Adding passing badge for the action
1 parent fe514bf commit 8c2b061

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+111
-171
lines changed

.tina/__generated__/.gitignore

-13
This file was deleted.

.tina/__generated__/_graphql.json

-1
This file was deleted.

.tina/__generated__/_lookup.json

-1
This file was deleted.

.tina/__generated__/_schema.json

-1
This file was deleted.

.tina/__generated__/popup.module-3WYFHLT2.css

-44
This file was deleted.

.tina/__generated__/popup.module-4FC6UIJG.css

-44
This file was deleted.

.tina/__generated__/static-media.json

-1
This file was deleted.

.tina/__generated__/training.module-IJDVUL7D.css

-7
This file was deleted.

README.md

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
This repository is a v3 of the zzSSW.Website. This website uses NextJS with TinaCMS.
66

7+
![](https://github.com/SSWConsulting/SSW.Website/actions/workflows/main-build-and-deploy.yml/badge.svg?)
8+
79
**Watch the demo:**
810

911
[![YouTube video](_docs/video-thumbnail.png)](https://www.youtube.com/watch?v=K0WVfM7yCKg)

components/blocks/newslettersTable.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { useEffect, useState } from "react";
22
import { FaSpinner } from "react-icons/fa";
33
import type { Template } from "tinacms";
4-
import client from "../../.tina/__generated__/client";
54
import { transformIntToMonth } from "../../services/client/date.service";
5+
import client from "../../tina/__generated__/client"; // TODO: Use alias - https://github.com/tinacms/tinacms/issues/4488
66
import { CustomLink } from "../customLink";
77

88
type NewsletterYearsType = {

components/blocks/payment-block.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Image from "next/image";
22
import type { Template } from "tinacms";
33
import { tinaField } from "tinacms/dist/react";
44
import { TinaMarkdown } from "tinacms/dist/rich-text";
5-
import { paymentDetailsBlockConstant } from "../../.tina/collections/payment-details";
5+
import { paymentDetailsBlockConstant } from "../../tina/collections/payment-details"; // TODO: Use alias - https://github.com/tinacms/tinacms/issues/4488
66

77
export type PaymentBlockProps = {
88
bankName: string;

components/company/companyHeader.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import { companyIndexSchemaConstants } from "@/tina-collections/company";
12
import { tinaField } from "tinacms/dist/react";
2-
import { companyIndexSchemaConstants } from "../../.tina/collections/company";
33
import { Section } from "../util/section";
44

55
const CompanyHeader = ({ data, schema }) => {

components/company/companyPageCard.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import { companyIndexSchemaConstants } from "@/tina-collections/company";
12
import { tinaField } from "tinacms/dist/react";
23
import { TinaMarkdown, TinaMarkdownContent } from "tinacms/dist/rich-text";
3-
import { companyIndexSchemaConstants } from "../../.tina/collections/company";
44
import { CustomLink } from "../customLink";
55

66
export type CompanyIndexProps = {

components/training/locationBlock.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { FaGlobe, FaLocationArrow } from "react-icons/fa";
33
import { MdLocationOn } from "react-icons/md";
44
import type { Template } from "tinacms";
55
import { tinaField } from "tinacms/dist/react";
6-
import { locationSchemaConstants } from "../../.tina/collections/location";
6+
import { locationSchemaConstants } from "../../tina/collections/location"; // TODO: Use alias - https://github.com/tinacms/tinacms/issues/4488
77
import { CustomLink } from "../customLink";
88
import { Container } from "../util/container";
99

components/training/presenterBlock.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Image from "next/image";
22
import type { Template } from "tinacms";
33
import { tinaField } from "tinacms/dist/react";
44
import { TinaMarkdown } from "tinacms/dist/rich-text";
5-
import { presenterSchemaConstants } from "../../.tina/collections/presenter";
5+
import { presenterSchemaConstants } from "../../tina/collections/presenter"; // TODO: Use alias - https://github.com/tinacms/tinacms/issues/4488
66
import { CustomLink } from "../customLink";
77
import { Container } from "../util/container";
88

jest.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ const config: Config = {
9292
"\\\\node_modules\\\\",
9393
"\\\\ui-tests\\\\",
9494
"\\\\public\\\\",
95-
"\\\\.tina\\\\",
95+
"\\\\tina\\\\",
9696
],
9797

9898
// A list of reporter names that Jest uses when writing coverage reports

pages/404.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Layout } from "@/components/layout";
22
import { ErrorPage } from "@/components/util/error-page";
3+
import client from "@/tina/client";
34
import { InferGetStaticPropsType } from "next";
4-
import client from "../.tina/__generated__/client";
55

66
export default function FourOhFour(
77
props: InferGetStaticPropsType<typeof getStaticProps>

pages/500.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Layout } from "@/components/layout";
22
import { ErrorPage } from "@/components/util/error-page";
3+
import client from "@/tina/client";
34
import { useAppInsightsContext } from "@microsoft/applicationinsights-react-js";
45
import { InferGetStaticPropsType } from "next";
56
import { useEffect } from "react";
6-
import client from "../.tina/__generated__/client";
77

88
export default function FiveHundred(
99
props: InferGetStaticPropsType<typeof getStaticProps>

pages/[...filename].tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { Blocks } from "@/components/blocks-renderer";
22
import { componentRenderer } from "@/components/blocks/mdxComponentRenderer";
3+
import classNames from "classnames";
34
import { InferGetStaticPropsType } from "next";
45
import Head from "next/head";
56
import { WebSite, WithContext } from "schema-dts";
67
import { tinaField, useTina } from "tinacms/dist/react";
78
import { TinaMarkdown } from "tinacms/dist/rich-text";
8-
import classNames from "classnames";
99

10-
import { client } from "../.tina/__generated__/client";
10+
import { client } from "@/tina/client";
1111
import { pageBlocks } from "../components/blocks";
1212
import { Breadcrumbs } from "../components/blocks/breadcrumbs";
1313
import { Layout } from "../components/layout";

pages/api/get-megamenu.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import client from "@/tina/client";
12
import * as appInsights from "applicationinsights";
23
import { NextApiRequest, NextApiResponse } from "next";
34
import { cache } from "services/server/cacheService";
4-
import client from "../../.tina/__generated__/client";
55
import megaMenuJson from "../../content/megamenu/menu.json";
66

77
const CACHE_MINS = 60;

pages/company/clients/[filename].tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import client from "@/tina/client";
12
import { InferGetStaticPropsType } from "next";
23
import { tinaField, useTina } from "tinacms/dist/react";
34
import { TinaMarkdown } from "tinacms/dist/rich-text";
4-
import client from "../../../.tina/__generated__/client";
55
import { BuiltOnAzure } from "../../../components/blocks";
66
import { Blocks } from "../../../components/blocks-renderer";
77
import { Breadcrumbs } from "../../../components/blocks/breadcrumbs";

pages/company/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import client from "@/tina/client";
12
import { InferGetStaticPropsType } from "next";
23
import { tinaField, useTina } from "tinacms/dist/react";
34
import { TinaMarkdown } from "tinacms/dist/rich-text";
4-
import client from "../../.tina/__generated__/client";
55
import { BuiltOnAzure } from "../../components/blocks";
66
import { Breadcrumbs } from "../../components/blocks/breadcrumbs";
77
import { componentRenderer } from "../../components/blocks/mdxComponentRenderer";

pages/company/partners.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import { client } from "@/tina/client";
12
import { useTina } from "tinacms/dist/react";
2-
import { client } from "../../.tina/__generated__/client";
33

44
import { InferGetStaticPropsType } from "next";
55
import { Breadcrumbs } from "../../components/blocks/breadcrumbs";

pages/consulting/[filename].tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { tinaField, useTina } from "tinacms/dist/react";
22
import { TinaMarkdown } from "tinacms/dist/rich-text";
33

4+
import { client } from "@/tina/client";
45
import { InferGetStaticPropsType } from "next";
56
import { ReactElement } from "react";
67
import ReactDOMServer from "react-dom/server";
7-
import { client } from "../../.tina/__generated__/client";
88
import { BuiltOnAzure, ClientLogos } from "../../components/blocks";
99
import { Blocks } from "../../components/blocks-renderer";
1010
import { Booking } from "../../components/blocks/booking";

pages/consulting/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { MdLiveHelp } from "react-icons/md";
44

55
import { wrapGrid } from "animate-css-grid";
66

7+
import { client } from "@/tina/client";
78
import { tinaField, useTina } from "tinacms/dist/react";
8-
import { client } from "../../.tina/__generated__/client";
99

1010
import { InferGetStaticPropsType } from "next";
1111
import { ParsedUrlQuery } from "querystring";

pages/consulting/video-production/[filename].tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { InferGetStaticPropsType } from "next";
22

3+
import { client } from "@/tina/client";
34
import { tinaField, useTina } from "tinacms/dist/react";
45
import { TinaMarkdown } from "tinacms/dist/rich-text";
5-
import { client } from "../../../.tina/__generated__/client";
66

77
import { ReactElement } from "react";
88
import { BuiltOnAzure } from "../../../components/blocks";

pages/employment/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { tinaField, useTina } from "tinacms/dist/react";
22
import { TinaMarkdown } from "tinacms/dist/rich-text";
33

4+
import { client } from "@/tina/client";
45
import { InferGetStaticPropsType } from "next";
5-
import { client } from "../../.tina/__generated__/client";
66
import { BuiltOnAzure } from "../../components/blocks";
77
import { Booking } from "../../components/blocks/booking";
88
import { Breadcrumbs } from "../../components/blocks/breadcrumbs";

pages/events/[filename].tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { tinaField, useTina } from "tinacms/dist/react";
22

3+
import { client } from "@/tina/client";
34
import { InferGetStaticPropsType } from "next";
45
import { TinaMarkdown } from "tinacms/dist/rich-text";
5-
import { client } from "../../.tina/__generated__/client";
66
import { ClientLogos } from "../../components/blocks";
77
import { Blocks } from "../../components/blocks-renderer";
88
import { Breadcrumbs } from "../../components/blocks/breadcrumbs";

pages/events/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import client from "@/tina/client";
12
import {
23
HydrationBoundary,
34
QueryClient,
@@ -10,7 +11,6 @@ import type { InferGetStaticPropsType } from "next";
1011
import { getEvents } from "services/server/events";
1112
import { useTina } from "tinacms/dist/react";
1213
import { TinaMarkdown } from "tinacms/dist/rich-text";
13-
import client from "../../.tina/__generated__/client";
1414
import { Blocks } from "../../components/blocks-renderer";
1515
import { componentRenderer } from "../../components/blocks/mdxComponentRenderer";
1616
import { EventTrimmed, EventsFilter } from "../../components/filter/events";

pages/industry/[filename].tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import { client } from "@/tina/client";
12
import { InferGetStaticPropsType } from "next";
23
import Image from "next/image";
34
import { tinaField, useTina } from "tinacms/dist/react";
45
import { TinaMarkdown } from "tinacms/dist/rich-text";
5-
import { client } from "../../.tina/__generated__/client";
66
import { BuiltOnAzure } from "../../components/blocks";
77
import { Breadcrumbs } from "../../components/blocks/breadcrumbs";
88
import {

pages/live.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { ReadMore } from "@/components/usergroup/readMore";
2+
import { client } from "@/tina/client";
23
import { InferGetStaticPropsType } from "next";
34
import { FaYoutube } from "react-icons/fa";
45
import { useTina } from "tinacms/dist/react";
5-
import { client } from "../.tina/__generated__/client";
66
import { Breadcrumbs } from "../components/blocks/breadcrumbs";
77
import { BuiltOnAzure } from "../components/blocks/builtOnAzure";
88
import { YoutubePlaylistBlock } from "../components/blocks/youtubePlaylist";

pages/netug/[[...filename]].tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import client from "@/tina/client";
12
import classNames from "classnames";
23
import { InferGetStaticPropsType } from "next";
34
import { tinaField, useTina } from "tinacms/dist/react";
45
import { TinaMarkdown } from "tinacms/dist/rich-text";
5-
import client from "../../.tina/__generated__/client";
66
import {
77
BuiltOnAzure,
88
GoogleMapsWrapper,

pages/offices/[filename].tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import Image from "next/image";
22

3+
import { client } from "@/tina/client";
34
import { tinaField, useTina } from "tinacms/dist/react";
45
import { TinaMarkdown } from "tinacms/dist/rich-text";
5-
import { client } from "../../.tina/__generated__/client";
66

77
import { InferGetStaticPropsType } from "next";
88
import { BuiltOnAzure } from "../../components/blocks";

pages/offices/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import { client } from "@/tina/client";
12
import { InferGetStaticPropsType } from "next";
23
import Image from "next/image";
34
import { useTina } from "tinacms/dist/react";
4-
import { client } from "../../.tina/__generated__/client";
55
import { Breadcrumbs } from "../../components/blocks/breadcrumbs";
66
import { Flag } from "../../components/blocks/flag";
77
import { CustomLink } from "../../components/customLink";

pages/products/[filename].tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import client from "@/tina/client";
12
import { InferGetStaticPropsType } from "next";
23
import { useTina } from "tinacms/dist/react";
34
import { TinaMarkdown } from "tinacms/dist/rich-text";
4-
import client from "../../.tina/__generated__/client";
55
import { Breadcrumbs } from "../../components/blocks/breadcrumbs";
66
import { componentRenderer } from "../../components/blocks/mdxComponentRenderer";
77
import { Layout } from "../../components/layout";

pages/products/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import { client } from "@/tina/client";
12
import { useTina } from "tinacms/dist/react";
2-
import { client } from "../../.tina/__generated__/client";
33

44
import { InferGetStaticPropsType } from "next";
55
import { Breadcrumbs } from "../../components/blocks/breadcrumbs";

pages/thankyou.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import client from "@/tina/client";
12
import { InferGetStaticPropsType } from "next";
23
import { FaGlobe, FaUsers } from "react-icons/fa";
3-
import client from "../.tina/__generated__/client";
44
import { CustomLink } from "../components/customLink";
55
import { Layout } from "../components/layout";
66
import { Container } from "../components/util/container";

0 commit comments

Comments
 (0)