Skip to content

Commit 08e9435

Browse files
Xarlifue360Xarlifue360
committed
Merge branch 'JuanFase3' of https://github.com/CodeURJC-DAW-2021-22/webapp9 into Carlos
2 parents 79a95b0 + 52eea64 commit 08e9435

File tree

88 files changed

+181
-137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+181
-137
lines changed

‎backend/gamelink/src/main/resources/application.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spring.mustache.suffix=.html
1010

1111
spring.datasource.url=jdbc:postgresql://localhost:5432/gamelink
1212
spring.datasource.username=postgres
13-
spring.datasource.password=password
13+
spring.datasource.password=Juanluis-123
1414
spring.jpa.hibernate.ddl-auto=create-drop
1515

1616
logging.level.org.springframework.security=DEBUG

‎frontend/proxy.conf.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"/api/*": {
3+
"target": "https://127.0.0.1:8443/",
4+
"secure": false,
5+
"logLevel": "debug",
6+
"changeOrigin": true
7+
}
8+
}

‎frontend/src/app/app.component.html‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
<header></header>
2-
<navBar></navBar>
1+
<!--AQUÍ NO HACE FALTA LA ETIQUETA HEAD, YA ESTÁ EN EL INDEX.HTML,
2+
O LA QUITAMOS DEL INDEX O LA QUITAMOS DE AQUÍ-->
3+
<!--head></head-->
34

4-
<home></home>
5+
<navBar></navBar>
56

7+
<!--tampoco hace falta <home></home>, porque ya el router-outlet ya lo muestra-->
68

79
<router-outlet></router-outlet>
10+
811
<footer></footer>

‎frontend/src/app/app.routing.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
import { Routes, RouterModule } from '@angular/router';
22

33
import { HomeComponent } from './components/home/home.component';
4+
import { NewsComponent } from './components/news/news.component';
5+
import { ShowNewsComponent } from './components/news/showNews.component';
6+
import { UserProfile } from './components/user/userProfile.component';
47

58
//aquí tenemos que completar todo lo que queremos que se vaya cargando en el router-outlet
69
//ojo, el template no debe llamar al servicio, hay que hacerlo a través del componente
710

811
const appRoutes = [
9-
{ path: 'home', component: HomeComponent }
12+
{ path: 'home', component: HomeComponent },
13+
{ path: 'news', component: NewsComponent },
14+
{ path: 'showNews', component: ShowNewsComponent},
15+
{ path: 'userProfile', component: UserProfile},
16+
{ path: '', redirectTo: 'home', pathMatch: 'full'}
1017
]
1118

1219
export const routing = RouterModule.forRoot(appRoutes);

‎frontend/src/app/components/home/home.component.html‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ <h1 class="display-5 fw-bolder text-white mb-2">Tienda y noticiero de videojuego
2020
<div class="col-lg-12 mb-5 mb-lg-0" style="padding-bottom: 3em;"><h2 class="fw-bolder mb-0" style="text-align: center;">Nuestros videojuegos destacados.</h2></div>
2121
<div class="col-lg-12 align-self-center">
2222

23-
<home *ngIf="images">
23+
<a *ngIf="images"> <!--Esta etiqueta estaba puesta a home, la he cambiado porque
24+
es la que provoca la recursión de home (MÍRALO JUAN)-->
2425
<ng-template ngbSlide>
2526
<div class="picsum-img-wrapper">
2627
<img [src]="images[0]" alt="Random first slide">
@@ -48,8 +49,8 @@ <h3>Leyendas Pokemon Arceus</h3>
4849
<p>Pokemon + mundo abierto, no hay nada más que decir.</p>
4950
</div>
5051
</ng-template>
51-
</home>
52-
52+
</a>
53+
5354
</div>
5455
</div>
5556
</div>
@@ -77,8 +78,8 @@ <h3>Leyendas Pokemon Arceus</h3>
7778
<section class="py-5">
7879
<div class="container px-5 my-5">
7980
<div id="moreImages" class="row gx-5 justify-content-center">
80-
<!-- AQUÍ VA EL NEWS TEMPLATE -->
81+
<newsTemplate></newsTemplate>
8182
</div>
82-
83+
8384
</div>
8485
</section>

‎frontend/src/app/components/home/home.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ import { Component } from '@angular/core';
77

88

99
export class HomeComponent{
10-
images = ["assets/images/ lostark.jpg", "assets/images/archeAge.jpg", "assets/images/pokemonArceus.jpg"]
11-
}
10+
images = ["assets/images/ lostark.jpg", "assets/images/ archeAge.jpg", "assets/images/ pokemonArceus.jpg"]
11+
}

‎frontend/src/app/components/navBar/navBar.component.html‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,24 @@
88
<li class="nav-item dropdown">
99
<a class="nav-link dropdown-toggle" id="navbarDropdownBlog" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">Videojuegos</a>
1010
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdownBlog">
11-
<li><a class="dropdown-item" href="/videogame">Descubrir</a></li>
12-
<li><a class="dropdown-item" href="/videogameStatistics/0">Top Juegos</a></li>
11+
<li><a class="dropdown-item" [routerLink]="['/videogame']">Descubrir</a></li>
12+
<li><a class="dropdown-item" [routerLink]="['/videogameStatistics/0']">Top Juegos</a></li>
1313
</ul>
1414
</li>
15-
<li class="nav-item"><a class="nav-link" href="/news">Noticias</a></li>
16-
<li class="nav-item"><a class="nav-link" href="/about">About</a></li>
15+
<li class="nav-item"><a class="nav-link" [routerLink]="['/news']">Noticias</a></li>
16+
<li class="nav-item"><a class="nav-link" [routerLink]="['/about']">About</a></li>
17+
1718

1819
<p *ngIf="!loginService.isLogged()"><!--/p-->
1920
<li class="nav-item dropdown">
2021
<a class="nav-link dropdown-toggle" id="navbarDropdownBlog" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">Sesión</a>
2122
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdownBlog">
22-
<li><a class="dropdown-item" href="/login">Iniciar sesión</a></li>
23-
<li><a class="dropdown-item" href="/signin">Registrarse</a></li>
23+
<li><a class="dropdown-item" [routerLink]="['/login']">Iniciar sesión</a></li>
24+
<li><a class="dropdown-item" [routerLink]="['/signin']">Registrarse</a></li>
2425
</ul>
2526
</li>
2627

28+
2729
<a ngIf="loginService.isLogged()">
2830
<p ngIf="loginService.isAdmin()"><!--/p-->
2931
<li class="nav-item"><a class="nav-link" [routerLink]="['/admin']">Administrador</a></li>

‎frontend/src/app/components/news/news.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ <h1 class="fw-bolder fs-5 mb-4">Noticias destacadas</h1>
2727
<div class="container px-5">
2828
<h2 class="fw-bolder fs-5 mb-4">Noticias que te pueden interesar.</h2>
2929
<div id="moreImages" class="row gx-5">
30-
<newsTemplate></newsTemplate>
30+
<newsTemplate class="col-lg-4 mb-5" *ngFor="let ng of news" [news]="ng"></newsTemplate>
3131
</div>
3232
<div class="text-end mb-5 mb-xl-0">
3333
<a class="text-decoration-none" href="#!">
@@ -85,7 +85,7 @@ <h3>Nuevas noticias sobre The Witcher 4</h3>
8585

8686
<!-- The slideshow/carousel -->
8787

88-
<news *ngIf="imagesCarousel">
88+
<a *ngIf="imagesCarousel">
8989
<ng-template ngbSlide>
9090
<div class="picsum-img-wrapper">
9191
<img [src]="imagesCarousel[0]" alt="Random first slide">
@@ -113,7 +113,7 @@ <h3>Mario kart 9</h3>
113113
<p>Ya es una realidad, no te lo pierdas</p>
114114
</div>
115115
</ng-template>
116-
</news>
116+
</a>
117117

118118
</div>
119119
</div>

‎frontend/src/app/components/news/news.component.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,36 @@ export class NewsComponent{
1414

1515
//25: int;
1616
//25: int;
17-
news!: News;
18-
imagesCarousel = ['diabloIV.jgp', 'overwatch2.jpg', 'marioKart9.jgp'].map((n) => `./backend/src/main/resources/static/Photos/${n}`); //esto no se si está bien
17+
news!: News[];
18+
imagesCarousel = ['assets/images/ diabloIV.jgp', 'assets/images/ overwatch2.jpg', 'assets/images/ marioKart9.jgp']
1919

2020
constructor(private router: Router, public newsService: NewsService, activatedRoute: ActivatedRoute){
2121

2222
const id = activatedRoute.snapshot.params['id'];
23-
this.newsService.getNew(id).subscribe(
24-
(news) => this.news = news as News, //casting in ts, es mejor hacerlo en el servicio (as Observable<News>), pero al dar error, hacemos el cast en el component
23+
this.newsService.getNews().subscribe(
24+
(news) => this.news = news as News[], //casting in ts, es mejor hacerlo en el servicio (as Observable<News>), pero al dar error, hacemos el cast en el component
2525
(error: any) => console.error(error)
2626

2727

2828
);
2929

3030
}
3131

32-
getNewsImage(){
32+
getNewsImage(news: News){
3333
if(this.news){ //We have to put this always. If exist any new...
34-
return this.news?.image+ '/api/news/' +this.news.id
34+
return news.image? '/api/news/' + news.id + '/image' : '/assets/images/not_foung.png';
3535
} else {
3636
return undefined;
3737
}
3838
}
3939

4040
//esto es una prueba
4141
nextPage(){
42-
if(this.news){
43-
return this.router.navigate(['/news/1'])
44-
} else {
45-
return undefined;
46-
}
42+
if(this.news){
43+
return this.router.navigate(['/news/1'])
44+
} else {
45+
return undefined;
46+
}
4747
}
4848

4949
}

‎frontend/src/app/components/news/newsTemplate.component.html‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
<p *ngIf="news"></p> <!--llamamos a news de tipo News, cargamos el constructor-->
2-
<div class="col-lg-4 mb-5">
3-
<div class="card h-100 shadow border-0">
4-
<p *ngIf="getNewsImage()"></p> <!--la imagen-->
5-
<img class="card-img-top" src="/news/{{news?.id}}/image" alt="..." />
1+
<!--llamamos a news de tipo News, cargamos el constructor-->
62

7-
<p *ngIf="!getNewsImage()"></p> <!--no imagen-->
8-
<img class="card-img-top" src="/Photos/not_foung.png" alt="..." />
9-
10-
<div class="card-body p-4">
11-
<div class="badge bg-primary bg-gradient rounded-pill mb-2">{{news?.badge}}</div>
12-
<a class="text-decoration-none link-dark stretched-link" href="/showNews/{{news?.id}}"><h5 class="card-title mb-3" style="color: black;">{{news?.title}}</h5></a>
13-
<p class="card-text mb-0">{{news?.description}}</p>
14-
</div>
15-
<div class="card-footer p-4 pt-0 bg-transparent border-top-0">
16-
<div class="d-flex align-items-end justify-content-between">
17-
<div class="d-flex align-items-center">
18-
<div class="small">
19-
<div class="text-muted">{{news?.date}} &middot; <p>{{news?.readTime}}</p></div>
20-
</div>
21-
</div>
3+
<div class="card h-100 shadow border-0">
4+
<!--la imagen-->
5+
<img class="card-img-top" [src]="newsImage()" alt="..." />
6+
<div class="card-body p-4">
7+
<div class="badge bg-primary bg-gradient rounded-pill mb-2">{{news?.badge}}</div>
8+
<a class="text-decoration-none link-dark stretched-link" (click)="goToNew()">
9+
<h5 class="card-title mb-3" style="color: black;">{{news?.title}}</h5>
10+
</a>
11+
<p class="card-text mb-0">{{news?.description}}</p>
12+
</div>
13+
<div class="card-footer p-4 pt-0 bg-transparent border-top-0">
14+
<div class="d-flex align-items-end justify-content-between">
15+
<div class="d-flex align-items-center">
16+
<div class="small">
17+
<div class="text-muted">{{news?.date}} &middot; <p>{{news?.readTime}}</p>
2218
</div>
19+
</div>
2320
</div>
21+
</div>
2422
</div>
25-
</div>
23+
</div>
24+
25+

0 commit comments

Comments
 (0)