diff --git a/client/src/app/pages/home/home.component.spec.ts b/client/src/app/pages/home/home.component.spec.ts
deleted file mode 100644
index 1191557..0000000
--- a/client/src/app/pages/home/home.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { HomeComponent } from './home.component';
-
-describe('HomeComponent', () => {
- let component: HomeComponent;
- let fixture: ComponentFixture
;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [HomeComponent]
- })
- .compileComponents();
-
- fixture = TestBed.createComponent(HomeComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/client/src/app/pages/home/home.component.ts b/client/src/app/pages/home/home.component.ts
index 17b64bf..69c31a4 100644
--- a/client/src/app/pages/home/home.component.ts
+++ b/client/src/app/pages/home/home.component.ts
@@ -1,16 +1,14 @@
import {Component, inject} from '@angular/core';
import {MatButton} from '@angular/material/button';
import {AuthService} from '../../services/auth/auth.service';
-import {RouterLink} from '@angular/router';
-import {AddProductComponent} from '../add-product/add-product.component';
+import {Router, RouterLink} from '@angular/router';
@Component({
selector: 'app-home',
standalone: true,
imports: [
MatButton,
- RouterLink,
- AddProductComponent
+ RouterLink
],
templateUrl: './home.component.html',
styleUrl: './home.component.css'
@@ -18,6 +16,7 @@ import {AddProductComponent} from '../add-product/add-product.component';
export class HomeComponent {
protected readonly authService: AuthService = inject(AuthService);
+ protected readonly router: Router = inject(Router);
getUser() {
return this.authService.user();
diff --git a/client/src/app/pages/login/login.component.spec.ts b/client/src/app/pages/login/login.component.spec.ts
deleted file mode 100644
index 18f3685..0000000
--- a/client/src/app/pages/login/login.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { LoginComponent } from './login.component';
-
-describe('LoginComponent', () => {
- let component: LoginComponent;
- let fixture: ComponentFixture;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [LoginComponent]
- })
- .compileComponents();
-
- fixture = TestBed.createComponent(LoginComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/client/src/app/pages/login/login.component.ts b/client/src/app/pages/login/login.component.ts
index 847f8e2..664a266 100644
--- a/client/src/app/pages/login/login.component.ts
+++ b/client/src/app/pages/login/login.component.ts
@@ -50,12 +50,11 @@ export class LoginComponent implements OnDestroy {
this.loginSubscription = this.authService.login(
this.loginFormGroup.value as Credentials).subscribe({
next: (result: User | null | undefined) => {
+ console.log(result);
this.navigateHome();
- alert('Login successful!');
},
error: (error) => {
console.log(error);
- alert(error.message);
this.invalidCredentials = true;
}
});
diff --git a/client/src/app/pages/not-found/not-found.component.spec.ts b/client/src/app/pages/not-found/not-found.component.spec.ts
deleted file mode 100644
index 5b65d9e..0000000
--- a/client/src/app/pages/not-found/not-found.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { NotFoundComponent } from './not-found.component';
-
-describe('NotFoundComponent', () => {
- let component: NotFoundComponent;
- let fixture: ComponentFixture;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [NotFoundComponent]
- })
- .compileComponents();
-
- fixture = TestBed.createComponent(NotFoundComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/client/src/app/pages/products/products.component.html b/client/src/app/pages/products/products.component.html
index ff56460..9394c6a 100644
--- a/client/src/app/pages/products/products.component.html
+++ b/client/src/app/pages/products/products.component.html
@@ -1 +1,7 @@
-
+
+ @if (showList) {
+
+ }
+
+
+
diff --git a/client/src/app/pages/products/products.component.ts b/client/src/app/pages/products/products.component.ts
index d2cf933..b7ad3fb 100644
--- a/client/src/app/pages/products/products.component.ts
+++ b/client/src/app/pages/products/products.component.ts
@@ -1,17 +1,43 @@
import {
- Component,
+ Component, inject,
} from '@angular/core';
-import {ProductsListComponent} from '../../components/products-list/products-list.component';
+import {ProductListComponent} from '../../components/list/product-list/product-list.component';
+import {ActivatedRoute, NavigationEnd, Router, RouterOutlet} from '@angular/router';
+import {filter, Subscription} from 'rxjs';
@Component({
- selector: 'app-products',
+ selector: 'app-dialog',
templateUrl: './products.component.html',
standalone: true,
imports: [
- ProductsListComponent
+ ProductListComponent,
+ RouterOutlet
],
styleUrls: ['./products.component.css']
})
export class ProductsComponent {
+ showList = true;
+ private sub?: Subscription;
+ private readonly router: Router = inject(Router);
+ private readonly route: ActivatedRoute = inject(ActivatedRoute);
+
+ ngOnInit(): void {
+ this.updateShowList(this.route);
+ this.sub = this.router.events.pipe(
+ filter(evt => evt instanceof NavigationEnd)
+ ).subscribe(() => this.updateShowList(this.route));
+ }
+
+ private updateShowList(route: ActivatedRoute): void {
+ let current = route;
+ while (current.firstChild) {
+ current = current.firstChild;
+ }
+ this.showList = current === route;
+ }
+
+ ngOnDestroy(): void {
+ this.sub?.unsubscribe();
+ }
}
diff --git a/client/src/app/pages/profile/profile.component.html b/client/src/app/pages/profile/profile.component.html
index b496f2c..20f1df4 100644
--- a/client/src/app/pages/profile/profile.component.html
+++ b/client/src/app/pages/profile/profile.component.html
@@ -5,7 +5,11 @@
account_circle
diff --git a/client/src/app/pages/profile/profile.component.spec.ts b/client/src/app/pages/profile/profile.component.spec.ts
deleted file mode 100644
index 17789ee..0000000
--- a/client/src/app/pages/profile/profile.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ProfileComponent } from './profile.component';
-
-describe('ProfileComponent', () => {
- let component: ProfileComponent;
- let fixture: ComponentFixture;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- imports: [ProfileComponent]
- })
- .compileComponents();
-
- fixture = TestBed.createComponent(ProfileComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/client/src/app/services/app/condition.service.ts b/client/src/app/services/app/condition.service.ts
index f4eaa3b..9c269fd 100644
--- a/client/src/app/services/app/condition.service.ts
+++ b/client/src/app/services/app/condition.service.ts
@@ -1,31 +1,32 @@
import {inject, Injectable} from '@angular/core';
import {HttpClient} from '@angular/common/http';
+import {Observable} from 'rxjs';
import {Condition} from '../../interfaces/condition';
+import {CrudService} from '../crud.service';
@Injectable({
providedIn: 'root'
})
-export class ConditionService {
-
+export class ConditionService implements CrudService {
private readonly http = inject(HttpClient);
private readonly BASE_URL = 'http://localhost:3000/api/app/conditions';
- getConditions() {
+ getAll(): Observable {
return this.http.get(this.BASE_URL, {withCredentials: true});
}
- addCondition(condition: Condition) {
- console.log("Adding condition:", condition);
- return this.http.post(this.BASE_URL, condition, {withCredentials: true});
+ add(item: Condition): Observable {
+ console.log('Adding condition:', item);
+ return this.http.post(this.BASE_URL, item, {withCredentials: true});
}
- updateCondition(id: string, condition: Condition) {
- console.log("Updating condition:", id, condition);
- return this.http.put(`${this.BASE_URL}/${id}`, condition, {withCredentials: true});
+ update(id: string | number, item: Condition): Observable {
+ console.log('Updating condition:', id, item);
+ return this.http.put(`${this.BASE_URL}/${id}`, item, {withCredentials: true});
}
- deleteCondition(id: string) {
- console.log("Deleting condition:", id);
- return this.http.delete(`${this.BASE_URL}/${id}`, {withCredentials: true});
+ delete(id: string | number): Observable {
+ console.log('Deleting condition:', id);
+ return this.http.delete(`${this.BASE_URL}/${id}`, {withCredentials: true});
}
}
diff --git a/client/src/app/services/app/product.service.ts b/client/src/app/services/app/product.service.ts
index 56f64ea..afc48c2 100644
--- a/client/src/app/services/app/product.service.ts
+++ b/client/src/app/services/app/product.service.ts
@@ -1,31 +1,32 @@
import {inject, Injectable} from '@angular/core';
import {HttpClient} from '@angular/common/http';
+import {Observable} from 'rxjs';
import {Product} from '../../interfaces/product';
+import {CrudService} from '../crud.service';
@Injectable({
providedIn: 'root'
})
-export class ProductService {
-
+export class ProductService implements CrudService {
private readonly http = inject(HttpClient);
private readonly BASE_URL = 'http://localhost:3000/api/app/products';
- getProducts() {
+ getAll(): Observable {
return this.http.get(this.BASE_URL, {withCredentials: true});
}
- addProduct(product: Product) {
- console.log("Adding product:", product);
- return this.http.post(this.BASE_URL, product, {withCredentials: true});
+ add(item: Product): Observable {
+ console.log('Adding product:', item);
+ return this.http.post(this.BASE_URL, item, {withCredentials: true});
}
- updateProduct(id: string, product: Product) {
- console.log("Updating product:", id, product);
- return this.http.put(`${this.BASE_URL}/${id}`, product, {withCredentials: true});
+ update(id: string | number, item: Product): Observable {
+ console.log('Updating product:', id, item);
+ return this.http.put(`${this.BASE_URL}/${id}`, item, {withCredentials: true});
}
- deleteProduct(id: string) {
- console.log("Deleting product:", id);
- return this.http.delete(`${this.BASE_URL}/${id}`, {withCredentials: true});
+ delete(id: string | number): Observable {
+ console.log('Deleting product:', id);
+ return this.http.delete(`${this.BASE_URL}/${id}`, {withCredentials: true});
}
}
diff --git a/client/src/app/services/user/user.service.spec.ts b/client/src/app/services/user/user.service.spec.ts
deleted file mode 100644
index 3f804c9..0000000
--- a/client/src/app/services/user/user.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { UserService } from './user.service';
-
-describe('UserService', () => {
- let service: UserService;
-
- beforeEach(() => {
- TestBed.configureTestingModule({});
- service = TestBed.inject(UserService);
- });
-
- it('should be created', () => {
- expect(service).toBeTruthy();
- });
-});
diff --git a/client/src/app/services/user/user.service.ts b/client/src/app/services/user/user.service.ts
deleted file mode 100644
index 3569db9..0000000
--- a/client/src/app/services/user/user.service.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Injectable } from '@angular/core';
-
-@Injectable({
- providedIn: 'root'
-})
-export class UserService {
-
- constructor() { }
-}