Merge branch 'Andrea' of https://github.com/CodeURJC-DAW-2021-22/webapp9 into Jhostin

Author: JhostinD

.gitignore

@@ -55,3 +55,4 @@ build/
 
 ### VS Code ###
 .vscode/
+backend/gamelink/docker-compose.yml

backend/gamelink/Docker-compose.yml

@@ -1,13 +1,13 @@
 version: "3.9"
 services: 
   web:
-    image: juanurjc/gamelink:latest
+    image: gamelink_web:latest
     ports:
       - 8443:8443
     environment:
       - SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/gamelink
       - SPRING_DATASOURCE_USERNAME=postgres
-      - SPRING_DATASOURCE_PASSWORD=password
+      - SPRING_DATASOURCE_PASSWORD=123456
       - SPRING_JPA_HIBERNATE_DLL_AUTO=update
       - SPRING_JPA_SHOW_SQL=true
     restart: on-failure
@@ -19,8 +19,7 @@ services:
     restart: always
     environment:
       - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=password
+      - POSTGRES_PASSWORD=123456
       - POSTGRES_DB=gamelink
     volumes:
       - ./postgres:/var/lib/postgres
-  

backend/gamelink/docker-compose.yml renamed to backend/gamelink/docker-compose.yml~ee5419ba20496b26bc6f469daa6c3f4ca01e5a8b

@@ -17,7 +17,6 @@
 import urjc.gamelink.Configuration.Security.jwt.UserLoginService;
 import urjc.gamelink.Configuration.Security.jwt.AuthResponse.Status;
 
-
 @RestController
 @RequestMapping("/api/auth")
 public class LoginRestController {   

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

@@ -15,8 +15,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 
-
-
 @Entity(name = "tbl_user")
 public class Usero {
 

backend/gamelink/src/main/java/urjc/gamelink/Model/Usero.java

@@ -3,7 +3,6 @@
 import java.sql.Blob;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

backend/gamelink/src/main/java/urjc/gamelink/Model/Videogame.java

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

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=Nekowa10
+spring.datasource.password=password
 spring.jpa.hibernate.ddl-auto=create-drop
 
 logging.level.org.springframework.security=DEBUG

backend/gamelink/target/classes/application.properties

@@ -18,6 +18,7 @@
     "@angular/platform-browser": "~13.3.0",
     "@angular/platform-browser-dynamic": "~13.3.0",
     "@angular/router": "~13.3.0",
+    "bootstrap": "^5.1.3",
     "rxjs": "~7.5.0",
     "tslib": "^2.3.0",
     "zone.js": "~0.11.4"