From fe164c08dcf16341fb7a0da64ecc047a4444ac1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Monteser=C3=ADn=20Rodr=C3=ADguez?=
 <uo288524@uniovi.es>
Date: Thu, 11 Apr 2024 20:39:36 +0200
Subject: [PATCH 1/9] Added some visual changes

---
 webapp/src/components/home/Home.css |  2 +-
 webapp/src/components/home/Home.js  | 19 +++++++++++--------
 webapp/tailwind.config.js           |  4 +++-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/webapp/src/components/home/Home.css b/webapp/src/components/home/Home.css
index 676732e4..87b1baa8 100644
--- a/webapp/src/components/home/Home.css
+++ b/webapp/src/components/home/Home.css
@@ -1,7 +1,7 @@
 
 p,h1,h2,h3,h4,h5,h6,span {
   font-family: Consolas, monaco, serif;
-  color:#FFFFFF;
+  /*color:#FFFFFF;*/
 }
 
 .buttonGradient {
diff --git a/webapp/src/components/home/Home.js b/webapp/src/components/home/Home.js
index ad611281..8f9983d5 100644
--- a/webapp/src/components/home/Home.js
+++ b/webapp/src/components/home/Home.js
@@ -78,8 +78,8 @@ export const Home = () =>
             <Container
                 component="main"
                 maxWidth="md"
-                sx={{ display: "flex", flexDirection: "row", alignItems: "center", justifyContent: "center", minHeight: "85vh", backgroundColor:"rgb(23 23 23 / var(--tw-bg-opacity))"}}
-                className="bg-teal-50 dark:bg-zinc-800 min-h-screen flex  justify-center place-content-between rounded-lg flex"
+                sx={{ display: "flex", flexDirection: "row", alignItems: "center", justifyContent: "center"}}
+                className="bg-white dark:bg-dark-mode min-h-screen flex  justify-center place-content-between rounded-lg flex"
             >
                 <Container
                     className="bg-teal-50 dark:bg-zinc-800 rounded-lg flex "
@@ -95,7 +95,7 @@ export const Home = () =>
                             alignItems: "left"
 
                         }}
-                        className="bg-white dark:bg-dark-mode text-black dark:text-white "
+                        className="bg-teal-50 dark:bg-zinc-800 text-black dark:text-white "
                     >
                        <img src = {bannerLight} alt="WiQ" className="block dark:hidden" />
                        <img src = {bannerDark} alt="WiQ" className="hidden dark:block" />
@@ -136,12 +136,15 @@ export const Home = () =>
                                 from-cyan-50 via-cyan-300 to blue-500
                                 dark:from-orange-500 dark:via-purple-500 dark:to-pink-500
                                 buttonGradient">
-                                    <span className="text-black dark:text-white text">JUGAR</span>
+                                    <span className="text-black dark:text-white text bg-light-blue dark:bg-dark-purple">JUGAR</span>
                                 </button>
                         </div>
                         <div className="flex align-middle justify-center flex-grow m-3">
-                            <button onClick={openTagSelection} className="buttonGradient">
-                                    <span className="text-black dark:text-white ">Elige las tags</span>
+                            <button onClick={openTagSelection} className="bg-gradient-to-r
+                                from-cyan-50 via-cyan-300 to blue-500
+                                dark:from-orange-500 dark:via-purple-500 dark:to-pink-500
+                                buttonGradient">
+                                    <span className="text-black dark:text-white text bg-light-blue dark:bg-dark-purple ">Elige las tags</span>
                             </button>
 
                         </div>
@@ -167,7 +170,7 @@ export const Home = () =>
                             transform: 'translateY(-50%) translateX(-50%)',
                             left: '50%'
                         }}>
-                        <IconButton aria-label="close" color="secondary" onClick={closeTagSelection} className="self-end p-2">
+                        <IconButton aria-label="close" color="inherit" onClick={closeTagSelection} className="self-end p-2">
                             <CancelIcon />
                         </IconButton>
                         <Box>
@@ -178,7 +181,7 @@ export const Home = () =>
                             <div id="tagBox">
                                 {tags.map((tag) =>
                                     <Chip
-                                        className="tagChip text-black dark:text-white"
+                                        className="tagChip text-black dark:text-white bg-light-blue dark:bg-dark-purple"
                                         key={tag.name}
                                         onClick={(e) => toggleTag(e, tag)}
                                         variant="outlined"
diff --git a/webapp/tailwind.config.js b/webapp/tailwind.config.js
index 447314c3..d6f84818 100644
--- a/webapp/tailwind.config.js
+++ b/webapp/tailwind.config.js
@@ -7,7 +7,9 @@ module.exports = {
   theme: {
     extend: {
       backgroundColor: {
-        'dark-mode': '#171717'
+        'dark-mode': '#171717',
+        'dark-purple': '#2A153E',
+        'light-blue': '#88d5f1',
       },
       backgroundImage: {
         'light': "url('/src/media/wiq_banner.light.png')",

From 6768c8a6a279b07f2af9e1fe579e245bd39b7e88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Monteser=C3=ADn=20Rodr=C3=ADguez?=
 <uo288524@uniovi.es>
Date: Thu, 11 Apr 2024 21:26:21 +0200
Subject: [PATCH 2/9] Some visual changes and added about us

---
 webapp/src/components/home/Home.css | 4 +---
 webapp/src/components/home/Home.js  | 4 +++-
 webapp/src/components/nav/Nav.js    | 8 +++++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/webapp/src/components/home/Home.css b/webapp/src/components/home/Home.css
index 87b1baa8..a604f33d 100644
--- a/webapp/src/components/home/Home.css
+++ b/webapp/src/components/home/Home.css
@@ -55,13 +55,11 @@ p,h1,h2,h3,h4,h5,h6,span {
 
 div.tagChip {
   border-width: 2px;
-
   margin:0.5em;
-  border-color: #c08f49;
 }
 
 div.tagChip[data-active="true"]{
-  background: rgb(49, 5, 87);
+  background: #ebd3b2;
 }
 
 
diff --git a/webapp/src/components/home/Home.js b/webapp/src/components/home/Home.js
index 8f9983d5..15275b02 100644
--- a/webapp/src/components/home/Home.js
+++ b/webapp/src/components/home/Home.js
@@ -181,14 +181,16 @@ export const Home = () =>
                             <div id="tagBox">
                                 {tags.map((tag) =>
                                     <Chip
-                                        className="tagChip text-black dark:text-white bg-light-blue dark:bg-dark-purple"
+                                        className="tagChip  border-cyan-500 dark:border-purple-500"
                                         key={tag.name}
                                         onClick={(e) => toggleTag(e, tag)}
                                         variant="outlined"
                                         label={tag.name}
                                         data-active={tag.active}
+                                        color = "secondary"
 
                                     >
+                                        
                                     </Chip>
 
                                 )}
diff --git a/webapp/src/components/nav/Nav.js b/webapp/src/components/nav/Nav.js
index d57d655b..4dd9d0c3 100644
--- a/webapp/src/components/nav/Nav.js
+++ b/webapp/src/components/nav/Nav.js
@@ -127,7 +127,13 @@ export const Nav = () => {
           >
             WIQ
           </Typography>
-
+          <Typography
+            variant="h6"
+            component="div"
+            style={{ color: color }}
+          >
+          <a href="https://github.com/Arquisoft/wiq_es1c" target="_blank" rel="noopener noreferrer"> Sobre nosotros</a>
+          </Typography>
           <IconButton size="large" color="inherit" data-testid="change-color">
             <NightlightIcon onClick={changeTheme} style={{ color: color }} />
           </IconButton>

From 48016ca0631b10bf88bab03285ad6ba19f300f0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Monteser=C3=ADn=20Rodr=C3=ADguez?=
 <uo288524@uniovi.es>
Date: Sat, 13 Apr 2024 20:26:22 +0200
Subject: [PATCH 3/9] Created footer

---
 webapp/package-lock.json                 | 171 +++++++++++++++++++++++
 webapp/package.json                      |   1 +
 webapp/src/components/footer/Footer.js   |  15 ++
 webapp/src/components/game/Game.js       |   2 +
 webapp/src/components/history/History.js |   2 +
 webapp/src/components/home/Home.js       |   2 +
 webapp/src/components/profile/Profile.js |   3 +-
 7 files changed, 195 insertions(+), 1 deletion(-)
 create mode 100644 webapp/src/components/footer/Footer.js

diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index 35532466..6f178d89 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -17,6 +17,7 @@
         "@testing-library/user-event": "^14.5.2",
         "axios": "^1.6.5",
         "history": "^5.3.0",
+        "mdb-react-ui-kit": "^7.2.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-native": "^0.73.5",
@@ -13732,6 +13733,44 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/framer-motion": {
+      "version": "10.18.0",
+      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-10.18.0.tgz",
+      "integrity": "sha512-oGlDh1Q1XqYPksuTD/usb0I70hq95OUzmL9+6Zd+Hs4XV0oaISBa/UUMSjYiq6m8EUF32132mOJ8xVZS+I0S6w==",
+      "dependencies": {
+        "tslib": "^2.4.0"
+      },
+      "optionalDependencies": {
+        "@emotion/is-prop-valid": "^0.8.2"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      },
+      "peerDependenciesMeta": {
+        "react": {
+          "optional": true
+        },
+        "react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/framer-motion/node_modules/@emotion/is-prop-valid": {
+      "version": "0.8.8",
+      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
+      "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
+      "optional": true,
+      "dependencies": {
+        "@emotion/memoize": "0.7.4"
+      }
+    },
+    "node_modules/framer-motion/node_modules/@emotion/memoize": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
+      "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==",
+      "optional": true
+    },
     "node_modules/fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
@@ -21359,6 +21398,40 @@
       "integrity": "sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q==",
       "dev": true
     },
+    "node_modules/mdb-react-ui-kit": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/mdb-react-ui-kit/-/mdb-react-ui-kit-7.2.0.tgz",
+      "integrity": "sha512-2AoW02DL2K1k4X4PoG8k1VGkWTTskykvGpKn7fLkGOmUD2eEXOKzLhSXgw3HbaYqg4ikWM2tL86M4oxRCtZdWg==",
+      "dependencies": {
+        "@popperjs/core": "2.11.5",
+        "clsx": "1.1.1",
+        "framer-motion": "^10.16.4",
+        "react-popper": "2.3.0"
+      },
+      "peerDependencies": {
+        "@types/react": "^18.0.9",
+        "@types/react-dom": "^18.0.3",
+        "react": "^18.1.0",
+        "react-dom": "^18.1.0"
+      }
+    },
+    "node_modules/mdb-react-ui-kit/node_modules/@popperjs/core": {
+      "version": "2.11.5",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz",
+      "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
+    "node_modules/mdb-react-ui-kit/node_modules/clsx": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz",
+      "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/mdn-data": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
@@ -25774,6 +25847,11 @@
       "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
       "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
     },
+    "node_modules/react-fast-compare": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
+      "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
+    },
     "node_modules/react-is": {
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
@@ -26018,6 +26096,20 @@
         "node": ">=12"
       }
     },
+    "node_modules/react-popper": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.3.0.tgz",
+      "integrity": "sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==",
+      "dependencies": {
+        "react-fast-compare": "^3.0.1",
+        "warning": "^4.0.2"
+      },
+      "peerDependencies": {
+        "@popperjs/core": "^2.0.0",
+        "react": "^16.8.0 || ^17 || ^18",
+        "react-dom": "^16.8.0 || ^17 || ^18"
+      }
+    },
     "node_modules/react-refresh": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
@@ -30922,6 +31014,14 @@
         "makeerror": "1.0.12"
       }
     },
+    "node_modules/warning": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+      "dependencies": {
+        "loose-envify": "^1.0.0"
+      }
+    },
     "node_modules/watchpack": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
@@ -42010,6 +42110,32 @@
         "map-cache": "^0.2.2"
       }
     },
+    "framer-motion": {
+      "version": "10.18.0",
+      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-10.18.0.tgz",
+      "integrity": "sha512-oGlDh1Q1XqYPksuTD/usb0I70hq95OUzmL9+6Zd+Hs4XV0oaISBa/UUMSjYiq6m8EUF32132mOJ8xVZS+I0S6w==",
+      "requires": {
+        "@emotion/is-prop-valid": "^0.8.2",
+        "tslib": "^2.4.0"
+      },
+      "dependencies": {
+        "@emotion/is-prop-valid": {
+          "version": "0.8.8",
+          "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
+          "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
+          "optional": true,
+          "requires": {
+            "@emotion/memoize": "0.7.4"
+          }
+        },
+        "@emotion/memoize": {
+          "version": "0.7.4",
+          "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
+          "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==",
+          "optional": true
+        }
+      }
+    },
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
@@ -47809,6 +47935,29 @@
       "integrity": "sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q==",
       "dev": true
     },
+    "mdb-react-ui-kit": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/mdb-react-ui-kit/-/mdb-react-ui-kit-7.2.0.tgz",
+      "integrity": "sha512-2AoW02DL2K1k4X4PoG8k1VGkWTTskykvGpKn7fLkGOmUD2eEXOKzLhSXgw3HbaYqg4ikWM2tL86M4oxRCtZdWg==",
+      "requires": {
+        "@popperjs/core": "2.11.5",
+        "clsx": "1.1.1",
+        "framer-motion": "^10.16.4",
+        "react-popper": "2.3.0"
+      },
+      "dependencies": {
+        "@popperjs/core": {
+          "version": "2.11.5",
+          "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz",
+          "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw=="
+        },
+        "clsx": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz",
+          "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA=="
+        }
+      }
+    },
     "mdn-data": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
@@ -50906,6 +51055,11 @@
       "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
       "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
     },
+    "react-fast-compare": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
+      "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
+    },
     "react-is": {
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
@@ -51104,6 +51258,15 @@
         }
       }
     },
+    "react-popper": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.3.0.tgz",
+      "integrity": "sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==",
+      "requires": {
+        "react-fast-compare": "^3.0.1",
+        "warning": "^4.0.2"
+      }
+    },
     "react-refresh": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
@@ -54874,6 +55037,14 @@
         "makeerror": "1.0.12"
       }
     },
+    "warning": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
     "watchpack": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
diff --git a/webapp/package.json b/webapp/package.json
index 4d01ad14..4fbe4c77 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -12,6 +12,7 @@
     "@testing-library/user-event": "^14.5.2",
     "axios": "^1.6.5",
     "history": "^5.3.0",
+    "mdb-react-ui-kit": "^7.2.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-native": "^0.73.5",
diff --git a/webapp/src/components/footer/Footer.js b/webapp/src/components/footer/Footer.js
new file mode 100644
index 00000000..038d507e
--- /dev/null
+++ b/webapp/src/components/footer/Footer.js
@@ -0,0 +1,15 @@
+import React from 'react';
+import { MDBFooter } from 'mdb-react-ui-kit';
+
+export const Footer= () => {
+  return (
+    <MDBFooter  className='bg-teal-50 dark:bg-zinc-800'>
+      <div className='text-center p-3' style={{ backgroundColor: 'rgba(0, 0, 0, 0.2)' }}>
+        &copy; {new Date().getFullYear()} Copyright:{' '}
+        <a className='text-dark' href='https://mdbootstrap.com/'>
+          MDBootstrap.com
+        </a>
+      </div>
+    </MDBFooter>
+  );
+}
\ No newline at end of file
diff --git a/webapp/src/components/game/Game.js b/webapp/src/components/game/Game.js
index 9e66bce1..cf3dabdb 100644
--- a/webapp/src/components/game/Game.js
+++ b/webapp/src/components/game/Game.js
@@ -4,6 +4,7 @@ import {Button, Box, Container, CssBaseline,Typography, Grid, Paper, LinearProgr
 import bannerDark from '../../media/wiq_banner.png';
 import { startNewGame, nextQuestion, awnser, getEndTime, getGameSettings } from "../../services/game.service";
 import { Nav } from '../nav/Nav';
+import {Footer} from '../footer/Footer';
 import {useLocation} from "react-router-dom";
 import Swal from 'sweetalert2';
 
@@ -258,6 +259,7 @@ export const Game = () => {
             </Box>
         </Container>
     </Container>
+    <Footer/>
     </>
   )
 }
diff --git a/webapp/src/components/history/History.js b/webapp/src/components/history/History.js
index 814474bd..5622ab5c 100644
--- a/webapp/src/components/history/History.js
+++ b/webapp/src/components/history/History.js
@@ -18,6 +18,7 @@ import CancelIcon from '@mui/icons-material/Cancel';
 import CheckCircleIcon from '@mui/icons-material/CheckCircle';
 import { getHistory } from "../../services/user.service"
 import { Nav } from '../nav/Nav';
+import {Footer} from '../footer/Footer';
 import { CssBaseline } from '@mui/material';
 import StringColorChip from './ColorChip';
 
@@ -131,6 +132,7 @@ export const History = () => {
                     </Table>
                 </TableContainer>
             </Container>
+            <Footer/>
         </>
     )
 }
\ No newline at end of file
diff --git a/webapp/src/components/home/Home.js b/webapp/src/components/home/Home.js
index 15275b02..ae9423ba 100644
--- a/webapp/src/components/home/Home.js
+++ b/webapp/src/components/home/Home.js
@@ -4,6 +4,7 @@ import { getCurrentUser } from "../../services/user.service";
 import bannerDark from '../../media/wiq_banner.png';
 import bannerLight from '../../media/wiq_banner.light.png';
 import { Nav } from '../nav/Nav';
+import {Footer} from '../footer/Footer';
 import './Home.css';
 import {useNavigate} from "react-router-dom";
 import CancelIcon from "@mui/icons-material/Cancel";
@@ -203,6 +204,7 @@ export const Home = () =>
 
             </Container>
         )}
+        <Footer/>
         </>
     )
 }
diff --git a/webapp/src/components/profile/Profile.js b/webapp/src/components/profile/Profile.js
index 55002580..2a8f88ff 100644
--- a/webapp/src/components/profile/Profile.js
+++ b/webapp/src/components/profile/Profile.js
@@ -3,6 +3,7 @@ import { getCurrentUser, getCreationDate, getHistory } from "../../services/user
 import {Box, Container, CssBaseline,Typography,Icon, CircularProgress } from "@mui/material";
 import AccountCircle from '@mui/icons-material/AccountCircle';
 import { Nav } from '../nav/Nav';
+import {Footer} from '../footer/Footer';
 
 
 export const Profile = () =>{
@@ -180,7 +181,7 @@ export const Profile = () =>{
             <CssBaseline />
             </Container>
         </Container>
-        
+        <Footer/>
         </>
     )
 }
\ No newline at end of file

From 0403d961c7cb8b2607e133c3a044ffc718e0463e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Monteser=C3=ADn=20Rodr=C3=ADguez?=
 <uo288524@uniovi.es>
Date: Sun, 14 Apr 2024 10:32:40 +0200
Subject: [PATCH 4/9] Fixed visual problems and added a simple test to footer

---
 webapp/src/components/footer/Footer.js      | 12 +++++++-----
 webapp/src/components/footer/Footer.test.js | 20 ++++++++++++++++++++
 webapp/src/components/nav/Nav.js            |  4 ++--
 3 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 webapp/src/components/footer/Footer.test.js

diff --git a/webapp/src/components/footer/Footer.js b/webapp/src/components/footer/Footer.js
index 038d507e..05906dd1 100644
--- a/webapp/src/components/footer/Footer.js
+++ b/webapp/src/components/footer/Footer.js
@@ -1,13 +1,15 @@
 import React from 'react';
 import { MDBFooter } from 'mdb-react-ui-kit';
+//import './Footer.css';
 
 export const Footer= () => {
   return (
-    <MDBFooter  className='bg-teal-50 dark:bg-zinc-800'>
-      <div className='text-center p-3' style={{ backgroundColor: 'rgba(0, 0, 0, 0.2)' }}>
-        &copy; {new Date().getFullYear()} Copyright:{' '}
-        <a className='text-dark' href='https://mdbootstrap.com/'>
-          MDBootstrap.com
+    
+    <MDBFooter  className='footer text-black dark:text-white bg-teal-50 dark:bg-zinc-800' style={{position: 'relative', bottom: 0, width: '100%', padding: '10px', textAlign: 'center', display: 'flex', flexDirection: 'column' }}>
+      <div className='footer-content' style={{textAlign: 'center'}}>
+        &copy; {new Date().getFullYear()} All rights reserved:{' '}
+        <a  href='https://github.com/Arquisoft/wiq_es1c'>
+          Wiq_es1c
         </a>
       </div>
     </MDBFooter>
diff --git a/webapp/src/components/footer/Footer.test.js b/webapp/src/components/footer/Footer.test.js
new file mode 100644
index 00000000..2c716202
--- /dev/null
+++ b/webapp/src/components/footer/Footer.test.js
@@ -0,0 +1,20 @@
+import React from 'react';
+import { render, screen, act, waitFor } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { MemoryRouter, BrowserRouter as Router  } from 'react-router-dom';
+import { Footer } from './Footer';
+
+
+describe("Footer component", () => {
+    beforeEach(() => localStorage.setItem("token", "manolineldelpino"));
+
+    test("renders component",async () => {
+        render(<MemoryRouter><Footer/></MemoryRouter>);
+        
+        await act(async () => {});
+
+        expect(screen.getByText(/All rights reserved:/i)).toBeInTheDocument();
+        
+
+    });
+});
\ No newline at end of file
diff --git a/webapp/src/components/nav/Nav.js b/webapp/src/components/nav/Nav.js
index 4dd9d0c3..fe8dab38 100644
--- a/webapp/src/components/nav/Nav.js
+++ b/webapp/src/components/nav/Nav.js
@@ -128,9 +128,9 @@ export const Nav = () => {
             WIQ
           </Typography>
           <Typography
-            variant="h6"
+            variant="p"
             component="div"
-            style={{ color: color }}
+            style={{ color: color, marginLeft: 15 }}
           >
           <a href="https://github.com/Arquisoft/wiq_es1c" target="_blank" rel="noopener noreferrer"> Sobre nosotros</a>
           </Typography>

From 47dd9312dddc1ada868bf8fc0b39dae4fe41aee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Monteser=C3=ADn=20Rodr=C3=ADguez?=
 <uo288524@uniovi.es>
Date: Tue, 16 Apr 2024 18:56:41 +0200
Subject: [PATCH 5/9] Well merged now

---
 webapp/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index d0c18d9f..16324580 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -25898,12 +25898,12 @@
       "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
       "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
     },
-<<<<<<< HEAD
+
     "node_modules/react-fast-compare": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
       "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
-=======
+
     "node_modules/react-i18next": {
       "version": "14.1.0",
       "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-14.1.0.tgz",
@@ -25924,7 +25924,7 @@
           "optional": true
         }
       }
->>>>>>> origin/develop
+
     },
     "node_modules/react-is": {
       "version": "17.0.2",
@@ -51166,12 +51166,12 @@
       "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
       "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
     },
-<<<<<<< HEAD
+
     "react-fast-compare": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
       "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
-=======
+
     "react-i18next": {
       "version": "14.1.0",
       "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-14.1.0.tgz",
@@ -51180,7 +51180,7 @@
         "@babel/runtime": "^7.23.9",
         "html-parse-stringify": "^3.0.1"
       }
->>>>>>> origin/develop
+
     },
     "react-is": {
       "version": "17.0.2",

From a7d54fb85ac81c840d98e45fec6ce7157d7d1d18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Monteser=C3=ADn=20Rodr=C3=ADguez?=
 <uo288524@uniovi.es>
Date: Tue, 16 Apr 2024 19:18:13 +0200
Subject: [PATCH 6/9] Fixed some bugs and added footer to new windows

---
 webapp/src/components/footer/Footer.js     | 5 +++--
 webapp/src/components/friends/Friend.js    | 2 ++
 webapp/src/components/home/Home.js         | 4 ----
 webapp/src/components/nav/Nav.js           | 7 ++-----
 webapp/src/components/settings/Settings.js | 2 ++
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/webapp/src/components/footer/Footer.js b/webapp/src/components/footer/Footer.js
index 05906dd1..b4f68f5a 100644
--- a/webapp/src/components/footer/Footer.js
+++ b/webapp/src/components/footer/Footer.js
@@ -7,10 +7,11 @@ export const Footer= () => {
     
     <MDBFooter  className='footer text-black dark:text-white bg-teal-50 dark:bg-zinc-800' style={{position: 'relative', bottom: 0, width: '100%', padding: '10px', textAlign: 'center', display: 'flex', flexDirection: 'column' }}>
       <div className='footer-content' style={{textAlign: 'center'}}>
-        &copy; {new Date().getFullYear()} All rights reserved:{' '}
+        &copy; {new Date().getFullYear()}{' '}
         <a  href='https://github.com/Arquisoft/wiq_es1c'>
-          Wiq_es1c
+          Wiq_es1c.
         </a>
+        <p>All rights reserved. </p>
       </div>
     </MDBFooter>
   );
diff --git a/webapp/src/components/friends/Friend.js b/webapp/src/components/friends/Friend.js
index 016b2c17..bac5f4be 100644
--- a/webapp/src/components/friends/Friend.js
+++ b/webapp/src/components/friends/Friend.js
@@ -4,6 +4,7 @@ import { Autocomplete, Avatar, Box, Button, Container, CssBaseline, Grid, Stack,
 import { ThemeProvider, createTheme } from '@mui/material/styles';
 import { getUsers, getCurrentUser } from "../../services/user.service";
 import { acceptRequest, getFriends, getRequests, sendRequest } from "../../services/friends.service";
+import {Footer} from '../footer/Footer';
 
 export const Friends = () => {
   const darkTheme = createTheme({
@@ -170,6 +171,7 @@ export const Friends = () => {
           </Container>
         </Container>
       </ThemeProvider>
+      <Footer/>
     </>
   );
 };
diff --git a/webapp/src/components/home/Home.js b/webapp/src/components/home/Home.js
index 4b83dc58..ef032e20 100644
--- a/webapp/src/components/home/Home.js
+++ b/webapp/src/components/home/Home.js
@@ -3,14 +3,11 @@ import {Box, IconButton, Chip, Container, CssBaseline, Modal, Typography} from "
 import CancelIcon from "@mui/icons-material/Cancel";
 import { useTranslation } from "react-i18next";
 
-import './Home.css';
 import { getCurrentUser } from "../../services/user.service";
 import { Nav } from '../nav/Nav';
 
 import {Footer} from '../footer/Footer';
 import './Home.css';
-import {useNavigate} from "react-router-dom";
-import CancelIcon from "@mui/icons-material/Cancel";
 
 import {getTags} from "../../services/question.service";
 import {useNavigate} from "react-router-dom";
@@ -166,7 +163,6 @@ export const Home = () =>
                                 from-cyan-50 via-cyan-300 to blue-500
                                 dark:from-orange-500 dark:via-purple-500 dark:to-pink-500
                                 buttonGradient">
-                                    <span className="text-black dark:text-white text bg-light-blue dark:bg-dark-purple ">Elige las tags</span>
 
                                     <span className="text-black dark:text-white text">{ t('Home.playClassic') }</span>
                                 </button>
diff --git a/webapp/src/components/nav/Nav.js b/webapp/src/components/nav/Nav.js
index 356885aa..5cbbece6 100644
--- a/webapp/src/components/nav/Nav.js
+++ b/webapp/src/components/nav/Nav.js
@@ -171,7 +171,7 @@ export const Nav = () => {
           >
             WIQ
           </Typography>
-          
+
           <Typography
             variant="p"
             component="div"
@@ -179,10 +179,7 @@ export const Nav = () => {
           >
           <a href="https://github.com/Arquisoft/wiq_es1c" target="_blank" rel="noopener noreferrer"> Sobre nosotros</a>
           </Typography>
-          <IconButton size="large" color="inherit" data-testid="change-color">
-            <NightlightIcon onClick={changeTheme} style={{ color: color }} />
-
-
+          
           <IconButton
             onClick={changeTheme}
             size="large"
diff --git a/webapp/src/components/settings/Settings.js b/webapp/src/components/settings/Settings.js
index 975aa233..04526085 100644
--- a/webapp/src/components/settings/Settings.js
+++ b/webapp/src/components/settings/Settings.js
@@ -4,6 +4,7 @@ import { Nav } from '../nav/Nav';
 import Slider from '@mui/material/Slider';
 import Grid from '@mui/material/Grid';
 import { getGameSettings, setGameSettings} from "../../services/game.service";
+import {Footer} from '../footer/Footer';
 
 export const Settings = () => {
     const token = localStorage.getItem("token");
@@ -113,6 +114,7 @@ export const Settings = () => {
                 </Container>
             </Container>
         )}
+        <Footer/>
         </>
     )
 }

From 14aa95d6e15f619772ce9e93e3604f848cfc4f0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Monteser=C3=ADn=20Rodr=C3=ADguez?=
 <uo288524@uniovi.es>
Date: Wed, 17 Apr 2024 15:09:34 +0200
Subject: [PATCH 7/9] Fixed some json problems

---
 webapp/package-lock.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index 16324580..a2eedb6c 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -25903,6 +25903,7 @@
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
       "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
+    },
 
     "node_modules/react-i18next": {
       "version": "14.1.0",
@@ -51171,7 +51172,7 @@
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
       "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
-
+    },
     "react-i18next": {
       "version": "14.1.0",
       "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-14.1.0.tgz",

From ca5db409e85805e96d1bab2c07abd12d1ca7fb95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Monteser=C3=ADn=20Rodr=C3=ADguez?=
 <uo288524@uniovi.es>
Date: Wed, 17 Apr 2024 22:59:02 +0200
Subject: [PATCH 8/9] Change complete json because something was wrong

---
 webapp/package-lock.json | 10 +---------
 webapp/package.json      |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index a2eedb6c..2362f7b6 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -18,13 +18,10 @@
         "axios": "^1.6.5",
         "flag-icons": "^7.2.1",
         "history": "^5.3.0",
-
-        "mdb-react-ui-kit": "^7.2.0",
-
         "i18next": "^23.11.1",
         "i18next-browser-languagedetector": "^7.2.1",
+        "mdb-react-ui-kit": "^7.2.0",
         "prop-types": "^15.8.1",
-
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-i18next": "^14.1.0",
@@ -25898,13 +25895,11 @@
       "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
       "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
     },
-
     "node_modules/react-fast-compare": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
       "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
     },
-
     "node_modules/react-i18next": {
       "version": "14.1.0",
       "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-14.1.0.tgz",
@@ -25925,7 +25920,6 @@
           "optional": true
         }
       }
-
     },
     "node_modules/react-is": {
       "version": "17.0.2",
@@ -51167,7 +51161,6 @@
       "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
       "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
     },
-
     "react-fast-compare": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
@@ -51181,7 +51174,6 @@
         "@babel/runtime": "^7.23.9",
         "html-parse-stringify": "^3.0.1"
       }
-
     },
     "react-is": {
       "version": "17.0.2",
diff --git a/webapp/package.json b/webapp/package.json
index 08ba8ead..c7cc6977 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -71,4 +71,4 @@
     "start-server-and-test": "^2.0.3",
     "tailwindcss": "^3.4.1"
   }
-}
+}
\ No newline at end of file

From 4c54329e33ad3f34a0cf2e7b563cb04df39f9289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Monteser=C3=ADn=20Rodr=C3=ADguez?=
 <uo288524@uniovi.es>
Date: Thu, 18 Apr 2024 21:25:09 +0200
Subject: [PATCH 9/9] Finally all tests pass

---
 webapp/src/components/footer/Footer.test.js |  2 +-
 webapp/src/components/home/Home.js          | 25 +++++----------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/webapp/src/components/footer/Footer.test.js b/webapp/src/components/footer/Footer.test.js
index 2c716202..6e2ebe28 100644
--- a/webapp/src/components/footer/Footer.test.js
+++ b/webapp/src/components/footer/Footer.test.js
@@ -13,7 +13,7 @@ describe("Footer component", () => {
         
         await act(async () => {});
 
-        expect(screen.getByText(/All rights reserved:/i)).toBeInTheDocument();
+        expect(screen.getByText(/All rights reserved./i)).toBeInTheDocument();
         
 
     });
diff --git a/webapp/src/components/home/Home.js b/webapp/src/components/home/Home.js
index 3a07569e..98d08c5c 100644
--- a/webapp/src/components/home/Home.js
+++ b/webapp/src/components/home/Home.js
@@ -3,16 +3,14 @@ import {Box, IconButton, Chip, Container, CssBaseline, Modal, Typography} from "
 import CancelIcon from "@mui/icons-material/Cancel";
 import { useTranslation } from "react-i18next";
 
+import './Home.css';
 import { getCurrentUser } from "../../services/user.service";
 import { Nav } from '../nav/Nav';
-
-import {Footer} from '../footer/Footer';
-import './Home.css';
-
 import {getTags} from "../../services/question.service";
 import {useNavigate} from "react-router-dom";
 import bannerDark from '../../media/wiq_banner.png';
 import bannerLight from '../../media/wiq_banner.light.png';
+import {Footer} from '../footer/Footer';
 
 export const Home = () => 
 {
@@ -121,7 +119,7 @@ export const Home = () =>
                             alignItems: "left"
 
                         }}
-                        className="bg-teal-50 dark:bg-zinc-800 text-black dark:text-white "
+                        className="bg-white dark:bg-dark-mode text-black dark:text-white "
                     >
                         <img src={bannerLight} alt="WiQ" className="block dark:hidden"/>
                         <img src={bannerDark} alt="WiQ" className="hidden dark:block"/>
@@ -161,15 +159,6 @@ export const Home = () =>
                                 from-cyan-50 via-cyan-300 to blue-500
                                 dark:from-orange-500 dark:via-purple-500 dark:to-pink-500
                                 buttonGradient">
-                                    <span className="text-black dark:text-white text bg-light-blue dark:bg-dark-purple">JUGAR</span>
-                                </button>
-                        </div>
-                        <div className="flex align-middle justify-center flex-grow m-3">
-                            <button onClick={openTagSelection} className="bg-gradient-to-r
-                                from-cyan-50 via-cyan-300 to blue-500
-                                dark:from-orange-500 dark:via-purple-500 dark:to-pink-500
-                                buttonGradient">
-
                                     <span className="text-black dark:text-white text">{ t('Home.playClassic') }</span>
                                 </button>
                         </div>
@@ -209,7 +198,7 @@ export const Home = () =>
                             transform: 'translateY(-50%) translateX(-50%)',
                             left: '50%'
                         }}>
-                        <IconButton aria-label="close" color="inherit" onClick={closeTagSelection} className="self-end p-2">
+                        <IconButton aria-label="close" color="secondary" onClick={closeTagSelection} className="self-end p-2">
                             <CancelIcon />
                         </IconButton>
                         <Box>
@@ -220,16 +209,14 @@ export const Home = () =>
                             <div id="tagBox">
                                 {tags.map((tag) =>
                                     <Chip
-                                        className="tagChip  border-cyan-500 dark:border-purple-500"
+                                        className="tagChip text-black dark:text-white"
                                         key={tag.name}
                                         onClick={(e) => toggleTag(e, tag)}
                                         variant="outlined"
                                         label={tag.name}
                                         data-active={tag.active}
-                                        color = "secondary"
 
                                     >
-                                        
                                     </Chip>
 
                                 )}
@@ -245,4 +232,4 @@ export const Home = () =>
         <Footer/>
         </>
     )
-}
+}
\ No newline at end of file