From cd4b0a28c07b5ee3bb67364fa5c7168920d58bd0 Mon Sep 17 00:00:00 2001
From: gerardmallol <gerardmallol01@gmail.com>
Date: Wed, 8 May 2024 18:14:58 +0200
Subject: [PATCH 01/13] adoptions

---
 .../adoptions-add.component.html              |  0
 .../adoptions-add/adoptions-add.component.ts  |  0
 .../adoptions-delete.component.ts             | 33 +++++++++++++++
 .../adoptions.add.component.html              |  0
 .../adoptions-detail.component.html           |  0
 .../adoptions-detail.component.ts             | 27 ++++++++++++
 .../adoptions-edit.component.html             |  0
 .../adoptions-edit.component.ts               |  0
 .../adoptions-list.component.html             |  0
 .../adoptions-list.component.ts               | 41 +++++++++++++++++++
 .../adoptions-search.component.html           |  0
 .../adoptions-search.component.ts             |  0
 src/app/adoptions/adoptions.service.ts        | 17 ++++++++
 src/app/adoptions/adoptions.ts                | 17 ++++++++
 14 files changed, 135 insertions(+)
 create mode 100644 src/app/adoptions/adoptions-add/adoptions-add.component.html
 create mode 100644 src/app/adoptions/adoptions-add/adoptions-add.component.ts
 create mode 100644 src/app/adoptions/adoptions-delete/adoptions-delete.component.ts
 create mode 100644 src/app/adoptions/adoptions-delete/adoptions.add.component.html
 create mode 100644 src/app/adoptions/adoptions-detail/adoptions-detail.component.html
 create mode 100644 src/app/adoptions/adoptions-detail/adoptions-detail.component.ts
 create mode 100644 src/app/adoptions/adoptions-edit/adoptions-edit.component.html
 create mode 100644 src/app/adoptions/adoptions-edit/adoptions-edit.component.ts
 create mode 100644 src/app/adoptions/adoptions-list/adoptions-list.component.html
 create mode 100644 src/app/adoptions/adoptions-list/adoptions-list.component.ts
 create mode 100644 src/app/adoptions/adoptions-search/adoptions-search.component.html
 create mode 100644 src/app/adoptions/adoptions-search/adoptions-search.component.ts
 create mode 100644 src/app/adoptions/adoptions.service.ts
 create mode 100644 src/app/adoptions/adoptions.ts

diff --git a/src/app/adoptions/adoptions-add/adoptions-add.component.html b/src/app/adoptions/adoptions-add/adoptions-add.component.html
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/adoptions/adoptions-add/adoptions-add.component.ts b/src/app/adoptions/adoptions-add/adoptions-add.component.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/adoptions/adoptions-delete/adoptions-delete.component.ts b/src/app/adoptions/adoptions-delete/adoptions-delete.component.ts
new file mode 100644
index 0000000..18a3bee
--- /dev/null
+++ b/src/app/adoptions/adoptions-delete/adoptions-delete.component.ts
@@ -0,0 +1,33 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { Adoptions } from '../adoptions';
+import { AdoptionsService } from '../adoptions.service';
+
+@Component({
+  selector: 'app-adoptions-delete',
+  templateUrl: './adoptions.add.component.html',
+  standalone: true,
+  imports: []
+})
+export class AdoptionsDeleteComponent implements OnInit {
+  public adoptions: Adoptions = new Adoptions();
+  public adoptionsId: string;
+
+  constructor(private route: ActivatedRoute,
+              private router: Router,
+              private adoptionsService: AdoptionsService) {
+  }
+
+  ngOnInit(): void {
+    this.adoptionsId = this.route.snapshot.paramMap.get('id');
+    this.adoptionsService.getResource(this.adoptionsId).subscribe(
+      adoptions => this.adoptions = adoptions);
+  }
+
+  delete(): void {
+    this.adoptionsService.deleteResource(this.adoptions).subscribe(
+      () => {
+        this.router.navigate(['']);
+      });
+  }
+}
diff --git a/src/app/adoptions/adoptions-delete/adoptions.add.component.html b/src/app/adoptions/adoptions-delete/adoptions.add.component.html
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/adoptions/adoptions-detail/adoptions-detail.component.html b/src/app/adoptions/adoptions-detail/adoptions-detail.component.html
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/adoptions/adoptions-detail/adoptions-detail.component.ts b/src/app/adoptions/adoptions-detail/adoptions-detail.component.ts
new file mode 100644
index 0000000..4d97de6
--- /dev/null
+++ b/src/app/adoptions/adoptions-detail/adoptions-detail.component.ts
@@ -0,0 +1,27 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { AdoptionsService } from '../adoptions.service';
+import { Adoptions } from '../adoptions';
+
+@Component({
+  selector: 'app-adoptions-detail',
+  templateUrl: './adoptions-detail.component.html',
+  standalone: true,
+  imports: []
+})
+export class AdoptionsDetailComponent implements OnInit {
+  public adoptions: Adoptions = new Adoptions();
+  public adoptionsId: string;
+
+  constructor(private route: ActivatedRoute,
+              private adoptionsService: AdoptionsService) {
+  }
+
+  ngOnInit(): void {
+    this.adoptionsId = this.route.snapshot.paramMap.get('id');
+    this.adoptionsService.getResource(this.adoptionsId).subscribe(
+      adoptions => {
+        this.adoptions = adoptions;
+      });
+  }
+}
diff --git a/src/app/adoptions/adoptions-edit/adoptions-edit.component.html b/src/app/adoptions/adoptions-edit/adoptions-edit.component.html
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/adoptions/adoptions-edit/adoptions-edit.component.ts b/src/app/adoptions/adoptions-edit/adoptions-edit.component.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/adoptions/adoptions-list/adoptions-list.component.html b/src/app/adoptions/adoptions-list/adoptions-list.component.html
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/adoptions/adoptions-list/adoptions-list.component.ts b/src/app/adoptions/adoptions-list/adoptions-list.component.ts
new file mode 100644
index 0000000..891dd70
--- /dev/null
+++ b/src/app/adoptions/adoptions-list/adoptions-list.component.ts
@@ -0,0 +1,41 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { Adoptions } from '../adoptions';
+import { AdoptionsService } from '../adoptions.service';
+import { PagedResourceCollection } from '@lagoshny/ngx-hateoas-client';
+
+@Component({
+  selector: 'app-adoptions-list',
+  standalone: true,
+  imports: [],
+  templateUrl: './adoptions-list.component.html'
+})
+export class AdoptionsListComponent implements OnInit{
+  public adoptions: Adoptions[] = [];
+  public pageSize = 5;
+  public page = 1;
+  public totalAdoptions = 0;
+
+  constructor(
+    public router: Router,
+    private adoptionsService: AdoptionsService) {
+  }
+
+  ngOnInit(): void {
+    this.adoptionsService.getPage({ pageParams:  { size: this.pageSize }, sort: { id: 'ASC' } }).subscribe(
+      (page: PagedResourceCollection<Adoptions>) => {
+        this.adoptions = page.resources;
+        this.totalAdoptions = page.totalElements;
+      });
+  }
+
+  changePage(): void {
+    this.adoptionsService.getPage({ pageParams: { page: this.page - 1, size: this.pageSize }, sort: { id: 'ASC' } }).subscribe(
+      (page: PagedResourceCollection<Adoptions>) => this.adoptions = page.resources);
+  }
+
+  detail(adoptions: Adoptions): void {
+    this.router.navigate(['adoptions', adoptions.id]);
+  }
+
+}
diff --git a/src/app/adoptions/adoptions-search/adoptions-search.component.html b/src/app/adoptions/adoptions-search/adoptions-search.component.html
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/adoptions/adoptions-search/adoptions-search.component.ts b/src/app/adoptions/adoptions-search/adoptions-search.component.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/adoptions/adoptions.service.ts b/src/app/adoptions/adoptions.service.ts
new file mode 100644
index 0000000..e3fc5c9
--- /dev/null
+++ b/src/app/adoptions/adoptions.service.ts
@@ -0,0 +1,17 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs/internal/Observable';
+import { HateoasResourceOperation, ResourceCollection } from '@lagoshny/ngx-hateoas-client';
+import { Adoptions } from "./adoptions"
+
+@Injectable({providedIn: 'root'})
+export class AdoptionsService extends HateoasResourceOperation<Adoptions> {
+
+  constructor() {
+    super(Adoptions);
+  }
+
+  public findById(query: string): Observable<ResourceCollection<Adoptions>> {
+    return this.searchCollection('findById', { params: { text: query } });
+  }
+}
+
diff --git a/src/app/adoptions/adoptions.ts b/src/app/adoptions/adoptions.ts
new file mode 100644
index 0000000..231c5bf
--- /dev/null
+++ b/src/app/adoptions/adoptions.ts
@@ -0,0 +1,17 @@
+import { HateoasResource, Resource } from '@lagoshny/ngx-hateoas-client';
+import {User} from "../login-basic/user";
+
+@HateoasResource('users')
+export class Adoptions extends Resource {
+  localDateTime: Date;
+  id: string;
+  pet: string;
+  user: User;
+
+
+
+  constructor(values: object = {}) {
+    super();
+    Object.assign(this as any, values);
+  }
+}

From dbec58ec483834a59d754feddcc2f9543bb7bc49 Mon Sep 17 00:00:00 2001
From: gerardmallol <gerardmallol01@gmail.com>
Date: Wed, 8 May 2024 18:29:49 +0200
Subject: [PATCH 02/13] adoptions

---
 .../adoptions-add/adoptions-add.component.ts  | 34 +++++++++++++++++++
 .../adoptions-delete.component.ts             |  2 +-
 .../adoptions-edit.component.ts               | 32 +++++++++++++++++
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/src/app/adoptions/adoptions-add/adoptions-add.component.ts b/src/app/adoptions/adoptions-add/adoptions-add.component.ts
index e69de29..3cd58aa 100644
--- a/src/app/adoptions/adoptions-add/adoptions-add.component.ts
+++ b/src/app/adoptions/adoptions-add/adoptions-add.component.ts
@@ -0,0 +1,34 @@
+import { Component, OnInit } from '@angular/core';
+import { Adoptions } from '../adoptions';
+import { Router } from '@angular/router';
+import { AdoptionsService } from '../adoptions.service';
+import { AuthenticationBasicService } from 'src/app/login-basic/authentication-basic.service';
+import { User } from 'src/app/login-basic/user';
+import { UserService } from 'src/app/user/user.service';
+
+@Component({
+  selector: 'app-adoptions-add',
+  templateUrl: './take-add.component.html',
+  imports: [],
+  standalone: true
+})
+export class AdoptionsAddComponent implements OnInit{
+  public adoptions: Adoptions;
+  public user: User;
+
+  constructor(private router: Router,
+              private adoptionsService: AdoptionsService,
+              private userService: UserService,
+              private authenticationService: AuthenticationBasicService) {
+  }
+
+  ngOnInit(): void {
+    this.adoptions = new Adoptions();
+    this.userService.getResource(this.getCurrentUserName()).subscribe(
+      (user: User) => this.user = user );
+  }
+
+  getCurrentUserName(): string {
+    return this.authenticationService.getCurrentUser().username;
+  }
+}
diff --git a/src/app/adoptions/adoptions-delete/adoptions-delete.component.ts b/src/app/adoptions/adoptions-delete/adoptions-delete.component.ts
index 18a3bee..65353e8 100644
--- a/src/app/adoptions/adoptions-delete/adoptions-delete.component.ts
+++ b/src/app/adoptions/adoptions-delete/adoptions-delete.component.ts
@@ -27,7 +27,7 @@ export class AdoptionsDeleteComponent implements OnInit {
   delete(): void {
     this.adoptionsService.deleteResource(this.adoptions).subscribe(
       () => {
-        this.router.navigate(['']);
+        this.router.navigate(['id']);
       });
   }
 }
diff --git a/src/app/adoptions/adoptions-edit/adoptions-edit.component.ts b/src/app/adoptions/adoptions-edit/adoptions-edit.component.ts
index e69de29..e06325b 100644
--- a/src/app/adoptions/adoptions-edit/adoptions-edit.component.ts
+++ b/src/app/adoptions/adoptions-edit/adoptions-edit.component.ts
@@ -0,0 +1,32 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Router } from '@angular/router';
+import { AuthenticationBasicService } from '../../login-basic/authentication-basic.service';
+import { AdoptionsService } from '../adoptions.service';
+import { Adoptions } from '../adoptions';
+
+@Component({
+  selector: 'app-adoptions-edit',
+  templateUrl: './adoptions-edit.component.html',
+  standalone: true,
+  imports: []
+})
+export class AdoptionsEditComponent implements OnInit {
+  public adoptions: Adoptions = new Adoptions();
+
+  constructor(private route: ActivatedRoute,
+              private router: Router,
+              private adoptionsService: AdoptionsService,
+              private authenticationService: AuthenticationBasicService) {
+  }
+
+  ngOnInit(): void {
+    const id = this.route.snapshot.paramMap.get('id');
+    this.adoptionsService.getResource(id).subscribe(
+      (adoptions: Adoptions) => this.adoptions = adoptions );
+  }
+
+  getCurrentUserName(): string {
+    return this.authenticationService.getCurrentUser().username;
+  }
+}

From 9811a64e48f804ad4ddb925ab4b6a349f9ed9b80 Mon Sep 17 00:00:00 2001
From: gerardmallol <gerardmallol01@gmail.com>
Date: Wed, 8 May 2024 18:35:50 +0200
Subject: [PATCH 03/13] adoptions

---
 .../adoptions-search.component.html           |  1 +
 .../adoptions-search.component.ts             | 44 +++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/src/app/adoptions/adoptions-search/adoptions-search.component.html b/src/app/adoptions/adoptions-search/adoptions-search.component.html
index e69de29..27b3e56 100644
--- a/src/app/adoptions/adoptions-search/adoptions-search.component.html
+++ b/src/app/adoptions/adoptions-search/adoptions-search.component.html
@@ -0,0 +1 @@
+<p>adoptions-search works!</p>
diff --git a/src/app/adoptions/adoptions-search/adoptions-search.component.ts b/src/app/adoptions/adoptions-search/adoptions-search.component.ts
index e69de29..03f1dcc 100644
--- a/src/app/adoptions/adoptions-search/adoptions-search.component.ts
+++ b/src/app/adoptions/adoptions-search/adoptions-search.component.ts
@@ -0,0 +1,44 @@
+import { Component, EventEmitter, Output } from '@angular/core';
+import { AdoptionsService } from '../adoptions.service';
+import { Adoptions } from '../adoptions';
+import { Observable, of, OperatorFunction } from 'rxjs';
+import { catchError, debounceTime, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators';
+import { ResourceCollection } from '@lagoshny/ngx-hateoas-client';
+
+@Component({
+  selector: 'app-propagator-search',
+  templateUrl: './propagator-search.component.html',
+  standalone: true,
+  imports: []
+})
+
+export class AdoptionsSearchComponent {
+  @Output() emitResults: EventEmitter<Adoptions> = new EventEmitter();
+  searchFailed = false;
+  searching = false;
+
+  constructor(private AdoptionsService: AdoptionsService) {
+  }
+
+  autocomplete: OperatorFunction<string, readonly Adoptions[]> = (text$: Observable<string>) =>
+    text$.pipe(
+      debounceTime(500),
+      distinctUntilChanged(),
+      tap(() => this.searching = true),
+      switchMap(term => term.length < 3 ? of([]) :
+        this.AdoptionsService.findById(term).pipe(
+          map((collection: ResourceCollection<Adoptions>) => collection.resources),
+          tap(() => this.searchFailed = false),
+          catchError(() => {
+            this.searchFailed = true;
+            return of([]);
+          })
+        )
+      ),
+      tap(() => this.searching = false )
+    )
+
+  select(item: any): void {
+    this.emitResults.emit(item as Adoptions);
+  }
+}

From b6fc37b14d02b3cb9f6f7d0be8c2d1decf0846c3 Mon Sep 17 00:00:00 2001
From: gerardmallol <gerardmallol01@gmail.com>
Date: Wed, 15 May 2024 17:38:23 +0200
Subject: [PATCH 04/13] adoptions

---
 .../adoptions-add/adoptions-add.component.ts       |  2 --
 .../adoptions-delete/adoptions-delete.component.ts |  4 +---
 .../adoptions-detail/adoptions-detail.component.ts |  4 +---
 .../adoptions-edit/adoptions-edit.component.ts     |  2 --
 .../adoptions-list/adoptions-list.component.ts     |  2 --
 .../adoptions-search/adoptions-search.component.ts |  6 ++----
 src/app/app-routing.module.ts                      | 13 +++++++++++++
 src/app/app.module.ts                              | 14 +++++++++++++-
 8 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/app/adoptions/adoptions-add/adoptions-add.component.ts b/src/app/adoptions/adoptions-add/adoptions-add.component.ts
index 3cd58aa..40cd4e8 100644
--- a/src/app/adoptions/adoptions-add/adoptions-add.component.ts
+++ b/src/app/adoptions/adoptions-add/adoptions-add.component.ts
@@ -9,8 +9,6 @@ import { UserService } from 'src/app/user/user.service';
 @Component({
   selector: 'app-adoptions-add',
   templateUrl: './take-add.component.html',
-  imports: [],
-  standalone: true
 })
 export class AdoptionsAddComponent implements OnInit{
   public adoptions: Adoptions;
diff --git a/src/app/adoptions/adoptions-delete/adoptions-delete.component.ts b/src/app/adoptions/adoptions-delete/adoptions-delete.component.ts
index 65353e8..0666226 100644
--- a/src/app/adoptions/adoptions-delete/adoptions-delete.component.ts
+++ b/src/app/adoptions/adoptions-delete/adoptions-delete.component.ts
@@ -5,9 +5,7 @@ import { AdoptionsService } from '../adoptions.service';
 
 @Component({
   selector: 'app-adoptions-delete',
-  templateUrl: './adoptions.add.component.html',
-  standalone: true,
-  imports: []
+  templateUrl: './adoptions.add.component.html'
 })
 export class AdoptionsDeleteComponent implements OnInit {
   public adoptions: Adoptions = new Adoptions();
diff --git a/src/app/adoptions/adoptions-detail/adoptions-detail.component.ts b/src/app/adoptions/adoptions-detail/adoptions-detail.component.ts
index 4d97de6..fb5ba00 100644
--- a/src/app/adoptions/adoptions-detail/adoptions-detail.component.ts
+++ b/src/app/adoptions/adoptions-detail/adoptions-detail.component.ts
@@ -5,9 +5,7 @@ import { Adoptions } from '../adoptions';
 
 @Component({
   selector: 'app-adoptions-detail',
-  templateUrl: './adoptions-detail.component.html',
-  standalone: true,
-  imports: []
+  templateUrl: './adoptions-detail.component.html'
 })
 export class AdoptionsDetailComponent implements OnInit {
   public adoptions: Adoptions = new Adoptions();
diff --git a/src/app/adoptions/adoptions-edit/adoptions-edit.component.ts b/src/app/adoptions/adoptions-edit/adoptions-edit.component.ts
index e06325b..2835f6d 100644
--- a/src/app/adoptions/adoptions-edit/adoptions-edit.component.ts
+++ b/src/app/adoptions/adoptions-edit/adoptions-edit.component.ts
@@ -8,8 +8,6 @@ import { Adoptions } from '../adoptions';
 @Component({
   selector: 'app-adoptions-edit',
   templateUrl: './adoptions-edit.component.html',
-  standalone: true,
-  imports: []
 })
 export class AdoptionsEditComponent implements OnInit {
   public adoptions: Adoptions = new Adoptions();
diff --git a/src/app/adoptions/adoptions-list/adoptions-list.component.ts b/src/app/adoptions/adoptions-list/adoptions-list.component.ts
index 891dd70..522ddeb 100644
--- a/src/app/adoptions/adoptions-list/adoptions-list.component.ts
+++ b/src/app/adoptions/adoptions-list/adoptions-list.component.ts
@@ -6,8 +6,6 @@ import { PagedResourceCollection } from '@lagoshny/ngx-hateoas-client';
 
 @Component({
   selector: 'app-adoptions-list',
-  standalone: true,
-  imports: [],
   templateUrl: './adoptions-list.component.html'
 })
 export class AdoptionsListComponent implements OnInit{
diff --git a/src/app/adoptions/adoptions-search/adoptions-search.component.ts b/src/app/adoptions/adoptions-search/adoptions-search.component.ts
index 03f1dcc..696e582 100644
--- a/src/app/adoptions/adoptions-search/adoptions-search.component.ts
+++ b/src/app/adoptions/adoptions-search/adoptions-search.component.ts
@@ -6,10 +6,8 @@ import { catchError, debounceTime, distinctUntilChanged, map, switchMap, tap } f
 import { ResourceCollection } from '@lagoshny/ngx-hateoas-client';
 
 @Component({
-  selector: 'app-propagator-search',
-  templateUrl: './propagator-search.component.html',
-  standalone: true,
-  imports: []
+  selector: 'app-adoptions-search',
+  templateUrl: './adoptions-search.component.html'
 })
 
 export class AdoptionsSearchComponent {
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 1f6d256..43d23e2 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -8,6 +8,13 @@ import { UserDetailComponent } from './user/user-detail/user-detail.component';
 import { UserRegisterComponent } from './user/user-register/user-register.component';
 import { UserEditComponent } from './user/user-edit/user-edit.component';
 import { UserDeleteComponent } from './user/user-delete/user-delete.component';
+import {AdoptionsSearchComponent} from './adoptions/adoptions-search/adoptions-search.component';
+import {AdoptionsListComponent} from './adoptions/adoptions-list/adoptions-list.component';
+import {AdoptionsEditComponent} from './adoptions/adoptions-edit/adoptions-edit.component';
+import {AdoptionsDetailComponent} from './adoptions/adoptions-detail/adoptions-detail.component';
+import {AdoptionsDeleteComponent} from './adoptions/adoptions-delete/adoptions-delete.component';
+import {AdoptionsAddComponent} from "./adoptions/adoptions-add/adoptions-add.component";
+
 
 const routes: Routes = [
   { path: 'users/create', component: UserRegisterComponent},
@@ -18,6 +25,12 @@ const routes: Routes = [
   { path: 'about', component: AboutComponent},
   { path: '404', component: NotFoundComponent},
   { path: '', redirectTo: 'about', pathMatch: 'full'},
+  { path: 'adoptions', component: AdoptionsListComponent },
+  { path: 'adoptions/create', component: AdoptionsAddComponent },
+  { path: 'adoptions/edit', component: AdoptionsEditComponent },
+  { path: 'adoptions/delete', component: AdoptionsDeleteComponent },
+  { path: 'adoptions/detail', component: AdoptionsDetailComponent },
+  { path: 'adoptions/search', component: AdoptionsSearchComponent }
 ];
 
 @NgModule({
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 40c973a..b33207d 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -23,6 +23,12 @@ import {HttpErrorInterceptor} from './error-handler/http-error-interceptor';
 import {AuthenticationBasicService} from './login-basic/authentication-basic.service';
 import {LoggedInGuard} from './login-basic/loggedin.guard';
 import {UserService} from './user/user.service';
+import {AdoptionsSearchComponent} from './adoptions/adoptions-search/adoptions-search.component';
+import {AdoptionsListComponent} from './adoptions/adoptions-list/adoptions-list.component';
+import {AdoptionsEditComponent} from './adoptions/adoptions-edit/adoptions-edit.component';
+import {AdoptionsDetailComponent} from './adoptions/adoptions-detail/adoptions-detail.component';
+import {AdoptionsDeleteComponent} from './adoptions/adoptions-delete/adoptions-delete.component';
+import {AdoptionsAddComponent} from "./adoptions/adoptions-add/adoptions-add.component";
 
 @NgModule({
   declarations: [
@@ -35,7 +41,13 @@ import {UserService} from './user/user.service';
     UserRegisterComponent,
     UserEditComponent,
     UserDeleteComponent,
-    UserSearchComponent
+    UserSearchComponent,
+    AdoptionsSearchComponent,
+    AdoptionsAddComponent,
+    AdoptionsDeleteComponent,
+    AdoptionsDetailComponent,
+    AdoptionsEditComponent,
+    AdoptionsListComponent
   ],
   imports: [
     BrowserModule,

From fe8d6917d5dc283d740da089445bb99eaecf0cb8 Mon Sep 17 00:00:00 2001
From: gerardmallol <gerardmallol01@gmail.com>
Date: Wed, 15 May 2024 17:43:53 +0200
Subject: [PATCH 05/13] error per obrir ng serve

---
 src/app/adoptions/adoptions-add/adoptions-add.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/adoptions/adoptions-add/adoptions-add.component.ts b/src/app/adoptions/adoptions-add/adoptions-add.component.ts
index 40cd4e8..6b082c3 100644
--- a/src/app/adoptions/adoptions-add/adoptions-add.component.ts
+++ b/src/app/adoptions/adoptions-add/adoptions-add.component.ts
@@ -8,7 +8,7 @@ import { UserService } from 'src/app/user/user.service';
 
 @Component({
   selector: 'app-adoptions-add',
-  templateUrl: './take-add.component.html',
+  templateUrl: './adoptions-add.component.html',
 })
 export class AdoptionsAddComponent implements OnInit{
   public adoptions: Adoptions;

From 9fbe63dbef09cf53342d7eb931b61353543bab6e Mon Sep 17 00:00:00 2001
From: gerardmallol <gerardmallol01@gmail.com>
Date: Wed, 15 May 2024 18:06:49 +0200
Subject: [PATCH 06/13] adoptions

---
 .../adoptions-add.component.html              | 30 +++++++++++++++++++
 .../adoptions-add/adoptions-add.component.ts  | 13 ++++----
 src/app/adoptions/adoptions.ts                |  1 +
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/app/adoptions/adoptions-add/adoptions-add.component.html b/src/app/adoptions/adoptions-add/adoptions-add.component.html
index e69de29..009d39b 100644
--- a/src/app/adoptions/adoptions-add/adoptions-add.component.html
+++ b/src/app/adoptions/adoptions-add/adoptions-add.component.html
@@ -0,0 +1,30 @@
+<form id="adoptions-form" (ngSubmit)="onSubmit()" #form="ngForm">
+  <fieldset>
+
+
+    <!-- id input -->
+    <div class="form-group mb-3" [class.was-validated]="id.invalid && (id.dirty || id.touched)">
+      <label class="control-label" for="id">Id</label>
+      <input id="id" name="id" type="number" class="form-control"  [(ngModel)]="adoptions.id"
+             #id="ngModel">
+    </div>
+
+    <!-- starttime input -->
+    <div class="form-group mb-3">
+      <label class="control-label" for="time">Time</label>
+      <input id="time" name="time" type="Date" class="form-control" [(ngModel)]="adoptions.localDateTime"
+             #time="ngModel">
+    </div>
+
+    <!-- Buttons -->
+    <div class=" form-group fa-pull-right">
+      <button id="listBtn" type="button" [routerLink]="['/adoptions']"
+              class="btn btn-outline-primary pull-right">Back
+      </button>
+      <button id="submit" type="submit" [disabled]="!form.form.valid"
+              class="btn ms-3 btn-success pull-right">Submit
+      </button>
+    </div>
+
+  </fieldset>
+</form>
diff --git a/src/app/adoptions/adoptions-add/adoptions-add.component.ts b/src/app/adoptions/adoptions-add/adoptions-add.component.ts
index 6b082c3..db5f4fa 100644
--- a/src/app/adoptions/adoptions-add/adoptions-add.component.ts
+++ b/src/app/adoptions/adoptions-add/adoptions-add.component.ts
@@ -5,6 +5,7 @@ import { AdoptionsService } from '../adoptions.service';
 import { AuthenticationBasicService } from 'src/app/login-basic/authentication-basic.service';
 import { User } from 'src/app/login-basic/user';
 import { UserService } from 'src/app/user/user.service';
+import {FormControl, FormGroup} from "@angular/forms";
 
 @Component({
   selector: 'app-adoptions-add',
@@ -13,20 +14,20 @@ import { UserService } from 'src/app/user/user.service';
 export class AdoptionsAddComponent implements OnInit{
   public adoptions: Adoptions;
   public user: User;
+  public date: Date;
 
   constructor(private router: Router,
               private adoptionsService: AdoptionsService,
               private userService: UserService,
-              private authenticationService: AuthenticationBasicService) {
+              private authenticationService: AuthenticationBasicService){
   }
-
   ngOnInit(): void {
     this.adoptions = new Adoptions();
-    this.userService.getResource(this.getCurrentUserName()).subscribe(
-      (user: User) => this.user = user );
   }
 
-  getCurrentUserName(): string {
-    return this.authenticationService.getCurrentUser().username;
+  onSubmit(): void {
+    this.adoptionsService.createResource({body: this.adoptions}).subscribe(
+      (adoptions:Adoptions) => this.router.navigate([adoptions.uri])
+    );
   }
 }
diff --git a/src/app/adoptions/adoptions.ts b/src/app/adoptions/adoptions.ts
index 231c5bf..2b7461d 100644
--- a/src/app/adoptions/adoptions.ts
+++ b/src/app/adoptions/adoptions.ts
@@ -7,6 +7,7 @@ export class Adoptions extends Resource {
   id: string;
   pet: string;
   user: User;
+  uri: string;
 
 
 

From e9599c07f4b534f30fdf965d56cc1d7854ccd9d4 Mon Sep 17 00:00:00 2001
From: gerardmallol <gerardmallol01@gmail.com>
Date: Wed, 15 May 2024 18:14:33 +0200
Subject: [PATCH 07/13] adoptions

---
 .../adoptions-list.component.html             | 21 +++++++++++++++++++
 .../adoptions-list.component.ts               |  3 ++-
 src/app/app-routing.module.ts                 |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/app/adoptions/adoptions-list/adoptions-list.component.html b/src/app/adoptions/adoptions-list/adoptions-list.component.html
index e69de29..65f282b 100644
--- a/src/app/adoptions/adoptions-list/adoptions-list.component.html
+++ b/src/app/adoptions/adoptions-list/adoptions-list.component.html
@@ -0,0 +1,21 @@
+<app-adoptions-list (emitResults)="detail($event)"></app-adoptions-list>
+
+<div class="card mb-1" *ngFor="let adoptions of adoptions">
+  <div class="card-block row m-1 col-12">
+    <div class="card-body row align-items-center">
+      <div class="col-6 mt-1">
+        <h6 class="card-subtitle text-muted">Id</h6>
+        <a class="card-text" [routerLink]="['/schedules', adoptions.id]">{{adoptions.id}}</a>
+      </div>
+      <div class="col-6 mt-1">
+        <h6 class="card-subtitle text-muted">Time</h6>
+        <p class="card-text">{{adoptions.localDateTime}}</p>
+      </div>
+    </div>
+  </div>
+</div>
+
+<ngb-pagination class="d-flex justify-content-center"
+                [(page)]="page" [pageSize]="pageSize" [collectionSize]="totalAdoptions"
+                (pageChange)="changePage()"></ngb-pagination>
+
diff --git a/src/app/adoptions/adoptions-list/adoptions-list.component.ts b/src/app/adoptions/adoptions-list/adoptions-list.component.ts
index 522ddeb..aab25c6 100644
--- a/src/app/adoptions/adoptions-list/adoptions-list.component.ts
+++ b/src/app/adoptions/adoptions-list/adoptions-list.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, EventEmitter, OnInit, Output} from '@angular/core';
 import { Router } from '@angular/router';
 import { Adoptions } from '../adoptions';
 import { AdoptionsService } from '../adoptions.service';
@@ -13,6 +13,7 @@ export class AdoptionsListComponent implements OnInit{
   public pageSize = 5;
   public page = 1;
   public totalAdoptions = 0;
+  @Output() emitResults = new EventEmitter<Adoptions>();
 
   constructor(
     public router: Router,
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 43d23e2..fbbd488 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -25,7 +25,7 @@ const routes: Routes = [
   { path: 'about', component: AboutComponent},
   { path: '404', component: NotFoundComponent},
   { path: '', redirectTo: 'about', pathMatch: 'full'},
-  { path: 'adoptions', component: AdoptionsListComponent },
+  { path: 'adoptions/list' , component: AdoptionsListComponent },
   { path: 'adoptions/create', component: AdoptionsAddComponent },
   { path: 'adoptions/edit', component: AdoptionsEditComponent },
   { path: 'adoptions/delete', component: AdoptionsDeleteComponent },

From 54cd10fac5a192a65e5aa603edae4be4f4268df8 Mon Sep 17 00:00:00 2001
From: gerardmallol <gerardmallol01@gmail.com>
Date: Wed, 15 May 2024 18:29:00 +0200
Subject: [PATCH 08/13] adoptions

---
 .../adoptions-add/adoptions-add.component.html         | 10 ++++++----
 .../adoptions-delete/adoptions-delete.component.ts     |  2 +-
 .../adoptions-delete/adoptions.add.component.html      |  0
 .../adoptions-delete/adoptions.delete.component.html   |  1 +
 .../adoptions-detail/adoptions-detail.component.html   |  1 +
 .../adoptions-edit/adoptions-edit.component.html       |  1 +
 6 files changed, 10 insertions(+), 5 deletions(-)
 delete mode 100644 src/app/adoptions/adoptions-delete/adoptions.add.component.html
 create mode 100644 src/app/adoptions/adoptions-delete/adoptions.delete.component.html

diff --git a/src/app/adoptions/adoptions-add/adoptions-add.component.html b/src/app/adoptions/adoptions-add/adoptions-add.component.html
index 009d39b..fceffa4 100644
--- a/src/app/adoptions/adoptions-add/adoptions-add.component.html
+++ b/src/app/adoptions/adoptions-add/adoptions-add.component.html
@@ -1,22 +1,24 @@
 <form id="adoptions-form" (ngSubmit)="onSubmit()" #form="ngForm">
   <fieldset>
 
-
-    <!-- id input -->
     <div class="form-group mb-3" [class.was-validated]="id.invalid && (id.dirty || id.touched)">
       <label class="control-label" for="id">Id</label>
       <input id="id" name="id" type="number" class="form-control"  [(ngModel)]="adoptions.id"
              #id="ngModel">
     </div>
 
-    <!-- starttime input -->
+    <div class="form-group mb-3">
+      <label class="control-label" for="pet">Pet</label>
+      <input id="pet" name="pet" type="text" class="form-control" [(ngModel)]="adoptions.pet"
+             #time="ngModel">
+    </div>
+
     <div class="form-group mb-3">
       <label class="control-label" for="time">Time</label>
       <input id="time" name="time" type="Date" class="form-control" [(ngModel)]="adoptions.localDateTime"
              #time="ngModel">
     </div>
 
-    <!-- Buttons -->
     <div class=" form-group fa-pull-right">
       <button id="listBtn" type="button" [routerLink]="['/adoptions']"
               class="btn btn-outline-primary pull-right">Back
diff --git a/src/app/adoptions/adoptions-delete/adoptions-delete.component.ts b/src/app/adoptions/adoptions-delete/adoptions-delete.component.ts
index 0666226..db34f99 100644
--- a/src/app/adoptions/adoptions-delete/adoptions-delete.component.ts
+++ b/src/app/adoptions/adoptions-delete/adoptions-delete.component.ts
@@ -5,7 +5,7 @@ import { AdoptionsService } from '../adoptions.service';
 
 @Component({
   selector: 'app-adoptions-delete',
-  templateUrl: './adoptions.add.component.html'
+  templateUrl: './adoptions.delete.component.html'
 })
 export class AdoptionsDeleteComponent implements OnInit {
   public adoptions: Adoptions = new Adoptions();
diff --git a/src/app/adoptions/adoptions-delete/adoptions.add.component.html b/src/app/adoptions/adoptions-delete/adoptions.add.component.html
deleted file mode 100644
index e69de29..0000000
diff --git a/src/app/adoptions/adoptions-delete/adoptions.delete.component.html b/src/app/adoptions/adoptions-delete/adoptions.delete.component.html
new file mode 100644
index 0000000..5da8c1c
--- /dev/null
+++ b/src/app/adoptions/adoptions-delete/adoptions.delete.component.html
@@ -0,0 +1 @@
+<p>adoptions-delete works!</p>
diff --git a/src/app/adoptions/adoptions-detail/adoptions-detail.component.html b/src/app/adoptions/adoptions-detail/adoptions-detail.component.html
index e69de29..a3ac23c 100644
--- a/src/app/adoptions/adoptions-detail/adoptions-detail.component.html
+++ b/src/app/adoptions/adoptions-detail/adoptions-detail.component.html
@@ -0,0 +1 @@
+<p>adoptions-detail works!</p>
diff --git a/src/app/adoptions/adoptions-edit/adoptions-edit.component.html b/src/app/adoptions/adoptions-edit/adoptions-edit.component.html
index e69de29..8c0a19d 100644
--- a/src/app/adoptions/adoptions-edit/adoptions-edit.component.html
+++ b/src/app/adoptions/adoptions-edit/adoptions-edit.component.html
@@ -0,0 +1 @@
+<p>adoptions-edit works!</p>

From 364539e32da5d80de852f7d823386f2dd6410ee8 Mon Sep 17 00:00:00 2001
From: gerardmallol <gerardmallol01@gmail.com>
Date: Wed, 15 May 2024 18:37:46 +0200
Subject: [PATCH 09/13] adoptions

---
 .../adoptions-list.component.html             | 21 ++++++++++++-------
 .../adoptions-list.component.ts               |  1 -
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/app/adoptions/adoptions-list/adoptions-list.component.html b/src/app/adoptions/adoptions-list/adoptions-list.component.html
index 65f282b..61e44e6 100644
--- a/src/app/adoptions/adoptions-list/adoptions-list.component.html
+++ b/src/app/adoptions/adoptions-list/adoptions-list.component.html
@@ -1,11 +1,17 @@
-<app-adoptions-list (emitResults)="detail($event)"></app-adoptions-list>
-
 <div class="card mb-1" *ngFor="let adoptions of adoptions">
   <div class="card-block row m-1 col-12">
     <div class="card-body row align-items-center">
       <div class="col-6 mt-1">
-        <h6 class="card-subtitle text-muted">Id</h6>
-        <a class="card-text" [routerLink]="['/schedules', adoptions.id]">{{adoptions.id}}</a>
+        <h6 class="card-subtitle text-muted">Adoptions ID</h6>
+        <a class="card-text" [routerLink]="['/adoptions', adoptions.id]">{{adoptions.id}}</a>
+      </div>
+      <div class="col-6 mt-1">
+        <h6 class="card-subtitle text-muted">Pet</h6>
+        <p class="card-text">{{adoptions.pet}}</p>
+      </div>
+      <div class="col-6 mt-1">
+        <h6 class="card-subtitle text-muted">User</h6>
+        <p class="card-text">{{adoptions.user}}</p>
       </div>
       <div class="col-6 mt-1">
         <h6 class="card-subtitle text-muted">Time</h6>
@@ -13,9 +19,8 @@ <h6 class="card-subtitle text-muted">Time</h6>
       </div>
     </div>
   </div>
-</div>
 
-<ngb-pagination class="d-flex justify-content-center"
-                [(page)]="page" [pageSize]="pageSize" [collectionSize]="totalAdoptions"
-                (pageChange)="changePage()"></ngb-pagination>
 
+  <ngb-pagination class="d-flex justify-content-center"
+                  [(page)]="page" [pageSize]="pageSize" [collectionSize]="totalAdoptions"
+                  (pageChange)="changePage()"></ngb-pagination>
diff --git a/src/app/adoptions/adoptions-list/adoptions-list.component.ts b/src/app/adoptions/adoptions-list/adoptions-list.component.ts
index aab25c6..322de1b 100644
--- a/src/app/adoptions/adoptions-list/adoptions-list.component.ts
+++ b/src/app/adoptions/adoptions-list/adoptions-list.component.ts
@@ -13,7 +13,6 @@ export class AdoptionsListComponent implements OnInit{
   public pageSize = 5;
   public page = 1;
   public totalAdoptions = 0;
-  @Output() emitResults = new EventEmitter<Adoptions>();
 
   constructor(
     public router: Router,

From 0c8cb5d2a7ff9b5ee849f5c86fa22b3c3a69a4a0 Mon Sep 17 00:00:00 2001
From: LordDangerous <mamrayo10@gmail.com>
Date: Wed, 15 May 2024 18:57:57 +0200
Subject: [PATCH 10/13] Fix adoptions

---
 src/app/adoptions/adoptions-add/adoptions-add.component.ts | 5 -----
 src/app/adoptions/adoptions.ts                             | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/app/adoptions/adoptions-add/adoptions-add.component.ts b/src/app/adoptions/adoptions-add/adoptions-add.component.ts
index db5f4fa..6fb6e09 100644
--- a/src/app/adoptions/adoptions-add/adoptions-add.component.ts
+++ b/src/app/adoptions/adoptions-add/adoptions-add.component.ts
@@ -3,9 +3,6 @@ import { Adoptions } from '../adoptions';
 import { Router } from '@angular/router';
 import { AdoptionsService } from '../adoptions.service';
 import { AuthenticationBasicService } from 'src/app/login-basic/authentication-basic.service';
-import { User } from 'src/app/login-basic/user';
-import { UserService } from 'src/app/user/user.service';
-import {FormControl, FormGroup} from "@angular/forms";
 
 @Component({
   selector: 'app-adoptions-add',
@@ -13,12 +10,10 @@ import {FormControl, FormGroup} from "@angular/forms";
 })
 export class AdoptionsAddComponent implements OnInit{
   public adoptions: Adoptions;
-  public user: User;
   public date: Date;
 
   constructor(private router: Router,
               private adoptionsService: AdoptionsService,
-              private userService: UserService,
               private authenticationService: AuthenticationBasicService){
   }
   ngOnInit(): void {
diff --git a/src/app/adoptions/adoptions.ts b/src/app/adoptions/adoptions.ts
index 2b7461d..8e57f90 100644
--- a/src/app/adoptions/adoptions.ts
+++ b/src/app/adoptions/adoptions.ts
@@ -1,7 +1,7 @@
 import { HateoasResource, Resource } from '@lagoshny/ngx-hateoas-client';
 import {User} from "../login-basic/user";
 
-@HateoasResource('users')
+@HateoasResource('adoptions')
 export class Adoptions extends Resource {
   localDateTime: Date;
   id: string;

From 58c9fc101e07bf3c3055a7f2879f066706f2e6b2 Mon Sep 17 00:00:00 2001
From: gerardmallol <gerardmallol01@gmail.com>
Date: Thu, 16 May 2024 16:34:58 +0200
Subject: [PATCH 11/13] solve name error

---
 .../adoption-create.component.html}           |  6 +--
 .../adoption-create.component.ts              | 26 +++++++++++++
 .../adoption-delete.component.ts              | 31 +++++++++++++++
 .../adoption.delete.component.html            |  1 +
 .../adoption-detail.component.html}           |  0
 .../adoption-detail.component.ts              | 25 ++++++++++++
 .../adoption-edit.component.html}             |  0
 .../adoption-edit.component.ts}               | 16 ++++----
 .../adoption-list.component.html}             | 12 +++---
 .../adoption-list/adoption-list.component.ts  | 39 +++++++++++++++++++
 .../adoption-search.component.html            |  1 +
 .../adoption-search.component.ts}             | 22 +++++------
 ...options.service.ts => adoption.service.ts} |  8 ++--
 .../adoptions/{adoptions.ts => adoption.ts}   |  2 +-
 .../adoptions-add/adoptions-add.component.ts  | 28 -------------
 .../adoptions-delete.component.ts             | 31 ---------------
 .../adoptions.delete.component.html           |  1 -
 .../adoptions-detail.component.ts             | 25 ------------
 .../adoptions-list.component.ts               | 39 -------------------
 .../adoptions-search.component.html           |  1 -
 src/app/app-routing.module.ts                 | 24 ++++++------
 src/app/app.module.ts                         | 24 ++++++------
 22 files changed, 180 insertions(+), 182 deletions(-)
 rename src/app/adoptions/{adoptions-add/adoptions-add.component.html => adoption-create/adoption-create.component.html} (91%)
 create mode 100644 src/app/adoptions/adoption-create/adoption-create.component.ts
 create mode 100644 src/app/adoptions/adoption-delete/adoption-delete.component.ts
 create mode 100644 src/app/adoptions/adoption-delete/adoption.delete.component.html
 rename src/app/adoptions/{adoptions-detail/adoptions-detail.component.html => adoption-detail/adoption-detail.component.html} (100%)
 create mode 100644 src/app/adoptions/adoption-detail/adoption-detail.component.ts
 rename src/app/adoptions/{adoptions-edit/adoptions-edit.component.html => adoption-edit/adoption-edit.component.html} (100%)
 rename src/app/adoptions/{adoptions-edit/adoptions-edit.component.ts => adoption-edit/adoption-edit.component.ts} (61%)
 rename src/app/adoptions/{adoptions-list/adoptions-list.component.html => adoption-list/adoption-list.component.html} (73%)
 create mode 100644 src/app/adoptions/adoption-list/adoption-list.component.ts
 create mode 100644 src/app/adoptions/adoption-search/adoption-search.component.html
 rename src/app/adoptions/{adoptions-search/adoptions-search.component.ts => adoption-search/adoption-search.component.ts} (55%)
 rename src/app/adoptions/{adoptions.service.ts => adoption.service.ts} (72%)
 rename src/app/adoptions/{adoptions.ts => adoption.ts} (88%)
 delete mode 100644 src/app/adoptions/adoptions-add/adoptions-add.component.ts
 delete mode 100644 src/app/adoptions/adoptions-delete/adoptions-delete.component.ts
 delete mode 100644 src/app/adoptions/adoptions-delete/adoptions.delete.component.html
 delete mode 100644 src/app/adoptions/adoptions-detail/adoptions-detail.component.ts
 delete mode 100644 src/app/adoptions/adoptions-list/adoptions-list.component.ts
 delete mode 100644 src/app/adoptions/adoptions-search/adoptions-search.component.html

diff --git a/src/app/adoptions/adoptions-add/adoptions-add.component.html b/src/app/adoptions/adoption-create/adoption-create.component.html
similarity index 91%
rename from src/app/adoptions/adoptions-add/adoptions-add.component.html
rename to src/app/adoptions/adoption-create/adoption-create.component.html
index fceffa4..3d33be6 100644
--- a/src/app/adoptions/adoptions-add/adoptions-add.component.html
+++ b/src/app/adoptions/adoption-create/adoption-create.component.html
@@ -3,19 +3,19 @@
 
     <div class="form-group mb-3" [class.was-validated]="id.invalid && (id.dirty || id.touched)">
       <label class="control-label" for="id">Id</label>
-      <input id="id" name="id" type="number" class="form-control"  [(ngModel)]="adoptions.id"
+      <input id="id" name="id" type="number" class="form-control"  [(ngModel)]="adoption.id"
              #id="ngModel">
     </div>
 
     <div class="form-group mb-3">
       <label class="control-label" for="pet">Pet</label>
-      <input id="pet" name="pet" type="text" class="form-control" [(ngModel)]="adoptions.pet"
+      <input id="pet" name="pet" type="text" class="form-control" [(ngModel)]="adoption.pet"
              #time="ngModel">
     </div>
 
     <div class="form-group mb-3">
       <label class="control-label" for="time">Time</label>
-      <input id="time" name="time" type="Date" class="form-control" [(ngModel)]="adoptions.localDateTime"
+      <input id="time" name="time" type="Date" class="form-control" [(ngModel)]="adoption.localDateTime"
              #time="ngModel">
     </div>
 
diff --git a/src/app/adoptions/adoption-create/adoption-create.component.ts b/src/app/adoptions/adoption-create/adoption-create.component.ts
new file mode 100644
index 0000000..eddcff7
--- /dev/null
+++ b/src/app/adoptions/adoption-create/adoption-create.component.ts
@@ -0,0 +1,26 @@
+import { Component, OnInit } from '@angular/core';
+import { Adoption } from '../adoption';
+import { Router } from '@angular/router';
+import { AdoptionService } from '../adoption.service';
+
+@Component({
+  selector: 'app-adoption-add',
+  templateUrl: './adoption-create.component.html',
+})
+export class AdoptionCreateComponent implements OnInit{
+  public adoption: Adoption;
+  public date: Date;
+
+  constructor(private router: Router,
+              private adoptionService: AdoptionService) {
+  }
+  ngOnInit(): void {
+    this.adoption = new Adoption();
+  }
+
+  onSubmit(): void {
+    this.adoptionService.createResource({body: this.adoption}).subscribe(
+      (adoption:Adoption) => this.router.navigate([adoption.uri])
+    );
+  }
+}
diff --git a/src/app/adoptions/adoption-delete/adoption-delete.component.ts b/src/app/adoptions/adoption-delete/adoption-delete.component.ts
new file mode 100644
index 0000000..27f43e8
--- /dev/null
+++ b/src/app/adoptions/adoption-delete/adoption-delete.component.ts
@@ -0,0 +1,31 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { Adoption } from '../adoption';
+import { AdoptionService } from '../adoption.service';
+
+@Component({
+  selector: 'app-adoption-delete',
+  templateUrl: './adoption.delete.component.html'
+})
+export class AdoptionDeleteComponent implements OnInit {
+  public adoption: Adoption = new Adoption();
+  public adoptionId: string;
+
+  constructor(private route: ActivatedRoute,
+              private router: Router,
+              private adoptionService: AdoptionService) {
+  }
+
+  ngOnInit(): void {
+    this.adoptionId = this.route.snapshot.paramMap.get('id');
+    this.adoptionService.getResource(this.adoptionId).subscribe(
+      adoption => this.adoption = adoption);
+  }
+
+  delete(): void {
+    this.adoptionService.deleteResource(this.adoption).subscribe(
+      () => {
+        this.router.navigate(['id']);
+      });
+  }
+}
diff --git a/src/app/adoptions/adoption-delete/adoption.delete.component.html b/src/app/adoptions/adoption-delete/adoption.delete.component.html
new file mode 100644
index 0000000..97d4922
--- /dev/null
+++ b/src/app/adoptions/adoption-delete/adoption.delete.component.html
@@ -0,0 +1 @@
+<p>adoption-delete works!</p>
diff --git a/src/app/adoptions/adoptions-detail/adoptions-detail.component.html b/src/app/adoptions/adoption-detail/adoption-detail.component.html
similarity index 100%
rename from src/app/adoptions/adoptions-detail/adoptions-detail.component.html
rename to src/app/adoptions/adoption-detail/adoption-detail.component.html
diff --git a/src/app/adoptions/adoption-detail/adoption-detail.component.ts b/src/app/adoptions/adoption-detail/adoption-detail.component.ts
new file mode 100644
index 0000000..657dbf4
--- /dev/null
+++ b/src/app/adoptions/adoption-detail/adoption-detail.component.ts
@@ -0,0 +1,25 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { AdoptionService } from '../adoption.service';
+import { Adoption } from '../adoption';
+
+@Component({
+  selector: 'app-adoption-detail',
+  templateUrl: './adoption-detail.component.html'
+})
+export class AdoptionDetailComponent implements OnInit {
+  public adoption: Adoption = new Adoption();
+  public adoptionId: string;
+
+  constructor(private route: ActivatedRoute,
+              private adoptionService: AdoptionService) {
+  }
+
+  ngOnInit(): void {
+    this.adoptionId = this.route.snapshot.paramMap.get('id');
+    this.adoptionService.getResource(this.adoptionId).subscribe(
+      adoption => {
+        this.adoption = adoption;
+      });
+  }
+}
diff --git a/src/app/adoptions/adoptions-edit/adoptions-edit.component.html b/src/app/adoptions/adoption-edit/adoption-edit.component.html
similarity index 100%
rename from src/app/adoptions/adoptions-edit/adoptions-edit.component.html
rename to src/app/adoptions/adoption-edit/adoption-edit.component.html
diff --git a/src/app/adoptions/adoptions-edit/adoptions-edit.component.ts b/src/app/adoptions/adoption-edit/adoption-edit.component.ts
similarity index 61%
rename from src/app/adoptions/adoptions-edit/adoptions-edit.component.ts
rename to src/app/adoptions/adoption-edit/adoption-edit.component.ts
index 2835f6d..c38c2f8 100644
--- a/src/app/adoptions/adoptions-edit/adoptions-edit.component.ts
+++ b/src/app/adoptions/adoption-edit/adoption-edit.component.ts
@@ -2,26 +2,26 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Router } from '@angular/router';
 import { AuthenticationBasicService } from '../../login-basic/authentication-basic.service';
-import { AdoptionsService } from '../adoptions.service';
-import { Adoptions } from '../adoptions';
+import { AdoptionService } from '../adoption.service';
+import { Adoption } from '../adoption';
 
 @Component({
-  selector: 'app-adoptions-edit',
-  templateUrl: './adoptions-edit.component.html',
+  selector: 'app-adoption-edit',
+  templateUrl: './adoption-edit.component.html',
 })
-export class AdoptionsEditComponent implements OnInit {
-  public adoptions: Adoptions = new Adoptions();
+export class AdoptionEditComponent implements OnInit {
+  public adoption: Adoption = new Adoption();
 
   constructor(private route: ActivatedRoute,
               private router: Router,
-              private adoptionsService: AdoptionsService,
+              private adoptionsService: AdoptionService,
               private authenticationService: AuthenticationBasicService) {
   }
 
   ngOnInit(): void {
     const id = this.route.snapshot.paramMap.get('id');
     this.adoptionsService.getResource(id).subscribe(
-      (adoptions: Adoptions) => this.adoptions = adoptions );
+      (adoption: Adoption) => this.adoption = adoption );
   }
 
   getCurrentUserName(): string {
diff --git a/src/app/adoptions/adoptions-list/adoptions-list.component.html b/src/app/adoptions/adoption-list/adoption-list.component.html
similarity index 73%
rename from src/app/adoptions/adoptions-list/adoptions-list.component.html
rename to src/app/adoptions/adoption-list/adoption-list.component.html
index 61e44e6..c94c4f8 100644
--- a/src/app/adoptions/adoptions-list/adoptions-list.component.html
+++ b/src/app/adoptions/adoption-list/adoption-list.component.html
@@ -1,26 +1,26 @@
-<div class="card mb-1" *ngFor="let adoptions of adoptions">
+<div class="card mb-1" *ngFor="let adoption of adoption">
   <div class="card-block row m-1 col-12">
     <div class="card-body row align-items-center">
       <div class="col-6 mt-1">
         <h6 class="card-subtitle text-muted">Adoptions ID</h6>
-        <a class="card-text" [routerLink]="['/adoptions', adoptions.id]">{{adoptions.id}}</a>
+        <a class="card-text" [routerLink]="['/adoptions', adoption.id]">{{adoption.id}}</a>
       </div>
       <div class="col-6 mt-1">
         <h6 class="card-subtitle text-muted">Pet</h6>
-        <p class="card-text">{{adoptions.pet}}</p>
+        <p class="card-text">{{adoption.pet}}</p>
       </div>
       <div class="col-6 mt-1">
         <h6 class="card-subtitle text-muted">User</h6>
-        <p class="card-text">{{adoptions.user}}</p>
+        <p class="card-text">{{adoption.user}}</p>
       </div>
       <div class="col-6 mt-1">
         <h6 class="card-subtitle text-muted">Time</h6>
-        <p class="card-text">{{adoptions.localDateTime}}</p>
+        <p class="card-text">{{adoption.localDateTime}}</p>
       </div>
     </div>
   </div>
 
 
   <ngb-pagination class="d-flex justify-content-center"
-                  [(page)]="page" [pageSize]="pageSize" [collectionSize]="totalAdoptions"
+                  [(page)]="page" [pageSize]="pageSize" [collectionSize]="totalAdoption"
                   (pageChange)="changePage()"></ngb-pagination>
diff --git a/src/app/adoptions/adoption-list/adoption-list.component.ts b/src/app/adoptions/adoption-list/adoption-list.component.ts
new file mode 100644
index 0000000..0e850d9
--- /dev/null
+++ b/src/app/adoptions/adoption-list/adoption-list.component.ts
@@ -0,0 +1,39 @@
+import {Component, EventEmitter, OnInit, Output} from '@angular/core';
+import { Router } from '@angular/router';
+import { Adoption } from '../adoption';
+import { AdoptionService } from '../adoption.service';
+import { PagedResourceCollection } from '@lagoshny/ngx-hateoas-client';
+
+@Component({
+  selector: 'app-adoption-list',
+  templateUrl: './adoption-list.component.html'
+})
+export class AdoptionListComponent implements OnInit{
+  public adoption: Adoption[] = [];
+  public pageSize = 5;
+  public page = 1;
+  public totalAdoption = 0;
+
+  constructor(
+    public router: Router,
+    private adoptionService: AdoptionService) {
+  }
+
+  ngOnInit(): void {
+    this.adoptionService.getPage({ pageParams:  { size: this.pageSize }, sort: { id: 'ASC' } }).subscribe(
+      (page: PagedResourceCollection<Adoption>) => {
+        this.adoption = page.resources;
+        this.totalAdoption = page.totalElements;
+      });
+  }
+
+  changePage(): void {
+    this.adoptionService.getPage({ pageParams: { page: this.page - 1, size: this.pageSize }, sort: { id: 'ASC' } }).subscribe(
+      (page: PagedResourceCollection<Adoption>) => this.adoption = page.resources);
+  }
+
+  detail(adoption: Adoption): void {
+    this.router.navigate(['adoption', adoption.id]);
+  }
+
+}
diff --git a/src/app/adoptions/adoption-search/adoption-search.component.html b/src/app/adoptions/adoption-search/adoption-search.component.html
new file mode 100644
index 0000000..a0246f2
--- /dev/null
+++ b/src/app/adoptions/adoption-search/adoption-search.component.html
@@ -0,0 +1 @@
+<p>adoption-search works!</p>
diff --git a/src/app/adoptions/adoptions-search/adoptions-search.component.ts b/src/app/adoptions/adoption-search/adoption-search.component.ts
similarity index 55%
rename from src/app/adoptions/adoptions-search/adoptions-search.component.ts
rename to src/app/adoptions/adoption-search/adoption-search.component.ts
index 696e582..70364d4 100644
--- a/src/app/adoptions/adoptions-search/adoptions-search.component.ts
+++ b/src/app/adoptions/adoption-search/adoption-search.component.ts
@@ -1,31 +1,31 @@
 import { Component, EventEmitter, Output } from '@angular/core';
-import { AdoptionsService } from '../adoptions.service';
-import { Adoptions } from '../adoptions';
+import { AdoptionService } from '../adoption.service';
+import { Adoption } from '../adoption';
 import { Observable, of, OperatorFunction } from 'rxjs';
 import { catchError, debounceTime, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators';
 import { ResourceCollection } from '@lagoshny/ngx-hateoas-client';
 
 @Component({
-  selector: 'app-adoptions-search',
-  templateUrl: './adoptions-search.component.html'
+  selector: 'app-adoption-search',
+  templateUrl: './adoption-search.component.html'
 })
 
-export class AdoptionsSearchComponent {
-  @Output() emitResults: EventEmitter<Adoptions> = new EventEmitter();
+export class AdoptionSearchComponent {
+  @Output() emitResults: EventEmitter<Adoption> = new EventEmitter();
   searchFailed = false;
   searching = false;
 
-  constructor(private AdoptionsService: AdoptionsService) {
+  constructor(private AdoptionService: AdoptionService) {
   }
 
-  autocomplete: OperatorFunction<string, readonly Adoptions[]> = (text$: Observable<string>) =>
+  autocomplete: OperatorFunction<string, readonly Adoption[]> = (text$: Observable<string>) =>
     text$.pipe(
       debounceTime(500),
       distinctUntilChanged(),
       tap(() => this.searching = true),
       switchMap(term => term.length < 3 ? of([]) :
-        this.AdoptionsService.findById(term).pipe(
-          map((collection: ResourceCollection<Adoptions>) => collection.resources),
+        this.AdoptionService.findById(term).pipe(
+          map((collection: ResourceCollection<Adoption>) => collection.resources),
           tap(() => this.searchFailed = false),
           catchError(() => {
             this.searchFailed = true;
@@ -37,6 +37,6 @@ export class AdoptionsSearchComponent {
     )
 
   select(item: any): void {
-    this.emitResults.emit(item as Adoptions);
+    this.emitResults.emit(item as Adoption);
   }
 }
diff --git a/src/app/adoptions/adoptions.service.ts b/src/app/adoptions/adoption.service.ts
similarity index 72%
rename from src/app/adoptions/adoptions.service.ts
rename to src/app/adoptions/adoption.service.ts
index e3fc5c9..d46414c 100644
--- a/src/app/adoptions/adoptions.service.ts
+++ b/src/app/adoptions/adoption.service.ts
@@ -1,16 +1,16 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs/internal/Observable';
 import { HateoasResourceOperation, ResourceCollection } from '@lagoshny/ngx-hateoas-client';
-import { Adoptions } from "./adoptions"
+import { Adoption } from "./adoption"
 
 @Injectable({providedIn: 'root'})
-export class AdoptionsService extends HateoasResourceOperation<Adoptions> {
+export class AdoptionService extends HateoasResourceOperation<Adoption> {
 
   constructor() {
-    super(Adoptions);
+    super(Adoption);
   }
 
-  public findById(query: string): Observable<ResourceCollection<Adoptions>> {
+  public findById(query: string): Observable<ResourceCollection<Adoption>> {
     return this.searchCollection('findById', { params: { text: query } });
   }
 }
diff --git a/src/app/adoptions/adoptions.ts b/src/app/adoptions/adoption.ts
similarity index 88%
rename from src/app/adoptions/adoptions.ts
rename to src/app/adoptions/adoption.ts
index 8e57f90..ce2cf8c 100644
--- a/src/app/adoptions/adoptions.ts
+++ b/src/app/adoptions/adoption.ts
@@ -2,7 +2,7 @@ import { HateoasResource, Resource } from '@lagoshny/ngx-hateoas-client';
 import {User} from "../login-basic/user";
 
 @HateoasResource('adoptions')
-export class Adoptions extends Resource {
+export class Adoption extends Resource {
   localDateTime: Date;
   id: string;
   pet: string;
diff --git a/src/app/adoptions/adoptions-add/adoptions-add.component.ts b/src/app/adoptions/adoptions-add/adoptions-add.component.ts
deleted file mode 100644
index 6fb6e09..0000000
--- a/src/app/adoptions/adoptions-add/adoptions-add.component.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { Adoptions } from '../adoptions';
-import { Router } from '@angular/router';
-import { AdoptionsService } from '../adoptions.service';
-import { AuthenticationBasicService } from 'src/app/login-basic/authentication-basic.service';
-
-@Component({
-  selector: 'app-adoptions-add',
-  templateUrl: './adoptions-add.component.html',
-})
-export class AdoptionsAddComponent implements OnInit{
-  public adoptions: Adoptions;
-  public date: Date;
-
-  constructor(private router: Router,
-              private adoptionsService: AdoptionsService,
-              private authenticationService: AuthenticationBasicService){
-  }
-  ngOnInit(): void {
-    this.adoptions = new Adoptions();
-  }
-
-  onSubmit(): void {
-    this.adoptionsService.createResource({body: this.adoptions}).subscribe(
-      (adoptions:Adoptions) => this.router.navigate([adoptions.uri])
-    );
-  }
-}
diff --git a/src/app/adoptions/adoptions-delete/adoptions-delete.component.ts b/src/app/adoptions/adoptions-delete/adoptions-delete.component.ts
deleted file mode 100644
index db34f99..0000000
--- a/src/app/adoptions/adoptions-delete/adoptions-delete.component.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Adoptions } from '../adoptions';
-import { AdoptionsService } from '../adoptions.service';
-
-@Component({
-  selector: 'app-adoptions-delete',
-  templateUrl: './adoptions.delete.component.html'
-})
-export class AdoptionsDeleteComponent implements OnInit {
-  public adoptions: Adoptions = new Adoptions();
-  public adoptionsId: string;
-
-  constructor(private route: ActivatedRoute,
-              private router: Router,
-              private adoptionsService: AdoptionsService) {
-  }
-
-  ngOnInit(): void {
-    this.adoptionsId = this.route.snapshot.paramMap.get('id');
-    this.adoptionsService.getResource(this.adoptionsId).subscribe(
-      adoptions => this.adoptions = adoptions);
-  }
-
-  delete(): void {
-    this.adoptionsService.deleteResource(this.adoptions).subscribe(
-      () => {
-        this.router.navigate(['id']);
-      });
-  }
-}
diff --git a/src/app/adoptions/adoptions-delete/adoptions.delete.component.html b/src/app/adoptions/adoptions-delete/adoptions.delete.component.html
deleted file mode 100644
index 5da8c1c..0000000
--- a/src/app/adoptions/adoptions-delete/adoptions.delete.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>adoptions-delete works!</p>
diff --git a/src/app/adoptions/adoptions-detail/adoptions-detail.component.ts b/src/app/adoptions/adoptions-detail/adoptions-detail.component.ts
deleted file mode 100644
index fb5ba00..0000000
--- a/src/app/adoptions/adoptions-detail/adoptions-detail.component.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { AdoptionsService } from '../adoptions.service';
-import { Adoptions } from '../adoptions';
-
-@Component({
-  selector: 'app-adoptions-detail',
-  templateUrl: './adoptions-detail.component.html'
-})
-export class AdoptionsDetailComponent implements OnInit {
-  public adoptions: Adoptions = new Adoptions();
-  public adoptionsId: string;
-
-  constructor(private route: ActivatedRoute,
-              private adoptionsService: AdoptionsService) {
-  }
-
-  ngOnInit(): void {
-    this.adoptionsId = this.route.snapshot.paramMap.get('id');
-    this.adoptionsService.getResource(this.adoptionsId).subscribe(
-      adoptions => {
-        this.adoptions = adoptions;
-      });
-  }
-}
diff --git a/src/app/adoptions/adoptions-list/adoptions-list.component.ts b/src/app/adoptions/adoptions-list/adoptions-list.component.ts
deleted file mode 100644
index 322de1b..0000000
--- a/src/app/adoptions/adoptions-list/adoptions-list.component.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import {Component, EventEmitter, OnInit, Output} from '@angular/core';
-import { Router } from '@angular/router';
-import { Adoptions } from '../adoptions';
-import { AdoptionsService } from '../adoptions.service';
-import { PagedResourceCollection } from '@lagoshny/ngx-hateoas-client';
-
-@Component({
-  selector: 'app-adoptions-list',
-  templateUrl: './adoptions-list.component.html'
-})
-export class AdoptionsListComponent implements OnInit{
-  public adoptions: Adoptions[] = [];
-  public pageSize = 5;
-  public page = 1;
-  public totalAdoptions = 0;
-
-  constructor(
-    public router: Router,
-    private adoptionsService: AdoptionsService) {
-  }
-
-  ngOnInit(): void {
-    this.adoptionsService.getPage({ pageParams:  { size: this.pageSize }, sort: { id: 'ASC' } }).subscribe(
-      (page: PagedResourceCollection<Adoptions>) => {
-        this.adoptions = page.resources;
-        this.totalAdoptions = page.totalElements;
-      });
-  }
-
-  changePage(): void {
-    this.adoptionsService.getPage({ pageParams: { page: this.page - 1, size: this.pageSize }, sort: { id: 'ASC' } }).subscribe(
-      (page: PagedResourceCollection<Adoptions>) => this.adoptions = page.resources);
-  }
-
-  detail(adoptions: Adoptions): void {
-    this.router.navigate(['adoptions', adoptions.id]);
-  }
-
-}
diff --git a/src/app/adoptions/adoptions-search/adoptions-search.component.html b/src/app/adoptions/adoptions-search/adoptions-search.component.html
deleted file mode 100644
index 27b3e56..0000000
--- a/src/app/adoptions/adoptions-search/adoptions-search.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>adoptions-search works!</p>
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index fbbd488..3d95fba 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -8,12 +8,12 @@ import { UserDetailComponent } from './user/user-detail/user-detail.component';
 import { UserRegisterComponent } from './user/user-register/user-register.component';
 import { UserEditComponent } from './user/user-edit/user-edit.component';
 import { UserDeleteComponent } from './user/user-delete/user-delete.component';
-import {AdoptionsSearchComponent} from './adoptions/adoptions-search/adoptions-search.component';
-import {AdoptionsListComponent} from './adoptions/adoptions-list/adoptions-list.component';
-import {AdoptionsEditComponent} from './adoptions/adoptions-edit/adoptions-edit.component';
-import {AdoptionsDetailComponent} from './adoptions/adoptions-detail/adoptions-detail.component';
-import {AdoptionsDeleteComponent} from './adoptions/adoptions-delete/adoptions-delete.component';
-import {AdoptionsAddComponent} from "./adoptions/adoptions-add/adoptions-add.component";
+import {AdoptionSearchComponent} from './adoptions/adoption-search/adoption-search.component';
+import {AdoptionListComponent} from './adoptions/adoption-list/adoption-list.component';
+import {AdoptionEditComponent} from './adoptions/adoption-edit/adoption-edit.component';
+import {AdoptionDetailComponent} from './adoptions/adoption-detail/adoption-detail.component';
+import {AdoptionDeleteComponent} from './adoptions/adoption-delete/adoption-delete.component';
+import {AdoptionCreateComponent} from "./adoptions/adoption-create/adoption-create.component";
 
 
 const routes: Routes = [
@@ -25,12 +25,12 @@ const routes: Routes = [
   { path: 'about', component: AboutComponent},
   { path: '404', component: NotFoundComponent},
   { path: '', redirectTo: 'about', pathMatch: 'full'},
-  { path: 'adoptions/list' , component: AdoptionsListComponent },
-  { path: 'adoptions/create', component: AdoptionsAddComponent },
-  { path: 'adoptions/edit', component: AdoptionsEditComponent },
-  { path: 'adoptions/delete', component: AdoptionsDeleteComponent },
-  { path: 'adoptions/detail', component: AdoptionsDetailComponent },
-  { path: 'adoptions/search', component: AdoptionsSearchComponent }
+  { path: 'adoptions' , component: AdoptionListComponent },
+  { path: 'adoptions/create', component: AdoptionCreateComponent },
+  { path: 'adoptions/edit', component: AdoptionEditComponent },
+  { path: 'adoptions/delete', component: AdoptionDeleteComponent },
+  { path: 'adoptions/detail', component: AdoptionDetailComponent },
+  { path: 'adoptions/search', component: AdoptionSearchComponent }
 ];
 
 @NgModule({
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index b33207d..d7f9057 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -23,12 +23,12 @@ import {HttpErrorInterceptor} from './error-handler/http-error-interceptor';
 import {AuthenticationBasicService} from './login-basic/authentication-basic.service';
 import {LoggedInGuard} from './login-basic/loggedin.guard';
 import {UserService} from './user/user.service';
-import {AdoptionsSearchComponent} from './adoptions/adoptions-search/adoptions-search.component';
-import {AdoptionsListComponent} from './adoptions/adoptions-list/adoptions-list.component';
-import {AdoptionsEditComponent} from './adoptions/adoptions-edit/adoptions-edit.component';
-import {AdoptionsDetailComponent} from './adoptions/adoptions-detail/adoptions-detail.component';
-import {AdoptionsDeleteComponent} from './adoptions/adoptions-delete/adoptions-delete.component';
-import {AdoptionsAddComponent} from "./adoptions/adoptions-add/adoptions-add.component";
+import {AdoptionSearchComponent} from './adoptions/adoption-search/adoption-search.component';
+import {AdoptionListComponent} from './adoptions/adoption-list/adoption-list.component';
+import {AdoptionEditComponent} from './adoptions/adoption-edit/adoption-edit.component';
+import {AdoptionDetailComponent} from './adoptions/adoption-detail/adoption-detail.component';
+import {AdoptionDeleteComponent} from './adoptions/adoption-delete/adoption-delete.component';
+import {AdoptionCreateComponent} from "./adoptions/adoption-create/adoption-create.component";
 
 @NgModule({
   declarations: [
@@ -42,12 +42,12 @@ import {AdoptionsAddComponent} from "./adoptions/adoptions-add/adoptions-add.com
     UserEditComponent,
     UserDeleteComponent,
     UserSearchComponent,
-    AdoptionsSearchComponent,
-    AdoptionsAddComponent,
-    AdoptionsDeleteComponent,
-    AdoptionsDetailComponent,
-    AdoptionsEditComponent,
-    AdoptionsListComponent
+    AdoptionSearchComponent,
+    AdoptionCreateComponent,
+    AdoptionDeleteComponent,
+    AdoptionDetailComponent,
+    AdoptionEditComponent,
+    AdoptionListComponent
   ],
   imports: [
     BrowserModule,

From bfc79b0e2fb1cc6fa08e3985e73861025e55320f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Gonz=C3=A1lez=20Liarte?= <diegogliarte@gmail.com>
Date: Sun, 19 May 2024 22:41:55 +0200
Subject: [PATCH 12/13] fix comma

---
 src/app/app-routing.module.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index e566ea9..99aa932 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -30,7 +30,7 @@ const routes: Routes = [
   { path: 'adoptions/edit', component: AdoptionEditComponent },
   { path: 'adoptions/delete', component: AdoptionDeleteComponent },
   { path: 'adoptions/detail', component: AdoptionDetailComponent },
-  { path: 'adoptions/search', component: AdoptionSearchComponent }
+  { path: 'adoptions/search', component: AdoptionSearchComponent },
   { path: 'shelters', component: ShelterListComponent},
 ];
 

From 2177e118a855dd31eaa861e2ea3431f409482fe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Gonz=C3=A1lez=20Liarte?= <diegogliarte@gmail.com>
Date: Sun, 19 May 2024 22:45:27 +0200
Subject: [PATCH 13/13] fix comma

---
 src/app/app.module.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 11f2d3b..bf37af6 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -52,7 +52,7 @@ import {ShelterDetailComponent} from "./shelter/shelter-detail/shelter-detail.co
     AdoptionDeleteComponent,
     AdoptionDetailComponent,
     AdoptionEditComponent,
-    AdoptionListComponent
+    AdoptionListComponent,
     ShelterListComponent,
     ShelterCreateComponent,
     ShelterDetailComponent