From 88327a4941008da45928118bbeab991e05a4c093 Mon Sep 17 00:00:00 2001 From: NataliaCancinoV Date: Sun, 28 Apr 2024 19:10:25 -0600 Subject: [PATCH] Commit integracion Login e Inicio --- frontend/package-lock.json | 11 ++++++++++- frontend/package.json | 3 ++- frontend/src/App.jsx | 1 - frontend/src/AppInicio.jsx | 2 +- frontend/src/LoginForm.jsx | 1 + frontend/src/main.jsx | 8 +++++--- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 3b906c6..6d82974 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -12,7 +12,8 @@ "@emotion/styled": "^11.11.5", "@mui/material": "^5.15.15", "react": "^18.2.0", - "react-dom": "^18.2.0" + "react-dom": "^18.2.0", + "react-icons": "^5.1.0" }, "devDependencies": { "@types/react": "^18.2.66", @@ -4065,6 +4066,14 @@ "react": "^18.2.0" } }, + "node_modules/react-icons": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.1.0.tgz", + "integrity": "sha512-D3zug1270S4hbSlIRJ0CUS97QE1yNNKDjzQe3HqY0aefp2CBn9VgzgES27sRR2gOvFK+0CNx/BW0ggOESp6fqQ==", + "peerDependencies": { + "react": "*" + } + }, "node_modules/react-is": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", diff --git a/frontend/package.json b/frontend/package.json index 463e7b2..3647e28 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -14,7 +14,8 @@ "@emotion/styled": "^11.11.5", "@mui/material": "^5.15.15", "react": "^18.2.0", - "react-dom": "^18.2.0" + "react-dom": "^18.2.0", + "react-icons": "^5.1.0" }, "devDependencies": { "@types/react": "^18.2.66", diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index b1fc4bf..5c4531b 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -5,7 +5,6 @@ function App() { return ( <>
-
) diff --git a/frontend/src/AppInicio.jsx b/frontend/src/AppInicio.jsx index e930dad..56c5c74 100644 --- a/frontend/src/AppInicio.jsx +++ b/frontend/src/AppInicio.jsx @@ -99,7 +99,7 @@ function App() { Ver más
-

Expreso Americano

+

Pastel de Chocolate

Ver más
diff --git a/frontend/src/LoginForm.jsx b/frontend/src/LoginForm.jsx index bab252b..e56a2d5 100644 --- a/frontend/src/LoginForm.jsx +++ b/frontend/src/LoginForm.jsx @@ -1,5 +1,6 @@ import React, { useState } from 'react'; import './LoginForm.css'; +import './App.css' function LoginForm() { const [loginVisible, setLoginVisible] = useState(true); diff --git a/frontend/src/main.jsx b/frontend/src/main.jsx index 54b39dd..9514f25 100644 --- a/frontend/src/main.jsx +++ b/frontend/src/main.jsx @@ -1,10 +1,12 @@ import React from 'react' import ReactDOM from 'react-dom/client' -import App from './App.jsx' -import './index.css' +//import LoginForm from './LoginForm.jsx' +//import './index.css' +import AppInicio from './AppInicio.jsx' ReactDOM.createRoot(document.getElementById('root')).render( - + {/**/} + , )