Skip to content

Commit 020247c

Browse files
authored
Merge pull request #249 from w3bdesign/development
Development
2 parents b91d021 + 0f547f9 commit 020247c

File tree

10 files changed

+13
-16
lines changed

10 files changed

+13
-16
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ With that said, keep the following in mind:
7171

7272
## TODO
7373

74+
- Look into replacing nextConfig.js with https://vercel.com/docs/build-step#environment-variables
7475
- Copy billing address to shipping address
7576
- Display product variation name in cart / checkout
7677
- Hide products not in stock

components/AlgoliaSearch/AlgoliaSearchBox.component.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import algoliasearch from 'algoliasearch';
22
import { InstantSearch, SearchBox, Hits } from 'react-instantsearch-dom';
33
import { useState } from 'react';
44

5-
import { WOO_CONFIG } from 'utils/config/nextConfig';
5+
import WOO_CONFIG from 'utils/config/nextConfig';
66
import SearchResults from './SearchResults.component';
77

88
const searchClient = algoliasearch(

components/AlgoliaSearch/MobileSearch.component.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import algoliasearch from 'algoliasearch';
22
import { InstantSearch, SearchBox, Hits } from 'react-instantsearch-dom';
33
import { useState } from 'react';
44

5-
import { WOO_CONFIG } from 'utils/config/nextConfig';
5+
import WOO_CONFIG from 'utils/config/nextConfig';
66
import SearchResults from './SearchResults.component';
77

88
const searchClient = algoliasearch(

components/Category/Categories.component.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { v4 as uuidv4 } from 'uuid';
44
/**
55
* Map over the categories and display them individually.
66
* Uses uuidv4 for unique key IDs
7-
* @param {Object} categories
7+
* @param {Object} categories Product categories
88
*/
99
const Categories = ({ categories }) => {
1010
return (

components/Header/Hamburger.component.jsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ const Hamburger = () => {
1414
to: [
1515
{
1616
opacity: isExpanded ? 1 : 0,
17-
marginTop: isExpanded ? '180px' : '-180px',
17+
marginTop: isExpanded ? '335px' : '-180px',
1818
},
1919
],
2020
from: {
2121
opacity: isExpanded ? 1 : 0,
22-
marginTop: isExpanded ? '180px' : '-180px',
22+
marginTop: isExpanded ? '335px' : '-180px',
2323
},
2424
});
2525

@@ -99,7 +99,7 @@ const Hamburger = () => {
9999
className="absolute right-0 z-10 w-full text-center text-black bg-white "
100100
>
101101
<ul>
102-
<li className="w-full p-4 border-b border-gray-400 border-solid rounded">
102+
<li className="w-full p-4 border-t border-gray-400 border-solid rounded">
103103
<Link href="/">
104104
<a
105105
className="inline-block px-4 py-2 no-underline hover:text-black hover:underline"
@@ -109,7 +109,7 @@ const Hamburger = () => {
109109
</a>
110110
</Link>
111111
</li>
112-
<li className="w-full p-4 border-b border-gray-400 border-solid rounded">
112+
<li className="w-full p-4 border-t border-gray-400 border-solid rounded">
113113
<Link href="/produkter">
114114
<a
115115
className="inline-block px-4 py-2 no-underline hover:text-black hover:underline"
@@ -121,7 +121,7 @@ const Hamburger = () => {
121121
</li>
122122
<li
123123
id="mobile-li"
124-
className="w-full p-4 border-b border-gray-400 border-solid rounded"
124+
className="w-full p-4 border-t border-b border-gray-400 border-solid rounded"
125125
>
126126
<Link href="/kategorier">
127127
<a

components/Product/IndexProducts.component.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Link from 'next/link';
22
import { v4 as uuidv4 } from 'uuid';
33

4-
import { WOO_CONFIG } from 'utils/config/nextConfig';
4+
import WOO_CONFIG from 'utils/config/nextConfig';
55

66
/**
77
* Displays all of the products as long as length is defined.

components/Product/SingleProduct.component.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { useState, useEffect } from 'react';
33
import AddToCartButton from 'components/Cart/AddToCartButton.component';
44
import LoadingSpinner from 'components/LoadingSpinner/LoadingSpinner.component';
55

6-
import { WOO_CONFIG } from 'utils/config/nextConfig';
6+
import WOO_CONFIG from 'utils/config/nextConfig';
77

88
/**
99
* Shows a single product with an Add To Cart button.

styles/index.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
height: 24rem;
77
}
88

9-
#mobile-menu {
10-
height: 300px;
11-
}
12-
139
#cart-div {
1410
width: 300px;
1511
}

utils/apollo/ApolloClient.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99

1010
import introspectionQueryResultData from './fragmentTypes';
1111

12-
import { WOO_CONFIG } from 'utils/config/nextConfig';
12+
import WOO_CONFIG from 'utils/config/nextConfig';
1313

1414
// Fragment matcher.
1515
/*const fragmentMatcher = new IntrospectionFragmentMatcher({

utils/functions/functions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { v4 } from 'uuid';
22

3-
import { WOO_CONFIG } from 'utils/config/nextConfig';
3+
import WOO_CONFIG from 'utils/config/nextConfig';
44

55
/**
66
* Convert price from string to floating value and convert it to use two decimals

0 commit comments

Comments
 (0)