Merge branch 'angular' into angular_report

Author: jbarcia2019

angular/wallypop/.idea/workspace.xml

@@ -18,9 +18,11 @@ import { ReportsComponent } from './components/report/reports.component';
 import { ShowReportComponent } from './components/report/showReport.component';
 import { CategoryListComponent } from './components/category/categoryList.component';
 import {CommercialComponent} from './components/articles/commercial.component';
+import {PostComponent} from './components/articles/post.component';
 
 @NgModule({
-  declarations: [AppComponent, IndexComponent, LoginComponent, SearchComponent, NotFoundComponent, NewaccountComponent, ProfileComponent, CategoryComponent, CategoryListComponent, CommercialComponent, FormReportComponent, ReportsComponent, ShowReportComponent],
+  // tslint:disable-next-line:max-line-length
+  declarations: [AppComponent, IndexComponent, LoginComponent, SearchComponent, NotFoundComponent, NewaccountComponent, ProfileComponent, CategoryComponent, CategoryListComponent, CommercialComponent, PostComponent, FormReportComponent, ReportsComponent, ShowReportComponent],
   imports: [BrowserModule, FormsModule, HttpClientModule, routing],
   bootstrap: [AppComponent]
 })

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

@@ -11,6 +11,7 @@ import { ReportsComponent } from './components/report/reports.component';
 import { ShowReportComponent } from './components/report/showReport.component';
 import { CategoryListComponent } from './components/category/categoryList.component';
 import {CommercialComponent} from './components/articles/commercial.component';
+import {PostComponent} from './components/articles/post.component';
 
 const appRoutes = [
     { path: '', component: IndexComponent },
@@ -24,6 +25,9 @@ const appRoutes = [
     { path: 'categoryList', component: CategoryListComponent},
     { path: 'commercial', component: CommercialComponent },
     { path: 'showReport/:id', component: ShowReportComponent},
+    { path: 'commercial/:id', component: CommercialComponent },
+    { path: 'post', component: PostComponent },
+    { path: 'post/:id', component: PostComponent },
     { path: '**', component: NotFoundComponent}
 ];
 

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

@@ -20,7 +20,7 @@
                         FILTROS <i aria-hidden="true" class="fa fa-sort pull-right"></i>
                     </button>
                     <form action="/search/commercial" class="full-width menu-commercial" method="GET">
-                        <h4 class="text-light">CATEGORÍA</h4>
+                        <!--<h4 class="text-light">CATEGORÍA</h4>
                         <div class="form-group">
                             <select class="form-control" name="id_category">
                                 <option disabled selected>Selecciona una categoría</option>
@@ -29,14 +29,14 @@ <h4 class="text-light">CATEGORÍA</h4>
                         </div>
                         <p class="text-center">
                             <button class="btn btn-success btn-block">APLICAR</button>
+                        </p> -->
+                        <p>
+                            <small>Anuncios segunda mano. Las mejores ofertas en de segunda mano y de ocasión solo
+                                en Wallypop</small>
                         </p>
                         <p class="text-center">
-                            <a class="btn btn-info btn-block" href="/commercial" onclick="" type="reset">BORRAR
-                                FILTROS</a>
-                        </p>
-                        <p>
-                            <small>Anuncios segunda mano . Las mejores ofertas en de segunda mano y de ocasión solo
-                                en </small>
+                        <a class="btn btn-info btn-block" href="/commercial" onclick="" type="reset">BORRAR
+                        FILTROS</a>
                         </p>
                     </form>
                 </div>
@@ -47,11 +47,11 @@ <h4 class="text-light">CATEGORÍA</h4>
                         <li *ngFor="let category of categories"><a href="/commercial/{{category.id_CATEGORY}}">{{category.title}}</a></li>
                     </ol>
                 </div>
-                <div class="full-widht">
+                <!-- <div class="full-widht">
                     <i class="fa fa-th-large btn btn-default hidden-xs btn-change-post"></i>
                     <i class="fa fa-refresh btn btn-default"></i>
                     <i class="fa fa-angle-right btn btn-default"></i>
-                </div>
+                </div> -->
                 <!-- Article -->
                 <div class="full-width container-post">
                     <div class="full-width post" *ngFor="let article of articles">
@@ -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,17 +38,17 @@ export class CommercialComponent implements OnInit {
         );
     }
 
-    getArticles(): void {
-        this.articleService.getArticles().subscribe(
-            article => this.articles = article,
+    getArticlesFromCategory(id: number | string): void {
+        this.categoryService.getCategory(id).subscribe(
+            articles => this.articles = articles,
             error => console.log(error)
         );
-        this.articles.forEach(value => {
-            value.user = this.getUser(value.userID);
-        });
     }
 
-    getUser(id: number): User {
-        return this.loginService.getUser(id);
+    getAllArticles(): void {
+        this.articleService.getArticles().subscribe(
+            article => this.articles = article,
+            error => console.log(error)
+        );
     }
 }