Skip to content

Commit 86e3b86

Browse files
author
JLRR2019
committed
Merge remote-tracking branch 'origin/Andrea' into JuanFase3
2 parents 4738ca1 + 742dbc3 commit 86e3b86

File tree

4 files changed

+89
-27
lines changed

4 files changed

+89
-27
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=Nekowa10
1414
spring.jpa.hibernate.ddl-auto=create-drop
1515

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

‎backend/gamelink/target/classes/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=Juanluis-123
13+
spring.datasource.password=Nekowa10
1414
spring.jpa.hibernate.ddl-auto=create-drop
1515

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

‎frontend/src/app/components/user/userProfile.component.html‎

Lines changed: 74 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,78 @@ <h4 *ngIf="user.videogame" class="text-right">Mis compras</h4>
6262
<ul>
6363
<li>
6464
<div class="row">
65-
<div class="col-md-4">
66-
<img class="img-fluid rounded-3 my-5" [src]="videogameImage()" />
67-
</div>
68-
<div class="col-md-8 align-self-center">
69-
<p>"{{user.videogame.title}}"</p>
70-
</div>
65+
<div class="col-md-3 border-right">
66+
<div class="d-flex flex-column align-items-center text-center p-3 py-5"><img
67+
class="rounded-circle mt-5" width="150px" [src]="userImage()"><span
68+
class="font-weight-bold">"{{user.nick}}"</span><span class="text-black-50">"{{user.email}}"</span><span>
69+
</span>
70+
<button (click)="save()">Save</button>
71+
<button (click)="cancel()">Cancel</button>
72+
</div>
73+
</div>
74+
75+
<div class="col-md-5 border-right">
76+
<div class="p-3 py-5">
77+
<form *ngIf="user">
78+
<div class="d-flex justify-content-between align-items-center mb-3">
79+
<h4 class="text-right">Mi perfil: "{{user.nick}}"</h4>
80+
</div>
81+
<div class="row mt-2">
82+
<div class="col-md-6"><label class="labels">Nombre</label>
83+
<h3>"{{user.name}}"</h3>
84+
</div>
85+
<div class="col-md-6"><label class="labels">Apellido(s)</label>
86+
<h3>"{{user.lastName}}"</h3>
87+
</div>
88+
</div>
89+
<div class="row mt-3">
90+
91+
<div class="col-md-12"><label class="labels">Nombre de usuario</label>
92+
<input name="nick" type="text" class="form-control" placeholder="RodPerez" [(ngModel)]="user.nick">
93+
</div>
94+
95+
<div class="col-md-12"><label class="labels">Email</label>
96+
<input name="email" type="email" class="form-control" placeholder="[email protected]" [(ngModel)]="user.email">
97+
</div>
98+
99+
100+
<div class="col-md-12"><label class="labels">Número de tarjeta</label>
101+
<input *ngIf="user.creditCard" name="creditCard" type="text" class="form-control" placeholder="123456789A" [(ngModel)]="user.creditCard">
102+
</div>
103+
104+
<div class="col-md-12">
105+
<p>Imagen de perfil</p>
106+
<input #file type='file' name='imageField' accept=".jpg, .jpeg, .png, .svg" />
107+
</div>
108+
109+
</div>
110+
</form>
111+
</div>
112+
113+
<div class="mt-5 text-center">
114+
</div>
115+
</div>
116+
71117
</div>
72-
</li>
73-
</ul>
74-
</div>
75-
</div>
76-
</div>
77-
</div>
78-
<button class="btn btn-primary profile-button m-3" (click)="logOut()" type="button">Log Out</button>
118+
<div class="col-md-4">
119+
<div class="p-3 py-5">
120+
<h4 *ngIf="videogame" class="text-right">Mis compras:</h4>
121+
<div *ngFor="let vg of videogame" class="d-flex justify-content-between align-items-center mb-3">
122+
<ul>
123+
<li>
124+
<div class="row">
125+
<div class="col-md-4">
126+
<img class="img-fluid rounded-3 my-5" [src]="videogameImage(vg)"/>
127+
</div>
128+
<div class="col-md-8 align-self-center">
129+
<p>"{{vg.title}}"</p>
130+
</div>
131+
</div>
132+
</li>
133+
</ul>
134+
</div>
135+
</div>
136+
</div>
137+
</div>
138+
<button class="btn btn-primary profile-button m-3" (click)="logOut()" type="button">Log Out</button>
139+

‎frontend/src/app/components/user/userProfile.component.ts‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { ActivatedRoute, Router } from '@angular/router';
55
import { Usero } from './../../models/usero.model';
66
import { UseroService } from '../../services/usero.service';
77
import { LoginService } from '../../services/login.service';
8+
import { Videogame } from 'src/app/models/videogame.model';
89

910
@Component({
1011
selector: 'userProfile',
@@ -13,6 +14,7 @@ import { LoginService } from '../../services/login.service';
1314
export class UserProfile {
1415

1516
user!: Usero;
17+
videogame! : Videogame[];
1618
@ViewChild("file")
1719
file: any;
1820
removeImage? :boolean;
@@ -25,6 +27,10 @@ export class UserProfile {
2527
(error: any) => console.error(error)
2628
);
2729
}
30+
useroService.getVideogames(this.user).subscribe(
31+
(videogame: Videogame[]) => videogame = videogame,
32+
(error: any) => console.error(error)
33+
);
2834
}
2935

3036

@@ -44,32 +50,27 @@ export class UserProfile {
4450
let formData = new FormData();
4551
formData.append("imageFile", image);
4652
this.useroService.setUserImage(user, formData).subscribe(
47-
(_: any) => this.afterUploadImage(user),
53+
(_: any) => this.afterUploadImage(),
4854
( error: string) => alert('Error al actualizar o subir la imagen: ' + error)
4955
);
5056
} else {
51-
this.afterUploadImage(user);
57+
this.afterUploadImage();
5258
}
5359
}
5460

55-
private afterUploadImage(user: Usero){
56-
this.router.navigate(['/usero/', user.id]); // NO ESTOY SEGURA DE ESA URL..SEGURAMENTE ESTÉ MAL. REVISARLA
61+
private afterUploadImage(){
62+
this.router.navigate(['/userProfile/']);
5763
}
5864

5965
userImage() {
60-
return this.user?.image? '/api/user/' + this.user?.id + '/image' : '/assets/images/defaultProfilePhoto';
66+
return this.user.image? '/api/users/' + this.user.id + '/image' : '/assets/images/defaultProfilePhoto';
6167
}
6268

63-
videogameImage() {
64-
69+
videogameImage(vg: Videogame) {
70+
return vg.imageVg? '/api/videogames/' + vg.id + '/image' : '/assets/images/defaultProfilePhoto';
6571
}
6672

6773
logOut(){
6874
this.loginservice.logOut();
6975
}
70-
71-
/*getUserVideogame(){
72-
this.useroService.getVideogames(this.user);
73-
}*/
74-
7576
}

0 commit comments

Comments
 (0)