Skip to content

Commit

Permalink
possible corrections in server js
Browse files Browse the repository at this point in the history
  • Loading branch information
shreyas-a committed Oct 16, 2017
1 parent a3ae78f commit 25d3b87
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
4 changes: 3 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,7 @@
"mocha": true
},
"extends": ["eslint:recommended", "plugin:react/recommended"],
"rules": {}
"rules": {
"no-console": "warn"
}
}
2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
web: node server.js
web: node server.js
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"license": "ISC",
"dependencies": {
"react": "^15.6.1",
"express": "^4.16.2",
"react-dom": "^15.6.1",
"react-router-dom": "^4.2.2"
},
Expand All @@ -35,7 +35,6 @@
"css-loader": "^0.28.5",
"eslint": "^4.5.0",
"eslint-plugin-react": "^7.3.0",
"express": "^4.15.4",
"file-loader": "^0.11.2",
"html-webpack-plugin": "^2.30.1",
"node-sass": "^4.5.3",
Expand Down
21 changes: 10 additions & 11 deletions server.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
var express = require("express");
var express = require('express');
var app = express();
var path = require("path");
var publicPath = __dirname + "/dist/";

app.get("/", function(req, res) {
res.sendFile(path.join(__dirname + "/dist/index.html"));
});
app.set('port', (process.env.PORT || 5000));

app.use(express.static(__dirname + '/dist'));

app.use("/", express.static(publicPath));

app.listen(process.env.PORT || 3000, function() {
/* eslint-disable no-console */
console.log("Listening on port " + process.env.PORT || 3000);
/* eslint-enable no-console */
app.get('/', function(request, response) {
response.render('dist/index');
});

app.listen(app.get('port'), function() {
console.log('Node app is running on port', app.get('port'));
});
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2032,7 +2032,7 @@ expand-range@^1.8.1:
dependencies:
fill-range "^2.1.0"

express@^4.13.3, express@^4.15.4:
express@^4.13.3:
version "4.15.4"
resolved "https://registry.yarnpkg.com/express/-/express-4.15.4.tgz#032e2253489cf8fce02666beca3d11ed7a2daed1"
dependencies:
Expand Down Expand Up @@ -2065,7 +2065,7 @@ express@^4.13.3, express@^4.15.4:
utils-merge "1.0.0"
vary "~1.1.1"

express@^4.15.2:
express@^4.15.2, express@^4.16.2:
version "4.16.2"
resolved "https://registry.yarnpkg.com/express/-/express-4.16.2.tgz#e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"
dependencies:
Expand Down

0 comments on commit 25d3b87

Please sign in to comment.