From 14f8b65df57844bce27683d1c4224967416d1337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Rafael=20Siqueira?= Date: Thu, 6 Nov 2025 11:24:05 -0300 Subject: [PATCH] update state sidebar --- .../app/routes/_.$orgid/route.tsx | 19 ++++++++----------- apps/admin.saladeaula.digital/package.json | 1 + package-lock.json | 1 + package.json | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx index da283a9..e97232e 100644 --- a/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx +++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx @@ -1,10 +1,7 @@ import type { Route } from './+types' -import { - createCookie, - Outlet, - type ShouldRevalidateFunctionArgs -} from 'react-router' +import * as cookie from 'cookie' +import { Outlet, type ShouldRevalidateFunctionArgs } from 'react-router' import { AppSidebar } from '@/components/app-sidebar' import { request as req } from '@/lib/request' @@ -22,10 +19,11 @@ import { export const middleware: Route.MiddlewareFunction[] = [authMiddleware] export async function loader({ params, context, request }: Route.ActionArgs) { - const rawCookie = request.headers.get('cookie') const user = context.get(userContext) + const rawCookie = request.headers.get('cookie') + const parsedCookies = cookie.parse(rawCookie) + const { sidebar_state } = parsedCookies - const sidebarState = await createCookie('sidebar_state').parse(rawCookie) const r = await req({ url: `/users/${user.sub}/orgs?limit=25`, request, @@ -44,7 +42,7 @@ export async function loader({ params, context, request }: Route.ActionArgs) { const exists = orgs.some(({ id }) => id === params.orgid) if (exists) { - return { user, orgs, sidebarState } + return { user, orgs, sidebar_state } } throw new Response(null, { status: 401 }) @@ -58,11 +56,10 @@ export function shouldRevalidate({ } export default function Route({ loaderData }: Route.ComponentProps) { - const { user, orgs, sidebarState } = loaderData - console.log(sidebarState) + const { user, orgs, sidebar_state } = loaderData return ( - + diff --git a/apps/admin.saladeaula.digital/package.json b/apps/admin.saladeaula.digital/package.json index c962c54..badec9d 100644 --- a/apps/admin.saladeaula.digital/package.json +++ b/apps/admin.saladeaula.digital/package.json @@ -16,6 +16,7 @@ "@repo/auth": "*", "@repo/ui": "*", "@tanstack/react-table": "^8.21.3", + "cookie": "^1.0.2", "date-fns": "^4.1.0", "fuse.js": "^7.1.0", "http-status-codes": "^2.3.0", diff --git a/package-lock.json b/package-lock.json index 50f1db3..f0e736f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,6 +29,7 @@ "@repo/auth": "*", "@repo/ui": "*", "@tanstack/react-table": "^8.21.3", + "cookie": "^1.0.2", "date-fns": "^4.1.0", "fuse.js": "^7.1.0", "http-status-codes": "^2.3.0", diff --git a/package.json b/package.json index 6cf3766..c8ee0f4 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,8 @@ }, "optionalDependencies": { "@rollup/rollup-linux-x64-gnu": "^4.52.5", - "lightningcss-linux-x64-gnu": "^1.30.2", - "@tailwindcss/oxide-linux-x64-gnu": "^4.1.16" + "@tailwindcss/oxide-linux-x64-gnu": "^4.1.16", + "lightningcss-linux-x64-gnu": "^1.30.2" }, "engines": { "node": ">=18"