Added add-note & navigation with routing

Suraj Chandgude · Suraj Chandgude · commit 408574f8e603 · 2019-05-09T11:53:28.000+05:30
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -1,7 +1,17 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
+import { TodosComponent } from './components/todos/todos.component';
 
-const routes: Routes = [];
+const routes: Routes = [
+  {
+    path: '',
+    component: TodosComponent
+  },
+  // {
+  //   path: '',
+  //   component: 
+  // }
+];
 
 @NgModule({
   imports: [RouterModule.forRoot(routes)],
diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -1 +1,4 @@
-<app-todos></app-todos>
+<div>
+    <app-header></app-header>
+    <router-outlet></router-outlet>
+</div>
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -1,20 +1,28 @@
+import { HttpClient, HttpClientModule } from "@angular/common/http";
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { TodosComponent } from './components/todos/todos.component';
 import { TodoItemComponent } from './components/todo-item/todo-item.component';
-
+import { HeaderComponent } from './components/layout/header/header.component';
+import { AddTodoComponent } from './components/add-todo/add-todo.component';
 @NgModule({
   declarations: [
     AppComponent,
     TodosComponent,
-    TodoItemComponent
+    TodoItemComponent,
+    HeaderComponent,
+    AddTodoComponent
   ],
   imports: [
     BrowserModule,
-    AppRoutingModule
+    AppRoutingModule,
+    HttpClientModule,
+    FormsModule
+  
   ],
   providers: [],
   bootstrap: [AppComponent]
diff --git a/src/app/components/add-todo/add-todo.component.html b/src/app/components/add-todo/add-todo.component.html
@@ -0,0 +1,4 @@
+<form class="form">
+  <input type="text" [(ngModel)]="title" name="title" placeholder="Add todo...">
+  <input type="button" value="submit" class="btn" (click)="onSubmit()">
+</form>
diff --git a/src/app/components/add-todo/add-todo.component.scss b/src/app/components/add-todo/add-todo.component.scss
@@ -0,0 +1,12 @@
+.form {
+    display: flex;
+  }
+  
+  .form input[type='text'] {
+    flex: 10;
+    padding: 5px;
+  }
+  
+  .form input[type='submit'] {
+    flex: 2;
+  }
diff --git a/src/app/components/add-todo/add-todo.component.spec.ts b/src/app/components/add-todo/add-todo.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AddTodoComponent } from './add-todo.component';
+
+describe('AddTodoComponent', () => {
+  let component: AddTodoComponent;
+  let fixture: ComponentFixture<AddTodoComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AddTodoComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AddTodoComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/components/add-todo/add-todo.component.ts b/src/app/components/add-todo/add-todo.component.ts
@@ -0,0 +1,29 @@
+import { Component, OnInit, Output, EventEmitter } from '@angular/core';
+
+@Component({
+  selector: 'app-add-todo',
+  templateUrl: './add-todo.component.html',
+  styleUrls: ['./add-todo.component.scss']
+})
+export class AddTodoComponent implements OnInit {
+
+  @Output() addTodo: EventEmitter<any> = new EventEmitter;
+
+  title: string;
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+  onSubmit() {
+    console.log("Hi")
+    let todo = {
+      title: this.title,
+      completed: false
+    }
+    this.addTodo.emit(todo);
+		console.log("TCL: AddTodoComponent -> onSubmit -> todo", todo)
+  }
+
+}
diff --git a/src/app/components/layout/header/header.component.html b/src/app/components/layout/header/header.component.html
@@ -0,0 +1,6 @@
+<header class="header">
+  <h1>TodoList</h1>
+  <nav>
+    <a routerLink="/">Home</a>
+  </nav>
+</header>
diff --git a/src/app/components/layout/header/header.component.scss b/src/app/components/layout/header/header.component.scss
@@ -0,0 +1,12 @@
+
+.header {
+    background: #333;
+    color: #fff;
+    text-align: center;
+    padding: 10px;
+  }
+  
+  .header a {
+    color: #fff;
+    text-decoration: none;
+  }
diff --git a/src/app/components/layout/header/header.component.spec.ts b/src/app/components/layout/header/header.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HeaderComponent } from './header.component';
+
+describe('HeaderComponent', () => {
+  let component: HeaderComponent;
+  let fixture: ComponentFixture<HeaderComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ HeaderComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HeaderComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/components/layout/header/header.component.ts b/src/app/components/layout/header/header.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-header',
+  templateUrl: './header.component.html',
+  styleUrls: ['./header.component.scss']
+})
+export class HeaderComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/src/app/components/models/Todo.ts b/src/app/components/models/Todo.ts
@@ -1,5 +1,5 @@
 export class Todo {
-    id: number;
+    id?: number;
     title: string;
     completed: boolean;
 }
diff --git a/src/app/components/todo-item/todo-item.component.html b/src/app/components/todo-item/todo-item.component.html
@@ -3,7 +3,7 @@
         <input type="checkbox" (change)="onToggle(todo)">
         {{todo.title}}
         
-       <button type="button" (click)="onDelete()" class="del">x</button>
+       <button type="button" (click)="onDelete(todo)" class="del">x</button>
         
     </p>
 </div>
diff --git a/src/app/components/todo-item/todo-item.component.ts b/src/app/components/todo-item/todo-item.component.ts
@@ -1,6 +1,7 @@
 import { TodoService } from './../../services/todo.service';
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, OnInit, Input, Output } from '@angular/core';
 import { Todo } from '../models/Todo';
+import { EventEmitter } from '@angular/core';
 
 @Component({
   selector: 'app-todo-item',
@@ -10,6 +11,7 @@ import { Todo } from '../models/Todo';
 export class TodoItemComponent implements OnInit {
 
   @Input() todo: Todo;
+  @Output() deleteTodo: EventEmitter<Todo> = new EventEmitter();
 
   constructor(private todoservice: TodoService) { }
 
@@ -22,16 +24,21 @@ export class TodoItemComponent implements OnInit {
       todo: true,
       'is-complete': this.todo.completed
     }
-
     return classes;
-
   }
+
   onToggle(todo) {
+    // toggle On UI
     todo.completed = !todo.completed;
+    
+    // toggle On server
+    this.todoservice.toggleCompleted(todo).subscribe((todo) => {
+      console.log("Todo", todo);
+    });
+
   }
 
   onDelete(todo) {
-		console.log("onDelete");
-
+    this.deleteTodo.emit(todo);
   }
 }
diff --git a/src/app/components/todos/todos.component.html b/src/app/components/todos/todos.component.html
@@ -1,5 +1,8 @@
-<h1>Todos</h1>
-
-<app-todo-item *ngFor="let todo of todos" [todo]="todo">
+<app-add-todo (addTodo)="addTodo($event)"></app-add-todo>
+<app-todo-item 
+*ngFor="let todo of todos"
+[todo]="todo"
+(deleteTodo)="deleteTodo($event)"
+>
   <li>{{todo.title}}</li>
 </app-todo-item>
diff --git a/src/app/components/todos/todos.component.ts b/src/app/components/todos/todos.component.ts
@@ -11,12 +11,31 @@ import { TodoService } from '../../services/todo.service';
 export class TodosComponent implements OnInit {
   todos: Todo[];
 
-  constructor(private todoservice: TodoService) { 
+  constructor(private todoservice: TodoService) {
    
   }
 
   ngOnInit() {
-    this.todos = this.todoservice.getTodos();
+    this.todoservice.getTodos().subscribe(r => {
+      this.todos = r;
+			console.log("TCL: TodosComponent -> ngOnInit -> todos", this.todos)
+    });
+  }
+  deleteTodo(todo: Todo) {
+		console.log("TCL: TodosComponent -> deleteTodo -> todo", todo)
+    // Remove From UI
+    this.todos = this.todos.filter(t => t.id !== todo.id);
+    // Remove from server
+    this.todoservice.deleteTodo(todo).subscribe();
+  }
+
+  addTodo(todo: Todo) {
+    this.todoservice.addTodo(todo).subscribe((td: any) => {
+			console.log("TCL: TodosComponent -> addTodo -> td", td)
+      this.todos.push((td));
+      // this.todoservice.getTodos().subscribe(r => {
+      //   this.todos = r;});
+    })
   }
 
-}
+  }
diff --git a/src/app/services/todo.service.ts b/src/app/services/todo.service.ts
@@ -1,31 +1,44 @@
+import { HttpClientModule, HttpHeaders, HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import { Todo } from '../components/models/Todo';
+import { Observable } from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
 })
 export class TodoService {
 
-  constructor() { }
-
-  getTodos() {
-    return  [
-      {
-        id: 1,
-        title: 'Todo One',
-        completed: false,
-      },
-      {
-        id: 2,
-        title: 'Todo Two',
-        completed: true,
-      },
-      {
-        id: 1,
-        title: 'Todo Three',
-        completed: false,
-      }
-  
-  
-    ]
+  todosUrl =  'https://jsonplaceholder.typicode.com/todos';
+  todoLimit = '?_limit=5';
+  httpOptions = {
+    headers: new HttpHeaders({
+      'Content-Type': 'application/json',
+    })
+  }
+
+  constructor(
+    private http: HttpClient
+  ) {}
+
+  getTodos(): Observable<Todo[]> {
+
+    return this.http.get<Todo[]>(`${this.todosUrl}${this.todoLimit}`);
+
+  }
+
+  toggleCompleted(todo: Todo) {
+    let url = `${this.todosUrl}/${todo.id}`
+    return this.http.put(url, todo, this.httpOptions);
+
+  }
+
+  deleteTodo(todo: Todo) {
+
+    let url = `${this.todosUrl}/${todo.id}`
+    return this.http.delete(url, this.httpOptions);
+  }
+
+  addTodo(todo: Todo) {
+    return this.http.post(this.todosUrl, todo, this.httpOptions);
   }
 }
