Gladyson/openmonetis
1
0
Fork 0
forked from git.gladyson/openmonetis
Code Pull Requests Activity

refactor: Relocate PrivacyProvider to the dashboard layout and update tsconfig jsx compiler option.

Browse Source
This commit is contained in:
Felipe Coutinho
2025-11-21 09:40:41 -03:00
parent 3d8772e55f
commit 4d076772e6
3 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
app/(dashboard)/layout.tsx
View File

@@ -1,3 +1,4 @@
import { PrivacyProvider } from "@/components/privacy-provider";
import { SiteHeader } from "@/components/header-dashboard"; import { SiteHeader } from "@/components/header-dashboard";
import { AppSidebar } from "@/components/sidebar/app-sidebar"; import { AppSidebar } from "@/components/sidebar/app-sidebar";
import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar"; import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar";
@@ -7,7 +8,7 @@ import { fetchPagadoresWithAccess } from "@/lib/pagadores/access";
import { PAGADOR_ROLE_ADMIN } from "@/lib/pagadores/constants"; import { PAGADOR_ROLE_ADMIN } from "@/lib/pagadores/constants";
import { parsePeriodParam } from "@/lib/utils/period"; import { parsePeriodParam } from "@/lib/utils/period";
export default async function layout({ export default async function DashboardLayout({
children, children,
searchParams, searchParams,
}: Readonly<{ }: Readonly<{
@@ -40,28 +41,30 @@ export default async function layout({
); );
return ( return (
<SidebarProvider> <PrivacyProvider>
<AppSidebar <SidebarProvider>
user={{ ...session.user, image: session.user.image ?? null }} <AppSidebar
pagadorAvatarUrl={adminPagador?.avatarUrl ?? null} user={{ ...session.user, image: session.user.image ?? null }}
pagadores={pagadoresList.map((item) => ({ pagadorAvatarUrl={adminPagador?.avatarUrl ?? null}
id: item.id, pagadores={pagadoresList.map((item) => ({
name: item.name, id: item.id,
avatarUrl: item.avatarUrl, name: item.name,
canEdit: item.canEdit, avatarUrl: item.avatarUrl,
}))} canEdit: item.canEdit,
variant="inset" }))}
/> variant="inset"
<SidebarInset> />
<SiteHeader notificationsSnapshot={notificationsSnapshot} /> <SidebarInset>
<div className="flex flex-1 flex-col"> <SiteHeader notificationsSnapshot={notificationsSnapshot} />
<div className="@container/main flex flex-1 flex-col gap-2"> <div className="flex flex-1 flex-col">
<div className="flex flex-col gap-4 py-4 md:gap-6 md:py-6"> <div className="@container/main flex flex-1 flex-col gap-2">
{children} <div className="flex flex-col gap-4 py-4 md:gap-6 md:py-6">
{children}
</div>
</div> </div>
</div> </div>
</div> </SidebarInset>
</SidebarInset> </SidebarProvider>
</SidebarProvider> </PrivacyProvider>
); );
} }

7
app/layout.tsx
View File

@@ -1,4 +1,3 @@
import { PrivacyProvider } from "@/components/privacy-provider";
import { ThemeProvider } from "@/components/theme-provider"; import { ThemeProvider } from "@/components/theme-provider";
import { Toaster } from "@/components/ui/sonner"; import { Toaster } from "@/components/ui/sonner";
import { main_font } from "@/public/fonts/font_index"; import { main_font } from "@/public/fonts/font_index";
@@ -23,10 +22,8 @@ export default function RootLayout({
suppressHydrationWarning suppressHydrationWarning
> >
<ThemeProvider attribute="class" defaultTheme="light"> <ThemeProvider attribute="class" defaultTheme="light">
<PrivacyProvider> {children}
{children} <Toaster position="top-right" />
<Toaster position="top-right" />
</PrivacyProvider>
</ThemeProvider> </ThemeProvider>
<Analytics /> <Analytics />
</body> </body>

16
tsconfig.json
View File

@@ -1,7 +1,11 @@
{ {
"compilerOptions": { "compilerOptions": {
"target": "ES2017", "target": "ES2017",
"lib": ["dom", "dom.iterable", "esnext"], "lib": [
"dom",
"dom.iterable",
"esnext"
],
"allowJs": true, "allowJs": true,
"skipLibCheck": true, "skipLibCheck": true,
"strict": true, "strict": true,
@@ -11,7 +15,7 @@
"moduleResolution": "bundler", "moduleResolution": "bundler",
"resolveJsonModule": true, "resolveJsonModule": true,
"isolatedModules": true, "isolatedModules": true,
"jsx": "preserve", "jsx": "react-jsx",
"incremental": true, "incremental": true,
"plugins": [ "plugins": [
{ {
@@ -19,7 +23,9 @@
} }
], ],
"paths": { "paths": {
"@/*": ["./*"] "@/*": [
"./*"
]
} }
}, },
"include": [ "include": [
@@ -29,5 +35,7 @@
".next/types/**/*.ts", ".next/types/**/*.ts",
".next/dev/types/**/*.ts" ".next/dev/types/**/*.ts"
], ],
"exclude": ["node_modules"] "exclude": [
"node_modules"
]
} }