diff --git a/app/globals.css b/app/globals.css index a7134ac..115f310 100644 --- a/app/globals.css +++ b/app/globals.css @@ -5,6 +5,7 @@ @custom-variant dark (&:is(.dark *)); @theme inline { + --font-bokor: var(--font-bokor); --font-barlow: var(--font-barlow); --font-mono: var(--font-mono); --radius-sm: calc(var(--radius) - 4px); diff --git a/app/layout.tsx b/app/layout.tsx index e93b425..06d0560 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,8 +1,8 @@ -import { ThemeProvider } from "@/providers/theme-provider"; import { Provider } from "jotai"; +import { ThemeProvider } from "@/providers/theme-provider"; import type { Metadata } from "next"; -import { Barlow } from "next/font/google"; +import { Barlow, Bokor } from "next/font/google"; import NextTopLoader from "nextjs-toploader"; import { Toaster } from "sonner"; import "./globals.css"; @@ -16,6 +16,12 @@ const barlow = Barlow({ variable: "--font-barlow", }); +const bokor = Bokor({ + subsets: ["latin"], + weight: ["400"], + variable: "--font-bokor", +}); + export const metadata: Metadata = { title: "SAR Link Portal", description: "Sarlink Portal", @@ -29,7 +35,7 @@ export default async function RootLayout({ const session = await getServerSession(authOptions); return ( - + diff --git a/components/generic-filter.tsx b/components/generic-filter.tsx index 3b41f56..16132d2 100644 --- a/components/generic-filter.tsx +++ b/components/generic-filter.tsx @@ -244,11 +244,11 @@ export default function DynamicFilter< if (input.type === "checkbox-group") { (clearedInputState as FilterValues)[ input.name as TFilterKeys - ] = [] as any; - } else { + ] = [] as FilterValues[typeof input.name]; + } else if (input.type === "radio-group" || input.type === "string" || input.type === "number") { (clearedInputState as FilterValues)[ input.name as TFilterKeys - ] = "" as any; + ] = "" as FilterValues[typeof input.name]; } } setInputValues(clearedInputState as FilterValues); @@ -297,7 +297,7 @@ export default function DynamicFilter< // Dynamic `prettyPrintFilter` for badges const prettyPrintFilter = ( - key: TFilterKeys, + _key: TFilterKeys, value: string | string[], config: FilterInputConfig, ) => { @@ -342,7 +342,7 @@ export default function DynamicFilter<