Fixed some bugs and added footer to new windows

Arquisoft · Apr 16, 2024 · a7d54fb · a7d54fb
1 parent 47dd931
commit a7d54fb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -171,18 +171,15 @@ export const Nav = () => {
           >
             WIQ
           </Typography>
-          
+
           <Typography
             variant="p"
             component="div"
             style={{ color: color, marginLeft: 15 }}
           >
           <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
@@ -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/>
         </>
     )
 }