Merge pull request #179 from Arquisoft/review2-changes

Change .pngs for .svgs, and modify the app style

src/main/java/com/uniovi/components/MultipleQuestionGenerator.java

@@ -1,7 +1,6 @@
 package com.uniovi.components;
 
 import com.uniovi.components.generators.QuestionGenerator;
-import com.uniovi.entities.Category;
 import com.uniovi.entities.Question;
 
 import java.util.ArrayList;

src/main/java/com/uniovi/components/QuestionGeneratorTestController.java

@@ -1,13 +1,7 @@
 package com.uniovi.components;
 
-import com.uniovi.components.generators.geography.CapitalQuestionGenerator;
-import com.uniovi.entities.Question;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @RestController
 public class QuestionGeneratorTestController {
 

src/main/java/com/uniovi/configuration/CustomConfiguration.java

@@ -1,14 +1,11 @@
 package com.uniovi.configuration;
 
-import jakarta.persistence.EntityManagerFactory;
-import org.hibernate.SessionFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.web.PageableHandlerMethodArgumentResolver;
-import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.LocaleResolver;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

src/main/java/com/uniovi/controllers/GameController.java

@@ -81,13 +81,13 @@ public String getCheckResult(@PathVariable Long idQuestion, @PathVariable Long i
             || getRemainingTime(gameSession) <= 0) {
             model.addAttribute("correctAnswer", gameSession.getCurrentQuestion().getCorrectAnswer());
             model.addAttribute("messageKey", "timeRunOut.result");
-            model.addAttribute("logoImage", "/images/logo_incorrect.png");
+            model.addAttribute("logoImage", "/images/logo_incorrect.svg");
             gameSession.addAnsweredQuestion(gameSession.getCurrentQuestion());
             gameSession.addQuestion(false, 0);
         }
         else if(questionService.checkAnswer(idQuestion, idAnswer)) {
             model.addAttribute("messageKey", "correctAnswer.result");
-            model.addAttribute("logoImage", "/images/logo_correct.png");
+            model.addAttribute("logoImage", "/images/logo_correct.svg");
 
             if (!gameSession.isAnswered(gameSession.getCurrentQuestion())) {
                 gameSession.addQuestion(true, getRemainingTime(gameSession));
@@ -97,7 +97,7 @@ else if(questionService.checkAnswer(idQuestion, idAnswer)) {
         } else {
             model.addAttribute("correctAnswer", gameSession.getCurrentQuestion().getCorrectAnswer());
             model.addAttribute("messageKey", "failedAnswer.result");
-            model.addAttribute("logoImage", "/images/logo_incorrect.png");
+            model.addAttribute("logoImage", "/images/logo_incorrect.svg");
             gameSession.addAnsweredQuestion(gameSession.getCurrentQuestion());
             gameSession.addQuestion(false, 0);
         }

src/main/java/com/uniovi/controllers/HomeController.java

@@ -1,18 +1,13 @@
 package com.uniovi.controllers;
 
-import com.uniovi.entities.ApiKey;
 import com.uniovi.entities.Player;
 import com.uniovi.services.ApiKeyService;
 import com.uniovi.services.PlayerService;
-import com.uniovi.services.QuestionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.Random;
 
 @Controller
 public class HomeController{

src/main/java/com/uniovi/dto/AnswerDto.java

@@ -1,6 +1,5 @@
 package com.uniovi.dto;
 
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 

src/main/java/com/uniovi/entities/Answer.java

@@ -1,6 +1,5 @@
 package com.uniovi.entities;
 
-import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;

src/main/java/com/uniovi/repositories/GameSessionRepository.java

@@ -1,13 +1,11 @@
 package com.uniovi.repositories;
 
-import com.uniovi.entities.Answer;
 import com.uniovi.entities.GameSession;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-
 import com.uniovi.entities.Player;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
 
 import java.util.List;
 

src/main/resources/static/css/custom.css

@@ -23,13 +23,13 @@ footer {
 
 
 /* Estilo personalizado para el botón */
-.btn-custom, .page-link {
+.btn-custom, .btn-primary, .page-link {
     color: #fff;
     background-color: transparent;
     border: 2px solid #fff;
 }
 
-.btn-custom:hover, .page-link:hover {
+.btn-custom:hover, .btn-primary:hover, .page-link:hover {
     background-color: #fff;
     color: #000;
 }
@@ -42,3 +42,24 @@ footer {
 .table-hover tbody tr:hover td {
     background: white;
 }
+
+.col-md-12 .display-4 {
+    font-size: 10em;
+}
+
+.col-md-12 .lead, .col-md-12 .btn {
+    font-size: 1.75em;
+}
+
+
+.nav {
+    background-color: transparent !important;
+}
+
+.nav .nav-link {
+    color: white !important; /* Cambia el color del texto del enlace a blanco */
+}
+
+.nav .nav-link:hover {
+    color: rgba(255, 255, 255, 0.7) !important; /* Cambia el color del texto del enlace cuando se pasa el mouse */
+}

src/main/resources/static/css/game.css

@@ -2,7 +2,7 @@
     position: relative;
     text-align: center;
     width: 35%;
-    margin: auto;
+    margin: 2% auto;
 }
 
 .countdown {
@@ -11,16 +11,16 @@
     left: 50%;
     transform: translate(-50%, -50%);
     font-size: 2em;
-    color: black;
+    color: white;
 }
 .stopwatch-img {
     width: 45%;
     height: auto;
 }
 
 .game-logo {
-    margin: 0 0 5% 0;
-    width: 25%;
+    margin: auto;
+    width: 15%;
     height: auto;
 }
 
@@ -45,4 +45,15 @@
     .countdown {
          font-size: 3em;
      }
+}
+
+.container .btn {
+    color: #fff;
+    background-color: transparent;
+    border: 2px solid #fff;
+}
+
+.container .btn:hover {
+    background-color: #fff;
+    color: #000;
 }