diff --git a/src/app/styles/layout/BarNavigation.scss b/src/app/styles/layout/BarNavigation.scss index 51db962..caf6184 100644 --- a/src/app/styles/layout/BarNavigation.scss +++ b/src/app/styles/layout/BarNavigation.scss @@ -1,12 +1,13 @@ .barNavigation { text-align: center; justify-content: end; + align-items: center; background-color: #ffffff; display: flex; width: 100%; top: 0; - height: 45px; - max-height: 40px; + height: 100%; + max-height: 100%; } .barNavigation ul { @@ -31,9 +32,7 @@ gap: 4px; cursor: pointer; padding: 10px; - margin-right: 10px; z-index: 10; - background-color: #fff; border-radius: 4px; max-width: 45px; } diff --git a/src/app/styles/layout/BarNavigationAdmin.scss b/src/app/styles/layout/BarNavigationAdmin.scss index 4beb8c0..c0a02ed 100644 --- a/src/app/styles/layout/BarNavigationAdmin.scss +++ b/src/app/styles/layout/BarNavigationAdmin.scss @@ -6,7 +6,7 @@ width: 100%; top: 0; height: 45px; - max-height: 40px; + max-height: 100%; } .barNavigation ul { @@ -31,9 +31,7 @@ gap: 4px; cursor: pointer; padding: 10px; - margin-right: 10px; z-index: 10; - background-color: #fff; border-radius: 4px; max-width: 45px; } @@ -163,7 +161,6 @@ } .barNavigation li:hover { - background-color: #d59f0f; color: black; border-radius: 0; border: none; diff --git a/src/app/styles/layout/header.module.scss b/src/app/styles/layout/header.module.scss index eb25a4c..99cc422 100644 --- a/src/app/styles/layout/header.module.scss +++ b/src/app/styles/layout/header.module.scss @@ -59,7 +59,7 @@ position: absolute; background-color: #003e79; height: 100%; - min-width: 400px; + min-width: 350px; transform: skew(45deg); z-index: 2; } @@ -72,7 +72,7 @@ background-color: rgb(1, 92, 184); height: 100%; width: 10%; - min-width: 400px; + min-width: 350px; transform: skew(45deg); z-index: 2; } @@ -82,7 +82,7 @@ width: 100%; height: 100%; padding-left: 80px; - max-height: 50%; + max-height: 60%; align-items: end; } diff --git a/src/components/header.tsx b/src/components/header.tsx index b6615f1..6d5adb0 100644 --- a/src/components/header.tsx +++ b/src/components/header.tsx @@ -9,7 +9,15 @@ import { usePathname } from "next/navigation"; function Header() { const pathname = usePathname(); - const publicNav = ["/escaner", "/agregarEquipo", "/editar", "/cambiarPass","/historial","/ranking"]; + const publicNav = [ + "/escaner", + "/agregarEquipo", + "/editar", + "/cambiarPass", + "/historial", + "/ranking", + ]; + const privateNav = ["/equipoComputo", "/crearCuenta", "/perifericos"]; return ( diff --git a/src/data/so_por_equipo.ts b/src/data/so_por_equipo.ts index 1d75b6f..b8e1bfb 100644 --- a/src/data/so_por_equipo.ts +++ b/src/data/so_por_equipo.ts @@ -80,7 +80,7 @@ export const SO_POR_EQUIPO: Record< ], /*"TABLETA iPAD OS"*/ 8: [ { - id_sistema_operativo: 20, + id_sistema_operativo: 19, sistema_operativo: "IOS", }, ], diff --git a/src/proxy.ts b/src/proxy.ts index 1e55642..1c2ffa8 100644 --- a/src/proxy.ts +++ b/src/proxy.ts @@ -3,8 +3,8 @@ import type { NextRequest } from "next/server"; import { jwtDecode } from "jwt-decode"; const permisos: Record = { - 1: ["/crearCuenta", "/equipoComputo", "/perifericos","/escaner", "/agregarEquipo", "/editar"], - 2: ["/escaner", "/agregarEquipo", "/editar"], + 1: ["/crearCuenta", "/equipoComputo", "/perifericos","/escaner", "/agregarEquipo", "/editar","/historial","/ranking","/cambiarPass"], + 2: ["/escaner", "/agregarEquipo", "/editar","/historial","/ranking","/cambiarPass"], }; export function proxy(request: NextRequest) { @@ -41,6 +41,9 @@ export const config = { "/crearCuenta", "/equipoComputo", "/perifericos", + "/ranking", + "/historial", + "/cambiarPass" ], }; //IO