I think monorepo is fairly correct now but I don't know for sure

2026-01-11 13:56:30 -05:00
parent 67daefb919
commit 674b224467
38 changed files with 485 additions and 412 deletions
--- a/packages/backend/convex/auth.config.ts
+++ b/packages/backend/convex/auth.config.ts
@@ -1,7 +1,7 @@
 export default {
  providers: [
    {
-      domain: process.env.CLERK_ISSUER_URL,
+      domain: process.env.CONVEX_SITE_URL,
      applicationID: 'convex',
    },
  ],
--- a/packages/backend/convex/auth.ts
+++ b/packages/backend/convex/auth.ts
@@ -0,0 +1,114 @@
+import Authentik from '@auth/core/providers/authentik';
+import {
+  convexAuth,
+  getAuthUserId,
+  modifyAccountCredentials,
+  retrieveAccount,
+} from '@convex-dev/auth/server';
+import { ConvexError, v } from 'convex/values';
+
+import type { Doc, Id } from './_generated/dataModel';
+import type { MutationCtx, QueryCtx } from './_generated/server';
+import { api } from './_generated/api';
+import { action, mutation, query } from './_generated/server';
+import { Password, validatePassword } from './custom/auth';
+
+export const { auth, signIn, signOut, store, isAuthenticated } = convexAuth({
+  providers: [Authentik({ allowDangerousEmailAccountLinking: true }), Password],
+});
+
+const getUserById = async (
+  ctx: QueryCtx,
+  userId: Id<'users'>,
+): Promise<Doc<'users'>> => {
+  const user = await ctx.db.get(userId);
+  if (!user) throw new ConvexError('User not found.');
+  return user;
+};
+const isSignedIn = async (ctx: QueryCtx): Promise<Doc<'users'> | null> => {
+  const userId = await getAuthUserId(ctx);
+  if (!userId) return null;
+  const user = await ctx.db.get(userId);
+  if (!user) return null;
+  return user;
+};
+
+export const getUser = query({
+  args: { userId: v.optional(v.id('users')) },
+  handler: async (ctx, args) => {
+    const user = await isSignedIn(ctx);
+    const userId = args.userId ?? user?._id;
+    if (!userId) throw new ConvexError('Not authenticated or no ID provided.');
+    return getUserById(ctx, userId);
+  },
+});
+
+export const getAllUsers = query(async (ctx) => {
+  const users = await ctx.db.query('users').collect();
+  return users ?? null;
+});
+
+export const getAllUserIds = query(async (ctx) => {
+  const users = await ctx.db.query('users').collect();
+  return users.map((u) => u._id);
+});
+
+export const updateUser = mutation({
+  args: {
+    name: v.optional(v.string()),
+    email: v.optional(v.string()),
+    image: v.optional(v.id('_storage')),
+  },
+  handler: async (ctx, args) => {
+    const userId = await getAuthUserId(ctx);
+    if (!userId) throw new ConvexError('Not authenticated.');
+    const user = await ctx.db.get(userId);
+    if (!user) throw new ConvexError('User not found.');
+    const patch: Partial<{
+      name: string;
+      email: string;
+      image: Id<'_storage'>;
+    }> = {};
+    if (args.name !== undefined) patch.name = args.name;
+    if (args.email !== undefined) patch.email = args.email;
+    if (args.image !== undefined) {
+      const oldImage = user.image as Id<'_storage'> | undefined;
+      patch.image = args.image;
+      if (oldImage && oldImage !== args.image) {
+        await ctx.storage.delete(oldImage);
+      }
+    }
+    if (Object.keys(patch).length > 0) {
+      await ctx.db.patch(userId, patch);
+    }
+    return { success: true };
+  },
+});
+
+export const updateUserPassword = action({
+  args: {
+    currentPassword: v.string(),
+    newPassword: v.string(),
+  },
+  handler: async (ctx, { currentPassword, newPassword }) => {
+    const userId = await getAuthUserId(ctx);
+    if (!userId) throw new ConvexError('Not authenticated.');
+    const user = await ctx.runQuery(api.auth.getUser, { userId });
+    if (!user?.email) throw new ConvexError('User not found.');
+    const verified = await retrieveAccount(ctx, {
+      provider: 'password',
+      account: { id: user.email, secret: currentPassword },
+    });
+    if (!verified) throw new ConvexError('Current password is incorrect.');
+
+    if (!validatePassword(newPassword))
+      throw new ConvexError('Invalid password.');
+
+    await modifyAccountCredentials(ctx, {
+      provider: 'password',
+      account: { id: user.email, secret: newPassword },
+    });
+
+    return { success: true };
+  },
+});
--- a/packages/backend/convex/custom/auth/index.ts
+++ b/packages/backend/convex/custom/auth/index.ts
@@ -0,0 +1,2 @@
+export { Password, validatePassword } from './providers/password';
+export { UseSendOTP, UseSendOTPPasswordReset } from './providers/usesend';
--- a/packages/backend/convex/custom/auth/providers/password.ts
+++ b/packages/backend/convex/custom/auth/providers/password.ts
@@ -0,0 +1,33 @@
+import { Password as DefaultPassword } from '@convex-dev/auth/providers/Password';
+import { ConvexError } from 'convex/values';
+import { UseSendOTP, UseSendOTPPasswordReset } from '..';
+import { DataModel } from '../../../_generated/dataModel';
+
+export const Password = DefaultPassword<DataModel>({
+  profile(params, ctx) {
+    return {
+      email: params.email as string,
+      name: params.name as string,
+    };
+  },
+  validatePasswordRequirements: (password: string) => {
+    if (!validatePassword(password)) {
+      throw new ConvexError('Invalid password.');
+    }
+  },
+  reset: UseSendOTPPasswordReset,
+  verify: UseSendOTP,
+});
+
+export const validatePassword = (password: string): boolean => {
+  if (
+    password.length < 8 ||
+    password.length > 100 ||
+    !/\d/.test(password) ||
+    !/[a-z]/.test(password) ||
+    !/[A-Z]/.test(password)
+  ) {
+    return false;
+  }
+  return true;
+};
--- a/packages/backend/convex/custom/auth/providers/usesend.ts
+++ b/packages/backend/convex/custom/auth/providers/usesend.ts
@@ -0,0 +1,90 @@
+import type { EmailConfig, EmailUserConfig } from '@auth/core/providers/email';
+import { generateRandomString, RandomReader } from '@oslojs/crypto/random';
+import { alphabet } from 'oslo/crypto';
+import { UseSend } from 'usesend-js';
+
+export default function UseSendProvider(config: EmailUserConfig): EmailConfig {
+  return {
+    id: 'usesend',
+    type: 'email',
+    name: 'UseSend',
+    from: 'TechTracker <admin@techtracker.gbrown.org>',
+    maxAge: 24 * 60 * 60, // 24 hours
+
+    async generateVerificationToken() {
+      const random: RandomReader = {
+        read(bytes) {
+          crypto.getRandomValues(bytes);
+        },
+      };
+      return generateRandomString(random, alphabet('0-9'), 6);
+    },
+
+    async sendVerificationRequest(params) {
+      const { identifier: to, provider, url, theme, token } = params;
+      //const { host } = new URL(url);
+      const host = 'TechTracker';
+
+      const useSend = new UseSend(
+        process.env.USESEND_API_KEY!,
+        'https://usesend.gbrown.org',
+      );
+
+      // For password reset, we want to send the code, not the magic link
+      const isPasswordReset =
+        url.includes('reset') || provider.id?.includes('reset');
+
+      const result = await useSend.emails.send({
+        from: provider.from!,
+        to: [to],
+        subject: isPasswordReset
+          ? `Reset your password - ${host}`
+          : `Sign in to ${host}`,
+        text: isPasswordReset
+          ? `Your password reset code is ${token}`
+          : `Your sign in code is ${token}`,
+        html: isPasswordReset
+          ? `
+          <div style="max-width: 600px; margin: 0 auto; font-family: Arial, sans-serif;">
+            <h2>Password Reset Request</h2>
+            <p>You requested a password reset. Your reset code is:</p>
+            <div style="font-size: 32px; font-weight: bold; text-align: center; padding: 20px; background: #f5f5f5; margin: 20px 0; border-radius: 8px;">
+              ${token}
+            </div>
+            <p>This code expires in 1 hour.</p>
+            <p>If you didn't request this, please ignore this email.</p>
+          </div>
+        `
+          : `
+          <div style="max-width: 600px; margin: 0 auto; font-family: Arial, sans-serif;">
+            <h2>Your Sign In Code</h2>
+            <p>Your verification code is:</p>
+            <div style="font-size: 32px; font-weight: bold; text-align: center; padding: 20px; background: #f5f5f5; margin: 20px 0; border-radius: 8px;">
+              ${token}
+            </div>
+            <p>This code expires in 24 hours.</p>
+          </div>
+        `,
+      });
+
+      if (result.error) {
+        throw new Error('UseSend error: ' + JSON.stringify(result.error));
+      }
+    },
+
+    options: config,
+  };
+}
+
+// Create specific instances for password reset and email verification
+export const UseSendOTPPasswordReset = UseSendProvider({
+  id: 'usesend-otp-password-reset',
+  apiKey: process.env.USESEND_API_KEY,
+  maxAge: 60 * 60, // 1 hour
+});
+
+export const UseSendOTP = UseSendProvider({
+  id: 'usesend-otp',
+  apiKey: process.env.USESEND_API_KEY,
+  maxAge: 60 * 20, // 20 minutes
+});
--- a/packages/backend/convex/http.ts
+++ b/packages/backend/convex/http.ts
@@ -0,0 +1,9 @@
+import { httpRouter } from 'convex/server';
+
+import { auth } from './auth';
+
+const http = httpRouter();
+
+auth.addHttpRoutes(http);
+
+export default http;
--- a/packages/backend/convex/notes.ts
+++ b/packages/backend/convex/notes.ts
@@ -1,71 +0,0 @@
-import { Auth } from 'convex/server';
-import { v } from 'convex/values';
-
-import { internal } from '../convex/_generated/api';
-import { mutation, query } from './_generated/server';
-
-export const getUserId = async (ctx: { auth: Auth }) => {
-  return (await ctx.auth.getUserIdentity())?.subject;
-};
-
-// Get all notes for a specific user
-export const getNotes = query({
-  args: {},
-  handler: async (ctx) => {
-    const userId = await getUserId(ctx);
-    if (!userId) return null;
-
-    const notes = await ctx.db
-      .query('notes')
-      .filter((q) => q.eq(q.field('userId'), userId))
-      .collect();
-
-    return notes;
-  },
-});
-
-// Get note for a specific note
-export const getNote = query({
-  args: {
-    id: v.optional(v.id('notes')),
-  },
-  handler: async (ctx, args) => {
-    const { id } = args;
-    if (!id) return null;
-    const note = await ctx.db.get(id);
-    return note;
-  },
-});
-
-// Create a new note for a user
-export const createNote = mutation({
-  args: {
-    title: v.string(),
-    content: v.string(),
-    isSummary: v.boolean(),
-  },
-  handler: async (ctx, { title, content, isSummary }) => {
-    const userId = await getUserId(ctx);
-    if (!userId) throw new Error('User not found');
-    const noteId = await ctx.db.insert('notes', { userId, title, content });
-
-    if (isSummary) {
-      await ctx.scheduler.runAfter(0, internal.openai.summary, {
-        id: noteId,
-        title,
-        content,
-      });
-    }
-
-    return noteId;
-  },
-});
-
-export const deleteNote = mutation({
-  args: {
-    noteId: v.id('notes'),
-  },
-  handler: async (ctx, args) => {
-    await ctx.db.delete(args.noteId);
-  },
-});
--- a/packages/backend/convex/openai.ts
+++ b/packages/backend/convex/openai.ts
@@ -1,76 +0,0 @@
-import { v } from 'convex/values';
-import OpenAI from 'openai';
-
-import { internal } from './_generated/api';
-import { internalAction, internalMutation, query } from './_generated/server';
-import { missingEnvVariableUrl } from './utils';
-
-export const openaiKeySet = query({
-  args: {},
-  handler: async () => {
-    return !!process.env.OPENAI_API_KEY;
-  },
-});
-
-export const summary = internalAction({
-  args: {
-    id: v.id('notes'),
-    title: v.string(),
-    content: v.string(),
-  },
-  handler: async (ctx, { id, title, content }) => {
-    const prompt = `Take in the following note and return a summary: Title: ${title}, Note content: ${content}`;
-
-    const apiKey = process.env.OPENAI_API_KEY;
-    if (!apiKey) {
-      const error = missingEnvVariableUrl(
-        'OPENAI_API_KEY',
-        'https://platform.openai.com/account/api-keys',
-      );
-      console.error(error);
-      await ctx.runMutation(internal.openai.saveSummary, {
-        id: id,
-        summary: error,
-      });
-      return;
-    }
-    const openai = new OpenAI({ apiKey });
-    const output = await openai.chat.completions.create({
-      messages: [
-        {
-          role: 'system',
-          content:
-            'You are a helpful assistant designed to output JSON in this format: {summary: string}',
-        },
-        { role: 'user', content: prompt },
-      ],
-      model: 'gpt-4-1106-preview',
-      response_format: { type: 'json_object' },
-    });
-
-    // Pull the message content out of the response
-    const messageContent = output.choices[0]?.message.content;
-
-    console.log({ messageContent });
-
-    const parsedOutput = JSON.parse(messageContent!);
-    console.log({ parsedOutput });
-
-    await ctx.runMutation(internal.openai.saveSummary, {
-      id: id,
-      summary: parsedOutput.summary,
-    });
-  },
-});
-
-export const saveSummary = internalMutation({
-  args: {
-    id: v.id('notes'),
-    summary: v.string(),
-  },
-  handler: async (ctx, { id, summary }) => {
-    await ctx.db.patch(id, {
-      summary: summary,
-    });
-  },
-});
--- a/packages/backend/convex/schema.ts
+++ b/packages/backend/convex/schema.ts
@@ -1,11 +1,36 @@
 import { defineSchema, defineTable } from 'convex/server';
 import { v } from 'convex/values';
+import { authTables } from '@convex-dev/auth/server';
+
+const applicationTables = {
+  // Users contains name image & email.
+  // If you would like to save any other information,
+  // I would recommend including this profiles table
+  // where you can include settings & anything else you would like tied to the user.
+  profiles: defineTable({
+    userId: v.id('users'),
+    theme_preference: v.optional(v.string()),
+  })
+    .index('userId', ['userId'])
+};

 export default defineSchema({
-  notes: defineTable({
-    userId: v.string(),
-    title: v.string(),
-    content: v.string(),
-    summary: v.optional(v.string()),
-  }),
+  ...authTables,
+  // Default table for users directly from authTable.
+  // You can extend it if you would like, but it may
+  // be better to just use the profiles table example
+  // below.
+  users: defineTable({
+    name: v.optional(v.string()),
+    image: v.optional(v.string()),
+    email: v.optional(v.string()),
+    emailVerificationTime: v.optional(v.number()),
+    phone: v.optional(v.string()),
+    phoneVerificationTime: v.optional(v.number()),
+    isAnonymous: v.optional(v.boolean()),
+  })
+    .index("email", ["email"])
+    .index('name', ['name'])
+    .index("phone", ["phone"]),
+  ...applicationTables,
 });
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -3,7 +3,7 @@
  "private": true,
  "type": "module",
  "exports": {
-    ".": "./src/index.ts",
+    ".": "./src/index.tsx",
    "./avatar": "./src/avatar.tsx",
    "./based-avatar": "./src/based-avatar.tsx",
    "./based-progress": "./src/based-progress.tsx",
--- a/packages/ui/src/avatar.tsx
+++ b/packages/ui/src/avatar.tsx
@@ -1,9 +1,9 @@
 'use client';

-import * as React from 'react';
+import type * as React from 'react';
 import * as AvatarPrimitive from '@radix-ui/react-avatar';

-import { cn } from '@gib/ui';
+import { cn } from '.';

 function Avatar({
  className,
--- a/packages/ui/src/based-avatar.tsx
+++ b/packages/ui/src/based-avatar.tsx
@@ -1,8 +1,7 @@
 'use client';

-import { type ComponentProps } from 'react';
-import { AvatarImage } from '@/components/ui/avatar';
-import { cn } from '@/lib/utils';
+import type { ComponentProps } from 'react';
+import { cn, AvatarImage } from '@gib/ui';
 import * as AvatarPrimitive from '@radix-ui/react-avatar';
 import { User } from 'lucide-react';

@@ -58,7 +57,7 @@ const BasedAvatar = ({
          ) : (
            <User
              {...userIconProps}
-              className={cn('', userIconProps?.className)}
+              className={cn('', userIconProps.className)}
            />
          )}
        </AvatarPrimitive.Fallback>
--- a/packages/ui/src/based-progress.tsx
+++ b/packages/ui/src/based-progress.tsx
@@ -1,7 +1,7 @@
 'use client';

 import * as React from 'react';
-import { cn } from '@/lib/utils';
+import { cn } from '@gib/ui';
 import * as ProgressPrimitive from '@radix-ui/react-progress';

 type BasedProgressProps = React.ComponentProps<
--- a/packages/ui/src/button.tsx
+++ b/packages/ui/src/button.tsx
@@ -1,6 +1,6 @@
 import type { VariantProps } from 'class-variance-authority';
 import * as React from 'react';
-import { cn } from '@/lib/utils';
+import { cn } from '@gib/ui';
 import { Slot } from '@radix-ui/react-slot';
 import { cva } from 'class-variance-authority';

--- a/packages/ui/src/card.tsx
+++ b/packages/ui/src/card.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { cn } from '@/lib/utils';
+import { cn } from '@gib/ui';

 function Card({ className, ...props }: React.ComponentProps<'div'>) {
  return (
--- a/packages/ui/src/checkbox.tsx
+++ b/packages/ui/src/checkbox.tsx
@@ -1,7 +1,7 @@
 'use client';

 import * as React from 'react';
-import { cn } from '@/lib/utils';
+import { cn } from '@gib/ui';
 import * as CheckboxPrimitive from '@radix-ui/react-checkbox';
 import { CheckIcon } from 'lucide-react';

--- a/packages/ui/src/drawer.tsx
+++ b/packages/ui/src/drawer.tsx
@@ -1,7 +1,7 @@
 'use client';

 import * as React from 'react';
-import { cn } from '@/lib/utils';
+import { cn } from '@gib/ui';
 import { Drawer as DrawerPrimitive } from 'vaul';

 function Drawer({
--- a/packages/ui/src/dropdown-menu.tsx
+++ b/packages/ui/src/dropdown-menu.tsx
@@ -1,7 +1,7 @@
 'use client';

 import * as React from 'react';
-import { cn } from '@/lib/utils';
+import { cn } from '@gib/ui';
 import * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu';
 import { CheckIcon, ChevronRightIcon, CircleIcon } from 'lucide-react';

--- a/packages/ui/src/field.tsx
+++ b/packages/ui/src/field.tsx
@@ -2,9 +2,7 @@

 import type { VariantProps } from 'class-variance-authority';
 import { useMemo } from 'react';
-import { cn } from '@acme/ui';
-import { Label } from '@acme/ui/label';
-import { Separator } from '@acme/ui/separator';
+import { cn, Label, Separator } from '@gib/ui';
 import { cva } from 'class-variance-authority';

 export function FieldSet({
--- a/packages/ui/src/form.tsx
+++ b/packages/ui/src/form.tsx
@@ -2,9 +2,8 @@

 import type { ControllerProps, FieldPath, FieldValues } from 'react-hook-form';
 import * as React from 'react';
-import { Label } from '@/components/ui/label';
-import { cn } from '@/lib/utils';
-import * as LabelPrimitive from '@radix-ui/react-label';
+import { cn, Label } from '@gib/ui';
+import type * as LabelPrimitive from '@radix-ui/react-label';
 import { Slot } from '@radix-ui/react-slot';
 import {
  Controller,
--- a/packages/ui/src/index.ts
+++ b/packages/ui/src/index.ts
@@ -1,16 +0,0 @@
-import { cx } from 'class-variance-authority';
-import { twMerge } from 'tailwind-merge';
-
-export const cn = (...inputs: Parameters<typeof cx>) => twMerge(cx(inputs));
-
-export const ccn = ({
-  context,
-  className,
-  on = '',
-  off = '',
-}: {
-  context: boolean;
-  className: string;
-  on: string;
-  off: string;
-}) => twMerge(className, context ? on : off);
--- a/packages/ui/src/index.tsx
+++ b/packages/ui/src/index.tsx
@@ -0,0 +1,109 @@
+import { cx } from 'class-variance-authority';
+import { twMerge } from 'tailwind-merge';
+
+export const cn = (...inputs: Parameters<typeof cx>) => twMerge(cx(inputs));
+
+export const ccn = ({
+  context,
+  className,
+  on = '',
+  off = '',
+}: {
+  context: boolean;
+  className: string;
+  on: string;
+  off: string;
+}) => twMerge(className, context ? on : off);
+
+export { Avatar, AvatarImage, AvatarFallback } from './avatar';
+export { BasedAvatar } from './based-avatar';
+export { BasedProgress } from './based-progress';
+export { Button, buttonVariants } from './button';
+export {
+  Card,
+  CardHeader,
+  CardFooter,
+  CardTitle,
+  CardAction,
+  CardDescription,
+  CardContent,
+} from './card';
+export { Checkbox } from './checkbox';
+export {
+  Drawer,
+  DrawerPortal,
+  DrawerOverlay,
+  DrawerTrigger,
+  DrawerClose,
+  DrawerContent,
+  DrawerHeader,
+  DrawerFooter,
+  DrawerTitle,
+  DrawerDescription,
+} from './drawer';
+export {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuLabel,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from './dropdown-menu';
+export {
+  useFormField,
+  Form,
+  FormItem,
+  FormLabel,
+  FormControl,
+  FormDescription,
+  FormMessage,
+  FormField,
+} from './form';
+export {
+  type ImageCropProps,
+  type ImageCropApplyProps,
+  type ImageCropContentProps,
+  type ImageCropResetProps,
+  type CropperProps,
+  Cropper,
+  ImageCrop,
+  ImageCropApply,
+  ImageCropContent,
+  ImageCropReset,
+} from './shadcn-io/image-crop';
+export { Input } from './input';
+export {
+  InputOTP,
+  InputOTPGroup,
+  InputOTPSlot,
+  InputOTPSeparator,
+} from './input-otp';
+export { Label } from './label';
+export {
+  Pagination,
+  PaginationContent,
+  PaginationLink,
+  PaginationItem,
+  PaginationPrevious,
+  PaginationNext,
+  PaginationEllipsis,
+} from './pagination';
+export { Progress } from './progress';
+export { ScrollArea, ScrollBar } from './scroll-area';
+export { Separator } from './separator';
+export { StatusMessage } from './status-message';
+export { SubmitButton } from './submit-button';
+export { Switch } from './switch';
+export {
+  Table,
+  TableHeader,
+  TableBody,
+  TableFooter,
+  TableHead,
+  TableRow,
+  TableCell,
+  TableCaption,
+} from './table';
+export { Tabs, TabsList, TabsTrigger, TabsContent } from './tabs';
+export { Toaster } from './sonner';
+export { ThemeProvider, ThemeToggle, type ThemeToggleProps } from './theme';
--- a/packages/ui/src/input-otp.tsx
+++ b/packages/ui/src/input-otp.tsx
@@ -1,7 +1,7 @@
 'use client';

 import * as React from 'react';
-import { cn } from '@/lib/utils';
+import { cn } from '@gib/ui';
 import { OTPInput, OTPInputContext } from 'input-otp';
 import { MinusIcon } from 'lucide-react';

--- a/packages/ui/src/input.tsx
+++ b/packages/ui/src/input.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { cn } from '@/lib/utils';
+import { cn } from '@gib/ui';

 function Input({ className, type, ...props }: React.ComponentProps<'input'>) {
  return (
--- a/packages/ui/src/label.tsx
+++ b/packages/ui/src/label.tsx
@@ -1,7 +1,7 @@
 'use client';

 import * as React from 'react';
-import { cn } from '@/lib/utils';
+import { cn } from '@gib/ui';
 import * as LabelPrimitive from '@radix-ui/react-label';

 function Label({
--- a/packages/ui/src/pagination.tsx
+++ b/packages/ui/src/pagination.tsx
@@ -1,6 +1,6 @@
-import * as React from 'react';
-import { Button, buttonVariants } from '@/components/ui/button';
-import { cn } from '@/lib/utils';
+import type * as React from 'react';
+import type { Button } from '@gib/ui';
+import { cn, buttonVariants } from '@gib/ui';
 import {
  ChevronLeftIcon,
  ChevronRightIcon,
--- a/packages/ui/src/progress.tsx
+++ b/packages/ui/src/progress.tsx
@@ -1,7 +1,7 @@
 'use client';

-import * as React from 'react';
-import { cn } from '@/lib/utils';
+import type * as React from 'react';
+import { cn } from '@gib/ui';
 import * as ProgressPrimitive from '@radix-ui/react-progress';

 function Progress({
--- a/packages/ui/src/scroll-area.tsx
+++ b/packages/ui/src/scroll-area.tsx
@@ -1,7 +1,7 @@
 'use client';

-import * as React from 'react';
-import { cn } from '@/lib/utils';
+import type * as React from 'react';
+import { cn } from '@gib/ui';
 import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area';

 function ScrollArea({
--- a/packages/ui/src/separator.tsx
+++ b/packages/ui/src/separator.tsx
@@ -1,7 +1,7 @@
 'use client';

 import * as React from 'react';
-import { cn } from '@/lib/utils';
+import { cn } from '@gib/ui';
 import * as SeparatorPrimitive from '@radix-ui/react-separator';

 function Separator({
--- a/packages/ui/src/shadcn-io/image-crop/index.tsx
+++ b/packages/ui/src/shadcn-io/image-crop/index.tsx
@@ -17,8 +17,7 @@ import {
  useRef,
  useState,
 } from 'react';
-import { Button } from '@/components/ui';
-import { cn } from '@/lib/utils';
+import { cn, Button } from '@gib/ui';
 import { CropIcon, RotateCcwIcon } from 'lucide-react';
 import { Slot } from 'radix-ui';
 import ReactCrop, { centerCrop, makeAspectCrop } from 'react-image-crop';
@@ -94,7 +93,7 @@ const getCroppedPngImage = async (
  return croppedImageUrl;
 };

-type ImageCropContextType = {
+interface ImageCropContextType {
  file: File;
  maxImageSize: number;
  imgSrc: string;
@@ -150,7 +149,7 @@ export const ImageCrop = ({
  useEffect(() => {
    const reader = new FileReader();
    reader.addEventListener('load', () =>
-      setImgSrc(reader.result?.toString() || ''),
+      setImgSrc(reader.result?.toString() ?? ''),
    );
    reader.readAsDataURL(file);
  }, [file]);
--- a/packages/ui/src/sonner.tsx
+++ b/packages/ui/src/sonner.tsx
@@ -1,7 +1,8 @@
 'use client';

 import { useTheme } from 'next-themes';
-import { Toaster as Sonner, ToasterProps } from 'sonner';
+import type { ToasterProps } from 'sonner';
+import { Toaster as Sonner } from 'sonner';

 const Toaster = ({ ...props }: ToasterProps) => {
  const { theme = 'system' } = useTheme();
--- a/packages/ui/src/status-message.tsx
+++ b/packages/ui/src/status-message.tsx
@@ -1,9 +1,9 @@
-import { type ComponentProps } from 'react';
-import { cn } from '@/lib/utils';
+import type { ComponentProps } from 'react';
+import { cn } from '@gib/ui';

 type Message = { success: string } | { error: string } | { message: string };

-type StatusMessageProps = {
+interface StatusMessageProps {
  message: Message;
  containerProps?: ComponentProps<'div'>;
  textProps?: ComponentProps<'div'>;
--- a/packages/ui/src/submit-button.tsx
+++ b/packages/ui/src/submit-button.tsx
@@ -1,8 +1,7 @@
 'use client';

-import { type ComponentProps } from 'react';
-import { Button } from '@/components/ui';
-import { cn } from '@/lib/utils';
+import type { ComponentProps } from 'react';
+import { cn, Button } from '@gib/ui';
 import { Loader2 } from 'lucide-react';
 import { useFormStatus } from 'react-dom';

--- a/packages/ui/src/switch.tsx
+++ b/packages/ui/src/switch.tsx
@@ -1,7 +1,7 @@
 'use client';

-import * as React from 'react';
-import { cn } from '@/lib/utils';
+import type * as React from 'react';
+import { cn } from '@gib/ui';
 import * as SwitchPrimitive from '@radix-ui/react-switch';

 function Switch({
--- a/packages/ui/src/table.tsx
+++ b/packages/ui/src/table.tsx
@@ -1,7 +1,7 @@
 'use client';

-import * as React from 'react';
-import { cn } from '@/lib/utils';
+import type * as React from 'react';
+import { cn } from '@gib/ui';

 function Table({ className, ...props }: React.ComponentProps<'table'>) {
  return (
--- a/packages/ui/src/tabs.tsx
+++ b/packages/ui/src/tabs.tsx
@@ -1,7 +1,7 @@
 'use client';

-import * as React from 'react';
-import { cn } from '@/lib/utils';
+import type * as React from 'react';
+import { cn } from '@gib/ui';
 import * as TabsPrimitive from '@radix-ui/react-tabs';

 function Tabs({
--- a/packages/ui/src/theme.tsx
+++ b/packages/ui/src/theme.tsx
@@ -1,184 +1,70 @@
 'use client';

-import * as React from 'react';
-import { DesktopIcon, MoonIcon, SunIcon } from '@radix-ui/react-icons';
-import * as z from 'zod/v4';
+import type { ComponentProps } from 'react';
+import { useEffect, useState } from 'react';
+import { Moon, Sun } from 'lucide-react';
+import { ThemeProvider as NextThemesProvider, useTheme } from 'next-themes';

-import { Button } from './button';
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from './dropdown-menu';
+import { Button, cn } from '@gib/ui';

-const ThemeModeSchema = z.enum(['light', 'dark', 'auto']);
+const ThemeProvider = ({
+  children,
+  ...props
+}: ComponentProps<typeof NextThemesProvider>) => {
+  const [mounted, setMounted] = useState(false);

-const themeKey = 'theme-mode';
+  useEffect(() => {
+    setMounted(true);
+  }, []);

-export type ThemeMode = z.output<typeof ThemeModeSchema>;
-export type ResolvedTheme = Exclude<ThemeMode, 'auto'>;
+  if (!mounted) return null;
+  return <NextThemesProvider {...props}>{children}</NextThemesProvider>;
+};

-const getStoredThemeMode = (): ThemeMode => {
-  if (typeof window === 'undefined') return 'auto';
-  try {
-    const storedTheme = localStorage.getItem(themeKey);
-    return ThemeModeSchema.parse(storedTheme);
-  } catch {
-    return 'auto';
+interface ThemeToggleProps {
+  size?: number;
+  buttonProps?: Omit<ComponentProps<typeof Button>, 'onClick'>;
+};
+
+const ThemeToggle = ({ size = 1, buttonProps }: ThemeToggleProps) => {
+  const { setTheme, resolvedTheme } = useTheme();
+  const [mounted, setMounted] = useState(false);
+
+  useEffect(() => {
+    setMounted(true);
+  }, []);
+
+  if (!mounted) {
+    return (
+      <Button {...buttonProps}>
+        <span style={{ height: `${size}rem`, width: `${size}rem` }} />
+      </Button>
+    );
  }
-};

-const setStoredThemeMode = (theme: ThemeMode) => {
-  try {
-    const parsedTheme = ThemeModeSchema.parse(theme);
-    localStorage.setItem(themeKey, parsedTheme);
-  } catch {
-    // Silently fail if localStorage is unavailable
-  }
-};
-
-const getSystemTheme = () => {
-  if (typeof window === 'undefined') return 'light';
-  return window.matchMedia('(prefers-color-scheme: dark)').matches
-    ? 'dark'
-    : 'light';
-};
-
-const updateThemeClass = (themeMode: ThemeMode) => {
-  const root = document.documentElement;
-  root.classList.remove('light', 'dark', 'auto');
-  const newTheme = themeMode === 'auto' ? getSystemTheme() : themeMode;
-  root.classList.add(newTheme);
-
-  if (themeMode === 'auto') {
-    root.classList.add('auto');
-  }
-};
-
-const setupPreferredListener = () => {
-  const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
-  const handler = () => updateThemeClass('auto');
-  mediaQuery.addEventListener('change', handler);
-  return () => mediaQuery.removeEventListener('change', handler);
-};
-
-const getNextTheme = (current: ThemeMode): ThemeMode => {
-  const themes: ThemeMode[] =
-    getSystemTheme() === 'dark'
-      ? ['auto', 'light', 'dark']
-      : ['auto', 'dark', 'light'];
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  return themes[(themes.indexOf(current) + 1) % themes.length]!;
-};
-
-export const themeDetectorScript = (function () {
-  function themeFn() {
-    const isValidTheme = (theme: string): theme is ThemeMode => {
-      const validThemes = ['light', 'dark', 'auto'] as const;
-      return validThemes.includes(theme as ThemeMode);
-    };
-
-    const storedTheme = localStorage.getItem('theme-mode') ?? 'auto';
-    const validTheme = isValidTheme(storedTheme) ? storedTheme : 'auto';
-
-    if (validTheme === 'auto') {
-      const autoTheme = window.matchMedia('(prefers-color-scheme: dark)')
-        .matches
-        ? 'dark'
-        : 'light';
-      document.documentElement.classList.add(autoTheme, 'auto');
-    } else {
-      document.documentElement.classList.add(validTheme);
-    }
-  }
-  return `(${themeFn.toString()})();`;
-})();
-
-interface ThemeContextProps {
-  themeMode: ThemeMode;
-  resolvedTheme: ResolvedTheme;
-  setTheme: (theme: ThemeMode) => void;
-  toggleMode: () => void;
-}
-const ThemeContext = React.createContext<ThemeContextProps | undefined>(
-  undefined,
-);
-
-export function ThemeProvider({ children }: React.PropsWithChildren) {
-  const [themeMode, setThemeMode] = React.useState(getStoredThemeMode);
-
-  React.useEffect(() => {
-    if (themeMode !== 'auto') return;
-    return setupPreferredListener();
-  }, [themeMode]);
-
-  const resolvedTheme = themeMode === 'auto' ? getSystemTheme() : themeMode;
-
-  const setTheme = (newTheme: ThemeMode) => {
-    setThemeMode(newTheme);
-    setStoredThemeMode(newTheme);
-    updateThemeClass(newTheme);
-  };
-
-  const toggleMode = () => {
-    setTheme(getNextTheme(themeMode));
+  const toggleTheme = () => {
+    if (resolvedTheme === 'dark') setTheme('light');
+    else setTheme('dark');
  };

  return (
-    <ThemeContext
-      value={{
-        themeMode,
-        resolvedTheme,
-        setTheme,
-        toggleMode,
-      }}
+    <Button
+      variant="outline"
+      size="icon"
+      {...buttonProps}
+      onClick={toggleTheme}
+      className={cn('cursor-pointer', buttonProps?.className)}
    >
-      <script
-        dangerouslySetInnerHTML={{ __html: themeDetectorScript }}
-        suppressHydrationWarning
+      <Sun
+        style={{ height: `${size}rem`, width: `${size}rem` }}
+        className="scale-100 rotate-0 transition-all dark:scale-0 dark:-rotate-90"
      />
-      {children}
-    </ThemeContext>
+      <Moon
+        style={{ height: `${size}rem`, width: `${size}rem` }}
+        className="absolute scale-0 rotate-90 transition-all dark:scale-100 dark:rotate-0"
+      />
+    </Button>
  );
-}
+};

-export function useTheme() {
-  const context = React.use(ThemeContext);
-  if (!context) {
-    throw new Error('useTheme must be used within a ThemeProvider');
-  }
-  return context;
-}
-
-export function ThemeToggle() {
-  const { setTheme } = useTheme();
-
-  return (
-    <DropdownMenu>
-      <DropdownMenuTrigger asChild>
-        <Button
-          variant="outline"
-          size="icon"
-          className="[&>svg]:absolute [&>svg]:size-5 [&>svg]:scale-0"
-        >
-          <SunIcon className="light:scale-100! auto:scale-0!" />
-          <MoonIcon className="auto:scale-0! dark:scale-100!" />
-          <DesktopIcon className="auto:scale-100!" />
-          <span className="sr-only">Toggle theme</span>
-        </Button>
-      </DropdownMenuTrigger>
-      <DropdownMenuContent align="end">
-        <DropdownMenuItem onClick={() => setTheme('light')}>
-          Light
-        </DropdownMenuItem>
-        <DropdownMenuItem onClick={() => setTheme('dark')}>
-          Dark
-        </DropdownMenuItem>
-        <DropdownMenuItem onClick={() => setTheme('auto')}>
-          System
-        </DropdownMenuItem>
-      </DropdownMenuContent>
-    </DropdownMenu>
-  );
-}
+export { ThemeProvider, ThemeToggle, type ThemeToggleProps };
--- a/packages/ui/src/toast.tsx
+++ b/packages/ui/src/toast.tsx
@@ -1,27 +0,0 @@
-'use client';
-
-import type { ToasterProps } from 'sonner';
-import { Toaster as Sonner, toast } from 'sonner';
-
-import { useTheme } from './theme';
-
-export const Toaster = ({ ...props }: ToasterProps) => {
-  const { themeMode } = useTheme();
-
-  return (
-    <Sonner
-      theme={themeMode === 'auto' ? 'system' : themeMode}
-      className="toaster group"
-      style={
-        {
-          '--normal-bg': 'var(--popover)',
-          '--normal-text': 'var(--popover-foreground)',
-          '--normal-border': 'var(--border)',
-        } as React.CSSProperties
-      }
-      {...props}
-    />
-  );
-};
-
-export { toast };