From 3bd6d6b7c2f4c790f970df609306b056228a236e Mon Sep 17 00:00:00 2001 From: IO420 <320154041@pcpuma.acatlan.unam.mx> Date: Fri, 26 Sep 2025 16:56:07 -0600 Subject: [PATCH] restructuring layout --- app/(private)/ActivosMantenimiento/page.tsx | 10 +-- app/(private)/AgregarTiempo/page.tsx | 18 +++-- app/(private)/Alta/page.tsx | 69 +------------------ app/(private)/Alta/style.css | 23 +++++++ .../AsignacionEquipo/asignacionEquipos..css | 29 -------- app/(private)/AsignacionEquipo/page.tsx | 4 +- .../AsignacionMesas/asignacionmesas.css | 29 -------- app/(private)/AsignacionMesas/page.tsx | 4 +- app/(private)/BitacoraSanciones/page.tsx | 10 +-- app/(private)/CambiarPass/page.tsx | 11 ++- app/(private)/Impresiones/page.tsx | 15 ++-- app/(private)/InformacionEquipo/page.tsx | 6 +- .../inscriptions.css | 0 .../{Inscripciones => Inscripcion}/page.tsx | 28 ++++++-- app/(private)/Mensajes/page.tsx | 4 +- app/(private)/Programas/page.tsx | 1 - app/(private)/QuitarSancion/page.tsx | 2 +- app/(private)/Reportes/page.tsx | 6 +- app/(private)/layout.tsx | 10 ++- .../ActivosMantenimiento/Areas.tsx | 0 .../ActivosMantenimiento/Equipos.tsx | 0 .../ActivosMantenimiento/Mesas.tsx | 0 .../{ => Equipo}/Equipos/equipos.tsx | 0 .../EviarMensaje/EnviarMensaje.tsx | 0 .../ProgramSelector/ProgramSelector.tsx | 0 .../{ => Global}/AlertBox/AlertBox.css | 0 .../{ => Global}/AlertBox/AlertBox.tsx | 0 .../{ => Global}/ClearParams/ClearParams.tsx | 0 .../{ => Global}/Information/information.tsx | 0 .../{ => Global}/SearchUser/searchUser.css | 0 .../{ => Global}/SearchUser/searchUser.tsx | 0 .../StepNavigator/StepNavigator.css | 0 .../StepNavigator/StepNavigator.tsx | 0 app/Components/{ => Global}/Toggle/Toggle.tsx | 0 .../visual/FallingSquares/FallingSquares.tsx | 0 .../visual/FallingSquares/style.css | 0 .../{ => Global}/visual/GlobalAlert.tsx | 6 +- .../{ => Global}/visual/Wave/wave.module.css | 0 .../{ => Global}/visual/Wave/wavesBack.tsx | 0 .../Inscripciones/Alta/registerAlta.tsx | 68 ++++++++++++++++++ app/Components/Receipt/Receipt.tsx | 4 +- .../BitacoraSanciones/BitacoraAlumno.tsx | 0 .../BitacoraSanciones/BitacoraEquipo.tsx | 0 .../BitacoraSanciones/BitacoraMesas.tsx | 0 .../BitacoraSanciones/Page.module.css | 0 .../BitacoraSanciones/Sanciones.tsx | 4 +- .../{ => Reportes}/SearchDate/SearchDate.tsx | 0 .../SearchDateBetween/SearchDateBetween.tsx | 2 +- .../Impressions/Impressions.css | 0 .../Impressions/impressions.tsx | 0 .../ChangePassword/changePassword.tsx | 0 app/Components/{ => auth}/Login/Login.css | 0 app/Components/{ => auth}/Login/Login.tsx | 2 +- app/Components/{ => auth}/Logout/Logout.css | 0 app/Components/{ => auth}/Logout/Logout.tsx | 0 .../BarNavigation/BarNavigation.css | 0 .../BarNavigation/BarNavigation.tsx | 6 +- .../{ => layout}/Footer/Footer.module.css | 0 app/Components/{ => layout}/Footer/Footer.tsx | 0 .../{ => layout}/Header/Header.module.css | 0 app/Components/{ => layout}/Header/Header.tsx | 0 app/globals.css | 1 + app/layout.tsx | 6 +- app/page.tsx | 4 +- 64 files changed, 187 insertions(+), 195 deletions(-) create mode 100644 app/(private)/Alta/style.css delete mode 100644 app/(private)/AsignacionEquipo/asignacionEquipos..css delete mode 100644 app/(private)/AsignacionMesas/asignacionmesas.css rename app/(private)/{Inscripciones => Inscripcion}/inscriptions.css (100%) rename app/(private)/{Inscripciones => Inscripcion}/page.tsx (55%) rename app/Components/{ => Equipo}/ActivosMantenimiento/Areas.tsx (100%) rename app/Components/{ => Equipo}/ActivosMantenimiento/Equipos.tsx (100%) rename app/Components/{ => Equipo}/ActivosMantenimiento/Mesas.tsx (100%) rename app/Components/{ => Equipo}/Equipos/equipos.tsx (100%) rename app/Components/{ => Equipo}/EviarMensaje/EnviarMensaje.tsx (100%) rename app/Components/{ => Equipo}/ProgramSelector/ProgramSelector.tsx (100%) rename app/Components/{ => Global}/AlertBox/AlertBox.css (100%) rename app/Components/{ => Global}/AlertBox/AlertBox.tsx (100%) rename app/Components/{ => Global}/ClearParams/ClearParams.tsx (100%) rename app/Components/{ => Global}/Information/information.tsx (100%) rename app/Components/{ => Global}/SearchUser/searchUser.css (100%) rename app/Components/{ => Global}/SearchUser/searchUser.tsx (100%) rename app/Components/{ => Global}/StepNavigator/StepNavigator.css (100%) rename app/Components/{ => Global}/StepNavigator/StepNavigator.tsx (100%) rename app/Components/{ => Global}/Toggle/Toggle.tsx (100%) rename app/Components/{ => Global}/visual/FallingSquares/FallingSquares.tsx (100%) rename app/Components/{ => Global}/visual/FallingSquares/style.css (100%) rename app/Components/{ => Global}/visual/GlobalAlert.tsx (78%) rename app/Components/{ => Global}/visual/Wave/wave.module.css (100%) rename app/Components/{ => Global}/visual/Wave/wavesBack.tsx (100%) create mode 100644 app/Components/Inscripciones/Alta/registerAlta.tsx rename app/Components/{ => Reportes}/BitacoraSanciones/BitacoraAlumno.tsx (100%) rename app/Components/{ => Reportes}/BitacoraSanciones/BitacoraEquipo.tsx (100%) rename app/Components/{ => Reportes}/BitacoraSanciones/BitacoraMesas.tsx (100%) rename app/Components/{ => Reportes}/BitacoraSanciones/Page.module.css (100%) rename app/Components/{ => Reportes}/BitacoraSanciones/Sanciones.tsx (95%) rename app/Components/{ => Reportes}/SearchDate/SearchDate.tsx (100%) rename app/Components/{ => Reportes}/SearchDateBetween/SearchDateBetween.tsx (96%) rename app/Components/{ => Servicios}/Impressions/Impressions.css (100%) rename app/Components/{ => Servicios}/Impressions/impressions.tsx (100%) rename app/Components/{ => auth}/ChangePassword/changePassword.tsx (100%) rename app/Components/{ => auth}/Login/Login.css (100%) rename app/Components/{ => auth}/Login/Login.tsx (97%) rename app/Components/{ => auth}/Logout/Logout.css (100%) rename app/Components/{ => auth}/Logout/Logout.tsx (100%) rename app/Components/{ => layout}/BarNavigation/BarNavigation.css (100%) rename app/Components/{ => layout}/BarNavigation/BarNavigation.tsx (95%) rename app/Components/{ => layout}/Footer/Footer.module.css (100%) rename app/Components/{ => layout}/Footer/Footer.tsx (100%) rename app/Components/{ => layout}/Header/Header.module.css (100%) rename app/Components/{ => layout}/Header/Header.tsx (100%) diff --git a/app/(private)/ActivosMantenimiento/page.tsx b/app/(private)/ActivosMantenimiento/page.tsx index 658d7c9..61bb673 100644 --- a/app/(private)/ActivosMantenimiento/page.tsx +++ b/app/(private)/ActivosMantenimiento/page.tsx @@ -1,9 +1,9 @@ "use client"; -import SearchUser from "@/app/Components/SearchUser/searchUser"; -import Equipos from "@/app/Components/ActivosMantenimiento/Equipos"; -import Toggle from "@/app/Components/Toggle/Toggle"; -import Areas from "@/app/Components/ActivosMantenimiento/Areas"; -import Mesas from "@/app/Components/ActivosMantenimiento/Mesas"; +import Areas from "@/app/Components/Equipo/ActivosMantenimiento/Areas"; +import Mesas from "@/app/Components/Equipo/ActivosMantenimiento/Mesas"; +import Equipos from "@/app/Components/Equipo/Equipos/equipos"; +import SearchUser from "@/app/Components/Global/SearchUser/searchUser"; +import Toggle from "@/app/Components/Global/Toggle/Toggle"; export default function Page(props: { searchParams?: Promise<{ diff --git a/app/(private)/AgregarTiempo/page.tsx b/app/(private)/AgregarTiempo/page.tsx index d3658bb..466ad4e 100644 --- a/app/(private)/AgregarTiempo/page.tsx +++ b/app/(private)/AgregarTiempo/page.tsx @@ -1,7 +1,7 @@ -import SearchUser from "@/app/Components/SearchUser/searchUser"; -import Information from "@/app/Components/Information/information"; +import SearchUser from "@/app/Components/Global/SearchUser/searchUser"; +import Information from "@/app/Components/Global/Information/information"; import Receipt from "@/app/Components/Receipt/Receipt"; -import AlertBox from "@/app/Components/AlertBox/AlertBox"; +import AlertBox from "@/app/Components/Global/AlertBox/AlertBox"; import { GetStudent } from "@/app/lib/getStudent"; @@ -16,12 +16,18 @@ export default async function Page(props: { }) { const params = await props.searchParams; const numAcount = params?.numAcount ? params.numAcount : null; - const showSuccess = params?.success ? parseInt(params.success) : null; - const showError = params?.error ? params.error : null; + const showSuccess = params?.success ? params.success : null; + let showError = params?.error ? params.error : null; let student: any = null; if (numAcount) { - student = await GetStudent(parseInt(numAcount)); + const result = await GetStudent(parseInt(numAcount)); + + if (result.error) { + showError = "Alumno no encontrado"; + } else { + student = result; + } } return ( diff --git a/app/(private)/Alta/page.tsx b/app/(private)/Alta/page.tsx index 54113ab..f78797d 100644 --- a/app/(private)/Alta/page.tsx +++ b/app/(private)/Alta/page.tsx @@ -1,75 +1,12 @@ -"use client"; -import { useState } from "react"; -import StepNavigator from "@/app/Components/StepNavigator/StepNavigator"; +import RegisterAlta from "@/app/Components/Inscripciones/Alta/registerAlta"; +import "./style.css"; export default function Page() { - const [step, setStep] = useState(1); - const [major, setMajor] = useState(""); - return (

ALTA

- console.log()}> -
- - setUser(e.target.value)} - placeholder="Coloca un número de cuenta..." - /> - - - setUser(e.target.value)} - placeholder="Coloca el nombre" - /> - - - setUser(e.target.value)} - placeholder="Coloca el apellido paterno" - /> - - - setUser(e.target.value)} - placeholder="Coloca el apellido materno" - /> -
-
- - setUser(e.target.value)} - placeholder="Coloca " - /> - - - setUser(e.target.value)} - placeholder="Coloca " - /> - - - - - -
-
+
); } diff --git a/app/(private)/Alta/style.css b/app/(private)/Alta/style.css new file mode 100644 index 0000000..bf559d8 --- /dev/null +++ b/app/(private)/Alta/style.css @@ -0,0 +1,23 @@ +.gridAlta { + display: grid; + grid-template-columns: 1fr 1fr; +} +.containerAlta { + background-color: #f9f9f9; + width: 100%; + max-width: 900px; + padding: 1rem; + border-radius: 4px; +} + +@media (max-width: 800px) { + .gridAlta { + grid-template-columns: 1fr; + justify-items: center; + min-width: max-content; + } + + .containerAlta { + width: 80%; + } +} diff --git a/app/(private)/AsignacionEquipo/asignacionEquipos..css b/app/(private)/AsignacionEquipo/asignacionEquipos..css deleted file mode 100644 index e73c9f3..0000000 --- a/app/(private)/AsignacionEquipo/asignacionEquipos..css +++ /dev/null @@ -1,29 +0,0 @@ - -.availableTablesContainer { - /* You can add specific styles for the table list here */ - width: 45%; /* Adjust width to fit the layout */ - background-color: #f9f9f9; - border-radius: 8px; - padding: 10px; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); -} - -.tableList { - list-style: none; - padding: 0; - display: flex; - flex-direction: column; /* Or use flex-wrap to make it a grid */ - height: 200px; /* Or a fixed height with overflow */ - overflow-y: auto; -} - -.tableList li { - padding: 8px; - border-bottom: 1px solid #ddd; - cursor: pointer; - transition: background-color 0.2s; -} - -.tableList li:hover { - background-color: #f0f0f0; -} diff --git a/app/(private)/AsignacionEquipo/page.tsx b/app/(private)/AsignacionEquipo/page.tsx index f4160e9..67a73e7 100644 --- a/app/(private)/AsignacionEquipo/page.tsx +++ b/app/(private)/AsignacionEquipo/page.tsx @@ -1,6 +1,6 @@ "use client"; -import SearchUser from "@/app/Components/SearchUser/searchUser"; -import Toggle from "@/app/Components/Toggle/Toggle"; +import SearchUser from "@/app/Components/Global/SearchUser/searchUser"; +import Toggle from "@/app/Components/Global/Toggle/Toggle"; export default function Page() { return ( diff --git a/app/(private)/AsignacionMesas/asignacionmesas.css b/app/(private)/AsignacionMesas/asignacionmesas.css deleted file mode 100644 index e73c9f3..0000000 --- a/app/(private)/AsignacionMesas/asignacionmesas.css +++ /dev/null @@ -1,29 +0,0 @@ - -.availableTablesContainer { - /* You can add specific styles for the table list here */ - width: 45%; /* Adjust width to fit the layout */ - background-color: #f9f9f9; - border-radius: 8px; - padding: 10px; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); -} - -.tableList { - list-style: none; - padding: 0; - display: flex; - flex-direction: column; /* Or use flex-wrap to make it a grid */ - height: 200px; /* Or a fixed height with overflow */ - overflow-y: auto; -} - -.tableList li { - padding: 8px; - border-bottom: 1px solid #ddd; - cursor: pointer; - transition: background-color 0.2s; -} - -.tableList li:hover { - background-color: #f0f0f0; -} diff --git a/app/(private)/AsignacionMesas/page.tsx b/app/(private)/AsignacionMesas/page.tsx index 7551292..6b67fd1 100644 --- a/app/(private)/AsignacionMesas/page.tsx +++ b/app/(private)/AsignacionMesas/page.tsx @@ -1,6 +1,6 @@ "use client"; -import SearchUser from "@/app/Components/SearchUser/searchUser"; -import Toggle from "@/app/Components/Toggle/Toggle"; +import SearchUser from "@/app/Components/Global/SearchUser/searchUser"; +import Toggle from "@/app/Components/Global/Toggle/Toggle"; import { useState } from "react"; export default function Page() { diff --git a/app/(private)/BitacoraSanciones/page.tsx b/app/(private)/BitacoraSanciones/page.tsx index 5d68131..0731acc 100644 --- a/app/(private)/BitacoraSanciones/page.tsx +++ b/app/(private)/BitacoraSanciones/page.tsx @@ -1,10 +1,10 @@ "use client"; -import Toggle from "@/app/Components/Toggle/Toggle"; -import Sanciones from "@/app/Components/BitacoraSanciones/Sanciones"; -import BitacoraMesas from "@/app/Components/BitacoraSanciones/BitacoraMesas"; -import BitacoraAlumno from "@/app/Components/BitacoraSanciones/BitacoraAlumno"; -import BitacoraEquipo from "@/app/Components/BitacoraSanciones/BitacoraEquipo"; +import BitacoraAlumno from "@/app/Components/Reportes/BitacoraSanciones/BitacoraAlumno"; +import BitacoraEquipo from "@/app/Components/Reportes/BitacoraSanciones/BitacoraEquipo"; +import BitacoraMesas from "@/app/Components/Reportes/BitacoraSanciones/BitacoraMesas"; +import Sanciones from "@/app/Components/Reportes/BitacoraSanciones/Sanciones"; +import Toggle from "@/app/Components/Global/Toggle/Toggle"; export default function Page() { return ( diff --git a/app/(private)/CambiarPass/page.tsx b/app/(private)/CambiarPass/page.tsx index 00fba34..66b6423 100644 --- a/app/(private)/CambiarPass/page.tsx +++ b/app/(private)/CambiarPass/page.tsx @@ -1,13 +1,12 @@ -import ChangePassword from "../../Components/ChangePassword/changePassword"; +import ChangePassword from "@/app/Components/auth/ChangePassword/changePassword"; export default function Page() { return ( -
-

Cambiar contraseña

+
+

Cambiar contraseña

- +
- ); } -//IO \ No newline at end of file +//IO diff --git a/app/(private)/Impresiones/page.tsx b/app/(private)/Impresiones/page.tsx index c83e1cd..8ebe9eb 100644 --- a/app/(private)/Impresiones/page.tsx +++ b/app/(private)/Impresiones/page.tsx @@ -1,12 +1,13 @@ -import SearchUser from "../../Components/SearchUser/searchUser"; +import SearchUser from "../../Components/Global/SearchUser/searchUser"; import Receipt from "../../Components/Receipt/Receipt"; -import Impressions from "../../Components/Impressions/impressions"; -import Toggle from "../../Components/Toggle/Toggle"; -import Information from "../../Components/Information/information"; -import AlertBox from "@/app/Components/AlertBox/AlertBox"; +import Toggle from "../../Components/Global/Toggle/Toggle"; +import Information from "../../Components/Global/Information/information"; +import AlertBox from "@/app/Components/Global/AlertBox/AlertBox"; import { GetStudent } from "@/app/lib/getStudent"; import "@/app/globals.css"; +import Impressions from "@/app/Components/Servicios/Impressions/impressions"; + export default async function Page(props: { searchParams?: Promise<{ numAcount: string; @@ -17,14 +18,14 @@ export default async function Page(props: { const params = await props.searchParams; const numAcount = params?.numAcount ? params.numAcount : null; const showSuccess = params?.success ? params.success : null; - let showError = params?.error ? params.error : null; + const showError = params?.error ? params.error : null; let student: any = null; + if (numAcount) { const result = await GetStudent(parseInt(numAcount)); if (result.error) { - showError = "Alumno no encontrado"; } else { student = result; } diff --git a/app/(private)/InformacionEquipo/page.tsx b/app/(private)/InformacionEquipo/page.tsx index 743d05a..0721229 100644 --- a/app/(private)/InformacionEquipo/page.tsx +++ b/app/(private)/InformacionEquipo/page.tsx @@ -1,8 +1,8 @@ -import ProgramSelector from "@/app/Components/ProgramSelector/ProgramSelector"; -import Toggle from "@/app/Components/Toggle/Toggle"; +import Toggle from "@/app/Components/Global/Toggle/Toggle"; +import ProgramSelector from "@/app/Components/Equipo/ProgramSelector/ProgramSelector"; +import Equipos from "@/app/Components/Equipo/Equipos/equipos"; import "./informacionequipo.css"; -import Equipos from "@/app/Components/Equipos/equipos"; export default function Page() { return ( diff --git a/app/(private)/Inscripciones/inscriptions.css b/app/(private)/Inscripcion/inscriptions.css similarity index 100% rename from app/(private)/Inscripciones/inscriptions.css rename to app/(private)/Inscripcion/inscriptions.css diff --git a/app/(private)/Inscripciones/page.tsx b/app/(private)/Inscripcion/page.tsx similarity index 55% rename from app/(private)/Inscripciones/page.tsx rename to app/(private)/Inscripcion/page.tsx index c14b5a4..168a4af 100644 --- a/app/(private)/Inscripciones/page.tsx +++ b/app/(private)/Inscripcion/page.tsx @@ -1,27 +1,31 @@ -import SearchUser from "@/app/Components/SearchUser/searchUser"; -import Information from "@/app/Components/Information/information"; -import StepNavigator from "@/app/Components/StepNavigator/StepNavigator"; +import SearchUser from "@/app/Components/Global/SearchUser/searchUser"; +import Information from "@/app/Components/Global/Information/information"; +import StepNavigator from "@/app/Components/Global/StepNavigator/StepNavigator"; import Receipt from "@/app/Components/Receipt/Receipt"; import Selection from "@/app/Components/Selection/Selection"; import { GetStudent } from "@/app/lib/getStudent"; import "./inscriptions.css"; +import AlertBox from "@/app/Components/Global/AlertBox/AlertBox"; export default async function Page(props: { searchParams?: Promise<{ numAcount: string; + success?: string; + error?: string; }>; }) { const params = await props.searchParams; const numAcount = params?.numAcount ? params.numAcount : null; + const showSuccess = params?.success ? params.success : null; + let showError = params?.error ? params.error : null; let student: any = null; - let error: string | null = null; if (numAcount) { const result = await GetStudent(parseInt(numAcount)); if (result.error) { - error = result.error; + showError = "Alumno no encontrado"; } else { student = result; } @@ -29,9 +33,19 @@ export default async function Page(props: { return (
+ {showError && ( + <> + + + )} + + {showSuccess && ( + + )} +

INSCRIPCION

- + {student ? ( <> @@ -44,7 +58,7 @@ export default async function Page(props: { - + ) : ( diff --git a/app/(private)/Mensajes/page.tsx b/app/(private)/Mensajes/page.tsx index ed3d6b6..4fd79b2 100644 --- a/app/(private)/Mensajes/page.tsx +++ b/app/(private)/Mensajes/page.tsx @@ -1,7 +1,7 @@ "use client"; -import EnviarMensaje from "@/app/Components/EviarMensaje/EnviarMensaje"; -import Toggle from "@/app/Components/Toggle/Toggle"; +import EnviarMensaje from "@/app/Components/Equipo/EviarMensaje/EnviarMensaje"; +import Toggle from "@/app/Components/Global/Toggle/Toggle"; export default function Page() { return ( diff --git a/app/(private)/Programas/page.tsx b/app/(private)/Programas/page.tsx index 4477740..014e048 100644 --- a/app/(private)/Programas/page.tsx +++ b/app/(private)/Programas/page.tsx @@ -3,7 +3,6 @@ import { useState } from "react"; import styleprograms from "./programas.module.css"; export default function Page() { - // modo puede ser: "ver", "editar", "nuevo" const [modo, setModo] = useState("ver"); const handleNuevo = () => { diff --git a/app/(private)/QuitarSancion/page.tsx b/app/(private)/QuitarSancion/page.tsx index 1040422..957ceb1 100644 --- a/app/(private)/QuitarSancion/page.tsx +++ b/app/(private)/QuitarSancion/page.tsx @@ -1,6 +1,6 @@ "use client"; -import SearchUser from "@/app/Components/SearchUser/searchUser"; +import SearchUser from "@/app/Components/Global/SearchUser/searchUser"; import QuitarSancion from "@/app/Components/QuitarSancion/QuitarSancion"; export default function Page() { diff --git a/app/(private)/Reportes/page.tsx b/app/(private)/Reportes/page.tsx index 9624bec..fae8ae7 100644 --- a/app/(private)/Reportes/page.tsx +++ b/app/(private)/Reportes/page.tsx @@ -2,8 +2,8 @@ import { useState } from "react"; import styles from "./Page.module.css"; // importamos el css -import Toggle from "@/app/Components/Toggle/Toggle"; -import SearchDateBetween from "@/app/Components/SearchDateBetween/SearchDateBetween"; +import Toggle from "@/app/Components/Global/Toggle/Toggle"; +import SearchDateBetween from "@/app/Components/Reportes/SearchDateBetween/SearchDateBetween"; export default function Page() { const [reportes] = useState([ @@ -69,7 +69,7 @@ export default function Page() { label: "Por Servicio", content: ( <> - +
diff --git a/app/(private)/layout.tsx b/app/(private)/layout.tsx index 4eb8832..565678d 100644 --- a/app/(private)/layout.tsx +++ b/app/(private)/layout.tsx @@ -1,8 +1,12 @@ import { ReactNode } from "react"; -import BarNavigation from "../Components/BarNavigation/BarNavigation"; -import Logout from "../Components/Logout/Logout"; +import BarNavigation from "../Components/layout/BarNavigation/BarNavigation"; +import Logout from "../Components/auth/Logout/Logout"; -export default function PrivateLayout({ children }: { children: ReactNode }) { +export default async function PrivateLayout({ + children, +}: { + children: ReactNode; +}) { return (
diff --git a/app/Components/ActivosMantenimiento/Areas.tsx b/app/Components/Equipo/ActivosMantenimiento/Areas.tsx similarity index 100% rename from app/Components/ActivosMantenimiento/Areas.tsx rename to app/Components/Equipo/ActivosMantenimiento/Areas.tsx diff --git a/app/Components/ActivosMantenimiento/Equipos.tsx b/app/Components/Equipo/ActivosMantenimiento/Equipos.tsx similarity index 100% rename from app/Components/ActivosMantenimiento/Equipos.tsx rename to app/Components/Equipo/ActivosMantenimiento/Equipos.tsx diff --git a/app/Components/ActivosMantenimiento/Mesas.tsx b/app/Components/Equipo/ActivosMantenimiento/Mesas.tsx similarity index 100% rename from app/Components/ActivosMantenimiento/Mesas.tsx rename to app/Components/Equipo/ActivosMantenimiento/Mesas.tsx diff --git a/app/Components/Equipos/equipos.tsx b/app/Components/Equipo/Equipos/equipos.tsx similarity index 100% rename from app/Components/Equipos/equipos.tsx rename to app/Components/Equipo/Equipos/equipos.tsx diff --git a/app/Components/EviarMensaje/EnviarMensaje.tsx b/app/Components/Equipo/EviarMensaje/EnviarMensaje.tsx similarity index 100% rename from app/Components/EviarMensaje/EnviarMensaje.tsx rename to app/Components/Equipo/EviarMensaje/EnviarMensaje.tsx diff --git a/app/Components/ProgramSelector/ProgramSelector.tsx b/app/Components/Equipo/ProgramSelector/ProgramSelector.tsx similarity index 100% rename from app/Components/ProgramSelector/ProgramSelector.tsx rename to app/Components/Equipo/ProgramSelector/ProgramSelector.tsx diff --git a/app/Components/AlertBox/AlertBox.css b/app/Components/Global/AlertBox/AlertBox.css similarity index 100% rename from app/Components/AlertBox/AlertBox.css rename to app/Components/Global/AlertBox/AlertBox.css diff --git a/app/Components/AlertBox/AlertBox.tsx b/app/Components/Global/AlertBox/AlertBox.tsx similarity index 100% rename from app/Components/AlertBox/AlertBox.tsx rename to app/Components/Global/AlertBox/AlertBox.tsx diff --git a/app/Components/ClearParams/ClearParams.tsx b/app/Components/Global/ClearParams/ClearParams.tsx similarity index 100% rename from app/Components/ClearParams/ClearParams.tsx rename to app/Components/Global/ClearParams/ClearParams.tsx diff --git a/app/Components/Information/information.tsx b/app/Components/Global/Information/information.tsx similarity index 100% rename from app/Components/Information/information.tsx rename to app/Components/Global/Information/information.tsx diff --git a/app/Components/SearchUser/searchUser.css b/app/Components/Global/SearchUser/searchUser.css similarity index 100% rename from app/Components/SearchUser/searchUser.css rename to app/Components/Global/SearchUser/searchUser.css diff --git a/app/Components/SearchUser/searchUser.tsx b/app/Components/Global/SearchUser/searchUser.tsx similarity index 100% rename from app/Components/SearchUser/searchUser.tsx rename to app/Components/Global/SearchUser/searchUser.tsx diff --git a/app/Components/StepNavigator/StepNavigator.css b/app/Components/Global/StepNavigator/StepNavigator.css similarity index 100% rename from app/Components/StepNavigator/StepNavigator.css rename to app/Components/Global/StepNavigator/StepNavigator.css diff --git a/app/Components/StepNavigator/StepNavigator.tsx b/app/Components/Global/StepNavigator/StepNavigator.tsx similarity index 100% rename from app/Components/StepNavigator/StepNavigator.tsx rename to app/Components/Global/StepNavigator/StepNavigator.tsx diff --git a/app/Components/Toggle/Toggle.tsx b/app/Components/Global/Toggle/Toggle.tsx similarity index 100% rename from app/Components/Toggle/Toggle.tsx rename to app/Components/Global/Toggle/Toggle.tsx diff --git a/app/Components/visual/FallingSquares/FallingSquares.tsx b/app/Components/Global/visual/FallingSquares/FallingSquares.tsx similarity index 100% rename from app/Components/visual/FallingSquares/FallingSquares.tsx rename to app/Components/Global/visual/FallingSquares/FallingSquares.tsx diff --git a/app/Components/visual/FallingSquares/style.css b/app/Components/Global/visual/FallingSquares/style.css similarity index 100% rename from app/Components/visual/FallingSquares/style.css rename to app/Components/Global/visual/FallingSquares/style.css diff --git a/app/Components/visual/GlobalAlert.tsx b/app/Components/Global/visual/GlobalAlert.tsx similarity index 78% rename from app/Components/visual/GlobalAlert.tsx rename to app/Components/Global/visual/GlobalAlert.tsx index 5f97eef..0587640 100644 --- a/app/Components/visual/GlobalAlert.tsx +++ b/app/Components/Global/visual/GlobalAlert.tsx @@ -1,8 +1,8 @@ "use client"; import { useEffect, useState } from "react"; -import AlertBox from "@/app/Components/AlertBox/AlertBox"; -import ClearParams from "@/app/Components/ClearParams/ClearParams"; +import AlertBox from "@/app/Components/Global/AlertBox/AlertBox"; +import ClearParams from "@/app/Components/Global/ClearParams/ClearParams"; export default function GlobalAlert() { const [showSuccess, setShowSuccess] = useState(null); @@ -22,14 +22,12 @@ export default function GlobalAlert() { {showError && ( <> - )} {showSuccess && ( <> - )} diff --git a/app/Components/visual/Wave/wave.module.css b/app/Components/Global/visual/Wave/wave.module.css similarity index 100% rename from app/Components/visual/Wave/wave.module.css rename to app/Components/Global/visual/Wave/wave.module.css diff --git a/app/Components/visual/Wave/wavesBack.tsx b/app/Components/Global/visual/Wave/wavesBack.tsx similarity index 100% rename from app/Components/visual/Wave/wavesBack.tsx rename to app/Components/Global/visual/Wave/wavesBack.tsx diff --git a/app/Components/Inscripciones/Alta/registerAlta.tsx b/app/Components/Inscripciones/Alta/registerAlta.tsx new file mode 100644 index 0000000..6e0aebf --- /dev/null +++ b/app/Components/Inscripciones/Alta/registerAlta.tsx @@ -0,0 +1,68 @@ +"use client"; +import { useState } from "react"; + +export default function RegisterAlta() { + const [major, setMajor] = useState(""); + return ( +
+
+ + setUser(e.target.value)} + placeholder="Coloca un número de cuenta..." + /> +
+ +
+ + setUser(e.target.value)} + placeholder="Coloca el nombre" + /> +
+ +
+ + setUser(e.target.value)} + placeholder="Coloca el apellido paterno" + /> +
+ +
+ + setUser(e.target.value)} + placeholder="Coloca el apellido materno" + /> +
+ +
+ + setUser(e.target.value)} + placeholder="Coloca fecha empezando por año" + /> +
+ +
+ + +
+ + + + ); +} diff --git a/app/Components/Receipt/Receipt.tsx b/app/Components/Receipt/Receipt.tsx index 46b5931..29f9af1 100644 --- a/app/Components/Receipt/Receipt.tsx +++ b/app/Components/Receipt/Receipt.tsx @@ -89,7 +89,7 @@ function Receipt({ urlBase, numAcount }: ReceiptsProps) { value={folio} onChange={(error) => { const value = error.target.value; - if (/^\d*$/.test(value)) { + if (/^\d*$/.test(value) && value.length <= 7) { setFolio(value); } }} @@ -114,7 +114,7 @@ function Receipt({ urlBase, numAcount }: ReceiptsProps) { setAmount(value); } else { router.push( - `/Impresiones?numAcount=${numAcount}&error=El monto no puede superar $1000.00` + `${urlBase}?numAcount=${numAcount}&error=El monto no puede superar $1000.00` ); } } diff --git a/app/Components/BitacoraSanciones/BitacoraAlumno.tsx b/app/Components/Reportes/BitacoraSanciones/BitacoraAlumno.tsx similarity index 100% rename from app/Components/BitacoraSanciones/BitacoraAlumno.tsx rename to app/Components/Reportes/BitacoraSanciones/BitacoraAlumno.tsx diff --git a/app/Components/BitacoraSanciones/BitacoraEquipo.tsx b/app/Components/Reportes/BitacoraSanciones/BitacoraEquipo.tsx similarity index 100% rename from app/Components/BitacoraSanciones/BitacoraEquipo.tsx rename to app/Components/Reportes/BitacoraSanciones/BitacoraEquipo.tsx diff --git a/app/Components/BitacoraSanciones/BitacoraMesas.tsx b/app/Components/Reportes/BitacoraSanciones/BitacoraMesas.tsx similarity index 100% rename from app/Components/BitacoraSanciones/BitacoraMesas.tsx rename to app/Components/Reportes/BitacoraSanciones/BitacoraMesas.tsx diff --git a/app/Components/BitacoraSanciones/Page.module.css b/app/Components/Reportes/BitacoraSanciones/Page.module.css similarity index 100% rename from app/Components/BitacoraSanciones/Page.module.css rename to app/Components/Reportes/BitacoraSanciones/Page.module.css diff --git a/app/Components/BitacoraSanciones/Sanciones.tsx b/app/Components/Reportes/BitacoraSanciones/Sanciones.tsx similarity index 95% rename from app/Components/BitacoraSanciones/Sanciones.tsx rename to app/Components/Reportes/BitacoraSanciones/Sanciones.tsx index 696b989..118a3ae 100644 --- a/app/Components/BitacoraSanciones/Sanciones.tsx +++ b/app/Components/Reportes/BitacoraSanciones/Sanciones.tsx @@ -1,8 +1,8 @@ "use client"; import { useEffect, useState } from "react"; import styles from "./Page.module.css"; -import SearchUser from "../SearchUser/searchUser"; -import Information from "../Information/information"; +import SearchUser from "../../Global/SearchUser/searchUser"; +import Information from "../../Global/Information/information"; import { GetStudent } from "@/app/lib/getStudent"; import { envConfig } from "@/app/lib/config"; diff --git a/app/Components/SearchDate/SearchDate.tsx b/app/Components/Reportes/SearchDate/SearchDate.tsx similarity index 100% rename from app/Components/SearchDate/SearchDate.tsx rename to app/Components/Reportes/SearchDate/SearchDate.tsx diff --git a/app/Components/SearchDateBetween/SearchDateBetween.tsx b/app/Components/Reportes/SearchDateBetween/SearchDateBetween.tsx similarity index 96% rename from app/Components/SearchDateBetween/SearchDateBetween.tsx rename to app/Components/Reportes/SearchDateBetween/SearchDateBetween.tsx index 4145493..2cfb89b 100644 --- a/app/Components/SearchDateBetween/SearchDateBetween.tsx +++ b/app/Components/Reportes/SearchDateBetween/SearchDateBetween.tsx @@ -1,5 +1,5 @@ "use client"; -import { Margarine } from "next/font/google"; + import { useState } from "react"; function SearchDateBetween() { diff --git a/app/Components/Impressions/Impressions.css b/app/Components/Servicios/Impressions/Impressions.css similarity index 100% rename from app/Components/Impressions/Impressions.css rename to app/Components/Servicios/Impressions/Impressions.css diff --git a/app/Components/Impressions/impressions.tsx b/app/Components/Servicios/Impressions/impressions.tsx similarity index 100% rename from app/Components/Impressions/impressions.tsx rename to app/Components/Servicios/Impressions/impressions.tsx diff --git a/app/Components/ChangePassword/changePassword.tsx b/app/Components/auth/ChangePassword/changePassword.tsx similarity index 100% rename from app/Components/ChangePassword/changePassword.tsx rename to app/Components/auth/ChangePassword/changePassword.tsx diff --git a/app/Components/Login/Login.css b/app/Components/auth/Login/Login.css similarity index 100% rename from app/Components/Login/Login.css rename to app/Components/auth/Login/Login.css diff --git a/app/Components/Login/Login.tsx b/app/Components/auth/Login/Login.tsx similarity index 97% rename from app/Components/Login/Login.tsx rename to app/Components/auth/Login/Login.tsx index a1cb223..e5adf37 100644 --- a/app/Components/Login/Login.tsx +++ b/app/Components/auth/Login/Login.tsx @@ -3,8 +3,8 @@ import { useState } from "react"; import { loginUser } from "@/app/lib/login"; import { useRouter } from "next/navigation"; -import AlertBox from "../AlertBox/AlertBox"; import "./Login.css"; +import AlertBox from "../../Global/AlertBox/AlertBox"; function Login() { const [user, setUser] = useState(""); diff --git a/app/Components/Logout/Logout.css b/app/Components/auth/Logout/Logout.css similarity index 100% rename from app/Components/Logout/Logout.css rename to app/Components/auth/Logout/Logout.css diff --git a/app/Components/Logout/Logout.tsx b/app/Components/auth/Logout/Logout.tsx similarity index 100% rename from app/Components/Logout/Logout.tsx rename to app/Components/auth/Logout/Logout.tsx diff --git a/app/Components/BarNavigation/BarNavigation.css b/app/Components/layout/BarNavigation/BarNavigation.css similarity index 100% rename from app/Components/BarNavigation/BarNavigation.css rename to app/Components/layout/BarNavigation/BarNavigation.css diff --git a/app/Components/BarNavigation/BarNavigation.tsx b/app/Components/layout/BarNavigation/BarNavigation.tsx similarity index 95% rename from app/Components/BarNavigation/BarNavigation.tsx rename to app/Components/layout/BarNavigation/BarNavigation.tsx index ad4ac0e..d8009bb 100644 --- a/app/Components/BarNavigation/BarNavigation.tsx +++ b/app/Components/layout/BarNavigation/BarNavigation.tsx @@ -24,7 +24,7 @@ function BarNavigation() {
  • - toggleSubMenu(0)}>Inscripciones + toggleSubMenu(0)}>Inscripcion
    • Alta
    • @@ -32,8 +32,8 @@ function BarNavigation() {
    • Agregar Tiempo
    • - -
    • Inscripciones
    • + +
    • Inscripcion
  • diff --git a/app/Components/Footer/Footer.module.css b/app/Components/layout/Footer/Footer.module.css similarity index 100% rename from app/Components/Footer/Footer.module.css rename to app/Components/layout/Footer/Footer.module.css diff --git a/app/Components/Footer/Footer.tsx b/app/Components/layout/Footer/Footer.tsx similarity index 100% rename from app/Components/Footer/Footer.tsx rename to app/Components/layout/Footer/Footer.tsx diff --git a/app/Components/Header/Header.module.css b/app/Components/layout/Header/Header.module.css similarity index 100% rename from app/Components/Header/Header.module.css rename to app/Components/layout/Header/Header.module.css diff --git a/app/Components/Header/Header.tsx b/app/Components/layout/Header/Header.tsx similarity index 100% rename from app/Components/Header/Header.tsx rename to app/Components/layout/Header/Header.tsx diff --git a/app/globals.css b/app/globals.css index e101602..e2a3ac0 100644 --- a/app/globals.css +++ b/app/globals.css @@ -164,6 +164,7 @@ footer p { input, select { flex: 1; + width: 100%; min-width: 200px; max-width: 500px; padding: 1rem; diff --git a/app/layout.tsx b/app/layout.tsx index 5ad6218..6de073d 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,10 +1,10 @@ import type { Metadata } from "next"; import { Poppins } from "next/font/google"; -import Header from "./Components/Header/Header"; -import Footer from "./Components/Footer/Footer"; + +import Header from "./Components/layout/Header/Header"; +import Footer from "./Components/layout/Footer/Footer"; import "./globals.css"; -import GlobalAlert from "./Components/visual/GlobalAlert"; const poppins = Poppins({ variable: "--font-poppins", diff --git a/app/page.tsx b/app/page.tsx index 3790a03..0070e55 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,4 +1,4 @@ -import Login from "./Components/Login/Login"; +import Login from "./Components/auth/Login/Login"; import { LoginRedirect } from "./Routes/LoginRedirect"; export default function Home() { @@ -13,4 +13,4 @@ export default function Home() {
); } -//IO \ No newline at end of file +//IO