Skip to content

Commit

Permalink
Merge pull request #2 from Kingsman-Construccion-de-software/actualiza
Browse files Browse the repository at this point in the history
Actualiza
  • Loading branch information
Bdelas777 authored May 2, 2023
2 parents 5ec846c + 1063255 commit 80f7c82
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 18 deletions.
31 changes: 18 additions & 13 deletions TestHero/ClientApp/src/App.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,27 @@
import React, { Component } from 'react';
import { Route, Routes } from 'react-router-dom';
import AppRoutes from './AppRoutes';
import { Layout } from './components/Layout';
import './custom.css';
import React, { Component } from "react";
import { Route, Routes } from "react-router-dom";
import AppRoutes from "./AppRoutes";
import { Layout } from "./components/Layout";
import "./custom.css";
import Login from "./Pages/login/Login";

export default class App extends Component {
static displayName = App.name;

render() {
return (
<Layout>
<Routes>
{AppRoutes.map((route, index) => {
const { element, ...rest } = route;
return <Route key={index} {...rest} element={element} />;
})}
</Routes>
</Layout>
// <Layout>
// {/* <Routes>
// {AppRoutes.map((route, index) => {
// const { element, ...rest } = route;
// return <Route key={index} {...rest} element={element} />;
// })}
// </Routes> */}

// </Layout>
<div>
<Login />
</div>
);
}
}
11 changes: 9 additions & 2 deletions TestHero/ClientApp/src/Pages/login/Login.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ import logo from "../../assets/logo.png";
// import { AuthContext } from "../../context/AuthContext";
// import CircularProgress from "@mui/material/CircularProgress";

/**
* @author: Bernardo de la Sierra
* @license: GP
* @version: 1.0.0
* Esta clase esta dedica al login
*/
export default function Login() {
const nombre = useRef();
const password = useRef();
Expand All @@ -19,6 +25,7 @@ export default function Login() {
// };

// console.log(usuario);

return (
<div className="login">
<div className="loginWrapper">
Expand All @@ -28,15 +35,15 @@ export default function Login() {
</div>
<form className="loginBox">
{/* onSubmit={handleClick} */}
<p class="texto">Usuario:</p>
<p class="texto">Usuario</p>
<input
placeholder="Nombre de usuario"
type="nombre"
className="loginInput"
ref={nombre}
required
/>
<p class="texto">Contraseña:</p>
<p class="texto">Contraseña</p>
<input
placeholder="Contraseña"
type="password"
Expand Down
8 changes: 5 additions & 3 deletions TestHero/ClientApp/src/Pages/login/login.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
.login {
width: 100vw;
height: 100vh;
width: 120vw;
height: 140vh;
background-color: #f0f2f5;
display: flex;
align-items: center;
justify-content: center;
/* background-image: url("../../../public/assets/fondo.jpg"); */
background-image: url("../..//assets/fondo.jpg");
background-size: 120vw 140vh;
}

.loginWrapper {
Expand Down Expand Up @@ -77,6 +78,7 @@
.texto {
font-size: 25px;
font-weight: bold;
color: #f0f2f5;
}

.imagen {
Expand Down
File renamed without changes
File renamed without changes

0 comments on commit 80f7c82

Please sign in to comment.