Skip to content

Commit af1c2a6

Browse files
jbarcia2019jbarcia2019
authored
Merge branch 'angular_article' into angular_categories
2 parents 1785575 + 890b93f commit af1c2a6

15 files changed

+907
-5
lines changed

‎.project‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
<projects>
66
</projects>
77
<buildSpec>
8+
<buildCommand>
9+
<name>ts.eclipse.ide.core.typeScriptBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
813
</buildSpec>
914
<natures>
1015
</natures>

‎angular/wallypop/src/app/components/article/AddArticle.component.html‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
<!-- {{>header}} --> <!-- ====== Page content ======-->
2+
<section class="section">
3+
<h2 class="text-center text-light">Pon tu anuncio gratis</h2>
4+
<div class="container">
5+
<div class="row">
6+
<div class="col-xs-12 col-sm-10 col-sm-offset-1" style="border: 1px solid #E1E1E1;">
7+
<form action=/newcommercial class="form-horizontal" enctype="multipart/form-data" method="post">
8+
<h3 class="text-info">Busca la categoría donde verán tu anuncio</h3>
9+
<div class="form-group">
10+
<div class="col-sm-3 control-label">
11+
<label>¿Qué anuncias?<small>Pulsando Ctrl puedes seleccionar varias
12+
catgorías</small></label>
13+
</div>
14+
<div class="col-sm-7">
15+
<div class="form-group">
16+
<select class="form-control" multiple name="CATEGORYS">
17+
<!-- {{#lcategory}}-->
18+
<option name="CATEGORY" value="showCategories($event)">"showCategories($event)"</option>
19+
<!-- {{/lcategory}} -->
20+
</select>
21+
</div>
22+
</div>
23+
</div>
24+
<br><br>
25+
<h3 class="text-info">Detalles de tu anuncio</h3>
26+
<div class="form-group">
27+
<label class="col-sm-3 control-label">Título del anuncio</label>
28+
<div class="col-sm-7">
29+
<input #title class="form-control" name="TITLE" placeholder="Título del anuncio" required=""
30+
type="text">
31+
</div>
32+
</div>
33+
<div class="form-group">
34+
<label class="col-sm-3 control-label">Descripción</label>
35+
<div class="col-sm-7">
36+
<textarea #description NAME="DESCRIPTION" class="form-control" placeholder="Descripción" required=""
37+
rows="3"></textarea>
38+
</div>
39+
</div>
40+
<div class="form-group">
41+
<label class="col-sm-3 control-label">Precio</label>
42+
<div class="col-sm-7">
43+
<input #price class="form-control" name="PRICE" placeholder="Precio" required="" type="text">
44+
</div>
45+
</div>
46+
<div class="form-group">
47+
<label class="col-sm-3 control-label">Ciudad</label>
48+
<div class="col-sm-7">
49+
<input #city class="form-control" name="CITY" placeholder="Ciudad" required="" type="text">
50+
</div>
51+
</div>
52+
<div class="form-group">
53+
<label class="col-sm-3 control-label">Código postal</label>
54+
<div class="col-sm-7">
55+
<input #postal_code class="form-control" name="POSTAL_CODE" placeholder="Código postal" required=""
56+
type="text">
57+
</div>
58+
</div>
59+
<br><br>
60+
<h3 class="text-info">Foto</h3>
61+
<p>¡los anuncios con fotos reciben 7 veces más contactos!</p>
62+
<div class="form-group">
63+
<div class="custom-input-file">
64+
<input accept=".jpg, .jpeg" class="input-file" name="imageField" size="1" type="file"/>
65+
<i aria-hidden="true" class="fa fa-picture-o"></i>
66+
</div>
67+
<br>
68+
<p class="text-muted text-center archivo">Archivo...</p>
69+
</div>
70+
<p class="text-center">
71+
Al publicar un anuncio, aceptas las <a href="#!">condiciones de uso y la Política de
72+
Privacidad</a>
73+
</p>
74+
<input name="_csrf" type="hidden" value="{{token}}"/>
75+
<p class="text-center">
76+
<button (click)="addArticle($event, title.value, description.value, city.value, price.value, postal_doce.value)" class="btn btn-danger btn-lg" type="submit">Guardar</button>
77+
</p>
78+
</form>
79+
</div>
80+
</div>
81+
</div>
82+
83+
</section>
84+
{{>footer}}

‎angular/wallypop/src/app/components/article/AddArticle.component.ts‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import {Component} from '@angular/core';
2+
// ESTA LINEA HAY QUE DESCOMENTARLA CUANDO SE HAGA EL MERGE CON LA RAMA CATEGORY
3+
//import {Category } from 'src/app/models/category.model';
4+
import {ArticleService} from '../../services/article.service';
5+
import {LoginService} from '../../services/login.service';
6+
7+
@Component({
8+
selector: 'AddArticle',
9+
templateUrl: './AddArticle.component.html'
10+
})
11+
export class AddArticle {
12+
constructor(public articleService: ArticleService, public loginService: LoginService) {
13+
}
14+
15+
addArticle(event: any, title: string, description: string, city: string, price: number, postal_code: number): void {
16+
event.preventDefault();
17+
this.articleService.addArticle(title,description,city, price, postal_code);
18+
}
19+
/*
20+
* ESTE METODO HAY QUE DESCOMENTARLO CUANDO SE HAGA EL MERGE CON LA RAMA CATEGORY
21+
showCategories(event: any): Observable<Category[]> {
22+
event.preventDefault();
23+
this.articleService.addArticle(title,description,city, price, postal_code);
24+
}
25+
*/
26+
}

‎angular/wallypop/src/app/components/article/AllArticlesWebPagination.component.html‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<!-- {>header}} -->{
2+
<!-- ====== Page content ======-->
3+
<section class="section">
4+
<!--{{>search}}-->
5+
<!--{{#ERROR}}-->
6+
<br>
7+
<div class="container">
8+
<div class="alert alert-danger" role="alert">
9+
<center>El artículo que buscas no existe o ya no está disponible</center>
10+
</div>
11+
</div>
12+
<!--{{/ERROR}}-->
13+
<hr>
14+
<div class="container-fluid">
15+
<div class="row">
16+
<div class="col-xs-12 col-sm-3 col-md-2">
17+
<div class="full-width" style="border: 1px solid #E1E1E1; border-radius: 4px; padding: 5px;">
18+
<button class="btn btn-default btn-block hidden-sm hidden-md hidden-lg btn-dropdown-conatiner"
19+
data-drop-cont=".menu-commercial">
20+
FILTROS <i aria-hidden="true" class="fa fa-sort pull-right"></i>
21+
</button>
22+
<form action="/search/commercial" class="full-width menu-commercial" method="GET">
23+
<h4 class="text-light">CATEGORÃA</h4>
24+
<div class="form-group">
25+
<select class="form-control" name="id_category">
26+
<option disabled selected>Selecciona una categoría</option>
27+
<!-- {{#lcategory}}-->
28+
<option name="CATEGORY" value="showCategories($event)">"showCategories($event)"</option>
29+
<!-- {{/lcategory}} -->
30+
</select>
31+
</div>
32+
<p class="text-center">
33+
<button class="btn btn-success btn-block">APLICAR</button>
34+
</p>
35+
<p class="text-center">
36+
<a class="btn btn-info btn-block" href="/commercial" onclick="" type="reset">BORRAR
37+
FILTROS</a>
38+
</p>
39+
<p>
40+
<small>Anuncios segunda mano . Las mejores ofertas en de segunda mano y de ocasión solo
41+
en </small>
42+
</p>
43+
</form>
44+
</div>
45+
</div>
46+
<div class="col-xs-12 col-sm-9 col-md-10">
47+
<div class="full-width">
48+
<ol class="breadcrumb">
49+
<!-- {{#lcategory}}-->
50+
<!-- <li><a href="/commercial/{{ID_CATEGORY}}">{{TITLE}}</a></li> -->
51+
<!--{{/lcategory}}-->
52+
</ol>
53+
</div>
54+
<div class="full-widht">
55+
<i class="fa fa-th-large btn btn-default hidden-xs btn-change-post"></i>
56+
<i class="fa fa-refresh btn btn-default"></i>
57+
<i class="fa fa-angle-right btn btn-default"></i>
58+
</div>
59+
<!--{{>article}}-->
60+
61+
<div class="clearfix"></div>
62+
<nav class="text-center">
63+
<ul class="pagination">
64+
<li>
65+
<a aria-label="Previous" href="#">
66+
<span aria-hidden="true">&laquo;</span>
67+
</a>
68+
</li>
69+
<li><a href="#">1</a></li>
70+
<li><a href="#">2</a></li>
71+
<li><a href="#">3</a></li>
72+
<li><a href="#">4</a></li>
73+
<li><a href="#">5</a></li>
74+
<li>
75+
<a aria-label="Next" href="#">
76+
<span aria-hidden="true">&raquo;</span>
77+
</a>
78+
</li>
79+
</ul>
80+
</nav>
81+
</div>
82+
</div>
83+
</div>
84+
</section>
85+
<!-- {{>footer}} -->

‎angular/wallypop/src/app/components/article/AllArticlesWebPagination.component.ts‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import {Component} from '@angular/core';
2+
import {Observable, throwError} from 'rxjs';
3+
//ESTA LINEA HAY QUE DESCOMENTARLA CUANDO SE HAGA EL MERGE CON LA RAMA CATEGORY
4+
//import {Category } from 'src/app/models/category.model';
5+
import {Article } from 'src/app/models/article.model';
6+
import {ArticleService} from '../../services/article.service';
7+
import {LoginService} from '../../services/login.service';
8+
9+
@Component({
10+
selector: 'AllArticlesWebPagination',
11+
templateUrl: './AllArticlesWebPagination.component.html'
12+
})
13+
export class AllArticlesWebPagination {
14+
constructor(public articleService: ArticleService, public loginService: LoginService) {
15+
}
16+
17+
listAllArticlesWebPagination(event: any,): Observable<Object> {
18+
event.preventDefault();
19+
return this.articleService.listAllArticlesWebPagination();
20+
}
21+
22+
/*
23+
* ESTE METODO HAY QUE DESCOMENTARLO CUANDO SE HAGA EL MERGE CON LA RAMA CATEGORY
24+
showCategories(event: any): Observable<Category[]> {
25+
event.preventDefault();
26+
this.articleService.addArticle(title,description,city, price, postal_code);
27+
}
28+
*/
29+
}
30+

‎angular/wallypop/src/app/components/article/ArticlesUserPagination.component.html‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
2+
<!-- {{>header}}-->
3+
<!-- ====== Page content ======-->
4+
<!--{{>nav_side}}-->
5+
<a class="list-group-item" href="/profile">
6+
<i aria-hidden="true" class="fa fa-user fa-fw"></i> TU PERFIL
7+
</a>
8+
<a class="list-group-item active" href="/yourcommercial">
9+
<i aria-hidden="true" class="fa fa-object-group fa-fw"></i> TUS ANUNCIOS
10+
</a>
11+
<a class="list-group-item" href="/yourcommercialsold">
12+
<i aria-hidden="true" class="fa fa-object-group fa-fw"></i> TUS ANUNCIOS VENDIDOS
13+
</a>
14+
<a class="list-group-item" href="/favorites">
15+
<i aria-hidden="true" class="fa fa-heart-o fa-fw"></i> FAVORITOS
16+
</a>
17+
<!--{{#admin}}-->
18+
<p class="full-width"><small *ngIf="loginService.isLogged() && loginService.isAdmin()">ADMIN</small></p>
19+
20+
<a class="list-group-item" href="/category">
21+
<i aria-hidden="true" class="fa fa-object-group fa-fw"></i> GESTIÓN CATEGORÃ-AS
22+
</a>
23+
<a class="list-group-item" href="/reports">
24+
<i aria-hidden="true" class="fa fa-object-group fa-fw"></i> GESTIÓN REPORTES
25+
</a>
26+
<!--{{/admin}}-->
27+
<p class="full-width"><small *ngIf="loginService.isLogged() && loginService.isAdmin()">ADMIN</small></p>
28+
29+
<div></div>
30+
<div></div>
31+
<!--<p style="color: forestgreen;">
32+
{{exito_creacion_nuevo_anuncio}}
33+
</p>
34+
-->
35+
<div class="col-xs-12 col-sm-8 col-md-9">
36+
<div class="full-width bar-info-user">
37+
<i aria-hidden="true" class="fa fa-object-group fa-fw"></i>
38+
<div>TUS ANUNCIOS</div>
39+
</div>
40+
<!-- Content-->
41+
<div class="full-widht">
42+
<i class="fa fa-th-large btn btn-default hidden-xs btn-change-post"></i>
43+
<i class="fa fa-refresh btn btn-default"></i>
44+
<i class="fa fa-angle-right btn btn-default"></i>
45+
</div>
46+
47+
<!--{{>article}}-->
48+
49+
<div class="clearfix"></div>
50+
<nav class="text-center">
51+
<ul class="pagination">
52+
<li>
53+
<a aria-label="Previous" href="#">
54+
<span aria-hidden="true">&laquo;</span>
55+
</a>
56+
</li>
57+
<li><a href="#">1</a></li>
58+
<li><a href="#">2</a></li>
59+
<li><a href="#">3</a></li>
60+
<li><a href="#">4</a></li>
61+
<li><a href="#">5</a></li>
62+
<li>
63+
<a aria-label="Next" href="#">
64+
<span aria-hidden="true">&raquo;</span>
65+
</a>
66+
</li>
67+
</ul>
68+
</nav>
69+
</div>
70+
<!--</div>-->
71+
<!--</div>-->
72+
<!--</section>-->
73+
<!--
74+
<script>
75+
$(document).ready(function () {
76+
$('.full-width container-post').load('./paginacionArticulosPublicados.html');
77+
});
78+
</script>
79+
-->
80+
<!--{{>footer}}-->

‎angular/wallypop/src/app/components/article/ArticlesUserPagination.component.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import {Component} from '@angular/core';
2+
import { User } from 'src/app/models/user.model';
3+
import { Article } from 'src/app/models/article.model';
4+
import {ArticleService} from '../../services/article.service';
5+
import {LoginService} from '../../services/login.service';
6+
7+
@Component({
8+
selector: 'ArticlesUserPagination',
9+
templateUrl: './ArticlesUserPagination.component.html'
10+
})
11+
export class ArticlesUserPagination {
12+
constructor(public articleService: ArticleService, public loginService: LoginService) {
13+
}
14+
15+
listArticlesUserPagination(event: any, user: User): void {
16+
event.preventDefault();
17+
this.articleService.listArticlesUserPagination(user);
18+
}
19+
20+
21+
}

0 commit comments

Comments
 (0)