mirror of
https://github.com/vercel/commerce.git
synced 2025-05-15 05:56:59 +00:00
Merged main into revalidate
This commit is contained in:
Henrik Larsson
commit
7bde54435c
@ -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);
|
||||
|
||||
|
||||
@ -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 (
|
||||
<html lang={locale} className={inter.variable}>
|
||||
<body className="flex flex-col min-h-screen">
|
||||
<body className="flex min-h-screen flex-col">
|
||||
<NextIntlClientProvider locale={locale} messages={messages}>
|
||||
<Header />
|
||||
<main className="flex-1">
|
||||
{children}
|
||||
</main>
|
||||
<main className="flex-1">{children}</main>
|
||||
<Footer />
|
||||
</NextIntlClientProvider>
|
||||
</body>
|
||||
</html>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -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<TextProps> = ({
|
||||
style,
|
||||
@ -32,10 +28,10 @@ const Text: FunctionComponent<TextProps> = ({
|
||||
variant = 'body',
|
||||
children,
|
||||
html,
|
||||
onClick,
|
||||
onClick
|
||||
}) => {
|
||||
const componentsMap: {
|
||||
[P in Variant]: React.ComponentType<any> | string
|
||||
[P in Variant]: React.ComponentType<any> | string;
|
||||
} = {
|
||||
body: 'div',
|
||||
heading: 'h1',
|
||||
@ -44,39 +40,38 @@ const Text: FunctionComponent<TextProps> = ({
|
||||
sectionHeading: 'h2',
|
||||
listChildHeading: 'h3',
|
||||
label: 'div',
|
||||
paragraph: 'p',
|
||||
}
|
||||
paragraph: 'p'
|
||||
};
|
||||
|
||||
const Component:
|
||||
| JSXElementConstructor<any>
|
||||
| React.ReactElement<any>
|
||||
| React.ComponentType<any>
|
||||
| string = componentsMap![variant!]
|
||||
| string = componentsMap![variant!];
|
||||
|
||||
const htmlContentProps = html
|
||||
? {
|
||||
dangerouslySetInnerHTML: { __html: html },
|
||||
dangerouslySetInnerHTML: { __html: html }
|
||||
}
|
||||
: {}
|
||||
: {};
|
||||
|
||||
return (
|
||||
<Component
|
||||
className={cn(
|
||||
'',
|
||||
{
|
||||
['text-base max-w-prose']: variant === 'body',
|
||||
['max-w-prose text-4xl font-display font-bold leading-none md:text-5xl md:leading-none lg:leading-none lg:text-6xl']:
|
||||
['max-w-prose text-base']: variant === 'body',
|
||||
['max-w-prose font-display text-4xl font-extrabold leading-none md:text-5xl md:leading-none lg:text-6xl lg:leading-none']:
|
||||
variant === 'heading',
|
||||
['max-w-prose text-3xl font-display font-bold leading-none md:text-4xl md:leading-none lg:leading-none lg:text-5xl']:
|
||||
['extrabold max-w-prose font-display text-3xl leading-none md:text-4xl md:leading-none lg:text-5xl lg:leading-none']:
|
||||
variant === 'pageHeading',
|
||||
['max-w-prose text-2xl font-display leading-none md:text-3xl md:leading-none lg:leading-none lg:text-4xl']:
|
||||
variant === 'productHeading',
|
||||
['max-w-prose text-2xl font-display font-bold leading-none md:text-3xl md:leading-none lg:leading-none lg:text-4xl']:
|
||||
variant === 'sectionHeading',
|
||||
['text-sm font-medium leading-tight lg:text-base']:
|
||||
variant === 'listChildHeading',
|
||||
['text-sm max-w-prose lg:text-base 2xl:text-lg']: variant === 'label',
|
||||
['max-w-prose lg:text-lg 2xl:text-xl']: variant === 'paragraph',
|
||||
['max-w-prose font-display text-2xl leading-none md:text-3xl md:leading-none lg:text-4xl lg:leading-none']:
|
||||
variant === 'productHeading',
|
||||
['max-w-prose font-display text-2xl font-extrabold leading-none md:text-3xl md:leading-none lg:text-4xl lg:leading-none']:
|
||||
variant === 'sectionHeading',
|
||||
['text-sm font-medium leading-tight lg:text-base']: variant === 'listChildHeading',
|
||||
['max-w-prose text-sm lg:text-base 2xl:text-lg']: variant === 'label',
|
||||
['max-w-prose lg:text-lg 2xl:text-xl']: variant === 'paragraph'
|
||||
},
|
||||
className
|
||||
)}
|
||||
@ -86,7 +81,7 @@ const Text: FunctionComponent<TextProps> = ({
|
||||
>
|
||||
{children}
|
||||
</Component>
|
||||
)
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
export default Text
|
||||
export default Text;
|
||||
|
||||
@ -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,
|
||||
});
|
||||
});
|
||||
|
||||
export const clientFetch = cache(client.fetch.bind(client));
|
||||
Loading…
x
Reference in New Issue
Block a user