From 43375ef5f84b5308d1cb317a1b1929e865aee3c3 Mon Sep 17 00:00:00 2001 From: IO420 <320154041@pcpuma.acatlan.unam.mx> Date: Fri, 12 Sep 2025 18:12:38 -0600 Subject: [PATCH] fixing routes --- .example | 2 - .../ActivosMantenimiento/Page.module.css | 7 +- .../ActivosMantenimiento/page.tsx | 5 +- .../AgregarTiempo/addTime.css | 0 app/{AT => (private)}/AgregarTiempo/page.tsx | 0 app/{AT => (private)}/Alta/page.tsx | 0 .../AsignacionEquipo/asignacionEquipos..css | 0 .../AsignacionEquipo/page.tsx | 5 +- .../AsignacionMesas/asignacionmesas.css | 0 .../AsignacionMesas/page.tsx | 0 .../BitacoraSanciones}/Page.module.css | 1 - .../BitacoraSanciones/page.tsx | 125 +++++++++--------- app/{AT => (private)}/CambiarPass/page.tsx | 0 app/{AT => (private)}/Impresiones/page.tsx | 0 .../InformacionEquipo/informacionequipo.css | 0 .../InformacionEquipo/page.tsx | 0 .../Inscripciones/inscriptions.css | 0 app/{AT => (private)}/Inscripciones/page.tsx | 0 app/{AT => (private)}/Inscritos/page.tsx | 0 app/{AT => (private)}/Mensajes/mensaje.css | 0 app/{AT => (private)}/Mensajes/page.tsx | 0 app/{AT => (private)}/Monitor/Page.module.css | 1 - app/{AT => (private)}/Monitor/page.tsx | 0 app/{AT => (private)}/Programas/page.tsx | 0 .../Programas/programas.module.css | 0 .../QuitarSancion/Page.module.css | 1 - app/{AT => (private)}/QuitarSancion/page.tsx | 0 .../Reportes}/Page.module.css | 3 - .../Recibo => (private)/Reportes}/page.tsx | 4 +- app/(private)/layout.tsx | 16 +++ app/AT/layout.tsx | 5 - .../BarNavigation/BarNavigation.css | 4 + .../BarNavigation/BarNavigation.tsx | 34 ++--- app/Components/Header/Header.module.css | 1 + app/Components/Login/Login.tsx | 3 +- .../ProgramSelector/ProgramSelector.tsx | 7 +- app/Components/Receipt/Receipt.tsx | 2 +- app/Routes/LoginRedirect.tsx | 2 +- app/Routes/PrivateRoute.tsx | 1 + app/globals.css | 34 +++-- app/layout.tsx | 18 ++- app/middleware.ts | 15 +++ app/page.tsx | 13 +- package-lock.json | 86 ++++++------ package.json | 2 +- 45 files changed, 220 insertions(+), 177 deletions(-) delete mode 100644 .example rename app/{AT => (private)}/ActivosMantenimiento/Page.module.css (96%) rename app/{AT => (private)}/ActivosMantenimiento/page.tsx (97%) rename app/{AT => (private)}/AgregarTiempo/addTime.css (100%) rename app/{AT => (private)}/AgregarTiempo/page.tsx (100%) rename app/{AT => (private)}/Alta/page.tsx (100%) rename app/{AT => (private)}/AsignacionEquipo/asignacionEquipos..css (100%) rename app/{AT => (private)}/AsignacionEquipo/page.tsx (89%) rename app/{AT => (private)}/AsignacionMesas/asignacionmesas.css (100%) rename app/{AT => (private)}/AsignacionMesas/page.tsx (100%) rename app/{AT/Recibo => (private)/BitacoraSanciones}/Page.module.css (98%) rename app/{AT => (private)}/BitacoraSanciones/page.tsx (67%) rename app/{AT => (private)}/CambiarPass/page.tsx (100%) rename app/{AT => (private)}/Impresiones/page.tsx (100%) rename app/{AT => (private)}/InformacionEquipo/informacionequipo.css (100%) rename app/{AT => (private)}/InformacionEquipo/page.tsx (100%) rename app/{AT => (private)}/Inscripciones/inscriptions.css (100%) rename app/{AT => (private)}/Inscripciones/page.tsx (100%) rename app/{AT => (private)}/Inscritos/page.tsx (100%) rename app/{AT => (private)}/Mensajes/mensaje.css (100%) rename app/{AT => (private)}/Mensajes/page.tsx (100%) rename app/{AT => (private)}/Monitor/Page.module.css (98%) rename app/{AT => (private)}/Monitor/page.tsx (100%) rename app/{AT => (private)}/Programas/page.tsx (100%) rename app/{AT => (private)}/Programas/programas.module.css (100%) rename app/{AT => (private)}/QuitarSancion/Page.module.css (98%) rename app/{AT => (private)}/QuitarSancion/page.tsx (100%) rename app/{AT/BitacoraSanciones => (private)/Reportes}/Page.module.css (94%) rename app/{AT/Recibo => (private)/Reportes}/page.tsx (100%) create mode 100644 app/(private)/layout.tsx delete mode 100644 app/AT/layout.tsx create mode 100644 app/middleware.ts diff --git a/.example b/.example deleted file mode 100644 index 515bb00..0000000 --- a/.example +++ /dev/null @@ -1,2 +0,0 @@ -NEXT_PUBLIC_API_URL= -PORT= \ No newline at end of file diff --git a/app/AT/ActivosMantenimiento/Page.module.css b/app/(private)/ActivosMantenimiento/Page.module.css similarity index 96% rename from app/AT/ActivosMantenimiento/Page.module.css rename to app/(private)/ActivosMantenimiento/Page.module.css index ef4cfa4..d2c7bc7 100644 --- a/app/AT/ActivosMantenimiento/Page.module.css +++ b/app/(private)/ActivosMantenimiento/Page.module.css @@ -1,5 +1,4 @@ .tableContainer { - margin-top: 10px; overflow-y: auto; overflow-x: auto; border-radius: 4px; @@ -68,6 +67,12 @@ .resetButton:hover { background-color: #cc0000; } + +.checkbox{ + display: inline-flex; + width: 100%; +} + .checkbox-grid label { display: inline-flex; align-items: center; diff --git a/app/AT/ActivosMantenimiento/page.tsx b/app/(private)/ActivosMantenimiento/page.tsx similarity index 97% rename from app/AT/ActivosMantenimiento/page.tsx rename to app/(private)/ActivosMantenimiento/page.tsx index 9ba394e..fab5685 100644 --- a/app/AT/ActivosMantenimiento/page.tsx +++ b/app/(private)/ActivosMantenimiento/page.tsx @@ -65,7 +65,6 @@ export default function Page() { - {/* Checkboxes */}
+ ), }, { @@ -162,9 +166,9 @@ export default function Page() { label: "Sanciones", content: ( <> + +
- - @@ -203,24 +207,23 @@ export default function Page() { ))}
- -
-
- - -
-
+
+
+ + +
+
), }, diff --git a/app/AT/CambiarPass/page.tsx b/app/(private)/CambiarPass/page.tsx similarity index 100% rename from app/AT/CambiarPass/page.tsx rename to app/(private)/CambiarPass/page.tsx diff --git a/app/AT/Impresiones/page.tsx b/app/(private)/Impresiones/page.tsx similarity index 100% rename from app/AT/Impresiones/page.tsx rename to app/(private)/Impresiones/page.tsx diff --git a/app/AT/InformacionEquipo/informacionequipo.css b/app/(private)/InformacionEquipo/informacionequipo.css similarity index 100% rename from app/AT/InformacionEquipo/informacionequipo.css rename to app/(private)/InformacionEquipo/informacionequipo.css diff --git a/app/AT/InformacionEquipo/page.tsx b/app/(private)/InformacionEquipo/page.tsx similarity index 100% rename from app/AT/InformacionEquipo/page.tsx rename to app/(private)/InformacionEquipo/page.tsx diff --git a/app/AT/Inscripciones/inscriptions.css b/app/(private)/Inscripciones/inscriptions.css similarity index 100% rename from app/AT/Inscripciones/inscriptions.css rename to app/(private)/Inscripciones/inscriptions.css diff --git a/app/AT/Inscripciones/page.tsx b/app/(private)/Inscripciones/page.tsx similarity index 100% rename from app/AT/Inscripciones/page.tsx rename to app/(private)/Inscripciones/page.tsx diff --git a/app/AT/Inscritos/page.tsx b/app/(private)/Inscritos/page.tsx similarity index 100% rename from app/AT/Inscritos/page.tsx rename to app/(private)/Inscritos/page.tsx diff --git a/app/AT/Mensajes/mensaje.css b/app/(private)/Mensajes/mensaje.css similarity index 100% rename from app/AT/Mensajes/mensaje.css rename to app/(private)/Mensajes/mensaje.css diff --git a/app/AT/Mensajes/page.tsx b/app/(private)/Mensajes/page.tsx similarity index 100% rename from app/AT/Mensajes/page.tsx rename to app/(private)/Mensajes/page.tsx diff --git a/app/AT/Monitor/Page.module.css b/app/(private)/Monitor/Page.module.css similarity index 98% rename from app/AT/Monitor/Page.module.css rename to app/(private)/Monitor/Page.module.css index 8f3544d..21769a9 100644 --- a/app/AT/Monitor/Page.module.css +++ b/app/(private)/Monitor/Page.module.css @@ -1,5 +1,4 @@ .tableContainer { - margin-top: 10px; overflow-y: auto; overflow-x: auto; border-radius: 4px; diff --git a/app/AT/Monitor/page.tsx b/app/(private)/Monitor/page.tsx similarity index 100% rename from app/AT/Monitor/page.tsx rename to app/(private)/Monitor/page.tsx diff --git a/app/AT/Programas/page.tsx b/app/(private)/Programas/page.tsx similarity index 100% rename from app/AT/Programas/page.tsx rename to app/(private)/Programas/page.tsx diff --git a/app/AT/Programas/programas.module.css b/app/(private)/Programas/programas.module.css similarity index 100% rename from app/AT/Programas/programas.module.css rename to app/(private)/Programas/programas.module.css diff --git a/app/AT/QuitarSancion/Page.module.css b/app/(private)/QuitarSancion/Page.module.css similarity index 98% rename from app/AT/QuitarSancion/Page.module.css rename to app/(private)/QuitarSancion/Page.module.css index 6d44e3e..b8783c6 100644 --- a/app/AT/QuitarSancion/Page.module.css +++ b/app/(private)/QuitarSancion/Page.module.css @@ -1,5 +1,4 @@ .tableContainer { - margin-top: 10px; overflow-y: auto; overflow-x: auto; border-radius: 4px; diff --git a/app/AT/QuitarSancion/page.tsx b/app/(private)/QuitarSancion/page.tsx similarity index 100% rename from app/AT/QuitarSancion/page.tsx rename to app/(private)/QuitarSancion/page.tsx diff --git a/app/AT/BitacoraSanciones/Page.module.css b/app/(private)/Reportes/Page.module.css similarity index 94% rename from app/AT/BitacoraSanciones/Page.module.css rename to app/(private)/Reportes/Page.module.css index 5ca56ef..d48a3c1 100644 --- a/app/AT/BitacoraSanciones/Page.module.css +++ b/app/(private)/Reportes/Page.module.css @@ -1,5 +1,4 @@ .tableContainer { - margin-top: 10px; overflow-y: auto; overflow-x: auto; border-radius: 4px; @@ -14,8 +13,6 @@ width: 100%; border-collapse: collapse; table-layout: auto; - margin-top: 1rem; - margin-bottom: 1rem; } .machineTable th, diff --git a/app/AT/Recibo/page.tsx b/app/(private)/Reportes/page.tsx similarity index 100% rename from app/AT/Recibo/page.tsx rename to app/(private)/Reportes/page.tsx index effe827..83ec4bd 100644 --- a/app/AT/Recibo/page.tsx +++ b/app/(private)/Reportes/page.tsx @@ -35,8 +35,8 @@ export default function Page() { label: "Por recibo", content: ( <> -
+
@@ -69,8 +69,8 @@ export default function Page() { label: "Por Servicio", content: ( <> -
+
diff --git a/app/(private)/layout.tsx b/app/(private)/layout.tsx new file mode 100644 index 0000000..78eaa06 --- /dev/null +++ b/app/(private)/layout.tsx @@ -0,0 +1,16 @@ +import { ReactNode } from "react"; +import { PrivateRoute } from "../Routes/PrivateRoute"; +import BarNavigation from "../Components/BarNavigation/BarNavigation"; + +export default function PrivateLayout({ children }: { children: ReactNode }) { + return ( +
+ +
+
+ {children} +
+
+ ); +} +//IO diff --git a/app/AT/layout.tsx b/app/AT/layout.tsx deleted file mode 100644 index a71b9ca..0000000 --- a/app/AT/layout.tsx +++ /dev/null @@ -1,5 +0,0 @@ -import { PrivateRoute } from "../Routes/PrivateRoute"; - -export default function PrivateLayout({ children }: { children: React.ReactNode }) { - return {children}; -} diff --git a/app/Components/BarNavigation/BarNavigation.css b/app/Components/BarNavigation/BarNavigation.css index 0418e63..0c85b77 100644 --- a/app/Components/BarNavigation/BarNavigation.css +++ b/app/Components/BarNavigation/BarNavigation.css @@ -1,8 +1,12 @@ .barNavigation { + position: absolute; text-align: center; background-color: rgb(1, 92, 184); padding: 0 20px; display: flex; + width: 100%; + top: 0; + min-height: 40px; } .barNavigation ul { diff --git a/app/Components/BarNavigation/BarNavigation.tsx b/app/Components/BarNavigation/BarNavigation.tsx index cd45bca..0066584 100644 --- a/app/Components/BarNavigation/BarNavigation.tsx +++ b/app/Components/BarNavigation/BarNavigation.tsx @@ -26,13 +26,13 @@ function BarNavigation() {
  • toggleSubMenu(0)}>Inscripciones
      - +
    • Alta
    • - +
    • Agregar Tiempo
    • - +
    • Inscripciones
    @@ -41,16 +41,16 @@ function BarNavigation() {
  • toggleSubMenu(1)}>Servicios
      - +
    • Impresiones y Ploteo
    • - +
    • Asignacion de Mesas
    • - +
    • Asignacion de Equipos
    • - +
    • Monitor
    @@ -59,16 +59,16 @@ function BarNavigation() {
  • toggleSubMenu(2)}>Equipo
      - +
    • Informacion de Equipos
    • - +
    • Activos y en Mantenimiento
    • - +
    • Mensajes
    • - +
    • Programas
    @@ -77,24 +77,24 @@ function BarNavigation() {
  • toggleSubMenu(3)}>Reportes
      - -
    • Recibo
    • + +
    • Reportes
    • - +
    • Inscritos
    • - +
    • Bitacora y sanciones
  • - + Quitar sancion
  • - + Cambiar contraseña
  • diff --git a/app/Components/Header/Header.module.css b/app/Components/Header/Header.module.css index 4f27880..855b651 100644 --- a/app/Components/Header/Header.module.css +++ b/app/Components/Header/Header.module.css @@ -2,6 +2,7 @@ position: relative; filter: invert(1); z-index: 3; + margin: 5px; } .cedetecContainer { diff --git a/app/Components/Login/Login.tsx b/app/Components/Login/Login.tsx index 88ebd13..f714e06 100644 --- a/app/Components/Login/Login.tsx +++ b/app/Components/Login/Login.tsx @@ -1,8 +1,9 @@ 'use client'; import { useState } from "react"; -import "./Login.css"; import { loginUser } from "@/app/lib/login"; +import "./Login.css"; + function Login() { const [user, setUser] = useState(""); const [password, setPassword] = useState(""); diff --git a/app/Components/ProgramSelector/ProgramSelector.tsx b/app/Components/ProgramSelector/ProgramSelector.tsx index c3b034d..d08e070 100644 --- a/app/Components/ProgramSelector/ProgramSelector.tsx +++ b/app/Components/ProgramSelector/ProgramSelector.tsx @@ -13,10 +13,10 @@ function ProgramSelector({ titulo, opcion }: DatosEquipo) {
    {/* Label dinámico con el título que recibimos */} - + {/* Renderizamos UN solo + - {/* Aquí puedes poner más - {/* Lista de checkboxes (esto lo podrías optimizar igual con .map) */}