From d7321917bfb658b5121bd67b7c6f4a7b34cd1099 Mon Sep 17 00:00:00 2001 From: jls846 Date: Sat, 1 Nov 2025 19:33:54 -0600 Subject: [PATCH 1/4] Modidicaciones en uso de any --- src/app/(Operador)/Escaner/page.tsx | 9 --------- src/components/BarcodeScanner.tsx | 21 +++++++++++++-------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/app/(Operador)/Escaner/page.tsx b/src/app/(Operador)/Escaner/page.tsx index 5369618..e1f486a 100644 --- a/src/app/(Operador)/Escaner/page.tsx +++ b/src/app/(Operador)/Escaner/page.tsx @@ -49,15 +49,6 @@ export default function Dashboard() { } }; -<<<<<<< HEAD - // Cerrar sesión - const cerrarSesion = () => { - localStorage.removeItem("loggedIn"); - router.push("/"); - }; - -======= ->>>>>>> c46e561af1c3cf0aa2835fee6eec718099d403cd return (
diff --git a/src/components/BarcodeScanner.tsx b/src/components/BarcodeScanner.tsx index 3d72d91..f3e151e 100644 --- a/src/components/BarcodeScanner.tsx +++ b/src/components/BarcodeScanner.tsx @@ -40,14 +40,19 @@ export default function BarcodeScanner({ onScan }: BarcodeScannerProps) { }, }, decoder: { - readers: [ - "code_128_reader", - "ean_reader", - "ean_8_reader", - "code_39_reader", - "upc_reader", - ], - }, + readers: [ + "code_128_reader", + "code_39_reader", + "code_39_vin_reader", + "ean_reader", + "ean_8_reader", + "upc_reader", + "upc_e_reader", + "i2of5_reader", + "2of5_reader", + "code_93_reader", + ], +}, locate: true, }; From a0e91127614c73fc4b3f6275e406b131025e2bf3 Mon Sep 17 00:00:00 2001 From: jls846 Date: Sat, 1 Nov 2025 19:57:32 -0600 Subject: [PATCH 2/4] correcion en vista escaner --- src/components/header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/header.tsx b/src/components/header.tsx index d315d97..f7eb04d 100644 --- a/src/components/header.tsx +++ b/src/components/header.tsx @@ -8,7 +8,7 @@ import { usePathname } from "next/navigation"; function Header() { const pathname = usePathname(); - const rutasConBar = ["/escaner", "/AgregarEquipo"]; + const rutasConBar = ["/Escaner", "/AgregarEquipo"]; return (
From ccf9325ba920bbe53bf9855aa18799cb81a6844e Mon Sep 17 00:00:00 2001 From: jls846 Date: Sat, 1 Nov 2025 21:01:51 -0600 Subject: [PATCH 3/4] Modificaciones a vista Repostes y editar --- src/app/reporte/page.tsx | 61 ++++----- src/app/reporte/reporte.css | 244 ++++++++++++++++++------------------ src/components/editar.css | 10 +- src/components/header.tsx | 2 +- 4 files changed, 158 insertions(+), 159 deletions(-) diff --git a/src/app/reporte/page.tsx b/src/app/reporte/page.tsx index 9d0982c..74fa30f 100644 --- a/src/app/reporte/page.tsx +++ b/src/app/reporte/page.tsx @@ -2,22 +2,9 @@ import "./reporte.css"; export default function Reporte() { return ( -
-
-
- -
- Escanear código - Equipo - Reportes -
- - -
- -
+
+ {/* Panel izquierdo: título, buscador y tabla */} +

REPORTE

@@ -26,14 +13,17 @@ export default function Reporte() { -
-
- -
-
- {/* Columna 1 */} -
+
+ {/* Aquí irá tu tabla real */} +

Tabla de equipos...

+
+
+ + {/* Panel derecho: filtros + botón descargar */} +
+
+

Filtro

@@ -73,17 +63,20 @@ export default function Reporte() { -
-
- - -
- + +
+ + +
+ +
+ +
); -} +} \ No newline at end of file diff --git a/src/app/reporte/reporte.css b/src/app/reporte/reporte.css index a276ed9..81c9f77 100644 --- a/src/app/reporte/reporte.css +++ b/src/app/reporte/reporte.css @@ -1,163 +1,169 @@ -.pestaña { - position: absolute; - top: 50%; - left: 62%; - transform: translate(-50%, -50%); - +/* Contenedor principal del reporte */ +.reporte-layout { display: flex; - justify-content: space-around; /* espacio igual entre los tres textos */ - align-items: center; - width: 45%; /* controla el ancho total del bloque central */ - font-size: 18px; - color: #003366; - font-weight: bold; - z-index: 5; /* por encima del logo */ + flex-wrap: wrap; + gap: 50px; + padding: 20px; + max-width: 1400px; + margin: 0 20px; } -.pestaña span { +/* Panel izquierdo: contenedor + tabla */ +.panel-izquierdo { flex: 1; + min-width: 300px; /* evita que se colapse demasiado en móviles */ +} + +/* Panel derecho: filtro */ +.panel-derecho { + width: 320px; /* ancho fijo razonable para filtros */ + min-width: 280px; +} + +.titulo-reporte { + font-weight: bold; + font-size: 24px; text-align: center; - cursor: pointer; - transition: color 0.3s; + margin-bottom: 15px; + color: #0056b3; } -.pestaña span:hover { - color: #b8870b; /* cambia de color al pasar el cursor */ -} - -.titulo-reporte{ - font-weight: bold; /* negrita */ - font-size: 24px; /* tamaño de texto */ - font-family: Arial, sans-serif; -} - -/*BUSCADOR*/ - -input[type="text"] { - width: 500px; /* más ancho, más largo */ - padding: 7px; /* mantiene espacio cómodo dentro */ - font-size: 18px; - border: 1px solid #ccc; - border-radius: 4px; -} - -button { - padding: 8px 12px; - font-size: 16px; - border: none; - background-color: #007bff; - color: white; - border-radius: 4px; - cursor: pointer; -} - -button:hover { - background-color: #0056b3; -} -.contenedor{ - margin-left: 80px; -} - -.filtro-rec{ - border: 2px solid #003366; /* Color del borde */ - border-radius: 10px; /* Bordes redondeados */ - padding: 10px; /* Espacio interno */ - margin: 80px 550px; /* Separación del resto del contenido */ - background-color: #f9f9f9; - position: relative; - left: 380px; - font-family: Arial, sans-serif; - top: -570px; /* sube 50px respecto a su posición original */ - - -} - -/* Estilos para los selects */ -select { - padding: 8px 12px; - border: 1px solid #003366; - border-radius: 5px; - background-color: white; - font-size: 14px; - width: 100%; - margin-bottom: 10px; -} - -select:focus { - border-color: #003366; - box-shadow: 0 0 4px rgba(0, 51, 102, 0.3); - outline: none; -} - -/* Botón de buscar */ +/* Buscador */ form[action="/buscar"] { display: flex; gap: 10px; - margin: 20px 0; - + margin-bottom: 20px; + align-items: center; + flex-wrap: wrap; } form[action="/buscar"] input { padding: 8px 12px; border: 1px solid #ccc; border-radius: 5px; - width: 300px; + font-size: 16px; + flex: 1; + min-width: 200px; } form[action="/buscar"] button { - background-color: #003366; + background-color: #0056b3; color: white; border: none; padding: 8px 16px; border-radius: 5px; cursor: pointer; + font-size: 16px; } +form[action="/buscar"] button:hover { + background-color: #0056b3; +} + +/* Tabla de reporte */ +.tabla-rec { + border: 2px solid #0056b3; + border-radius: 10px; + padding: 15px; + background-color: #f9f9f9; + min-height: 400px; + width: 100%; + box-sizing: border-box; +} + +/* Filtro */ +.filtro-rec { + border: 2px solid #0056b3; + border-radius: 10px; + padding: 15px; + background-color: #f9f9f9; + font-family: Arial, sans-serif; + width: 100%; + box-sizing: border-box; +} + +.filtro-rec .titulo-rec { + font-weight: bold; + margin-top: 0; + margin-bottom: 10px; + color: #0056b3; +} + +.filtro-rec label { + display: block; + margin-top: 12px; + font-weight: bold; + font-size: 14px; +} + +.filtro-rec select { + width: 100%; + padding: 8px; + margin-top: 4px; + border: 1px solid #0056b3; + border-radius: 5px; + font-size: 14px; +} + +/* Botones del filtro */ .botones-filtro { display: flex; - justify-content: flex-end; /* botones a la derecha */ - gap: 10px; /* espacio entre botones */ - margin-top: 15px; /* separación del resto del formulario */ + gap: 10px; + margin-top: 20px; } -.aplicar { - background-color: #003366; - color: white; +.botones-filtro .aplicar, +.botones-filtro .limpiar { + flex: 1; + padding: 8px; border: none; - padding: 8px 16px; border-radius: 4px; - cursor: pointer; - font-size: 14px; -} - -.limpiar { - background-color: #b8870b; color: white; - border: none; - padding: 8px 16px; - border-radius: 4px; - cursor: pointer; font-size: 14px; + cursor: pointer; } -.tabla-rec{ - border: 2px solid #003366; /* Color del borde */ - border-radius: 10px; /* Bordes redondeados */ - padding: 10px; /* Espacio interno */ - margin: 50px 700px 0 80px; /* superior, derecha, inferior, izquierda */ - background-color: #f9f9f9; - font-family: Arial, sans-serif; - height: 400px; +.botones-filtro .aplicar { + background-color: #0056b3; } -.boton-descargar{ - padding: 8px 12px; +.botones-filtro .limpiar { + background-color: #ffb700; + color: #0056b3; + font-weight: bold; +} + +/* Botón descargar */ +.boton-descargar { + margin-top: 25px; + padding: 10px 20px; font-size: 16px; border: none; - background-color: #003366; + background-color: #0056b3; color: white; border-radius: 4px; cursor: pointer; - right: 30px; - margin-left: 700px; + width: 100%; +} + +/* Responsive: en pantallas pequeñas (iPad portrait, etc.) */ +@media (max-width: 768px) { + .reporte-layout { + flex-direction: column; + align-items: center; + } + + .panel-derecho { + width: 100%; + max-width: 500px; + } + + .panel-izquierdo { + width: 100%; + max-width: 500px; + } + + .boton-descargar { + max-width: 500px; + } } \ No newline at end of file diff --git a/src/components/editar.css b/src/components/editar.css index 45f1238..78b4d9c 100644 --- a/src/components/editar.css +++ b/src/components/editar.css @@ -26,7 +26,7 @@ input { } input:focus { - border-color: #003366; + border-color: #0056b3; box-shadow: 0 0 4px rgba(0, 51, 102, 0.3); } @@ -59,7 +59,7 @@ input:focus { width: 35%; /* ajusta el ancho del bloque de texto */ font-size: 18px; font-weight: bold; - color: #003366; + color: #0056b3; z-index: 5; } @@ -89,7 +89,7 @@ input:focus { margin-bottom: 8px; /* un poco de espacio debajo del título */ } .linea { - border-bottom: 2px solid #003366; /* color y grosor de la línea */ + border-bottom: 2px solid #0056b3; /* color y grosor de la línea */ width: 100%; /* ocupa toda la columna */ margin-bottom: 10px; /* espacio entre línea y los campos */ } @@ -102,7 +102,7 @@ input:focus { } .guardar { background-color: #b8870b; - color: #003366; + color: #0056b3; border: none; padding: 8px 16px; border-radius: 4px; @@ -110,7 +110,7 @@ input:focus { font-size: 14px; } .cancelar { - background-color: #003366; + background-color: #0056b3; color: white; border: none; padding: 8px 16px; diff --git a/src/components/header.tsx b/src/components/header.tsx index f7eb04d..97cd1ae 100644 --- a/src/components/header.tsx +++ b/src/components/header.tsx @@ -8,7 +8,7 @@ import { usePathname } from "next/navigation"; function Header() { const pathname = usePathname(); - const rutasConBar = ["/Escaner", "/AgregarEquipo"]; + const rutasConBar = ["/Escaner", "/AgregarEquipo","/reporte"]; return (
From 7fe625b42c3e126d8520d94b009d3cc20a81bb77 Mon Sep 17 00:00:00 2001 From: jls846 Date: Tue, 4 Nov 2025 13:15:59 -0600 Subject: [PATCH 4/4] Modificaciones a vista forgodPassword --- .../(Administrador)/forgotPassword/page.tsx | 14 +- src/app/styles/layout/ForgotPasswordPage.scss | 125 ++++++++++++++++++ 2 files changed, 126 insertions(+), 13 deletions(-) create mode 100644 src/app/styles/layout/ForgotPasswordPage.scss diff --git a/src/app/(Administrador)/forgotPassword/page.tsx b/src/app/(Administrador)/forgotPassword/page.tsx index ff68644..49bb198 100644 --- a/src/app/(Administrador)/forgotPassword/page.tsx +++ b/src/app/(Administrador)/forgotPassword/page.tsx @@ -4,7 +4,7 @@ import { useState } from "react"; import axios from "axios"; import { useRouter } from "next/navigation"; import toast from "react-hot-toast"; -import "../../styles/base/globales.scss"; // ajusta ruta si tu proyecto la tiene en otro sitio +import "../../styles/layout/ForgotPasswordPage.scss"; // ajusta ruta si tu proyecto la tiene en otro sitio import Link from "next/link"; export default function ForgotPasswordPage() { @@ -46,7 +46,6 @@ export default function ForgotPasswordPage() { return (

¿Olvidaste tu contraseña?

@@ -67,22 +66,11 @@ export default function ForgotPasswordPage() { onChange={(e) => setEmail(e.target.value)} placeholder="tu@correo.com" required - style={{ - padding: "0.6rem", - borderRadius: 8, - border: "1px solid #ccc", - }} /> diff --git a/src/app/styles/layout/ForgotPasswordPage.scss b/src/app/styles/layout/ForgotPasswordPage.scss new file mode 100644 index 0000000..567d813 --- /dev/null +++ b/src/app/styles/layout/ForgotPasswordPage.scss @@ -0,0 +1,125 @@ +// ===================================== +// Forgot Password Page Styles (sin variables) +// ===================================== + +.forgot-password-page { + max-width: 520px; + margin: 15rem auto; + padding: 2rem; + background: #ffffff; + border-radius: 1rem; + box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1); + color: #222; + transition: background 0.3s ease, color 0.3s ease; + + @media (max-width: 768px) { + margin: 2rem auto; + padding: 1.5rem; + } + + h1 { + font-size: 1.8rem; + font-weight: 600; + margin-bottom: 0.75rem; + text-align: center; + color: #1a73e8; + } + + p { + font-size: 1rem; + line-height: 1.5; + margin-bottom: 1.5rem; + text-align: center; + color: #555; + } + + // Formulario principal + .forgot-form { + display: grid; + gap: 1rem; + + label { + font-weight: 500; + color: #222; + } + + input[type="email"] { + padding: 0.6rem 0.8rem; + border: 1px solid #ccc; + border-radius: 8px; + font-size: 1rem; + transition: border-color 0.2s ease, box-shadow 0.2s ease; + + &:focus { + border-color: #1a73e8; + box-shadow: 0 0 0 3px rgba(26, 115, 232, 0.15); + outline: none; + } + } + + button[type="submit"] { + background-color: #1a73e8; + color: #fff; + font-weight: 600; + padding: 0.75rem 1rem; + border-radius: 8px; + border: none; + cursor: pointer; + transition: background-color 0.3s ease, transform 0.2s ease; + + &:hover:not(:disabled) { + background-color: #155fc0; + transform: translateY(-2px); + } + + &:disabled { + background-color: #b3d0ff; + cursor: not-allowed; + } + } + + a { + display: inline-block; + font-size: 0.9rem; + color: #1a73e8; + text-decoration: none; + text-align: center; + + &:hover { + text-decoration: underline; + } + } + } +} + +// ===================================== +// Modo oscuro (opcional) +// ===================================== + +[data-theme="dark"] .forgot-password-page { + background: #1e1e1e; + color: #eee; + + input[type="email"] { + background: #2a2a2a; + border-color: #444; + color: #f3f3f3; + + &:focus { + border-color: #4a90e2; + box-shadow: 0 0 0 3px rgba(74, 144, 226, 0.2); + } + } + + button[type="submit"] { + background-color: #4a90e2; + + &:hover:not(:disabled) { + background-color: #357ab8; + } + } + + a { + color: #82b1ff; + } +}