Merge branch 'local-provider' into custom-checkout

This commit is contained in:
Tobias Koppers
2021-06-14 21:19:18 +02:00
59 changed files with 11939 additions and 67 deletions

View File

@@ -8,6 +8,7 @@ import { Text } from '@components/ui'
import { Layout } from '@components/common'
import getSlug from '@lib/get-slug'
import { missingLocaleInPages } from '@lib/usage-warns'
import type { Page } from '@commerce/types/page'
export async function getStaticProps({
preview,
@@ -22,7 +23,9 @@ export async function getStaticProps({
const { categories } = await siteInfoPromise
const path = params?.pages.join('/')
const slug = locale ? `${locale}/${path}` : path
const pageItem = pages.find((p) => (p.url ? getSlug(p.url) === slug : false))
const pageItem = pages.find((p: Page) =>
p.url ? getSlug(p.url) === slug : false
)
const data =
pageItem &&
(await commerce.getPage({
@@ -45,7 +48,7 @@ export async function getStaticProps({
export async function getStaticPaths({ locales }: GetStaticPathsContext) {
const config = { locales }
const { pages } = await commerce.getAllPages({ config })
const { pages }: { pages: Page[] } = await commerce.getAllPages({ config })
const [invalidPaths, log] = missingLocaleInPages()
const paths = pages
.map((page) => page.url)

View File

@@ -12,6 +12,13 @@ export async function getStaticProps({
locale,
locales,
}: GetStaticPropsContext) {
// Disabling page if Feature is not available
if (!process.env.COMMERCE_CART_ENABLED) {
return {
notFound: true,
}
}
const config = { locale, locales }
const pagesPromise = commerce.getAllPages({ config, preview })
const siteInfoPromise = commerce.getSiteInfo({ config, preview })
@@ -79,7 +86,7 @@ export default function Cart() {
<Text variant="pageHeading">My Cart</Text>
<Text variant="sectionHeading">Review your Order</Text>
<ul className="py-6 space-y-6 sm:py-0 sm:space-y-0 sm:divide-y sm:divide-accent-2 border-b border-accent-2">
{data!.lineItems.map((item) => (
{data!.lineItems.map((item: any) => (
<CartItem
key={item.id}
item={item}

View File

@@ -39,7 +39,7 @@ export default function Home({
return (
<>
<Grid variant="filled">
{products.slice(0, 3).map((product, i) => (
{products.slice(0, 3).map((product: any, i: number) => (
<ProductCard
key={product.id}
product={product}
@@ -51,7 +51,7 @@ export default function Home({
))}
</Grid>
<Marquee variant="secondary">
{products.slice(0, 3).map((product, i) => (
{products.slice(0, 3).map((product: any, i: number) => (
<ProductCard key={product.id} product={product} variant="slim" />
))}
</Marquee>
@@ -60,7 +60,7 @@ export default function Home({
description="Cupcake ipsum dolor sit amet lemon drops pastry cotton candy. Sweet carrot cake macaroon bonbon croissant fruitcake jujubes macaroon oat cake. Soufflé bonbon caramels jelly beans. Tiramisu sweet roll cheesecake pie carrot cake. "
/>
<Grid layout="B" variant="filled">
{products.slice(0, 3).map((product, i) => (
{products.slice(0, 3).map((product: any, i: number) => (
<ProductCard
key={product.id}
product={product}
@@ -72,7 +72,7 @@ export default function Home({
))}
</Grid>
<Marquee>
{products.slice(3).map((product, i) => (
{products.slice(3).map((product: any, i: number) => (
<ProductCard key={product.id} product={product} variant="slim" />
))}
</Marquee>

View File

@@ -55,12 +55,12 @@ export async function getStaticPaths({ locales }: GetStaticPathsContext) {
paths: locales
? locales.reduce<string[]>((arr, locale) => {
// Add a product path for every locale
products.forEach((product) => {
products.forEach((product: any) => {
arr.push(`/${locale}/product${product.path}`)
})
return arr
}, [])
: products.map((product) => `/product${product.path}`),
: products.map((product: any) => `/product${product.path}`),
fallback: 'blocking',
}
}