Commercial with filtering of category

Author: jbarcia2019

angular/wallypop/.idea/workspace.xml

@@ -18,6 +18,7 @@ const appRoutes = [
     { path: 'category', component: CategoryComponent},
     { path: 'categoryList', component: CategoryListComponent},
     { path: 'commercial', component: CommercialComponent },
+    { path: 'commercial/:id', component: CommercialComponent },
     { path: 'post', component: PostComponent },
     { path: 'post/:id', component: PostComponent },
     { path: '**', component: NotFoundComponent}

angular/wallypop/src/app/app.routing.ts

@@ -35,8 +35,8 @@ <h4 class="text-light">CATEGORÍA</h4>
                                 FILTROS</a>
                         </p>
                         <p>
-                            <small>Anuncios segunda mano . Las mejores ofertas en de segunda mano y de ocasión solo
-                                en </small>
+                            <small>Anuncios segunda mano. Las mejores ofertas en de segunda mano y de ocasión solo
+                                en Wallypop</small>
                         </p>
                     </form>
                 </div>
@@ -64,7 +64,7 @@ <h4 class="text-light">CATEGORÍA</h4>
                                 <p class="full-width post-info-price">{{article.price}}€</p>
                                 <span class="post-info-zone">{{article.city}}</span>
                                 <span class="post-info-date">{{article.date}}</span>
-                                <a *ngIf="this.loginService.isLogged" href="/addFavorite/{{article.id_ARTICLE}}"><i class="fa fa-heart-o post-info-like"></i></a>
+                                <a *ngIf="this.loginService.isLogged()" href="/addFavorite/{{article.id_ARTICLE}}"><i class="fa fa-heart-o post-info-like"></i></a>
                             </div>
                         </ng-template>
                     </div>

angular/wallypop/src/app/components/articles/commercial.component.html

@@ -5,6 +5,7 @@ import {Article} from '../../models/article.model';
 import {Category} from '../../models/category.model';
 import {CategoryService} from '../../services/category.service';
 import {User} from '../../models/user.model';
+import {ActivatedRoute} from '@angular/router';
 
 @Component({
     selector: 'commercial',
@@ -13,12 +14,21 @@ import {User} from '../../models/user.model';
 export class CommercialComponent implements OnInit {
     articles: Article[];
     categories: Category[];
-    constructor(private articleService: ArticleService, private categoryService: CategoryService, private loginService: LoginService) {
+    category: Category;
+    idCategory: number;
+    constructor(private articleService: ArticleService, private categoryService: CategoryService, private loginService: LoginService, private routing: ActivatedRoute) {
+        this.idCategory = -1;
     }
 
     ngOnInit(): void {
         this.getCategories();
-        this.getArticles();
+
+        this.idCategory = this.routing.snapshot.params.id;
+        if (this.idCategory !== undefined) {
+            this.getArticlesFromCategory(this.idCategory);
+        } else {
+            this.getAllArticles();
+        }
     }
 
     getCategories(): void {
@@ -28,7 +38,14 @@ export class CommercialComponent implements OnInit {
         );
     }
 
-    getArticles(): void {
+    getArticlesFromCategory(id: number | string): void {
+        this.categoryService.getCategory(id).subscribe(
+            articles => this.articles = articles,
+            error => console.log(error)
+        );
+    }
+
+    getAllArticles(): void {
         this.articleService.getArticles().subscribe(
             article => this.articles = article,
             error => console.log(error)

angular/wallypop/src/app/components/articles/commercial.component.ts

@@ -5,6 +5,7 @@ import {catchError} from 'rxjs/operators';
 
 import {Category} from '../models/category.model';
 import {Router} from '@angular/router';
+import {Article} from '../models/article.model';
 
 const BASE_URL = '/api/';
 
@@ -26,10 +27,10 @@ export class CategoryService {
         ) as Observable<Category[]>;
     }
 
-    getCategory(id: number | string): Observable<Category> {
+    getCategory(id: number | string): Observable<Article[]> {
         return this.httpClient.get(BASE_URL + 'categories/' + id).pipe(
             catchError(error => CategoryService.handleError(error))
-        ) as Observable<Category>;
+        ) as Observable<Article[]>;
     }
 
     addCategory(title: string, description: string, icon: string): void {