Skip to content

Commit df02ad5

Browse files
committed
webpack config dev/production
1 parent cb70149 commit df02ad5

10 files changed

+758
-611
lines changed

app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ var express = require('express'),
44
app.use(express.static('src/build'));
55

66
app.listen(3000, function(){
7-
console.log("server is running")
7+
console.log("server is running at port " + 3000)
88
});

package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test": "echo \"Error: no test specified\" && exit 1",
88
"build": "webpack",
99
"bundle": "webpack-dev-server",
10-
"start": "node app.js"
10+
"start": "webpack & node app.js"
1111
},
1212
"repository": {
1313
"type": "git",
@@ -41,6 +41,7 @@
4141
"npm-install-webpack-plugin": "^4.0.3",
4242
"react-hot-loader": "^1.3.0",
4343
"webpack": "^1.13.1",
44-
"webpack-dev-server": "^1.14.1"
44+
"webpack-dev-server": "^1.14.1",
45+
"webpack-merge": "^0.14.0"
4546
}
4647
}

src/app/styles/index.scss

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ h1 {
2828
}
2929

3030
.pageContent {
31+
min-height: 600px;
3132
width: 70vw;
3233
position: relative;
3334
/*background: rgba(0,0,0,0.1);*/
@@ -37,6 +38,7 @@ h1 {
3738
}
3839
div.deco{
3940
width: 100%;
41+
height: 100%;
4042
background: rgba(255,255,255,0.3);
4143
> div {
4244
padding: 10px;
13.8 KB
Binary file not shown.

src/build/assets/leaguespartan-bold.svg

+661
Loading
34.8 KB
Binary file not shown.
17.2 KB
Binary file not shown.
12.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)