Merge branch 'JuanFase4'

Author: ultramani

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

@@ -10,7 +10,7 @@ spring.mustache.suffix=.html
 
 spring.datasource.url=jdbc:postgresql://localhost:5432/gamelink
 spring.datasource.username=postgres
-spring.datasource.password=password
+spring.datasource.password=Juanluis-123
 spring.jpa.hibernate.ddl-auto=create-drop
 
 logging.level.org.springframework.security=DEBUG

backend/gamelink/target/classes/application.properties

@@ -10,7 +10,7 @@ spring.mustache.suffix=.html
 
 spring.datasource.url=jdbc:postgresql://localhost:5432/gamelink
 spring.datasource.username=postgres
-spring.datasource.password=password
+spring.datasource.password=Juanluis-123
 spring.jpa.hibernate.ddl-auto=create-drop
 
 logging.level.org.springframework.security=DEBUG

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

@@ -90,35 +90,7 @@ <h3>Nuevas noticias sobre The Witcher 4</h3>
 
               <!-- The slideshow/carousel -->
 
-              <a *ngIf="imagesCarousel">
-                <ng-template ngbSlide>
-                  <div class="picsum-img-wrapper">
-                    <img [src]="imagesCarousel[0]" alt="Random first slide">
-                  </div>
-                  <div class="carousel-caption">
-                    <h3>Diablo 4</h3>
-                    <p>Fecha de lanzamiento revelada</p>
-                  </div>
-                </ng-template>
-                <ng-template ngbSlide>
-                  <div class="picsum-img-wrapper">
-                    <img [src]="imagesCarousel[1]" alt="Random second slide">
-                  </div>
-                  <div class="carousel-caption">
-                    <h3>Overwatch 2</h3>
-                    <p>Se cancela definitivamente</p>
-                  </div>
-                </ng-template>
-                <ng-template ngbSlide>
-                  <div class="picsum-img-wrapper">
-                    <img [src]="imagesCarousel[2]" alt="Random third slide">
-                  </div>
-                  <div class="carousel-caption">
-                    <h3>Mario kart 9</h3>
-                    <p>Ya es una realidad, no te lo pierdas</p>
-                  </div>
-                </ng-template>
-              </a>
+              <app-carousel></app-carousel>
 
             </div>
           </div>

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

@@ -17,7 +17,7 @@ <h1 class="display-5 fw-bolder text-white mb-2">{{videogame.title}}</h1>
                             style="color: aliceblue !important; font-size: 2em !important;"> Precio: {{videogame.price}}€</p>
                             <!--Button to pay-->
                             <button class="btn btn-primary btn-lg px-4 me-sm-3" id="payButton" (click)="purchasevideogame()">
-                                Comprar ya 
+                                Comprar ya
                                 <span style="color: grey;">{{videogame.price}}€</span>
                             </button>
                     </div>
@@ -33,7 +33,7 @@ <h1 class="display-5 fw-bolder text-white mb-2">{{videogame.title}}</h1>
                     <div class="col-5 text-center" >
                         <p class="lead fw-normal text-white-50 mb-4"
                             style="color: aliceblue !important; font-size: 2em !important; margin-top: 5%;"> Admin Actions :
-                            <button class="btn btn-primary btn-lg px-4 me-sm-3" (click)="removeVideogame()" style="margin-top: auto;">Eliminar  </button>               
+                            <button class="btn btn-primary btn-lg px-4 me-sm-3" (click)="removeVideogame()" style="margin-top: auto;">Eliminar  </button>
                             <button class="btn btn-outline-light btn-lg px-4" (click)="editVideogame()" style="margin-top: auto;">Editar</button>
                         </p>
 
@@ -95,7 +95,7 @@ <h1 style="padding-bottom: 10px;">Noticias destacadas sobre este Titulo.</h1>
             <div class="container px-5 my-5" style="margin-bottom: 0px !important ;">
                 <div class="row gx-5 justify-content-center">
 
-                    <!-- {{>newsTemplate}}  FALTA AÑADIR -->
+                  <newsTemplate class="col-lg-4 mb-5" *ngFor="let ng of news" [news]="ng"></newsTemplate>
 
                 </div>
             </div>

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

@@ -3,6 +3,8 @@ import { Router,ActivatedRoute } from '@angular/router';
 import { Videogame } from 'src/app/models/videogame.model';
 import { LoginService } from 'src/app/services/login.service';
 import { VideogameService } from 'src/app/services/videogame.service';
+import { News } from 'src/app/models/news.model';
+import { NewsService } from 'src/app/services/news.service';
 
 @Component({
   selector: 'videogame-detail',
@@ -11,15 +13,24 @@ import { VideogameService } from 'src/app/services/videogame.service';
 
 export class VideogameDetailComponent{
 
+
+  news!: News[];
   videogame!: Videogame;
 
-  constructor(private router: Router,public loginService: LoginService, activatedRoute: ActivatedRoute, public videogameService: VideogameService){
-    
+  constructor(private router: Router,public loginService: LoginService, activatedRoute: ActivatedRoute, public videogameService: VideogameService, newsService: NewsService){
+
     const id = activatedRoute.snapshot.params['id'];
     videogameService.getVideogame(id).subscribe(
         videogame => this.videogame = videogame,
         error => console.error(error)
     )
+
+
+    newsService.getNew(id).subscribe(
+      news => {this.news = news as News[]},
+      error => console.error(error)
+    )
+
   }
 
   removeVideogame() {
@@ -30,13 +41,13 @@ export class VideogameDetailComponent{
             error => console.error(error)
         );
     }
-}     
-   
+}
+
     editVideogame() {
         this.router.navigate(['/videogame/edit/' + this.videogame.id]);
     }
 
-    purchasevideogame(){ 
+    purchasevideogame(){
         var id = this.loginService.currentUser();
         this.router.navigate(['/videogame/' + this.videogame.id + '/purchase/' + id?.id]);
     }
@@ -45,7 +56,7 @@ export class VideogameDetailComponent{
         return this.videogame.imageVg? '/api/videogames/'+this.videogame.id+'/image' : '/assets/images/no_image.png';
     }
 
-    
+
     companyImage(){
         return this.videogame.imageCompany? '/api/videogames/'+this.videogame.id+'/companyImage' : '/assets/images/no_image.png';
     }

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

@@ -177,9 +177,9 @@ <h2 style="text-align: center; padding-top: 2%;">Edit Videogame Form</h2>
                     <div class="col-md-8">
                         <p>Related News: </p>
                         <select name="notices" multiple style="width: 100%;">
-                            <!-- {{#news}}
-                            <option value="{{ id }}">{{ title }}</option>
-                            {{/news}} -->
+
+                            <option *ngFor="let ng of news" value="{{ ng.id }}">{{ ng.title }}</option>
+
                         </select>
                     </div>
                 </div>
@@ -209,4 +209,4 @@ <h2 style="text-align: center; padding-top: 2%;">Edit Videogame Form</h2>
             </div>
         </form>
     </section>
-</main>
+</main>