todo detail page / ng lint / todo category java entity

Author: aboudard

src/angular/package-lock.json

@@ -30,6 +30,7 @@
     "@ngrx/entity": "^6.0.1",
     "@ngrx/store": "^6.0.1",
     "@ngrx/store-devtools": "^6.0.1",
+    "awesome-bootstrap-checkbox": "^1.0.1",
     "bootstrap": "^4.1.1",
     "core-js": "^2.5.6",
     "ngrx-data": "^6.0.0-beta.6",

src/angular/package.json

@@ -19,13 +19,15 @@
       "active": false
     },
     {
-      "description": "nbn bnb nbnbnnbn bnnbnbnb nbnbnb nbb nb nb nbnb",
       "title": "Spring Boot for my crocodile",
+      "description": "special edition teeth-proof for big mouth",
+      "active": true,
       "id": 3
     },
     {
-      "description": "bebebbebbb be be b be bbbebbebeb b ebebebebeb b eb",
       "title": "Beer is not my first name",
+      "description": "autre truc",
+      "active": null,
       "id": 4
     },
     {
@@ -34,28 +36,22 @@
       "id": 5
     },
     {
-      "description": "tdtd tdt ddddt dtdt dtdtddtdtd tdtd",
       "title": "That's barealy a Todo List right ?",
-      "id": 7,
-      "active": true
+      "description": "the brand new description",
+      "active": false,
+      "id": 7
     },
     {
       "description": "ititit ititit it it it it it ititit itit ",
       "title": "Do something about it",
       "id": 8,
       "active": true
     },
-    {
-      "title": "test calculate",
-      "description": "description for the todo",
-      "active": true,
-      "id": 9
-    },
     {
       "title": "test meuh",
-      "description": "bilou bilou bilou bilou bilou bilou bilou bilou bilou bilou bilou bilou ",
+      "description": "er ererererer er e rer ererer er",
       "active": true,
-      "id": 10
+      "id": 9
     }
   ]
 }

src/angular/server.json

@@ -1,28 +1,30 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
-import { CommonModule } from '@angular/common';
 import { TodoComponent } from '../todo/todo.component';
 import { AdminModule } from '../admin/admin.module';
+import { TodoEditComponent } from '../todo/todo-edit/todo-edit.component';
 
 const routes: Routes = [
   {
-    path: 'admin',
+    path: '',
+    redirectTo: 'todopage',
+    pathMatch: 'full'
+  },
+  {
+    path: 'adminpage',
     loadChildren: () => AdminModule
   },
   {
-    path: 'todo',
+    path: 'todopage',
     component: TodoComponent
   },
-  {
-    path: '',
-    redirectTo: 'todo',
-    pathMatch: 'full'
-  }
+  { path: 'todopage/:id', component: TodoEditComponent },
+  { path: '**', redirectTo: 'todopage' } // bad routes redirect to todopage
 ];
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes)],
+  imports: [RouterModule.forRoot(routes, { useHash: true })],
   exports: [RouterModule]
 })
 export class AppRoutingModule {}

src/angular/src/app/app-routing/app-routing.module.ts

@@ -1,12 +1,4 @@
-import { OnInit } from '@angular/core/src/metadata/lifecycle_hooks';
-import {
-  Component,
-  ChangeDetectionStrategy,
-  ViewContainerRef
-} from '@angular/core';
-import { TodosService } from './services/todos.service';
-import { Todo } from './dto/todo';
-import { Observable } from 'rxjs';
+import { Component, ChangeDetectionStrategy } from '@angular/core';
 import { ToastService } from './services/toast.service';
 
 @Component({
@@ -15,10 +7,8 @@ import { ToastService } from './services/toast.service';
   styleUrls: ['./app.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class AppComponent implements OnInit {
+export class AppComponent {
   constructor(
     private toastService: ToastService // create an instance of the service that intercepts $entities actions
   ) {}
-
-  ngOnInit() {}
 }

src/angular/src/app/app.component.ts

@@ -6,9 +6,7 @@ import { AppComponent } from './app.component';
 import { AppStoreModule } from './store/app-store.module';
 import { ServicesModule } from './services/services.module';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { CounterComponent } from './counter/counter.component';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { CountervalidComponent } from './counter/countervalid/countervalid.component';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { CompModule } from './comp/comp.module';
 import { ToastrModule } from 'ngx-toastr';

src/angular/src/app/app.module.ts

@@ -3,14 +3,14 @@ import { CommonModule } from '@angular/common';
 import { FaInputComponent } from './fa-input/fa-input.component';
 import { HelloComponent } from './hello/hello.component';
 import { NavbarComponent } from './navbar/navbar.component';
-import { AppRoutingModule } from '../app-routing/app-routing.module';
 import { FooterComponent } from './footer/footer.component';
+import { RouterModule } from '@angular/router';
 
 /**
  * Module des composants annexes non liés aux routes
  */
 @NgModule({
-  imports: [CommonModule, AppRoutingModule],
+  imports: [CommonModule, RouterModule],
   declarations: [
     FaInputComponent,
     HelloComponent,

src/angular/src/app/comp/comp.module.ts

@@ -13,10 +13,10 @@
         <a class="nav-link" href="#">NgRx Data / SpringBoot</a>
       </li>
       <li class="nav-item">
-        <a class="nav-link" [routerLinkActive]="['active']" [routerLink]="'todo'">Todo</a>
+        <a class="nav-link" [routerLinkActive]="['active']" [routerLink]="'todopage'">Todo</a>
       </li>
       <li class="nav-item">
-        <a class="nav-link" [routerLinkActive]="['active']" [routerLink]="'admin'">Admin</a>
+        <a class="nav-link" [routerLinkActive]="['active']" [routerLink]="'adminpage'">Admin</a>
       </li>
     </ul>
     <div class="float-right pr-3">

src/angular/src/app/comp/navbar/navbar.component.html

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { TodosService } from '../services/todos.service';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 @Component({
   selector: 'app-counter',
@@ -11,7 +11,7 @@ export class CounterComponent implements OnInit {
   counter$: Observable<number>;
 
   constructor(private todosService: TodosService) {
-    this.counter$ = todosService.count$;
+    this.counter$ = this.todosService.count$;
   }
 
   ngOnInit() {}

src/angular/src/app/counter/counter.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { TodosService } from '../../services/todos.service';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { Todo } from '../../dto/todo';
 
 @Component({
@@ -12,8 +12,8 @@ export class CountervalidComponent implements OnInit {
   filteredTodos$: Observable<Todo[]>;
 
   constructor(private todosService: TodosService) {
-    todosService.setFilter(true);
-    this.filteredTodos$ = todosService.filteredEntities$;
+    this.todosService.setFilter(true);
+    this.filteredTodos$ = this.todosService.filteredEntities$;
   }
 
   ngOnInit() {}