Merge pull request #46 from aszharite/master

fixed issues with new users builds
code4romania · Jun 7, 2017 · 6c033db · 6c033db
2 parents c736de0 + f5f51fb
commit 6c033db
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,7 @@
 # civichq-client
 Client side for platform of civic applications developed within Romanian civic society.
 
-```
-npm install -g tsc
-npm install
-npm start
-```
+## Installation
+
+1. Run `npm install`
+1. Run `npm start`
diff --git a/package.json b/package.json
@@ -4,7 +4,8 @@
   "description": "Angular 2 with Webpack starter",
   "main": "index.js",
   "scripts": {
-    "start": "webpack-dev-server --inline --progress --port 8381",
+    "install": "npm install -g tsc && npm update",
+    "start": "webpack-dev-server --inline --progress --open --port 8381",
     "w": "webpack",
     "test": "echo \"Error: no test specified\" && exit 1",
     "ty": "typings install",
@@ -29,33 +30,33 @@
     "@angular/platform-browser-dynamic": "2.0.0",
     "@angular/router": "3.0.0",
     "@angular/upgrade": "2.0.0",
-    "angular2-jwt": "^0.1.24",
-    "angular2-recaptcha": "^0.3.3",
+    "angular2-jwt": "0.1.24",
+    "angular2-recaptcha": "0.3.3",
     "bootstrap-sass": "3.3.7",
-    "config": "^1.21.0",
-    "core-js": "^2.4.1",
-    "font-awesome": "^4.6.3",
-    "ng2-bootstrap": "^1.1.1",
-    "ng2-select": "^1.1.0",
-    "ng2-validation": "^2.0.0",
+    "config": "1.21.0",
+    "core-js": "2.4.1",
+    "font-awesome": "4.6.3",
+    "ng2-bootstrap": "1.1.1",
+    "ng2-select": "1.1.0",
+    "ng2-validation": "2.0.0",
     "rxjs": "5.0.0-beta.12",
-    "zone.js": "^0.6.23"
+    "zone.js": "0.6.23"
   },
   "devDependencies": {
-    "angular2-template-loader": "^0.5.0",
-    "css-loader": "^0.25.0",
-    "file-loader": "^0.9.0",
-    "html-webpack-plugin": "^2.22.0",
-    "http-server": "^0.9.0",
-    "node-sass": "^3.9.3",
-    "raw-loader": "^0.5.1",
-    "rimraf": "^2.5.4",
-    "sass-loader": "^4.0.2",
-    "style-loader": "^0.13.1",
-    "ts-loader": "^0.8.2",
-    "typescript": "^2.0.3",
-    "typings": "^1.3.3",
-    "webpack": "^1.13.2",
-    "webpack-dev-server": "^1.15.1"
+    "angular2-template-loader": "0.5.0",
+    "css-loader": "0.25.0",
+    "file-loader": "0.9.0",
+    "html-webpack-plugin": "2.22.0",
+    "http-server": "0.9.0",
+    "node-sass": "3.9.3",
+    "raw-loader": "0.5.1",
+    "rimraf": "2.5.4",
+    "sass-loader": "4.0.2",
+    "style-loader": "0.13.1",
+    "ts-loader": "0.8.2",
+    "typescript": "2.0.3",
+    "typings": "1.3.3",
+    "webpack": "1.13.2",
+    "webpack-dev-server": "1.15.1"
   }
 }
diff --git a/src/index.html b/src/index.html
@@ -1,8 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <base href="/">
-
   <title>Centru Civic</title>
 
   <meta property="og:url" content="http://www.centrucivic.ro/">

diff --git a/webpack.config.js b/webpack.config.js
@@ -10,7 +10,7 @@ module.exports = {
   },
   output: {
     path: 'build',
-    filename: '[name].js'
+    filename: '[name].[hash].js'
   },
   resolve: {
     extensions: ['', '.js', '.ts'],

diff --git a/webpack.prod.js b/webpack.prod.js
@@ -11,7 +11,7 @@ module.exports = {
     },
     output: {
         path: 'dist',
-        filename: '[name].js'
+        filename: '[name].[hash].js'
     },
     resolve: {
         extensions: ['', '.js', '.ts']