From e9b369d1d8b17da7341d4d54e9cd66ddefab06aa Mon Sep 17 00:00:00 2001 From: feledori Date: Fri, 18 Oct 2024 11:56:19 +0200 Subject: [PATCH] fix missed import paths --- .storybook/preview.js | 6 ++--- .../animated-gradient.stories.js | 2 +- libs/shopify/cart/actions.js | 22 +++++++++---------- libs/shopify/cart/add-to-cart/index.js | 2 +- libs/shopify/cart/modal/index.js | 4 ++-- libs/shopify/cart/optimistic-utils.js | 22 ++++++++----------- libs/shopify/customer/actions.js | 2 +- libs/shopify/index.js | 10 ++++----- 8 files changed, 33 insertions(+), 37 deletions(-) diff --git a/.storybook/preview.js b/.storybook/preview.js index 73c32c1..d004d4c 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -1,8 +1,8 @@ import { fonts } from 'app/fonts' import cn from 'clsx' -import { StyleVariables } from 'libs/style-variables' -import { colors, themes } from 'styles/config.mjs' -import 'styles/global.css' +import { StyleVariables } from '~/libs/style-variables' +import { colors, themes } from '~/styles/config.mjs' +import '~/styles/global.css' /** @type { import('@storybook/react').Preview } */ const preview = { diff --git a/components/animated-gradient/animated-gradient.stories.js b/components/animated-gradient/animated-gradient.stories.js index f0597ab..dc8dc60 100644 --- a/components/animated-gradient/animated-gradient.stories.js +++ b/components/animated-gradient/animated-gradient.stories.js @@ -1,4 +1,4 @@ -import { Canvas } from 'libs/webgl/components/canvas' +import { Canvas } from '~/libs/webgl/components/canvas' import { AnimatedGradient } from '.' // More on how to set up stories at: https://storybook.js.org/docs/writing-stories#default-export diff --git a/libs/shopify/cart/actions.js b/libs/shopify/cart/actions.js index 46716c0..b3ddcf0 100644 --- a/libs/shopify/cart/actions.js +++ b/libs/shopify/cart/actions.js @@ -1,18 +1,18 @@ 'use server' +import { revalidateTag } from 'next/cache' +import { cookies } from 'next/headers' import { addToCart, createCart, getCart, removeFromCart, updateCart, -} from 'libs/shopify' -import { TAGS } from 'libs/shopify/constants' -import { revalidateTag } from 'next/cache' -import { cookies } from 'next/headers' +} from '~/libs/shopify' +import { TAGS } from '~/libs/shopify/constants' export async function removeItem(prevState, merchandiseId) { - let cartId = cookies().get('cartId')?.value + const cartId = cookies().get('cartId')?.value if (!cartId) { return 'Missing cart ID' @@ -26,10 +26,10 @@ export async function removeItem(prevState, merchandiseId) { } const lineItem = cart.lines.find( - (line) => line.merchandise.id === merchandiseId, + (line) => line.merchandise.id === merchandiseId ) - if (lineItem && lineItem.id) { + if (lineItem?.id) { await removeFromCart(cartId, [lineItem.id]) revalidateTag(TAGS.cart) } else { @@ -68,9 +68,9 @@ export async function addItem(prevState, { variantId, quantity = 1 }) { export async function updateItemQuantity( prevState, - payload = { merchandiseId: '', quantity: '' }, + payload = { merchandiseId: '', quantity: '' } ) { - let cartId = cookies().get('cartId')?.value + const cartId = cookies().get('cartId')?.value if (!cartId) { return 'Missing cart ID' @@ -86,7 +86,7 @@ export async function updateItemQuantity( const { merchandiseId, quantity } = payload const lineItem = cart.lines.find( - (line) => line.merchandise.id === merchandiseId, + (line) => line.merchandise.id === merchandiseId ) await updateCart(cartId, [ @@ -103,7 +103,7 @@ export async function updateItemQuantity( } export async function fetchCart() { - let cartId = cookies().get('cartId')?.value + const cartId = cookies().get('cartId')?.value let cart diff --git a/libs/shopify/cart/add-to-cart/index.js b/libs/shopify/cart/add-to-cart/index.js index 3cee63d..bc29252 100644 --- a/libs/shopify/cart/add-to-cart/index.js +++ b/libs/shopify/cart/add-to-cart/index.js @@ -1,7 +1,7 @@ 'use client' import cn from 'clsx' -import { addItem } from 'libs/shopify/cart/actions' +import { addItem } from '~/libs/shopify/cart/actions' import { useCartContext } from '../cart-context' import { useCartModal } from '../modal' import s from './add-to-cart.module.css' diff --git a/libs/shopify/cart/modal/index.js b/libs/shopify/cart/modal/index.js index a495f6c..d7245b7 100644 --- a/libs/shopify/cart/modal/index.js +++ b/libs/shopify/cart/modal/index.js @@ -1,9 +1,9 @@ 'use client' import cn from 'clsx' -import { Image } from 'components/image' -import { Link } from 'components/link' import { createContext, useContext, useState } from 'react' +import { Image } from '~/components/image' +import { Link } from '~/components/link' import { removeItem, updateItemQuantity } from '../actions' import { useCartContext } from '../cart-context' import s from './modal.module.css' diff --git a/libs/shopify/cart/optimistic-utils.js b/libs/shopify/cart/optimistic-utils.js index 9667a0a..b8d312f 100644 --- a/libs/shopify/cart/optimistic-utils.js +++ b/libs/shopify/cart/optimistic-utils.js @@ -1,4 +1,4 @@ -import { isEmptyArray } from 'libs/utils' +import { isEmptyArray } from '~/libs/utils' export function cartReconciler(state, action) { const currentCart = state || createEmptyCart() @@ -26,12 +26,8 @@ function createEmptyCart() { } const reconcilingActions = { - UPDATE_ITEM: function (state, action) { - return updateItem(state, action) - }, - ADD_ITEM: function (state, action) { - return addItem(state, action) - }, + UPDATE_ITEM: (state, action) => updateItem(state, action), + ADD_ITEM: (state, action) => addItem(state, action), } function updateItem(state, action) { @@ -40,7 +36,7 @@ function updateItem(state, action) { .map((item) => item.merchandise.id === merchandiseId ? updateCartItem(item, updateType) - : item, + : item ) .filter(Boolean) @@ -62,18 +58,18 @@ function updateItem(state, action) { function addItem(state, action) { const { variant, product, quantity } = action.payload const existingItem = state.lines.find( - (item) => item.merchandise.id === variant.id, + (item) => item.merchandise.id === variant.id ) const updatedItem = createOrUpdateCartItem( existingItem, variant, product, - quantity, + quantity ) const updatedLines = existingItem ? state.lines.map((item) => - item.merchandise.id === variant.id ? updatedItem : item, + item.merchandise.id === variant.id ? updatedItem : item ) : [...state.lines, updatedItem] @@ -97,7 +93,7 @@ function updateCartItem(item, updateType) { const singleItemAmount = Number(item.cost.totalAmount.amount) / item.quantity const newTotalAmount = calculateItemCost( newQuantity, - singleItemAmount.toString(), + singleItemAmount.toString() ) return { @@ -150,7 +146,7 @@ function updateCartTotals(lines) { const totalQuantity = lines.reduce((sum, item) => sum + item.quantity, 0) const totalAmount = lines.reduce( (sum, item) => sum + Number(item.cost.totalAmount.amount), - 0, + 0 ) const currencyCode = lines[0]?.cost.totalAmount.currencyCode ?? 'USD' diff --git a/libs/shopify/customer/actions.js b/libs/shopify/customer/actions.js index 0b4422c..88261c1 100644 --- a/libs/shopify/customer/actions.js +++ b/libs/shopify/customer/actions.js @@ -1,7 +1,7 @@ 'use server' -import { shopifyFetch } from 'libs/shopify' import { cookies } from 'next/headers' +import { shopifyFetch } from '~/libs/shopify' import { customerAccessTokenCreateMutation, customerAccessTokenDeleteMutation, diff --git a/libs/shopify/index.js b/libs/shopify/index.js index 9dab082..daae95e 100644 --- a/libs/shopify/index.js +++ b/libs/shopify/index.js @@ -1,11 +1,11 @@ +import { revalidateTag } from 'next/cache' +import { headers } from 'next/headers' +import { NextResponse } from 'next/server' import { HIDDEN_PRODUCT_TAG, SHOPIFY_GRAPHQL_API_ENDPOINT, TAGS, -} from 'libs/shopify/constants' -import { revalidateTag } from 'next/cache' -import { headers } from 'next/headers' -import { NextResponse } from 'next/server' +} from '~/libs/shopify/constants' import { addToCartMutation, createCartMutation, @@ -277,7 +277,7 @@ export async function getCollections() { // Filter out the `hidden` collections. // Collections that start with `hidden-*` need to be hidden on the search page. ...reshapeCollections(shopifyCollections).filter( - (collection) => !collection.handle.startsWith('hidden'), + (collection) => !collection.handle.startsWith('hidden') ), ]