Skip to content

Commit

Permalink
Some styling, some responsive stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
jissereitsma committed Mar 18, 2020
1 parent ea63259 commit e11d0a0
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/components/Molecules/ProductGrid/component.jsx
Expand Up @@ -12,7 +12,7 @@ const ProductListing = props => {
<div className="ProductListing">
<Row>
{props.products.map(product => (
<Col xs={4} key={product.id}>
<Col sm={4} key={product.id}>
<Item product={product} key={product.id} />
</Col>
))}
Expand Down
6 changes: 3 additions & 3 deletions src/components/Pages/CartPage/component.jsx
@@ -1,5 +1,5 @@
import React from "react";
import Table from "react-bootstrap/Table";
import { Table, Button } from "react-bootstrap";
import { Link } from "react-router-dom";
import useCart from "hooks/useCart";
import CartTotals from "./CartTotals";
Expand Down Expand Up @@ -41,8 +41,8 @@ const CartPage = props => {

{props.cart.prices && <CartTotals prices={props.cart.prices} />}

<Link to="checkout">Checkout</Link>
<button onClick={props.updateCart}>Refresh cart</button>
<Button href="checkout">Checkout</Button>
<Button onClick={props.updateCart}>Refresh</Button>
</div>
);
};
Expand Down
6 changes: 0 additions & 6 deletions src/components/Pages/HomePage/component.css
@@ -1,9 +1,3 @@
.HomePage {
display: grid;
grid-gap: 1rem;
grid-template-columns: 3fr 1fr;
}

.HomePage .sidebar {
border-left: 1px solid #ccc;
padding: 10px;
Expand Down
13 changes: 9 additions & 4 deletions src/components/Pages/HomePage/component.jsx
@@ -1,15 +1,20 @@
import React from "react";
import CmsBlock from "components/Molecules/CmsBlock";
import CmsPage from "components/Pages/CmsPage";
import { Row, Col } from "react-bootstrap";
import "./component.css";

const HomePage = () => {
return (
<div className="HomePage">
<CmsPage id={2} />
<div className="sidebar">
<CmsBlock id="sale-left-menu-block" />
</div>
<Row>
<Col sm>
<CmsPage id={2} />
</Col>
<Col sm className="sidebar">
<CmsBlock id="sale-left-menu-block" />
</Col>
</Row>
</div>
);
};
Expand Down
4 changes: 2 additions & 2 deletions src/index.js
Expand Up @@ -9,7 +9,7 @@ import persistStore from "redux-phoenix";

import apolloClient from "state/graphql/apollo-client";
import reduxStore from "state/redux/store";
import * as serviceWorker from "serviceWorker";
//import * as serviceWorker from "serviceWorker";

persistStore(reduxStore).then(reduxStore => {
ReactDOM.render(
Expand All @@ -24,4 +24,4 @@ persistStore(reduxStore).then(reduxStore => {
);
});

serviceWorker.register();
//serviceWorker.register();

0 comments on commit e11d0a0

Please sign in to comment.