diff --git a/app/[locale]/[[...slug]]/page.tsx b/app/[locale]/[[...slug]]/page.tsx
index d0be0494e..ddf21504a 100644
--- a/app/[locale]/[[...slug]]/page.tsx
+++ b/app/[locale]/[[...slug]]/page.tsx
@@ -1,9 +1,12 @@
+// Next
+import type { Metadata } from 'next';
+import { draftMode } from 'next/headers';
+// Sanity
import PreviewSuspense from 'components/preview-suspense';
import getQueryFromSlug from 'helpers/getQueryFromSlug';
import { docQuery } from 'lib/sanity/queries';
-import { client } from 'lib/sanity/sanity.client';
-import type { Metadata } from 'next';
-import { draftMode } from 'next/headers';
+import { clientFetch } from 'lib/sanity/sanity.client';
+// Pages.
import CategoryPage from './category-page';
import CategoryPagePreview from './category-page-preview';
import HomePage from './home-page';
@@ -23,7 +26,7 @@ export default async function Page({ params }: { params: { slug: string[]; local
const { query = '', queryParams, docType } = getQueryFromSlug(slug, locale);
- const pageData = await client.fetch(query, queryParams);
+ const pageData = await clientFetch(query, queryParams);
const data = filterDataToSingleItem(pageData, isEnabled);
@@ -55,7 +58,7 @@ export default async function Page({ params }: { params: { slug: string[]; local
* Get paths for each page.
*/
export async function generateStaticParams() {
- const paths = await client.fetch(docQuery);
+ const paths = await clientFetch(docQuery);
return paths.map((path: { slug: string; locale: string }) => ({
slug: path.slug.split('/').filter((p) => p),
@@ -95,7 +98,7 @@ export async function generateMetadata({
const { query = '', queryParams } = getQueryFromSlug(slug, locale);
- const pageData = await client.fetch(query, queryParams);
+ const pageData = await clientFetch(query, queryParams);
const data = filterDataToSingleItem(pageData, false);
diff --git a/app/[locale]/layout.tsx b/app/[locale]/layout.tsx
index 10b80c3ce..817770125 100644
--- a/app/[locale]/layout.tsx
+++ b/app/[locale]/layout.tsx
@@ -6,12 +6,12 @@ import { notFound } from 'next/navigation';
import { ReactNode } from 'react';
import './globals.css';
-const SITE_NAME = "KM Storefront"
-const SITE_DESCRIPTION = "Webb och digitalbyrå från Göteborg"
-const TWITTER_CREATOR = "@kodamera.se"
-const TWITTER_SITE = "https://kodamera.se"
-const OG_IMAGE_URL = "/og-image.jpg"
-const OG_IMAGE_ALT = "Kodamera"
+const SITE_NAME = 'KM Storefront';
+const SITE_DESCRIPTION = 'Webb och digitalbyrå från Göteborg';
+const TWITTER_CREATOR = '@kodamera.se';
+const TWITTER_SITE = 'https://kodamera.se';
+const OG_IMAGE_URL = '/og-image.jpg';
+const OG_IMAGE_ALT = 'Kodamera';
export const metadata = {
title: {
@@ -26,8 +26,8 @@ export const metadata = {
width: 1200,
height: 630,
alt: OG_IMAGE_ALT
- },
- ],
+ }
+ ]
},
robots: {
follow: true,
@@ -48,40 +48,36 @@ const inter = Inter({
display: 'swap',
variable: '--font-inter'
});
-
+
export function generateStaticParams() {
- return [{locale: 'sv'}, {locale: 'en'}];
+ return [{ locale: 'sv' }, { locale: 'en' }];
}
interface LocaleLayoutProps {
- children: ReactNode
+ children: ReactNode;
params: {
- locale: string
- }
+ locale: string;
+ };
}
-
-export default async function LocaleLayout({children, params: {locale}}: LocaleLayoutProps) {
+
+export default async function LocaleLayout({ children, params: { locale } }: LocaleLayoutProps) {
let messages;
-
+
try {
messages = (await import(`../../messages/${locale}.json`)).default;
} catch (error) {
notFound();
}
-
+
return (
-
+
-
- {children}
-
+ {children}
);
}
-
-
diff --git a/components/ui/text/text.tsx b/components/ui/text/text.tsx
index 2e7db83f1..66ad02881 100644
--- a/components/ui/text/text.tsx
+++ b/components/ui/text/text.tsx
@@ -1,19 +1,15 @@
-'use client'
+'use client';
-import { cn } from 'lib/utils'
-import React, {
- CSSProperties,
- FunctionComponent,
- JSXElementConstructor,
-} from 'react'
+import { cn } from 'lib/utils';
+import React, { CSSProperties, FunctionComponent, JSXElementConstructor } from 'react';
interface TextProps {
- variant?: Variant
- className?: string
- style?: CSSProperties
- children?: React.ReactNode | any
- html?: string
- onClick?: () => any
+ variant?: Variant;
+ className?: string;
+ style?: CSSProperties;
+ children?: React.ReactNode | any;
+ html?: string;
+ onClick?: () => any;
}
type Variant =
@@ -24,7 +20,7 @@ type Variant =
| 'sectionHeading'
| 'label'
| 'paragraph'
- | 'listChildHeading'
+ | 'listChildHeading';
const Text: FunctionComponent = ({
style,
@@ -32,10 +28,10 @@ const Text: FunctionComponent = ({
variant = 'body',
children,
html,
- onClick,
+ onClick
}) => {
const componentsMap: {
- [P in Variant]: React.ComponentType | string
+ [P in Variant]: React.ComponentType | string;
} = {
body: 'div',
heading: 'h1',
@@ -44,39 +40,38 @@ const Text: FunctionComponent = ({
sectionHeading: 'h2',
listChildHeading: 'h3',
label: 'div',
- paragraph: 'p',
- }
+ paragraph: 'p'
+ };
const Component:
| JSXElementConstructor
| React.ReactElement
| React.ComponentType
- | string = componentsMap![variant!]
+ | string = componentsMap![variant!];
const htmlContentProps = html
? {
- dangerouslySetInnerHTML: { __html: html },
+ dangerouslySetInnerHTML: { __html: html }
}
- : {}
+ : {};
return (
= ({
>
{children}
- )
-}
+ );
+};
-export default Text
+export default Text;
diff --git a/lib/sanity/sanity.client.ts b/lib/sanity/sanity.client.ts
index 6567b927f..3c10a146e 100644
--- a/lib/sanity/sanity.client.ts
+++ b/lib/sanity/sanity.client.ts
@@ -1,4 +1,5 @@
import { createClient } from "next-sanity";
+import { cache } from 'react';
export const projectId = process.env.NEXT_PUBLIC_SANITY_PROJECT_ID!;
export const dataset = process.env.NEXT_PUBLIC_SANITY_DATASET!;
@@ -9,4 +10,6 @@ export const client = createClient({
dataset,
apiVersion,
useCdn: false,
-});
\ No newline at end of file
+});
+
+export const clientFetch = cache(client.fetch.bind(client));
\ No newline at end of file