diff --git a/apps/admin.saladeaula.digital/app/components/app-sidebar.tsx b/apps/admin.saladeaula.digital/app/components/app-sidebar.tsx index 673f8bd..9f0fe57 100644 --- a/apps/admin.saladeaula.digital/app/components/app-sidebar.tsx +++ b/apps/admin.saladeaula.digital/app/components/app-sidebar.tsx @@ -6,6 +6,7 @@ import { FileBadgeIcon, GraduationCap, LayoutDashboardIcon, + ReceiptTextIcon, ShieldUserIcon, ShoppingCartIcon, UploadIcon, @@ -27,10 +28,17 @@ const data = { title: 'Visão geral', url: '/main', icon: LayoutDashboardIcon + } + ], + navPayment: [ + { + title: 'Resumo de cobranças', + url: '/billing', + icon: ReceiptTextIcon }, { - title: 'Histórico de compras', - url: '/orders', + title: 'Histórico de pagamentos', + url: '/payments', icon: ShoppingCartIcon } ], @@ -44,12 +52,12 @@ const data = { title: 'Gestores', url: '/admins', icon: ShieldUserIcon - }, - { - title: 'Importações', - url: '/batch', - icon: UploadIcon } + // { + // title: 'Importações', + // url: '/batch', + // icon: UploadIcon + // } ], navEnrollment: [ { @@ -57,11 +65,11 @@ const data = { url: '/enrollments', icon: GraduationCap }, - { - title: 'Certificações', - url: '/certs', - icon: FileBadgeIcon - }, + // { + // title: 'Certificações', + // url: '/certs', + // icon: FileBadgeIcon + // }, { title: 'Agendamentos', url: '/scheduled', diff --git a/apps/admin.saladeaula.digital/app/components/nav-main.tsx b/apps/admin.saladeaula.digital/app/components/nav-main.tsx index 87989c1..53488cb 100644 --- a/apps/admin.saladeaula.digital/app/components/nav-main.tsx +++ b/apps/admin.saladeaula.digital/app/components/nav-main.tsx @@ -25,6 +25,7 @@ export function NavMain({ }: { data: { navMain: NavItem[] + navPayment: NavItem[] navUser: NavItem[] navEnrollment: NavItem[] } @@ -41,6 +42,17 @@ export function NavMain({ + + + + Financeiro + {data.navPayment.map((props, idx) => ( + + ))} + + + + diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.billing._index/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.billing._index/route.tsx new file mode 100644 index 0000000..8f74b8b --- /dev/null +++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.billing._index/route.tsx @@ -0,0 +1,21 @@ +import type { Route } from './+types/route' + +export function meta({}) { + return [{ title: 'Resumo de cobranças' }] +} + +export default function Route({}: Route.ComponentProps) { + return ( + <> +
+

+ Resumo de cobranças +

+

+ Acompanhe as cobranças em tempo real e garanta mais eficiência no + controle financeiro. +

+
+ + ) +} diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.orders._index/columns.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.payments._index/columns.tsx similarity index 69% rename from apps/admin.saladeaula.digital/app/routes/_.$orgid.orders._index/columns.tsx rename to apps/admin.saladeaula.digital/app/routes/_.$orgid.payments._index/columns.tsx index 7998337..e94291b 100644 --- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.orders._index/columns.tsx +++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.payments._index/columns.tsx @@ -11,11 +11,11 @@ import { columns as columns_, type Order } from '@repo/ui/routes/orders/columns' export type { Order } export const columns: ColumnDef[] = [ - { - id: 'select', - header: DataTableColumnHeaderSelect, - cell: DataTableColumnSelect, - meta: { className: 'w-9' } - }, + // { + // id: 'select', + // header: DataTableColumnHeaderSelect, + // cell: DataTableColumnSelect, + // meta: { className: 'w-9' } + // }, ...columns_ ] diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.orders._index/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.payments._index/route.tsx similarity index 98% rename from apps/admin.saladeaula.digital/app/routes/_.$orgid.orders._index/route.tsx rename to apps/admin.saladeaula.digital/app/routes/_.$orgid.payments._index/route.tsx index 27c2792..ad3c1dc 100644 --- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.orders._index/route.tsx +++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.payments._index/route.tsx @@ -44,7 +44,7 @@ export default function Route({ loaderData: { data } }: Route.ComponentProps) { }>

- Histórico de compras + Histórico de pagamentos

Acompanhe todos as compras realizadas, visualize pagamentos e mantenha diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.users.$id._index/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.users.$id._index/route.tsx index 20755c2..47acc2e 100644 --- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.users.$id._index/route.tsx +++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.users.$id._index/route.tsx @@ -46,7 +46,7 @@ export default function Route({}: Route.ComponentProps) { Editar colaborador - Configurar as informações gerais para este colaborador + Configurar as informações gerais para este colaborador. diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.users.add/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.users.add/route.tsx index 00cd520..67af37f 100644 --- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.users.add/route.tsx +++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.users.add/route.tsx @@ -122,7 +122,7 @@ export default function Route({}: Route.ComponentProps) { Adicionar colaborador - Siga os passos abaixo para cadastrar um novo colaborador + Siga os passos abaixo para cadastrar um novo colaborador. diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx index 67573e1..d1c30d4 100644 --- a/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx +++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx @@ -79,7 +79,7 @@ export default function Route({ loaderData }: Route.ComponentProps) {

- + {/**/}
diff --git a/apps/saladeaula.digital/app/routes/history.tsx b/apps/saladeaula.digital/app/routes/history.tsx index 3f58226..eaa37fe 100644 --- a/apps/saladeaula.digital/app/routes/history.tsx +++ b/apps/saladeaula.digital/app/routes/history.tsx @@ -66,14 +66,14 @@ export default function Component({ loaderData: { data } }) { - Histórico de compras + Histórico de pagamentos

- Histórico de compras + Histórico de pagamentos

Acompanhe todos as compras realizadas, visualize pagamentos e diff --git a/apps/saladeaula.digital/app/routes/index.tsx b/apps/saladeaula.digital/app/routes/index.tsx index 9a18e57..b278656 100644 --- a/apps/saladeaula.digital/app/routes/index.tsx +++ b/apps/saladeaula.digital/app/routes/index.tsx @@ -39,8 +39,7 @@ import { CardFooter, CardHeader, CardTitle, - CardAction, - CardContent + CardAction } from '@repo/ui/components/ui/card' import { Kbd } from '@repo/ui/components/ui/kbd' import { Progress } from '@repo/ui/components/ui/progress' @@ -228,7 +227,7 @@ function Enrollment(enrollment: Enrollment) { diff --git a/apps/saladeaula.digital/app/routes/layout.tsx b/apps/saladeaula.digital/app/routes/layout.tsx index 7ba68f6..789fd6b 100644 --- a/apps/saladeaula.digital/app/routes/layout.tsx +++ b/apps/saladeaula.digital/app/routes/layout.tsx @@ -61,7 +61,7 @@ const navMain = [ // url: '/certs' // }, { - title: 'Histórico de compras', + title: 'Histórico de pagamentos', url: '/history' } ] diff --git a/packages/ui/src/components/nav-user.tsx b/packages/ui/src/components/nav-user.tsx index 4ed75c1..594c169 100644 --- a/packages/ui/src/components/nav-user.tsx +++ b/packages/ui/src/components/nav-user.tsx @@ -123,7 +123,7 @@ export function NavUser({ className="cursor-pointer" > - Histórico de compras + Histórico de pagamentos diff --git a/packages/ui/src/routes/enrollments/data.tsx b/packages/ui/src/routes/enrollments/data.tsx index 8300075..f7777ef 100644 --- a/packages/ui/src/routes/enrollments/data.tsx +++ b/packages/ui/src/routes/enrollments/data.tsx @@ -1,7 +1,7 @@ import { + BanIcon, CircleCheckIcon, CircleIcon, - CircleOffIcon, CircleXIcon, TimerIcon, type LucideIcon @@ -51,7 +51,7 @@ export const statuses: Record< label: 'Reprovado' }, CANCELED: { - icon: CircleOffIcon, + icon: BanIcon, color: 'text-orange-400 [&_svg]:text-orange-500', label: 'Cancelado' }