git.gladyson/openmonetis
1
0
Fork 1
mirror of https://github.com/felipegcoutinho/openmonetis.git synced 2026-05-09 11:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: corrige tipagem compartilhada e compatibilidade do typecheck

Browse Source
This commit is contained in:
Felipe Coutinho
2026-03-16 01:24:04 +00:00
parent 132f98c0f8
commit 2cb5033486
10 changed files with 55 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/(landing-page)/page.tsx
View File

@@ -231,7 +231,7 @@ export default async function Page() {
<div className="mx-auto flex max-w-5xl flex-col items-center text-center gap-5 md:gap-6">
<Logo variant="small" className="h-12 w-12 mb-1" />
<Badge variant="primary">
<Badge variant="default">
<RiGithubFill size={14} className="mr-1" />
Projeto Open Source
</Badge>
@@ -378,7 +378,7 @@ export default async function Page() {
<div className="mx-auto max-w-6xl">
<AnimateOnScroll>
<div className="text-center mb-8 md:mb-12">
<Badge variant="primary" className="mb-4">
<Badge variant="default" className="mb-4">
Conheça as telas
</Badge>
<h2 className="text-2xl sm:text-3xl md:text-4xl font-bold tracking-tight mb-3 md:mb-4">
@@ -430,7 +430,7 @@ export default async function Page() {
<div className="mx-auto max-w-5xl">
<AnimateOnScroll>
<div className="text-center mb-8 md:mb-12">
<Badge variant="primary" className="mb-4">
<Badge variant="default" className="mb-4">
O que tem aqui
</Badge>
<h2 className="text-2xl sm:text-3xl md:text-4xl font-bold tracking-tight mb-3 md:mb-4">
@@ -514,7 +514,7 @@ export default async function Page() {
<div className="grid gap-8 md:gap-12 md:grid-cols-2 items-center">
{/* Text content */}
<div className="order-2 md:order-1">
<Badge variant="primary" className="mb-4">
<Badge variant="default" className="mb-4">
<RiSmartphoneLine size={14} className="mr-1" />
App Android
</Badge>
@@ -625,7 +625,7 @@ export default async function Page() {
<div className="mx-auto max-w-5xl">
<AnimateOnScroll>
<div className="text-center mb-8 md:mb-12">
<Badge variant="primary" className="mb-4">
<Badge variant="default" className="mb-4">
Stack técnica
</Badge>
<h2 className="text-2xl sm:text-3xl md:text-4xl font-bold tracking-tight mb-3 md:mb-4">
@@ -748,7 +748,7 @@ export default async function Page() {
<div className="mx-auto max-w-3xl">
<AnimateOnScroll>
<div className="text-center mb-8 md:mb-12">
<Badge variant="primary" className="mb-4">
<Badge variant="default" className="mb-4">
Como usar
</Badge>
<h2 className="text-2xl sm:text-3xl md:text-4xl font-bold tracking-tight mb-3 md:mb-4">

5
src/db/schema.ts
View File

@@ -1,5 +1,6 @@
import { relations, sql } from "drizzle-orm";
import {
type AnyPgColumn,
boolean,
date,
index,
@@ -536,7 +537,7 @@ export const installmentAnticipations = pgTable(
.default("0"),
transactionId: uuid("lancamento_id")
.notNull()
.references(() => transactions.id, { onDelete: "cascade" }),
.references((): AnyPgColumn => transactions.id, { onDelete: "cascade" }),
payerId: uuid("pagador_id").references(() => payers.id, {
onDelete: "cascade",
}),
@@ -585,7 +586,7 @@ export const transactions = pgTable(
isDivided: boolean("dividido").default(false),
isAnticipated: boolean("antecipado").default(false),
anticipationId: uuid("antecipacao_id").references(
() => installmentAnticipations.id,
(): AnyPgColumn => installmentAnticipations.id,
{ onDelete: "set null" },
),
createdAt: timestamp("created_at", {

2
src/features/dashboard/components/category-history-widget.tsx
View File

@@ -387,7 +387,7 @@ export function CategoryHistoryWidget({ data }: CategoryHistoryWidgetProps) {
return (
<div
key={entry.dataKey}
key={String(entry.dataKey ?? entry.name)}
className="flex items-center justify-between gap-4"
>
<div className="flex items-center gap-2">

2
src/features/dashboard/components/income-expense-balance-widget.tsx
View File

@@ -91,7 +91,7 @@ export function IncomeExpenseBalanceWidget({
return (
<div
key={entry.dataKey}
key={String(entry.dataKey ?? entry.name)}
className="flex items-center gap-2"
>
<div

21
src/features/reports/components/category-report-chart.tsx
View File

@@ -6,7 +6,9 @@ import {
Area,
AreaChart,
CartesianGrid,
type TooltipProps,
type TooltipContentProps,
type TooltipPayloadEntry,
type TooltipValueType,
XAxis,
} from "recharts";
import type { CategoryChartData } from "@/features/reports/category-chart-queries";
@@ -35,12 +37,19 @@ import {
import { CATEGORY_COLORS } from "@/shared/utils/category-colors";
import { currencyFormatter } from "@/shared/utils/currency";
function AreaTooltip({ active, payload, label }: TooltipProps<number, string>) {
function AreaTooltip({
active,
payload,
label,
}: Partial<TooltipContentProps<TooltipValueType, string>>) {
if (!active || !payload?.length) return null;
const items = payload
.filter((entry) => Number(entry.value) > 0)
.sort((a, b) => Number(b.value) - Number(a.value));
.filter((entry: TooltipPayloadEntry) => Number(entry.value) > 0)
.sort(
(a: TooltipPayloadEntry, b: TooltipPayloadEntry) =>
Number(b.value) - Number(a.value),
);
if (items.length === 0) return null;
@@ -50,9 +59,9 @@ function AreaTooltip({ active, payload, label }: TooltipProps<number, string>) {
{label}
</p>
<div className="space-y-1.5">
{items.map((entry) => (
{items.map((entry: TooltipPayloadEntry) => (
<div
key={entry.dataKey}
key={String(entry.dataKey ?? entry.name)}
className="flex items-center justify-between gap-6"
>
<div className="flex min-w-0 items-center gap-1.5">

2
src/features/transactions/components/shared/anticipation-card.tsx
View File

@@ -34,7 +34,7 @@ export function AnticipationCard({
}: AnticipationCardProps) {
const [isPending, startTransition] = useTransition();
const isSettled = anticipation.transaction.isSettled === true;
const isSettled = anticipation.transaction?.isSettled === true;
const canCancel = !isSettled;
const formatDate = (date: Date) => {

29
src/shared/components/ui/chart.tsx
View File

@@ -1,6 +1,13 @@
"use client";
import * as React from "react";
import type {
LegendPayload as RechartsLegendPayload,
LegendProps as RechartsLegendProps,
TooltipContentProps as RechartsTooltipContentProps,
TooltipPayloadEntry,
TooltipValueType,
} from "recharts";
import * as RechartsPrimitive from "recharts";
import { cn } from "@/shared/utils/ui";
@@ -134,7 +141,7 @@ function ChartTooltipContent({
color,
nameKey,
labelKey,
}: React.ComponentProps<typeof RechartsPrimitive.Tooltip> &
}: Partial<RechartsTooltipContentProps<TooltipValueType, string | number>> &
React.ComponentProps<"div"> & {
hideLabel?: boolean;
hideIndicator?: boolean;
@@ -197,21 +204,21 @@ function ChartTooltipContent({
<div className="grid gap-1.5">
{payload
.filter((item) => item.type !== "none")
.map((item, index) => {
.map((item: TooltipPayloadEntry, index) => {
const key = `${nameKey || item.name || item.dataKey || "value"}`;
const itemConfig = getPayloadConfigFromPayload(config, item, key);
const indicatorColor = color || item.payload.fill || item.color;
return (
<div
key={item.dataKey}
key={String(item.dataKey ?? item.name ?? index)}
className={cn(
"[&>svg]:text-muted-foreground flex w-full flex-wrap items-stretch gap-2 [&>svg]:h-2.5 [&>svg]:w-2.5",
indicator === "dot" && "items-center",
)}
>
{formatter && item?.value !== undefined && item.name ? (
formatter(item.value, item.name, item, index, item.payload)
formatter(item.value, item.name, item, index, payload)
) : (
<>
{itemConfig?.icon ? (
@@ -250,7 +257,7 @@ function ChartTooltipContent({
{itemConfig?.label || item.name}
</span>
</div>
{item.value && (
{item.value !== undefined && item.value !== null && (
<span className="text-foreground font-mono font-medium tabular-nums">
{item.value.toLocaleString()}
</span>
@@ -274,12 +281,14 @@ function ChartLegendContent({
payload,
verticalAlign = "bottom",
nameKey,
}: React.ComponentProps<"div"> &
Pick<RechartsPrimitive.LegendProps, "payload" | "verticalAlign"> & {
}: React.ComponentProps<"div"> & {
payload?: ReadonlyArray<RechartsLegendPayload>;
verticalAlign?: RechartsLegendProps["verticalAlign"];
hideIcon?: boolean;
nameKey?: string;
}) {
const { config } = useChart();
type LegendPayloadEntry = RechartsLegendPayload;
if (!payload?.length) {
return null;
@@ -294,14 +303,14 @@ function ChartLegendContent({
)}
>
{payload
.filter((item) => item.type !== "none")
.map((item) => {
.filter((item: LegendPayloadEntry) => item.type !== "none")
.map((item: LegendPayloadEntry) => {
const key = `${nameKey || item.dataKey || "value"}`;
const itemConfig = getPayloadConfigFromPayload(config, item, key);
return (
<div
key={item.value}
key={String(item.dataKey ?? item.value)}
className={cn(
"[&>svg]:text-muted-foreground flex items-center gap-1.5 [&>svg]:h-3 [&>svg]:w-3",
)}

1
src/shared/components/ui/currency-input.tsx
View File

@@ -63,6 +63,7 @@ export interface CurrencyInputProps
> {
value: string;
onValueChange: (value: string) => void;
onChange?: React.ComponentProps<typeof Input>["onChange"];
}
export const CurrencyInput = React.forwardRef<

5
src/shared/components/ui/spinner.tsx
View File

@@ -1,7 +1,10 @@
import { RiLoader4Line } from "@remixicon/react";
import { cn } from "@/shared/utils/ui";
function Spinner({ className, ...props }: React.ComponentProps<"svg">) {
function Spinner({
className,
...props
}: React.ComponentProps<typeof RiLoader4Line>) {
return (
<RiLoader4Line
role="status"

2
src/shared/lib/installments/anticipation-types.ts
View File

@@ -26,7 +26,7 @@ export type EligibleInstallment = {
* Antecipação com dados completos
*/
export type InstallmentAnticipationWithRelations = InstallmentAnticipation & {
transaction: Transaction;
transaction: Transaction | null;
payer: Payer | null;
category: Category | null;
};