CodeURJC-DAW-2021-22
diff --git a/‎backend/docker/create_image.sh‎
Lines changed: 3 additions & 1 deletion b/‎backend/docker/create_image.sh‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎backend/src/main/resources/public/new/index.html‎
Lines changed: 4 additions & 4 deletions b/‎backend/src/main/resources/public/new/index.html‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎backend/src/main/resources/public/new/main.21b05d1ae8953ccf.js‎
Lines changed: 0 additions & 1 deletion b/‎backend/src/main/resources/public/new/main.21b05d1ae8953ccf.js‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎backend/src/main/resources/public/new/main.7bafc258ee226a6c.js‎
Lines changed: 0 additions & 1 deletion b/‎backend/src/main/resources/public/new/main.7bafc258ee226a6c.js‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎backend/src/main/resources/public/new/main.8b525f4aa798a348.js‎
Lines changed: 0 additions & 1 deletion b/‎backend/src/main/resources/public/new/main.8b525f4aa798a348.js‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎backend/src/main/resources/public/new/main.99dc72018ec0334d.js‎
Lines changed: 0 additions & 1 deletion b/‎backend/src/main/resources/public/new/main.99dc72018ec0334d.js‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎backend/src/main/resources/public/new/main.a7a3c27dc5399545.js‎
Lines changed: 1 addition & 0 deletions b/‎backend/src/main/resources/public/new/main.a7a3c27dc5399545.js‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎backend/src/main/resources/public/new/main.f905f3e442c72289.js‎
Lines changed: 0 additions & 1 deletion b/‎backend/src/main/resources/public/new/main.f905f3e442c72289.js‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎backend/src/main/resources/public/new/styles.411581a70064ef3d.css‎
Lines changed: 0 additions & 10 deletions b/‎backend/src/main/resources/public/new/styles.411581a70064ef3d.css‎
Lines changed: 0 additions & 10 deletions
diff --git a/‎frontend/src/app/components/admin/admin.component.html‎
Lines changed: 7 additions & 9 deletions b/‎frontend/src/app/components/admin/admin.component.html‎
Lines changed: 7 additions & 9 deletions
@@ -2,10 +2,12 @@
 
 cd ../../frontend
 
-npm install
+# npm install
 
 ng build --prod --base-href="/new/"
 
+rm -r ../backend/src/main/resources/public/new/*
+
 cp -r dist/frontend/* ../backend/src/main/resources/public/new/
 
 cd ../backend/docker
 
@@ -1,5 +1,3 @@
-
-
 <body class="bg-232323">
 
   <header class="fixed-top"></header>
@@ -41,7 +39,7 @@ <h2 class="mt-2 mb-1">Usuarios encontrados</h2>
                     <div  *ngFor="let user of usersList" class="col-md-12">
                       <div class="d-flex lineUser">
 
-                      <img  *ngIf="hasImage()" class="userFinder" src="/user/{{user.id}}/image">
+                      <img  *ngIf="hasImage()" class="userFinder" [src]="userService.getUserImage(user.id, 0)">
                       <img *ngIf="!hasImage()" class="userFinder" src="/assets/images/no_profile_photo.jpg">
 
                       <span class="d-flex align-items-center partner-name">{{user.name}}</span>
@@ -77,23 +75,23 @@ <h2 class="mt-2 mb-1">Torneos encontrados</h2>
                 <span id="elements">
                   <div  *ngIf="isAdmin()" class="row">
 
-                    <div *ngFor="let Tournament of tournaments" class="col-md-12">
+                    <div *ngFor="let tournament of tournaments" class="col-md-12">
                         <div class="d-flex lineTournament">
 
-                            <img  *ngIf="Tournament.image" class="tournamentFinder" src="/api/tournaments/{{Tournament?.id}}/image">
-                            <img *ngIf="!Tournament.image" class="tournamentFinder" src="/assets/images/product_02.jpg">
+                            <img  *ngIf="tournament.image" class="tournamentFinder" [src]="tournamentService.getTournamentImage(tournament?.id, 0)">
+                            <img *ngIf="!tournament.image" class="tournamentFinder" src="/assets/images/product_02.jpg">
 
-                          <span class="d-flex align-items-center partner-name">{{Tournament.tournamentName}}</span>
+                          <span class="d-flex align-items-center partner-name">{{tournament.tournamentName}}</span>
                           <button class="btn btn-danger binUsers"  title="Perma delate users"
-                           (click)="removeTournament(Tournament.id)">Remove</button>
+                           (click)="removeTournament(tournament.id)">Remove</button>
 
                         </div>
                       </div>
                   </div>
 
                   <div *ngIf="hasMoreTournaments" class="row">
                     <div class="d-flex justify-content-center">
-                      <a class="cargar-mas mb-5" (click)="getTournaments()">Cargar más</a>
+                      <a class="cargar-mas" (click)="getTournaments()">Cargar más</a>
                     </div>
                   </div>
                 </span>