Compare commits

..

28 Commits

Author SHA1 Message Date
dependabot[bot]
771f3b2901 Bump ua-parser-js from 0.7.31 to 0.7.33
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.31 to 0.7.33.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Changelog](https://github.com/faisalman/ua-parser-js/blob/master/changelog.md)
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.31...0.7.33)

---
updated-dependencies:
- dependency-name: ua-parser-js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-27 11:39:36 +00:00
Raymond
d68a8d6f1f Merge pull request #24 from Rhymond/dependabot/npm_and_yarn/lodash-es-4.17.21
Bump lodash-es from 4.17.4 to 4.17.21
2022-04-03 18:17:16 +01:00
Raymond
971af955f9 Merge pull request #22 from Rhymond/dependabot/npm_and_yarn/urijs-1.19.10
Bump urijs from 1.18.12 to 1.19.10
2022-04-03 18:17:05 +01:00
Raymond
4492822065 Merge pull request #20 from Rhymond/dependabot/npm_and_yarn/url-parse-1.5.10
Bump url-parse from 1.4.3 to 1.5.10
2022-04-03 18:16:56 +01:00
Raymond
f32c001de3 Merge pull request #17 from Rhymond/dependabot/npm_and_yarn/follow-redirects-1.14.8
Bump follow-redirects from 1.5.7 to 1.14.8
2022-04-03 18:16:47 +01:00
Raymond
8b058c1b92 Merge pull request #16 from Rhymond/dependabot/npm_and_yarn/handlebars-4.7.7
Bump handlebars from 4.0.11 to 4.7.7
2022-04-03 18:16:32 +01:00
Raymond
249e45216c Merge pull request #15 from Rhymond/dependabot/npm_and_yarn/node-sass-4.14.1
Bump node-sass from 4.9.3 to 4.14.1
2022-04-03 18:16:05 +01:00
Raymond
28d4ca64cb Merge pull request #14 from Rhymond/dependabot/npm_and_yarn/ua-parser-js-0.7.31
Bump ua-parser-js from 0.7.18 to 0.7.31
2022-04-03 18:15:53 +01:00
Raymond
f0823eec57 Merge pull request #11 from Rhymond/dependabot/npm_and_yarn/tmpl-1.0.5
Bump tmpl from 1.0.4 to 1.0.5
2022-04-03 18:15:43 +01:00
Raymond
6f8650b8a8 Merge pull request #9 from Rhymond/dependabot/npm_and_yarn/dns-packet-1.3.4
Bump dns-packet from 1.3.1 to 1.3.4
2022-04-03 18:13:52 +01:00
dependabot[bot]
1f652b172d Bump lodash-es from 4.17.4 to 4.17.21
Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.4 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.4...4.17.21)

---
updated-dependencies:
- dependency-name: lodash-es
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-15 18:34:36 +00:00
dependabot[bot]
912f1218fd Bump urijs from 1.18.12 to 1.19.10
Bumps [urijs](https://github.com/medialize/URI.js) from 1.18.12 to 1.19.10.
- [Release notes](https://github.com/medialize/URI.js/releases)
- [Changelog](https://github.com/medialize/URI.js/blob/gh-pages/CHANGELOG.md)
- [Commits](https://github.com/medialize/URI.js/compare/v1.18.12...v1.19.10)

---
updated-dependencies:
- dependency-name: urijs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-08 21:30:19 +00:00
dependabot[bot]
2d057c7e3a Bump url-parse from 1.4.3 to 1.5.10
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.4.3 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.4.3...1.5.10)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-26 01:37:22 +00:00
dependabot[bot]
a4b10dc3da Bump follow-redirects from 1.5.7 to 1.14.8
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.5.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.5.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-14 07:35:00 +00:00
dependabot[bot]
3261386cd6 Bump handlebars from 4.0.11 to 4.7.7
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.0.11 to 4.7.7.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.0.11...v4.7.7)

---
updated-dependencies:
- dependency-name: handlebars
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-11 00:41:57 +00:00
dependabot[bot]
590babbf3a Bump node-sass from 4.9.3 to 4.14.1
Bumps [node-sass](https://github.com/sass/node-sass) from 4.9.3 to 4.14.1.
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/node-sass/compare/v4.9.3...v4.14.1)

---
updated-dependencies:
- dependency-name: node-sass
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-09 23:20:10 +00:00
dependabot[bot]
94b8507ef6 Bump ua-parser-js from 0.7.18 to 0.7.31
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.18 to 0.7.31.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.18...0.7.31)

---
updated-dependencies:
- dependency-name: ua-parser-js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-09 22:56:49 +00:00
dependabot[bot]
23af127430 Bump tmpl from 1.0.4 to 1.0.5
Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases)
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5)

---
updated-dependencies:
- dependency-name: tmpl
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-20 20:37:18 +00:00
dependabot[bot]
5b03415f96 Bump dns-packet from 1.3.1 to 1.3.4
Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-26 20:29:32 +00:00
Raymond
69c9055a16 Merge pull request #7 from Rhymond/dependabot/npm_and_yarn/eslint-4.18.2
Bump eslint from 3.19.0 to 4.18.2
2019-11-02 14:31:16 +00:00
dependabot[bot]
300d734bcf Bump eslint from 3.19.0 to 4.18.2
Bumps [eslint](https://github.com/eslint/eslint) from 3.19.0 to 4.18.2.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v3.19.0...v4.18.2)

Signed-off-by: dependabot[bot] <support@github.com>
2019-11-02 13:11:13 +00:00
Raymond
ef8bbd18d2 fixing vulnerable dep 2019-02-08 13:43:00 +00:00
Raymond
a26a4a85f0 Merge pull request #3 from ksakiyama/feature/resolve-webpack-vulnerabilities
Feature/resolve webpack vulnerabilities
2018-09-06 23:00:29 +01:00
ksakiyama
38f27ba1d2 resolve npm WARNs(included as both a dev and production dependency) 2018-09-02 10:51:12 +09:00
ksakiyama
7411582d9b update package versions related webpack 2018-09-02 10:47:44 +09:00
Raymond
4f97c49d2f change images, update readme 2018-07-05 16:41:28 +01:00
Raymond
eeecbb54ec Merge pull request #2 from Rhymond/responsiveFixes
Pretify code
2017-10-08 16:56:38 +01:00
Ray
9f6d256a96 Pretify code, remove unnecessary semicolon, function => const 2017-10-08 16:55:00 +01:00
23 changed files with 9450 additions and 3789 deletions

View File

@@ -2,7 +2,7 @@
Product comparison page build using **React** + **Redux** + **Bootstrap** + **SASS**
![Screenshot](http://i.imgur.com/0fTmInU.png)
![Screenshot](https://s8.postimg.cc/fdfsvumkl/Screen_Shot_2018-07-05_at_16.36.17.png)
It's build on top of [`create-react-app`](http://www.google.lt)
@@ -26,8 +26,3 @@ License
The MIT License (MIT). Please see License File for more information.
[![forthebadge](http://forthebadge.com/images/badges/built-with-love.svg)](https://github.com/Rhymond/product-compare-react)
Todo
-
- [ ] Write tests
- [ ] Integrate CI

12976
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -4,55 +4,47 @@
"private": true,
"dependencies": {
"autoprefixer": "7.1.1",
"babel-core": "6.25.0",
"babel-eslint": "7.2.3",
"babel-core": "^6.26.3",
"babel-jest": "20.0.3",
"babel-loader": "7.0.0",
"babel-preset-react-app": "^3.0.1",
"babel-loader": "8.0.1",
"babel-preset-react-app": "^3.1.2",
"babel-runtime": "6.23.0",
"bootstrap": "^4.0.0-alpha.6",
"case-sensitive-paths-webpack-plugin": "2.1.1",
"bootstrap": "^4.1.1",
"case-sensitive-paths-webpack-plugin": "2.1.2",
"chalk": "1.1.3",
"css-loader": "0.28.4",
"dotenv": "^4.0.0",
"eslint": "3.19.0",
"eslint-config-react-app": "^1.0.5",
"eslint-loader": "1.7.1",
"eslint-plugin-flowtype": "2.34.0",
"eslint-plugin-import": "2.2.0",
"eslint-plugin-jsx-a11y": "5.0.3",
"eslint-plugin-react": "7.1.0",
"extract-text-webpack-plugin": "2.1.2",
"file-loader": "0.11.2",
"file-loader": "2.0.0",
"fs-extra": "3.0.1",
"html-webpack-plugin": "2.29.0",
"html-webpack-plugin": "3.2.0",
"jest": "20.0.4",
"node-sass-chokidar": "0.0.3",
"npm-run-all": "^4.1.1",
"npm-run-all": "^4.1.3",
"object-assign": "4.1.1",
"postcss-flexbugs-fixes": "3.0.0",
"postcss-loader": "2.0.6",
"postcss-loader": "3.0.0",
"promise": "7.1.1",
"react": "^15.6.1",
"react-addons-css-transition-group": "^15.6.0",
"react-addons-transition-group": "^15.6.0",
"react": "^15.6.2",
"react-addons-css-transition-group": "^15.6.2",
"react-addons-transition-group": "^15.6.2",
"react-dev-utils": "^3.0.2",
"react-dom": "^15.6.1",
"react-dom": "^15.6.2",
"react-error-overlay": "^1.0.9",
"react-redux": "^5.0.5",
"react-router": "^4.1.1",
"react-router-dom": "^4.1.1",
"react-scripts": "^1.0.10",
"react-select": "^1.0.0-rc.5",
"react-redux": "^5.0.7",
"react-router": "^4.3.1",
"react-router-dom": "^4.3.1",
"react-scripts": "^1.1.5",
"react-select": "^1.2.1",
"redux": "^3.0.0",
"redux-logger": "^3.0.6",
"redux-thunk": "^2.2.0",
"style-loader": "0.18.2",
"sw-precache-webpack-plugin": "0.11.3",
"url-loader": "0.5.9",
"webpack": "2.6.1",
"webpack-dev-server": "2.5.0",
"webpack-manifest-plugin": "1.1.0",
"redux-thunk": "^2.3.0",
"style-loader": "0.23.0",
"sw-precache-webpack-plugin": "0.11.5",
"url-loader": "1.1.1",
"webpack": "4.17.1",
"webpack-dev-server": "^3.1.14",
"webpack-manifest-plugin": "2.0.3",
"whatwg-fetch": "2.0.3"
},
"scripts": {
@@ -65,10 +57,11 @@
},
"devDependencies": {
"babel-eslint": "^7.2.3",
"eslint": "^3.19.0",
"eslint": "^4.18.2",
"eslint-config-react-app": "^1.0.5",
"eslint-loader": "^1.7.1",
"eslint-plugin-flowtype": "^2.33.0",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jsx-a11y": "^5.0.1",
"eslint-plugin-react": "^7.0.1"
},

BIN
public/images/Cherry.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 285 KiB

BIN
public/images/Nuts.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 420 KiB

BIN
public/images/Orange.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 576 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 438 KiB

View File

@@ -1,39 +1,39 @@
{
"products": [{
"id": "1",
"name": "Chair",
"image": "https://devitems.com/preview/furnish/img/product/1.jpg",
"price": "$39",
"name": "Cherry",
"image": "images/Cherry.png",
"price": "$1.99",
"colors": ["red", "green", "blue"],
"condition": "New",
"description": "Black chair"
"condition": "Fresh",
"description": "Two Cherries"
},
{
"id": "2",
"name": "Lamp",
"image": "https://devitems.com/preview/furnish/img/product/2.jpg",
"price": "$319",
"name": "Orange",
"image": "images/Orange.png",
"price": "$2.99",
"colors": ["green", "blue"],
"condition": "Used",
"description": "Amazing lamp"
"condition": "Frozen",
"description": "Giant Orange"
},
{
"id": "3",
"name": "Statue",
"image": "https://devitems.com/preview/furnish/img/product/3.jpg",
"price": "$239",
"name": "Nuts",
"image": "images/Nuts.png",
"price": "$1.00",
"colors": ["red"],
"condition": "Used",
"description": "Used Statue"
"condition": "Frozen",
"description": "Mixed Nuts"
},
{
"id": "4",
"name": "Seat",
"image": "https://devitems.com/preview/furnish/img/product/4.jpg",
"price": "$239",
"name": "Strawberry",
"image": "images/Strawberry.png",
"price": "$1.49",
"colors": ["blue"],
"condition": "New",
"description": "Large Seat"
"condition": "Fresh",
"description": "Just Strawberry"
}
]
}

View File

@@ -1 +0,0 @@
export * from './product';

View File

@@ -1,18 +1,17 @@
import * as types from '../constants/types';
import * as types from '../constants/types'
export function getProducts() {
return dispatch => {
export const getProducts = () =>
dispatch =>
fetch(`products.json`)
.then(response => response.json())
.then(response => {
dispatch({
type: types.FETCH_PRODUCTS,
payload: response.products
});
})
})
}
}
export function compare(product) {
return {type: types.COMPARE_PRODUCT, product};
}
export const compare = product => ({
type: types.COMPARE_PRODUCT,
product
})

View File

@@ -7,7 +7,7 @@ const Compare = ({products}) =>
<table className="table">
<thead className="thead-default">
<tr>
<th></th>
<th />
{products.map(product =>
<th key={product.id}>
{product.name}
@@ -27,7 +27,7 @@ const Compare = ({products}) =>
{products.map(product =>
<td key={product.id}>
{product.colors.map((color, index) =>
<span key={index} className={"bg-" + color}></span>
<span key={index} className={"bg-" + color} />
)}
</td>
)}
@@ -35,7 +35,7 @@ const Compare = ({products}) =>
<tr className="condition">
<th scope="row">Condition</th>
{products.map(product =>
<td key={product.id} className={product.condition === "Used" ? "bg-red" : "bg-green"}>
<td key={product.id} className={product.condition === "Frozen" ? "bg-red" : "bg-green"}>
{product.condition}
</td>
)}
@@ -45,4 +45,4 @@ const Compare = ({products}) =>
</div>
</div>;
export default Compare;
export default Compare

View File

@@ -5,7 +5,7 @@
background-color: #fff;
border-radius: 5px;
overflow: hidden;
box-shadow: 0px 13px 21px -5px rgba(0, 0, 0, 0.05);
box-shadow: 0 13px 21px -5px rgba(0, 0, 0, 0.05);
border: 1px solid #eee;
font-size: 18px;
table-layout: fixed;

View File

@@ -5,7 +5,7 @@ const Product = ({product, compare}) =>
<div key={product.id} className="col-sm-6 col-md-3">
<div className={"product " + (product.compare ? "compare" : "")} >
<img src={product.image} alt={product.name} />
<div className="image_overlay"></div>
<div className="image_overlay"/>
<div className="view_details" onClick={() => compare(product)}>
{product.compare ? "Remove" : "Compare"}
</div>
@@ -19,4 +19,4 @@ const Product = ({product, compare}) =>
</div>
</div>;
export default Product;
export default Product

View File

@@ -10,8 +10,9 @@ $product-main-color: $green;
overflow: hidden;
transition: all 500ms ease-out;
margin-bottom: 30px;
border: 1px solid #ddd;
&:hover {
box-shadow: 0px 13px 21px -5px rgba(0, 0, 0, 0.2);
box-shadow: 0 13px 21px -5px rgba(0, 0, 0, 0.2);
.image_overlay {
opacity: $image-overlay-opacity;
}

View File

@@ -1,13 +1,11 @@
import React from 'react'
import {Product} from '../';
import {Product} from '../'
const ProductList = ({products, compare}) =>
<div>
<div className="row mt-3">
{products.map(product =>
<Product key={product.id} product={product} compare={compare} />
)}
</div>
<div className="row mt-3">
{products.map(product =>
<Product key={product.id} product={product} compare={compare} />
)}
</div>;
export default ProductList;
export default ProductList

View File

@@ -1,2 +1,2 @@
export const FETCH_PRODUCTS = 'FETCH_PRODUCTS';
export const COMPARE_PRODUCT = 'COMPARE_PRODUCT';
export const COMPARE_PRODUCT = 'COMPARE_PRODUCT';

View File

@@ -1,12 +1,12 @@
import React, {Component} from 'react';
import React, {Component} from 'react'
import {Route, Switch} from 'react-router-dom'
import {Home, NotFound} from '../';
import {Home, NotFound} from '../'
export default class App extends Component {
class App extends Component {
render() {
return (
<div className="App">
<div className="app">
<div className="container mt-4">
<Switch>
<Route exact path="/" component={Home}/>
@@ -14,6 +14,8 @@ export default class App extends Component {
</Switch>
</div>
</div>
);
)
}
}
export default App

View File

@@ -1,12 +1,12 @@
import React from 'react';
import {bindActionCreators} from 'redux';
import {Compare, ProductList} from '../../components';
import * as productActions from '../../actions';
import {connect} from 'react-redux';
import React, {Component} from 'react'
import {bindActionCreators} from 'redux'
import {Compare, ProductList} from '../../components'
import * as productActions from '../../actions/product'
import {connect} from 'react-redux'
class Home extends React.Component {
class Home extends Component {
componentWillMount() {
this.props.actions.getProducts();
this.props.actions.getProducts()
}
render() {
@@ -14,27 +14,26 @@ class Home extends React.Component {
const compareProducts = products.filter(product => product.compare);
return (
<div className="Home mt-5">
<div className="home mt-5">
<div className="row">
<div className="col-12">
<h2 className="mb-3">Compare Products</h2>
</div>
</div>
<ProductList products={products} compare={actions.compare}/>
{compareProducts.length >= 2 ? <Compare products={compareProducts}/> : null}
{compareProducts.length >= 2 &&
<Compare products={compareProducts}/>
}
</div>
);
)
}
}
function mapStateToProps(state) {
return {
products: state.product.products
}
}
function mapDispatchToProps(dispatch) {
return {
actions: bindActionCreators(productActions, dispatch)
};
}
export default connect(
mapStateToProps,
mapDispatchToProps
)(Home);
state => ({
products: state.product.products
}),
dispatch => ({
actions: bindActionCreators(productActions, dispatch)
})
)(Home)

View File

@@ -1,12 +1,14 @@
import React from 'react'
import React, {Component} from 'react'
export default class NotFound extends React.Component {
class NotFound extends Component {
render() {
return (
<div>
<div className="not-found">
<h1>404</h1>
<h3>Page not found</h3>
</div>
);
)
}
}
export default NotFound

View File

@@ -1,6 +1,6 @@
import registerServiceWorker from './registerServiceWorker';
import React from 'react';
import ReactDOM from 'react-dom';
import registerServiceWorker from './registerServiceWorker'
import React from 'react'
import ReactDOM from 'react-dom'
import {BrowserRouter} from 'react-router-dom'
import {createStore, applyMiddleware} from 'redux'
import {Provider} from 'react-redux'
@@ -12,20 +12,23 @@ import App from './containers/App'
import 'bootstrap/dist/css/bootstrap.css'
import './styles.css'
const loggerMiddleware = createLogger()
const loggerMiddleware = createLogger();
const store = createStore(
reducer,
applyMiddleware(
thunkMiddleware, // lets us dispatch() functions
loggerMiddleware // neat middleware that logs actions
thunkMiddleware,
loggerMiddleware
)
)
);
ReactDOM.render(
<Provider store={store}>
<BrowserRouter>
<App />
</BrowserRouter>
</Provider>, document.getElementById('root'));
</Provider>,
document.getElementById('root')
);
registerServiceWorker();

View File

@@ -1,8 +1,8 @@
import { combineReducers } from 'redux'
import product from './product_reducer'
import product from './productReducer'
const compareApp = combineReducers({
product
})
});
export default compareApp

View File

@@ -1,4 +1,4 @@
import * as types from '../constants/types';
import * as types from '../constants/types'
const INITIAL_STATE = {
products: []
@@ -21,6 +21,6 @@ export default function (state = INITIAL_STATE, action) {
)
};
default:
return state;
return state
}
}
}

View File

@@ -2,6 +2,6 @@ body {
margin: 0;
padding: 0;
font-family: sans-serif;
background: #eaebec;
background: #f6f7f8;
color: #393c45;
}