Merge pull request #241 from w3bdesign/development

Development
w3bdesign · Sep 14, 2020 · dd684b9 · dd684b9 · vercel · Sep 14, 2020
2 parents 653dfd6 + ad3fdca
commit dd684b9
Show file tree

Hide file tree

Showing 10 changed files with 1,335 additions and 3,323 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nextjs-woocommerce",
-  "version": "0.9.92",
+  "version": "0.9.94",
   "description": "Nextjs WooCommerce webshop",
   "main": "index.js",
   "scripts": {
@@ -12,23 +12,23 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@apollo/client": "^3.0.2",
-    "@types/react": "^16.9.43",
-    "algoliasearch": "^4.3.1",
+    "@apollo/client": "^3.1.5",
+    "@types/react": "^16.9.49",
+    "algoliasearch": "^4.5.1",
     "graphql": "^15.3.0",
-    "next": "^9.4.4",
+    "next": "^9.5.3",
     "nprogress": "^0.2.0",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
-    "react-hook-form": "^6.0.8",
+    "react-hook-form": "^6.8.2",
     "react-instantsearch-dom": "^6.7.0",
     "react-spring": "^8.0.27",
-    "styled-components": "^5.1.1",
-    "uuid": "^8.2.0"
+    "styled-components": "^5.2.0",
+    "uuid": "^8.3.0"
   },
   "devDependencies": {
-    "babel-plugin-styled-components": "^1.10.7",
+    "babel-plugin-styled-components": "^1.11.1",
     "postcss-preset-env": "^6.7.0",
-    "tailwindcss": "^1.5.2"
+    "tailwindcss": "^1.8.10"
   }
 }
diff --git a/pages/index.js b/pages/index.js
@@ -36,6 +36,6 @@ export async function getStaticProps() {
       loading: loading,
       networkStatus: networkStatus,
     },
-    unstable_revalidate: 10,
+    revalidate: 10,
   };
 }
diff --git a/pages/kategori/[slug].js b/pages/kategori/[slug].js
@@ -20,7 +20,6 @@ const Produkt = ({ categoryName, products }) => {
       {products ? (
         <>
           <PageTitle title={categoryName} marginleft="50" />
-
           <IndexProducts products={products} />
         </>
       ) : (

diff --git a/pages/kategorier.js b/pages/kategorier.js
@@ -49,6 +49,6 @@ export async function getStaticProps() {
     props: {
       categories: result.data.productCategories.nodes,
     },
-    unstable_revalidate: 10,
+    revalidate: 10,
   };
 }
diff --git a/pages/produkt/[slug].js b/pages/produkt/[slug].js
@@ -36,7 +36,7 @@ export default withRouter(Produkt);
 export async function getServerSideProps({ query: { productId } }) {
   const res = await client.query({
     query: GET_SINGLE_PRODUCT,
-    variables: { productId },
+    variables: { id: productId },
   });
 
   return {

diff --git a/pages/produkter.js b/pages/produkter.js
@@ -52,6 +52,6 @@ export async function getStaticProps() {
     props: {
       products: result.data.products.nodes,
     },
-    unstable_revalidate: 10,
+    revalidate: 10,
   };
 }
diff --git a/screenshots/screenshot1.jpg b/screenshots/screenshot1.jpg
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -1,8 +1,12 @@
 module.exports = {
-  purge: ["./components/**/*.jsx", "./pages/**/*.js"],
+  purge: ['./components/**/*.jsx', './pages/**/*.js'],
   theme: {
     extend: {},
   },
   variants: {},
   plugins: [],
-};
+  future: {
+    removeDeprecatedGapUtilities: true,
+    purgeLayersByDefault: true,
+  },
+};
diff --git a/utils/config/nextConfig.js b/utils/config/nextConfig.js
@@ -2,16 +2,14 @@
 
 // Live details
 
-
 export const WOO_CONFIG = {
   GRAPHQL_URL: 'https://woo.dfweb.no/graphql',
   ALGOLIA_APP_ID: '7L9M5Y0B1K',
   ALGOLIA_PUBLIC_API_KEY: '925cc92373120f1bf477bb8ce0e71649',
   ALGOLIA_INDEX_NAME: 'dfweb',
-  PLACEHOLDER_IMAGE_URL: "https://via.placeholder.com/272",
+  PLACEHOLDER_IMAGE_URL: 'https://via.placeholder.com/272',
 };
 
-
 // Development details
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,6 @@ const Produkt = ({ categoryName, products }) => { @@
           {products ? (
             <>
               <PageTitle title={categoryName} marginleft="50" />
               <IndexProducts products={products} />
             </>
           ) : (
@@ Expand Down @@