mend

MarlonPerez-01 · MarlonPerez-01 · commit 95329dc28204 · 2021-06-01T11:58:49.000-06:00
diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -10,7 +10,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "bcryptjs": "^2.4.3",
     "cors": "^2.8.5",
     "dotenv": "^8.2.0",
     "express": "^4.17.1",
diff --git a/backend/server/controllers/login.controller.js b/backend/server/controllers/login.controller.js
@@ -17,7 +17,7 @@ export const seleccionarPorNombreU = async (req, res) => {
     }
 
     //TODO: desencriptar contrasenia
-    
+
     let pass = data[0].contrasenia;
 
     if (pass != contrasenia) {
@@ -26,7 +26,7 @@ export const seleccionarPorNombreU = async (req, res) => {
         .json({ errors: [{ msg: 'Credenciales invalidas' }] });
     }
 
-    console.log(data[0]);
+    // console.log(data[0]);
 
     const payload = {
       usuario: {
diff --git a/backend/server/middlewares/admin.js b/backend/server/middlewares/admin.js
@@ -16,8 +16,6 @@ module.exports = async (req, res, next) => {
 
     const cargo = decoded.usuario.nombre_tipo_usuario;
 
-    console.log(decoded);
-
     //si el cargo en el token no es ADMIN se deniega acceso a esta ruta
     if (cargo != 'ADMIN') {
       return res.status(401).json({ msg: 'acceso denegado' });
diff --git a/backend/server/middlewares/cajero.js b/backend/server/middlewares/cajero.js
@@ -16,8 +16,6 @@ module.exports = async (req, res, next) => {
 
     const cargo = decoded.usuario.nombre_tipo_usuario;
 
-    console.log(decoded);
-
     //si el cargo en el token no es CAJERO se deniega acceso a esta ruta
     if (cargo != 'CAJERO') {
       return res.status(401).json({ msg: 'acceso denegado' });
diff --git a/backend/server/models/Server.js b/backend/server/models/Server.js
@@ -27,7 +27,9 @@ export class Server {
   }
 
   middlewares() {
-    this.app.use(cors({ origin: 'http://localhost:3000' }));
+    this.app.use(
+      cors({ origin: ['http://localhost:3000', 'http://localhost:5000'] })
+    );
     this.app.use(express.json());
     this.app.use(express.urlencoded({ extended: true }));
     this.app.use(morgan('dev'));
diff --git a/frontend/src/components/Error.jsx b/frontend/src/components/Error.jsx
@@ -4,4 +4,4 @@ const Error = ({ mensaje }) => (
 	<p className='alert-danger text-center pt-3 pb-3 texto-grande'>{mensaje}</p>
 );
 
-export default Error;
+export default Error;
diff --git a/frontend/src/components/Header.jsx b/frontend/src/components/Header.jsx
@@ -11,30 +11,46 @@ const Header = () => {
   };
   const estilos = {
     maxWidth: '100%',
-    maxHeight: '4em'
+    maxHeight: '2em'
   };
   return (
     <>
+      <nav className="navbar navbar-dark bg-dark">
+        <div className="container">
+          <span className="navbar-brand">
+            Peruvian Restaurant
+          </span>
+          <input
+            className="btn text-white"
+            type="button"
+            value="Cerrar Sesión"
+            onClick={cerrarSesion}
+          />
+        </div>
+      </nav>
+    </>
+  );
+};
+
+export default Header;
+
+/*
       <nav className="navbar navbar-light bg-light">
         <div className="container-fluid">
-          <span className="navbar-brand">
             <img
-              src={process.env.PUBLIC_URL + '/logo-res.png'}
+              src={process.env.PUBLIC_URL + '/logo-res2.png'}
               alt="logo"
               className="img-fluid"
               style={estilos}
             />
-          </span>
+
           <input
-            className="btn btn-primary"
+            className="btn"
             type="button"
             value="Cerrar Sesión"
             onClick={cerrarSesion}
           />
         </div>
       </nav>
-    </>
-  );
-};
 
-export default Header;
+*/
diff --git a/frontend/src/components/assets/logo.png b/frontend/src/components/assets/logo.png
diff --git a/frontend/src/components/assets/orden.png b/frontend/src/components/assets/orden.png
diff --git a/frontend/src/components/auth/Login.jsx b/frontend/src/components/auth/Login.jsx
@@ -63,16 +63,12 @@ const Login = () => {
   //redireccionar segun el cargo
   const redireccionar = (cargo) => {
     if (cargo === 'ADMIN') {
-      console.log('Es ADMIN');
       history.push('platos');
     } else if (cargo === 'CAJERO') {
-      console.log('Es CAJERO');
       history.push('ventas');
     } else if (cargo === 'CHEF') {
-      console.log('Es CHEF');
       history.push('ordenes');
     } else {
-      console.log('desconocido');
       history.push('/');
     }
   };
@@ -109,6 +105,7 @@ const Login = () => {
                         <Error mensaje="Error en la autenticación" />
                       </div>
                     )}
+                    <div className="imageLogo"></div>
                     <h3 className="login-heading mb-4">
                       Bienvenido, Inicia Sesión
                     </h3>
diff --git a/frontend/src/components/noEncontrado/NoEncontrado.jsx b/frontend/src/components/noEncontrado/NoEncontrado.jsx
@@ -1,11 +1,24 @@
 import React from 'react';
+import '../../css/index.css';
 
 function App() {
   return (
     <>
-      <div>404 no encontrado</div>
+      <div className="container" id="mainContainer">
+        <div className="row">
+          <div className="col-2"></div>
+          <div className="col-6">
+            <img src="" alt="" />
+            <h3><strong>404</strong></h3><h4> Pagina no encontrada.</h4><br />
+            <p>La URL que fue buscada no exite.<p className="text-muted"> Intentelo de nuevo.</p></p>
+          </div>
+          <div className="col-4">
+            <img src="https://www.google.com/images/errors/robot.png" alt="" />
+          </div>
+        </div>
+      </div>
     </>
   );
 }
 
-export default App;
+export default App;
diff --git a/frontend/src/components/ordenes/Detalles.jsx b/frontend/src/components/ordenes/Detalles.jsx
@@ -3,17 +3,25 @@ import React from 'react';
 const Detalles = ({ detalles }) => {
 	return (
 		<>
+		<table className="table table-hover">                            
+			<thead>
+				<tr>
+					<th scope="col">Platillo</th>
+					<th scope="col">#</th>
+				</tr>
+			</thead>
+
+			<tbody>
 			{detalles.map((detalle) => (
-				<ul className='list-group' key={detalle.id_detalle_venta}>
-					<li className='list-group-item'>
-						<span className='text-center'>{detalle.nombre}</span>
-						{' - '}
-						<span className='text-right circle'>{detalle.cantidad}</span>
-					</li>
-				</ul>
+				<tr key={JSON.stringify(detalle)}>
+					<td>{detalle.nombre}</td>
+					<th scope="row">{detalle.cantidad}</th>
+				</tr>
 			))}
+			</tbody>
+		</table>
 		</>
 	);
 };
 
-export default Detalles;
+export default Detalles;
diff --git a/frontend/src/components/ordenes/Orden.jsx b/frontend/src/components/ordenes/Orden.jsx
@@ -1,21 +1,30 @@
 import React from 'react';
 import Detalles from './Detalles';
+import '../../css/index.css';
 
 const Orden = ({ orden, eliminar }) => {
+
+  const hora = orden.fecha.split(/[T.]/);
+  
   return (
-    <ul className="list-group mb-5 col-md-4 text-capitalize">
-      <li className="list-group-item list-group-item-primary text-center">
-        {orden.nombres} {orden.apellidos}
-      </li>
-      <Detalles detalles={orden.detalles} />
-      <input
-        type="submit"
-        className="btn btn-outline-secondary"
-        value="Orden Completada"
-        onClick={() => eliminar(orden.id_venta)}
-      ></input>
-    </ul>
+    <div className="col-3">
+      <div className="card shadow p-3 mb-5 bg-body rounded">
+        <div className="image-order"></div>
+        <div className="card-body">
+          <h3 className="card-title">Orden</h3>
+          <h6 className="card-subtitle mb-2 text-muted">Cliente: {orden.nombres} {orden.apellidos}</h6>
+          <h6 className="card-subtitle mb-2 text-muted">Hora: {hora[1]}</h6>
+          <Detalles detalles={orden.detalles} /><br />
+          <input
+            type="submit"
+            className="btn btn-success"
+            value="Orden Completada"
+            onClick={() => eliminar(orden.id_venta)}
+          ></input>
+        </div>
+      </div>
+    </div>
   );
 };
 
-export default Orden;
+export default Orden;
diff --git a/frontend/src/components/ordenes/Ordenes.jsx b/frontend/src/components/ordenes/Ordenes.jsx
@@ -61,14 +61,14 @@ const Ordenes = () => {
       console.log(err);
     }
   };
-
+  
   return (
     <>
+      <Header /><br /><br /><br /><br />
       <div className="container">
-        <Header />
         <div className="row">
-          <h1 className="col mb-4 mt-4 text-secondary">Listado de ordenes</h1>
-        </div>
+          <h1 className="display-4">Listado de ordenes </h1>
+        </div><br />
         {ordenes.length > 0 && (
           <div className="row">
             {ordenes.map((orden) => (
diff --git a/frontend/src/components/platos/Agregar.jsx b/frontend/src/components/platos/Agregar.jsx
@@ -4,7 +4,7 @@ const Agregar = ({ plato, insertar, handleAgregarChange }) => {
   return (
     <>
       <div className="row">
-        <h1 className="col mb-4 mt-4 titulo">Nuevo plato</h1>
+        <h3 className="col mb-4 mt-4">Nuevo plato</h3>
       </div>
       <form>
         <div className="form-group">
@@ -53,7 +53,7 @@ const Agregar = ({ plato, insertar, handleAgregarChange }) => {
         <input
           type="button"
           value="Agregar"
-          className="btn btn-primary mt-3"
+          className="btn btn-primary mt-3 w-100"
           onClick={insertar}
         />
       </form>
diff --git a/frontend/src/components/platos/Listado.jsx b/frontend/src/components/platos/Listado.jsx
@@ -48,7 +48,7 @@ const Listado = ({ platos, eliminar, setPlatos }) => {
 
   return (
     <>
-      <h3 className="text-secondary">Listado de platos</h3>
+      <h3 className="mt-4">Listado de platos</h3>
 
       <table className="table table-striped text-secondary">
         <thead>
diff --git a/frontend/src/components/platos/Platos.jsx b/frontend/src/components/platos/Platos.jsx
@@ -61,7 +61,7 @@ const Platos = () => {
 
   const insertar = async () => {
     //TODO: validacion de campos
-    if(!plato.nombre || !plato.descripcion || !plato.precio){
+    if (!plato.nombre || !plato.descripcion || !plato.precio) {
       return;
     }
 
@@ -96,24 +96,27 @@ const Platos = () => {
 
   return (
     <>
-    <div className="container">
-      <div className="row mb-5">
+      <div>
         <Header />
-      </div>
-      <div className="row">
-        <div className="col">
-          <Agregar
-            plato={plato}
-            insertar={insertar}
-            handleAgregarChange={handleAgregarChange}
-          />
-        </div>
-        <div className="col-8">
-          <Listado platos={platos} eliminar={eliminar} setPlatos={setPlatos} />
+        <div className="container">
+          <div className="row">
+            <div className="col">
+              <Agregar
+                plato={plato}
+                insertar={insertar}
+                handleAgregarChange={handleAgregarChange}
+              />
+            </div>
+            <div className="col-8">
+              <Listado
+                platos={platos}
+                eliminar={eliminar}
+                setPlatos={setPlatos}
+              />
+            </div>
+          </div>
         </div>
       </div>
-
-      </div>
     </>
   );
 };
diff --git a/frontend/src/components/ventas/Ventas.jsx b/frontend/src/components/ventas/Ventas.jsx
diff --git a/frontend/src/css/auth.css b/frontend/src/css/auth.css
diff --git a/frontend/src/css/index.css b/frontend/src/css/index.css
diff --git a/frontend/src/helper/fetchPlatos.js b/frontend/src/helper/fetchPlatos.js

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ export const seleccionarPorNombreU = async (req, res) => {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`//TODO: desencriptar contrasenia`
`20`		`-`
	`20`	`+`
`21`	`21`	`let pass = data[0].contrasenia;`
`22`	`22`
`23`	`23`	`if (pass != contrasenia) {`
`@@ -26,7 +26,7 @@ export const seleccionarPorNombreU = async (req, res) => {`
`26`	`26`	`.json({ errors: [{ msg: 'Credenciales invalidas' }] });`
`27`	`27`	`}`
`28`	`28`
`29`		`- console.log(data[0]);`
	`29`	`+ // console.log(data[0]);`
`30`	`30`
`31`	`31`	`const payload = {`
`32`	`32`	`usuario: {`