From 06c46c1c2546056d0993c538ff54042dc7533231 Mon Sep 17 00:00:00 2001
From: gap95 <gauri.a.pande@gmail.com>
Date: Fri, 29 Nov 2019 22:03:17 +0100
Subject: [PATCH] Username is displayed on home page and done styling
---
src/app/app.component.html | 4 ++++
src/app/app.component.scss | 8 ++++++++
src/app/app.component.ts | 8 ++++++--
src/app/auth/login/login.page.ts | 8 +++++---
src/app/services/user.service.spec.ts | 12 ++++++++++++
src/app/services/user.service.ts | 15 +++++++++++++++
6 files changed, 50 insertions(+), 5 deletions(-)
create mode 100644 src/app/services/user.service.spec.ts
create mode 100644 src/app/services/user.service.ts
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 5cb5a69..50992d5 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -4,6 +4,10 @@
<ion-header>
<ion-toolbar>
<ion-title>Menu</ion-title>
+
+ <div class="ion-text">
+ Welcome , {{userService.userDetails.username}}
+ </div>
</ion-toolbar>
</ion-header>
<ion-content>
diff --git a/src/app/app.component.scss b/src/app/app.component.scss
index e69de29..719b0e9 100644
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@@ -0,0 +1,8 @@
+.ion-text{
+ font-size: small;
+ color:black;
+ font-weight: bold;
+ margin-left: 20px;
+ margin-top: 3px;
+ }
+
\ No newline at end of file
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index b38de52..8243678 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -7,6 +7,7 @@ import { Storage } from '@ionic/storage';
import { Router } from '@angular/router';
import { RestService } from './rest.service';
+import { UserService } from './services/user.service';
@Component({
selector: 'app-root',
@@ -14,7 +15,7 @@ import { RestService } from './rest.service';
styleUrls: ['app.component.scss']
})
export class AppComponent {
-
+ username="";
isLoginPage = false;
public appPages = [
@@ -39,6 +40,7 @@ export class AppComponent {
icon: 'exit'
}
];
+
constructor(
private platform: Platform,
@@ -46,7 +48,9 @@ export class AppComponent {
private statusBar: StatusBar,
public restService: RestService,
private storage: Storage,
- private router: Router) {
+ private router: Router,
+ public userService: UserService) {
+ this.username = this.userService.getUsername();
this.initializeApp();
diff --git a/src/app/auth/login/login.page.ts b/src/app/auth/login/login.page.ts
index 460cad5..74b06ec 100644
--- a/src/app/auth/login/login.page.ts
+++ b/src/app/auth/login/login.page.ts
@@ -5,6 +5,7 @@ import { Observable } from 'rxjs';
import { HttpClient } from '@angular/common/http';
import { RestService } from '../../rest.service';
+import { UserService } from 'src/app/services/user.service';
@Component({
selector: 'app-login',
@@ -12,14 +13,14 @@ import { RestService } from '../../rest.service';
styleUrls: ['./login.page.scss'],
})
export class LoginPage implements OnInit {
- username = "Bob@mail.com";
- password = "BobPassword";
+ username = "";
+ password = "";
//username = "";
//password = "";
correctCredentials = false;
loginApi: Observable<any>;
- constructor(private router: Router, public httpClient: HttpClient, public restService: RestService) {
+ constructor(private router: Router, public httpClient: HttpClient, public restService: RestService,public userService: UserService) {
}
@@ -41,6 +42,7 @@ export class LoginPage implements OnInit {
//console.log('my data: ', data);
this.restService.setToken(data.token);
this.restService.isLoginPage = false;
+ this.userService.setUsername(this.username);
this.router.navigateByUrl('/home');
}, (error) => {
console.log(JSON.stringify(error));
diff --git a/src/app/services/user.service.spec.ts b/src/app/services/user.service.spec.ts
new file mode 100644
index 0000000..9e7fd1c
--- /dev/null
+++ b/src/app/services/user.service.spec.ts
@@ -0,0 +1,12 @@
+import { TestBed } from '@angular/core/testing';
+
+import { UserService } from './user.service';
+
+describe('UserService', () => {
+ beforeEach(() => TestBed.configureTestingModule({}));
+
+ it('should be created', () => {
+ const service: UserService = TestBed.get(UserService);
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/src/app/services/user.service.ts b/src/app/services/user.service.ts
new file mode 100644
index 0000000..c048eaa
--- /dev/null
+++ b/src/app/services/user.service.ts
@@ -0,0 +1,15 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class UserService {
+userDetails = {name : "",username:""}
+ constructor() { }
+public getUsername(){
+ return this.userDetails.username
+}
+public setUsername (username){
+ this.userDetails.username = username
+}
+}
--
GitLab