diff --git a/.gitignore b/.gitignore
index ce515e3..72532e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
node_modules
-public
-bundle.js
debug.log
-npm-debug.log
\ No newline at end of file
+npm-debug.log
+src
\ No newline at end of file
diff --git a/index/index.html b/index/index.html
index f05085a..64ea7e1 100644
--- a/index/index.html
+++ b/index/index.html
@@ -11,7 +11,7 @@
-
diff --git a/package.json b/package.json
index b8118c0..c1d74cc 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
"scripts": {
"start-dev": "webpack-dev-server",
"test": "echo \"Error: no test specified\" && exit 1",
- "lint": "eslint js/**/*.js jsx/**/*.jsx"
+ "lint": "node_modules/.bin/eslint server/**/*.js --quiet"
},
"repository": {
"type": "git",
@@ -20,7 +20,6 @@
"homepage": "https://github.com/ecmascriptElephants/Monopoly#readme",
"dependencies": {
"body-parser": "^1.16.0",
- "eslint-loader": "^1.6.1",
"express": "^4.14.1",
"knex": "^0.12.6",
"morgan": "^1.8.0",
@@ -44,6 +43,7 @@
"eslint-config-standard": "^6.2.1",
"eslint-config-standard-jsx": "^3.3.0",
"eslint-config-standard-react": "^4.2.0",
+ "eslint-loader": "^1.6.1",
"eslint-plugin-promise": "^3.4.1",
"eslint-plugin-react": "^6.9.0",
"eslint-plugin-standard": "^2.0.1",
diff --git a/server/server.js b/server/server.js
index b6b7a47..931a262 100644
--- a/server/server.js
+++ b/server/server.js
@@ -8,8 +8,8 @@ const app = express()
const port = process.env.PORT || 8000
app.use(bodyParser.json())
app.use(morgan('dev'))
-app.use(express.static(path.join(__dirname, '../public')))
app.use(express.static(path.join(__dirname, '../index')))
+app.use(express.static(path.join(__dirname, '../src')))
// routes(app, express)
app.listen(port, () => {
diff --git a/webpack.config.js b/webpack.config.js
index 1c3c2e4..142c71c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -4,12 +4,12 @@ module.exports = {
context: __dirname,
entry: './client/app.jsx',
output: {
- path: path.join(__dirname, '/public'),
- publicPath: '/public/',
+ path: path.join(__dirname, '/src'),
+ publicPath: '/src/',
filename: 'bundle.js'
},
devServer: {
- publicPath: '/public/',
+ publicPath: '/src/',
open: true,
historyApiFallback: true,
contentBase: './index'