Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

context.js updates w/ graphQL #129

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

context.js updates w/ graphQL #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
162d0b8
feat: context.js updates w/ graphQL
jpvalery Nov 2, 2023
dac7fc6
fix: switch to HULL original Prettier config
jpvalery Nov 2, 2023
1425889
feat: graphql refactor (fixes #125)
jpvalery Nov 3, 2023
8b34d27
fix: openCart bug on setCartState
jpvalery Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 33 additions & 26 deletions components/cart-item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import React from 'react'
import Link from 'next/link'

import { hasObject } from '@lib/helpers'

import { useUpdateItem, useRemoveItem, useToggleCart } from '@lib/context'
import { useRemoveItem, useToggleCart, useUpdateItem } from '@lib/context'

import Photo from '@components/photo'
import { ProductCounter, ProductPrice } from '@components/product'

function CartItem({ item }) {
Expand All @@ -14,51 +11,64 @@ function CartItem({ item }) {
const toggleCart = useToggleCart()

const changeQuantity = (quantity) => {
updateItem(item.lineID, quantity)
updateItem(item.id, quantity)
}

const defaultPhoto = item.photos.cart?.find((set) => !set.forOption)
const variantPhoto = item.photos.cart?.find((set) => {
const option = set.forOption
? {
name: set.forOption.split(':')[0],
value: set.forOption.split(':')[1],
}
: {}
return option.value && hasObject(item.options, option)
})
/*
const defaultPhoto = item.photos.cart?.find((set) => !set.forOption);
const variantPhoto = item.photos.cart?.find((set) => {
const option = set.forOption
? {
name: set.forOption.split(':')[0],
value: set.forOption.split(':')[1],
}
: {};
return option.value && hasObject(item.options, option);
});

const photos = variantPhoto ? variantPhoto : defaultPhoto
const photos = variantPhoto ? variantPhoto : defaultPhoto;
*/
const photos = item.merchandise.product.images.edges[0].node.originalSrc

return (
<div className="cart-item">
{/*
{photos && (
<Photo
photo={photos?.default}
srcSizes={[400]}
sizes="(min-width: 768px) 400px, 35vw'"
className="cart-item--photo"
/>
)}
)}
*/}
{photos && <img src={photos} className="cart-item--photo" />}
<div className="cart-item--details">
<div className="cart-item--header">
<div className="cart-item--title">
<div className="cart-item--variant">{item.title}</div>
{/* <div className="cart-item--variant">
{item.merchandise.product.title}
</div> */}
<h2 className="cart-item--name">
<Link
href={`/products/${item.product.slug}?variant=${item.id}`}
href={`/products/${
item.merchandise.product.handle
}?variant=${item.merchandise.id.replace(
'gid://shopify/ProductVariant/',
'',
)}`}
scroll={false}
>
<a
onClick={() => toggleCart(false)}
className="cart-item--link"
>
{item.product.title}
{item.merchandise.product.title}
</a>
</Link>
</h2>
</div>
<ProductPrice price={item.price} />
<ProductPrice price={item.cost.totalAmount.amount * 100} />
</div>
<div className="cart-item--tools">
<div className="cart-item--quantity">
Expand All @@ -70,11 +80,8 @@ function CartItem({ item }) {
className="is-small is-inverted"
/>
</div>
<button
onClick={() => removeItem(item.lineID)}
className="btn is-text"
>
Remove
<button onClick={() => removeItem(item.id)} className="btn is-text">
Supprimer
</button>
</div>
</div>
Expand Down
32 changes: 19 additions & 13 deletions components/cart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
import React, { useState, useEffect } from 'react'
import cx from 'classnames'
import FocusTrap from 'focus-trap-react'
import { m } from 'framer-motion'
import cx from 'classnames'
import { useEffect, useState } from 'react'

import { centsToPrice } from '@lib/helpers'

import {
useSiteContext,
useCartTotals,
useCartCount,
useCartItems,
useCartTotals,
useCheckout,
useCheckoutCount,
useCheckoutItems,
useCheckoutTotals,
useSiteContext,
useToggleCart,
} from '@lib/context'

Expand All @@ -23,8 +26,11 @@ const Cart = ({ data }) => {

const { isCartOpen, isUpdating } = useSiteContext()
const { subTotal } = useCartTotals()
const { subTotalCheckout } = useCheckoutTotals()
const checkouttCount = useCheckoutCount()
const cartCount = useCartCount()
const lineItems = useCartItems()
const lineItems = useCheckoutItems()
const cartLineItems = useCartItems()
const checkoutURL = useCheckout()
const toggleCart = useToggleCart()

Expand Down Expand Up @@ -52,7 +58,7 @@ const Cart = ({ data }) => {
const buildCheckoutLink = shop.storeURL
? checkoutURL.replace(
/^(?:https?:\/\/)?(?:[^@\/\n]+@)?(?:www\.)?([^:\/?\n]+)/g,
shop.storeURL
shop.storeURL,
)
: checkoutURL
setCheckoutLink(buildCheckoutLink)
Expand Down Expand Up @@ -87,26 +93,26 @@ const Cart = ({ data }) => {
<div className="cart--inner">
<div className="cart--header">
<div className="cart--title">
Your Cart <span className="cart--count">{cartCount}</span>
Votre panier <span className="cart--count">{cartCount}</span>
</div>
<button className="cart-toggle" onClick={() => toggleCart(false)}>
Done
Fini
</button>
</div>

<div className="cart--content">
{lineItems?.length ? (
<CartItems items={lineItems} />
{cartLineItems?.length ? (
<CartItems items={cartLineItems} />
) : (
<EmptyCart />
)}
</div>

{lineItems?.length > 0 && (
{cartLineItems?.length > 0 && (
<div className="cart--footer">
<div className="cart--subtotal">
<span>Subtotal</span>
<span>${centsToPrice(subTotal)}</span>
<span>{centsToPrice(subTotal * 100)}$</span>
</div>

<a
Expand Down Expand Up @@ -140,7 +146,7 @@ const CartItems = ({ items }) => {
return (
<div className="cart--items">
{items.map((item) => {
return <CartItem key={item.id} item={item} />
return <CartItem key={item.node.id} item={item.node} />
})}
</div>
)
Expand Down
22 changes: 12 additions & 10 deletions components/header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
import React, { useState, useRef, useEffect } from 'react'
import { m } from 'framer-motion'
import FocusTrap from 'focus-trap-react'
import { useInView } from 'react-cool-inview'
import { useRect } from '@reach/rect'
import { useRouter } from 'next/router'
import Link from 'next/link'
import cx from 'classnames'
import FocusTrap from 'focus-trap-react'
import { m } from 'framer-motion'
import Link from 'next/link'
import { useRouter } from 'next/router'
import { useEffect, useRef, useState } from 'react'
import { useInView } from 'react-cool-inview'

import { isBrowser } from '@lib/helpers'

import {
useCartCount,
useCheckoutCount,
useSiteContext,
useToggleMegaNav,
useToggleCart,
useCartCount,
useToggleMegaNav,
} from '@lib/context'

import PromoBar from '@components/promo-bar'
import Icon from '@components/icon'
import Menu from '@components/menu'
import MegaNavigation from '@components/menu-mega-nav'
import Icon from '@components/icon'
import PromoBar from '@components/promo-bar'

const Header = ({ data = {}, isTransparent, onSetup = () => {} }) => {
// expand our header data
Expand Down Expand Up @@ -216,6 +217,7 @@ const Header = ({ data = {}, isTransparent, onSetup = () => {} }) => {

const CartToggle = () => {
const toggleCart = useToggleCart()
const checkoutCount = useCheckoutCount()
const cartCount = useCartCount()

return (
Expand Down
Loading