From c9cf57c933fe6a2cbc85c71786412ebd2670ef99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Meyer?= Date: Thu, 6 Jul 2023 10:42:30 +0200 Subject: [PATCH] feat(poc): react nextjs initial --- .env.example | 12 +- README.md | 234 +- app/[page]/opengraph-image.tsx | 4 +- app/[page]/page.tsx | 8 +- app/layout.tsx | 2 +- app/page.tsx | 2 +- .../{[handle] => [...handle]}/page.tsx | 5 +- .../[...collection]}/page.tsx | 9 +- .../opengraph-image.tsx | 2 +- app/search/page.tsx | 4 +- components/carousel.tsx | 64 +- components/cart/index.tsx | 31 +- components/grid/three-items.tsx | 8 +- components/layout/footer.tsx | 22 +- components/layout/navbar/index.tsx | 12 +- components/layout/product-grid-items.tsx | 6 +- components/layout/search/collections.tsx | 10 +- lib/shopware/api-types/apiTypes-6.5.2.0.d.ts | 7733 +++++++++++++++++ lib/shopware/api.ts | 111 + lib/shopware/criteria.ts | 245 + lib/shopware/index.ts | 199 + lib/shopware/transform.ts | 203 + lib/shopware/types.ts | 96 + next.config.js | 4 +- package.json | 21 +- pnpm-lock.yaml | 619 +- tsconfig.json | 2 +- 27 files changed, 9010 insertions(+), 658 deletions(-) rename app/product/{[handle] => [...handle]}/page.tsx (94%) rename app/search/{[collection] => (collection)/[...collection]}/page.tsx (87%) rename app/search/{[collection] => (collection)}/opengraph-image.tsx (88%) create mode 100644 lib/shopware/api-types/apiTypes-6.5.2.0.d.ts create mode 100644 lib/shopware/api.ts create mode 100644 lib/shopware/criteria.ts create mode 100644 lib/shopware/index.ts create mode 100644 lib/shopware/transform.ts create mode 100644 lib/shopware/types.ts diff --git a/.env.example b/.env.example index dc6582eb5..a4666dd31 100644 --- a/.env.example +++ b/.env.example @@ -1,6 +1,6 @@ -TWITTER_CREATOR="@vercel" -TWITTER_SITE="https://nextjs.org/commerce" -SITE_NAME="Next.js Commerce" -SHOPIFY_REVALIDATION_SECRET= -SHOPIFY_STOREFRONT_ACCESS_TOKEN= -SHOPIFY_STORE_DOMAIN= +TWITTER_CREATOR="@shopware" +TWITTER_SITE="https://www.shopware.com/en/solutions/shopware-composable-frontends/" +SITE_NAME="Next.js Commerce with Shopware Composable Frontends" +SHOPWARE_STORE_DOMAIN="" +SHOPWARE_API_TYPE="store-api" +SHOPWARE_ACCESS_TOKEN="" diff --git a/README.md b/README.md index 07b281de7..aefe269f4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ -[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2Fvercel%2Fcommerce&project-name=commerce&repo-name=commerce&demo-title=Next.js%20Commerce&demo-url=https%3A%2F%2Fdemo.vercel.store&demo-image=https%3A%2F%2Fbigcommerce-demo-asset-ksvtgfvnd.vercel.app%2Fbigcommerce.png&env=SHOPIFY_REVALIDATION_SECRET,SHOPIFY_STOREFRONT_ACCESS_TOKEN,SHOPIFY_STORE_DOMAIN,SITE_NAME,TWITTER_CREATOR,TWITTER_SITE) - -# Next.js Commerce +# Next.js Commerce & Shopware Composable Frontends A Next.js 13 and App Router-ready ecommerce template featuring: @@ -12,27 +10,21 @@ A Next.js 13 and App Router-ready ecommerce template featuring: - New fetching and caching paradigms - Dynamic OG images - Styling with Tailwind CSS -- Checkout and payments with Shopify - Automatic light/dark mode based on system settings > Note: Looking for Next.js Commerce v1? View the [code](https://github.com/vercel/commerce/tree/v1), [demo](https://commerce-v1.vercel.store), and [release notes](https://github.com/vercel/commerce/releases/tag/v1) -## Providers +## Prerequisites -Vercel will only be actively maintaining a Shopify version [as outlined in our vision and strategy for Next.js Commerce](https://github.com/vercel/commerce/pull/966). +Next.js + Shopware requires a running [Shopware 6 Instance (Installation Guide)](https://developer.shopware.com/docs/guides/installation). -Vercel is more than happy to partner and work with any commerce provider to help them get a similar template up and running and listed below. Alternative providers should be able to fork this repository and swap out the `lib/shopify` file with their own implementation while leaving the rest of the template mostly unchanged. - -- Shopify (this repository) -- [BigCommerce](https://github.com/bigcommerce/nextjs-commerce) ([Demo](https://next-commerce-v2.vercel.app/)) -- [Medusa](https://github.com/medusajs/vercel-commerce) ([Demo](https://medusa-nextjs-commerce.vercel.app/)) -- [Saleor](https://github.com/saleor/nextjs-commerce) ([Demo](https://saleor-commerce.vercel.app/)) +To get started, use this README and the example environment variable comments. ## Running locally You will need to use the environment variables [defined in `.env.example`](.env.example) to run Next.js Commerce. It's recommended you use [Vercel Environment Variables](https://vercel.com/docs/concepts/projects/environment-variables) for this, but a `.env` file is all that is necessary. -> Note: You should not commit your `.env` file or it will expose secrets that will allow others to control your Shopify store. +> Note: You should not commit your `.env` file or it will expose secrets that will allow others to control your Shopware store. 1. Install Vercel CLI: `npm i -g vercel` 2. Link local instance with Vercel and GitHub accounts (creates `.vercel` directory): `vercel link` @@ -45,220 +37,24 @@ pnpm dev Your app should now be running on [localhost:3000](http://localhost:3000/). -## How to configure your Shopify store for Next.js Commerce +## How to configure your Shopware store for Next.js Commerce -Next.js Commerce requires a [paid Shopify plan](https://www.shopify.com/pricing). +You can find the `SHOPWARE_ACCESS_TOKEN` in the Admin at your SalesChannel configuration. -> Note: Next.js Commerce will not work with a Shopify Starter plan as it does not allow installation of custom themes, which is required to run as a headless storefront. +### Add Shopware domain to an environment variable -### Add Shopify domain to an environment variable +Copy `.env.example` file to `.env` and change the environment variables like descibed below. -Create a `SHOPIFY_STORE_DOMAIN` environment variable and use your Shopify domain as the the value (ie. `SHOPIFY_STORE_SUBDOMAIN.myshopify.com`). +Create a `SHOPWARE_STORE_DOMAIN` environment variable and use your Shopware domain as the the value (ie. `demo-frontends.shopware.store`). > Note: Do not include the `https://`. -### Accessing the Shopify Storefront API +### Accessing the Shopware store API -Next.js Commerce utilizes [Shopify's Storefront API](https://shopify.dev/docs/api/storefront) to create unique customer experiences. The API offers a full range of commerce options making it possible for customers to control products, collections, menus, pages, cart, checkout, and more. +Next.js Commerce utilizes [Shopware's store API](https://shopware.stoplight.io/docs/store-api/) to create unique customer experiences. The API offers a full range of commerce options making it possible for customers to control products, collections, menus, pages, cart, checkout, and more. -In order to use the Shopify's Storefront API, you need to install the [Headless app](https://apps.shopify.com/headless) in your Shopify store. +In order to use the Shopware's store API, you need at least one _(Storefront)_ SalesChannel _(for speaking URL's)_ in your Shopware instance. -Once installed, you'll need to create a `SHOPIFY_STOREFRONT_ACCESS_TOKEN` environment variable and use the public access token as the value +Once installed, you'll need to create a `SHOPWARE_ACCESS_TOKEN` environment variable and use the public access token as the value -> Note: Shopify does offer a Node.js Storefront API SDK. We use the Storefront API via GraphQL directly instead of the Node.js SDK so we have more control over fetching and caching. - -
- Expand to view detailed walkthrough - -1. Navigate to `https://SHOPIFY_STORE_SUBDOMAIN.myshopify.com/admin/settings/apps`. -1. Click the green `Shopify App Store` button. - ![Shopify App Store](https://user-images.githubusercontent.com/446260/233220545-cb4c1461-ebc5-424e-a421-bf0d32044027.jpg) -1. Search for `Headless` and click on the `Headless` app. - ![Headless](https://user-images.githubusercontent.com/446260/233220547-6d93b5ef-16c7-45db-99e7-13ae7e18eb39.jpg) -1. Click the black `Add app` button. - ![Add app](https://user-images.githubusercontent.com/446260/233220550-a34c8bda-75a8-437a-9673-125f3794ff35.jpg) -1. Click the green `Add sales channel` button. - ![Add sales channel](https://user-images.githubusercontent.com/446260/233220553-42d94a74-421d-4f8a-99ab-a95936b707a3.jpg) -1. Click the green `Create storefront` button. - ![Create storefront](https://user-images.githubusercontent.com/446260/233220556-1eee15c4-a45d-446e-9f73-2e7c9f56b29c.jpg) -1. Copy and paste the public access token and assign it to a `SHOPIFY_STOREFRONT_ACCESS_TOKEN` environment variable. - ![Pubic access token](https://user-images.githubusercontent.com/446260/233220558-5db04ff9-b894-40fe-bfba-0e92f26b8e1f.jpg) -1. If you ever need to reference the public access token again, you can navigate to `https://SHOPIFY_STORE_SUBDOMAIN.myshopify.com/admin/headless_storefronts`. -
- -### Install a headless theme - -When using a headless Shopify setup, you normally don't want customers to access any of the theme pages except for checkout. However, you can't totally disable the theme and a lot of links will still point to the theme (e.g. links in emails, order details, plugins, checkout, etc.). - -To enable a seamless flow between your headless site and Shopify, you can install the [Shopify Headless Theme](https://github.com/instantcommerce/shopify-headless-theme). - -Follow the installation instructions and configure the theme with your headless site's values. - -
- Expand to view detailed walkthrough - -1. Download [Shopify Headless Theme](https://github.com/instantcommerce/shopify-headless-theme). - ![Download Shoify Headless Theme](https://user-images.githubusercontent.com/446260/233220560-9f3f5ab0-ffb4-4305-b4ee-2c9d33eea90f.jpg) -1. Navigate to `https://SHOPIFY_STORE_SUBDOMAIN.myshopify.com/admin/themes`. -1. Click `Add theme`, then `Upload zip file`. - ![Upload zip file](https://user-images.githubusercontent.com/446260/233220561-7a53809e-0d95-45eb-b52f-3a52e3663a9c.jpg) -1. Select the downloaded zip file from above, and click the green `Upload file` button. - ![Select and upload file](https://user-images.githubusercontent.com/446260/233220563-135fb9f7-2921-4189-8f17-3b1cc15c0ea6.jpg) -1. Click `Customize`. - ![Customize theme](https://user-images.githubusercontent.com/446260/233220565-24b9c954-c18a-46f1-9db5-3d2a00040e48.jpg) -1. Click `Theme settings` (ie. the paintbrush icon), expand the `STOREFRONT` section, enter your headless store domain, click the gray `Publish` button. - ![Set headless domain in theme settings](https://user-images.githubusercontent.com/446260/233220566-acaee14d-03f8-400d-a2a2-28e85eb5ecdc.jpg) -1. Confirm the theme change by clicking the green `Save and publish` button. - ![Confirm save and publish](https://user-images.githubusercontent.com/446260/233220567-504d5bde-cfb9-426d-a264-f9a12d02af13.jpg) -1. The headless theme should now be your current active theme. -![Headless theme is current and active](https://user-images.githubusercontent.com/446260/233220569-63cab2b4-241b-4bf1-9b5b-451daaeceb91.jpg) -
- -### Branding & Design - -Since you're creating a headless Shopify store, you'll be in full control of your brand and design. However, there are still a few aspects we're leaving within Shopify's control. - -- Checkout -- Emails -- Order status -- Order history -- Favicon (for any Shopify controlled pages) - -You can use Shopify's admin to customize these pages to match your brand and design. - -
- Expand to view detailed walkthrough - -#### Checkout, order status, and order history - -1. Navigate to `https://SHOPIFY_STORE_SUBDOMAIN.myshopify.com/admin/settings/checkout`. -1. Click the green `Customize` button. - ![Customize](https://user-images.githubusercontent.com/446260/233220530-9beda4b4-5008-440a-b923-9d196b722539.jpg) -1. Click `Branding` (ie. the paintbrush icon) and customize your brand. Please note, there are three steps / pages to the checkout flow. Use the dropdown to change pages and adjust branding as needed on each page. Click `Save` when you are done. - ![Branding](https://user-images.githubusercontent.com/446260/233220534-e884d9fd-1a39-4f4d-9d09-163dde47c2e8.jpg) -1. Navigate to `https://SHOPIFY_STORE_SUBDOMAIN.myshopify.com/admin/settings/branding`. -1. Customize settings to match your brand. - ![Branding](https://user-images.githubusercontent.com/446260/233220536-452b8802-9a1e-40f0-9a12-52b3dace84a5.jpg) - -#### Emails - -1. Navigate to `https://SHOPIFY_STORE_SUBDOMAIN.myshopify.com/admin/settings/email_settings`. -1. Customize settings to match your brand. - ![Branding](https://user-images.githubusercontent.com/446260/233220538-13c83a9e-55f8-41e6-9b34-a39ee0848a8a.jpg) - -#### Favicon - -1. Navigate to `https://SHOPIFY_STORE_SUBDOMAIN.myshopify.com/admin/themes`. -1. Click the green `Customize` button. - ![Customize theme](https://user-images.githubusercontent.com/446260/233220539-4869a6cd-f59f-4de6-8091-95ed81d2302d.jpg) -1. Click `Theme settings` (ie. the paintbrush icon), expand the `FAVICON` section, upload favicon, then click the `Save` button. - ![Favicon](https://user-images.githubusercontent.com/446260/233220542-ac81b674-d86e-4172-ab38-c79d1ad1ff36.jpg) - -
- -### Configure webhooks for on-demand incremental static regeneration (ISR) - -Utilizing [Shopify's webhooks](https://shopify.dev/docs/apps/webhooks), and listening for select [Shopify webhook event topics](https://shopify.dev/docs/api/admin-rest/2022-04/resources/webhook#event-topics), we can use [Next'js on-demand revalidation](https://nextjs.org/docs/app/building-your-application/data-fetching/revalidating#using-on-demand-revalidation) to keep data fetches indefinitely cached until certain events in the Shopify store occur. - -Next.js is pre-configured to listen for the following Shopify webhook events and automatically revalidate fetches. - -- `collections/create` -- `collections/delete` -- `collections/update` -- `products/create` -- `products/delete` -- `products/update` (this also includes when variants are added, updated, and removed as well as when products are purchased so inventory and out of stocks can be updated) - -
- Expand to view detailed walkthrough - -#### Setup secret for secure revalidation - -1. Create your own secret or [generate a random UUID](https://www.uuidgenerator.net/guid). -1. Create a [Vercel Environment Variable](https://vercel.com/docs/concepts/projects/environment-variables) named `SHOPIFY_REVALIDATION_SECRET` and use the value from above. - -#### Configure Shopify webhooks - -1. Navigate to `https://SHOPIFY_STORE_SUBDOMAIN.myshopify.com/admin/settings/notifications`. -1. Add webhooks for all six event topics listed above. You can add more sets for other preview urls, environments, or local development. Append `?secret=[SECRET]` to each url, where `[SECRET]` is the secret you created above. - ![Shopify store webhooks](https://github.com/vercel/commerce/assets/446260/3d713fd7-b642-46e2-b2ce-f2b695ff6d2b) - ![Shopify store add webhook](https://github.com/vercel/commerce/assets/446260/f0240a22-be07-42bc-bf6c-b97873868677) - -#### Testing webhooks during local development - -The easiest way to test webhooks while developing locally is to use [ngrok](https://ngrok.com). - -1. [Install and configure ngrok](https://ngrok.com/download) (you will need to create an account). -1. Run your app locally, `npm run dev`. -1. In a separate terminal session, run `ngrok http 3000`. -1. Use the url generated by ngrok and add or update your webhook urls in Shopify. - ![ngrok](https://github.com/vercel/commerce/assets/446260/5dc09c5d-0e48-479c-ab64-de8dc9a2c4b1) - ![Shopify store edit webhook](https://github.com/vercel/commerce/assets/446260/13fd397d-4666-4e8d-b25f-4adc674345c0) -1. You can now make changes to your store and your local app should receive updates. You can also use the `Send test notification` button to trigger a generic webhook test. - ![Shopify store webhook send test notification](https://github.com/vercel/commerce/assets/446260/e872e233-1663-446d-961f-8c9455358530) - -
- -### Using Shopify as a CMS - -Next.js Commerce is fully powered by Shopify in a truly headless and data driven way. - -#### Products - -`https://SHOPIFY_STORE_SUBDOMAIN.myshopify.com/admin/products` - -Only `Active` products are shown. `Draft` products will not be shown until they are marked as `Active`. - -`Active` products can still be hidden and not seen by navigating the site, by adding a `nextjs-frontend-hidden` tag on the product. This tag will also tell search engines to not index or crawl the product. The product is still directly accessible via url. This feature is great for "secret" products you only want to people you share the url with. - -Product options and option combinations are driven from Shopify options and variants. When selecting options on the product detail page, other option and variant combinations will be visually validated and verified for availability, like Amazon does. - -Products that are active and "out of stock" are still shown on the site, but the ability to add the product to the cart is disabled. - -#### Collections - -`https://SHOPIFY_STORE_SUBDOMAIN.myshopify.com/admin/collections` - -Create whatever collections you want and configure them however you want. All available collections will show on the search page as filters on the left, with one exception... - -Any collection names that start with the word "hidden" will not show up on the headless front end. The Next.js Commerce theme comes pre-configured to look for two hidden collections. Collections were chosen for this over tags so that order of products could be controlled (collections allow for manual ordering). - -Create the following collections: - -- `Hidden: Homepage Featured Items` -- Products in this collection are displayed in the three featured blocks on the homepage. -- `Hidden: Homepage Carousel` -- Products in this collection are displayed in the auto-scrolling carousel section on the homepage. - -![Shopify collections](https://user-images.githubusercontent.com/446260/233220543-81896a2b-7085-4abc-a4f1-ce321e08b953.jpg) - -![Shopify collection detail](https://user-images.githubusercontent.com/446260/233220544-ecd4c069-49fc-4a0b-8378-aa5e1b4b5257.jpg) - -#### Pages - -`https://SHOPIFY_STORE_SUBDOMAIN.myshopify.com/admin/pages` - -Next.js Commerce contains a dynamic `[page]` route. It will use the value to look for a corresponding page in Shopify. If a page is found, it will display its rich content using Tailwind's prose. If a page is not found, a 404 page is displayed. - -![Shopify pages](https://user-images.githubusercontent.com/446260/233221142-4dc3fa56-5256-4d84-b0a3-331ffb7d79b2.jpg) - -![Shopify page detail](https://user-images.githubusercontent.com/446260/233247700-cbeaf917-fb67-49e9-b9b9-5ee8cb188639.jpg) - -#### Navigation menus - -`https://SHOPIFY_STORE_SUBDOMAIN.myshopify.com/admin/menus` - -Next.js Commerce's header and footer navigation is pre-configured to be controlled by Shopify navigation menus. This means you have full control over what links go here. They can be to collections, pages, external links, and more. - -Create the following navigation menus: - -- `Next.js Frontend Header Menu` -- Menu items to be shown in the headless frontend header. -- `Next.js Frontend Footer Menu` -- Menu items to be shown in the headless frontend footer. - -![Shopify navigation menus](https://user-images.githubusercontent.com/446260/233220571-33f9d5a8-1206-4ab4-ad79-83b4ca954331.jpg) - -![Shopify navigation menu detail](https://user-images.githubusercontent.com/446260/233220573-5f03a51f-4100-461f-a696-f085856e391b.jpg) - -#### SEO - -Shopify's products, collections, pages, etc. allow you to create custom SEO titles and descriptions. Next.js Commerce is pre-configured to display these custom values, but also comes with sensible default fallbacks if they are not provided. - -![Shopify SEO](https://user-images.githubusercontent.com/446260/233247701-0ff2a560-7949-4e6c-b3a8-8168ed6341f8.jpg) +> Note: We using an [api Client package](https://www.npmjs.com/package/@shopware/api-client) that helps you with types, endpoints, params and returns. diff --git a/app/[page]/opengraph-image.tsx b/app/[page]/opengraph-image.tsx index 2fd59281e..db45917a7 100644 --- a/app/[page]/opengraph-image.tsx +++ b/app/[page]/opengraph-image.tsx @@ -1,11 +1,11 @@ import OpengraphImage from 'components/opengraph-image'; -import { getPage } from 'lib/shopify'; +import { getPage } from 'lib/shopware'; export const runtime = 'edge'; export default async function Image({ params }: { params: { page: string } }) { const page = await getPage(params.page); - const title = page.seo?.title || page.title; + const title = page ? page.seo?.title || page.title : ''; return await OpengraphImage({ title }); } diff --git a/app/[page]/page.tsx b/app/[page]/page.tsx index 7e0defed3..52eefdb06 100644 --- a/app/[page]/page.tsx +++ b/app/[page]/page.tsx @@ -1,7 +1,7 @@ import type { Metadata } from 'next'; import Prose from 'components/prose'; -import { getPage } from 'lib/shopify'; +import { getPage } from 'lib/shopware'; import { notFound } from 'next/navigation'; export const runtime = 'edge'; @@ -39,6 +39,10 @@ export default async function Page({ params }: { params: { page: string } }) { const page = await getPage(params.page); if (!page) return notFound(); + let date = page.createdAt; + if (page.updatedAt !== '') { + date = page.updatedAt; + } return ( <> @@ -49,7 +53,7 @@ export default async function Page({ params }: { params: { page: string } }) { year: 'numeric', month: 'long', day: 'numeric' - }).format(new Date(page.updatedAt))}.`} + }).format(new Date(date))}.`}

); diff --git a/app/layout.tsx b/app/layout.tsx index dca2c624f..b93239710 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -7,7 +7,7 @@ const { TWITTER_CREATOR, TWITTER_SITE, SITE_NAME } = process.env; export const metadata = { title: { - default: SITE_NAME, + default: SITE_NAME || 'Shopware Composable Frontends', template: `%s | ${SITE_NAME}` }, robots: { diff --git a/app/page.tsx b/app/page.tsx index 991a7345e..5f357726a 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -6,7 +6,7 @@ import { Suspense } from 'react'; export const runtime = 'edge'; export const metadata = { - description: 'High-performance ecommerce store built with Next.js, Vercel, and Shopify.', + description: 'High-performance ecommerce store built with Next.js, Vercel, and Shopware.', openGraph: { images: [ { diff --git a/app/product/[handle]/page.tsx b/app/product/[...handle]/page.tsx similarity index 94% rename from app/product/[handle]/page.tsx rename to app/product/[...handle]/page.tsx index 45286cdbe..573fe475b 100644 --- a/app/product/[handle]/page.tsx +++ b/app/product/[...handle]/page.tsx @@ -10,8 +10,8 @@ import { Gallery } from 'components/product/gallery'; import { VariantSelector } from 'components/product/variant-selector'; import Prose from 'components/prose'; import { HIDDEN_PRODUCT_TAG } from 'lib/constants'; -import { getProduct, getProductRecommendations } from 'lib/shopify'; -import { Image } from 'lib/shopify/types'; +import { getProduct, getProductRecommendations } from 'lib/shopware'; +import { Image } from 'lib/shopware/types'; export const runtime = 'edge'; @@ -20,6 +20,7 @@ export async function generateMetadata({ }: { params: { handle: string }; }): Promise { + // @ToDo: create a simpler function and do not do the heavy options/variant stuff here const product = await getProduct(params.handle); if (!product) return notFound(); diff --git a/app/search/[collection]/page.tsx b/app/search/(collection)/[...collection]/page.tsx similarity index 87% rename from app/search/[collection]/page.tsx rename to app/search/(collection)/[...collection]/page.tsx index 4ec62f2f4..847aaa258 100644 --- a/app/search/[collection]/page.tsx +++ b/app/search/(collection)/[...collection]/page.tsx @@ -1,4 +1,4 @@ -import { getCollection, getCollectionProducts } from 'lib/shopify'; +import { getCollection, getCollectionProducts } from 'lib/shopware'; import { Metadata } from 'next'; import { notFound } from 'next/navigation'; @@ -33,7 +33,12 @@ export default async function CategoryPage({ }) { const { sort } = searchParams as { [key: string]: string }; const { sortKey, reverse } = sorting.find((item) => item.slug === sort) || defaultSort; - const products = await getCollectionProducts({ collection: params.collection, sortKey, reverse }); + + const products = await getCollectionProducts({ + collection: params.collection, + sortKey, + reverse + }); return (
diff --git a/app/search/[collection]/opengraph-image.tsx b/app/search/(collection)/opengraph-image.tsx similarity index 88% rename from app/search/[collection]/opengraph-image.tsx rename to app/search/(collection)/opengraph-image.tsx index 9eb9c47f7..98cd40853 100644 --- a/app/search/[collection]/opengraph-image.tsx +++ b/app/search/(collection)/opengraph-image.tsx @@ -1,5 +1,5 @@ import OpengraphImage from 'components/opengraph-image'; -import { getCollection } from 'lib/shopify'; +import { getCollection } from 'lib/shopware'; export const runtime = 'edge'; diff --git a/app/search/page.tsx b/app/search/page.tsx index 354a2022f..3eeac0c6a 100644 --- a/app/search/page.tsx +++ b/app/search/page.tsx @@ -1,7 +1,7 @@ import Grid from 'components/grid'; import ProductGridItems from 'components/layout/product-grid-items'; import { defaultSort, sorting } from 'lib/constants'; -import { getProducts } from 'lib/shopify'; +import { getSearchCollectionProducts } from 'lib/shopware'; export const runtime = 'edge'; @@ -18,7 +18,7 @@ export default async function SearchPage({ const { sort, q: searchValue } = searchParams as { [key: string]: string }; const { sortKey, reverse } = sorting.find((item) => item.slug === sort) || defaultSort; - const products = await getProducts({ sortKey, reverse, query: searchValue }); + const products = await getSearchCollectionProducts({ sortKey, reverse, query: searchValue }); const resultsText = products.length > 1 ? 'results' : 'result'; return ( diff --git a/components/carousel.tsx b/components/carousel.tsx index d86d17f45..86f05c54c 100644 --- a/components/carousel.tsx +++ b/components/carousel.tsx @@ -1,39 +1,41 @@ -import { getCollectionProducts } from 'lib/shopify'; +import { getCollectionProducts } from 'lib/shopware'; import Image from 'next/image'; import Link from 'next/link'; export async function Carousel() { // Collections that start with `hidden-*` are hidden from the search page. - const products = await getCollectionProducts({ collection: 'hidden-homepage-carousel' }); + // const products = await getCollectionProducts({ collection: 'hidden-homepage-carousel' }); - if (!products?.length) return null; + // if (!products?.length) return null; - return ( -
-
- {[...products, ...products].map((product, i) => ( - - {product.featuredImage ? ( - {product.title} - ) : null} -
-
- {product.title} -
-
- - ))} -
-
- ); + return null; + + // return ( + //
+ //
+ // {[...products, ...products].map((product, i) => ( + // + // {product.featuredImage ? ( + // {product.title} + // ) : null} + //
+ //
+ // {product.title} + //
+ //
+ // + // ))} + //
+ //
+ // ); } diff --git a/components/cart/index.tsx b/components/cart/index.tsx index 75b6978fe..b75166bd2 100644 --- a/components/cart/index.tsx +++ b/components/cart/index.tsx @@ -3,21 +3,18 @@ import { cookies } from 'next/headers'; import CartModal from './modal'; export default async function Cart() { - const cartId = cookies().get('cartId')?.value; - let cartIdUpdated = false; - let cart; - - if (cartId) { - cart = await getCart(cartId); - } - - // If the `cartId` from the cookie is not set or the cart is empty - // (old carts becomes `null` when you checkout), then get a new `cartId` - // and re-fetch the cart. - if (!cartId || !cart) { - cart = await createCart(); - cartIdUpdated = true; - } - - return ; + // const cartId = cookies().get('cartId')?.value; + // let cartIdUpdated = false; + // let cart; + // if (cartId) { + // cart = await getCart(cartId); + // } + // // If the `cartId` from the cookie is not set or the cart is empty + // // (old carts becomes `null` when you checkout), then get a new `cartId` + // // and re-fetch the cart. + // if (!cartId || !cart) { + // cart = await createCart(); + // cartIdUpdated = true; + // } + // return ; } diff --git a/components/grid/three-items.tsx b/components/grid/three-items.tsx index 2280de26e..a47af2ed5 100644 --- a/components/grid/three-items.tsx +++ b/components/grid/three-items.tsx @@ -1,6 +1,6 @@ import { GridTileImage } from 'components/grid/tile'; -import { getCollectionProducts } from 'lib/shopify'; -import type { Product } from 'lib/shopify/types'; +import { getCollectionProducts } from 'lib/shopware'; +import type { Product } from 'lib/shopware/types'; import Link from 'next/link'; function ThreeItemGridItem({ @@ -16,7 +16,7 @@ function ThreeItemGridItem({
- +
diff --git a/components/layout/navbar/index.tsx b/components/layout/navbar/index.tsx index 8d036b315..301982468 100644 --- a/components/layout/navbar/index.tsx +++ b/components/layout/navbar/index.tsx @@ -4,20 +4,20 @@ import { Suspense } from 'react'; import Cart from 'components/cart'; import CartIcon from 'components/icons/cart'; import LogoIcon from 'components/icons/logo'; -import { getMenu } from 'lib/shopify'; -import { Menu } from 'lib/shopify/types'; +import { getMenu } from 'lib/shopware'; +import { Menu } from 'lib/shopware/types'; import MobileMenu from './mobile-menu'; import Search from './search'; export default async function Navbar() { - const menu = await getMenu('next-js-frontend-header-menu'); + const menu = await getMenu({ type: 'main-navigation' }); return (