Merge pull request #40 from SoftStackFactory/dev

Release Week 2

Author: khoadnguyen

package-lock.json

@@ -28,6 +28,9 @@
     "@ionic-native/status-bar": "~4.12.0",
     "@ionic/pro": "2.0.3",
     "@ionic/storage": "2.1.3",
+    "@types/chart.js": "^2.7.35",
+    "chart.js": "^2.7.2",
+    "chartjs-plugin-datalabels": "^0.4.0",
     "ionic-angular": "3.9.2",
     "ionicons": "3.0.0",
     "rxjs": "5.5.11",
@@ -36,6 +39,7 @@
   },
   "devDependencies": {
     "@ionic/app-scripts": "3.2.0",
+    "ng2-charts": "^1.6.0",
     "typescript": "~2.6.2"
   },
   "description": "An Ionic project"

package.json

@@ -1,19 +1,22 @@
-<!--
-  Generated template for the AssessmentPage page.
-
-  See http://ionicframework.com/docs/components/#navigation for more info on
-  Ionic pages and navigation.
--->
 <ion-header>
   <ion-navbar>
-    <button ion-button menuToggle>
-      <ion-icon name="menu"></ion-icon>
-    </button>
-    <ion-title>Assessment</ion-title>
+    <ion-grid>
+      <ion-row>
+        <button ion-button menuToggle>
+          <ion-icon name="menu"></ion-icon>
+        </button>
+        <ion-title>LIFE BALANCE WHEEL</ion-title>
+      </ion-row>
+    </ion-grid>
   </ion-navbar>
 </ion-header>
 
 
 <ion-content padding>
+  <ion-grid>
+    <ion-row>
+      <ion-title text-center>Finances Self Assessment Test</ion-title>
+    </ion-row>
+  </ion-grid>
 
 </ion-content>