Merge pull request #228 from w3bdesign/development

Development

Author: w3bdesign

components/Cart/CartPage/CartItemsContainer.component.jsx

@@ -9,7 +9,7 @@ import {
   getUpdatedItems,
 } from '../../../utils/functions/functions';
 
-import PageTitle from 'components/Header/PageTitle.component';
+import PageTitle from 'components/Title/PageTitle.component';
 import RegularCart from './RegularCart.component';
 import MobileCart from './MobileCart.component';
 import LoadingSpinner from 'components/LoadingSpinner/LoadingSpinner.component';

pages/_app.js

@@ -4,14 +4,14 @@ import { AppProvider } from 'utils/context/AppContext';
 import Router from 'next/router';
 import NProgress from 'nprogress';
 
-import Footer from '../components/Footer/Footer.component';
+import Footer from 'components/Footer/Footer.component';
 
 import "styles/index.css";
 import 'styles/algolia.min.css';
 import 'styles/animate.min.css';
 import 'nprogress/nprogress.css';
 
-import client from '../utils/apollo/ApolloClient';
+import client from 'utils/apollo/ApolloClient';
 
 Router.events.on('routeChangeStart', () => NProgress.start());
 Router.events.on('routeChangeComplete', () => NProgress.done());

pages/kategori/[slug].js

@@ -1,7 +1,8 @@
 import { withRouter } from 'next/router';
 
+import Header from 'components/Header/Header.component';
 import IndexProducts from 'components/Product/IndexProducts.component';
-import PageTitle from 'components/Header/PageTitle.component';
+import PageTitle from 'components/Title/PageTitle.component';
 
 import client from 'utils/apollo/ApolloClient';
 
@@ -11,12 +12,11 @@ import { GET_PRODUCTS_FROM_CATEGORY } from 'utils/const/GQL_QUERIES';
  * Display a single product with dynamic pretty urls
  */
 const Produkt = ({ categoryName, products }) => {
- 
-
-  const error = false;
+  let error = false;
 
   return (
     <>
+      <Header title={`- ${categoryName && categoryName}`} />
       {products ? (
         <>
           <PageTitle title={categoryName} marginleft="50" />

pages/produkter.js

@@ -1,7 +1,7 @@
 import Header from 'components/Header/Header.component';
 import IndexProducts from 'components/Product/IndexProducts.component';
 import LoadingSpinner from 'components/LoadingSpinner/LoadingSpinner.component';
-import PageTitle from 'components/Header/PageTitle.component';
+import PageTitle from 'components/Title/PageTitle.component';
 
 import { FETCH_ALL_PRODUCTS_QUERY } from 'utils/const/GQL_QUERIES';
 

utils/functions/functions.js

@@ -1,5 +1,7 @@
 import { v4 } from 'uuid';
 
+import { WOO_CONFIG } from 'utils/config/nextConfig';
+
 /**
  * Convert price from string to floating value and convert it to use two decimals
  * @param {String} string
@@ -193,6 +195,8 @@ export const getFormattedCart = (data) => {
 
   const givenProducts = data.cart.contents.nodes;
 
+  console.log(givenProducts);
+
   // Create an empty object.
   formattedCart = {};
   formattedCart.products = [];
@@ -211,11 +215,18 @@ export const getFormattedCart = (data) => {
     product.qty = givenProducts[i].quantity;
     product.price = convertedCurrency / product.qty;
     product.totalPrice = givenProducts[i].total;
-    product.image = {
-      sourceUrl: givenProduct.image.sourceUrl,
-      srcSet: givenProduct.image.srcSet,
-      title: givenProduct.image.title,
-    };
+    // Ensure we can add products without images to the cart
+    givenProduct.image
+      ? (product.image = {
+          sourceUrl: givenProduct.image.sourceUrl,
+          srcSet: givenProduct.image.srcSet,
+          title: givenProduct.image.title,
+        })
+      : (product.image = {
+          sourceUrl: WOO_CONFIG.PLACEHOLDER_SMALL_IMAGE_URL,
+          srcSet: WOO_CONFIG.PLACEHOLDER_SMALL_IMAGE_URL,
+          title: givenProduct.name,
+        });
 
     totalProductsCount += givenProducts[i].quantity;
     // Push each item into the products array.