Revertir el revert y volver al commit de arreglar el despliegue

Arquisoft · Feb 19, 2024 · af82de0 · af82de0
1 parent 1b8c833
commit af82de0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 40 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/webapp/package.json b/webapp/package.json
@@ -51,6 +51,5 @@
     "puppeteer": "^21.7.0",
     "serve": "^14.2.1",
     "start-server-and-test": "^2.0.3"
-
   }
 }
diff --git a/webapp/src/App.js b/webapp/src/App.js
@@ -46,49 +46,28 @@ function App() {
 }
 
 export default App; */
-import React, { useState } from 'react';
-import AddUser from './components/AddUser';
+import React from 'react';
+import GenerateQuestion from './components/GenerateQuestion'; // Asegúrate de importar GenerateQuestion correctamente
 import Login from './components/Login';
 import CssBaseline from '@mui/material/CssBaseline';
 import Container from '@mui/material/Container';
 import Typography from '@mui/material/Typography';
-import Link from '@mui/material/Link';
+import Footer from './components/Footer';
 function App() {
-
-
-  const [showLogin, setShowLogin] = useState(true);
-
-  const handleToggleView = () => {
-    setShowLogin(!showLogin);
-  };
-
   return (
 
   <Container component="main" maxWidth="xs">
       <CssBaseline />
-
-
       <Typography component="h1" variant="h5" align="center" sx={{ marginTop: 2 }}>
-      wiq_es04c
-      {showLogin ? <Login /> : <AddUser />}
-      {showLogin ? (
-          <Link name="gotoregister" component="button" variant="body2" onClick={handleToggleView}>
-            Don't have an account? Register here.
-          </Link>
-        ) : (
-          <Link component="button" variant="body2" onClick={handleToggleView}>
-            Already have an account? Login here.
-          </Link>
-        )}
-
+        Welcome to the 2024 edition of the Software Architecture course
       </Typography>
       {/* Aquí se muestra el componente GenerateQuestion */}
 
-
+      <GenerateQuestion />
 
+      <Footer> </Footer>
     </Container>
   );
-
 }
 
 export default App;
diff --git a/webapp/src/App.test.js b/webapp/src/App.test.js
@@ -3,6 +3,6 @@ import App from './App';
 
 test('renders learn react link', () => {
   render(<App />);
-  const linkElement = screen.getByText(/wiq_es04c/i);
+  const linkElement = screen.getByText(/Welcome to the 2024 edition of the Software Architecture course/i);
   expect(linkElement).toBeInTheDocument();
 });
diff --git a/webapp/src/index.js b/webapp/src/index.js
@@ -5,8 +5,6 @@ import App from './App';
 import reportWebVitals from './reportWebVitals';
 /*funcion q representa la barra de navegacion superior*/
 import Navbar from './components/NavBar';
-import Footer from './components/Footer';
-
 const root = ReactDOM.createRoot(document.getElementById('root'));
 
 root.render(
@@ -16,9 +14,6 @@ root.render(
 
     <App />
 
-
-    <Footer> </Footer>
-
   </React.StrictMode>
 );