Merge pull request #1 from voucherifyio/ps/parkland

preparing to V% custom app [V% products, other localisations]
voucherifyio · Apr 12, 2024 · 49ff7ec · 49ff7ec
2 parents fe839ba + 1879a96
commit 49ff7ec
Show file tree

Hide file tree

Showing 37 changed files with 414 additions and 554 deletions.
diff --git a/composable-ui/.gitignore b/composable-ui/.gitignore
@@ -1,2 +1,4 @@
 public/sitemap*
 public/robots.txt
+
+.env*.local
diff --git a/composable-ui/next.config.js b/composable-ui/next.config.js
@@ -45,6 +45,23 @@ module.exports = () => {
         'voucherify-uploads.s3.amazonaws.com',
         'voucherify.io',
         'dev.dl.voucherify.io',
+        'www.drinksupermarket.com',
+        'www.nestlepurezavital.com.ar',
+        'www.benjerry.com',
+        'a.allegroimg.com',
+        'i5.walmartimages.com',
+        'www.teyli.eu',
+        'basketo.pl',
+        'asset1.cxnmarksandspencer.com',
+        'japoniacentralna.pl',
+        'content.woolovers.com',
+        'encrypted-tbn0.gstatic.com',
+        'm.media-amazon.com',
+        'i.insider.com',
+        'lsco.scene7.com',
+        'media.boohoo.com',
+        'pl.benetton.com',
+        'eu.wrangler.com',
       ],
       formats: ['image/avif', 'image/webp'],
       minimumCacheTTL: 60 * 60 * 24 * 30,

diff --git a/composable-ui/src/components/cart/__data__/cart-data.ts b/composable-ui/src/components/cart/__data__/cart-data.ts
@@ -6,18 +6,13 @@ export const cartData: CartData = {
     {
       id: '1',
       category: 'Accessories',
-      type: 'Bag',
       name: 'Venture Daypack',
       brand: 'Riley',
       price: 129,
       tax: 0.07,
-      image: {
-        url: '/img/products/_0000s_0001_backpack-rugged-black-front.jpg',
-        alt: '',
-      },
-      sku: 'SKU-A1-2345',
-      slug: 'venture-daypack',
+      image_url: '/img/products/_0000s_0001_backpack-rugged-black-front.jpg',
       quantity: 1,
+      slug: 'venture-daypack',
     },
   ],
   summary: {

diff --git a/composable-ui/src/components/cart/cart-drawer/cart-drawer.tsx b/composable-ui/src/components/cart/cart-drawer/cart-drawer.tsx
@@ -102,15 +102,18 @@ export const CartDrawer = () => {
                         columns={4}
                         editable
                         details={[
-                          { name: 'SKU', value: item.sku, id: item.id },
-                          { name: 'Type', value: item.type, id: item.id },
+                          {
+                            name: 'Category',
+                            value: item.category,
+                            id: item.id,
+                          },
                         ]}
                         size={'sm'}
                         image={{
-                          src: item.image.url,
-                          alt: item.image.alt ?? item.name,
+                          src: item.image_url || '',
+                          alt: item.name || '',
                           onClickImage: () =>
-                            router.push(`/product/${item.slug}`),
+                            router.push(`/product/${item.slug}?id=${item.id}`),
                         }}
                         name={item.name || ''}
                         labels={{

diff --git a/composable-ui/src/components/cart/cart-item-data.tsx b/composable-ui/src/components/cart/cart-item-data.tsx
@@ -15,7 +15,7 @@ export const CartItemData = ({ cartItem }: CartItemDataProps) => {
     <Stack direction="row" spacing={{ base: '3', md: '5' }} flexGrow={1}>
       <Link
         as={NextLink}
-        href={`/product/${cartItem.slug}`}
+        href={`/product/${cartItem.slug}?id=${cartItem.id}`}
         display="flex"
         rounded="base"
       >
@@ -28,8 +28,8 @@ export const CartItemData = ({ cartItem }: CartItemDataProps) => {
         >
           <Image
             fit="cover"
-            src={cartItem.image.url || APP_CONFIG.IMAGE_PLACEHOLDER}
-            alt={cartItem.image.alt}
+            src={cartItem.image_url || APP_CONFIG.IMAGE_PLACEHOLDER}
+            alt={cartItem.name || ''}
             draggable="false"
             loading="lazy"
             width="full"
@@ -40,9 +40,6 @@ export const CartItemData = ({ cartItem }: CartItemDataProps) => {
       <Box maxWidth="calc(100% - 130px)">
         <Stack fontSize="sm" align="flex-start">
           <Text fontWeight="semibold">{cartItem.name}</Text>
-          <Text color="text-muted">
-            {intl.formatMessage({ id: 'product.sku' }, { sku: cartItem.sku })}
-          </Text>
         </Stack>
       </Box>
     </Stack>

diff --git a/composable-ui/src/components/cart/cart-page.tsx b/composable-ui/src/components/cart/cart-page.tsx
@@ -110,15 +110,18 @@ export const CartPage = () => {
                         columns={4}
                         editable
                         details={[
-                          { name: 'SKU', value: item.sku, id: item.id },
-                          { name: 'Type', value: item.type, id: item.id },
+                          {
+                            name: 'Category',
+                            value: item.category,
+                            id: item.id,
+                          },
                         ]}
                         size={productCartSize}
                         image={{
-                          src: item.image.url,
-                          alt: item.image.alt ?? item.name,
+                          src: item.image_url || '',
+                          alt: item.name || '',
                           onClickImage: () =>
-                            router.push(`/product/${item.slug}`),
+                            router.push(`/product/${item.slug}?&id=${item.id}`),
                         }}
                         metaText={
                           productCartSize === 'lg'

diff --git a/composable-ui/src/components/checkout/products-list.tsx b/composable-ui/src/components/checkout/products-list.tsx
@@ -32,13 +32,14 @@ export const ProductsList = ({
             key={`${item.name}-${item.id}`}
             columns={2}
             size="lg"
-            name={item.name}
+            name={item.name || item.id}
             brand={item.brand}
             quantity={item.quantity}
             image={{
-              src: item.image.url,
-              alt: item.image.alt ?? item.name,
-              onClickImage: () => router.push(`/product/${item.slug}`),
+              src: item.image_url || '',
+              alt: item.name || '',
+              onClickImage: () =>
+                router.push(`/product/${item.slug}?id=${item.id}`),
             }}
             regularPrice={intl.formatNumber(item.price, currencyFormatConfig)}
             labels={{

diff --git a/composable-ui/src/components/ev-kiosk-and-pomp-page.tsx b/composable-ui/src/components/ev-kiosk-and-pomp-page.tsx
diff --git a/composable-ui/src/components/layout/header.tsx b/composable-ui/src/components/layout/header.tsx
@@ -79,14 +79,14 @@ export const Header = () => {
                 height: 'full',
               }}
             />
-            <MenuItem
+            {/* <MenuItem
               label="Ev Kiosk & Pump"
               href={`/ev-kiosk-and-pomp`}
               state={'/ev-kiosk-and-pomp' === pathname ? 'Active' : 'Default'}
               rootProps={{
                 height: 'full',
               }}
-            />
+            /> */}
             <MenuItem
               label="Return Products"
               href={`/return-products`}