Merge pull request #189 from SoftStackFactory/dev

Dev

Author: khoadnguyen

config.xml

@@ -82,4 +82,5 @@
     <plugin name="cordova-plugin-splashscreen" spec="5.0.2" />
     <plugin name="cordova-plugin-ionic-webview" spec="^2.0.0" />
     <plugin name="cordova-plugin-ionic-keyboard" spec="^2.0.5" />
+    <plugin name="cordova-sqlite-storage" spec="~2.5.0" />
 </widget>

package-lock.json

@@ -56,5 +56,10 @@
     "ts-jest": "^23.10.3",
     "typescript": "^2.6.2"
   },
-  "description": "An Ionic project"
-}
+  "description": "An Ionic project",
+  "cordova": {
+    "plugins": {
+      "cordova-sqlite-storage": {}
+    }
+  }
+}

package.json

@@ -12,6 +12,7 @@ import { ProfilePage } from '../pages/profile/profile';
 import { TransitionPage } from '../pages/transition/transition';
 import { AssessmentPage } from '../pages/assessment/assessment';
 import { TimelinePage } from '../pages/timeline/timeline';
+import { HistoryPage } from '../pages/history/history';
 
 @Component({
   templateUrl: 'app.html'
@@ -35,8 +36,8 @@ export class MyApp {
       { title: 'Dashboard', component: DashboardPage },
       { title: 'Profile', component: ProfilePage },
       { title: 'Transition', component: TransitionPage },
-      { title: 'Assessment', component: AssessmentPage },
-      { title: 'Timeline', component: TimelinePage }
+      { title: 'Timeline', component: TimelinePage },
+      { title: 'History', component: HistoryPage }
     ];
 
   }

src/app/app.component.ts

@@ -15,12 +15,15 @@ import { ProfilePage } from '../pages/profile/profile';
 import { TransitionPage } from '../pages/transition/transition';
 import { AssessmentPage } from '../pages/assessment/assessment';
 import { TimelinePage } from '../pages/timeline/timeline';
+import { HistoryPage } from '../pages/history/history';
 import { TimelineComponent } from '../components/timeline/timeline';
 import { TimelineItemComponent } from '../components/timeline/timeline';
 import { TimelineTimeComponent } from '../components/timeline/timeline';
-
-import { ChartsModule } from 'ng2-charts';
+import { ChartComponent } from '../components/chart/chart';
+import { ChartProvider } from '../providers/chart/chart';
 import { UserProvider } from '../providers/user/user';
+import { IonicStorageModule } from '@ionic/storage';
+
 
 @NgModule({
   declarations: [
@@ -34,14 +37,17 @@ import { UserProvider } from '../providers/user/user';
     TransitionPage,
     AssessmentPage,
     TimelinePage,
+    HistoryPage,
     TimelineComponent,
     TimelineItemComponent,
-    TimelineTimeComponent
+    TimelineTimeComponent,
+    ChartComponent
   ],
   imports: [
     BrowserModule,
     HttpClientModule,
-    IonicModule.forRoot(MyApp)
+    IonicModule.forRoot(MyApp),
+    IonicStorageModule.forRoot()
   ],
   bootstrap: [IonicApp],
   entryComponents: [
@@ -54,13 +60,15 @@ import { UserProvider } from '../providers/user/user';
     ProfilePage,
     TransitionPage,
     AssessmentPage,
-    TimelinePage
+    TimelinePage,
+    HistoryPage
   ],
   providers: [
     StatusBar,
     SplashScreen,
     {provide: ErrorHandler, useClass: IonicErrorHandler},
-    UserProvider
+    UserProvider,
+    ChartProvider
   ]
 })
 export class AppModule {}

src/app/app.module.ts

@@ -5,17 +5,34 @@
     width: 40vw;
     max-width: 500px;
     //height: 50vw;
+     font-size: 20px;
+    // //font-size: 50px;
+}
+
+.alert-head{
+    font-size: 25px;
+}
+.alert-message{
     font-size: 20px;
-    //font-size: 50px;
 }
 
-@media screen and (min-width: 765)  {
+@media screen and (min-width: 765px)  {
     .branchRadio .alert-wrapper{
-        font-size: 50px;
-    } 
+        font-size: 30px;
+    }
+    .alert-title{
+        font-size: 35px!important;
+    }
+    .alert-message{
+        font-size: 30px!important;
+    }
+    .alert-button{
+        font-size: 25px!important;
+    }
 }
 
 
+
 // App Global Sass
 // --------------------------------------------------
 // Put style rules here that you want to apply globally. These

src/app/app.scss

@@ -0,0 +1 @@
+<div><canvas #canvas></canvas></div>

src/components/chart/chart.html

@@ -0,0 +1,3 @@
+chart {
+
+}