From cef81009f7d973fe514fdfe64b4bda6e9c79d25f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Rafael=20Siqueira?= Date: Wed, 19 Nov 2025 18:03:21 -0300 Subject: [PATCH] update layout --- .../app/components/app-sidebar.tsx | 3 +-- .../app/routes/_.$orgid/route.tsx | 4 ++-- apps/admin.saladeaula.digital/package.json | 1 - .../app/components/app-sidebar.tsx | 6 ++---- .../app/routes/_app._index/route.tsx | 13 ++----------- .../routes/_app.enrollments._index/route.tsx | 19 +++++-------------- .../app/routes/_app.orgs._index/route.tsx | 11 +++-------- .../app/routes/_app.payments._index/route.tsx | 11 ++++------- .../app/routes/_app.users._index/route.tsx | 9 ++------- .../app/routes/_app.webhooks._index/route.tsx | 15 ++++++--------- .../app/routes/_app/route.tsx | 11 +++++++---- id.saladeaula.digital/app/routes/session.py | 1 + package-lock.json | 7 ------- 13 files changed, 35 insertions(+), 76 deletions(-) diff --git a/apps/admin.saladeaula.digital/app/components/app-sidebar.tsx b/apps/admin.saladeaula.digital/app/components/app-sidebar.tsx index a4f3f1c..00ffb7f 100644 --- a/apps/admin.saladeaula.digital/app/components/app-sidebar.tsx +++ b/apps/admin.saladeaula.digital/app/components/app-sidebar.tsx @@ -79,14 +79,13 @@ const data = { export function AppSidebar() { return ( + - - ) } diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx index 58d2904..a4d1d4e 100644 --- a/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx +++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx @@ -81,7 +81,7 @@ export default function Route({ loaderData }: Route.ComponentProps) { -
+
-
+ diff --git a/apps/admin.saladeaula.digital/package.json b/apps/admin.saladeaula.digital/package.json index 38df53c..84279e2 100644 --- a/apps/admin.saladeaula.digital/package.json +++ b/apps/admin.saladeaula.digital/package.json @@ -21,7 +21,6 @@ "date-fns": "^4.1.0", "flat": "^6.0.1", "fuse.js": "^7.1.0", - "http-status-codes": "^2.3.0", "isbot": "^5.1.31", "luxon": "^3.7.2", "meilisearch": "^0.54.0", diff --git a/apps/insights.saladeaula.digital/app/components/app-sidebar.tsx b/apps/insights.saladeaula.digital/app/components/app-sidebar.tsx index c8fdc49..a94c508 100644 --- a/apps/insights.saladeaula.digital/app/components/app-sidebar.tsx +++ b/apps/insights.saladeaula.digital/app/components/app-sidebar.tsx @@ -13,7 +13,6 @@ import { NavMain } from '@/components/nav-main' import { Sidebar, SidebarContent, - SidebarFooter, SidebarRail } from '@repo/ui/components/ui/sidebar' @@ -52,12 +51,11 @@ const navMain = [ export function AppSidebar() { return ( - + + - - ) } diff --git a/apps/insights.saladeaula.digital/app/routes/_app._index/route.tsx b/apps/insights.saladeaula.digital/app/routes/_app._index/route.tsx index 4100412..dbad45c 100644 --- a/apps/insights.saladeaula.digital/app/routes/_app._index/route.tsx +++ b/apps/insights.saladeaula.digital/app/routes/_app._index/route.tsx @@ -1,12 +1,7 @@ import type { Route } from './+types/home' -import { Button } from '@repo/ui/components/ui/button' - export function meta({}: Route.MetaArgs) { - return [ - { title: 'New React Router App' }, - { name: 'description', content: 'Welcome to React Router!' } - ] + return [{ title: 'Visão geral' }] } export function loader({ context }: Route.LoaderArgs) { @@ -14,9 +9,5 @@ export function loader({ context }: Route.LoaderArgs) { } export default function Route({}: Route.ComponentProps) { - return ( - <> - - - ) + return <> } diff --git a/apps/insights.saladeaula.digital/app/routes/_app.enrollments._index/route.tsx b/apps/insights.saladeaula.digital/app/routes/_app.enrollments._index/route.tsx index 996e3bc..bd1d9ec 100644 --- a/apps/insights.saladeaula.digital/app/routes/_app.enrollments._index/route.tsx +++ b/apps/insights.saladeaula.digital/app/routes/_app.enrollments._index/route.tsx @@ -7,12 +7,11 @@ import { DownloadIcon, FileSpreadsheetIcon, FileTextIcon, - PlusCircleIcon, - PlusIcon + PlusCircleIcon } from 'lucide-react' import { MeiliSearchFilterBuilder } from 'meilisearch-helper' import { Suspense, useState } from 'react' -import { Await, Link, Outlet, useParams, useSearchParams } from 'react-router' +import { Await, Outlet, useSearchParams } from 'react-router' import type { BookType } from 'xlsx' import * as XLSX from 'xlsx' @@ -39,9 +38,8 @@ export function meta({}: Route.MetaArgs) { return [{ title: 'Matrículas' }] } -export async function loader({ params, context, request }: Route.LoaderArgs) { +export async function loader({ context, request }: Route.LoaderArgs) { const { searchParams } = new URL(request.url) - const { orgid } = params const query = searchParams.get('q') || '' const from = searchParams.get('from') const to = searchParams.get('to') @@ -89,12 +87,7 @@ export default function Route({ loaderData: { data } }) { return ( }>
-

- Gerenciar matrículas -

-

- Matricule colaboradores de forma rápida e acompanhe seu progresso. -

+

Matrículas

@@ -248,8 +241,6 @@ export function ExportMenu({ headers: Record selectedRows: object[] }) { - const { orgid } = useParams() - const exportFile = (bookType: BookType) => () => { if (!selectedRows.length) { return @@ -267,7 +258,7 @@ export function ExportMenu({ origin: 'A1' }) XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1') - XLSX.writeFile(workbook, `${orgid}_users_${+now}.${bookType}`, { + XLSX.writeFile(workbook, `users_${+now}.${bookType}`, { bookType, compression: true }) diff --git a/apps/insights.saladeaula.digital/app/routes/_app.orgs._index/route.tsx b/apps/insights.saladeaula.digital/app/routes/_app.orgs._index/route.tsx index 7c157f3..0b7b8f7 100644 --- a/apps/insights.saladeaula.digital/app/routes/_app.orgs._index/route.tsx +++ b/apps/insights.saladeaula.digital/app/routes/_app.orgs._index/route.tsx @@ -9,10 +9,10 @@ import { Skeleton } from '@repo/ui/components/skeleton' import { Kbd } from '@repo/ui/components/ui/kbd' import { createSearch } from '@repo/util/meili' -import { columns, type c } from './columns' +import { columns, type Org } from './columns' export function meta({}: Route.MetaArgs) { - return [{ title: 'Colaboradores' }] + return [{ title: 'Empresas' }] } export async function loader({ context, request }: Route.LoaderArgs) { @@ -40,12 +40,7 @@ export default function Route({ loaderData: { data } }) { return ( }>
-

- Gerenciar empresas -

-

- Adicione colaboradores e organize sua equipe de forma prática. -

+

Empresas

diff --git a/apps/insights.saladeaula.digital/app/routes/_app.payments._index/route.tsx b/apps/insights.saladeaula.digital/app/routes/_app.payments._index/route.tsx index 184d632..ab07bee 100644 --- a/apps/insights.saladeaula.digital/app/routes/_app.payments._index/route.tsx +++ b/apps/insights.saladeaula.digital/app/routes/_app.payments._index/route.tsx @@ -1,12 +1,7 @@ import type { Route } from './+types' -import { Button } from '@repo/ui/components/ui/button' - export function meta({}: Route.MetaArgs) { - return [ - { title: 'Histórico de pagamentos' }, - { name: 'description', content: 'Welcome to React Router!' } - ] + return [{ title: 'Pagamentos' }] } export function loader({ context }: Route.LoaderArgs) { @@ -16,7 +11,9 @@ export function loader({ context }: Route.LoaderArgs) { export default function Route({}: Route.ComponentProps) { return ( <> - +
+

Pagamentos

+
) } diff --git a/apps/insights.saladeaula.digital/app/routes/_app.users._index/route.tsx b/apps/insights.saladeaula.digital/app/routes/_app.users._index/route.tsx index 5dc1d48..c3004b6 100644 --- a/apps/insights.saladeaula.digital/app/routes/_app.users._index/route.tsx +++ b/apps/insights.saladeaula.digital/app/routes/_app.users._index/route.tsx @@ -12,7 +12,7 @@ import { createSearch } from '@repo/util/meili' import { columns, type User } from './columns' export function meta({}: Route.MetaArgs) { - return [{ title: 'Colaboradores' }] + return [{ title: 'Usuários' }] } export async function loader({ context, request }: Route.LoaderArgs) { @@ -40,12 +40,7 @@ export default function Route({ loaderData: { data } }) { return ( }>
-

- Gerenciar colaboradores -

-

- Adicione colaboradores e organize sua equipe de forma prática. -

+

Usuários

diff --git a/apps/insights.saladeaula.digital/app/routes/_app.webhooks._index/route.tsx b/apps/insights.saladeaula.digital/app/routes/_app.webhooks._index/route.tsx index 184d632..411eb84 100644 --- a/apps/insights.saladeaula.digital/app/routes/_app.webhooks._index/route.tsx +++ b/apps/insights.saladeaula.digital/app/routes/_app.webhooks._index/route.tsx @@ -1,22 +1,19 @@ import type { Route } from './+types' -import { Button } from '@repo/ui/components/ui/button' - export function meta({}: Route.MetaArgs) { - return [ - { title: 'Histórico de pagamentos' }, - { name: 'description', content: 'Welcome to React Router!' } - ] + return [{ title: 'Webhooks' }] } -export function loader({ context }: Route.LoaderArgs) { - return { message: context.cloudflare.env.VALUE_FROM_CLOUDFLARE } +export function loader({}: Route.LoaderArgs) { + return {} } export default function Route({}: Route.ComponentProps) { return ( <> - +
+

Webhooks

+
) } diff --git a/apps/insights.saladeaula.digital/app/routes/_app/route.tsx b/apps/insights.saladeaula.digital/app/routes/_app/route.tsx index f646871..1bfd81b 100644 --- a/apps/insights.saladeaula.digital/app/routes/_app/route.tsx +++ b/apps/insights.saladeaula.digital/app/routes/_app/route.tsx @@ -37,11 +37,14 @@ export default function Route({ loaderData }: Route.ComponentProps) {
- + + Insights +
@@ -50,7 +53,7 @@ export default function Route({ loaderData }: Route.ComponentProps) {
-
+
-
+ ) diff --git a/id.saladeaula.digital/app/routes/session.py b/id.saladeaula.digital/app/routes/session.py index 5e1da0f..1aa6011 100644 --- a/id.saladeaula.digital/app/routes/session.py +++ b/id.saladeaula.digital/app/routes/session.py @@ -117,6 +117,7 @@ def _get_idp_user( 'id': user_id, 'sk': 'PASSWORD', 'hash': pbkdf2_sha256.hash(password), + 'created_at': now(), } ) except Exception: diff --git a/package-lock.json b/package-lock.json index 97e9ea6..e011d35 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,6 @@ "date-fns": "^4.1.0", "flat": "^6.0.1", "fuse.js": "^7.1.0", - "http-status-codes": "^2.3.0", "isbot": "^5.1.31", "luxon": "^3.7.2", "meilisearch": "^0.54.0", @@ -4861,12 +4860,6 @@ "node": ">=12" } }, - "node_modules/http-status-codes": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/http-status-codes/-/http-status-codes-2.3.0.tgz", - "integrity": "sha512-RJ8XvFvpPM/Dmc5SV+dC4y5PCeOhT3x1Hq0NU3rjGeg5a/CqlhZ7uudknPwZFz4aeAXDcbAyaeP7GAo9lvngtA==", - "license": "MIT" - }, "node_modules/id.saladeaula.digital": { "resolved": "apps/id.saladeaula.digital", "link": true