diff --git a/user-app/src/app/app-routing.module.ts b/user-app/src/app/app-routing.module.ts index 0abcce6..c395cb5 100644 --- a/user-app/src/app/app-routing.module.ts +++ b/user-app/src/app/app-routing.module.ts @@ -7,7 +7,28 @@ import { UserDetailComponent } from './pages/user-detail/user-detail.component'; import { CreateUserComponent } from './pages/create-user/create-user.component'; import { AuthGuard } from './guards/auth.guard'; -const routes: Routes = []; +const routes: Routes = [ + { + path: '', + component: UserListComponent, + }, + { + path: 'about-us', + component: AboutUsComponent, + }, + { + path: 'contact', + component: ContactComponent, + }, + { + path: 'create-user', + component: CreateUserComponent, + }, + { + path: 'user-detail', + component: UserDetailComponent, + }, +]; @NgModule({ imports: [RouterModule.forRoot(routes)], diff --git a/user-app/src/app/pages/app/app.component.html b/user-app/src/app/pages/app/app.component.html index c6e9877..62345bf 100644 --- a/user-app/src/app/pages/app/app.component.html +++ b/user-app/src/app/pages/app/app.component.html @@ -1,6 +1,2 @@ -

- Congratulations! Angular set up is complete. -
-
- You are ready to begin the workshop3. -

+ + diff --git a/user-app/src/app/pages/app/app.component.scss b/user-app/src/app/pages/app/app.component.scss index 8b13789..921bff1 100644 --- a/user-app/src/app/pages/app/app.component.scss +++ b/user-app/src/app/pages/app/app.component.scss @@ -1 +1,8 @@ - +.normal { + font-size: 15px; + color: blue; +} +.error { + font-size: 18px; + color: red; +} diff --git a/user-app/src/app/pages/app/app.component.ts b/user-app/src/app/pages/app/app.component.ts index ba8e2e0..bb1eed2 100644 --- a/user-app/src/app/pages/app/app.component.ts +++ b/user-app/src/app/pages/app/app.component.ts @@ -5,4 +5,27 @@ import { Component } from '@angular/core'; templateUrl: './app.component.html', styleUrls: ['./app.component.scss'], }) -export class AppComponent {} +export class AppComponent { + name: string = 'manasa'; + + show: boolean = false; + names = ['Arun', 'Mark', 'Smith', 'Jack']; + isError: boolean = false; + userName: string = ''; + constructor() { + console.log('Constructor called'); + } + changeName() { + this.name = 'Steve'; + console.log(this.userName); + } + ngOnChanges() { + console.log('on changes called'); + } + ngOnInit() { + console.log('on init called'); + } + ngOnDestroy() { + console.log('on destroy called'); + } +} diff --git a/user-app/src/app/pages/header/header.component.html b/user-app/src/app/pages/header/header.component.html index ad4f732..074e537 100644 --- a/user-app/src/app/pages/header/header.component.html +++ b/user-app/src/app/pages/header/header.component.html @@ -1 +1,13 @@ -

Header Works

+
+ logo +
+ diff --git a/user-app/src/app/pages/header/header.component.ts b/user-app/src/app/pages/header/header.component.ts index 7082d31..d4310b2 100644 --- a/user-app/src/app/pages/header/header.component.ts +++ b/user-app/src/app/pages/header/header.component.ts @@ -1,8 +1,14 @@ -import { Component } from '@angular/core'; +import { Component, Input, Output, EventEmitter } from '@angular/core'; @Component({ selector: 'app-header', templateUrl: './header.component.html', styleUrls: ['./header.component.scss'], }) -export class HeaderComponent {} +export class HeaderComponent { + @Input() title: string; + @Output() changeValue = new EventEmitter(); + onClick() { + this.changeValue.emit(); + } +} diff --git a/user-app/src/app/pages/user-card/user-card.component.html b/user-app/src/app/pages/user-card/user-card.component.html index c05cd52..c0392c0 100644 --- a/user-app/src/app/pages/user-card/user-card.component.html +++ b/user-app/src/app/pages/user-card/user-card.component.html @@ -1,3 +1,8 @@
-

User Card works

+

+ {{ emailId }}
+
+ {{ city }}
+ +
diff --git a/user-app/src/app/pages/user-card/user-card.component.ts b/user-app/src/app/pages/user-card/user-card.component.ts index 8a5b52a..60f6de2 100644 --- a/user-app/src/app/pages/user-card/user-card.component.ts +++ b/user-app/src/app/pages/user-card/user-card.component.ts @@ -6,4 +6,9 @@ import { UserService } from 'src/app/services/user.service'; templateUrl: './user-card.component.html', styleUrls: ['./user-card.component.scss'], }) -export class UserCardComponent {} +export class UserCardComponent { + @Input() id: number; + @Input() name: string; + @Input() emailId: string; + @Input() city: string; +} diff --git a/user-app/src/app/pages/user-list/user-list.component.html b/user-app/src/app/pages/user-list/user-list.component.html index 9326de9..59de606 100644 --- a/user-app/src/app/pages/user-list/user-list.component.html +++ b/user-app/src/app/pages/user-list/user-list.component.html @@ -1,3 +1,10 @@

User List Works

+
diff --git a/user-app/src/app/pages/user-list/user-list.component.ts b/user-app/src/app/pages/user-list/user-list.component.ts index 60cb003..92fb2d8 100644 --- a/user-app/src/app/pages/user-list/user-list.component.ts +++ b/user-app/src/app/pages/user-list/user-list.component.ts @@ -7,4 +7,18 @@ import { UserService } from 'src/app/services/user.service'; templateUrl: './user-list.component.html', styleUrls: ['./user-list.component.scss'], }) -export class UserListComponent {} +export class UserListComponent { + // users: User[] = [ + // { + // name: 'Arun', + // city: 'sdsd', + // emailId: 'arunk@unicourt.com', + // id: 1, + // }, + // ]; + // } + constructor(private userService: UserService) {} + ngOnInit() { + this.userService.getUsers(); + } +} diff --git a/user-app/src/app/services/user.service.ts b/user-app/src/app/services/user.service.ts index 0160cc5..a51d613 100644 --- a/user-app/src/app/services/user.service.ts +++ b/user-app/src/app/services/user.service.ts @@ -1,13 +1,13 @@ import { Injectable } from '@angular/core'; import { User, UserDetail } from '../model/common.dto'; - +import { H} @Injectable({ providedIn: 'root', }) export class UserService { baseUrl: string = 'https://jsonplaceholder.typicode.com/users'; userId: number; - users: User[] = []; + user: User[] = []; constructor() {} @@ -15,7 +15,23 @@ export class UserService { return true; } - getUsers(): void {} + getUsers(): void { + this.user = [ + { + name : 'Arun', + city : 'Mangalore', + emailId : 'arunkga@unicourt.com', + id : 1 + }, + { + name : 'Riya', + city : 'Coorg', + emailId : 'riyajd@unicourt.com', + id : 2 + } + ] + return this.user; + } getUserDetail(id: number) {} diff --git a/user-app/src/index.html b/user-app/src/index.html index 01ea96e..37a7d93 100644 --- a/user-app/src/index.html +++ b/user-app/src/index.html @@ -1,13 +1,13 @@ - + - - - UserApp - - - - - - - + + + UserApp + + + + + + +