Skip to content

Commit

Permalink
stateless beer component
Browse files Browse the repository at this point in the history
  • Loading branch information
Ch4s3 committed Sep 6, 2017
1 parent ff9b7ba commit 1e2e3c0
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 40 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ erl_crash.dump
/deck-js/node_modules
deck-js/build

.env
.env
ngrok
27 changes: 0 additions & 27 deletions deck-js/src/components/beer/index.js

This file was deleted.

35 changes: 35 additions & 0 deletions deck-js/src/components/beer_list/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import { h, Component } from 'preact';


export default class BeerList extends Component {
render() {
const beers = this.props.beers;
const liStyle = { padding: '0.25em' };
const ulStyle = { listStyle: 'none' };
const beerStyle = {
padding: '1em',
margin: '1em',
background: 'rgba(250,250,250,0.5)',
boxShadow: '0 1px 5px rgba(0,0,0,0.5)',
};
return (
<div>
{beers.map(beer => (
<Beer beer={beer} beerStyle={beerStyle} listStyle={liStyle} ulStyle={ulStyle}/>
))}
</div>
);
}
}

const Beer = ({ beer, beerStyle, liStyle, ulStyle}) => (
<div style={beerStyle}>
<h3 style={{padding: '0.125em 2em'}}>{beer.name}</h3>
<ul style={ulStyle}>
<li style={liStyle}> Style: {beer.style} </li>
<li style={liStyle}> Abv: {beer.abv} </li>
<li style={liStyle}> IBU: {beer.estimatedIbu} </li>
<li style={liStyle}> OG: {beer.measuredOriginalGravity} </li>
</ul>
</div>
);
14 changes: 3 additions & 11 deletions deck-js/src/routes/brewer/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { h, Component } from 'preact';
import { createApolloFetch } from 'apollo-fetch';
import Beer from '../../components/beer';
import BeerList from '../../components/beer_list';
import style from './style';

export default class Brewer extends Component {
Expand All @@ -16,14 +16,6 @@ export default class Brewer extends Component {
this.setState({ time: Date.now() });
};

buildBeers = () => {
if (this.state.beers) {
return(
this.state.beers.map(beer => <Beer beer={beer}/> )
);
}
}

parseData = (data) => {
const user = data.user
this.setState({
Expand Down Expand Up @@ -89,15 +81,15 @@ export default class Brewer extends Component {
}

// Note: `user` comes from the URL, courtesy of our router
render({ user }, { time, userName, beerCount }) {
render({ user }, { time, userName, beerCount, beers }) {
return (
<div class={style.brewer}>
<h1>Brewer: {userName}</h1>
<p>This is the brewer profile for a user named {userName}.</p>

<div>Current time: {new Date(time).toLocaleString()}</div>
<div>beers on tap: {beerCount}</div>
{this.buildBeers()}
<BeerList beers={beers}/>
</div>
);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/on_deck_web/endpoint.ex
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ defmodule OnDeckWeb.Endpoint do
key: "_on_deck_key",
signing_salt: "YDQP4iS4"

plug CORSPlug, origin: ["http://localhost:8080"]
plug CORSPlug, origin: ["*"]

plug OnDeckWeb.Router

Expand Down

0 comments on commit 1e2e3c0

Please sign in to comment.