Skip to content

Commit 3e172c5

Browse files
committed
fixed default image in new users
1 parent 6d1c840 commit 3e172c5

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

backend/gamelink/src/main/java/urjc/gamelink/Controllers/UserRestController.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import org.hibernate.engine.jdbc.BlobProxy;
1414
import org.springframework.beans.factory.annotation.Autowired;
15+
import org.springframework.core.io.ClassPathResource;
1516
import org.springframework.core.io.InputStreamResource;
1617
import org.springframework.core.io.Resource;
1718
import org.springframework.http.HttpHeaders;
@@ -74,8 +75,11 @@ public ResponseEntity<Usero> getUser(@PathVariable long id) {
7475
@ResponseStatus(HttpStatus.CREATED)
7576
public ResponseEntity<Usero> createUser(Usero user, @RequestParam String nick,
7677
@RequestParam String name, @RequestParam String lastName,
77-
@RequestParam String email, @RequestParam String password) {
78+
@RequestParam String email, @RequestParam String password) throws IOException{
7879

80+
Resource image = new ClassPathResource("/static/Photos/defaultProfilePhoto.jpg");
81+
user.setImageFile(BlobProxy.generateProxy(image.getInputStream(), image.contentLength()));
82+
user.setImage(true);
7983
user.setEncodedPassword(passwordEncoder.encode(password));
8084
ArrayList<String> list = new ArrayList<>();
8185
list.add("USERO");

backend/gamelink/src/main/resources/templates/signin.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ <h3 class="card-title text-center">Registro</h3>
5353
<span id="passwordMessage"></span>
5454
</div>
5555
<button onclick="location.href='/'; return false;">Cancelar</button>
56-
<button type="submit" (click)="logIn($event, nick.value, name.value, lastName.value, email.value, password.value)"
57-
class="btn btn-default">Login</button>
56+
<input id="createUserBtn" type="submit" value="Crear">
57+
<input type="hidden" name="_csrf" value="{{token}}"/>
5858
</form>
5959
<!-- Right after creating the button disable "Create User button"-->
6060
<script>
@@ -76,5 +76,6 @@ <h3 class="card-title text-center">Registro</h3>
7676
<!-- Bootstrap core JS-->
7777
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"></script>
7878
<!-- Core theme JS-->
79+
<script src="js/scripts.js"></script>
7980
</body>
80-
</html>
81+
</html>

frontend/src/app/components/login/signUp.component.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,14 @@ export class SignUpComponent {
1616

1717
event.preventDefault();
1818
const formData = new FormData();
19-
var user: Usero = { nick, name, lastName, email, creditCard: "",image: false, roles: ['USERO']}
19+
var user: Usero = { nick, name, lastName, email, creditCard: "", image: true, roles: ['USERO']}
2020
formData.append('nick', nick);
2121
formData.append('name', name);
2222
formData.append('lastName', lastName);
2323
formData.append('email', email);
2424
formData.append('password', password);
2525
//this.useroService.createUser(user);
2626
this.useroService.createUser(formData);
27-
28-
if(user.id){
29-
alert("Usuario creado exitoso");
30-
}else{
31-
alert("Error al crear el usuario");
32-
}
3327

3428
// this.router.navigate(['/login']);
3529
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
width="150px" [src]="userImage()"><span class="font-weight-bold">"{{user.nick}}"</span><span
77
class="text-black-50">"{{user.email}}"</span><span>
88
</span>
9-
<button (click)="save()">Save</button>
10-
<button (click)="cancel()">Cancel</button>
9+
<button class="btn btn-primary profile-button m-3" (click)="save()">Save</button>
10+
<button class="btn btn-primary profile-button m-3" (click)="cancel()">Cancel</button>
11+
<button class="btn btn-primary profile-button m-3" (click)="logOut()" type="button">Log Out</button>
1112
</div>
1213
</div>
1314

@@ -37,7 +38,7 @@ <h3>"{{user.lastName}}"</h3>
3738
</div>
3839

3940
<div class="col-md-12"><label class="labels">Número de tarjeta</label>
40-
<input *ngIf="user.creditCard" name="creditCard" type="text" class="form-control" placeholder="123456789A"
41+
<input name="creditCard" type="text" class="form-control" placeholder="123456789A"
4142
[(ngModel)]="user.creditCard" value="user.creditCard">
4243
</div>
4344

@@ -75,4 +76,3 @@ <h4 class="text-right">Mis compras:</h4>
7576
</div>
7677
</div>
7778
</div>
78-
<button class="btn btn-primary profile-button m-3" (click)="logOut()" type="button">Log Out</button>

0 commit comments

Comments
 (0)