Fixed linter errors and removed inneeded api call
This commit is contained in:
Tom Bloor
parent
5279dfae10
commit
b1c2f531bb
2 changed files with 68 additions and 162 deletions
|
|
@ -38,10 +38,6 @@ export class LoginComponent implements OnInit {
|
|||
}
|
||||
);
|
||||
|
||||
this.api.graph_data(undefined).subscribe(
|
||||
result => { console.log(result) }
|
||||
)
|
||||
|
||||
// get return url from route parameters or default to '/'
|
||||
this.returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/';
|
||||
}
|
||||
|
|
@ -54,17 +50,15 @@ export class LoginComponent implements OnInit {
|
|||
.subscribe(
|
||||
result => {
|
||||
console.log('logged in!');
|
||||
this.loginStatus = "success";
|
||||
this.loginStatus = 'success';
|
||||
console.log(this.loginStatus);
|
||||
this.router.navigate([this.returnUrl]);
|
||||
},
|
||||
error => {
|
||||
console.log( error._body );
|
||||
this.loginStatus = "send_failed";
|
||||
this.loginStatus = 'send_failed';
|
||||
console.log(this.loginStatus);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ export class ApiService {
|
|||
}
|
||||
|
||||
public login(data) {
|
||||
let login_event = this.http.post(
|
||||
const login_event = this.http.post(
|
||||
this.apiUrl + '/login',
|
||||
data
|
||||
).map( response => response.json() );
|
||||
|
|
@ -66,7 +66,7 @@ export class ApiService {
|
|||
result.email,
|
||||
result.display_name || result.name
|
||||
);
|
||||
this.setUserType(result.user_type)
|
||||
this.setUserType(result.user_type);
|
||||
}
|
||||
);
|
||||
return login_event;
|
||||
|
|
@ -74,13 +74,13 @@ export class ApiService {
|
|||
|
||||
public logout() {
|
||||
console.log(this.sessionKey);
|
||||
let key = this.sessionKey;
|
||||
const key = this.sessionKey;
|
||||
return this.http.post(
|
||||
this.apiUrl + '/logout',
|
||||
{
|
||||
session_key : key,
|
||||
}
|
||||
).map( response => { this.removeSessionKey(); return response.json() } );
|
||||
).map( response => { this.removeSessionKey(); return response.json(); } );
|
||||
}
|
||||
|
||||
// Submits feedback
|
||||
|
|
@ -100,7 +100,7 @@ export class ApiService {
|
|||
// gets transaction list for log
|
||||
|
||||
public transList(data) {
|
||||
let key = this.sessionKey;
|
||||
const key = this.sessionKey;
|
||||
return this.http.post(
|
||||
this.apiUrl + '/outgoing-transactions',
|
||||
{
|
||||
|
|
@ -127,7 +127,7 @@ export class ApiService {
|
|||
return this.http.post(
|
||||
this.apiUrl + '/upload',
|
||||
data
|
||||
).map( response => response.json() )
|
||||
).map( response => response.json() );
|
||||
}
|
||||
|
||||
// handles Org data added
|
||||
|
|
@ -137,7 +137,7 @@ export class ApiService {
|
|||
return this.http.post(
|
||||
this.apiUrl + '/org/payroll',
|
||||
data
|
||||
).map( response => response.json() )
|
||||
).map( response => response.json() );
|
||||
}
|
||||
|
||||
public orgSupplier(data) {
|
||||
|
|
@ -145,7 +145,7 @@ export class ApiService {
|
|||
return this.http.post(
|
||||
this.apiUrl + '/org/supplier',
|
||||
data
|
||||
).map( response => response.json() )
|
||||
).map( response => response.json() );
|
||||
}
|
||||
|
||||
public orgEmployee(data) {
|
||||
|
|
@ -153,7 +153,7 @@ export class ApiService {
|
|||
return this.http.post(
|
||||
this.apiUrl + '/org/employee',
|
||||
data
|
||||
).map( response => response.json() )
|
||||
).map( response => response.json() );
|
||||
}
|
||||
|
||||
// Handles user data interaction
|
||||
|
|
@ -169,22 +169,22 @@ export class ApiService {
|
|||
public setUserInfo(
|
||||
email: string,
|
||||
display_name: string) {
|
||||
console.log("set UserInfo");
|
||||
localStorage.setItem('email',email);
|
||||
localStorage.setItem('displayname',display_name);
|
||||
console.log('set UserInfo');
|
||||
localStorage.setItem('email', email);
|
||||
localStorage.setItem('displayname', display_name);
|
||||
}
|
||||
|
||||
// Sets usertype
|
||||
|
||||
public setUserType(user_type: string) {
|
||||
console.log("set UserType");
|
||||
localStorage.setItem('usertype',user_type);
|
||||
console.log('set UserType');
|
||||
localStorage.setItem('usertype', user_type);
|
||||
}
|
||||
|
||||
// Used for getting account details and updating
|
||||
|
||||
public accountFullLoad() {
|
||||
let key = this.sessionKey;
|
||||
const key = this.sessionKey;
|
||||
return this.http.post(
|
||||
this.apiUrl + '/user',
|
||||
{ session_key : key },
|
||||
|
|
@ -202,40 +202,40 @@ export class ApiService {
|
|||
// Deletes account details on logout
|
||||
|
||||
public removeUserInfo() {
|
||||
console.log("remove UserInfo");
|
||||
console.log('remove UserInfo');
|
||||
localStorage.removeItem('email');
|
||||
localStorage.removeItem('displayname');
|
||||
}
|
||||
|
||||
public getFullName() {
|
||||
console.log("get Full Name");
|
||||
console.log('get Full Name');
|
||||
localStorage.getItem('fullname');
|
||||
}
|
||||
|
||||
public getDisplayName() {
|
||||
console.log("get Display Name");
|
||||
console.log('get Display Name');
|
||||
localStorage.getItem('displayname');
|
||||
}
|
||||
|
||||
public getPostcode() {
|
||||
console.log("get Postcode");
|
||||
console.log('get Postcode');
|
||||
localStorage.getItem('postcode');
|
||||
}
|
||||
|
||||
public getYearOfBirth() {
|
||||
console.log("get Year of Birth");
|
||||
console.log('get Year of Birth');
|
||||
localStorage.getItem('yearofbirth');
|
||||
}
|
||||
|
||||
public getEmail() {
|
||||
console.log("get email");
|
||||
console.log('get email');
|
||||
localStorage.getItem('email');
|
||||
}
|
||||
|
||||
// Leaderboard Api
|
||||
|
||||
public leaderboard_fetch(data) {
|
||||
let key = this.sessionKey;
|
||||
const key = this.sessionKey;
|
||||
return this.http.post(
|
||||
this.apiUrl + '/stats/leaderboard',
|
||||
{
|
||||
|
|
@ -247,7 +247,7 @@ export class ApiService {
|
|||
|
||||
// Basic Customer User stats API
|
||||
public basicStats() {
|
||||
let key = this.sessionKey;
|
||||
const key = this.sessionKey;
|
||||
return this.http.post(
|
||||
this.apiUrl + '/stats',
|
||||
{
|
||||
|
|
@ -255,92 +255,4 @@ export class ApiService {
|
|||
}
|
||||
).map( response => response.json() );
|
||||
}
|
||||
|
||||
// Fake chart data to mimic
|
||||
|
||||
public graph_data(data) {
|
||||
return Observable.of(
|
||||
{
|
||||
// graphstoshow is on server and changes every hour, listing what snippets & graphs to display
|
||||
"elementstoshow" :
|
||||
{
|
||||
"graphs" :
|
||||
{
|
||||
customersthisweek : true,
|
||||
customerslastweek : true,
|
||||
customerslastmonth : true,
|
||||
customerslastyear : true,
|
||||
returningcustomerslastweek : true,
|
||||
returningcustomerslastmonth : true,
|
||||
returningcustomerslastyear : true,
|
||||
noofcustomerssector : true,
|
||||
percentofcustomerssector : true,
|
||||
pointsthisweek : true,
|
||||
percentlocalsuppliersvscompetitor : true,
|
||||
},
|
||||
"snippets" :
|
||||
{
|
||||
customersthismonth: true,
|
||||
moneyspentthismonth: true,
|
||||
pointstotal: true,
|
||||
averagetransactiontoday: true,
|
||||
percentownlocalsupplier : false,
|
||||
percentsinglecompetitorlocalsupplier : false,
|
||||
},
|
||||
},
|
||||
"data" :
|
||||
{
|
||||
"customersthisweek" :
|
||||
{
|
||||
day : ['Monday', 'tuesday','wednesday','thursday','friday','saturday','sunday'],
|
||||
customerno : [1,2,3,4,5,6,7],
|
||||
returningcustomerno : [1,1,2,3,4,5,4],
|
||||
},
|
||||
"customerslastweek" :
|
||||
{
|
||||
day : ['Monday', 'tuesday','wednesday','thursday','friday','saturday','sunday'],
|
||||
customerno : [7,6,5,4,3,2,1],
|
||||
returningcustomerno : [3,4,5,4,3,2,1],
|
||||
},
|
||||
// can take differing size arrays, so any month works. Example here is for April
|
||||
"customerslastmonth" :
|
||||
{
|
||||
day : ['April 1','April 2','April 3','April 4','April 5','April 6','April 7','April 8',
|
||||
'April 9','April 10','April 11','April 12','April 13','April 14','April 15','April 16',
|
||||
'April 17','April 18','April 19','April 20','April 21','April 22','April 23','April 24',
|
||||
'April 25','April 26','April 27','April 28','April 29','April 30'],
|
||||
customerno : [7,6,5,4,3,2,1,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30],
|
||||
returningcustomerno : [4,5,4,3,2,1,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24],
|
||||
},
|
||||
"customerslastyear" :
|
||||
{
|
||||
month : ['January','February','March','April','May','June','July','August','September','October','November','December'],
|
||||
customerno : [7,6,5,4,3,2,1,8,9,10,11,12],
|
||||
returningcustomerno : [3,2,4,2,1,1,1,6,4,8,5,12],
|
||||
},
|
||||
// If the number is potential or actual customers in their sector has yet to be determined
|
||||
"customersinsector" :
|
||||
{
|
||||
percent : 76,
|
||||
customerno : 34000,
|
||||
},
|
||||
"pointsthisweek" :
|
||||
{
|
||||
day : ['Monday', 'tuesday','wednesday','thursday','friday','saturday','sunday'],
|
||||
points : [1,2,3,4,5,6,7],
|
||||
},
|
||||
"pointslastweek" :
|
||||
{
|
||||
day : ['Monday', 'tuesday','wednesday','thursday','friday','saturday','sunday'],
|
||||
points : [1,2,3,4,5,6,7],
|
||||
},
|
||||
"localsuppliers" :
|
||||
{
|
||||
percentownlocal : 50,
|
||||
percentsinglecompetitorlocal : 65,
|
||||
},
|
||||
},
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue