Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test to see review app #1

Merged
merged 4 commits into from
Mar 28, 2017
Merged

Test to see review app #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c6bc15
Test to see review app
nkbelow Mar 28, 2017
3899e55
TEST
nkbelow Mar 28, 2017
12d8851
Add package.json
nkbelow Mar 28, 2017
7c225c7
fix error
nkbelow Mar 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"scripts": {
"react-dev": "webpack -d --watch",
"server-dev": "nodemon server/index.js",
"start": "node server/index.js"
"start": "node server/index.js",
"build": "webpack"
},
"author": "Magnanimous Monkeys",
"license": "ISC",
Expand Down
13 changes: 6 additions & 7 deletions react-client/src/app.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ class App extends React.Component {
render() {
return (
<div>
<img src="http://i65.tinypic.com/2igc483.png" style={bannerStyle}/>
<div style={appStyle}>
<Search
createEvent={this.createEvent}
Expand Down Expand Up @@ -174,12 +173,12 @@ const appStyle = {
fontFamily: 'Roboto',
}

const bannerStyle = {
display: 'flex',
alignItems: 'center',
flexStyle: 1,
backgroundColor: '#31434C',
}
// const bannerStyle = {
// display: 'flex',
// alignItems: 'center',
// flexStyle: 1,
// backgroundColor: '#31434C',
// }

const searchStyle = {
display: 'inline-block',
Expand Down
2 changes: 1 addition & 1 deletion server/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,6 @@ app.get('/search', function(req, res) {
});
});

app.listen(process.env.PORT, function() {
app.listen(process.env.PORT || 3000, function() {
console.log('Magic happens on port 3000!');
});