Compare commits

...

8 Commits

Author SHA1 Message Date
Felipe Coutinho
78c3ed5995 chore(release): prepara versao 2.7.1 2026-05-31 15:19:15 -03:00
Felipe Coutinho
c34adba587 style(inbox): padroniza acao de lancar notificacoes 2026-05-31 15:19:07 -03:00
Felipe Coutinho
99bc049cf4 fix(boletos): diferencia pagamentos e recebimentos 2026-05-31 15:18:55 -03:00
Felipe Coutinho
35abe1b0bf feat(dashboard): refina experiencia dos widgets 2026-05-31 15:18:43 -03:00
Felipe Coutinho
402f0072af feat(lancamentos): melhora painel de filtros ativos 2026-05-31 15:18:23 -03:00
Felipe Coutinho
02ee5bb758 feat(navegacao): adiciona atalhos financeiros e seletor mensal 2026-05-31 15:18:19 -03:00
Felipe Coutinho
41eecc2538 feat(preferencias): permite ocultar resumo do lancamento 2026-05-31 15:18:07 -03:00
Felipe Coutinho
cdcc677787 style(ui): atualiza identidade visual 2026-05-31 15:17:57 -03:00
88 changed files with 5427 additions and 1468 deletions

View File

@@ -5,6 +5,33 @@ Todas as mudanças notáveis deste projeto serão documentadas neste arquivo.
O formato é baseado em [Keep a Changelog](https://keepachangelog.com/pt-BR/1.1.0/),
e este projeto adere ao [Versionamento Semântico](https://semver.org/lang/pt-BR/).
## [2.7.1] - 2026-05-30
Esta versão melhora a clareza dos fluxos de lançamento e a experiência do dashboard. Boletos de receita agora diferenciam pagamentos de recebimentos, a navegação mensal ficou mais direta e o painel ganhou atalhos mais úteis com personalização simplificada.
### Adicionado
- Preferências: nova opção para exibir ou ocultar o card `Resumo da operação` no modal de lançamento.
- Navegação mensal: ao passar o mouse, focar ou clicar no período selecionado, agora é possível abrir um seletor e ir diretamente para outro mês.
### Alterado
- Documentação: o guia visual foi reescrito com os tokens, temas, componentes e práticas de acessibilidade atuais; o README agora apresenta a identidade visual e as preferências disponíveis.
- Dashboard: os cards de receitas e despesas agora oferecem um atalho discreto para abrir os lançamentos da pessoa principal filtrados pelo tipo e período.
- Dashboard: a configuração e a reordenação de widgets agora partem de uma única ação `Personalizar`, com controle de visibilidade durante a edição.
- Dashboard: em telas pequenas, os atalhos para receita, despesa e anotação foram agrupados no menu `Adicionar`.
- Dashboard: os títulos dos widgets agora usam sentence case para reduzir ruído visual.
- Dashboard: os widgets receberam uma revisão ampla de UX, com hierarquia visual mais clara, listas compactas, textos mais diretos, estados acessíveis e navegação interna consistente.
- Dashboard: o widget `Comportamento de pagamento` foi renomeado para `Distribuição de despesas`.
- Dashboard: limites de orçamento agora aparecem apenas no widget de despesas por categoria.
- Dashboard: o widget `Panorama de gastos` agora exibe todos os lançamentos sem filtro adicional por cartão.
- Navegação: o menu de finanças agora oferece submenus para abrir diretamente as faturas dos cartões e os extratos das contas ativas.
- Lançamentos: ao passar o mouse sobre `Filtros`, os filtros ativos agora aparecem em um painel compacto com remoção individual e ação para limpar todos de uma vez.
### Corrigido
- Dashboard: o saldo consolidado do widget `Minhas contas` não inclui mais contas inativas.
- Boletos: lançamentos de receita agora exibem ações e status como `Receber`, `Recebido` e `Recebido em`, enquanto despesas continuam usando `Pagar`, `Pago` e `Pago em`.
- Dashboard: o modal de baixa de boleto agora usa textos de recebimento e conta de destino para receitas.
- Calendário e pessoas: os detalhes de boletos de receita agora preservam a nomenclatura de recebimento.
## [2.7.0] - 2026-05-28
Esta versão amplia o OpenMonetis para quem usa o app todos os dias e para quem prefere mais controle sobre os próprios dados. Os Insights ganham novas opções de IA, incluindo modelos locais via Ollama, enquanto a autenticação fica mais confortável em dispositivos pessoais. Também entram melhorias práticas em contas, lançamentos compartilhados, filtros, relatórios e dashboard, deixando os fluxos financeiros mais completos e fáceis de revisar.

479
DESIGN.md
View File

@@ -1,389 +1,178 @@
# Design System Inspired by OpenMonetis
# Design System do OpenMonetis
## 1. Visual Theme & Atmosphere
Este documento descreve a identidade visual implementada no OpenMonetis. Ele deve
ser usado como referência ao criar telas, revisar componentes e manter a
experiência consistente entre dashboard, relatórios, formulários e landing page.
OpenMonetis embodies a warm, approachable financial management aesthetic grounded in trust and transparency. The design system combines a rich warm-orange accent palette with a sophisticated warm-neutral foundation, creating an interface that feels both professional and inviting. The typography and spacing work together to emphasize clarity and hierarchy, supporting the open-source ethos of personal financial control. The visual atmosphere prioritizes legibility and calm navigation, with generous whitespace and deliberate color restraint—the bold orange is reserved for critical calls-to-action and highlights, while the warm grays and blacks anchor the interface with stability and focus.
## 1. Direção visual
**Key Characteristics**
- Warm, approachable color story with a dominant orange accent (`#FF7733`)
- Generous whitespace and breathing room between sections
- High contrast between backgrounds and text for accessibility
- Clear typographic hierarchy using Inter for all text and UI
- Minimal elevation and shadow treatment—mostly flat design
- Subtle border accents in warm grays to define surfaces
- Open-source transparency reflected in straightforward, honest design language
O OpenMonetis busca tornar a gestão financeira clara e acolhedora. A interface
usa superfícies quentes, poucos elementos decorativos e uma cor laranja de
destaque para orientar o olhar sem transformar toda ação em urgência.
## 2. Color Palette & Roles
Princípios:
### Primary
- **Primary Accent** (`#FF7733`): Used for primary call-to-action buttons, highlights, and key interactive elements throughout the interface; draws user attention to the most important actions
- **Primary Dark** (`#443732`): Warm-brown anchor color used extensively for text, headings, and interactive elements; provides the primary text color across the system
- priorizar legibilidade e hierarquia em telas com muitos dados;
- usar laranja para ações principais, seleção e foco;
- manter superfícies leves no tema claro e contraste confortável no tema escuro;
- aplicar cores semânticas para comunicar estado, não como decoração;
- preservar espaço suficiente entre blocos para evitar ruído visual;
- favorecer componentes responsivos e navegação acessível por teclado.
### Interactive
- **Interactive Neutral** (`#0F0D0C`): Near-black used for primary text and strong emphasis elements; highest contrast state
- **Interactive Overlay** (`#0006`): Transparent black overlay at 24% opacity; used for hover states, modals, and depth layering
## 2. Fonte de verdade
### Neutral Scale
- **Neutral 900** (`#2A2827`): Very dark warm gray; used for secondary text and disabled states
- **Neutral 800** (`#322C2A`): Dark warm gray; alternative text color for lower-emphasis content
- **Neutral 700** (`#676260`): Medium warm gray; used for tertiary text, captions, and metadata
- **Neutral 50** (`#FCF7F6`): Almost-white warm cream; primary background color for light surfaces
- **Neutral 100** (`#F8F6F4`): Very light warm gray; secondary background and subtle surface distinction
- **Neutral 200** (`#F5F2EF`): Light warm gray; tertiary background and card interiors
- **Neutral 300** (`#F0EEEC`): Pale warm gray; border and divider lines
Os tokens globais estão definidos em
[`src/app/globals.css`](./src/app/globals.css). Componentes reutilizáveis ficam
em [`src/shared/components/ui/`](./src/shared/components/ui/) e seguem o padrão
do shadcn/ui com Radix UI e Tailwind CSS 4.
### Surface & Borders
- **Surface** (`#FFFFFF`): Pure white; primary card and container background; high-contrast surface
- **Border Light** (`#F0EEEC`): Pale warm gray used for subtle borders between elements
- **Border Dark** (`#2A2827`): Dark warm gray; stronger borders for defined card boundaries
Ao implementar uma tela:
### Semantic / Status
- **Success** (`#0E9D6E`): Green used for positive status indicators, confirmation states, and success messages
- **Warning** (`#F7A439`): Amber used for cautionary states, warnings, and attention-drawing alerts
- **Error** (`#F53F2D`): Red-orange used for error states, destructive actions, and validation failures
- **Error Alt** (`#D40C1A`): Deep red alternative for critical errors and danger states
1. use classes semânticas como `bg-background`, `bg-card`, `text-foreground`,
`text-muted-foreground`, `border-border` e `ring-ring`;
2. reutilize os componentes em `src/shared/components/ui/`;
3. evite cores hexadecimais e valores arbitrários quando já existir um token;
4. valide os dois temas antes de concluir a alteração.
## 3. Typography Rules
## 3. Cores
### Font Family
**Primary:** Inter (sans-serif)
Fallback: `Inter, system-ui, -apple-system, sans-serif`
A paleta é definida em OKLCH para manter uma percepção de contraste mais
consistente. Não copie os valores para componentes: use os tokens semânticos.
**Monospace:** ui-monospace
Fallback: `ui-monospace, 'Courier New', monospace`
| Token | Papel |
|---|---|
| `background` | Fundo geral da aplicação |
| `foreground` | Texto principal |
| `card` / `card-foreground` | Cards e conteúdo em destaque |
| `popover` / `popover-foreground` | Menus, popovers e overlays |
| `primary` / `primary-foreground` | Ações principais, foco e seleção |
| `secondary` / `secondary-foreground` | Ações secundárias e superfícies discretas |
| `muted` / `muted-foreground` | Apoio visual, descrições e metadados |
| `accent` / `accent-foreground` | Hover e seleção leve |
| `success` | Confirmações, recebimentos e estados positivos |
| `warning` | Atenção, vencimentos e estados intermediários |
| `info` | Informações auxiliares |
| `destructive` | Erros e ações destrutivas |
| `border`, `input`, `ring` | Bordas, campos e foco |
### Hierarchy
### Gráficos
| Role | Font | Size | Weight | Line Height | Letter Spacing | Notes |
|------|------|------|--------|-------------|----------------|-------|
| Display / H1 | Inter | 60px | 600 | 60px | 0px | Page titles and hero headlines; maximum visual impact |
| Heading H2 | Inter | 36px | 600 | 40px | 0px | Section headers and major subsections |
| Heading H3 | Inter | 16px | 600 | 20px | 0px | Card titles and smaller section headers |
| Body | Inter | 20px | 400 | 28px | 0px | Descriptive text, paragraphs, and long-form content |
| Body Secondary | Inter | 16px | 400 | 24px | 0px | Standard body text, list items, and descriptions |
| Emphasis / Span | Inter | 14px | 500 | 20px | 0px | Emphasized text, labels, and badge content |
| Button | Inter | 14px | 500 | 20px | 0px | All button text; medium weight for clarity |
| Caption | Inter | 14px | 400 | 20px | 0px | Metadata, timestamps, and small supporting text |
| Code | ui-monospace | 14px | 400 | 20px | 0px | Code blocks and technical content |
Gráficos usam `chart-1` a `chart-10`. Visualizações que precisam de uma escala
sequencial quente podem usar `data-1` a `data-6`. A cor nunca deve ser o único
meio de distinguir uma série: inclua legenda, rótulo ou tooltip.
### Principles
- **Contrast & Clarity:** Text color `#0F0D0C` on light backgrounds; `#FFFFFF` on dark backgrounds
- **Weight Hierarchy:** Use 600 weight for all headings; 500 for interactive/emphasized text; 400 for body
- **Scale Progression:** Sizes increase in meaningful increments (14 → 16 → 20 → 36 → 60); maintain consistent rhythm
- **Line Height:** Body text uses 1.4× line height multiplier for comfortable reading; headings use tighter ratio (1:1) for impact
- **Readability First:** Avoid line lengths over 80 characters for long-form content; increase line height on smaller screens
### Tema escuro
## 4. Component Stylings
O tema escuro redefine a mesma camada semântica dentro de `.dark`. Não crie uma
segunda árvore de componentes para suportá-lo. Prefira tokens e, somente quando
necessário, variantes Tailwind `dark:`.
### Buttons
## 4. Tipografia
#### Primary Button
- **Background:** `#FF7733`
- **Text Color:** `#FFFFFF`
- **Font Size:** `14px`
- **Font Weight:** `500`
- **Font Family:** `Inter`
- **Padding:** `8px 16px`
- **Border Radius:** `9.2px`
- **Border:** `0px solid transparent`
- **Height:** `40px`
- **Box Shadow:** `none`
- **Hover State:** Darken background to `#E55F1F`; add subtle shadow `0px 2px 8px rgba(0, 0, 0, 0.12)`
- **Active State:** Darken further to `#CC5118`; increase shadow
- **Disabled State:** Background `#E8E3E0`; text color `#999890`; cursor not-allowed
A família principal é **Bricolage Grotesque**, carregada com `next/font` em
[`public/fonts/font_index.ts`](./public/fonts/font_index.ts). Os pesos
disponíveis são `500`, `600` e `700`, com fallback para Arial e fontes sans-serif
do sistema.
#### Secondary Button
- **Background:** `#FFFFFF`
- **Text Color:** `#2A2827`
- **Font Size:** `14px`
- **Font Weight:** `500`
- **Font Family:** `Inter`
- **Padding:** `8px 24px`
- **Border Radius:** `9.2px`
- **Border:** `1px solid #F0EEEC`
- **Height:** `40px`
- **Box Shadow:** `0px 1px 3px rgba(0, 0, 0, 0.06)`
- **Hover State:** Background `#F8F6F4`; border color `#E8E3E0`
- **Active State:** Background `#F0EEEC`; border color `#D5CCCA`
- **Disabled State:** Background `#FAFAF8`; text color `#BFBAB7`; border color `#F0EEEC`
Diretrizes:
#### Ghost Button
- **Background:** `transparent`
- **Text Color:** `#443732`
- **Font Size:** `14px`
- **Font Weight:** `500`
- **Font Family:** `Inter`
- **Padding:** `6px 8px`
- **Border Radius:** `9.2px`
- **Border:** `0px solid transparent`
- **Height:** `32px`
- **Box Shadow:** `none`
- **Hover State:** Background `rgba(68, 55, 50, 0.05)`
- **Active State:** Background `rgba(68, 55, 50, 0.1)`
- **Disabled State:** Text color `#BFBAB7`; cursor not-allowed
- corpo e controles: `text-sm` ou `text-base`;
- descrições e metadados: `text-sm text-muted-foreground`;
- títulos de card: `text-base font-medium`;
- títulos de modal: `text-lg font-semibold`;
- títulos de página: hierarquia responsiva conforme a densidade da tela;
- números financeiros: destaque por peso e alinhamento, sem depender apenas da
cor.
#### Icon Button
- **Background:** `transparent`
- **Icon Color:** `#443732`
- **Size:** `32px` × `32px`
- **Border Radius:** `9.2px`
- **Border:** `0px solid transparent`
- **Padding:** `0px`
- **Box Shadow:** `none`
- **Hover State:** Background `rgba(68, 55, 50, 0.08)`
- **Active State:** Background `rgba(68, 55, 50, 0.12)`
## 5. Espaçamento, raio e elevação
### Cards & Containers
A escala base é de `0.25rem` (`4px`). Prefira a escala padrão do Tailwind para
padding, gap e margens. O raio base é `0.7rem`, exposto pelas classes
`rounded-sm`, `rounded-md`, `rounded-lg` e `rounded-xl`.
#### Standard Card
- **Background:** `#FFFFFF`
- **Border:** `1px solid #F0EEEC`
- **Border Radius:** `11.2px`
- **Padding:** `24px`
- **Box Shadow:** `none`
- **Text Color:** `#2A2827`
- **Hover State:** Border color `#E8E3E0`; box-shadow `0px 4px 12px rgba(0, 0, 0, 0.08)`
Sombras também são tokens. Cards comuns usam `shadow-xs`; menus, tooltips e
modais podem subir de nível conforme a necessidade. Evite adicionar sombra forte
a cada bloco: bordas e diferença de superfície devem resolver a maior parte da
hierarquia.
#### Card with Top Border
- **Background:** `#FFFFFF`
- **Border:** `1px solid #F0EEEC`
- **Border Radius:** `15.2px 15.2px 0px 0px` (top corners only)
- **Padding:** `24px`
- **Box Shadow:** `none`
- **Top Border Color:** `#FF7733` (3px height implied)
## 6. Componentes
#### Surface Container (Header/Nav)
- **Background:** `#FF7733`
- **Height:** `64px`
- **Padding:** `0px 24px`
- **Box Shadow:** `none`
- **Text Color:** `#FFFFFF`
- **Border:** `0px solid transparent`
### Botões
#### Light Surface
- **Background:** `#F8F6F4`
- **Border:** `0px solid transparent`
- **Border Radius:** `11.2px`
- **Padding:** `16px`
- **Box Shadow:** `none`
Use [`Button`](./src/shared/components/ui/button.tsx) e suas variantes:
### Inputs & Forms
| Variante | Uso |
|---|---|
| `default` | Ação principal da tela ou do fluxo |
| `secondary` | Ação complementar |
| `outline` | Ação neutra com contorno |
| `ghost` | Ação discreta em barras e grupos |
| `link` | Ação textual |
| `destructive` | Exclusão ou operação irreversível |
| `navbar` | Ferramentas da navegação superior |
#### Text Input
- **Background:** `#FFFFFF`
- **Border:** `1px solid #F0EEEC`
- **Border Radius:** `9.2px`
- **Padding:** `12px 16px`
- **Font Size:** `16px`
- **Text Color:** `#2A2827`
- **Line Height:** `24px`
- **Placeholder Color:** `#999890`
- **Focus State:** Border color `#FF7733`; box-shadow `0px 0px 0px 3px rgba(255, 119, 51, 0.1)`
- **Error State:** Border color `#F53F2D`; background `#FEF5F3`
- **Disabled State:** Background `#F8F6F4`; text color `#BFBAB7`; border color `#F0EEEC`
Não coloque duas ações `default` competindo na mesma região. Para ícones sem
rótulo visível, inclua `aria-label` ou texto apenas para leitores de tela.
#### Select / Dropdown
- **Background:** `#FFFFFF`
- **Border:** `1px solid #F0EEEC`
- **Border Radius:** `9.2px`
- **Padding:** `12px 16px`
- **Font Size:** `16px`
- **Text Color:** `#2A2827`
- **Focus State:** Border color `#FF7733`; outline `0px`
- **Hover State:** Background `#FAFAF8`
### Cards
#### Checkbox & Radio
- **Size:** `20px` × `20px`
- **Border Radius:** `4px` (checkbox), `50%` (radio)
- **Border:** `2px solid #F0EEEC`
- **Background:** `#FFFFFF`
- **Checked Background:** `#FF7733`
- **Checked Border:** `2px solid #FF7733`
- **Checked Icon Color:** `#FFFFFF`
- **Focus:** Border `2px solid #FF7733`; box-shadow `0px 0px 0px 3px rgba(255, 119, 51, 0.1)`
Use [`Card`](./src/shared/components/ui/card.tsx) para agrupar informações
relacionadas. O componente já define fundo, borda, sombra leve, raio e destaque
de hover. Não transforme todo conteúdo em card: listas densas e tabelas podem
usar uma única superfície.
### Navigation
### Formulários
#### Primary Navigation
- **Background:** `#FF7733`
- **Height:** `64px`
- **Padding:** `0px 48px`
- **Display:** flex; align-items: center; gap `32px`
- **Link Color:** `#FFFFFF`
- **Link Font Size:** `16px`
- **Link Font Weight:** `400`
- **Link Hover:** Opacity `0.8`
- **Link Active:** Text decoration underline; opacity `1.0`
Campos devem usar os componentes compartilhados, como `Input`, `Select`,
`Checkbox`, `Switch` e `DatePicker`. Eles já aplicam foco com `ring`, estados
desabilitados e integração visual com os temas. Sempre associe controles a
`Label` e apresente erros próximos ao campo correspondente.
#### Secondary Navigation / Tabs
- **Background:** `transparent`
- **Border Bottom:** `2px solid #F0EEEC`
- **Tab Padding:** `16px 24px`
- **Tab Color:** `#676260`
- **Tab Font Size:** `16px`
- **Tab Hover:** Color `#443732`
- **Tab Active:** Color `#FF7733`; border-bottom color `#FF7733`
### Diálogos
#### Breadcrumb Navigation
- **Font Size:** `14px`
- **Color:** `#676260`
- **Separator:** `/` with `0px 8px` margin
- **Link Color:** `#443732`
- **Link Hover:** Color `#FF7733`
- **Current (Active):** Color `#2A2827`; font-weight `500`
Use [`Dialog`](./src/shared/components/ui/dialog.tsx) para tarefas focadas. Em
mobile, o conteúdo respeita a largura disponível; em telas maiores, o modal pode
ganhar mais espaço. Botões do rodapé devem preservar a ordem e a hierarquia da
ação principal.
### Badges & Status Indicators
### Feedback
#### Badge Default
- **Background:** `#F8F6F4`
- **Text Color:** `#443732`
- **Padding:** `4px 12px`
- **Border Radius:** `20px`
- **Font Size:** `12px`
- **Font Weight:** `500`
- **Border:** `0px solid transparent`
Use toast para retorno breve, `Alert` para contexto persistente e componentes em
[`src/shared/components/feedback/`](./src/shared/components/feedback/) para
estados vazios, status e confirmações. Textos visíveis ao usuário devem estar em
português claro.
#### Badge Success
- **Background:** `#E8F5F0`
- **Text Color:** `#0E9D6E`
- **Padding:** `4px 12px`
- **Border Radius:** `20px`
- **Font Size:** `12px`
- **Font Weight:** `500`
## 7. Layout e navegação
#### Badge Warning
- **Background:** `#FEF5E8`
- **Text Color:** `#F7A439`
- **Padding:** `4px 12px`
- **Border Radius:** `20px`
- **Font Size:** `12px`
- **Font Weight:** `500`
As páginas protegidas usam uma navbar fixa e um contêiner central com largura
máxima `max-w-8xl`, padding lateral responsivo e espaçamento vertical enxuto. A
navegação principal fica em
[`src/shared/components/navigation/navbar/`](./src/shared/components/navigation/navbar/).
#### Badge Error
- **Background:** `#FEF5F3`
- **Text Color:** `#F53F2D`
- **Padding:** `4px 12px`
- **Border Radius:** `20px`
- **Font Size:** `12px`
- **Font Weight:** `500`
Padrões:
## 5. Layout Principles
- telas do App Router devem continuar finas;
- conteúdo principal começa abaixo da navbar fixa (`pt-16`);
- use uma coluna em telas pequenas e expanda grids progressivamente;
- tabelas e gráficos devem preservar leitura em viewport estreita;
- ações essenciais precisam continuar alcançáveis por toque e teclado.
### Spacing System
- **Base Unit:** `4px`
- **Scale:** `4px`, `8px`, `12px`, `16px`, `24px`, `32px`, `48px`, `56px`, `64px`, `80px`, `96px`, `128px`
## 8. Acessibilidade
**Usage Contexts:**
- **48px:** Tight spacing within compact components (icon-text pairs, inline elements)
- **1216px:** Standard padding inside cards, inputs, and buttons
- **2432px:** Section gaps, spacing between components on a page
- **4864px:** Large section separations, hero spacing
- **80128px:** Hero margins, page-level vertical rhythm
- mantenha foco visível com os tokens `ring`;
- use HTML semântico antes de adicionar ARIA;
- não comunique estado apenas por cor;
- associe labels a inputs;
- forneça nome acessível para botões de ícone;
- confira contraste e navegação por teclado nos temas claro e escuro;
- mantenha áreas de toque confortáveis em mobile.
### Grid & Container
- **Max Width:** `1440px` for full-width containers
- **Content Width:** `1152px` for typical page layouts
- **Column Strategy:** 12-column grid system; gutter `24px`
- **Container Padding:** `48px` on desktop (left + right)
- **Section Pattern:** Full-width containers with internal max-width constraint
## 9. Checklist de revisão visual
### Whitespace Philosophy
OpenMonetis prioritizes breathing room and visual clarity. Whitespace is intentional and strategic—surrounding headings, separating card groups, and framing key messages. The warm neutral backgrounds (`#F8F6F4`, `#F5F2EF`) create natural visual separation without hard borders. Minimum margin between major sections is `64px` vertically; minimum padding inside containers is `16px`.
### Border Radius Scale
- **Sharp Corners:** `0px` (utility container tops, category selectors)
- **Subtle Radius:** `9.2px` (buttons, small inputs, icon buttons)
- **Standard Radius:** `11.2px` (cards, standard containers, modals)
- **Rounded Top:** `15.2px 15.2px 0px 0px` (card headers, sheet-style containers)
- **Pill Shape:** `24px` (badges, full-rounded tags, avatar images)
- **Circle:** `50%` (avatar images, radial elements)
## 6. Depth & Elevation
| Level | Treatment | Use |
|-------|-----------|-----|
| Flat (None) | No shadow, `border: 1px solid #F0EEEC` | Default cards, inputs, containers; baseline surfaces |
| Subtle (sm) | `0px 1px 3px rgba(0, 0, 0, 0.06)` | Secondary buttons, hover states on light surfaces |
| Medium (md) | `0px 4px 12px rgba(0, 0, 0, 0.08)` | Elevated cards on hover, floating actions |
| Deep (lg) | `0px 10px 24px rgba(0, 0, 0, 0.12)` | Modals, dropdowns, popover menus |
**Shadow Philosophy:**
The design system uses restrained shadow treatment aligned with a flat-modern aesthetic. Shadows emerge subtly on interaction (hover, focus) rather than as default styling. The primary depth cue is border color (`#F0EEEC`), which maintains visual hierarchy without excessive z-depth. When shadows are used, they employ warm-tinted blacks (`rgba(0, 0, 0, 0.060.12)`) to harmonize with the warm neutral palette.
## 7. Do's and Don'ts
### Do
- Use the primary orange (`#FF7733`) exclusively for the most important call-to-action buttons
- Apply generous padding (`24px48px`) around sections and inside cards for breathing room
- Stack elements vertically with `2432px` gaps for clear visual rhythm
- Use warm grays (`#443732`, `#2A2827`) for all body text to maintain the warm aesthetic
- Apply `9.2px` border radius consistently to all interactive elements (buttons, inputs)
- Keep line heights at `1.4×` or greater for comfortable reading on body text
- Use semantic colors (`#0E9D6E` success, `#F7A439` warning, `#F53F2D` error) intentionally
- Test contrast ratios; maintain WCAG AA minimum (4.5:1 for body text)
- Use the `Inter` typeface exclusively for consistency
- Implement focus states with a `3px` colored outline or border
### Don't
- Don't use orange anywhere except primary CTAs and critical highlights
- Don't reduce padding below `12px` inside cards or `8px` inside compact buttons
- Don't use dark backgrounds (`#0F0D0C`) for body text on light surfaces; stick to `#2A2827` or `#443732`
- Don't apply shadows as default styling; reserve them for elevated states (hover, focus, modal)
- Don't mix border radius values on the same component type; stick to defined scale
- Don't increase line height above `1.6×` for headings; tighten for impact
- Don't use the error color (`#F53F2D`) for general emphasis; reserve for genuine errors
- Don't create new colors outside the palette; use opacity if gradation is needed
- Don't apply multiple shadows to a single element; layer a maximum of two shadow values
- Don't forget to include focus/keyboard navigation states on all interactive elements
## 8. Responsive Behavior
### Breakpoints
| Breakpoint | Width | Key Changes |
|-----------|-------|-------------|
| Mobile | `375px599px` | Single column; container padding `16px`; font sizes reduce 12 sizes; gap scale halved |
| Tablet | `600px1023px` | Two-column grid; container padding `32px`; button height `36px`; heading sizes reduce slightly |
| Desktop | `1024px+` | Full 12-column grid; container padding `48px`; full-scale typography; max-width `1440px` |
### Touch Targets
- **Minimum Interactive Size:** `44px` × `44px` for mobile; `40px` × `40px` for desktop
- **Button Padding:** `12px` vertical, `16px` horizontal (minimum)
- **Link Padding:** `6px` vertical, `8px` horizontal minimum
- **Icon Button:** `32px` × `32px` minimum (32px on mobile preferred)
- **Spacing Between Targets:** `8px` minimum to avoid accidental activation
### Collapsing Strategy
- **Navigation:** Horizontal nav on desktop collapses to hamburger menu on tablet; menu items stack vertically with `12px` gap
- **Grid:** 12-column layout on desktop → 6-column on tablet → 2-column (stacked) on mobile
- **Cards:** Three-column card layouts collapse to single column on mobile; padding reduces from `24px` to `16px`
- **Typography:** Display (60px) → 36px on tablet → 28px on mobile; body (20px) → 18px on tablet → 16px on mobile
- **Spacing:** All spacing scale values reduce by 2533% on mobile (e.g., `24px` gap → `16px` on tablet, `12px` on mobile)
- **Buttons:** Full-width on mobile (padding `0px`); inline (auto-width) on desktop
- **Inputs:** Full-width on mobile; constrained width on desktop
## 9. Agent Prompt Guide
### Quick Color Reference
- **Primary CTA:** Warm Orange (`#FF7733`) — Buttons, highlights, key interactions
- **Primary Text:** Warm Brown (`#443732`) — Headings, strong emphasis
- **Secondary Text:** Dark Neutral (`#2A2827`) — Body text, card content
- **Background:** White (`#FFFFFF`) — Cards, primary surfaces
- **Background Alt:** Cream (`#FCF7F6`) — Alternative surfaces, light containers
- **Border:** Pale Gray (`#F0EEEC`) — Card borders, divider lines
- **Success:** Green (`#0E9D6E`) — Confirmation, positive states
- **Warning:** Amber (`#F7A439`) — Cautions, attention states
- **Error:** Red-Orange (`#F53F2D`) — Errors, destructive actions
- **Disabled:** Light Gray (`#E8E3E0`) — Inactive elements, inaccessible states
### Iteration Guide
1. **Always use `#FF7733` for primary buttons** and all main call-to-action elements; secondary buttons use `#FFFFFF` with `#F0EEEC` border
2. **Typography is always `Inter`** with weights 400 (body), 500 (emphasis), and 600 (headings); size hierarchy: 14 → 16 → 20 → 36 → 60px
3. **Spacing base is `4px`**; use multiples from the scale (8, 12, 16, 24, 32, 48, 64, 80, 96, 128px); never arbitrary values
4. **Border radius:** Apply `9.2px` to all buttons and inputs, `11.2px` to cards, `15.2px 15.2px 0px 0px` to top-bordered containers
5. **Cards default to `#FFFFFF` background with `1px solid #F0EEEC` border**; add shadow only on hover (0px 4px 12px rgba(0, 0, 0, 0.08))
6. **Form inputs:** Padding `12px 16px`, border `1px solid #F0EEEC`, focus state `border: 1px solid #FF7733` + `box-shadow: 0px 0px 0px 3px rgba(255, 119, 51, 0.1)`
7. **Navigation background is always `#FF7733`** with white text; links in content use `#443732` with underline on active
8. **Maintain 1.4× line height minimum for body text**; tighten headings to 1:1 or 1.2:1 ratio
9. **Contrast validation:** Text `#0F0D0C` or `#2A2827` on light backgrounds (WCAG AA); text `#FFFFFF` on `#FF7733` (WCAG AAA)
10. **Responsive collapse:** Reduce padding and font by 25% on mobile; stack multi-column layouts to single column; full-width buttons on mobile only
- O componente compartilhado existente foi reutilizado?
- As cores usam tokens semânticos?
- A tela funciona em tema claro e escuro?
- O layout continua legível em mobile?
- Foco, labels e nomes acessíveis estão presentes?
- Estados vazio, carregando, erro e sucesso foram considerados?
- Valores financeiros continuam fáceis de comparar?

View File

@@ -8,7 +8,7 @@
> **⚠️ Não há versão online hospedada.** Você precisa clonar o repositório e rodar localmente ou no seu próprio servidor.
[![Version](https://img.shields.io/badge/version-2.7.0-blue?style=flat-square)](CHANGELOG.md)
[![Version](https://img.shields.io/badge/version-2.7.1-blue?style=flat-square)](CHANGELOG.md)
[![Next.js](https://img.shields.io/badge/Next.js-black?style=flat-square&logo=next.js)](https://nextjs.org/)
[![TypeScript](https://img.shields.io/badge/TypeScript-blue?style=flat-square&logo=typescript)](https://www.typescriptlang.org/)
[![PostgreSQL](https://img.shields.io/badge/PostgreSQL-blue?style=flat-square&logo=postgresql)](https://www.postgresql.org/)
@@ -36,6 +36,7 @@
- [Backup](#-backup)
- [Storage S3 Compatível](#-storage-s3-compatível)
- [Variáveis de Ambiente](#-variáveis-de-ambiente)
- [Design System](#-design-system)
- [Arquitetura](#-arquitetura)
- [Contribuindo](#-contribuindo)
- [Apoie o Projeto](#-apoie-o-projeto)
@@ -64,7 +65,7 @@ A ideia é simples: ter um lugar onde consigo ver todas as minhas contas, cartõ
💰 **Contas e transações** — Contas bancárias, cartões, dinheiro. Receitas, despesas, rendimentos e transferências. Categorização, divisão de lançamentos entre várias pessoas, filtros combináveis com intervalo de datas, extratos detalhados e importação de extratos OFX e XLS/XLSX com detecção automática de categoria.
📊 **Dashboard e relatórios** — Widgets interativos de métricas, gráficos de evolução, comparativos por categoria, tendências, uso de cartões, top estabelecimentos. Exportação em PDF e Excel.
📊 **Dashboard e relatórios** — Widgets personalizáveis, métricas com atalhos para lançamentos, gráficos de evolução, comparativos por categoria, tendências, uso de cartões, top estabelecimentos e navegação direta entre meses pelo seletor de período. Exportação em PDF e Excel.
💳 **Faturas de cartão** — Acompanhe faturas por período, controle limites e vencimentos.
@@ -86,7 +87,7 @@ A ideia é simples: ter um lugar onde consigo ver todas as minhas contas, cartõ
<img src="./public/images/companion-preview-light.webp" alt="OpenMonetis Companion" width="300" height="600" />
</p>
⚙️ **Personalização** — Tema dark/light, modo privacidade e changelog visual para acompanhar as novidades do app.
⚙️ **Personalização** — Tema dark/light, modo privacidade, ordem das colunas, exibição de anotações, tamanho máximo de anexos, resumo opcional no modal de lançamento e changelog visual para acompanhar as novidades do app.
### Stack técnica
@@ -94,6 +95,7 @@ A ideia é simples: ter um lugar onde consigo ver todas as minhas contas, cartõ
- **PostgreSQL** + **Drizzle ORM**
- **Better Auth** (email/senha, OAuth, Passkeys/WebAuthn)
- **shadcn/ui** (Radix UI) + **Tailwind CSS**
- **Bricolage Grotesque** via `next/font`
- **Docker** (multi-stage build)
- **Biome** (linting + formatting)
- **Vercel AI SDK** (Claude, GPT, Gemini, MiniMax, OpenRouter, Ollama)
@@ -504,6 +506,19 @@ Se o OpenMonetis estiver rodando dentro de um container Docker e o Ollama estive
---
## 🎨 Design System
O OpenMonetis usa uma identidade visual própria com superfícies quentes, laranja
como cor de destaque, temas claro e escuro e tipografia Bricolage Grotesque. A
interface é construída com tokens semânticos em OKLCH, Tailwind CSS 4 e
componentes compartilhados baseados em shadcn/ui e Radix UI.
As regras de cores, tipografia, componentes, responsividade e acessibilidade
estão documentadas no [`DESIGN.md`](DESIGN.md). Use esse guia como referência ao
criar telas ou alterar componentes visuais.
---
## 🏗️ Arquitetura
O projeto segue arquitetura **feature-first** dentro de `src/`:

View File

@@ -0,0 +1 @@
ALTER TABLE "preferencias_usuario" ADD COLUMN "mostrar_resumo_lancamento" boolean DEFAULT true NOT NULL;

File diff suppressed because it is too large Load Diff

View File

@@ -204,6 +204,13 @@
"when": 1777648189399,
"tag": "0029_friendly_spitfire",
"breakpoints": true
},
{
"idx": 30,
"version": "7",
"when": 1780150535055,
"tag": "0030_complete_umar",
"breakpoints": true
}
]
}

View File

@@ -1,6 +1,6 @@
{
"name": "openmonetis",
"version": "2.7.0",
"version": "2.7.1",
"private": true,
"packageManager": "pnpm@11.1.3",
"scripts": {

View File

@@ -1,10 +1,10 @@
import { Golos_Text } from "next/font/google";
import { Bricolage_Grotesque } from "next/font/google";
export const inter = Golos_Text({
export const bricolage = Bricolage_Grotesque({
subsets: ["latin"],
display: "swap",
variable: "--font-inter",
fallback: ["ui-sans-serif", "system-ui"],
variable: "--font-bricolage",
fallback: ["arial", "ui-sans-serif", "system-ui"],
weight: ["500", "600", "700"],
preload: true,
});

View File

@@ -27,6 +27,10 @@ export default async function Page({ searchParams }: PageProps) {
const { dashboardData, preferences, quickActionOptions } =
await fetchDashboardPageData(user.id, selectedPeriod);
const { dashboardWidgets } = preferences;
const adminPayerSlug =
quickActionOptions.payerOptions.find(
(option) => option.value === quickActionOptions.defaultPayerId,
)?.slug ?? null;
const logoMappings = await prefetchLogoMappings(
user.id,
@@ -37,7 +41,11 @@ export default async function Page({ searchParams }: PageProps) {
<main className="flex flex-col gap-4">
<DashboardWelcome name={user.name} />
<MonthNavigation />
<DashboardMetricsCards metrics={dashboardData.metrics} />
<DashboardMetricsCards
metrics={dashboardData.metrics}
period={selectedPeriod}
adminPayerSlug={adminPayerSlug}
/>
<LogoPrefetchProvider mappings={logoMappings}>
<DashboardGridEditable
data={dashboardData}

View File

@@ -1,39 +1,125 @@
import { Card, CardContent } from "@/shared/components/ui/card";
import { Skeleton } from "@/shared/components/ui/skeleton";
/**
* Loading state para a página de insights com IA
*/
const providers = [
"openai",
"anthropic",
"google",
"minimax",
"openrouter",
"ollama",
];
const summaryRows = ["period", "data-source"];
export default function InsightsLoading() {
return (
<main className="flex flex-col gap-6">
<div className="space-y-6 pt-4">
{/* Header */}
<div className="space-y-2">
<Skeleton className="h-10 w-64 rounded-md bg-foreground/10" />
<Skeleton className="h-6 w-96 rounded-md bg-foreground/10" />
<Card className="flex w-full flex-row items-center justify-between gap-2 px-3 py-3 sm:px-4">
<div className="flex items-center gap-2">
<Skeleton className="size-8 bg-foreground/10" />
<Skeleton className="h-8 w-40 bg-foreground/10" />
<Skeleton className="size-8 bg-foreground/10" />
</div>
</Card>
{/* Grid de insights */}
<div className="grid grid-cols-1 gap-6 lg:grid-cols-2">
{Array.from({ length: 4 }).map((_, i) => (
<div key={i} className="rounded-md border p-6 space-y-4">
<div className="flex items-start justify-between">
<div className="space-y-2 flex-1">
<Skeleton className="h-6 w-48 rounded-md bg-foreground/10" />
<Skeleton className="h-4 w-full rounded-md bg-foreground/10" />
<Skeleton className="h-4 w-3/4 rounded-md bg-foreground/10" />
<section className="space-y-4">
<div className="grid items-stretch gap-4 xl:grid-cols-[minmax(0,1fr)_340px]">
<div className="space-y-4">
<Card className="border-border/70 bg-card/95 shadow-sm">
<CardContent className="space-y-6">
<div className="space-y-2">
<Skeleton className="h-8 w-64 bg-foreground/10" />
<Skeleton className="h-4 w-full max-w-2xl bg-foreground/10" />
<Skeleton className="h-4 w-3/4 max-w-xl bg-foreground/10" />
</div>
<div className="space-y-3">
<div className="space-y-2">
<Skeleton className="h-4 w-28 bg-foreground/10" />
<Skeleton className="h-3 w-80 max-w-full bg-foreground/10" />
</div>
<div className="grid gap-3 md:grid-cols-2 xl:grid-cols-3">
{providers.map((provider) => (
<div
className="flex min-h-24 items-start gap-3 rounded-2xl border p-4"
key={provider}
>
<Skeleton className="mt-1 size-4 shrink-0 rounded-full bg-foreground/10" />
<Skeleton className="size-8 shrink-0 rounded-full bg-foreground/10" />
<div className="flex-1 space-y-2">
<Skeleton className="h-4 w-20 bg-foreground/10" />
<Skeleton className="h-3 w-full bg-foreground/10" />
<Skeleton className="h-3 w-3/4 bg-foreground/10" />
</div>
</div>
))}
</div>
</div>
</CardContent>
</Card>
<Card className="border-border/70 bg-card/95 shadow-sm">
<CardContent className="space-y-6">
<div className="space-y-3">
<div className="space-y-2">
<Skeleton className="h-4 w-32 bg-foreground/10" />
<Skeleton className="h-3 w-72 max-w-full bg-foreground/10" />
</div>
<Skeleton className="h-9 w-full max-w-72 bg-foreground/10" />
</div>
<div className="flex items-center justify-between gap-3">
<Skeleton className="h-9 w-24 bg-foreground/10" />
<Skeleton className="h-9 w-32 bg-foreground/10" />
</div>
</CardContent>
</Card>
</div>
<Card className="border-border/70 bg-card/95 shadow-sm">
<CardContent className="flex flex-col gap-4">
<div className="flex items-center gap-3">
<Skeleton className="size-9 rounded-xl bg-foreground/10" />
<div className="space-y-2">
<Skeleton className="h-4 w-32 bg-foreground/10" />
<Skeleton className="h-3 w-24 bg-foreground/10" />
</div>
<Skeleton className="size-8 rounded-full bg-foreground/10" />
</div>
<div className="space-y-2">
<Skeleton className="h-3 w-full rounded-md bg-foreground/10" />
<Skeleton className="h-3 w-full rounded-md bg-foreground/10" />
<Skeleton className="h-3 w-2/3 rounded-md bg-foreground/10" />
<Skeleton className="h-9 w-full bg-foreground/10" />
<Skeleton className="h-8 w-full bg-foreground/10" />
<div className="space-y-4">
{summaryRows.map((row) => (
<div className="flex gap-3" key={row}>
<Skeleton className="size-4 shrink-0 bg-foreground/10" />
<div className="flex-1 space-y-2">
<Skeleton className="h-3 w-24 bg-foreground/10" />
<Skeleton className="h-3 w-full bg-foreground/10" />
</div>
</div>
))}
</div>
</div>
))}
<div className="space-y-3">
<Skeleton className="h-3 w-32 bg-foreground/10" />
<div className="flex items-center gap-3">
<Skeleton className="size-8 rounded-full bg-foreground/10" />
<div className="flex-1 space-y-2">
<Skeleton className="h-4 w-20 bg-foreground/10" />
<Skeleton className="h-3 w-32 bg-foreground/10" />
</div>
</div>
</div>
<Skeleton className="h-20 w-full rounded-2xl bg-foreground/10" />
<Skeleton className="h-20 w-full rounded-2xl bg-foreground/10" />
</CardContent>
</Card>
</div>
</div>
</section>
</main>
);
}

View File

@@ -1,10 +1,12 @@
import { connection } from "next/server";
import { fetchDashboardNavbarData } from "@/features/dashboard/lib/navbar-queries";
import { AppNavbar } from "@/shared/components/navigation/navbar/app-navbar";
import { AppPreferencesProvider } from "@/shared/components/providers/app-preferences-provider";
import { LogoDevProvider } from "@/shared/components/providers/logo-dev-provider";
import { PrivacyProvider } from "@/shared/components/providers/privacy-provider";
import { getUserSession } from "@/shared/lib/auth/server";
import { isLogoDevEnabled } from "@/shared/lib/logo/server";
import { fetchAppPreferences } from "@/shared/lib/preferences/queries";
export default async function DashboardLayout({
children,
@@ -13,26 +15,32 @@ export default async function DashboardLayout({
}>) {
await connection();
const session = await getUserSession();
const navbarData = await fetchDashboardNavbarData(session.user.id);
const [navbarData, appPreferences] = await Promise.all([
fetchDashboardNavbarData(session.user.id),
fetchAppPreferences(session.user.id),
]);
const logoDevEnabled = isLogoDevEnabled();
return (
<LogoDevProvider enabled={logoDevEnabled}>
<PrivacyProvider>
<AppNavbar
user={{ ...session.user, image: session.user.image ?? null }}
payerAvatarUrl={navbarData.payerAvatarUrl}
inboxPendingCount={navbarData.inboxPendingCount}
notificationsSnapshot={navbarData.notificationsSnapshot}
/>
<div className="relative flex flex-1 flex-col pt-16">
<div className="@container/main flex flex-1 flex-col gap-2">
<div className="flex flex-col gap-4 py-5 md:gap-6 w-full max-w-8xl mx-auto px-4 ">
{children}
<AppPreferencesProvider {...appPreferences}>
<PrivacyProvider>
<AppNavbar
user={{ ...session.user, image: session.user.image ?? null }}
payerAvatarUrl={navbarData.payerAvatarUrl}
inboxPendingCount={navbarData.inboxPendingCount}
notificationsSnapshot={navbarData.notificationsSnapshot}
financeLinks={navbarData.financeLinks}
/>
<div className="relative flex flex-1 flex-col pt-16">
<div className="@container/main flex flex-1 flex-col gap-2">
<div className="flex flex-col gap-4 py-5 md:gap-6 w-full max-w-8xl mx-auto px-4 ">
{children}
</div>
</div>
</div>
</div>
</PrivacyProvider>
</PrivacyProvider>
</AppPreferencesProvider>
</LogoDevProvider>
);
}

View File

@@ -0,0 +1,61 @@
import { Card, CardContent, CardHeader } from "@/shared/components/ui/card";
import { Skeleton } from "@/shared/components/ui/skeleton";
const installmentCards = ["first", "second", "third"];
export default function Loading() {
return (
<main className="flex flex-col gap-4 pb-8">
<Card className="border-none bg-primary/10 shadow-none">
<CardContent className="flex flex-col items-start justify-center gap-2 py-2">
<Skeleton className="h-4 w-64 bg-foreground/10" />
<Skeleton className="h-9 w-36 bg-foreground/10" />
<Skeleton className="h-4 w-32 bg-foreground/10" />
</CardContent>
</Card>
<Skeleton className="h-8 w-36 bg-foreground/10" />
<div className="grid grid-cols-1 gap-3 md:grid-cols-2 lg:grid-cols-3">
{installmentCards.map((card) => (
<Card key={card} className="overflow-hidden">
<CardHeader className="pb-0">
<div className="flex items-start gap-2">
<Skeleton className="mt-1 size-4 shrink-0 bg-foreground/10" />
<Skeleton className="size-10 shrink-0 rounded-full bg-foreground/10" />
<div className="flex-1 space-y-2">
<Skeleton className="h-5 w-32 bg-foreground/10" />
<Skeleton className="h-4 w-24 bg-foreground/10" />
</div>
<Skeleton className="h-5 w-16 rounded-full bg-foreground/10" />
</div>
</CardHeader>
<CardContent>
<div className="mb-4 grid grid-cols-2 gap-4 rounded-lg bg-primary/5 p-4">
<div className="space-y-2">
<Skeleton className="h-3 w-24 bg-foreground/10" />
<Skeleton className="h-6 w-20 bg-foreground/10" />
</div>
<div className="flex flex-col items-end gap-2">
<Skeleton className="h-3 w-16 bg-foreground/10" />
<Skeleton className="h-6 w-20 bg-foreground/10" />
</div>
</div>
<div className="mb-4 space-y-2">
<div className="flex items-center justify-between">
<Skeleton className="h-3 w-40 bg-foreground/10" />
<Skeleton className="h-3 w-16 bg-foreground/10" />
</div>
<Skeleton className="h-2.5 w-full bg-foreground/10" />
</div>
<Skeleton className="h-8 w-full bg-foreground/10" />
</CardContent>
</Card>
))}
</div>
</main>
);
}

View File

@@ -82,6 +82,9 @@ export default async function Page() {
userPreferences?.transactionsColumnOrder ?? null
}
attachmentMaxSizeMb={userPreferences?.attachmentMaxSizeMb ?? 50}
showTransactionSummary={
userPreferences?.showTransactionSummary ?? true
}
/>
</div>
</Card>

View File

@@ -86,7 +86,7 @@ export async function POST(request: Request) {
const body = await request.json();
const { items } = inboxBatchSchema.parse(body);
// Processar todos os itens em paralelo
// lançar todos os itens em paralelo
const settled = await Promise.allSettled(
items.map((item) =>
db
@@ -119,7 +119,7 @@ export async function POST(request: Request) {
return {
clientId: item?.clientId,
success: false,
error: "Erro ao processar notificação",
error: "Erro ao lançar notificação",
};
});
@@ -160,7 +160,7 @@ export async function POST(request: Request) {
console.error("[API] Error creating batch inbox items:", error);
return NextResponse.json(
{ error: "Erro ao processar notificações" },
{ error: "Erro ao lançar notificações" },
{ status: 500 },
);
}

View File

@@ -127,7 +127,7 @@ export async function POST(request: Request) {
console.error("[API] Error creating inbox item:", error);
return NextResponse.json(
{ error: "Erro ao processar notificação" },
{ error: "Erro ao lançar notificação" },
{ status: 500 },
);
}

View File

@@ -117,7 +117,7 @@
--destructive: oklch(62% 0.2 28);
--destructive-foreground: oklch(98% 0.005 30);
--border: oklch(31.987% 0.00462 39.069);
--border: oklch(24.576% 0.0072 67.399);
--input: var(--border);
--ring: var(--primary);
@@ -170,7 +170,7 @@
}
@theme inline {
--default-font-family: var(--font-inter);
--default-font-family: var(--font-bricolage);
--color-background: var(--background);
--color-foreground: var(--foreground);
--color-card: var(--card);

View File

@@ -4,7 +4,7 @@ import { QueryProvider } from "@/shared/components/providers/query-provider";
import { ThemeProvider } from "@/shared/components/providers/theme-provider";
import { Toaster } from "@/shared/components/ui/sonner";
import "./globals.css";
import { inter } from "@/public/fonts/font_index";
import { bricolage } from "@/public/fonts/font_index";
export const metadata: Metadata = {
title: {
@@ -24,7 +24,7 @@ export default function RootLayout({
<html
data-scroll-behavior="smooth"
lang="pt-BR"
className={`${inter.variable}`}
className={`${bricolage.className}`}
suppressHydrationWarning
>
<head>

View File

@@ -154,6 +154,9 @@ export const userPreferences = pgTable("preferencias_usuario", {
string[] | null
>(),
attachmentMaxSizeMb: integer("attachment_max_size_mb").notNull().default(50),
showTransactionSummary: boolean("mostrar_resumo_lancamento")
.notNull()
.default(true),
dashboardWidgets: jsonb("dashboard_widgets").$type<{
order: string[];
hidden: string[];
@@ -495,7 +498,7 @@ export const inboxItems = pgTable(
withTimezone: true,
}).notNull(),
// Dados parseados (editáveis pelo usuário antes de processar)
// Dados parseados (editáveis pelo usuário antes de lançar)
parsedName: text("parsed_name"), // Nome do estabelecimento
parsedAmount: numeric("parsed_amount", { precision: 12, scale: 2 }),

View File

@@ -82,7 +82,7 @@ export function AccountStatementCard({
</div>
{/* Linha 2 — saldo final (hero) */}
<div className="space-y-4">
<div className="space-y-3">
<p className="text-sm text-muted-foreground ">
Saldo ao final do período
</p>

View File

@@ -81,6 +81,8 @@ const renderLancamento = (
const renderBoleto = (event: Extract<CalendarEvent, { type: "boleto" }>) => {
const isPaid = Boolean(event.transaction.isSettled);
const isIncome = event.transaction.transactionType === "Receita";
const settlementLabel = isIncome ? "Recebido" : "Pago";
const dueDateLabel = formatFinancialDateLabel(
event.transaction.dueDate,
"Vence em",
@@ -89,7 +91,7 @@ const renderBoleto = (event: Extract<CalendarEvent, { type: "boleto" }>) => {
const paymentDateLabel = isPaid
? formatFinancialDateLabel(
event.transaction.boletoPaymentDate,
"Pago em",
`${settlementLabel} em`,
DATE_FORMAT,
)
: null;
@@ -109,7 +111,9 @@ const renderBoleto = (event: Extract<CalendarEvent, { type: "boleto" }>) => {
<span className="text-success">{paymentDateLabel}</span>
)}
</div>
<Badge variant="outline">{isPaid ? "Pago" : "Pendente"}</Badge>
<Badge variant="outline">
{isPaid ? settlementLabel : "Pendente"}
</Badge>
</div>
<MoneyValues
className="font-medium whitespace-nowrap"

View File

@@ -89,7 +89,7 @@ export function CategoryDetailHeader({
</div>
<div className="grid gap-3 md:grid-cols-3">
<div className="rounded-md border border-dashed bg-muted/20 px-3 py-3">
<div className="rounded-lg border p-3">
<p className="text-xs font-medium uppercase tracking-wide text-muted-foreground">
Total em {currentPeriodLabel}
</p>
@@ -98,7 +98,7 @@ export function CategoryDetailHeader({
</p>
</div>
<div className="rounded-md border border-dashed bg-muted/20 px-3 py-3">
<div className="rounded-lg border p-3">
<p className="text-xs font-medium uppercase tracking-wide text-muted-foreground">
Total em {previousPeriodLabel}
</p>
@@ -107,7 +107,7 @@ export function CategoryDetailHeader({
</p>
</div>
<div className="rounded-md border border-dashed bg-muted/20 px-3 py-3">
<div className="rounded-lg border p-3">
<p className="text-xs font-medium uppercase tracking-wide text-muted-foreground">
Variação
</p>

View File

@@ -1,18 +1,28 @@
import type { DashboardBill } from "@/features/dashboard/bills/bills-queries";
import type { PaymentDialogState } from "@/features/dashboard/payments/use-payment-dialog-controller";
import { getBusinessDateString, isDateOnlyPast } from "@/shared/utils/date";
import {
getBusinessDateString,
isDateOnlyPast,
parseUtcDateString,
toDateOnlyString,
} from "@/shared/utils/date";
import {
buildFinancialStatusLabel,
buildRelativeFinancialStatusLabel,
formatFinancialDateLabel,
formatRelativeFinancialDateLabel,
} from "@/shared/utils/financial-dates";
export type BillDialogState = PaymentDialogState;
type BillStatusDateItem = Pick<
DashboardBill,
"dueDate" | "boletoPaymentDate" | "isSettled"
"dueDate" | "boletoPaymentDate" | "isSettled" | "transactionType"
>;
export const isIncomeBill = (bill: Pick<DashboardBill, "transactionType">) => {
return bill.transactionType === "Receita";
};
export const formatBillDateLabel = (value: string | null, prefix?: string) => {
return formatFinancialDateLabel(value, prefix);
};
@@ -22,10 +32,15 @@ export const buildBillStatusLabel = (bill: BillStatusDateItem) => {
isSettled: bill.isSettled,
dueDate: bill.dueDate,
paidAt: bill.boletoPaymentDate,
paidPrefix: isIncomeBill(bill) ? "Recebido em" : "Pago em",
});
};
export const buildBillWidgetStatusLabel = (bill: BillStatusDateItem) => {
if (bill.isSettled && isIncomeBill(bill)) {
return formatRelativeFinancialDateLabel(bill.boletoPaymentDate, "received");
}
return buildRelativeFinancialStatusLabel({
isSettled: bill.isSettled,
dueDate: bill.dueDate,
@@ -43,6 +58,34 @@ export const isBillOverdue = (bill: DashboardBill) => {
return isDateOnlyPast(bill.dueDate);
};
export const formatBillWidgetOverdueLabel = (
bill: Pick<DashboardBill, "dueDate" | "isSettled" | "transactionType">,
): string | null => {
if (bill.isSettled) {
return null;
}
const dueDateValue = toDateOnlyString(bill.dueDate);
const todayValue = getBusinessDateString();
if (!dueDateValue || dueDateValue >= todayValue) {
return null;
}
const dueDate = parseUtcDateString(dueDateValue);
const today = parseUtcDateString(todayValue);
if (!dueDate || !today) {
return null;
}
const overdueDays = Math.round(
(today.getTime() - dueDate.getTime()) / (24 * 60 * 60 * 1000),
);
const overdueLabel = isIncomeBill(bill) ? "Atrasada" : "Atrasado";
return overdueDays === 1
? `${overdueLabel} · venceu ontem`
: `${overdueLabel} · venceu há ${overdueDays} dias`;
};
export const getBillStatusBadgeVariant = (
statusLabel: string,
): "success" | "info" => {

View File

@@ -6,6 +6,7 @@ export type DashboardBill = {
boletoPaymentDate: string | null;
isSettled: boolean;
accountId: string | null;
transactionType: string;
};
export type BillPaymentAccountOption = {

View File

@@ -1,9 +1,11 @@
import { RiCheckboxCircleFill, RiExternalLinkLine } from "@remixicon/react";
import { RiCheckboxCircleFill } from "@remixicon/react";
import Link from "next/link";
import {
buildBillStatusLabel,
buildBillWidgetStatusLabel,
formatBillWidgetOverdueLabel,
isBillOverdue,
isIncomeBill,
} from "@/features/dashboard/bills/bills-helpers";
import type { DashboardBill } from "@/features/dashboard/bills/bills-queries";
import { EstablishmentLogo } from "@/shared/components/entity-avatar";
@@ -36,8 +38,10 @@ export function BillListItem({ bill, period, onPay }: BillListItemProps) {
const statusLabel = buildBillWidgetStatusLabel(bill);
const absoluteStatusLabel = buildBillStatusLabel(bill);
const overdue = isBillOverdue(bill);
const income = isIncomeBill(bill);
const overdueLabel = formatBillWidgetOverdueLabel(bill);
const statusTooltipLabel =
statusLabel && statusLabel !== absoluteStatusLabel
overdueLabel || (statusLabel && statusLabel !== absoluteStatusLabel)
? absoluteStatusLabel
: null;
const href = buildTransactionsHref(bill.name, period);
@@ -53,10 +57,6 @@ export function BillListItem({ bill, period, onPay }: BillListItemProps) {
className="inline-flex max-w-full items-center gap-1 text-sm font-medium text-foreground underline-offset-2 hover:text-primary hover:underline"
>
<span className="truncate">{bill.name}</span>
<RiExternalLinkLine
className="size-3 shrink-0 text-muted-foreground"
aria-hidden
/>
</Link>
<div className="flex flex-wrap items-center gap-2 text-xs text-muted-foreground">
{statusLabel ? (
@@ -67,9 +67,10 @@ export function BillListItem({ bill, period, onPay }: BillListItemProps) {
className={cn(
"cursor-help rounded-full py-0.5",
bill.isSettled && "text-success font-semibold",
overdue && "text-destructive font-semibold",
)}
>
{statusLabel}
{overdueLabel ?? statusLabel}
</span>
</TooltipTrigger>
<TooltipContent side="top">
@@ -81,9 +82,10 @@ export function BillListItem({ bill, period, onPay }: BillListItemProps) {
className={cn(
"rounded-full py-0.5",
bill.isSettled && "text-success font-semibold",
overdue && "text-destructive font-semibold",
)}
>
{statusLabel}
{overdueLabel ?? statusLabel}
</span>
)
) : null}
@@ -93,29 +95,35 @@ export function BillListItem({ bill, period, onPay }: BillListItemProps) {
<div className="flex shrink-0 flex-col items-end">
<MoneyValues className="font-medium" amount={bill.amount} />
<Button
type="button"
size="sm"
variant="link"
className="h-auto p-0 disabled:opacity-100"
disabled={bill.isSettled}
onClick={() => onPay(bill.id)}
>
{bill.isSettled ? (
<span className="flex items-center gap-0.5 text-success">
<RiCheckboxCircleFill className="size-3.5" /> Pago
</span>
) : overdue ? (
<span className="overdue-blink">
<span className="overdue-blink-primary text-destructive">
Atrasado
{bill.isSettled ? (
<span className="flex h-7 items-center gap-0.5 text-xs font-medium text-success">
<RiCheckboxCircleFill className="size-3.5" />{" "}
{income ? "Recebido" : "Pago"}
</span>
) : (
<Button
type="button"
size="sm"
variant="link"
className="-mr-1.5 h-7 px-1.5 py-0"
onClick={() => onPay(bill.id)}
>
{overdue ? (
<span className="overdue-blink">
<span className="overdue-blink-primary text-destructive">
{income ? "Atrasada" : "Atrasado"}
</span>
<span className="overdue-blink-secondary">
{income ? "Receber" : "Pagar"}
</span>
</span>
<span className="overdue-blink-secondary">Pagar</span>
</span>
) : (
"Pagar"
)}
</Button>
) : income ? (
"Receber"
) : (
"Pagar"
)}
</Button>
)}
</div>
</li>
);

View File

@@ -7,6 +7,7 @@ import {
type BillDialogState,
formatBillDateLabel,
getBillStatusBadgeVariant,
isIncomeBill,
} from "@/features/dashboard/bills/bills-helpers";
import type {
BillPaymentAccountOption,
@@ -66,11 +67,13 @@ export function BillPaymentDialog({
onConfirm,
}: BillPaymentDialogProps) {
const isProcessing = modalState === "processing" || isPending;
const income = bill ? isIncomeBill(bill) : false;
const settlementLabel = income ? "Recebido" : "Pago";
const dueLabel = bill
? formatBillDateLabel(bill.dueDate, "Vencimento:")
: null;
const paidLabel = bill
? formatBillDateLabel(bill.boletoPaymentDate, "Pago em:")
? formatBillDateLabel(bill.boletoPaymentDate, `${settlementLabel} em:`)
: null;
const isBillPending = bill ? !bill.isSettled : false;
const paymentDateValue = paymentDate.toISOString().split("T")[0] ?? "";
@@ -103,8 +106,8 @@ export function BillPaymentDialog({
>
{modalState === "success" ? (
<PaymentSuccess
title="Pagamento registrado!"
description="Atualizamos o status do boleto para pago. Em instantes ele aparecerá como baixado no histórico."
title={income ? "Recebimento registrado!" : "Pagamento registrado!"}
description={`Atualizamos o status do boleto para ${income ? "recebido" : "pago"}. Em instantes ele aparecerá como baixado no histórico.`}
onClose={onClose}
/>
) : (
@@ -112,10 +115,12 @@ export function BillPaymentDialog({
<DialogHeader>
<div className="mb-1 flex items-center gap-3">
<div>
<DialogTitle>Confirmar pagamento</DialogTitle>
<DialogTitle>
{income ? "Confirmar recebimento" : "Confirmar pagamento"}
</DialogTitle>
<DialogDescription className="mt-1 text-xs">
{isBillPending
? "Escolha a conta de origem e a data em que o boleto foi pago."
? `Escolha a conta de ${income ? "destino" : "origem"} e a data em que o boleto foi ${income ? "recebido" : "pago"}.`
: "Boleto"}
</DialogDescription>
</div>
@@ -158,12 +163,15 @@ export function BillPaymentDialog({
<div className="flex items-center gap-1.5 text-muted-foreground">
<RiCalendarLine className="size-3.5" />
<span className="text-xs font-medium uppercase">
{bill.isSettled ? "Pago em" : "Vencimento"}
{bill.isSettled
? `${settlementLabel} em`
: "Vencimento"}
</span>
</div>
<p className="font-semibold">
{bill.isSettled
? (paidLabel?.replace("Pago em: ", "") ?? "—")
? (paidLabel?.replace(`${settlementLabel} em: `, "") ??
"—")
: (dueLabel?.replace("Vencimento: ", "") ?? "—")}
</p>
</Card>
@@ -175,7 +183,7 @@ export function BillPaymentDialog({
<div className="space-y-3">
<div className="space-y-2">
<Label htmlFor="bill-widget-payment-account">
Conta de pagamento
Conta de {income ? "recebimento" : "pagamento"}
</Label>
<Select
value={paymentAccountId}
@@ -212,7 +220,7 @@ export function BillPaymentDialog({
<div className="space-y-2">
<Label htmlFor="bill-widget-payment-date">
Data do pagamento
Data do {income ? "recebimento" : "pagamento"}
</Label>
<DatePicker
id="bill-widget-payment-date"
@@ -231,8 +239,8 @@ export function BillPaymentDialog({
<span className="text-sm text-muted-foreground">
Status atual
</span>
<Badge variant={getBillStatusBadgeVariant("Pago")}>
Pago
<Badge variant={getBillStatusBadgeVariant(settlementLabel)}>
{settlementLabel}
</Badge>
</div>
)}

View File

@@ -15,7 +15,7 @@ export function BillsList({ bills, period, onPay }: BillsListProps) {
<WidgetEmptyState
icon={<RiBarcodeFill className="size-6 text-muted-foreground" />}
title="Nenhum boleto cadastrado para o período selecionado"
description="Cadastre boletos para monitorar os pagamentos aqui."
description="Cadastre boletos para monitorar os vencimentos aqui."
/>
);
}

View File

@@ -41,9 +41,7 @@ export function BillsWidgetView({
}: BillsWidgetViewProps) {
return (
<>
<div className="flex flex-col gap-4">
<BillsList bills={bills} period={period} onPay={onOpenPaymentDialog} />
</div>
<BillsList bills={bills} period={period} onPay={onOpenPaymentDialog} />
<BillPaymentDialog
bill={selectedBill}

View File

@@ -96,7 +96,7 @@ export function CategoryBreakdownChart({
}, [categories, chartConfig]);
return (
<div className="flex items-center gap-4">
<div className="flex flex-col items-center gap-4 sm:flex-row">
<ChartContainer config={chartConfig} className="h-[280px] flex-1">
<PieChart>
<Pie
@@ -143,7 +143,7 @@ export function CategoryBreakdownChart({
</PieChart>
</ChartContainer>
<div className="min-w-[140px] flex flex-col gap-2">
<div className="grid w-full grid-cols-2 gap-2 sm:min-w-[140px] sm:w-auto sm:grid-cols-1">
{chartData.map((entry, index) => (
<div key={`legend-${index}`} className="flex items-center gap-2">
<div

View File

@@ -1,4 +1,3 @@
import { RiExternalLinkLine } from "@remixicon/react";
import Link from "next/link";
import type { DashboardCategoryBreakdownItem } from "@/features/dashboard/categories/category-breakdown-helpers";
import { PercentageChangeIndicator } from "@/features/dashboard/components/percentage-change-indicator";
@@ -11,13 +10,14 @@ type CategoryBreakdownListItemConfig = {
shareLabel: string;
percentageDigits: number;
positiveTrend: "up" | "down";
includeBudgetAmount: boolean;
showBudget: boolean;
};
type CategoryBreakdownListItemProps = {
category: DashboardCategoryBreakdownItem;
periodParam: string;
config: CategoryBreakdownListItemConfig;
position: number;
};
const formatPercentage = (value: number, digits: number) =>
@@ -31,8 +31,9 @@ export function CategoryBreakdownListItem({
category,
periodParam,
config,
position,
}: CategoryBreakdownListItemProps) {
const hasBudget = category.budgetAmount !== null;
const hasBudget = config.showBudget && category.budgetAmount !== null;
const budgetExceeded =
hasBudget &&
category.budgetUsedPercentage !== null &&
@@ -44,7 +45,10 @@ export function CategoryBreakdownListItem({
return (
<div>
<div className="flex items-center justify-between gap-3 transition-all duration-300 py-2">
<div className="flex items-center justify-between gap-2 transition-all duration-300 py-1.5">
<span className="w-3 shrink-0 text-left text-xs font-medium text-muted-foreground">
{position}
</span>
<div className="flex min-w-0 flex-1 items-center gap-2">
<CategoryIconBadge
icon={category.categoryIcon}
@@ -54,13 +58,9 @@ export function CategoryBreakdownListItem({
<div className="flex items-center gap-2">
<Link
href={`/categories/${category.categoryId}?periodo=${periodParam}`}
className="flex max-w-full items-center gap-1 text-sm font-medium text-foreground underline-offset-2 hover:underline"
className="flex max-w-full items-center gap-1 text-sm font-medium text-foreground underline-offset-2 hover:text-primary hover:underline"
>
<span className="truncate">{category.categoryName}</span>
<RiExternalLinkLine
className="size-3 shrink-0 text-muted-foreground"
aria-hidden
/>
</Link>
</div>
<div className="flex flex-wrap items-center gap-x-1 text-xs text-muted-foreground">
@@ -71,36 +71,29 @@ export function CategoryBreakdownListItem({
)}{" "}
da {config.shareLabel}
</span>
{hasBudget && category.budgetUsedPercentage !== null ? (
<>
<span aria-hidden>·</span>
<span
className={`flex items-center gap-1 ${budgetExceeded ? "text-destructive" : "text-info"}`}
>
{budgetExceeded ? (
<>
Excedeu{" "}
<span className="font-medium">
{formatCurrency(exceededAmount)}
</span>
</>
) : (
<>
{formatPercentage(
category.budgetUsedPercentage,
config.percentageDigits,
)}{" "}
do limite
{config.includeBudgetAmount &&
category.budgetAmount !== null
? ` ${formatCurrency(category.budgetAmount)}`
: ""}
</>
)}
</span>
</>
) : null}
</div>
{hasBudget && category.budgetUsedPercentage !== null ? (
<div
className={`mt-0.5 text-xs ${budgetExceeded ? "text-destructive" : "text-info"}`}
>
{budgetExceeded ? (
<>
Limite excedido em{" "}
<span className="font-medium">
{formatCurrency(exceededAmount)}
</span>
</>
) : (
<>
{formatPercentage(
category.budgetUsedPercentage,
config.percentageDigits,
)}{" "}
do limite utilizado
</>
)}
</div>
) : null}
</div>
</div>

View File

@@ -5,7 +5,7 @@ type CategoryBreakdownListConfig = {
shareLabel: string;
percentageDigits: number;
positiveTrend: "up" | "down";
includeBudgetAmount: boolean;
showBudget: boolean;
};
type CategoryBreakdownListProps = {
@@ -20,13 +20,14 @@ export function CategoryBreakdownList({
config,
}: CategoryBreakdownListProps) {
return (
<div>
{categories.map((category) => (
<div className="flex flex-col">
{categories.map((category, index) => (
<CategoryBreakdownListItem
key={category.categoryId}
category={category}
periodParam={periodParam}
config={config}
position={index + 1}
/>
))}
</div>

View File

@@ -34,7 +34,7 @@ const VARIANT_CONFIG = {
shareLabel: "receita total",
percentageDigits: 1,
positiveTrend: "up",
includeBudgetAmount: true,
showBudget: false,
},
expense: {
emptyTitle: "Nenhuma despesa encontrada",
@@ -43,7 +43,7 @@ const VARIANT_CONFIG = {
shareLabel: "despesa total",
percentageDigits: 0,
positiveTrend: "down",
includeBudgetAmount: false,
showBudget: true,
},
} as const;

View File

@@ -21,6 +21,7 @@ import {
RiCloseLine,
RiDragMove2Line,
RiEyeOffLine,
RiSettings4Line,
RiTodoLine,
} from "@remixicon/react";
import { useMemo, useState, useTransition } from "react";
@@ -41,6 +42,12 @@ import {
import { NoteDialog } from "@/features/notes/components/note-dialog";
import { TransactionDialog } from "@/features/transactions/components/dialogs/transaction-dialog/transaction-dialog";
import { Button } from "@/shared/components/ui/button";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
} from "@/shared/components/ui/dropdown-menu";
import { ExpandableWidgetCard } from "@/shared/components/widgets/expandable-widget-card";
type DashboardGridEditableProps = {
@@ -60,6 +67,9 @@ export function DashboardGridEditable({
}: DashboardGridEditableProps) {
const [isEditing, setIsEditing] = useState(false);
const [isPending, startTransition] = useTransition();
const [isMobileIncomeOpen, setIsMobileIncomeOpen] = useState(false);
const [isMobileExpenseOpen, setIsMobileExpenseOpen] = useState(false);
const [isMobileNoteOpen, setIsMobileNoteOpen] = useState(false);
// Initialize widget order and hidden state
const [widgetOrder, setWidgetOrder] = useState<string[]>(
@@ -132,14 +142,6 @@ export function DashboardGridEditable({
: [...hiddenWidgets, widgetId];
setHiddenWidgets(newHidden);
// Salvar automaticamente ao toggle
startTransition(async () => {
await updateWidgetPreferences({
order: widgetOrder,
hidden: newHidden,
});
});
};
const handleHideWidget = (widgetId: string) => {
@@ -182,6 +184,8 @@ export function DashboardGridEditable({
setWidgetOrder(DEFAULT_WIDGET_ORDER);
setHiddenWidgets([]);
setMyAccountsShowExcluded(true);
setOriginalOrder(DEFAULT_WIDGET_ORDER);
setOriginalHidden([]);
toast.success("Preferências restauradas!");
} else {
toast.error(result.error ?? "Erro ao restaurar");
@@ -195,7 +199,68 @@ export function DashboardGridEditable({
<div className="flex flex-wrap items-center justify-between gap-2">
{!isEditing ? (
<div className="flex w-full min-w-0 flex-col gap-1 sm:w-auto sm:flex-row sm:items-center sm:gap-2">
<div className="-mb-1 grid w-full grid-cols-3 gap-1 pb-1 sm:mb-0 sm:flex sm:w-auto sm:items-center sm:gap-2 sm:overflow-visible sm:pb-0">
<div className="sm:hidden">
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button size="sm" variant="outline" className="w-full gap-2">
<RiAddFill className="size-4 text-primary" />
Adicionar
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="start" className="w-48">
<DropdownMenuItem
onSelect={() => setIsMobileIncomeOpen(true)}
>
<RiAddFill className="text-success/80" />
Nova receita
</DropdownMenuItem>
<DropdownMenuItem
onSelect={() => setIsMobileExpenseOpen(true)}
>
<RiAddFill className="text-destructive/80" />
Nova despesa
</DropdownMenuItem>
<DropdownMenuItem onSelect={() => setIsMobileNoteOpen(true)}>
<RiTodoLine className="text-info/80" />
Nova anotação
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
<TransactionDialog
mode="create"
open={isMobileIncomeOpen}
onOpenChange={setIsMobileIncomeOpen}
payerOptions={quickActionOptions.payerOptions}
splitPayerOptions={quickActionOptions.splitPayerOptions}
defaultPayerId={quickActionOptions.defaultPayerId}
accountOptions={quickActionOptions.accountOptions}
cardOptions={quickActionOptions.cardOptions}
categoryOptions={quickActionOptions.categoryOptions}
estabelecimentos={quickActionOptions.estabelecimentos}
defaultPeriod={period}
defaultTransactionType="Receita"
/>
<TransactionDialog
mode="create"
open={isMobileExpenseOpen}
onOpenChange={setIsMobileExpenseOpen}
payerOptions={quickActionOptions.payerOptions}
splitPayerOptions={quickActionOptions.splitPayerOptions}
defaultPayerId={quickActionOptions.defaultPayerId}
accountOptions={quickActionOptions.accountOptions}
cardOptions={quickActionOptions.cardOptions}
categoryOptions={quickActionOptions.categoryOptions}
estabelecimentos={quickActionOptions.estabelecimentos}
defaultPeriod={period}
defaultTransactionType="Despesa"
/>
<NoteDialog
mode="create"
open={isMobileNoteOpen}
onOpenChange={setIsMobileNoteOpen}
/>
</div>
<div className="hidden items-center gap-2 sm:flex">
<TransactionDialog
mode="create"
payerOptions={quickActionOptions.payerOptions}
@@ -269,6 +334,12 @@ export function DashboardGridEditable({
<div className="flex w-full items-center justify-end gap-2 sm:w-auto">
{isEditing ? (
<>
<WidgetSettingsDialog
hiddenWidgets={hiddenWidgets}
onToggleWidget={handleToggleWidget}
onReset={handleReset}
triggerLabel="Visibilidade"
/>
<Button
variant="outline"
size="sm"
@@ -290,21 +361,15 @@ export function DashboardGridEditable({
</Button>
</>
) : (
<div className="grid w-full grid-cols-2 gap-2 sm:flex sm:w-auto">
<WidgetSettingsDialog
hiddenWidgets={hiddenWidgets}
onToggleWidget={handleToggleWidget}
onReset={handleReset}
triggerClassName="w-full sm:w-auto"
/>
<div className="w-full sm:w-auto">
<Button
variant="outline"
size="sm"
onClick={handleStartEditing}
className="w-full gap-2 sm:w-auto"
>
<RiDragMove2Line className="size-4" />
Reordenar
<RiSettings4Line className="size-4" />
Personalizar
</Button>
</div>
)}

View File

@@ -1,9 +1,11 @@
import {
RiArrowLeftRightLine,
RiArrowRightDownLine,
RiArrowRightLine,
RiArrowRightUpLine,
RiCalendar2Line,
} from "@remixicon/react";
import Link from "next/link";
import { MetricsCardInfoButton } from "@/features/dashboard/components/metrics-card-info-button";
import { PercentageChangeIndicator } from "@/features/dashboard/components/percentage-change-indicator";
import type { DashboardCardMetrics } from "@/features/dashboard/overview/dashboard-metrics-queries";
@@ -18,10 +20,13 @@ import {
} from "@/shared/components/ui/card";
import { Separator } from "@/shared/components/ui/separator";
import { formatPercentage } from "@/shared/utils/percentage";
import { formatPeriodForUrl } from "@/shared/utils/period";
import { cn } from "@/shared/utils/ui";
type DashboardMetricsCardsProps = {
metrics: DashboardCardMetrics;
period: string;
adminPayerSlug: string | null;
};
type Trend = "up" | "down" | "flat";
@@ -36,6 +41,7 @@ const CARDS = [
icon: RiArrowRightDownLine,
invertTrend: false,
iconClass: "text-success",
transactionType: "receita",
helpTitle: "Como calculamos receitas",
helpLines: [
"Somamos os lançamentos do tipo Receita no período selecionado.",
@@ -53,6 +59,7 @@ const CARDS = [
icon: RiArrowRightUpLine,
invertTrend: true,
iconClass: "text-destructive",
transactionType: "despesa",
helpTitle: "Como calculamos despesas",
helpLines: [
"Somamos os lançamentos do tipo Despesa no período selecionado.",
@@ -70,6 +77,7 @@ const CARDS = [
icon: RiArrowLeftRightLine,
invertTrend: false,
iconClass: "text-warning",
transactionType: null,
helpTitle: "Como calculamos o balanço",
helpLines: [
"Partimos de receitas menos despesas do período.",
@@ -86,6 +94,7 @@ const CARDS = [
icon: RiCalendar2Line,
invertTrend: false,
iconClass: "text-cyan-600",
transactionType: null,
helpTitle: "Como calculamos o previsto",
helpLines: [
"Acumulamos o balanço mês a mês até o período atual.",
@@ -123,7 +132,11 @@ const getPercentChange = (current: number, previous: number): string | null => {
});
};
export function DashboardMetricsCards({ metrics }: DashboardMetricsCardsProps) {
export function DashboardMetricsCards({
metrics,
period,
adminPayerSlug,
}: DashboardMetricsCardsProps) {
return (
<div className="grid grid-cols-1 gap-3 @xl/main:grid-cols-2 @5xl/main:grid-cols-4">
{CARDS.map(
@@ -134,6 +147,7 @@ export function DashboardMetricsCards({ metrics }: DashboardMetricsCardsProps) {
icon: Icon,
invertTrend,
iconClass,
transactionType,
helpTitle,
helpLines,
}) => {
@@ -143,19 +157,33 @@ export function DashboardMetricsCards({ metrics }: DashboardMetricsCardsProps) {
metric.current,
metric.previous,
);
const transactionsHref = transactionType
? `/transactions?periodo=${formatPeriodForUrl(period)}&type=${transactionType}${adminPayerSlug ? `&payer=${adminPayerSlug}` : ""}`
: null;
return (
<Card key={label} className="gap-2 overflow-hidden">
<Card key={label} className="gap-2 overflow-hidden py-6">
<CardHeader className="gap-1">
<CardTitle className="flex items-center gap-1">
<Icon className={cn("size-4", iconClass)} aria-hidden />
{label}
<MetricsCardInfoButton
label={label}
helpTitle={helpTitle}
helpLines={helpLines}
/>
</CardTitle>
<div className="flex items-center justify-between gap-2">
<CardTitle className="flex items-center gap-1">
<Icon className={cn("size-4", iconClass)} aria-hidden />
{label}
<MetricsCardInfoButton
label={label}
helpTitle={helpTitle}
helpLines={helpLines}
/>
</CardTitle>
{transactionsHref ? (
<Link
href={transactionsHref}
className="rounded-sm px-1 text-muted-foreground/60 transition-colors hover:bg-accent hover:text-primary focus-visible:outline-none focus-visible:ring-ring/50 focus-visible:ring-[3px]"
aria-label={`Ver lançamentos de ${label.toLowerCase()}`}
>
<RiArrowRightLine className="size-4" aria-hidden />
</Link>
) : null}
</div>
<CardDescription className="mt-1 tracking-tight">
{subtitle}
</CardDescription>

View File

@@ -1,5 +1,5 @@
import { RiPencilLine } from "@remixicon/react";
import { PercentageChangeIndicator } from "@/features/dashboard/components/percentage-change-indicator";
import Link from "next/link";
import {
clampGoalProgress,
formatGoalProgressPercentage,
@@ -9,24 +9,28 @@ import { CategoryIconBadge } from "@/shared/components/entity-avatar";
import MoneyValues from "@/shared/components/money-values";
import { Button } from "@/shared/components/ui/button";
import { Progress } from "@/shared/components/ui/progress";
import {
Tooltip,
TooltipContent,
TooltipTrigger,
} from "@/shared/components/ui/tooltip";
import { cn } from "@/shared/utils";
import { formatPeriodForUrl } from "@/shared/utils/period";
type GoalProgressItemProps = {
item: GoalProgressItemData;
index: number;
onEdit: (item: GoalProgressItemData) => void;
};
export function GoalProgressItem({
item,
index,
onEdit,
}: GoalProgressItemProps) {
export function GoalProgressItem({ item, onEdit }: GoalProgressItemProps) {
const progressValue = clampGoalProgress(item.usedPercentage, 0, 100);
const percentageDelta = item.usedPercentage - 100;
const isExceeded = item.status === "exceeded";
const isCritical = item.status === "critical";
const exceededAmount = Math.max(item.spentAmount - item.budgetAmount, 0);
const usedPercentageLabel = formatGoalProgressPercentage(item.usedPercentage);
return (
<div className="group transition-all duration-300 py-2">
<li className="group py-2 transition-all duration-300">
<div className="flex items-start justify-between gap-3">
<div className="flex min-w-0 flex-1 items-start gap-2">
<CategoryIconBadge
@@ -35,46 +39,72 @@ export function GoalProgressItem({
size="md"
/>
<div className="min-w-0 flex-1">
<p className="truncate text-sm font-medium text-foreground">
{item.categoryName}
</p>
{item.categoryId ? (
<Link
href={`/categories/${item.categoryId}?periodo=${formatPeriodForUrl(item.period)}`}
className="block truncate text-sm font-medium text-foreground underline-offset-2 hover:text-primary hover:underline"
>
{item.categoryName}
</Link>
) : (
<p className="truncate text-sm font-medium text-foreground">
{item.categoryName}
</p>
)}
<p className="mt-0.5 text-xs text-muted-foreground">
<MoneyValues className="font-medium" amount={item.spentAmount} />{" "}
de{" "}
<MoneyValues className="font-medium" amount={item.budgetAmount} />
<PercentageChangeIndicator
value={percentageDelta}
label={formatGoalProgressPercentage(percentageDelta, true)}
positiveTrend="down"
className="ml-1.5 align-middle"
/>
<span aria-hidden> · </span>
<span
className={cn(
"font-medium",
isExceeded && "text-destructive",
isCritical && "text-warning",
)}
>
{isExceeded ? (
<>
<MoneyValues amount={exceededAmount} /> acima do limite
</>
) : (
`${usedPercentageLabel} utilizado`
)}
</span>
</p>
</div>
</div>
<div className="flex shrink-0 items-center gap-2">
<Button
type="button"
variant="link"
size="icon-sm"
className="transition-opacity text-primary hover:opacity-80"
onClick={() => onEdit(item)}
aria-label={`Atualizar orçamento de ${item.categoryName}`}
>
<RiPencilLine className="size-3.5" />
</Button>
</div>
<Tooltip>
<TooltipTrigger asChild>
<Button
type="button"
variant="ghost"
size="icon-sm"
className="shrink-0 text-primary/70 opacity-70 transition-all hover:text-primary hover:opacity-100 focus-visible:text-primary focus-visible:opacity-100 group-hover:opacity-100 group-focus-within:opacity-100"
onClick={() => onEdit(item)}
aria-label={`Atualizar orçamento de ${item.categoryName}`}
>
<RiPencilLine className="size-3.5" />
</Button>
</TooltipTrigger>
<TooltipContent side="top">Atualizar orçamento</TooltipContent>
</Tooltip>
</div>
<div className="ml-11 mt-1.5">
<Progress
value={progressValue}
className={
isExceeded
? "**:data-[slot=progress-indicator]:bg-destructive bg-destructive/20"
: undefined
}
className={cn(
isExceeded && "bg-destructive/20",
isCritical && "bg-warning/20",
)}
indicatorClassName={cn(
isExceeded && "bg-destructive",
isCritical && "bg-warning",
)}
aria-label={`${usedPercentageLabel} do orçamento utilizado em ${item.categoryName}`}
/>
</div>
</div>
</li>
);
}

View File

@@ -21,13 +21,8 @@ export function GoalsProgressList({ items, onEdit }: GoalsProgressListProps) {
return (
<ul className="flex flex-col">
{items.map((item, index) => (
<GoalProgressListItem
key={item.id}
item={item}
index={index}
onEdit={onEdit}
/>
{items.map((item) => (
<GoalProgressListItem key={item.id} item={item} onEdit={onEdit} />
))}
</ul>
);

View File

@@ -9,6 +9,7 @@ import {
TooltipContent,
TooltipTrigger,
} from "@/shared/components/ui/tooltip";
import { getPaymentMethodIcon } from "@/shared/utils/icons";
type InstallmentExpenseListItemProps = {
expense: InstallmentExpense;
@@ -28,7 +29,7 @@ export function InstallmentExpenseListItem({
} = buildInstallmentExpenseDisplay(expense);
return (
<div className="flex items-center gap-3 transition-all duration-300 py-2">
<div className="flex items-center gap-2 transition-all duration-300 py-1.5">
<EstablishmentLogo name={expense.name} size={37} />
<div className="min-w-0 flex-1">
@@ -66,22 +67,32 @@ export function InstallmentExpenseListItem({
/>
</div>
{remainingInstallments === 0 ? (
<p className="text-xs text-muted-foreground">
{endDate ? `Termina em ${endDate}` : null}
{" · Quitado"}
</p>
) : (
<p className="text-xs text-muted-foreground">
{endDate ? `Termina em ${endDate}` : null}
{` · ${remainingLabel}: `}
<MoneyValues
amount={remainingAmount}
className="inline-block font-semibold"
/>{" "}
({remainingInstallments}x)
</p>
)}
<div className="flex items-center justify-between gap-2 text-xs text-muted-foreground">
<span className="inline-flex min-w-0 items-center gap-1">
<span
className="inline-flex shrink-0 [&_svg]:size-3.5"
title={expense.paymentMethod}
>
{getPaymentMethodIcon(expense.paymentMethod)}
<span className="sr-only">{expense.paymentMethod}</span>
</span>
{endDate ? <span className="shrink-0">Até {endDate}</span> : null}
</span>
<span className="shrink-0">
{remainingInstallments === 0 ? (
"Quitado"
) : (
<>
{remainingLabel}:{" "}
<MoneyValues
amount={remainingAmount}
className="inline-block font-semibold"
/>{" "}
({remainingInstallments}x)
</>
)}
</span>
</div>
<Progress value={progress} className="mt-1 h-2" />
</div>

View File

@@ -14,17 +14,17 @@ export function InstallmentExpensesList({
return (
<WidgetEmptyState
icon={<RiNumbersLine className="size-6 text-muted-foreground" />}
title="Nenhuma despesa parcelada"
title="Nenhuma despesa parcelada encontrada"
description="Lançamentos parcelados aparecerão aqui conforme forem registrados."
/>
);
}
return (
<ul className="flex flex-col">
<div className="flex flex-col">
{expenses.map((expense) => (
<InstallmentExpenseListItem key={expense.id} expense={expense} />
))}
</ul>
</div>
);
}

View File

@@ -1,10 +1,11 @@
import { RiCheckboxCircleFill, RiExternalLinkLine } from "@remixicon/react";
import { RiCheckboxCircleFill, RiGroupLine } from "@remixicon/react";
import Link from "next/link";
import { PercentageChangeIndicator } from "@/features/dashboard/components/percentage-change-indicator";
import {
buildInvoiceDetailsHref,
buildInvoiceInitials,
formatInvoicePaymentDate,
formatInvoiceWidgetOverdueLabel,
formatInvoiceWidgetPaymentDate,
getInvoiceShareLabel,
parseInvoiceDueDate,
@@ -48,9 +49,13 @@ export function InvoiceListItem({ invoice, onPay }: InvoiceListItemProps) {
const absolutePaymentInfo = formatInvoicePaymentDate(invoice.paidAt);
const breakdown = invoice.pagadorBreakdown ?? [];
const hasBreakdown = breakdown.length > 0;
const hasMultiplePayers = breakdown.length > 1;
const detailHref = buildInvoiceDetailsHref(invoice.cardId, invoice.period);
const overdueLabel = formatInvoiceWidgetOverdueLabel(dueInfo.date);
const dueTooltipLabel =
dueInfo.label !== absoluteDueInfo.label ? absoluteDueInfo.label : null;
overdueLabel || dueInfo.label !== absoluteDueInfo.label
? absoluteDueInfo.label
: null;
const paymentTooltipLabel =
paymentInfo?.label && paymentInfo.label !== absolutePaymentInfo?.label
? absolutePaymentInfo?.label
@@ -63,15 +68,11 @@ export function InvoiceListItem({ invoice, onPay }: InvoiceListItemProps) {
className="inline-flex max-w-full items-center gap-1 text-sm font-medium text-foreground underline-offset-2 hover:text-primary hover:underline"
>
<span className="truncate">{invoice.cardName}</span>
<RiExternalLinkLine
className="size-3 shrink-0 text-muted-foreground"
aria-hidden
/>
</Link>
);
return (
<div className="flex items-center justify-between transition-all duration-300 py-1.5">
<li className="flex items-center justify-between transition-all duration-300 py-1.5">
<div className="flex min-w-0 flex-1 items-center gap-2 py-1">
<InvoiceLogo
cardName={invoice.cardName}
@@ -81,70 +82,99 @@ export function InvoiceListItem({ invoice, onPay }: InvoiceListItemProps) {
/>
<div className="min-w-0">
{hasBreakdown ? (
<HoverCard openDelay={150}>
<HoverCardTrigger asChild>{linkNode}</HoverCardTrigger>
<HoverCardContent align="start" className="w-80 space-y-3">
<p className="text-xs text-muted-foreground">
Distribuição por pessoa
</p>
<ul className="space-y-2">
{breakdown.map((share, index) => (
<li
key={`${invoice.id}-${
share.payerId ?? share.pagadorName ?? index
}`}
className="flex items-center gap-3"
>
<Avatar className="size-9">
<AvatarImage
src={getAvatarSrc(share.pagadorAvatar)}
alt={`Avatar de ${share.pagadorName}`}
/>
<AvatarFallback>
{buildInvoiceInitials(share.pagadorName)}
</AvatarFallback>
</Avatar>
<div className="min-w-0 flex-1">
<p className="truncate text-sm font-medium text-foreground">
{share.pagadorName}
</p>
<p className="text-xs text-muted-foreground">
{getInvoiceShareLabel(
share.amount,
Math.abs(invoice.totalAmount),
)}
</p>
</div>
<div className="flex shrink-0 flex-col items-end gap-0.5 text-sm font-medium text-foreground">
<MoneyValues
className="font-medium"
amount={share.amount}
/>
<PercentageChangeIndicator
value={share.percentageChange}
/>
</div>
</li>
))}
</ul>
</HoverCardContent>
</HoverCard>
) : (
linkNode
)}
<div className="flex max-w-full items-center gap-1">
{hasBreakdown ? (
<HoverCard openDelay={150}>
<HoverCardTrigger asChild>{linkNode}</HoverCardTrigger>
<HoverCardContent align="start" className="w-80 space-y-3">
<p className="text-xs text-muted-foreground">
Distribuição por pessoa
</p>
<ul className="space-y-2">
{breakdown.map((share, index) => (
<li
key={`${invoice.id}-${
share.payerId ?? share.pagadorName ?? index
}`}
className="flex items-center gap-3"
>
<Avatar className="size-9">
<AvatarImage
src={getAvatarSrc(share.pagadorAvatar)}
alt={`Avatar de ${share.pagadorName}`}
/>
<AvatarFallback>
{buildInvoiceInitials(share.pagadorName)}
</AvatarFallback>
</Avatar>
<div className="min-w-0 flex-1">
<p className="truncate text-sm font-medium text-foreground">
{share.pagadorName}
</p>
<p className="text-xs text-muted-foreground">
{getInvoiceShareLabel(
share.amount,
Math.abs(invoice.totalAmount),
)}
</p>
</div>
<div className="flex shrink-0 flex-col items-end gap-0.5 text-sm font-medium text-foreground">
<MoneyValues
className="font-medium"
amount={share.amount}
/>
<PercentageChangeIndicator
value={share.percentageChange}
/>
</div>
</li>
))}
</ul>
</HoverCardContent>
</HoverCard>
) : (
linkNode
)}
{hasMultiplePayers ? (
<Tooltip>
<TooltipTrigger asChild>
<span className="inline-flex shrink-0 cursor-help text-muted-foreground">
<RiGroupLine className="size-3.5" aria-hidden />
<span className="sr-only">Ver distribuição por pessoa</span>
</span>
</TooltipTrigger>
<TooltipContent side="top">
Ver distribuição por pessoa
</TooltipContent>
</Tooltip>
) : null}
</div>
<div className="flex flex-wrap items-center gap-2 text-xs text-muted-foreground">
{!isPaid ? (
dueTooltipLabel ? (
<Tooltip>
<TooltipTrigger asChild>
<span className="cursor-help">{dueInfo.label}</span>
<span
className={
isOverdue
? "cursor-help font-semibold text-destructive"
: "cursor-help"
}
>
{overdueLabel ?? dueInfo.label}
</span>
</TooltipTrigger>
<TooltipContent side="top">{dueTooltipLabel}</TooltipContent>
</Tooltip>
) : (
<span>{dueInfo.label}</span>
<span
className={
isOverdue ? "font-semibold text-destructive" : undefined
}
>
{overdueLabel ?? dueInfo.label}
</span>
)
) : null}
{isPaid && paymentInfo ? (
@@ -174,30 +204,31 @@ export function InvoiceListItem({ invoice, onPay }: InvoiceListItemProps) {
className="font-medium"
amount={Math.abs(invoice.totalAmount)}
/>
<Button
type="button"
size="sm"
variant="link"
className="h-auto p-0 disabled:opacity-100"
disabled={isPaid}
onClick={() => onPay(invoice.id)}
>
{isPaid ? (
<span className="flex items-center gap-0.5 text-success">
<RiCheckboxCircleFill className="size-3.5" /> Pago
</span>
) : isOverdue ? (
<span className="overdue-blink">
<span className="overdue-blink-primary text-destructive">
Atrasado
{isPaid ? (
<span className="flex h-7 items-center gap-0.5 text-xs font-medium text-success">
<RiCheckboxCircleFill className="size-3.5" /> Pago
</span>
) : (
<Button
type="button"
size="sm"
variant="link"
className="-mr-1.5 h-7 px-1.5 py-0"
onClick={() => onPay(invoice.id)}
>
{isOverdue ? (
<span className="overdue-blink">
<span className="overdue-blink-primary text-destructive">
Atrasado
</span>
<span className="overdue-blink-secondary">Pagar</span>
</span>
<span className="overdue-blink-secondary">Pagar</span>
</span>
) : (
<span>Pagar</span>
)}
</Button>
) : (
<span>Pagar</span>
)}
</Button>
)}
</div>
</div>
</li>
);
}

View File

@@ -39,9 +39,7 @@ export function InvoicesWidgetView({
}: InvoicesWidgetViewProps) {
return (
<>
<div className="flex flex-col gap-4">
<InvoicesList invoices={invoices} onPay={onOpenPaymentDialog} />
</div>
<InvoicesList invoices={invoices} onPay={onOpenPaymentDialog} />
<InvoicePaymentDialog
invoice={selectedInvoice}

View File

@@ -1,4 +1,8 @@
import { RiFileList2Line, RiPencilLine } from "@remixicon/react";
import {
RiCalendarLine,
RiFileList2Line,
RiPencilLine,
} from "@remixicon/react";
import type { Note } from "@/features/notes/components/types";
import {
buildNoteDisplayTitle,
@@ -7,6 +11,11 @@ import {
} from "@/features/notes/lib/formatters";
import { Badge } from "@/shared/components/ui/badge";
import { Button } from "@/shared/components/ui/button";
import {
Tooltip,
TooltipContent,
TooltipTrigger,
} from "@/shared/components/ui/tooltip";
type NoteListItemProps = {
note: Note;
@@ -21,43 +30,59 @@ export function NoteListItem({
}: NoteListItemProps) {
const displayTitle = buildNoteDisplayTitle(note.title);
const createdAtLabel = formatNoteCreatedAt(note.createdAt);
const isTask = note.type === "tarefa";
return (
<div className="group flex items-center justify-between gap-2 transition-all duration-300 py-2">
<li className="group flex items-center justify-between gap-2 py-1.5 transition-all duration-300">
<div className="min-w-0 flex-1">
<p className="truncate text-sm font-medium text-foreground">
{displayTitle}
</p>
<div className="mt-1 flex items-center gap-2">
<Badge variant="outline" className="h-5 px-1.5 text-xs">
{getNoteTasksSummary(note)}
</Badge>
<div className="mt-1 flex min-w-0 items-center gap-2">
{isTask ? (
<Badge variant="outline" className="h-5 px-1.5 text-xs">
{getNoteTasksSummary(note)}
</Badge>
) : null}
<p className="truncate text-xs text-muted-foreground">
{createdAtLabel}
<span className="inline-flex items-center gap-1">
<RiCalendarLine className="size-3.5 shrink-0" />
{createdAtLabel}
</span>
</p>
</div>
</div>
<div className="flex shrink-0 items-center">
<Button
variant="link"
size="icon-sm"
className="transition-opacity text-primary hover:opacity-80"
onClick={() => onOpenEdit(note)}
aria-label={`Editar anotação ${displayTitle}`}
>
<RiPencilLine className="size-4" />
</Button>
<Button
variant="link"
size="icon-sm"
className="transition-opacity text-primary hover:opacity-80"
onClick={() => onOpenDetails(note)}
aria-label={`Ver detalhes da anotação ${displayTitle}`}
>
<RiFileList2Line className="size-4" />
</Button>
<div className="flex shrink-0 items-center gap-0.5">
<Tooltip>
<TooltipTrigger asChild>
<Button
variant="ghost"
size="icon-sm"
className="text-primary/70 opacity-70 transition-all hover:text-primary hover:opacity-100 focus-visible:text-primary focus-visible:opacity-100 group-hover:opacity-100 group-focus-within:opacity-100"
onClick={() => onOpenEdit(note)}
aria-label={`Editar anotação ${displayTitle}`}
>
<RiPencilLine className="size-4" />
</Button>
</TooltipTrigger>
<TooltipContent side="top">Editar anotação</TooltipContent>
</Tooltip>
<Tooltip>
<TooltipTrigger asChild>
<Button
variant="ghost"
size="icon-sm"
className="text-primary/70 opacity-70 transition-all hover:text-primary hover:opacity-100 focus-visible:text-primary focus-visible:opacity-100 group-hover:opacity-100 group-focus-within:opacity-100"
onClick={() => onOpenDetails(note)}
aria-label={`Ver detalhes da anotação ${displayTitle}`}
>
<RiFileList2Line className="size-4" />
</Button>
</TooltipTrigger>
<TooltipContent side="top">Ver detalhes</TooltipContent>
</Tooltip>
</div>
</div>
</li>
);
}

View File

@@ -27,7 +27,7 @@ export function NotesWidgetView({
}: NotesWidgetViewProps) {
return (
<>
<div className="flex flex-col gap-4 px-0">
<div className="flex flex-col px-0">
<NotesList
notes={notes}
onOpenEdit={onOpenEdit}

View File

@@ -1,4 +1,3 @@
import { RiExternalLinkLine } from "@remixicon/react";
import Link from "next/link";
import type { ReactNode } from "react";
import {
@@ -24,13 +23,18 @@ export type PaymentBreakdownListItemData = {
type PaymentBreakdownListItemProps = {
item: PaymentBreakdownListItemData;
position: number;
};
export function PaymentBreakdownListItem({
item,
position,
}: PaymentBreakdownListItemProps) {
return (
<div className="flex items-center gap-3 transition-all duration-300 py-1.5">
<div className="flex items-center gap-2 transition-all duration-300 py-1">
<span className="w-3 shrink-0 text-left text-xs font-medium text-muted-foreground">
{position}
</span>
<div
className="flex size-9.5 shrink-0 items-center justify-center rounded-full"
style={{
@@ -49,22 +53,20 @@ export function PaymentBreakdownListItem({
className="inline-flex items-center gap-1 text-sm font-medium text-foreground underline-offset-2 hover:text-primary hover:underline"
>
<span className="truncate">{item.title}</span>
<RiExternalLinkLine
className="size-3 shrink-0 text-muted-foreground"
aria-hidden
/>
</Link>
) : (
<p className="text-sm font-medium text-foreground">{item.title}</p>
)}
<MoneyValues className="font-medium" amount={item.amount} />
<MoneyValues className="shrink-0 font-medium" amount={item.amount} />
</div>
<div className="flex items-center justify-between text-xs text-muted-foreground">
<span>
{formatPaymentBreakdownTransactionsLabel(item.transactions)}
</span>
<span>{formatPaymentBreakdownPercentage(item.percentage)}</span>
<span>
{formatPaymentBreakdownPercentage(item.percentage)} do total
</span>
</div>
<div className="mt-1">

View File

@@ -31,10 +31,14 @@ export function PaymentBreakdownList({
}
return (
<div className="flex flex-col gap-4 px-0">
<div className="flex flex-col px-0">
<ul className="flex flex-col gap-2">
{items.map((item) => (
<PaymentBreakdownListItem key={item.id} item={item} />
{items.map((item, index) => (
<PaymentBreakdownListItem
key={item.id}
item={item}
position={index + 1}
/>
))}
</ul>
</div>

View File

@@ -43,7 +43,7 @@ export function PaymentOverviewWidgetView({
className="text-xs data-[state=active]:bg-transparent"
>
<RiMoneyDollarCircleLine className="mr-1 size-3.5" />
Formas
Formas de pagamento
</TabsTrigger>
</TabsList>

View File

@@ -1,16 +1,18 @@
import { RiArrowDownLine, RiArrowUpLine } from "@remixicon/react";
import StatusDot from "@/shared/components/feedback/status-dot";
import MoneyValues from "@/shared/components/money-values";
import { Progress } from "@/shared/components/ui/progress";
import { formatPercentage } from "@/shared/utils/percentage";
type PaymentStatusCategorySectionProps = {
title: string;
type: "income" | "expenses";
total: number;
confirmed: number;
pending: number;
};
export function PaymentStatusCategorySection({
title,
type,
total,
confirmed,
pending,
@@ -19,27 +21,51 @@ export function PaymentStatusCategorySection({
const absConfirmed = Math.abs(confirmed);
const confirmedPercentage =
absTotal > 0 ? (absConfirmed / absTotal) * 100 : 0;
const income = type === "income";
const title = income ? "A receber" : "A pagar";
const confirmedLabel = income ? "recebidos" : "pagos";
const pendingLabel = income ? "a receber" : "a pagar";
const percentageLabel = income ? "recebido" : "pago";
const TitleIcon = income ? RiArrowDownLine : RiArrowUpLine;
return (
<div className="mt-4 space-y-3">
<div className="space-y-3">
<div className="flex items-center justify-between">
<span className="text-sm font-medium text-foreground">{title}</span>
<MoneyValues amount={total} className="font-medium" />
<span className="flex items-center gap-1.5 text-sm font-medium text-foreground">
<TitleIcon className="size-4 text-primary" aria-hidden />
{title}
</span>
<span className="flex items-center gap-2">
<span className="text-xs text-muted-foreground">
{formatPercentage(confirmedPercentage, {
minimumFractionDigits: 0,
maximumFractionDigits: 0,
})}{" "}
{percentageLabel}
</span>
<MoneyValues amount={total} className="font-medium" />
</span>
</div>
<Progress value={confirmedPercentage} className="h-2" />
<Progress
value={confirmedPercentage}
className="h-2"
indicatorClassName="bg-primary"
/>
<div className="flex flex-col gap-1 text-sm sm:flex-row sm:items-center sm:justify-between sm:gap-4">
<div className="flex items-center gap-1.5">
<StatusDot color="bg-primary" />
<MoneyValues amount={confirmed} className="font-medium" />
<span className="text-xs text-muted-foreground">confirmados</span>
<span className="text-xs text-muted-foreground">
{confirmedLabel}
</span>
</div>
<div className="flex items-center gap-1.5">
<StatusDot color="bg-warning/40" />
<MoneyValues amount={pending} className="font-medium" />
<span className="text-xs text-muted-foreground">pendentes</span>
<span className="text-xs text-muted-foreground">{pendingLabel}</span>
</div>
</div>
</div>

View File

@@ -28,7 +28,7 @@ export function PaymentStatusWidgetView({
return (
<CardContent className="space-y-6 px-0">
<PaymentStatusCategorySection
title="A Receber"
type="income"
total={data.income.total}
confirmed={data.income.confirmed}
pending={data.income.pending}
@@ -37,7 +37,7 @@ export function PaymentStatusWidgetView({
<div className="border-t" />
<PaymentStatusCategorySection
title="A Pagar"
type="expenses"
total={data.expenses.total}
confirmed={data.expenses.confirmed}
pending={data.expenses.pending}

View File

@@ -1,6 +1,11 @@
"use client";
import { RiLineChartLine } from "@remixicon/react";
import {
RiArrowRightLine,
RiCalendarLine,
RiHistoryLine,
RiLineChartLine,
} from "@remixicon/react";
import type { DashboardCategoryBreakdownItem } from "@/features/dashboard/categories/category-breakdown-helpers";
import { PercentageChangeIndicator } from "@/features/dashboard/components/percentage-change-indicator";
import { CategoryIconBadge } from "@/shared/components/entity-avatar";
@@ -50,12 +55,30 @@ export function CategoryTrendsWidget({
<p className="truncate text-sm font-medium text-foreground">
{category.categoryName}
</p>
<p className="text-xs text-muted-foreground">
<MoneyValues amount={category.previousAmount} /> vs{" "}
<MoneyValues
amount={category.currentAmount}
className="font-semibold"
/>
<p className="flex items-center gap-1.5 text-xs text-muted-foreground">
<span
className="inline-flex items-center gap-1"
title="Mês anterior"
>
<RiHistoryLine className="size-3.5" aria-hidden />
<span className="sr-only">Mês anterior:</span>
<MoneyValues amount={category.previousAmount} />
</span>
<RiArrowRightLine className="size-3" aria-hidden />
<span
className="inline-flex items-center gap-1 text-foreground"
title="Mês atual"
>
<RiCalendarLine
className="size-3.5 text-primary"
aria-hidden
/>
<span className="sr-only">Mês atual:</span>
<MoneyValues
amount={category.currentAmount}
className="font-semibold"
/>
</span>
</p>
</div>
<PercentageChangeIndicator

View File

@@ -6,6 +6,7 @@ import {
RiDeleteBinLine,
} from "@remixicon/react";
import Image from "next/image";
import Link from "next/link";
import { useRouter } from "next/navigation";
import { useMemo, useState } from "react";
import { toast } from "sonner";
@@ -19,6 +20,11 @@ import { TransactionDialog } from "@/features/transactions/components/dialogs/tr
import { ConfirmActionDialog } from "@/shared/components/confirm-action-dialog";
import MoneyValues from "@/shared/components/money-values";
import { Button } from "@/shared/components/ui/button";
import {
Tooltip,
TooltipContent,
TooltipTrigger,
} from "@/shared/components/ui/tooltip";
import { WidgetEmptyState } from "@/shared/components/widgets/widget-empty-state";
import { resolveLogoSrc } from "@/shared/lib/logo";
@@ -46,6 +52,24 @@ function getDateString(date: Date | string | null | undefined): string | null {
return date.toISOString().slice(0, 10);
}
function findMatchingLogo(
sourceAppName: string | null,
logoMap: Record<string, string>,
): string | null {
if (!sourceAppName) return null;
const appName = sourceAppName.toLowerCase();
if (logoMap[appName]) return resolveLogoSrc(logoMap[appName]);
for (const [name, logo] of Object.entries(logoMap)) {
if (name.includes(appName) || appName.includes(name)) {
return resolveLogoSrc(logo);
}
}
return null;
}
export function InboxWidget({
snapshot,
quickActionOptions,
@@ -149,13 +173,18 @@ export function InboxWidget({
if (snapshot.pendingCount === 0) {
return (
<WidgetEmptyState
icon={<RiCheckboxCircleFill color="green" className="size-6" />}
icon={<RiCheckboxCircleFill className="size-6 text-success" />}
title="Tudo em dia"
description="Nenhum pré-lançamento aguardando revisão."
/>
);
}
const remainingCount = Math.max(
snapshot.pendingCount - snapshot.recentItems.length,
0,
);
return (
<div className="flex flex-col">
{snapshot.recentItems.map((item) => {
@@ -168,17 +197,12 @@ export function InboxWidget({
parsedAmount !== null && Number.isFinite(parsedAmount)
? parsedAmount
: null;
const logoKey = item.sourceAppName?.toLowerCase() ?? "";
const rawLogo = snapshot.logoMap[logoKey] ?? null;
const logoSrc = resolveLogoSrc(rawLogo);
const logoSrc = findMatchingLogo(item.sourceAppName, snapshot.logoMap);
const displayLogo = logoSrc ?? DEFAULT_INBOX_APP_LOGO;
return (
<div
key={item.id}
className="flex items-center justify-between py-1.5"
>
<div className="flex flex-1 items-center gap-2">
<div key={item.id} className="flex items-center justify-between py-2">
<div className="flex min-w-0 flex-1 items-center gap-2">
<Image
src={displayLogo}
alt={item.sourceAppName ?? ""}
@@ -188,52 +212,74 @@ export function InboxWidget({
unoptimized
/>
<div>
<p className="text-sm font-medium text-foreground">
{displayName.length > 30
? `${displayName.slice(0, 30)}...`
: displayName}
<div className="min-w-0">
<p className="truncate text-sm font-medium text-foreground">
{displayName}
</p>
<div className="flex items-center gap-2 text-xs text-muted-foreground">
{item.sourceAppName && <span>{item.sourceAppName}</span>}
<div className="flex min-w-0 items-center gap-2 text-xs text-muted-foreground">
{item.sourceAppName && (
<span className="truncate">{item.sourceAppName}</span>
)}
<span className="text-muted-foreground/60">
{relativeTime(item.createdAt)}
{relativeTime(item.notificationTimestamp)}
</span>
</div>
</div>
</div>
<div className="flex shrink-0 flex-col items-end">
<div className="ml-2 flex shrink-0 items-center gap-1">
{amount !== null && (
<MoneyValues className="font-medium" amount={amount} />
)}
{amount === null && (
<span className="max-w-20 text-right text-xs leading-tight text-muted-foreground">
Valor não identificado
</span>
)}
<div className="flex items-center">
<Button
size="icon-sm"
variant="ghost"
className="size-6 text-muted-foreground hover:text-foreground"
onClick={() => handleProcessRequest(item)}
aria-label="Processar notificação"
title="Processar"
>
<RiCheckLine className="size-3.5" />
</Button>
<Button
size="icon-sm"
variant="ghost"
className="size-6 text-muted-foreground hover:text-destructive"
onClick={() => handleDiscardRequest(item)}
aria-label="Descartar notificação"
title="Descartar"
>
<RiDeleteBinLine className="size-3.5" />
</Button>
<Tooltip>
<TooltipTrigger asChild>
<Button
size="icon-sm"
variant="ghost"
className="text-muted-foreground hover:text-foreground"
onClick={() => handleProcessRequest(item)}
aria-label="Lançar notificação"
>
<RiCheckLine className="size-3.5" />
</Button>
</TooltipTrigger>
<TooltipContent side="top">Lançar</TooltipContent>
</Tooltip>
<Tooltip>
<TooltipTrigger asChild>
<Button
size="icon-sm"
variant="ghost"
className="text-muted-foreground hover:text-destructive"
onClick={() => handleDiscardRequest(item)}
aria-label="Descartar notificação"
>
<RiDeleteBinLine className="size-3.5" />
</Button>
</TooltipTrigger>
<TooltipContent side="top">Descartar</TooltipContent>
</Tooltip>
</div>
</div>
</div>
);
})}
{remainingCount > 0 && (
<Link
href="/inbox"
className="mt-2 inline-flex items-center justify-center text-xs font-medium text-muted-foreground transition-colors hover:text-primary"
>
+ {remainingCount} pendentes · Revisar todos
</Link>
)}
<TransactionDialog
mode="create"
open={processOpen}

View File

@@ -1,7 +1,14 @@
"use client";
import { RiLineChartLine } from "@remixicon/react";
import { Bar, BarChart, CartesianGrid, XAxis } from "recharts";
import {
Bar,
CartesianGrid,
ComposedChart,
Line,
ReferenceLine,
XAxis,
} from "recharts";
import type { IncomeExpenseBalanceData } from "@/features/dashboard/overview/income-expense-balance-queries";
import { CardContent } from "@/shared/components/ui/card";
import {
@@ -11,6 +18,7 @@ import {
} from "@/shared/components/ui/chart";
import { WidgetEmptyState } from "@/shared/components/widgets/widget-empty-state";
import { formatCurrency } from "@/shared/utils/currency";
import { formatCompactPeriodLabel } from "@/shared/utils/period";
type IncomeExpenseBalanceWidgetProps = {
data: IncomeExpenseBalanceData;
@@ -19,15 +27,15 @@ type IncomeExpenseBalanceWidgetProps = {
const chartConfig = {
receita: {
label: "Receita",
color: "var(--chart-1)",
color: "var(--success)",
},
despesa: {
label: "Despesa",
color: "var(--chart-2)",
color: "var(--destructive)",
},
balanco: {
label: "Balanço",
color: "var(--chart-3)",
color: "var(--primary)",
},
} satisfies ChartConfig;
@@ -35,7 +43,7 @@ export function IncomeExpenseBalanceWidget({
data,
}: IncomeExpenseBalanceWidgetProps) {
const chartData = data.months.map((month) => ({
month: month.monthLabel,
month: formatCompactPeriodLabel(month.month).toLowerCase(),
receita: month.income,
despesa: month.expense,
balanco: month.balance,
@@ -59,16 +67,18 @@ export function IncomeExpenseBalanceWidget({
}
return (
<CardContent className="space-y-4 px-0">
<CardContent className="space-y-2 px-0">
<ChartContainer
config={chartConfig}
className="h-[270px] w-full aspect-auto"
>
<BarChart
<ComposedChart
data={chartData}
margin={{ top: 20, right: 10, left: 10, bottom: 5 }}
accessibilityLayer
>
<CartesianGrid strokeDasharray="3 3" vertical={false} />
<ReferenceLine y={0} stroke="var(--border)" />
<XAxis
dataKey="month"
tickLine={false}
@@ -81,8 +91,15 @@ export function IncomeExpenseBalanceWidget({
return null;
}
const month = payload[0]?.payload.month as string | undefined;
return (
<div className="rounded-lg border bg-background p-2 shadow-sm">
{month ? (
<p className="mb-2 text-xs font-medium text-muted-foreground">
{month}
</p>
) : null}
<div className="grid gap-2">
{payload.map((entry) => {
const config =
@@ -111,7 +128,7 @@ export function IncomeExpenseBalanceWidget({
</div>
);
}}
cursor={{ fill: "hsl(var(--muted))", opacity: 0.3 }}
cursor={{ fill: "var(--muted)", opacity: 0.3 }}
/>
<Bar
dataKey="receita"
@@ -125,42 +142,26 @@ export function IncomeExpenseBalanceWidget({
radius={[4, 4, 0, 0]}
maxBarSize={60}
/>
<Bar
<Line
dataKey="balanco"
fill={chartConfig.balanco.color}
radius={[4, 4, 0, 0]}
maxBarSize={60}
type="monotone"
stroke={chartConfig.balanco.color}
strokeWidth={2}
dot={{ fill: chartConfig.balanco.color, r: 3 }}
activeDot={{ r: 5 }}
/>
</BarChart>
</ComposedChart>
</ChartContainer>
<div className="flex items-center justify-center gap-6">
<div className="flex items-center gap-2">
<div
className="size-2 rounded-full"
style={{ backgroundColor: chartConfig.receita.color }}
/>
<span className="text-sm text-muted-foreground">
{chartConfig.receita.label}
</span>
</div>
<div className="flex items-center gap-2">
<div
className="size-2 rounded-full"
style={{ backgroundColor: chartConfig.despesa.color }}
/>
<span className="text-sm text-muted-foreground">
{chartConfig.despesa.label}
</span>
</div>
<div className="flex items-center gap-2">
<div
className="size-2 rounded-full"
style={{ backgroundColor: chartConfig.balanco.color }}
/>
<span className="text-sm text-muted-foreground">
{chartConfig.balanco.label}
</span>
</div>
<div className="flex flex-wrap items-center justify-center gap-x-4 gap-y-1 text-xs text-muted-foreground">
{Object.values(chartConfig).map((config) => (
<div key={config.label} className="flex items-center gap-1.5">
<div
className="size-2 rounded-full"
style={{ backgroundColor: config.color }}
/>
<span>{config.label}</span>
</div>
))}
</div>
</CardContent>
);

View File

@@ -1,8 +1,8 @@
"use client";
import {
RiArrowRightLine,
RiBarChartBoxLine,
RiExternalLinkLine,
RiEyeLine,
RiEyeOffLine,
} from "@remixicon/react";
@@ -24,7 +24,9 @@ import {
import { WidgetEmptyState } from "@/shared/components/widgets/widget-empty-state";
import { isAccountInactive } from "@/shared/lib/accounts/constants";
import { resolveLogoSrc } from "@/shared/lib/logo";
import { buildInitials } from "@/shared/utils/initials";
import { formatPeriodForUrl } from "@/shared/utils/period";
import { cn } from "@/shared/utils/ui";
type MyAccountsWidgetProps = {
accounts: DashboardAccount[];
@@ -54,9 +56,6 @@ export function MyAccountsWidget({
: activeAccounts.filter((account) => !account.excludeFromBalance);
const displayedAccounts = visibleAccounts.slice(0, 5);
const remainingCount = visibleAccounts.length - displayedAccounts.length;
const hiddenExcludedAccountsCount = showExcludedAccounts
? 0
: excludedAccountsCount;
const toggleButtonLabel = showExcludedAccounts
? "Ocultar contas não consideradas"
: "Mostrar contas não consideradas";
@@ -81,7 +80,7 @@ export function MyAccountsWidget({
<>
<div className="flex items-start justify-between gap-3 py-1">
<div className="space-y-1">
<p className="text-sm text-muted-foreground">Saldo Total</p>
<p className="text-sm text-muted-foreground">Saldo total</p>
<MoneyValues className="text-2xl font-medium" amount={totalBalance} />
</div>
@@ -106,51 +105,46 @@ export function MyAccountsWidget({
</TooltipTrigger>
<TooltipContent side="left" className="max-w-xs">
<p className="text-xs">{toggleButtonLabel}</p>
{!showExcludedAccounts ? (
<p className="mt-1 text-xs text-background/70">
{excludedAccountsCount}{" "}
{excludedAccountsCount === 1
? "conta não considerada oculta"
: "contas não consideradas ocultas"}
</p>
) : null}
</TooltipContent>
</Tooltip>
) : null}
</div>
{hiddenExcludedAccountsCount > 0 ? (
<p className="pb-2 text-xs text-muted-foreground">
{hiddenExcludedAccountsCount}{" "}
{hiddenExcludedAccountsCount === 1
? "conta não considerada oculta"
: "contas não consideradas ocultas"}
</p>
) : null}
<div>
{activeAccounts.length === 0 ? (
<div className="-mt-10">
<WidgetEmptyState
icon={
<RiBarChartBoxLine className="size-6 text-muted-foreground" />
}
title="Você ainda não adicionou nenhuma conta"
description="Cadastre suas contas bancárias para acompanhar os saldos e movimentações."
/>
</div>
<WidgetEmptyState
icon={
<RiBarChartBoxLine className="size-6 text-muted-foreground" />
}
title="Você ainda não adicionou nenhuma conta"
description="Cadastre suas contas bancárias para acompanhar os saldos e movimentações."
/>
) : displayedAccounts.length === 0 ? (
<div className="-mt-10">
<WidgetEmptyState
icon={<RiEyeOffLine className="size-6 text-muted-foreground" />}
title="As contas não consideradas estão ocultas"
description="Use o botão no topo do widget para mostrá-las novamente."
/>
</div>
<WidgetEmptyState
icon={<RiEyeOffLine className="size-6 text-muted-foreground" />}
title="As contas não consideradas estão ocultas"
description="Use o botão no topo do widget para mostrá-las novamente."
/>
) : (
<ul className="flex flex-col">
{displayedAccounts.map((account, index) => {
const logoSrc = resolveLogoSrc(account.logo);
return (
<div
<li
key={account.id}
className="flex items-center justify-between transition-all duration-300 py-1.5 "
className="flex items-center justify-between py-1.5 transition-all duration-300"
>
<div className="flex min-w-0 flex-1 items-center gap-2 py-1">
<div className="relative size-9.5 overflow-hidden">
<div className="relative flex size-9.5 shrink-0 items-center justify-center overflow-hidden rounded-full bg-primary/10">
{logoSrc ? (
<Image
src={logoSrc}
@@ -160,7 +154,11 @@ export function MyAccountsWidget({
className="object-contain rounded-full"
priority={index === 0}
/>
) : null}
) : (
<span className="text-xs font-medium text-primary">
{buildInitials(account.name)}
</span>
)}
</div>
<div className="min-w-0">
@@ -172,44 +170,41 @@ export function MyAccountsWidget({
className="inline-flex max-w-full items-center gap-1 text-sm font-medium text-foreground underline-offset-2 hover:text-primary hover:underline"
>
<span className="truncate">{account.name}</span>
<RiExternalLinkLine
className="size-3 shrink-0 text-muted-foreground"
aria-hidden
/>
</Link>
{account.excludeFromBalance ? (
<Tooltip>
<TooltipTrigger asChild>
<span className="inline-flex cursor-help ml-2">
<Badge className="font-normal" variant="info">
Não considerada
</Badge>
</span>
</TooltipTrigger>
<TooltipContent side="top" className="max-w-xs">
<p className="text-xs">
Esta conta aparece na lista, mas não entra no
cálculo do saldo total porque está marcada para
desconsiderar do saldo total.
</p>
</TooltipContent>
</Tooltip>
) : null}
<div className="flex flex-wrap items-center gap-2 text-xs text-muted-foreground">
<span className="truncate">{account.accountType}</span>
{account.excludeFromBalance ? (
<Tooltip>
<TooltipTrigger asChild>
<span className="inline-flex cursor-help">
<Badge className="font-normal" variant="info">
Não considerada
</Badge>
</span>
</TooltipTrigger>
<TooltipContent side="top" className="max-w-xs">
<p className="text-xs">
Esta conta aparece na lista, mas não entra no
cálculo do saldo total.
</p>
</TooltipContent>
</Tooltip>
) : null}
</div>
</div>
</div>
<div className="flex flex-col items-end gap-0.5 text-right">
<MoneyValues
className="font-medium"
className={cn(
"font-medium",
account.balance < 0 && "text-destructive",
)}
amount={account.balance}
/>
</div>
</div>
</li>
);
})}
</ul>
@@ -217,8 +212,14 @@ export function MyAccountsWidget({
</div>
{remainingCount > 0 ? (
<CardFooter className="border-border/60 border-t pt-4 text-sm text-muted-foreground">
+{remainingCount} contas não exibidas
<CardFooter className="border-border/60 border-t pt-4">
<Link
href="/accounts"
className="inline-flex items-center gap-1 text-sm font-medium text-muted-foreground transition-colors hover:text-primary"
>
+{remainingCount} contas não exibidas
<RiArrowRightLine className="size-4" aria-hidden />
</Link>
</CardFooter>
) : null}
</>

View File

@@ -1,10 +1,6 @@
"use client";
import {
RiExternalLinkLine,
RiGroupLine,
RiVerifiedBadgeFill,
} from "@remixicon/react";
import { RiGroupLine, RiVerifiedBadgeFill } from "@remixicon/react";
import Link from "next/link";
import { PercentageChangeIndicator } from "@/features/dashboard/components/percentage-change-indicator";
import type { DashboardPagador } from "@/features/dashboard/lib/payers-queries";
@@ -14,6 +10,11 @@ import {
AvatarFallback,
AvatarImage,
} from "@/shared/components/ui/avatar";
import {
Tooltip,
TooltipContent,
TooltipTrigger,
} from "@/shared/components/ui/tooltip";
import { WidgetEmptyState } from "@/shared/components/widgets/widget-empty-state";
import { getAvatarSrc } from "@/shared/lib/payers/utils";
import { buildInitials } from "@/shared/utils/initials";
@@ -33,7 +34,7 @@ export function PayersWidget({ payers }: PayersWidgetProps) {
/>
) : (
<div className="flex flex-col">
{payers.map((payer) => {
{payers.map((payer, index) => {
const initials = buildInitials(payer.name);
const hasValidPercentageChange =
typeof payer.percentageChange === "number" &&
@@ -45,8 +46,11 @@ export function PayersWidget({ payers }: PayersWidgetProps) {
return (
<div
key={payer.id}
className="flex items-center justify-between transition-all duration-300 py-1.5"
className="flex items-center justify-between gap-2 transition-all duration-300 py-1.5"
>
<span className="w-3 shrink-0 text-left text-xs font-medium text-muted-foreground">
{index + 1}
</span>
<div className="flex min-w-0 flex-1 items-center gap-2 py-1">
<Avatar className="size-9.5 shrink-0">
<AvatarImage
@@ -64,18 +68,24 @@ export function PayersWidget({ payers }: PayersWidgetProps) {
>
<span className="truncate font-medium">{payer.name}</span>
{payer.isAdmin && (
<RiVerifiedBadgeFill
className="size-4 shrink-0 text-blue-500"
aria-hidden
/>
<Tooltip>
<TooltipTrigger asChild>
<span className="inline-flex shrink-0">
<RiVerifiedBadgeFill
className="size-4 text-blue-500"
aria-hidden
/>
<span className="sr-only">Pessoa principal</span>
</span>
</TooltipTrigger>
<TooltipContent side="top">
Pessoa principal
</TooltipContent>
</Tooltip>
)}
<RiExternalLinkLine
className="size-3 shrink-0 text-muted-foreground"
aria-hidden
/>
</Link>
<p className="truncate text-xs text-muted-foreground">
{payer.email ?? "Sem email cadastrado"}
Despesas no período
</p>
</div>
</div>
@@ -85,7 +95,12 @@ export function PayersWidget({ payers }: PayersWidgetProps) {
className="font-medium"
amount={payer.totalExpenses}
/>
<PercentageChangeIndicator value={percentageChange} />
<div className="flex items-center gap-1 text-xs text-muted-foreground">
<PercentageChangeIndicator value={percentageChange} />
{percentageChange !== null ? (
<span>vs. mês ant.</span>
) : null}
</div>
</div>
</div>
);

View File

@@ -1,6 +1,6 @@
"use client";
import { RiArrowDownSFill, RiStore3Line } from "@remixicon/react";
import { RiFileList2Line, RiStore3Line } from "@remixicon/react";
import { useEffect, useMemo, useRef, useState } from "react";
import type { PurchasesByCategoryData } from "@/features/dashboard/categories/purchases-by-category-queries";
import { EstablishmentLogo } from "@/shared/components/entity-avatar";
@@ -8,7 +8,9 @@ import MoneyValues from "@/shared/components/money-values";
import {
Select,
SelectContent,
SelectGroup,
SelectItem,
SelectLabel,
SelectTrigger,
SelectValue,
} from "@/shared/components/ui/select";
@@ -129,18 +131,18 @@ export function PurchasesByCategoryWidget({
</SelectTrigger>
<SelectContent>
{Object.entries(categoriesByType).map(([type, categories]) => (
<div key={type}>
<div className="px-2 py-1.5 text-xs font-medium text-muted-foreground">
<SelectGroup key={type}>
<SelectLabel className="font-medium">
{CATEGORY_TYPE_LABEL[
type as keyof typeof CATEGORY_TYPE_LABEL
] ?? type}
</div>
</SelectLabel>
{categories.map((category) => (
<SelectItem key={category.id} value={category.id}>
{category.name}
</SelectItem>
))}
</div>
</SelectGroup>
))}
</SelectContent>
</Select>
@@ -148,12 +150,12 @@ export function PurchasesByCategoryWidget({
{currentTransactions.length === 0 ? (
<WidgetEmptyState
icon={<RiArrowDownSFill className="size-6 text-muted-foreground" />}
title="Nenhuma compra encontrada"
icon={<RiFileList2Line className="size-6 text-muted-foreground" />}
title="Nenhum lançamento encontrado"
description={
selectedCategory
? `Não há lançamentos na categoria "${selectedCategory.name}".`
: "Selecione uma categoria para visualizar as compras."
: "Selecione uma categoria para visualizar os lançamentos."
}
/>
) : (
@@ -162,9 +164,9 @@ export function PurchasesByCategoryWidget({
return (
<div
key={transaction.id}
className="flex items-center justify-between gap-3 transition-all duration-300 py-2"
className="flex items-center justify-between gap-2 transition-all duration-300 py-1.5"
>
<div className="flex min-w-0 flex-1 items-center gap-3">
<div className="flex min-w-0 flex-1 items-center gap-2">
<EstablishmentLogo name={transaction.name} size={37} />
<div className="min-w-0">

View File

@@ -3,6 +3,7 @@ import type { RecurringExpensesData } from "@/features/dashboard/expenses/recurr
import { EstablishmentLogo } from "@/shared/components/entity-avatar";
import MoneyValues from "@/shared/components/money-values";
import { WidgetEmptyState } from "@/shared/components/widgets/widget-empty-state";
import { getPaymentMethodIcon } from "@/shared/utils/icons";
type RecurringExpensesWidgetProps = {
data: RecurringExpensesData;
@@ -10,10 +11,10 @@ type RecurringExpensesWidgetProps = {
const formatOccurrences = (value: number | null) => {
if (!value) {
return "Recorrência contínua";
return "Repete mensalmente";
}
return `${value} recorrências mensais`;
return `Repete por ${value} ${value === 1 ? "mês" : "meses"}`;
};
export function RecurringExpensesWidget({
@@ -23,7 +24,7 @@ export function RecurringExpensesWidget({
return (
<WidgetEmptyState
icon={<RiRefreshLine className="size-6 text-muted-foreground" />}
title="Nenhuma despesa recorrente"
title="Nenhuma despesa recorrente encontrada"
description="Lançamentos recorrentes aparecerão aqui conforme forem registrados."
/>
);
@@ -31,33 +32,39 @@ export function RecurringExpensesWidget({
return (
<div className="flex flex-col">
{data.expenses.map((expense) => {
return (
<div
key={expense.id}
className="flex items-center gap-2 transition-all duration-300 py-1.5"
>
<EstablishmentLogo name={expense.name} size={37} />
{[...data.expenses]
.sort((a, b) => b.amount - a.amount)
.map((expense) => {
return (
<div
key={expense.id}
className="flex items-center gap-2 transition-all duration-300 py-1.5"
>
<EstablishmentLogo name={expense.name} size={37} />
<div className="min-w-0 flex-1">
<div className="flex items-center justify-between">
<p className="truncate text-foreground text-sm font-medium">
{expense.name}
</p>
<div className="min-w-0 flex-1">
<div className="flex items-center justify-between">
<p className="truncate text-foreground text-sm font-medium">
{expense.name}
</p>
<MoneyValues className="font-medium" amount={expense.amount} />
</div>
<MoneyValues
className="font-medium"
amount={expense.amount}
/>
</div>
<div className="flex items-center justify-between text-xs text-muted-foreground">
<span className="inline-flex items-center gap-1">
{expense.paymentMethod}
</span>
<span>{formatOccurrences(expense.recurrenceCount)}</span>
<div className="flex items-center justify-between text-xs text-muted-foreground">
<span className="inline-flex items-center gap-1 [&_svg]:size-3.5">
{getPaymentMethodIcon(expense.paymentMethod)}
{expense.paymentMethod}
</span>
<span>{formatOccurrences(expense.recurrenceCount)}</span>
</div>
</div>
</div>
</div>
);
})}
);
})}
</div>
);
}

View File

@@ -15,13 +15,11 @@ import { TopExpensesWidget } from "./top-expenses-widget";
type SpendingOverviewWidgetProps = {
topExpensesAll: TopExpensesData;
topExpensesCardOnly: TopExpensesData;
topEstablishmentsData: TopEstablishmentsData;
};
export function SpendingOverviewWidget({
topExpensesAll,
topExpensesCardOnly,
topEstablishmentsData,
}: SpendingOverviewWidgetProps) {
const [activeTab, setActiveTab] = useState<"expenses" | "establishments">(
@@ -54,10 +52,7 @@ export function SpendingOverviewWidget({
</TabsList>
<TabsContent value="expenses" className="mt-2">
<TopExpensesWidget
allExpenses={topExpensesAll}
cardOnlyExpenses={topExpensesCardOnly}
/>
<TopExpensesWidget data={topExpensesAll} />
</TabsContent>
<TabsContent value="establishments" className="mt-2">

View File

@@ -28,13 +28,16 @@ export function TopEstablishmentsWidget({
/>
) : (
<div className="flex flex-col">
{data.establishments.map((establishment) => {
{data.establishments.map((establishment, index) => {
return (
<div
key={establishment.id}
className="flex items-center justify-between gap-3 transition-all duration-300 py-2"
className="flex items-center justify-between gap-2 transition-all duration-300 py-1.5"
>
<div className="flex min-w-0 flex-1 items-center gap-3">
<span className="w-3 shrink-0 text-left text-xs font-medium text-muted-foreground">
{index + 1}
</span>
<div className="flex min-w-0 flex-1 items-center gap-2">
<EstablishmentLogo name={establishment.name} size={37} />
<div className="min-w-0">
@@ -42,7 +45,8 @@ export function TopEstablishmentsWidget({
{establishment.name}
</p>
<p className="text-xs text-muted-foreground">
{formatOccurrencesLabel(establishment.occurrences)}
{formatOccurrencesLabel(establishment.occurrences)} ·
total acumulado
</p>
</div>
</div>

View File

@@ -1,20 +1,18 @@
"use client";
import { RiArrowUpDoubleLine } from "@remixicon/react";
import { useMemo, useState } from "react";
import { useMemo } from "react";
import type {
TopExpense,
TopExpensesData,
} from "@/features/dashboard/expenses/top-expenses-queries";
import { EstablishmentLogo } from "@/shared/components/entity-avatar";
import MoneyValues from "@/shared/components/money-values";
import { Switch } from "@/shared/components/ui/switch";
import { WidgetEmptyState } from "@/shared/components/widgets/widget-empty-state";
import { formatTransactionDate } from "@/shared/utils/date";
type TopExpensesWidgetProps = {
allExpenses: TopExpensesData;
cardOnlyExpenses: TopExpensesData;
data: TopExpensesData;
};
const shouldIncludeExpense = (expense: TopExpense) => {
@@ -31,75 +29,34 @@ const shouldIncludeExpense = (expense: TopExpense) => {
return true;
};
const isCardExpense = (expense: TopExpense) =>
expense.paymentMethod?.toLowerCase().includes("cartão") ?? false;
export function TopExpensesWidget({
allExpenses,
cardOnlyExpenses,
}: TopExpensesWidgetProps) {
const [cardOnly, setCardOnly] = useState(false);
const normalizedAllExpenses = useMemo(() => {
return allExpenses.expenses.filter(shouldIncludeExpense);
}, [allExpenses]);
const normalizedCardOnlyExpenses = useMemo(() => {
const merged = [...cardOnlyExpenses.expenses, ...normalizedAllExpenses];
const seen = new Set<string>();
return merged.filter((expense) => {
if (seen.has(expense.id)) {
return false;
}
if (!isCardExpense(expense) || !shouldIncludeExpense(expense)) {
return false;
}
seen.add(expense.id);
return true;
});
}, [cardOnlyExpenses, normalizedAllExpenses]);
const data = cardOnly
? { expenses: normalizedCardOnlyExpenses }
: { expenses: normalizedAllExpenses };
export function TopExpensesWidget({ data }: TopExpensesWidgetProps) {
const expenses = useMemo(
() => data.expenses.filter(shouldIncludeExpense),
[data.expenses],
);
return (
<div className="flex flex-col gap-4 px-0">
<div className="flex items-center justify-between gap-3">
<label
htmlFor="card-only-toggle"
className="text-sm text-muted-foreground"
>
Apenas cartões
</label>
<Switch
id="card-only-toggle"
checked={cardOnly}
onCheckedChange={setCardOnly}
<div className="flex flex-col px-0">
{expenses.length === 0 ? (
<WidgetEmptyState
icon={
<RiArrowUpDoubleLine className="size-6 text-muted-foreground" />
}
title="Nenhuma despesa encontrada"
description="Quando houver despesas registradas, elas aparecerão aqui."
/>
</div>
{data.expenses.length === 0 ? (
<div className="-mt-10">
<WidgetEmptyState
icon={
<RiArrowUpDoubleLine className="size-6 text-muted-foreground" />
}
title="Nenhuma despesa encontrada"
description="Quando houver despesas registradas, elas aparecerão aqui."
/>
</div>
) : (
<div className="flex flex-col">
{data.expenses.map((expense) => {
{expenses.map((expense, index) => {
return (
<div
key={expense.id}
className="flex items-center justify-between gap-3 transition-all duration-300 py-2"
className="flex items-center justify-between gap-2 transition-all duration-300 py-1.5"
>
<div className="flex min-w-0 flex-1 items-center gap-3">
<span className="w-3 shrink-0 text-left text-xs font-medium text-muted-foreground">
{index + 1}
</span>
<div className="flex min-w-0 flex-1 items-center gap-2">
<EstablishmentLogo name={expense.name} size={37} />
<div className="min-w-0">

View File

@@ -21,6 +21,7 @@ type WidgetSettingsDialogProps = {
onToggleWidget: (widgetId: string) => void;
onReset: () => void;
triggerClassName?: string;
triggerLabel?: string;
};
export function WidgetSettingsDialog({
@@ -28,6 +29,7 @@ export function WidgetSettingsDialog({
onToggleWidget,
onReset,
triggerClassName,
triggerLabel = "Widgets",
}: WidgetSettingsDialogProps) {
const [open, setOpen] = useState(false);
@@ -40,12 +42,12 @@ export function WidgetSettingsDialog({
className={cn("gap-2", triggerClassName)}
>
<RiSettings4Line className="size-4" />
Widgets
{triggerLabel}
</Button>
</DialogTrigger>
<DialogContent className="sm:max-w-md">
<DialogHeader>
<DialogTitle>Configurar Widgets</DialogTitle>
<DialogTitle>Configurar widgets</DialogTitle>
<DialogDescription>
Escolha quais widgets deseja exibir no seu dashboard.
</DialogDescription>
@@ -91,7 +93,7 @@ export function WidgetSettingsDialog({
className="gap-2"
>
<RiRefreshLine className="size-4" />
Restaurar Padrão
Restaurar padrão
</Button>
</DialogFooter>
</DialogContent>

View File

@@ -5,7 +5,7 @@ import { capitalize } from "@/shared/utils/string";
type InstallmentExpenseDisplay = {
compactLabel: string | null;
isLast: boolean;
remainingLabel: "Próx." | "Aberto";
remainingLabel: "Próximas" | "Em aberto";
remainingInstallments: number;
remainingAmount: number;
endDate: string | null;
@@ -17,7 +17,7 @@ const buildInstallmentCompactLabel = (
installmentCount: number | null,
) => {
if (currentInstallment && installmentCount) {
return `${currentInstallment} de ${installmentCount}`;
return `Parcela ${currentInstallment} de ${installmentCount}`;
}
return null;
@@ -111,7 +111,7 @@ export const buildInstallmentExpenseDisplay = (
installmentCount,
),
isLast: isInstallmentLast(currentInstallment, installmentCount),
remainingLabel: isSettled === true ? "Próx." : "Aberto",
remainingLabel: isSettled === true ? "Próximas" : "Em aberto",
remainingInstallments: calculateInstallmentRemainingCount(
currentInstallment,
installmentCount,

View File

@@ -65,7 +65,6 @@ async function fetchDashboardDataInternal(userId: string, period: string) {
installmentExpensesData: currentPeriodOverview.installmentExpensesData,
topEstablishmentsData: currentPeriodOverview.topEstablishmentsData,
topExpensesAll: currentPeriodOverview.topExpensesAll,
topExpensesCardOnly: currentPeriodOverview.topExpensesCardOnly,
purchasesByCategoryData: currentPeriodOverview.purchasesByCategoryData,
incomeByCategoryData: categoryOverview.incomeByCategoryData,
expensesByCategoryData: categoryOverview.expensesByCategoryData,

View File

@@ -4,7 +4,11 @@ import {
INVOICE_PAYMENT_STATUS,
type InvoicePaymentStatus,
} from "@/shared/lib/invoices";
import { getBusinessDateString } from "@/shared/utils/date";
import {
getBusinessDateString,
parseUtcDateString,
toDateOnlyString,
} from "@/shared/utils/date";
import {
buildDueDateInfoFromPeriodDay,
buildRelativeDueDateInfoFromPeriodDay,
@@ -80,6 +84,29 @@ export const formatInvoiceWidgetPaymentDate = (
};
};
export const formatInvoiceWidgetOverdueLabel = (
value: string | null,
): string | null => {
const dueDateValue = toDateOnlyString(value);
const todayValue = getBusinessDateString();
if (!dueDateValue || dueDateValue >= todayValue) {
return null;
}
const dueDate = parseUtcDateString(dueDateValue);
const today = parseUtcDateString(todayValue);
if (!dueDate || !today) {
return null;
}
const overdueDays = Math.round(
(today.getTime() - dueDate.getTime()) / (24 * 60 * 60 * 1000),
);
return overdueDays === 1
? "Atrasada · venceu ontem"
: `Atrasada · venceu há ${overdueDays} dias`;
};
export const getCurrentDateString = () => getBusinessDateString();
const formatInvoiceSharePercentage = (value: number) => {

View File

@@ -1,6 +1,9 @@
import { and, eq, sql } from "drizzle-orm";
import { financialAccounts, transactions } from "@/db/schema";
import { INITIAL_BALANCE_NOTE } from "@/shared/lib/accounts/constants";
import {
INITIAL_BALANCE_NOTE,
isAccountInactive,
} from "@/shared/lib/accounts/constants";
import { db } from "@/shared/lib/db";
import { getAdminPayerId } from "@/shared/lib/payers/get-admin-id";
import { safeToNumber as toNumber } from "@/shared/utils/number";
@@ -101,7 +104,10 @@ export async function fetchDashboardAccounts(
.sort((a, b) => b.balance - a.balance);
const totalBalance = accounts
.filter((account) => !account.excludeFromBalance)
.filter(
(account) =>
!account.excludeFromBalance && !isAccountInactive(account.status),
)
.reduce((total, account) => total + account.balance, 0);
return {

View File

@@ -16,8 +16,6 @@ export function extractDashboardLogoNames(data: DashboardData): string[] {
for (const establishment of data.topEstablishmentsData.establishments)
names.push(establishment.name);
for (const expense of data.topExpensesAll.expenses) names.push(expense.name);
for (const expense of data.topExpensesCardOnly.expenses)
names.push(expense.name);
for (const transactions of Object.values(
data.purchasesByCategoryData.transactionsByCategory,
)) {

View File

@@ -1,10 +1,13 @@
import { eq } from "drizzle-orm";
import { and, asc, eq, ilike, not, sql } from "drizzle-orm";
import { cacheLife, cacheTag } from "next/cache";
import { payers } from "@/db/schema";
import { cards, financialAccounts, payers, transactions } from "@/db/schema";
import { fetchPendingInboxCount } from "@/features/inbox/queries";
import type { NavbarFinanceLinks } from "@/shared/components/navigation/navbar/nav-items";
import { INITIAL_BALANCE_NOTE } from "@/shared/lib/accounts/constants";
import { db } from "@/shared/lib/db";
import { getAdminPayerId } from "@/shared/lib/payers/get-admin-id";
import { getBusinessDateString } from "@/shared/utils/date";
import { safeToNumber } from "@/shared/utils/number";
import {
type DashboardNotificationsSnapshot,
fetchDashboardNotifications,
@@ -14,13 +17,13 @@ type DashboardNavbarData = {
payerAvatarUrl: string | null;
inboxPendingCount: number;
notificationsSnapshot: DashboardNotificationsSnapshot;
financeLinks: NavbarFinanceLinks;
};
async function fetchAdminPayerAvatarUrl(
userId: string,
adminPayerId: string | null,
): Promise<string | null> {
const adminPayerId = await getAdminPayerId(userId);
if (!adminPayerId) {
return null;
}
@@ -29,7 +32,7 @@ async function fetchAdminPayerAvatarUrl(
columns: {
avatarUrl: true,
},
where: eq(payers.id, adminPayerId),
where: and(eq(payers.id, adminPayerId), eq(payers.userId, userId)),
});
return payer?.avatarUrl ?? null;
@@ -39,17 +42,97 @@ async function fetchDashboardNavbarDataInternal(
userId: string,
): Promise<DashboardNavbarData> {
const currentPeriod = getBusinessDateString().slice(0, 7);
const [payerAvatarUrl, notificationsSnapshot, inboxPendingCount] =
await Promise.all([
fetchAdminPayerAvatarUrl(userId),
fetchDashboardNotifications(userId, currentPeriod),
fetchPendingInboxCount(userId),
]);
const adminPayerId = await getAdminPayerId(userId);
const [
payerAvatarUrl,
notificationsSnapshot,
inboxPendingCount,
activeCards,
activeAccounts,
] = await Promise.all([
fetchAdminPayerAvatarUrl(userId, adminPayerId),
fetchDashboardNotifications(userId, currentPeriod),
fetchPendingInboxCount(userId),
db
.select({
id: cards.id,
name: cards.name,
logo: cards.logo,
amount: sql<number>`coalesce(sum(${transactions.amount}), 0)`,
})
.from(cards)
.leftJoin(
transactions,
and(
eq(transactions.cardId, cards.id),
eq(transactions.userId, userId),
eq(transactions.period, currentPeriod),
),
)
.where(and(eq(cards.userId, userId), not(ilike(cards.status, "inativo"))))
.groupBy(cards.id, cards.name, cards.logo)
.orderBy(asc(cards.name)),
db
.select({
id: financialAccounts.id,
name: financialAccounts.name,
logo: financialAccounts.logo,
initialBalance: financialAccounts.initialBalance,
balanceMovements: sql<number>`
coalesce(
sum(
case
when ${transactions.note} = ${INITIAL_BALANCE_NOTE} then 0
else ${transactions.amount}
end
),
0
)
`,
})
.from(financialAccounts)
.leftJoin(
transactions,
and(
eq(transactions.accountId, financialAccounts.id),
eq(transactions.userId, userId),
eq(transactions.isSettled, true),
adminPayerId ? eq(transactions.payerId, adminPayerId) : sql`false`,
),
)
.where(
and(
eq(financialAccounts.userId, userId),
not(ilike(financialAccounts.status, "inativa")),
),
)
.groupBy(
financialAccounts.id,
financialAccounts.name,
financialAccounts.logo,
financialAccounts.initialBalance,
)
.orderBy(asc(financialAccounts.name)),
]);
return {
payerAvatarUrl,
inboxPendingCount,
notificationsSnapshot,
financeLinks: {
cards: activeCards.map((card) => ({
...card,
amount: Math.abs(safeToNumber(card.amount)),
})),
accounts: activeAccounts.map((account) => ({
id: account.id,
name: account.name,
logo: account.logo,
amount:
safeToNumber(account.initialBalance) +
safeToNumber(account.balanceMovements),
})),
},
};
}

View File

@@ -245,7 +245,7 @@ export async function fetchDashboardNotifications(
]);
// =====================
// Processar notificações
// lançar notificações
// =====================
const notifications: DashboardNotification[] = [];

View File

@@ -34,7 +34,6 @@ import {
import { safeToNumber as toNumber } from "@/shared/utils/number";
const PAYMENT_METHOD_BOLETO = "Boleto";
const PAYMENT_METHOD_CARD = "Cartão de Crédito";
const TRANSACTION_TYPE_EXPENSE = "Despesa";
const TRANSACTION_TYPE_INCOME = "Receita";
const CONDITION_RECURRING = "Recorrente";
@@ -79,7 +78,6 @@ type DashboardCurrentPeriodOverview = {
installmentExpensesData: InstallmentExpensesData;
topEstablishmentsData: TopEstablishmentsData;
topExpensesAll: TopExpensesData;
topExpensesCardOnly: TopExpensesData;
purchasesByCategoryData: PurchasesByCategoryData;
};
@@ -99,7 +97,6 @@ const emptyOverview = (): DashboardCurrentPeriodOverview => ({
installmentExpensesData: { expenses: [] },
topEstablishmentsData: { establishments: [] },
topExpensesAll: { expenses: [] },
topExpensesCardOnly: { expenses: [] },
purchasesByCategoryData: {
categories: [],
transactionsByCategory: {},
@@ -190,6 +187,7 @@ const buildBillsSnapshot = (
: null,
isSettled: Boolean(row.isSettled),
accountId: row.accountId ?? null,
transactionType: row.transactionType,
}))
.sort((a, b) => {
if (a.isSettled !== b.isSettled) {
@@ -432,14 +430,12 @@ const mapTopExpense = (row: CurrentPeriodTransactionRow): TopExpense => ({
const buildTopExpensesData = (
rows: CurrentPeriodTransactionRow[],
cardOnly: boolean,
): TopExpensesData => ({
expenses: rows
.filter(
(row) =>
row.transactionType === TRANSACTION_TYPE_EXPENSE &&
shouldIncludeWithoutAutoGenerated(row.note) &&
(!cardOnly || row.paymentMethod === PAYMENT_METHOD_CARD),
shouldIncludeWithoutAutoGenerated(row.note),
)
.sort((a, b) => toNumber(a.amount) - toNumber(b.amount))
.slice(0, 10)
@@ -617,8 +613,7 @@ export async function fetchDashboardCurrentPeriodOverview(
recurringExpensesData: buildRecurringExpensesData(rows),
installmentExpensesData: buildInstallmentExpensesData(rows),
topEstablishmentsData: buildTopEstablishmentsData(rows),
topExpensesAll: buildTopExpensesData(rows, false),
topExpensesCardOnly: buildTopExpensesData(rows, true),
topExpensesAll: buildTopExpensesData(rows),
purchasesByCategoryData: buildPurchasesByCategoryData(rows),
};
}

View File

@@ -69,8 +69,8 @@ export type WidgetConfig = {
export const widgetsConfig: WidgetConfig[] = [
{
id: "my-accounts",
title: "Minhas Contas",
subtitle: "Saldo consolidado disponível",
title: "Minhas contas",
subtitle: "Saldo atualizado das contas ativas",
icon: <RiBarChartBoxLine className="size-4" />,
component: ({
data,
@@ -114,7 +114,7 @@ export const widgetsConfig: WidgetConfig[] = [
},
{
id: "payment-status",
title: "Status de Pagamento",
title: "Status de pagamento",
subtitle: "Valores confirmados e pendentes",
icon: <RiWallet3Line className="size-4" />,
component: ({ data }) => (
@@ -144,8 +144,8 @@ export const widgetsConfig: WidgetConfig[] = [
},
{
id: "income-expense-balance",
title: "Receita, Despesa e Balanço",
subtitle: "Últimos 6 meses",
title: "Receita, despesa e balanço",
subtitle: "Últimos 6 meses até o período selecionado",
icon: <RiLineChartLine className="size-4" />,
component: ({ data }) => (
<IncomeExpenseBalanceWidget data={data.incomeExpenseBalanceData} />
@@ -153,8 +153,8 @@ export const widgetsConfig: WidgetConfig[] = [
},
{
id: "goals-progress",
title: "Progresso de Orçamentos",
subtitle: "Orçamentos por categoria no período",
title: "Progresso de orçamentos",
subtitle: "Categorias mais próximas do limite",
icon: <RiExchangeLine className="size-4" />,
component: ({ data }) => (
<GoalsProgressWidget data={data.goalsProgressData} />
@@ -171,7 +171,7 @@ export const widgetsConfig: WidgetConfig[] = [
},
{
id: "category-trends",
title: "Tendências de Categorias",
title: "Tendências de categorias",
subtitle: "Top 10 maiores variações vs. mês anterior",
icon: <RiLineChartLine className="size-4" />,
component: ({ data }) => (
@@ -182,21 +182,20 @@ export const widgetsConfig: WidgetConfig[] = [
},
{
id: "spending-overview",
title: "Panorama de Gastos",
title: "Panorama de gastos",
subtitle: "Principais despesas e frequência por local",
icon: <RiArrowUpDoubleLine className="size-4" />,
component: ({ data }) => (
<SpendingOverviewWidget
topExpensesAll={data.topExpensesAll}
topExpensesCardOnly={data.topExpensesCardOnly}
topEstablishmentsData={data.topEstablishmentsData}
/>
),
},
{
id: "payment-overview",
title: "Comportamento de Pagamento",
subtitle: "Despesas por condição e forma de pagamento",
title: "Distribuição de despesas",
subtitle: "Por condição e forma de pagamento",
icon: <RiWallet3Line className="size-4" />,
component: ({ data, period, adminPayerSlug }) => (
<PaymentOverviewWidget
@@ -209,8 +208,8 @@ export const widgetsConfig: WidgetConfig[] = [
},
{
id: "expenses-by-category",
title: "Categorias por Despesas",
subtitle: "Distribuição de despesas por categoria",
title: "Despesas por categoria",
subtitle: "Maiores despesas por categoria",
icon: <RiPieChartLine className="size-4" />,
component: ({ data, period }) => (
<ExpensesByCategoryWidgetWithChart
@@ -221,8 +220,8 @@ export const widgetsConfig: WidgetConfig[] = [
},
{
id: "income-by-category",
title: "Categorias por Receitas",
subtitle: "Distribuição de receitas por categoria",
title: "Receitas por categoria",
subtitle: "Maiores receitas por categoria",
icon: <RiPieChartLine className="size-4" />,
component: ({ data, period }) => (
<IncomeByCategoryWidgetWithChart
@@ -233,8 +232,8 @@ export const widgetsConfig: WidgetConfig[] = [
},
{
id: "purchases-by-category",
title: "Lançamentos por Categorias",
subtitle: "Distribuição de lançamentos por categoria",
title: "Lançamentos por categoria",
subtitle: "Lançamentos recentes da categoria selecionada",
icon: <RiStore3Line className="size-4" />,
component: ({ data }) => (
<PurchasesByCategoryWidget data={data.purchasesByCategoryData} />
@@ -242,8 +241,8 @@ export const widgetsConfig: WidgetConfig[] = [
},
{
id: "recurring-expenses",
title: "Lançamentos Recorrentes",
subtitle: "Despesas recorrentes do período",
title: "Despesas recorrentes",
subtitle: "Despesas recorrentes deste mês",
icon: <RiRefreshLine className="size-4" />,
component: ({ data }) => (
<RecurringExpensesWidget data={data.recurringExpensesData} />
@@ -251,8 +250,8 @@ export const widgetsConfig: WidgetConfig[] = [
},
{
id: "installment-expenses",
title: "Lançamentos Parcelados",
subtitle: "Acompanhe as parcelas abertas",
title: "Despesas parceladas",
subtitle: "Parcelamentos mais próximos da quitação",
icon: <RiNumbersLine className="size-4" />,
component: ({ data }) => (
<InstallmentExpensesWidget data={data.installmentExpensesData} />
@@ -261,7 +260,7 @@ export const widgetsConfig: WidgetConfig[] = [
{
id: "pagadores",
title: "Pessoas",
subtitle: "Despesas por pessoa no período",
subtitle: "Maiores despesas por pessoa no período",
icon: <RiGroupLine className="size-4" />,
component: ({ data }) => (
<PayersWidget payers={data.pagadoresSnapshot.payers} />
@@ -279,7 +278,7 @@ export const widgetsConfig: WidgetConfig[] = [
{
id: "notes",
title: "Anotações",
subtitle: "Últimas anotações ativas",
subtitle: "Anotações ativas adicionadas recentemente",
icon: <RiTodoLine className="size-4" />,
component: ({ data }) => <NotesWidget notes={data.notesData} />,
action: (

View File

@@ -206,7 +206,7 @@ export const InboxCard = memo(function InboxCard({
onClick={() => onProcess?.(item)}
>
<RiCheckLine className="mr-1.5 size-4" />
Processar
Lançar
</Button>
<Button
size="icon-sm"

View File

@@ -129,7 +129,7 @@ export function InboxDetailsDialog({
onProcess(item);
}}
>
Processar
Lançar
</Button>
)}
</DialogFooter>

View File

@@ -240,13 +240,13 @@ export function InvoiceSummaryCard({
</div>
{/* Linha 2 — valor da fatura (hero) */}
<div className="space-y-4">
<div className="space-y-3">
<p className="text-sm text-muted-foreground">Valor da fatura</p>
<div className="flex items-center gap-2">
<MoneyValues
amount={Math.abs(totalAmount)}
className={cn(
"text-3xl tracking-tighter font-semibold",
"text-3xl leading-none tracking-tighter sm:text-2xl",
isPaid ? "text-success" : "text-foreground",
)}
/>
@@ -259,7 +259,7 @@ export function InvoiceSummaryCard({
type="button"
variant="ghost"
size="icon-sm"
className="text-muted-foreground hover:text-foreground"
className="text-primary hover:text-primary"
aria-label="Ajustar fatura"
>
<RiEqualizerLine className="size-4" />

View File

@@ -30,7 +30,7 @@ export function PayerBoletoCard({ items }: PayerBoletoCardProps) {
<WidgetEmptyState
icon={<RiBarcodeLine className="size-6 text-muted-foreground" />}
title="Nenhum boleto cadastrado para o período"
description="Quando houver despesas registradas com boleto, elas aparecerão aqui."
description="Quando houver lançamentos registrados com boleto, eles aparecerão aqui."
/>
</CardContent>
);

View File

@@ -68,6 +68,7 @@ const updatePreferencesSchema = z.object({
statementNoteAsColumn: z.boolean(),
transactionsColumnOrder: z.array(z.string()).nullable(),
attachmentMaxSizeMb: z.number().int().min(1).max(100),
showTransactionSummary: z.boolean(),
});
type ResettableUser = {
@@ -582,6 +583,7 @@ export async function updatePreferencesAction(
statementNoteAsColumn: validated.statementNoteAsColumn,
transactionsColumnOrder: validated.transactionsColumnOrder,
attachmentMaxSizeMb: validated.attachmentMaxSizeMb,
showTransactionSummary: validated.showTransactionSummary,
updatedAt: new Date(),
})
.where(eq(schema.userPreferences.userId, session.user.id));
@@ -592,6 +594,7 @@ export async function updatePreferencesAction(
statementNoteAsColumn: validated.statementNoteAsColumn,
transactionsColumnOrder: validated.transactionsColumnOrder,
attachmentMaxSizeMb: validated.attachmentMaxSizeMb,
showTransactionSummary: validated.showTransactionSummary,
});
}

View File

@@ -42,6 +42,7 @@ interface PreferencesFormProps {
statementNoteAsColumn: boolean;
transactionsColumnOrder: string[] | null;
attachmentMaxSizeMb: number;
showTransactionSummary: boolean;
}
function SortableColumnItem({ id }: { id: string }) {
@@ -85,6 +86,7 @@ export function PreferencesForm({
statementNoteAsColumn: initialExtratoNoteAsColumn,
transactionsColumnOrder: initialColumnOrder,
attachmentMaxSizeMb: initialAttachmentMaxSizeMb,
showTransactionSummary: initialShowTransactionSummary,
}: PreferencesFormProps) {
const router = useRouter();
const [isPending, startTransition] = useTransition();
@@ -104,6 +106,9 @@ export function PreferencesForm({
? initialAttachmentMaxSizeMb
: 50) as AttachmentSizeOption,
);
const [showTransactionSummary, setShowTransactionSummary] = useState(
initialShowTransactionSummary,
);
const sensors = useSensors(
useSensor(PointerSensor, { activationConstraint: { distance: 8 } }),
@@ -129,6 +134,7 @@ export function PreferencesForm({
statementNoteAsColumn,
transactionsColumnOrder: columnOrder,
attachmentMaxSizeMb,
showTransactionSummary,
});
if (result.success) {
@@ -172,6 +178,26 @@ export function PreferencesForm({
<Separator />
<section className="flex items-center justify-between max-w-md">
<div className="space-y-2">
<Label htmlFor="show-transaction-summary" className="text-sm">
Resumo da operação
</Label>
<p className="text-sm text-muted-foreground">
Exibe um resumo dos dados preenchidos no final do modal de
lançamento.
</p>
</div>
<Switch
id="show-transaction-summary"
checked={showTransactionSummary}
onCheckedChange={setShowTransactionSummary}
disabled={isPending}
/>
</section>
<Separator />
<section className="space-y-2 max-w-md">
<Label className="text-sm">Ordem das colunas</Label>
<p className="text-sm text-muted-foreground">

View File

@@ -6,6 +6,7 @@ interface UserPreferences {
statementNoteAsColumn: boolean;
transactionsColumnOrder: string[] | null;
attachmentMaxSizeMb: number;
showTransactionSummary: boolean;
}
interface ApiToken {
@@ -34,6 +35,7 @@ export async function fetchUserPreferences(
statementNoteAsColumn: schema.userPreferences.statementNoteAsColumn,
transactionsColumnOrder: schema.userPreferences.transactionsColumnOrder,
attachmentMaxSizeMb: schema.userPreferences.attachmentMaxSizeMb,
showTransactionSummary: schema.userPreferences.showTransactionSummary,
})
.from(schema.userPreferences)
.where(eq(schema.userPreferences.userId, userId))

View File

@@ -608,7 +608,12 @@ export async function toggleTransactionSettlementAction(
const data = toggleSettlementSchema.parse(input);
const existing = await db.query.transactions.findFirst({
columns: { id: true, paymentMethod: true, accountId: true },
columns: {
id: true,
paymentMethod: true,
accountId: true,
transactionType: true,
},
where: and(
eq(transactions.id, data.id),
eq(transactions.userId, user.id),
@@ -627,6 +632,7 @@ export async function toggleTransactionSettlementAction(
}
const isBoleto = existing.paymentMethod === "Boleto";
const isIncomeBill = isBoleto && existing.transactionType === "Receita";
const customPaymentDate =
isBoleto && data.value && data.paymentDate
? parseLocalDateString(data.paymentDate)
@@ -652,7 +658,7 @@ export async function toggleTransactionSettlementAction(
if (!paymentAccount) {
return {
success: false,
error: "Conta de pagamento não encontrada.",
error: `Conta de ${isIncomeBill ? "recebimento" : "pagamento"} não encontrada.`,
};
}
}
@@ -682,8 +688,8 @@ export async function toggleTransactionSettlementAction(
return {
success: true,
message: data.value
? "Lançamento marcado como pago."
: "Pagamento desfeito com sucesso.",
? `Lançamento marcado como ${isIncomeBill ? "recebido" : "pago"}.`
: `${isIncomeBill ? "Recebimento" : "Pagamento"} desfeito com sucesso.`,
};
} catch (error) {
return handleActionError(error);

View File

@@ -17,6 +17,7 @@ import {
buildTransactionInitialState,
deriveCreditCardPeriod,
} from "@/features/transactions/lib/form-helpers";
import { useAppPreferences } from "@/shared/components/providers/app-preferences-provider";
import { Button } from "@/shared/components/ui/button";
import {
Collapsible,
@@ -104,6 +105,7 @@ export function TransactionDialog({
const [pendingUploadFiles, setPendingUploadFiles] = useState<File[]>([]);
const [extrasOpen, setExtrasOpen] = useState(false);
const scrollContainerRef = useRef<HTMLDivElement>(null);
const { showTransactionSummary } = useAppPreferences();
useEffect(() => {
if (dialogOpen) {
@@ -730,15 +732,17 @@ export function TransactionDialog({
</Collapsible>
)}
<div className="mt-3">
<TransactionSummaryCard
formState={formState}
payerOptions={payerOptions}
accountOptions={accountOptions}
cardOptions={cardOptions}
categoryOptions={categoryOptions}
/>
</div>
{showTransactionSummary ? (
<div className="mt-3">
<TransactionSummaryCard
formState={formState}
payerOptions={payerOptions}
accountOptions={accountOptions}
cardOptions={cardOptions}
categoryOptions={categoryOptions}
/>
</div>
) : null}
</div>
{errorMessage ? (

View File

@@ -34,6 +34,7 @@ import {
parseDateFilterParam,
parsePositiveAmount,
} from "@/features/transactions/lib/page-helpers";
import { Badge } from "@/shared/components/ui/badge";
import { Button } from "@/shared/components/ui/button";
import { Checkbox } from "@/shared/components/ui/checkbox";
import {
@@ -54,6 +55,11 @@ import {
DrawerTitle,
DrawerTrigger,
} from "@/shared/components/ui/drawer";
import {
HoverCard,
HoverCardContent,
HoverCardTrigger,
} from "@/shared/components/ui/hover-card";
import { Input } from "@/shared/components/ui/input";
import {
Popover,
@@ -73,6 +79,8 @@ import {
ToggleGroup,
ToggleGroupItem,
} from "@/shared/components/ui/toggle-group";
import { formatCurrency } from "@/shared/utils/currency";
import { formatDateOnly } from "@/shared/utils/date";
import { slugify } from "@/shared/utils/string";
import { cn } from "@/shared/utils/ui";
import {
@@ -90,6 +98,36 @@ import type {
const FILTER_EMPTY_VALUE = "__all";
type ActiveFilterChipProps = {
label: string;
onRemove: () => void;
disabled?: boolean;
};
function ActiveFilterChip({
label,
onRemove,
disabled,
}: ActiveFilterChipProps) {
return (
<Badge
variant="secondary"
className="gap-1 border border-border/70 bg-secondary/70 py-1 pr-1 pl-2.5 font-normal text-secondary-foreground"
>
<span>{label}</span>
<button
type="button"
onClick={onRemove}
disabled={disabled}
className="rounded-full p-0.5 text-muted-foreground transition-colors hover:bg-background/80 hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50"
aria-label={`Remover filtro ${label}`}
>
<RiCloseLine className="size-3" aria-hidden />
</button>
</Badge>
);
}
const normalizeAmountParam = (raw: string): string | null => {
const parsed = parsePositiveAmount(raw.trim());
return parsed === null ? null : parsed.toString();
@@ -601,6 +639,140 @@ export function TransactionsFilters({
});
};
const handleRemoveParams = (keys: string[]) => {
const nextParams = new URLSearchParams(searchParams.toString());
for (const key of keys) {
nextParams.delete(key);
}
nextParams.delete("page");
if (keys.includes(AMOUNT_MIN_PARAM)) {
setValorMinValue("");
}
if (keys.includes(AMOUNT_MAX_PARAM)) {
setValorMaxValue("");
}
startTransition(() => {
const target = nextParams.toString()
? `${pathname}?${nextParams.toString()}`
: pathname;
router.replace(target, { scroll: false });
});
};
const handleRemoveMultiValue = (key: string, value: string) => {
handleMultiFilterChange(
key,
getParamValues(key).filter((currentValue) => currentValue !== value),
);
};
const activeFilterChips: Array<{
key: string;
label: string;
onRemove: () => void;
}> = [];
const typeValue = searchParams.get("type");
if (typeValue) {
const label =
TRANSACTION_TYPES.find((value) => slugify(value) === typeValue) ??
typeValue;
activeFilterChips.push({
key: `type-${typeValue}`,
label: `Tipo: ${label}`,
onRemove: () => handleRemoveParams(["type"]),
});
}
const addMultiValueChips = (
param: string,
prefix: string,
options: MultiOption[],
) => {
const labels = new Map(
options.map((option) => [option.value, option.label]),
);
for (const value of getParamValues(param)) {
activeFilterChips.push({
key: `${param}-${value}`,
label: `${prefix}: ${labels.get(value) ?? value}`,
onRemove: () => handleRemoveMultiValue(param, value),
});
}
};
addMultiValueChips("condition", "Condição", conditionOptions);
addMultiValueChips("payment", "Pagamento", paymentOptions);
addMultiValueChips("payer", "Pessoa", payerMultiOptions);
addMultiValueChips("category", "Categoria", categoryMultiOptions);
addMultiValueChips("accountCard", "Conta/cartão", accountCardMultiOptions);
const settledValue = searchParams.get("settled");
if (settledValue) {
activeFilterChips.push({
key: `settled-${settledValue}`,
label:
settledValue === SETTLED_FILTER_VALUES.PAID
? "Status: Pago"
: "Status: Não pago",
onRemove: () => handleRemoveParams(["settled"]),
});
}
if (searchParams.get("hasAttachment") === "true") {
activeFilterChips.push({
key: "has-attachment",
label: "Com anexo",
onRemove: () => handleRemoveParams(["hasAttachment"]),
});
}
if (searchParams.get("isDivided") === "true") {
activeFilterChips.push({
key: "is-divided",
label: "Somente divididos",
onRemove: () => handleRemoveParams(["isDivided"]),
});
}
if (hasAmountFilter) {
const minValue = parsePositiveAmount(
searchParams.get(AMOUNT_MIN_PARAM) ?? "",
);
const maxValue = parsePositiveAmount(
searchParams.get(AMOUNT_MAX_PARAM) ?? "",
);
const label =
minValue !== null && maxValue !== null
? `Valor: ${formatCurrency(minValue)} até ${formatCurrency(maxValue)}`
: minValue !== null
? `Valor: a partir de ${formatCurrency(minValue)}`
: `Valor: até ${formatCurrency(maxValue ?? 0)}`;
activeFilterChips.push({
key: "amount-range",
label,
onRemove: () => handleRemoveParams([AMOUNT_MIN_PARAM, AMOUNT_MAX_PARAM]),
});
}
if (hasDateRangeFilter) {
const startValue = formatDateOnly(searchParams.get(DATE_START_PARAM));
const endValue = formatDateOnly(searchParams.get(DATE_END_PARAM));
const label =
startValue && endValue
? `Datas: ${startValue} até ${endValue}`
: startValue
? `Datas: a partir de ${startValue}`
: `Datas: até ${endValue}`;
activeFilterChips.push({
key: "date-range",
label,
onRemove: () => handleRemoveParams([DATE_START_PARAM, DATE_END_PARAM]),
});
}
return (
<div
aria-busy={isPending}
@@ -640,366 +812,401 @@ export function TransactionsFilters({
)}
{!hideAdvancedFilters && (
<Drawer
direction="right"
open={drawerOpen}
onOpenChange={setDrawerOpen}
>
<DrawerTrigger asChild>
<Button
variant="outline"
className="flex-1 md:flex-none text-sm border-dashed relative bg-transparent"
aria-label={isPending ? "Aplicando filtros" : "Abrir filtros"}
>
{isPending ? (
<Spinner className="size-4" role="presentation" aria-hidden />
) : (
<RiFilterLine className="size-4" aria-hidden />
)}
{isPending ? "Aplicando..." : "Filtros"}
{hasActiveFilters && (
<span
className="absolute -top-1 -right-1 size-3 rounded-full bg-primary"
aria-hidden
/>
)}
</Button>
</DrawerTrigger>
{hasActiveFilters && (
<Button
type="button"
variant="ghost"
size="sm"
onClick={handleReset}
disabled={isPending}
aria-label="Limpar filtros"
className="text-xs text-muted-foreground hover:text-foreground h-9 px-2"
>
<RiCloseLine className="size-3.5" aria-hidden />
Limpar
</Button>
)}
<DrawerContent>
<DrawerHeader>
<DrawerTitle>Filtros</DrawerTitle>
<DrawerDescription>
Selecione os filtros desejados para refinar os lançamentos
</DrawerDescription>
</DrawerHeader>
<div className="flex-1 overflow-y-auto px-4 space-y-4">
<div>
<div className="grid gap-3 sm:grid-cols-2">
<div className="space-y-1.5">
<label className="text-xs font-medium text-muted-foreground">
Tipo de lançamento
</label>
<FilterSelect
param="type"
placeholder="Todos"
options={TRANSACTION_TYPES.map((v) => ({
value: slugify(v),
label: v,
}))}
widthClass="w-full border-dashed"
disabled={isPending}
getParamValue={getParamValue}
onChange={handleFilterChange}
renderContent={(label) => (
<TransactionTypeSelectContent label={label} />
)}
/>
</div>
<div className="space-y-1.5">
<label className="text-xs font-medium text-muted-foreground">
Condição de pagamento
</label>
<MultiSelectFilter
placeholder="Todas"
options={conditionOptions}
selected={getParamValues("condition")}
onChange={(values) =>
handleMultiFilterChange("condition", values)
}
disabled={isPending}
/>
</div>
<div className="space-y-1.5">
<label className="text-xs font-medium text-muted-foreground">
Forma de pagamento
</label>
<MultiSelectFilter
placeholder="Todas"
options={paymentOptions}
selected={getParamValues("payment")}
onChange={(values) =>
handleMultiFilterChange("payment", values)
}
disabled={isPending}
/>
</div>
<div className="space-y-1.5">
<label className="text-xs font-medium text-muted-foreground">
Pessoa
</label>
<MultiSelectFilter
placeholder="Todas"
options={payerMultiOptions}
selected={getParamValues("payer")}
onChange={(values) =>
handleMultiFilterChange("payer", values)
}
disabled={isPending}
searchable
searchPlaceholder="Buscar pessoa..."
/>
</div>
<div className="space-y-1.5">
<label className="text-xs font-medium text-muted-foreground">
Categoria
</label>
<MultiSelectFilter
placeholder="Todas"
options={categoryMultiOptions}
selected={getParamValues("category")}
onChange={(values) =>
handleMultiFilterChange("category", values)
}
disabled={isPending}
searchable
searchPlaceholder="Buscar categoria..."
groupOrder={["Despesas", "Receitas", "Outras"]}
/>
</div>
<div className="space-y-1.5">
<label className="text-xs font-medium text-muted-foreground">
Conta/Cartão
</label>
<MultiSelectFilter
placeholder="Todos"
options={accountCardMultiOptions}
selected={getParamValues("accountCard")}
onChange={(values) =>
handleMultiFilterChange("accountCard", values)
}
disabled={isPending}
searchable
searchPlaceholder="Buscar conta ou cartão..."
groupOrder={["Contas", "Cartões"]}
/>
</div>
</div>
</div>
<Separator />
<div className="space-y-3">
<div className="space-y-2">
<div className="flex items-center justify-between gap-2">
<label className="text-xs font-medium text-muted-foreground">
Intervalo de datas
</label>
{hasDateRangeFilter ? (
<button
type="button"
onClick={handleResetDateRange}
disabled={isPending}
className="text-xs text-muted-foreground underline-offset-2 hover:text-foreground hover:underline disabled:pointer-events-none disabled:opacity-50"
>
Limpar período
</button>
) : null}
</div>
<div className="grid gap-2 sm:grid-cols-[1fr_auto_1fr] sm:items-center">
<DatePicker
value={searchParams.get(DATE_START_PARAM) ?? ""}
onChange={(value) =>
handleDateFilterChange(DATE_START_PARAM, value)
}
placeholder="Data inicial"
disabled={isPending}
inputClassName="border-dashed"
compact
/>
<span className="hidden text-xs text-muted-foreground sm:block">
até
</span>
<DatePicker
value={searchParams.get(DATE_END_PARAM) ?? ""}
onChange={(value) =>
handleDateFilterChange(DATE_END_PARAM, value)
}
placeholder="Data final"
disabled={isPending}
inputClassName="border-dashed"
compact
/>
</div>
</div>
<div className="space-y-2">
<label className="text-xs font-medium text-muted-foreground">
Faixa de valor
</label>
<div className="flex items-center gap-2">
<Input
type="number"
inputMode="decimal"
min="0"
step="0.01"
placeholder="Mínimo"
aria-label="Valor mínimo"
value={valorMinValue}
onChange={(event) =>
setValorMinValue(event.target.value)
}
disabled={isPending}
className="text-sm border-dashed"
/>
<span className="text-xs text-muted-foreground">até</span>
<Input
type="number"
inputMode="decimal"
min="0"
step="0.01"
placeholder="Máximo"
aria-label="Valor máximo"
value={valorMaxValue}
onChange={(event) =>
setValorMaxValue(event.target.value)
}
disabled={isPending}
className="text-sm border-dashed"
/>
</div>
</div>
</div>
<Separator />
<div className="space-y-3">
<ToggleGroup
type="single"
value={settledFilterValue}
onValueChange={(value) => {
if (!value) return;
handleFilterChange(
"settled",
value === FILTER_EMPTY_VALUE ? null : value,
);
}}
<HoverCard openDelay={200} closeDelay={200}>
<Drawer
direction="right"
open={drawerOpen}
onOpenChange={setDrawerOpen}
>
<HoverCardTrigger asChild>
<DrawerTrigger asChild>
<Button
variant="outline"
size="sm"
className="grid w-full grid-cols-3 rounded-md bg-muted/30 p-0.5"
aria-label="Status de pagamento"
className="flex-1 md:flex-none text-sm border-dashed relative bg-transparent"
aria-label={
isPending ? "Aplicando filtros" : "Abrir filtros"
}
>
<ToggleGroupItem
value={FILTER_EMPTY_VALUE}
className="text-xs font-medium transition-all data-[state=on]:border-foreground data-[state=on]:bg-foreground data-[state=on]:text-background data-[state=on]:shadow-sm"
>
Todos
</ToggleGroupItem>
<ToggleGroupItem
value={SETTLED_FILTER_VALUES.PAID}
className="text-xs font-medium transition-all data-[state=on]:border-foreground data-[state=on]:bg-foreground data-[state=on]:text-background data-[state=on]:shadow-sm"
>
Pagos
</ToggleGroupItem>
<ToggleGroupItem
value={SETTLED_FILTER_VALUES.UNPAID}
className="text-xs font-medium transition-all data-[state=on]:border-foreground data-[state=on]:bg-foreground data-[state=on]:text-background data-[state=on]:shadow-sm"
>
Não pagos
</ToggleGroupItem>
</ToggleGroup>
</div>
<div className="flex items-center justify-between">
<label
htmlFor="filter-has-attachment"
className="text-sm font-medium cursor-pointer"
>
Com anexo
</label>
<Switch
id="filter-has-attachment"
checked={searchParams.get("hasAttachment") === "true"}
disabled={isPending}
onCheckedChange={(checked) => {
handleFilterChange(
"hasAttachment",
checked ? "true" : null,
);
}}
/>
</div>
<div className="flex items-center justify-between">
<label
htmlFor="filter-is-divided"
className="text-sm font-medium cursor-pointer"
>
Somente divididos
</label>
<Switch
id="filter-is-divided"
checked={searchParams.get("isDivided") === "true"}
disabled={isPending}
onCheckedChange={(checked) => {
handleFilterChange("isDivided", checked ? "true" : null);
}}
/>
</div>
</div>
<DrawerFooter>
<div className="flex items-center justify-between gap-3 rounded-md border border-dashed px-3 py-2">
<div className="flex min-w-0 flex-col gap-0.5">
<span
className="text-xs text-muted-foreground"
aria-live="polite"
>
{hasActiveFilters
? `${activeFilterCount} ${
activeFilterCount === 1
? "filtro ativo"
: "filtros ativos"
}`
: "Nenhum filtro ativo"}
</span>
{isPending ? (
<Spinner
className="size-4"
role="presentation"
aria-hidden
/>
) : (
<RiFilterLine className="size-4" aria-hidden />
)}
{isPending ? "Aplicando..." : "Filtros"}
{hasActiveFilters && (
<span
className="inline-flex items-center gap-1.5 text-xs text-muted-foreground"
role="status"
>
<Spinner
className="size-3"
role="presentation"
aria-hidden
/>
Aplicando filtros...
</span>
) : null}
className="absolute -top-1 -right-1 size-3 rounded-full bg-primary"
aria-hidden
/>
)}
</Button>
</DrawerTrigger>
</HoverCardTrigger>
{activeFilterChips.length > 0 ? (
<HoverCardContent
align="end"
className="w-80 space-y-3"
aria-label="Filtros ativos"
>
<div className="space-y-0.5">
<p className="text-sm font-medium">Filtros ativos</p>
<p className="text-xs text-muted-foreground">
Remova rapidamente o que não precisa mais.
</p>
</div>
<div className="flex flex-wrap gap-1.5">
{activeFilterChips.map((chip) => (
<ActiveFilterChip
key={chip.key}
label={chip.label}
onRemove={chip.onRemove}
disabled={isPending}
/>
))}
</div>
<Button
type="button"
variant="ghost"
size="sm"
onClick={handleResetFilters}
disabled={isPending || !hasActiveFilters}
onClick={handleReset}
disabled={isPending}
className="h-7 px-2 text-xs text-muted-foreground hover:text-foreground"
>
Limpar
Limpar filtros
</Button>
</HoverCardContent>
) : null}
<DrawerContent>
<DrawerHeader>
<DrawerTitle>Filtros</DrawerTitle>
<DrawerDescription>
Selecione os filtros desejados para refinar os lançamentos
</DrawerDescription>
</DrawerHeader>
<div className="flex-1 overflow-y-auto px-4 space-y-4">
<div>
<div className="grid gap-3 sm:grid-cols-2">
<div className="space-y-1.5">
<label className="text-xs font-medium text-muted-foreground">
Tipo de lançamento
</label>
<FilterSelect
param="type"
placeholder="Todos"
options={TRANSACTION_TYPES.map((v) => ({
value: slugify(v),
label: v,
}))}
widthClass="w-full border-dashed"
disabled={isPending}
getParamValue={getParamValue}
onChange={handleFilterChange}
renderContent={(label) => (
<TransactionTypeSelectContent label={label} />
)}
/>
</div>
<div className="space-y-1.5">
<label className="text-xs font-medium text-muted-foreground">
Condição de pagamento
</label>
<MultiSelectFilter
placeholder="Todas"
options={conditionOptions}
selected={getParamValues("condition")}
onChange={(values) =>
handleMultiFilterChange("condition", values)
}
disabled={isPending}
/>
</div>
<div className="space-y-1.5">
<label className="text-xs font-medium text-muted-foreground">
Forma de pagamento
</label>
<MultiSelectFilter
placeholder="Todas"
options={paymentOptions}
selected={getParamValues("payment")}
onChange={(values) =>
handleMultiFilterChange("payment", values)
}
disabled={isPending}
/>
</div>
<div className="space-y-1.5">
<label className="text-xs font-medium text-muted-foreground">
Pessoa
</label>
<MultiSelectFilter
placeholder="Todas"
options={payerMultiOptions}
selected={getParamValues("payer")}
onChange={(values) =>
handleMultiFilterChange("payer", values)
}
disabled={isPending}
searchable
searchPlaceholder="Buscar pessoa..."
/>
</div>
<div className="space-y-1.5">
<label className="text-xs font-medium text-muted-foreground">
Categoria
</label>
<MultiSelectFilter
placeholder="Todas"
options={categoryMultiOptions}
selected={getParamValues("category")}
onChange={(values) =>
handleMultiFilterChange("category", values)
}
disabled={isPending}
searchable
searchPlaceholder="Buscar categoria..."
groupOrder={["Despesas", "Receitas", "Outras"]}
/>
</div>
<div className="space-y-1.5">
<label className="text-xs font-medium text-muted-foreground">
Conta/Cartão
</label>
<MultiSelectFilter
placeholder="Todos"
options={accountCardMultiOptions}
selected={getParamValues("accountCard")}
onChange={(values) =>
handleMultiFilterChange("accountCard", values)
}
disabled={isPending}
searchable
searchPlaceholder="Buscar conta ou cartão..."
groupOrder={["Contas", "Cartões"]}
/>
</div>
</div>
</div>
<Separator />
<div className="space-y-3">
<div className="space-y-2">
<div className="flex items-center justify-between gap-2">
<label className="text-xs font-medium text-muted-foreground">
Intervalo de datas
</label>
{hasDateRangeFilter ? (
<button
type="button"
onClick={handleResetDateRange}
disabled={isPending}
className="text-xs text-muted-foreground underline-offset-2 hover:text-foreground hover:underline disabled:pointer-events-none disabled:opacity-50"
>
Limpar período
</button>
) : null}
</div>
<div className="grid gap-2 sm:grid-cols-[1fr_auto_1fr] sm:items-center">
<DatePicker
value={searchParams.get(DATE_START_PARAM) ?? ""}
onChange={(value) =>
handleDateFilterChange(DATE_START_PARAM, value)
}
placeholder="Data inicial"
disabled={isPending}
inputClassName="border-dashed"
compact
/>
<span className="hidden text-xs text-muted-foreground sm:block">
até
</span>
<DatePicker
value={searchParams.get(DATE_END_PARAM) ?? ""}
onChange={(value) =>
handleDateFilterChange(DATE_END_PARAM, value)
}
placeholder="Data final"
disabled={isPending}
inputClassName="border-dashed"
compact
/>
</div>
</div>
<div className="space-y-2">
<label className="text-xs font-medium text-muted-foreground">
Faixa de valor
</label>
<div className="flex items-center gap-2">
<Input
type="number"
inputMode="decimal"
min="0"
step="0.01"
placeholder="Mínimo"
aria-label="Valor mínimo"
value={valorMinValue}
onChange={(event) =>
setValorMinValue(event.target.value)
}
disabled={isPending}
className="text-sm border-dashed"
/>
<span className="text-xs text-muted-foreground">
até
</span>
<Input
type="number"
inputMode="decimal"
min="0"
step="0.01"
placeholder="Máximo"
aria-label="Valor máximo"
value={valorMaxValue}
onChange={(event) =>
setValorMaxValue(event.target.value)
}
disabled={isPending}
className="text-sm border-dashed"
/>
</div>
</div>
</div>
<Separator />
<div className="space-y-3">
<ToggleGroup
type="single"
value={settledFilterValue}
onValueChange={(value) => {
if (!value) return;
handleFilterChange(
"settled",
value === FILTER_EMPTY_VALUE ? null : value,
);
}}
variant="outline"
size="sm"
className="grid w-full grid-cols-3 rounded-md bg-muted/30 p-0.5"
aria-label="Status de pagamento"
>
<ToggleGroupItem
value={FILTER_EMPTY_VALUE}
className="text-xs font-medium transition-all data-[state=on]:border-foreground data-[state=on]:bg-foreground data-[state=on]:text-background data-[state=on]:shadow-sm"
>
Todos
</ToggleGroupItem>
<ToggleGroupItem
value={SETTLED_FILTER_VALUES.PAID}
className="text-xs font-medium transition-all data-[state=on]:border-foreground data-[state=on]:bg-foreground data-[state=on]:text-background data-[state=on]:shadow-sm"
>
Pagos
</ToggleGroupItem>
<ToggleGroupItem
value={SETTLED_FILTER_VALUES.UNPAID}
className="text-xs font-medium transition-all data-[state=on]:border-foreground data-[state=on]:bg-foreground data-[state=on]:text-background data-[state=on]:shadow-sm"
>
Não pagos
</ToggleGroupItem>
</ToggleGroup>
</div>
<div className="flex items-center justify-between">
<label
htmlFor="filter-has-attachment"
className="text-sm font-medium cursor-pointer"
>
Com anexo
</label>
<Switch
id="filter-has-attachment"
checked={searchParams.get("hasAttachment") === "true"}
disabled={isPending}
onCheckedChange={(checked) => {
handleFilterChange(
"hasAttachment",
checked ? "true" : null,
);
}}
/>
</div>
<div className="flex items-center justify-between">
<label
htmlFor="filter-is-divided"
className="text-sm font-medium cursor-pointer"
>
Somente divididos
</label>
<Switch
id="filter-is-divided"
checked={searchParams.get("isDivided") === "true"}
disabled={isPending}
onCheckedChange={(checked) => {
handleFilterChange(
"isDivided",
checked ? "true" : null,
);
}}
/>
</div>
</div>
</DrawerFooter>
</DrawerContent>
</Drawer>
<DrawerFooter>
<div className="flex items-center justify-between gap-3 rounded-md border border-dashed px-3 py-2">
<div className="flex min-w-0 flex-col gap-0.5">
<span
className="text-xs text-muted-foreground"
aria-live="polite"
>
{hasActiveFilters
? `${activeFilterCount} ${
activeFilterCount === 1
? "filtro ativo"
: "filtros ativos"
}`
: "Nenhum filtro ativo"}
</span>
{isPending ? (
<span
className="inline-flex items-center gap-1.5 text-xs text-muted-foreground"
role="status"
>
<Spinner
className="size-3"
role="presentation"
aria-hidden
/>
Aplicando filtros...
</span>
) : null}
</div>
<Button
type="button"
variant="ghost"
size="sm"
onClick={handleResetFilters}
disabled={isPending || !hasActiveFilters}
className="h-7 px-2 text-xs text-muted-foreground hover:text-foreground"
>
Limpar
</Button>
</div>
</DrawerFooter>
</DrawerContent>
</Drawer>
</HoverCard>
)}
</div>
</div>

View File

@@ -1,9 +1,22 @@
"use client";
import { RiArrowDropDownLine, RiCalendarLine } from "@remixicon/react";
import { useRouter } from "next/navigation";
import { useEffect, useTransition } from "react";
import { useEffect, useRef, useState, useTransition } from "react";
import { Button } from "@/shared/components/ui/button";
import { Card } from "@/shared/components/ui/card";
import { getNextPeriod, getPreviousPeriod } from "@/shared/utils/period";
import { MonthPicker } from "@/shared/components/ui/month-picker";
import {
Popover,
PopoverContent,
PopoverTrigger,
} from "@/shared/components/ui/popover";
import {
dateToPeriod,
getNextPeriod,
getPreviousPeriod,
periodToDate,
} from "@/shared/utils/period";
import LoadingSpinner from "./loading-spinner";
import NavigationButton from "./nav-button";
import ReturnButton from "./return-button";
@@ -15,6 +28,8 @@ export default function MonthNavigation() {
const router = useRouter();
const [isPending, startTransition] = useTransition();
const [isPickerOpen, setIsPickerOpen] = useState(false);
const closePickerTimeout = useRef<ReturnType<typeof setTimeout>>(null);
const currentMonthLabel = `${currentMonth.charAt(0).toUpperCase()}${currentMonth.slice(1)} ${currentYear}`;
const prevTarget = buildHref(getPreviousPeriod(period));
@@ -30,31 +45,88 @@ export default function MonthNavigation() {
}
}, [router, prevTarget, nextTarget, returnTarget, isDifferentFromCurrent]);
useEffect(() => {
return () => {
if (closePickerTimeout.current) {
clearTimeout(closePickerTimeout.current);
}
};
}, []);
const handleNavigate = (href: string) => {
setIsPickerOpen(false);
startTransition(() => {
router.replace(href, { scroll: false });
});
};
const handlePickerOpen = () => {
if (isPending) {
return;
}
if (closePickerTimeout.current) {
clearTimeout(closePickerTimeout.current);
}
setIsPickerOpen(true);
};
const handlePickerClose = () => {
closePickerTimeout.current = setTimeout(() => {
setIsPickerOpen(false);
}, 150);
};
const handleMonthSelect = (date: Date) => {
handleNavigate(buildHref(dateToPeriod(date)));
};
return (
<Card className="sticky top-18 z-10 flex w-full flex-row p-4 backdrop-blur-md supports-backdrop-filter:bg-card/60">
<div className="flex items-center gap-1">
<Card className="sticky top-18 z-10 flex w-full flex-row items-center justify-between gap-2 px-3 py-3 backdrop-blur-md supports-backdrop-filter:bg-card/60 sm:px-4">
<div className="flex min-w-0 items-center">
<NavigationButton
direction="left"
disabled={isPending}
onClick={() => handleNavigate(prevTarget)}
/>
<div className="flex items-center">
<div
className="mx-1 space-x-1 capitalize font-semibold"
aria-current={!isDifferentFromCurrent ? "date" : undefined}
aria-label={`Período selecionado: ${currentMonthLabel}`}
>
<span>{currentMonthLabel}</span>
</div>
{isPending && <LoadingSpinner />}
<div className="flex min-w-0 items-center">
<Popover open={isPickerOpen} onOpenChange={setIsPickerOpen}>
<PopoverTrigger asChild>
<Button
variant="ghost"
size="sm"
disabled={isPending}
onMouseEnter={handlePickerOpen}
onMouseLeave={handlePickerClose}
onFocus={handlePickerOpen}
className="min-w-0 gap-1 px-1.5 font-semibold"
aria-current={!isDifferentFromCurrent ? "date" : undefined}
aria-label={`Selecionar período. Período atual: ${currentMonthLabel}`}
>
{isPending ? (
<LoadingSpinner />
) : (
<RiCalendarLine className="size-4 text-primary" />
)}
<span className="truncate capitalize">{currentMonthLabel}</span>
<RiArrowDropDownLine
className="size-4 text-muted-foreground/50"
aria-hidden
/>
</Button>
</PopoverTrigger>
<PopoverContent
className="w-auto p-0"
align="start"
onMouseEnter={handlePickerOpen}
onMouseLeave={handlePickerClose}
>
<MonthPicker
selectedMonth={periodToDate(period)}
onMonthSelect={handleMonthSelect}
/>
</PopoverContent>
</Popover>
</div>
<NavigationButton

View File

@@ -1,6 +1,7 @@
"use client";
import { RiArrowLeftSLine, RiArrowRightSLine } from "@remixicon/react";
import { Button } from "@/shared/components/ui/button";
interface NavigationButtonProps {
direction: "left" | "right";
@@ -16,15 +17,17 @@ export default function NavigationButton({
const Icon = direction === "left" ? RiArrowLeftSLine : RiArrowRightSLine;
return (
<button
<Button
type="button"
variant="ghost"
size="icon-sm"
onClick={onClick}
className="text-card-foreground transition-all duration-200 cursor-pointer rounded-lg p-1 hover:bg-card-foreground/10 focus:outline-hidden focus:ring-2 focus:ring-card-foreground/30 disabled:cursor-not-allowed disabled:opacity-40 disabled:hover:bg-transparent"
disabled={disabled}
aria-label={`Navegar para o mês ${
direction === "left" ? "anterior" : "seguinte"
}`}
>
<Icon className="text-primary" size={18} />
</button>
<Icon className="size-5 text-primary" />
</Button>
);
}

View File

@@ -1,5 +1,6 @@
"use client";
import { RiCalendarLine } from "@remixicon/react";
import { Button } from "@/shared/components/ui/button";
interface ReturnButtonProps {
@@ -10,13 +11,16 @@ interface ReturnButtonProps {
export default function ReturnButton({ disabled, onClick }: ReturnButtonProps) {
return (
<Button
className="w-max h-6 lowercase"
type="button"
variant="secondary"
className="w-max shrink-0"
size="sm"
disabled={disabled}
onClick={onClick}
aria-label="Retornar para o mês atual"
>
Mês Atual
<RiCalendarLine className="size-4" />
<span className="hidden sm:inline">Mês atual</span>
</Button>
);
}

View File

@@ -3,6 +3,7 @@ import { NotificationBell } from "@/shared/components/navigation/navbar/notifica
import { RefreshPageButton } from "@/shared/components/refresh-page-button";
import type { DashboardNotificationsSnapshot } from "@/shared/lib/types/notifications";
import { checkForUpdate } from "@/shared/lib/version/check-update";
import type { NavbarFinanceLinks } from "./nav-items";
import { NavMenu } from "./nav-menu";
import { NavbarShell } from "./navbar-shell";
import { NavbarUser } from "./navbar-user";
@@ -17,6 +18,7 @@ type AppNavbarProps = {
payerAvatarUrl: string | null;
inboxPendingCount?: number;
notificationsSnapshot: DashboardNotificationsSnapshot;
financeLinks: NavbarFinanceLinks;
};
export async function AppNavbar({
@@ -24,12 +26,13 @@ export async function AppNavbar({
payerAvatarUrl,
inboxPendingCount = 0,
notificationsSnapshot,
financeLinks,
}: AppNavbarProps) {
const updateCheck = await checkForUpdate();
return (
<NavbarShell logoHref="/dashboard" fixed>
<NavMenu />
<NavMenu financeLinks={financeLinks} />
<div className="ml-auto flex items-center gap-2">
<NotificationBell
notifications={notificationsSnapshot.notifications}

View File

@@ -1,8 +1,12 @@
"use client";
import { RiBankCard2Line, RiBankLine } from "@remixicon/react";
import { usePathname } from "next/navigation";
import { Badge } from "@/shared/components/ui/badge";
import { resolveLogoSrc } from "@/shared/lib/logo";
import { formatCurrency } from "@/shared/utils/currency";
import { cn } from "@/shared/utils/ui";
import type { NavbarEntityLink, NavbarFinanceLinks } from "./nav-items";
import { NavLink } from "./nav-link";
type MobileLinkProps = {
@@ -74,3 +78,64 @@ export function MobileSectionLabel({ label }: { label: string }) {
</p>
);
}
export function MobileFinanceEntityLinks({
type,
items,
onClick,
}: {
type: keyof NavbarFinanceLinks;
items: NavbarEntityLink[];
onClick: () => void;
}) {
const pathname = usePathname();
return items.map((item) => {
const href =
type === "cards"
? `/cards/${item.id}/invoice`
: `/accounts/${item.id}/statement`;
const logoSrc = resolveLogoSrc(item.logo);
const isActive = pathname === href;
const fallbackIcon =
type === "cards" ? (
<RiBankCard2Line className="size-3.5" />
) : (
<RiBankLine className="size-3.5" />
);
return (
<NavLink
key={href}
href={href}
preservePeriod
onClick={onClick}
className={cn(
"flex items-center gap-2 rounded-md py-1.5 pr-3 pl-9 text-xs transition-colors",
isActive
? "bg-primary/10 text-primary font-medium"
: "text-muted-foreground hover:bg-accent hover:text-foreground",
)}
>
{logoSrc ? (
<img
src={logoSrc}
alt=""
className="size-3.5 shrink-0 rounded-full object-contain"
/>
) : (
<span className="shrink-0">{fallbackIcon}</span>
)}
<span className="flex min-w-0 flex-col">
<span className={cn("truncate", type === "cards" && "font-semibold")}>
{item.name}
</span>
<span className="truncate text-xs text-muted-foreground">
{type === "cards" ? "Fatura deste mês" : "Saldo"}:{" "}
{formatCurrency(item.amount)}
</span>
</span>
</NavLink>
);
});
}

View File

@@ -1,16 +1,85 @@
"use client";
import {
RiArrowRightSLine,
RiBankCard2Line,
RiBankLine,
} from "@remixicon/react";
import { usePathname } from "next/navigation";
import { Badge } from "@/shared/components/ui/badge";
import { resolveLogoSrc } from "@/shared/lib/logo";
import { formatCurrency } from "@/shared/utils/currency";
import { cn } from "@/shared/utils/ui";
import type { NavItem } from "./nav-items";
import type {
NavbarEntityLink,
NavbarFinanceLinks,
NavItem,
} from "./nav-items";
import { NavLink } from "./nav-link";
type NavDropdownProps = {
items: NavItem[];
financeLinks?: NavbarFinanceLinks;
};
export function NavDropdown({ items }: NavDropdownProps) {
function FinanceEntityLinks({
type,
items,
}: {
type: keyof NavbarFinanceLinks;
items: NavbarEntityLink[];
}) {
const pathname = usePathname();
return items.map((item) => {
const href =
type === "cards"
? `/cards/${item.id}/invoice`
: `/accounts/${item.id}/statement`;
const logoSrc = resolveLogoSrc(item.logo);
const isActive = pathname === href;
const fallbackIcon =
type === "cards" ? (
<RiBankCard2Line className="size-5" />
) : (
<RiBankLine className="size-5" />
);
return (
<li key={href}>
<NavLink
href={href}
preservePeriod
className={cn(
"flex items-center gap-2 rounded-sm px-2 py-2 text-sm transition-colors",
isActive
? "bg-accent text-primary"
: "text-foreground hover:bg-accent hover:text-foreground",
)}
>
{logoSrc ? (
<img
src={logoSrc}
alt=""
className="size-5 shrink-0 rounded-full object-contain"
/>
) : (
<span className="shrink-0">{fallbackIcon}</span>
)}
<span className="flex min-w-0 flex-col">
<span className={cn("truncate font-semibold")}>{item.name}</span>
<span className="truncate text-xs text-muted-foreground">
{type === "cards" ? "Fatura deste mês" : "Saldo"}:{" "}
{formatCurrency(item.amount)}
</span>
</span>
</NavLink>
</li>
);
});
}
export function NavDropdown({ items, financeLinks }: NavDropdownProps) {
const pathname = usePathname();
return (
@@ -18,9 +87,22 @@ export function NavDropdown({ items }: NavDropdownProps) {
{items.map((item) => {
const isActive =
pathname === item.href || pathname.startsWith(`${item.href}/`);
const entityLinks =
item.href === "/cards"
? financeLinks?.cards
: item.href === "/accounts"
? financeLinks?.accounts
: undefined;
const entityType =
item.href === "/cards"
? "cards"
: item.href === "/accounts"
? "accounts"
: undefined;
const hasEntityLinks = Boolean(entityType && entityLinks?.length);
return (
<li key={item.href}>
<li key={item.href} className="group/entity relative">
<NavLink
href={item.href}
preservePeriod={item.preservePeriod}
@@ -57,7 +139,20 @@ export function NavDropdown({ items }: NavDropdownProps) {
{item.badge}
</Badge>
) : null}
{hasEntityLinks ? (
<RiArrowRightSLine
className="ml-auto size-4 shrink-0 text-muted-foreground transition-transform group-hover/entity:translate-x-0.5"
aria-hidden
/>
) : null}
</NavLink>
{hasEntityLinks && entityType && entityLinks ? (
<div className="invisible absolute top-0 left-full z-50 pl-1 opacity-0 transition-opacity group-hover/entity:visible group-hover/entity:opacity-100 group-focus-within/entity:visible group-focus-within/entity:opacity-100">
<ul className="grid max-h-[calc(100vh-5rem)] w-64 gap-0.5 overflow-y-auto rounded-md border bg-popover p-2 text-popover-foreground">
<FinanceEntityLinks type={entityType} items={entityLinks} />
</ul>
</div>
) : null}
</li>
);
})}

View File

@@ -26,6 +26,18 @@ export type NavItem = {
hideOnMobile?: boolean;
};
export type NavbarEntityLink = {
id: string;
name: string;
logo: string | null;
amount: number;
};
export type NavbarFinanceLinks = {
cards: NavbarEntityLink[];
accounts: NavbarEntityLink[];
};
type NavSection = {
label: string;
items: NavItem[];

View File

@@ -22,9 +22,13 @@ import {
SheetTrigger,
} from "@/shared/components/ui/sheet";
import { cn } from "@/shared/utils/ui";
import { MobileLink, MobileSectionLabel } from "./mobile-link";
import {
MobileFinanceEntityLinks,
MobileLink,
MobileSectionLabel,
} from "./mobile-link";
import { NavDropdown } from "./nav-dropdown";
import { NAV_SECTIONS } from "./nav-items";
import { NAV_SECTIONS, type NavbarFinanceLinks } from "./nav-items";
import { NavPill } from "./nav-pill";
import { MobileTools, NavToolsDropdown } from "./nav-tools";
@@ -34,7 +38,11 @@ const triggerClass =
const triggerActiveClass =
"bg-primary-foreground/15! text-primary-foreground! dark:bg-foreground/15! dark:text-foreground!";
export function NavMenu() {
export function NavMenu({
financeLinks,
}: {
financeLinks: NavbarFinanceLinks;
}) {
const pathname = usePathname();
const [sheetOpen, setSheetOpen] = useState(false);
const [calculatorOpen, setCalculatorOpen] = useState(false);
@@ -73,8 +81,19 @@ export function NavMenu() {
>
{section.label}
</NavigationMenuTrigger>
<NavigationMenuContent>
<NavDropdown items={section.items} />
<NavigationMenuContent
className={
section.label === "Finanças"
? "overflow-visible!"
: undefined
}
>
<NavDropdown
items={section.items}
financeLinks={
section.label === "Finanças" ? financeLinks : undefined
}
/>
</NavigationMenuContent>
</NavigationMenuItem>
);
@@ -130,17 +149,33 @@ export function NavMenu() {
<div key={section.label}>
<MobileSectionLabel label={section.label} />
{mobileItems.map((item) => (
<MobileLink
key={item.href}
href={item.href}
icon={item.icon}
onClick={close}
badge={item.badge}
preservePeriod={item.preservePeriod}
description={item.description}
>
{item.label}
</MobileLink>
<div key={item.href}>
<MobileLink
href={item.href}
icon={item.icon}
onClick={close}
badge={item.badge}
preservePeriod={item.preservePeriod}
description={item.description}
>
{item.label}
</MobileLink>
{item.href === "/cards" && financeLinks.cards.length ? (
<MobileFinanceEntityLinks
type="cards"
items={financeLinks.cards}
onClick={close}
/>
) : null}
{item.href === "/accounts" &&
financeLinks.accounts.length ? (
<MobileFinanceEntityLinks
type="accounts"
items={financeLinks.accounts}
onClick={close}
/>
) : null}
</div>
))}
</div>
);

View File

@@ -0,0 +1,31 @@
"use client";
import { createContext, useContext } from "react";
import type { AppPreferences } from "@/shared/lib/preferences/queries";
const DEFAULT_APP_PREFERENCES: AppPreferences = {
showTransactionSummary: true,
};
const AppPreferencesContext = createContext<AppPreferences>(
DEFAULT_APP_PREFERENCES,
);
type AppPreferencesProviderProps = AppPreferences & {
children: React.ReactNode;
};
export function AppPreferencesProvider({
children,
...preferences
}: AppPreferencesProviderProps) {
return (
<AppPreferencesContext.Provider value={preferences}>
{children}
</AppPreferencesContext.Provider>
);
}
export function useAppPreferences() {
return useContext(AppPreferencesContext);
}

View File

@@ -63,6 +63,7 @@ export type PayerBoletoItem = {
dueDate: string | null;
boletoPaymentDate: string | null;
isSettled: boolean;
transactionType: string;
};
export type PayerPaymentStatusData = {
@@ -322,6 +323,7 @@ export async function fetchPayerBoletoItems({
dueDate: transactions.dueDate,
boletoPaymentDate: transactions.boletoPaymentDate,
isSettled: transactions.isSettled,
transactionType: transactions.transactionType,
})
.from(transactions)
.leftJoin(
@@ -350,6 +352,7 @@ export async function fetchPayerBoletoItems({
dueDate: toDateOnlyString(row.dueDate),
boletoPaymentDate: toDateOnlyString(row.boletoPaymentDate),
isSettled: Boolean(row.isSettled),
transactionType: row.transactionType,
});
}

View File

@@ -0,0 +1,24 @@
import { eq } from "drizzle-orm";
import { db, schema } from "@/shared/lib/db";
export type AppPreferences = {
showTransactionSummary: boolean;
};
const DEFAULT_APP_PREFERENCES: AppPreferences = {
showTransactionSummary: true,
};
export async function fetchAppPreferences(
userId: string,
): Promise<AppPreferences> {
const [preferences] = await db
.select({
showTransactionSummary: schema.userPreferences.showTransactionSummary,
})
.from(schema.userPreferences)
.where(eq(schema.userPreferences.userId, userId))
.limit(1);
return preferences ?? DEFAULT_APP_PREFERENCES;
}

View File

@@ -19,7 +19,7 @@ type FinancialDueDateInfo = {
date: string | null;
};
type RelativeFinancialDateContext = "due" | "paid";
type RelativeFinancialDateContext = "due" | "paid" | "received";
export function formatFinancialDateLabel(
value: string | null,
@@ -75,15 +75,17 @@ export function formatRelativeFinancialDateLabel(
return formatFinancialDateLabel(normalizedValue, "Vence em");
}
const settlementLabel = context === "received" ? "Recebido" : "Pago";
if (normalizedValue === referenceDate) {
return "Pago hoje";
return `${settlementLabel} hoje`;
}
if (normalizedValue === yesterday) {
return "Pago ontem";
return `${settlementLabel} ontem`;
}
return formatFinancialDateLabel(normalizedValue, "Pago em");
return formatFinancialDateLabel(normalizedValue, `${settlementLabel} em`);
}
export function buildFinancialStatusLabel({