diff --git a/package-lock.json b/package-lock.json
index 7da5fa6..25a6ebd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11215,8 +11215,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"aproba": {
"version": "1.2.0",
@@ -11259,8 +11258,7 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"concat-map": {
"version": "0.0.1",
@@ -11271,8 +11269,7 @@
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"core-util-is": {
"version": "1.0.2",
@@ -11389,8 +11386,7 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"ini": {
"version": "1.3.5",
@@ -11402,7 +11398,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -11432,7 +11427,6 @@
"version": "2.3.5",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -11451,7 +11445,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -11545,7 +11538,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"wrappy": "1"
}
@@ -11631,8 +11623,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -11668,7 +11659,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -11688,7 +11678,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -11732,14 +11721,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
}
}
},
@@ -12037,8 +12024,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"aproba": {
"version": "1.2.0",
@@ -12081,8 +12067,7 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"concat-map": {
"version": "0.0.1",
@@ -12093,8 +12078,7 @@
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"core-util-is": {
"version": "1.0.2",
@@ -12211,8 +12195,7 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"ini": {
"version": "1.3.5",
@@ -12224,7 +12207,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -12254,7 +12236,6 @@
"version": "2.3.5",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -12273,7 +12254,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -12367,7 +12347,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"wrappy": "1"
}
@@ -12453,8 +12432,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -12490,7 +12468,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -12510,7 +12487,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -12554,14 +12530,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
}
}
},
diff --git a/package.json b/package.json
index be63c2f..49d7303 100644
--- a/package.json
+++ b/package.json
@@ -85,4 +85,4 @@
"ios"
]
}
-}
\ No newline at end of file
+}
diff --git a/resources/icon.png b/resources/icon.png
index 71a543b..f42758c 100644
Binary files a/resources/icon.png and b/resources/icon.png differ
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 7fd98bf..4cf85ce 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -11,10 +11,13 @@ import { AppComponent } from './app.component';
import { Camera } from '@ionic-native/camera/ngx';
import { IonicStorageModule } from '@ionic/storage';
+import { HttpModule } from '@angular/http';
+
+
@NgModule({
declarations: [AppComponent],
entryComponents: [],
- imports: [BrowserModule, IonicModule.forRoot(), AppRoutingModule,
+ imports: [BrowserModule, IonicModule.forRoot(), AppRoutingModule,HttpModule,
IonicStorageModule.forRoot()
],
providers: [
diff --git a/src/app/services/api/user.service.ts b/src/app/services/api/user.service.ts
index 5cdf7e5..534bc9f 100644
--- a/src/app/services/api/user.service.ts
+++ b/src/app/services/api/user.service.ts
@@ -1,12 +1,23 @@
import { Injectable } from '@angular/core';
+import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
@Injectable({
providedIn: 'root'
})
export class UserService {
- constructor() { }
+ //constructor() { }
+ apiKey = '99dfe35fcb7de1ee';
+ url;
+ oauth_url: string = "https://savvyoauth2.sworks.chiefsoft.net/api/v1";
+
+ constructor(private http: HttpClient) {
+ console.log('Hello UserService Provider');
+ this.url = 'https://www.chiefsoft.net/SAVVY/user';
+ this.url = 'https://adminsavvy.sworks.float.sg/SAVVY/user';
+ }
+
connectUser(){
alert('1202020');
diff --git a/typings/cordova-typings.d.ts b/typings/cordova-typings.d.ts
index 108537a..04c4a27 100644
--- a/typings/cordova-typings.d.ts
+++ b/typings/cordova-typings.d.ts
@@ -1,3 +1,5 @@
///
-///
\ No newline at end of file
+///
+///
+///
\ No newline at end of file