improve directory structure and lite-server/testing config

jwerts · jwerts · commit 4aef72ad1065 · 2016-05-17T20:00:19.000-04:00
diff --git a/.bowerrc b/.bowerrc
@@ -1,3 +1,3 @@
 {
-  "directory": "./app/bower_components"
+  "directory": "./bower_components"
 }
diff --git a/app/attribute.component.html b/app/attribute.component.html
@@ -1,9 +1,9 @@
 <div>
-  <h2>points</h2>
+  <h2>Points!</h2>
   <p>Index sum: {{pointsModel.getIndexSum()}}
   <ul>
     <li *ngFor="let point of points.toArray()">
-      <span>{{point.attributes.index}} ({{point.geometry.x}},{{point.geometry.y}})</span>
+      <span>{{point.attributes.index}} ({{point.geometry.x | number:6}},{{point.geometry.y | number:6}})</span>
     </li>
   </ul>
 </div>
diff --git a/app/points.model.spec.ts b/app/points.model.spec.ts
@@ -3,7 +3,7 @@ import { PointsModel } from './points.model';
 describe('PointsModel tests', function() {
   var mockPoint = {
     attributes: {
-      index: 0
+      index: 1
     },
     geometry: {
       x: 1,
@@ -43,5 +43,13 @@ describe('PointsModel tests', function() {
       expect(pointsModel.getPointGraphics().length).toEqual(0);
     });
   });
+  
+  describe('calculations', function() {
+    it('should calculate the sum of the index attributes', function() {
+      pointsModel.addPoints([mockPoint, mockPoint]);
+      var sum = pointsModel.getIndexSum();
+      expect(sum).toEqual(2);
+    });
+  });
  
 });
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jsapi4angular2",
-  "description": "",
+  "description": "Testing angular 2 with esri jsapi 4",
   "main": "",
   "authors": [
     "Josh Werts <joshwerts@gmail.com>"
@@ -17,6 +17,10 @@
     "tests"
   ],
   "dependencies": {
-    "esri": "arcgis-js-api#4.0.0"
+    "esri": "arcgis-js-api#4.0.0",
+    "bootstrap": "^3.3.6"
+  },
+  "resolutions": {
+    "dojo": "v1.10.4/esri-3.14.0"
   }
 }
diff --git a/bs-config.json b/bs-config.json
@@ -0,0 +1,13 @@
+{
+  "port": 3000,
+  "files": ["./**/*.{html,htm,css,js}"],
+  "server": { "baseDir": "./" },
+  "watchOptions": {
+    "ignored": [
+      "node_modules",
+      "bower_components",
+      "_test-output",
+      "*.spec.*"
+    ]
+  }
+}
diff --git a/css/main.css b/css/main.css
diff --git a/index.html b/index.html
@@ -1,8 +1,10 @@
 <html>
   <head>
     <title>jsapi4/angular2</title>
-    <link rel="stylesheet" href="https://js.arcgis.com/4.0/esri/css/main.css">
-    <link rel="stylesheet" href="./app/styles/main.css">
+    <link rel="stylesheet" href="bower_components/esri/css/main.css">
+    <link rel="stylesheet" href="bower_components/esri/calcite/calcite.css"/>
+    <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css"/>
+    <link rel="stylesheet" href="app/styles/main.css">
 
     <!-- 1. Load libraries -->
     <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
@@ -11,8 +13,8 @@
     <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
 
     <!-- 2. Configure SystemJS -->
-    <script src="./app/bower_components/dojo/dojo.js"></script>
-    <script src="./app/dojoConfig.js"></script>
+    <script src="bower_components/dojo/dojo.js"></script>
+    <script src="app/dojoConfig.js"></script>
     <script src="node_modules/esri-system-js/dist/esriSystem.js"></script>
     <script src="systemjs.config.js"></script>
   </head>
@@ -22,8 +24,8 @@
     <div class="container-fluid">
       <my-app>Loading...</my-app>
     </div>
-    <script src="./app/esriLoadConfig.js"></script>
-    <script src="./app/esriSystemLoadBrowser.js"></script>
+    <script src="app/esriLoadConfig.js"></script>
+    <script src="app/esriSystemLoadBrowser.js"></script>
   </body>
 
 </html>

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "directory": "./app/bower_components"`
	`2`	`+ "directory": "./bower_components"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jsapi4angular2",`
`3`		`- "description": "",`
	`3`	`+ "description": "Testing angular 2 with esri jsapi 4",`
`4`	`4`	`"main": "",`
`5`	`5`	`"authors": [`
`6`	`6`	`"Josh Werts <joshwerts@gmail.com>"`
`@@ -17,6 +17,10 @@`
`17`	`17`	`"tests"`
`18`	`18`	`],`
`19`	`19`	`"dependencies": {`
`20`		`- "esri": "arcgis-js-api#4.0.0"`
	`20`	`+ "esri": "arcgis-js-api#4.0.0",`
	`21`	`+ "bootstrap": "^3.3.6"`
	`22`	`+ },`
	`23`	`+ "resolutions": {`
	`24`	`+ "dojo": "v1.10.4/esri-3.14.0"`
`21`	`25`	`}`
`22`	`26`	`}`