diff --git a/src/app/login/login.page.ts b/src/app/login/login.page.ts
index c1021e6..34ec813 100644
--- a/src/app/login/login.page.ts
+++ b/src/app/login/login.page.ts
@@ -36,7 +36,7 @@ export class LoginPage implements OnInit {
login() {
this.authService.authenticateUser(this.credentials).then((data: any) => {
- localStorage.userInfo = data;
+ localStorage.userInfo = JSON.stringify(data);
localStorage.access_Token = data.access_Token;
this.router.navigate(['/malls']);
document.querySelector('.menu-icon-holder').classList.remove('hide');
diff --git a/src/app/profile/profile.page.html b/src/app/profile/profile.page.html
index 0db0108..e823689 100644
--- a/src/app/profile/profile.page.html
+++ b/src/app/profile/profile.page.html
@@ -5,12 +5,12 @@
-
Mr. Christian Carry
+ {{ userInfo.name }}
Edit
diff --git a/src/app/profile/profile.page.ts b/src/app/profile/profile.page.ts
index 6956c63..22dffb3 100644
--- a/src/app/profile/profile.page.ts
+++ b/src/app/profile/profile.page.ts
@@ -9,6 +9,7 @@ import { Router } from '@angular/router';
})
export class ProfilePage implements OnInit {
selected_tab: string = 'MY ORDERS';
+ userInfo: any;
constructor(
private location: Location,
@@ -16,6 +17,8 @@ export class ProfilePage implements OnInit {
) { }
ngOnInit() {
+ this.userInfo = JSON.parse(localStorage.userInfo)['User Info'];
+ console.log(this.userInfo);
}
ionViewDidEnter() {
diff --git a/src/app/services/mall.service.ts b/src/app/services/mall.service.ts
index f685390..5aac557 100644
--- a/src/app/services/mall.service.ts
+++ b/src/app/services/mall.service.ts
@@ -17,7 +17,7 @@ export class MallService {
headers: new HttpHeaders({
'Access-Control-Allow-Origin': '*',
'Content-Type': 'application/json',
- 'Authorization': 'Token ' + localStorage.access_Token
+ 'Authorization': 'Bearer ' + localStorage.access_Token
})
};
@@ -29,7 +29,7 @@ export class MallService {
headers: new HttpHeaders({
'Access-Control-Allow-Origin': '*',
'Content-Type': 'application/json',
- 'Authorization': 'Token ' + localStorage.access_Token
+ 'Authorization': 'Bearer ' + localStorage.access_Token
})
};
diff --git a/src/app/services/order.service.ts b/src/app/services/order.service.ts
index 02933a4..df9601e 100644
--- a/src/app/services/order.service.ts
+++ b/src/app/services/order.service.ts
@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { TOKEN, URL } from '../mocks/url';
+import { URL } from '../mocks/url';
@Injectable({
providedIn: 'root'
@@ -16,7 +16,7 @@ export class OrderService {
headers: new HttpHeaders({
'Access-Control-Allow-Origin': '*',
'Content-Type': 'application/json',
- 'Authorization': 'Token ' + TOKEN
+ 'Authorization': 'Bearer ' + localStorage.access_Token
})
};
@@ -28,7 +28,7 @@ export class OrderService {
headers: new HttpHeaders({
'Access-Control-Allow-Origin': '*',
'Content-Type': 'application/json',
- 'Authorization': 'Token ' + TOKEN
+ 'Authorization': 'Bearer ' + localStorage.access_Token
})
};