diff --git a/webapp/src/App.js b/webapp/src/App.js index fb36455..93e9c85 100644 --- a/webapp/src/App.js +++ b/webapp/src/App.js @@ -4,8 +4,8 @@ import Layout from './components/Layout'; // Asegúrate de importar el nuevo com import Home from './components/pages/Home'; import Historial from './components/pages/Historial'; import Jugar from './components/pages/Jugar'; -import SignUp from './components/AddUser'; -import LogIn from './components/Login'; +import SignUp from './components/pages/AddUser'; +import LogIn from './components/pages/Login'; import { AuthProvider } from './AuthContext'; import Logout from "./components/Logout"; import AboutUS from "./components/pages/AboutUS"; diff --git a/webapp/src/components/Navbar.js b/webapp/src/components/Navbar.js index 87f4430..142558d 100644 --- a/webapp/src/components/Navbar.js +++ b/webapp/src/components/Navbar.js @@ -26,24 +26,31 @@ function Navbar() { {isLoggedIn ? ( <> -
  • - Jugar -
  • -
  • - Historial -
  • -
  • - Salir -
  • + +
  • + Jugar +
  • +
  • + Historial +
  • +
  • + About US +
  • +
  • + Salir +
  • ) : ( <> -
  • - Registrarse -
  • -
  • - Entrar -
  • +
  • + About US +
  • +
  • + Registrarse +
  • +
  • + Entrar +
  • )} diff --git a/webapp/src/components/pages/AboutUS.js b/webapp/src/components/pages/AboutUS.js index 0d5b2a6..8b38e36 100644 --- a/webapp/src/components/pages/AboutUS.js +++ b/webapp/src/components/pages/AboutUS.js @@ -14,14 +14,14 @@ function AboutUS() { src='images/design.jpg' // Asegúrate de cambiar esta imagen por una representativa del diseño gráfico text='Estudiantes innovadores que transformaron la visión del proyecto con su diseño gráfico.' label='Diseño Gráfico' - path='/areas/diseno-grafico' + path='https://arquisoft.github.io/wiq_es04d/' /> {/* Lógica de API de Wikidata */} diff --git a/webapp/src/components/AddUser.js b/webapp/src/components/pages/AddUser.js similarity index 100% rename from webapp/src/components/AddUser.js rename to webapp/src/components/pages/AddUser.js diff --git a/webapp/src/components/AddUser.test.js b/webapp/src/components/pages/AddUser.test.js similarity index 100% rename from webapp/src/components/AddUser.test.js rename to webapp/src/components/pages/AddUser.test.js diff --git a/webapp/src/components/Login.js b/webapp/src/components/pages/Login.js similarity index 97% rename from webapp/src/components/Login.js rename to webapp/src/components/pages/Login.js index 2117483..cab88be 100644 --- a/webapp/src/components/Login.js +++ b/webapp/src/components/pages/Login.js @@ -1,7 +1,7 @@ import React, { useState, useContext } from 'react'; import axios from 'axios'; import { Container, Typography, Button,TextField, Snackbar } from '@mui/material'; -import { AuthContext } from '../AuthContext'; +import { AuthContext } from '../../AuthContext'; import {Link, useNavigate} from "react-router-dom"; const Login = () => { diff --git a/webapp/src/components/Login.test.js b/webapp/src/components/pages/Login.test.js similarity index 97% rename from webapp/src/components/Login.test.js rename to webapp/src/components/pages/Login.test.js index 9f0fa6e..8baf056 100644 --- a/webapp/src/components/Login.test.js +++ b/webapp/src/components/pages/Login.test.js @@ -3,7 +3,7 @@ import { render, fireEvent, screen, waitFor, act } from '@testing-library/react' import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; import Login from './Login'; -import {AuthProvider} from "../AuthContext"; +import {AuthProvider} from "../../AuthContext"; import {MemoryRouter} from "react-router-dom"; const mockAxios = new MockAdapter(axios);