-
-
- )
- }
-
- );
+ return category?.name ?? '-';
},
- size: 200,
},
{
accessorKey: 'note',
header: 'Note',
- size: 200,
},
{
id: 'actions',
diff --git a/src/app/payments/page.tsx b/src/app/payments/page.tsx
index e34a96a..38d123c 100644
--- a/src/app/payments/page.tsx
+++ b/src/app/payments/page.tsx
@@ -1,22 +1,17 @@
-import prisma from '@/prisma';
+import { getUser } from '@/auth';
+import { prismaClient } from '@/prisma';
import React from 'react';
import PaymentPageClientContent from '@/components/paymentPageClientComponents';
import paymentCreateUpdate from '@/lib/actions/paymentCreateUpdate';
import paymentDelete from '@/lib/actions/paymentDelete';
-import { auth0 } from '@/lib/auth';
-import { redirect } from 'next/navigation';
export default async function PaymentsPage() {
- const session = await auth0.getSession();
- if (!session) {
- return redirect('/auth/login');
- }
- const user = session.user;
+ const user = await getUser();
- const payments = await prisma.payment.findMany({
+ const payments = await prismaClient.payment.findMany({
where: {
- userId: user.sub,
+ userId: user?.id,
},
orderBy: [
{
@@ -28,9 +23,9 @@ export default async function PaymentsPage() {
],
});
- const entities = await prisma.entity.findMany({
+ const entities = await prismaClient.entity.findMany({
where: {
- userId: user.sub,
+ userId: user?.id,
},
orderBy: [
{
@@ -42,9 +37,9 @@ export default async function PaymentsPage() {
],
});
- const categories = await prisma.category.findMany({
+ const categories = await prismaClient.category.findMany({
where: {
- userId: user.sub,
+ userId: user?.id,
},
orderBy: [
{
@@ -63,6 +58,6 @@ export default async function PaymentsPage() {
categories={categories}
onSubmit={paymentCreateUpdate}
onDelete={paymentDelete}
- className="flex flex-col justify-center space-y-4"/>
+ className="flex flex-col justify-center space-y-4 p-10"/>
);
}
diff --git a/src/app/service-worker.ts b/src/app/service-worker.ts
deleted file mode 100644
index 82b4457..0000000
--- a/src/app/service-worker.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import type { PrecacheEntry } from '@serwist/precaching';
-import { defaultCache } from '@serwist/next/worker';
-import { Serwist, SerwistGlobalConfig } from 'serwist';
-
-declare const self: ServiceWorkerGlobalScope & {
- __SW_MANIFEST: (PrecacheEntry | string)[] | undefined;
-};
-
-declare global {
- interface WorkerGlobalScope extends SerwistGlobalConfig {
- // Change this attribute's name to your \`injectionPoint\`.
- // \`injectionPoint\` is an InjectManifest option.
- // See https://serwist.pages.dev/docs/build/configuring
- __SW_MANIFEST: (PrecacheEntry | string)[] | undefined;
- }
-}
-
-const serwist = new Serwist({
- // A list of URLs that should be cached. Usually, you don't generate
- // this list yourself; rather, you'd rely on a Serwist build tool/your framework
- // to do it for you. In this example, it is generated by \`@serwist/vite\`.
- precacheEntries: self.__SW_MANIFEST,
- // Options to customize how Serwist precaches the URLs.
- precacheOptions: {
- // Whether outdated caches should be removed.
- cleanupOutdatedCaches: true,
- concurrency: 10,
- ignoreURLParametersMatching: [],
- },
- // Whether the service worker should skip waiting and become the active one.
- skipWaiting: true,
- // Whether the service worker should claim any currently available clients.
- clientsClaim: true,
- // Whether navigation preloading should be used.
- navigationPreload: true,
- // Whether Serwist should log in development mode.
- disableDevLogs: true,
- // A list of runtime caching entries. When a request is made and its URL match
- // any of the entries, the response to it will be cached according to the matching
- // entry's \`handler\`. This does not apply to precached URLs.
- runtimeCaching: defaultCache,
- // Other options...
- // See https://serwist.pages.dev/docs/serwist/core/serwist
-});
-
-serwist.addEventListeners();
diff --git a/src/auth.ts b/src/auth.ts
new file mode 100644
index 0000000..26cdb6c
--- /dev/null
+++ b/src/auth.ts
@@ -0,0 +1,67 @@
+import { Lucia } from 'lucia';
+import { PrismaAdapter } from '@lucia-auth/adapter-prisma';
+import { cookies } from 'next/headers';
+import { prismaClient } from '@/prisma';
+
+const adapter = new PrismaAdapter(prismaClient.session, prismaClient.user);
+
+export const lucia = new Lucia(adapter, {
+ sessionCookie: {
+ expires: false,
+ attributes: {
+ sameSite: 'strict',
+ domain: process.env.NODE_ENV === 'production' ? process.env.COOKIE_DOMAIN : undefined,
+ secure: process.env.NODE_ENV === 'production',
+ },
+ },
+ getUserAttributes: (attributes) => {
+ return {
+ username: attributes.username,
+ };
+ },
+});
+
+declare module 'lucia' {
+ interface Register {
+ Lucia: typeof lucia;
+ DatabaseUserAttributes: DatabaseUserAttributes;
+ }
+}
+
+interface DatabaseUserAttributes {
+ username: string;
+}
+
+export function getSessionId() {
+ return cookies().get(lucia.sessionCookieName)?.value ?? null;
+}
+
+export async function getSession() {
+ const sessionId = getSessionId();
+ if (!sessionId) {
+ return null;
+ }
+ const {session} = await lucia.validateSession(sessionId);
+ return session;
+}
+
+export async function getUser() {
+ const sessionId = getSessionId();
+ if (!sessionId) {
+ return null;
+ }
+ const {user, session} = await lucia.validateSession(sessionId);
+ try {
+ if (session && session.fresh) {
+ const sessionCookie = lucia.createSessionCookie(session.id);
+ cookies().set(sessionCookie.name, sessionCookie.value, sessionCookie.attributes);
+ }
+ if (!session) {
+ const sessionCookie = lucia.createBlankSessionCookie();
+ cookies().set(sessionCookie.name, sessionCookie.value, sessionCookie.attributes);
+ }
+ } catch {
+ // Next.js throws error when attempting to set cookies when rendering page
+ }
+ return user;
+}
diff --git a/src/components/categoryPageClientComponents.tsx b/src/components/categoryPageClientComponents.tsx
index f59b3f0..ac8b908 100644
--- a/src/components/categoryPageClientComponents.tsx
+++ b/src/components/categoryPageClientComponents.tsx
@@ -23,8 +23,6 @@ import {
} from '@/components/ui/alert-dialog';
import { categoryFormSchema } from '@/lib/form-schemas/categoryFormSchema';
import CategoryForm from '@/components/form/categoryForm';
-import { useMediaQuery } from '@/lib/hooks/useMediaQuery';
-import { Drawer, DrawerContent, DrawerHeader, DrawerTitle, DrawerTrigger } from '@/components/ui/drawer';
export default function CategoryPageClientContent({categories, onSubmit, onDelete, className}: {
categories: Category[],
@@ -33,7 +31,6 @@ export default function CategoryPageClientContent({categories, onSubmit, onDelet
className: string,
}) {
- const isDesktop = useMediaQuery('(min-width: 768px)');
const router = useRouter();
const [isEditDialogOpen, setIsEditDialogOpen] = useState(false);
@@ -100,51 +97,26 @@ export default function CategoryPageClientContent({categories, onSubmit, onDelet
{category?.name ?? '-'}
-Categories
{/* Edit dialog */} - { - isDesktop ? ( - - ) : ( -
- }) {
+
+ const router = useRouter();
+
+ const handleSubmit = async () => {
+ const response = await onSubmit();
+ toast(sonnerContent(response));
+ router.refresh();
+ };
+
+ return (
+
+ );
+}
diff --git a/src/components/form/paymentForm.tsx b/src/components/form/paymentForm.tsx
index c4f968f..d6323dd 100644
--- a/src/components/form/paymentForm.tsx
+++ b/src/components/form/paymentForm.tsx
@@ -5,7 +5,7 @@ import { useForm } from 'react-hook-form';
import { z } from 'zod';
import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form';
import { Input } from '@/components/ui/input';
-import React, { useRef } from 'react';
+import React, { useState } from 'react';
import { Button } from '@/components/ui/button';
import { ActionResponse } from '@/lib/types/actionResponse';
import { useRouter } from 'next/navigation';
@@ -16,11 +16,11 @@ import { paymentFormSchema } from '@/lib/form-schemas/paymentFormSchema';
import CurrencyInput from '@/components/ui/currency-input';
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
import { cn } from '@/lib/utils';
-import { CalendarIcon } from 'lucide-react';
+import { CalendarIcon, Check, ChevronsUpDown } from 'lucide-react';
import { format } from 'date-fns';
import { Calendar } from '@/components/ui/calendar';
+import { ScrollArea, ScrollBar } from '@/components/ui/scroll-area';
import { Textarea } from '@/components/ui/textarea';
-import { AutoCompleteInput } from '@/components/ui/auto-complete-input';
export default function PaymentForm({value, entities, categories, onSubmit, className}: {
value: Payment | undefined,
@@ -32,6 +32,12 @@ export default function PaymentForm({value, entities, categories, onSubmit, clas
const router = useRouter();
+ const [filter, setFilter] = useState('');
+
+ const [payorOpen, setPayorOpen] = useState(false);
+ const [payeeOpen, setPayeeOpen] = useState(false);
+ const [categoryOpen, setCategoryOpen] = useState(false);
+
const form = useForm>({
resolver: zodResolver(paymentFormSchema),
defaultValues: {
@@ -67,10 +73,6 @@ export default function PaymentForm({value, entities, categories, onSubmit, clas
};
}) ?? [];
- const payeeRef = useRef({} as HTMLInputElement);
- const categoryRef = useRef({} as HTMLInputElement);
- const submitRef = useRef({} as HTMLButtonElement);
-
return (
);
diff --git a/src/components/form/serverActionTrigger.tsx b/src/components/form/serverActionTrigger.tsx
deleted file mode 100644
index 7f21415..0000000
--- a/src/components/form/serverActionTrigger.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-'use client';
-
-import { Button, buttonVariants } from '@/components/ui/button';
-import React from 'react';
-import { Slot } from '@radix-ui/react-slot';
-import { cn } from '@/lib/utils';
-import { useRouter } from 'next/navigation';
-import { toast } from 'sonner';
-import { sonnerContent } from '@/components/ui/sonner';
-import type { VariantProps } from 'class-variance-authority';
-import { ActionResponse } from '@/lib/types/actionResponse';
-import {
- AlertDialog,
- AlertDialogAction,
- AlertDialogCancel,
- AlertDialogContent,
- AlertDialogDescription,
- AlertDialogFooter,
- AlertDialogHeader,
- AlertDialogTitle,
- AlertDialogTrigger,
-} from '@/components/ui/alert-dialog';
-
-export interface ConfirmationDialogProps {
- title: string;
- description?: string;
- actionText?: string;
- actionVariant?: 'default' | 'destructive' | 'outline' | 'secondary' | 'ghost' | 'link';
-}
-
-export interface ButtonWithActionProps
- extends React.ButtonHTMLAttributes,
- VariantProps {
- asChild?: boolean;
- dialog?: ConfirmationDialogProps;
- action: () => Promise>;
- callback?: (data: T) => void;
-}
-
-const ServerActionTrigger = React.forwardRef(
- ({className, variant, size, asChild = false, ...props}, ref) => {
-
- const router = useRouter();
-
- const Comp = asChild ? Slot : 'button';
-
- const handleSubmit = async () => {
- const response = await props.action();
- toast(sonnerContent(response));
- if (props.callback) {
- props.callback(response);
- }
- if (response.redirect) {
- router.push(response.redirect);
- }
- };
-
- return props.dialog ? (
-
-
-
-
-
- {props.dialog.title}
- {props.dialog?.description && (
-
- {props.dialog.description}
-
- )}
-
-
-
- Cancel
-
-
-
-
-
- ) : (
- ) => Promise
+}) {
+
+ const router = useRouter();
+
+ const form = useForm>({
+ resolver: zodResolver(signInFormSchema),
+ defaultValues: {
+ username: '',
+ password: '',
+ },
+ });
+
+ const handleSubmit = async (data: z.infer) => {
+ const response = await onSubmit(data);
+ toast(sonnerContent(response));
+ if (response.redirect) {
+ router.push(response.redirect);
+ }
+ };
+
+ return (
+
+
+ );
+}
diff --git a/src/components/form/signOutForm.tsx b/src/components/form/signOutForm.tsx
new file mode 100644
index 0000000..9dd51fe
--- /dev/null
+++ b/src/components/form/signOutForm.tsx
@@ -0,0 +1,25 @@
+'use client';
+
+import { ActionResponse } from '@/lib/types/actionResponse';
+import { Button } from '@/components/ui/button';
+import React from 'react';
+import { useRouter } from 'next/navigation';
+import { toast } from 'sonner';
+import { sonnerContent } from '@/components/ui/sonner';
+
+export default function SignOutForm({onSubmit}: { onSubmit: () => Promise }) {
+
+ const router = useRouter();
+
+ const handleSignOut = async () => {
+ const response = await onSubmit();
+ toast(sonnerContent(response));
+ if (response.redirect) {
+ router.push(response.redirect);
+ }
+ };
+
+ return (
+
+ );
+}
diff --git a/src/components/form/signUpForm.tsx b/src/components/form/signUpForm.tsx
new file mode 100644
index 0000000..2898733
--- /dev/null
+++ b/src/components/form/signUpForm.tsx
@@ -0,0 +1,84 @@
+'use client';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useForm } from 'react-hook-form';
+import { z } from 'zod';
+import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form';
+import { Input } from '@/components/ui/input';
+import React from 'react';
+import { Button } from '@/components/ui/button';
+import { signUpFormSchema } from '@/lib/form-schemas/signUpFormSchema';
+import { ActionResponse } from '@/lib/types/actionResponse';
+import { useRouter } from 'next/navigation';
+import { toast } from 'sonner';
+import { sonnerContent } from '@/components/ui/sonner';
+
+export default function SignUpForm({onSubmit}: {
+ onSubmit: (data: z.infer) => Promise
+}) {
+
+ const router = useRouter();
+
+ const form = useForm>({
+ resolver: zodResolver(signUpFormSchema),
+ defaultValues: {
+ username: '',
+ password: '',
+ },
+ });
+
+ const handleSubmit = async (data: z.infer) => {
+ const response = await onSubmit(data);
+ toast(sonnerContent(response));
+ if (response.redirect) {
+ router.push(response.redirect);
+ }
+ };
+
+ return (
+
+
+ );
+}
diff --git a/src/components/navigation.tsx b/src/components/navigation.tsx
index 660654b..e6c9648 100644
--- a/src/components/navigation.tsx
+++ b/src/components/navigation.tsx
@@ -2,125 +2,65 @@
import {
NavigationMenu,
- navigationMenuIconTriggerStyle,
NavigationMenuItem,
NavigationMenuLink,
NavigationMenuList,
navigationMenuTriggerStyle,
} from '@/components/ui/navigation-menu';
-import React, { useState } from 'react';
+import React from 'react';
import Link from 'next/link';
-import { Banknote, Home, Menu, Tag, User, UserSearch } from 'lucide-react';
-import { Drawer, DrawerContent, DrawerTrigger } from '@/components/ui/drawer';
-import { Button } from '@/components/ui/button';
+import { User } from 'lucide-react';
export default function Navigation() {
- const [open, setOpen] = useState(false);
-
return (
-
-
-
-
-
- {selectedPayment?.id ? 'Update Payment' : 'Create Payment'}
-
-
-
- )
- }
+
{/* Data Table */}
diff --git a/src/components/ui/auto-complete-input.tsx b/src/components/ui/auto-complete-input.tsx
deleted file mode 100644
index 971b41a..0000000
--- a/src/components/ui/auto-complete-input.tsx
+++ /dev/null
@@ -1,129 +0,0 @@
-'use client';
-
-import * as React from 'react';
-import { useEffect, useState } from 'react';
-import { cn } from '@/lib/utils';
-import { X } from 'lucide-react';
-import { Button } from '@/components/ui/button';
-
-export interface AutoCompleteInputProps
- extends React.InputHTMLAttributes {
- items: { label: string, value: any }[];
-}
-
-const AutoCompleteInput = React.forwardRef(
- ({className, type, ...props}, ref) => {
-
- const [value, setValue] = useState(getNameOfPropValue());
- const [open, setOpen] = useState(false);
- const [lastKey, setLastKey] = useState('');
- const [filteredItems, setFilteredItems] = useState(props.items);
-
- function getNameOfPropValue() {
-
- if (!props.items) {
- return '';
- }
-
- const item = props.items?.find(item => item.value === props.value);
- return item?.label || '';
- }
-
- function handleChange(e: React.ChangeEvent) {
-
- const value = e.target.value;
-
- setFilteredItems(props?.items?.filter((item) => {
- return item.label.toLowerCase().includes(value.toLowerCase());
- }));
-
- setValue(value);
- setOpen(value.length > 0);
-
- // on typing only the internal state is changed while the form state is
- // set to undefined. This way only the predefined items are actual values
- // for the form validation
- props.onChange?.(undefined as any);
- }
-
- // since typing changes the internal values and therefor the selected value, this effect
- // handles every filteredItems change to check if only one item is left
- useEffect(() => {
- // only one item is left and the last character was a letter or digit.
- // the last condition has to be checked to make it possible to use the backspace
- if (filteredItems.length === 1 && /^[a-zA-Z0-9]$/.test(lastKey)) {
- setValue(filteredItems[0].label);
- setOpen(false);
- props.onChange?.({target: {value: filteredItems[0].value}} as any);
- }
- }, [filteredItems]);
-
- useEffect(() => {
- if (props.value) {
- setValue(getNameOfPropValue());
- } else {
- setValue('');
- }
- }, [props.value]);
-
- return (
- (
- ({ className, variant, size, asChild = false, ...props }, ref) => {
+ ({className, variant, size, asChild = false, ...props}, ref) => {
const Comp = asChild ? Slot : 'button';
return (
function Calendar({
- className,
- classNames,
- showOutsideDays = true,
- ...props
- }: CalendarProps) {
+ className,
+ classNames,
+ showOutsideDays = true,
+ ...props
+}: CalendarProps) {
return (
(
- {
columns: ColumnDef[];
@@ -21,7 +20,6 @@ export function DataTable({
pagination,
className,
}: DataTableProps) {
-
const table = useReactTable({
data,
columns,
@@ -29,13 +27,6 @@ export function DataTable({
getPaginationRowModel: pagination ? getPaginationRowModel() : undefined,
});
- const [pageSize, setPageSize] = useState(50);
- useEffect(() => {
- if (pagination) {
- table.setPageSize(pageSize);
- }
- }, [table, pagination, pageSize]);
-
return (
+
) => Promise,
onDelete: (id: number) => Promise,
className: string,
}) {
- const isDesktop = useMediaQuery('(min-width: 768px)');
const router = useRouter();
const [isEditDialogOpen, setIsEditDialogOpen] = useState(false);
@@ -129,53 +125,26 @@ export default function EntityPageClientContent({entities, categories, onSubmit,
-
-
-
-
-
- {selectedEntity?.id ? 'Update Entity' : 'Create Entity'}
-
-
-
- )
- }
+
{/* Filter input */}
@@ -187,7 +156,7 @@ export default function EntityPageClientContent({entities, categories, onSubmit,
{/* Data Table */}
) => Promise
className?: string
}) {
@@ -31,7 +29,6 @@ export default function EntityForm({value, categories, onSubmit, className}: {
id: value?.id ?? undefined,
name: value?.name ?? '',
type: value?.type ?? EntityType.Entity,
- defaultCategoryId: value?.defaultCategoryId ?? undefined,
},
});
@@ -43,13 +40,6 @@ export default function EntityForm({value, categories, onSubmit, className}: {
}
};
- const categoriesMapped = categories?.map((category) => {
- return {
- label: category.name,
- value: category.id,
- };
- }) ?? [];
-
return (
diff --git a/src/components/form/generateSampleDataForm.tsx b/src/components/form/generateSampleDataForm.tsx
new file mode 100644
index 0000000..c8677be
--- /dev/null
+++ b/src/components/form/generateSampleDataForm.tsx
@@ -0,0 +1,23 @@
+'use client';
+
+import { Button } from '@/components/ui/button';
+import React from 'react';
+import { useRouter } from 'next/navigation';
+import { toast } from 'sonner';
+import { sonnerContent } from '@/components/ui/sonner';
+import { ActionResponse } from '@/lib/types/actionResponse';
+
+export default function GenerateSampleDataForm({onSubmit}: { onSubmit: () => PromiseDashboard
diff --git a/src/components/entityPageClientComponents.tsx b/src/components/entityPageClientComponents.tsx index f3f3085..4f4a8bd 100644 --- a/src/components/entityPageClientComponents.tsx +++ b/src/components/entityPageClientComponents.tsx @@ -1,6 +1,6 @@ 'use client'; -import { Category, Entity } from '@prisma/client'; +import { Entity } from '@prisma/client'; import React, { useState } from 'react'; import { CellContext } from '@tanstack/table-core'; import { Button } from '@/components/ui/button'; @@ -24,18 +24,14 @@ import { AlertDialogFooter, AlertDialogHeader, } from '@/components/ui/alert-dialog'; -import { useMediaQuery } from '@/lib/hooks/useMediaQuery'; -import { Drawer, DrawerContent, DrawerHeader, DrawerTitle, DrawerTrigger } from '@/components/ui/drawer'; -export default function EntityPageClientContent({entities, categories, onSubmit, onDelete, className}: { +export default function EntityPageClientContent({entities, onSubmit, onDelete, className}: { entities: Entity[], - categories: Category[], onSubmit: (data: z.inferEntities
{/* Edit dialog */} - { - isDesktop ? ( - - ) : ( -
-
+
+
+ Account
+
+
+
+
+
);
}
diff --git a/src/components/paymentPageClientComponents.tsx b/src/components/paymentPageClientComponents.tsx
index 60a21fd..22fa031 100644
--- a/src/components/paymentPageClientComponents.tsx
+++ b/src/components/paymentPageClientComponents.tsx
@@ -23,8 +23,6 @@ import { paymentFormSchema } from '@/lib/form-schemas/paymentFormSchema';
import { Category, Entity, Payment } from '@prisma/client';
import PaymentForm from '@/components/form/paymentForm';
import { columns } from '@/app/payments/columns';
-import { Drawer, DrawerContent, DrawerHeader, DrawerTitle, DrawerTrigger } from '@/components/ui/drawer';
-import { useMediaQuery } from '@/lib/hooks/useMediaQuery';
export default function PaymentPageClientContent({
payments,
@@ -42,7 +40,6 @@ export default function PaymentPageClientContent({
className: string,
}) {
- const isDesktop = useMediaQuery('(min-width: 768px)');
const router = useRouter();
const [isEditDialogOpen, setIsEditDialogOpen] = useState(false);
@@ -103,61 +100,48 @@ export default function PaymentPageClientContent({
);
};
+ const entitiesMapped = entities?.map((entity) => {
+ return {
+ label: entity.name,
+ value: entity.id,
+ };
+ }) ?? [];
+
+ const categoriesMapped = categories?.map((category) => {
+ return {
+ label: category.name,
+ value: category.id,
+ };
+ }) ?? [];
+
return (
- setOpen(open)}>
-
-
-
-
-
-
-
-
- setOpen(false)}
- passHref>
-
-
-
-
-
+
+
+ Payments
+
+
+
+
+
+
+ Entities
+
+
+
+
+
+
+ Categories
+
+
+
+
+
+
+
+
+ 
-
+
- Account
-
-
-
-
+
- 
-
-
-
-
- Dashboard
-
-
-
-
-
-
- Payments
-
-
-
-
-
-
- Entities
-
-
-
-
-
-
- Categories
-
-
-
-
+
-
-
Payments
{/* Edit dialog */} - { - isDesktop ? ( - - ) : ( -
- {
- if (e.metaKey || e.ctrlKey || e.altKey) {
- props.onKeyDown?.(e);
- return;
- }
- setLastKey(e.key);
- props.onKeyDown?.(e);
- }}
- />
- {
- value.length > 0 && (
-
- )
- }
- {
- open && (
-
- );
- },
-);
-AutoCompleteInput.displayName = 'Input';
-
-export { AutoCompleteInput };
diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx
index 48a63a3..6170dc8 100644
--- a/src/components/ui/button.tsx
+++ b/src/components/ui/button.tsx
@@ -5,7 +5,7 @@ import { cva, type VariantProps } from 'class-variance-authority';
import { cn } from '@/lib/utils';
const buttonVariants = cva(
- 'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
+ 'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
{
variants: {
variant: {
@@ -40,11 +40,11 @@ export interface ButtonProps
}
const Button = React.forwardRef
- {filteredItems?.map((item) =>
-
- )
- }
- {
- props.onChange?.({target: {value: item.value}} as any);
- setValue(item.label);
- setOpen(false);
- }}
- key={item.value}>
- {item.label}
-
,
- )}
-
@@ -45,8 +36,7 @@ export function DataTable({
{headerGroup.headers.map((header) => {
return (
-
+
{header.isPlaceholder
? null
: flexRender(
@@ -67,8 +57,7 @@ export function DataTable({
data-state={row.getIsSelected() && 'selected'}
>
{row.getVisibleCells().map((cell) => (
-
+
{flexRender(cell.column.columnDef.cell, cell.getContext())}
))}
@@ -86,62 +75,43 @@ export function DataTable({
{
pagination && (
-
-