Skip to content

Connect, collaborate, and grow with a community of TypeScript developers

feat: nuke barrel file (#628)

Tom Lienardaf79a76255a0
diff --git a/apps/admin/src/app/_components/TabView.tsx b/apps/admin/src/app/_components/TabView.tsx
index a1c1a36e..c8f1f9c6 100644
--- a/apps/admin/src/app/_components/TabView.tsx
+++ b/apps/admin/src/app/_components/TabView.tsx
@@ -1,6 +1,6 @@
'use client';
-import { Tabs, TabsContent, TabsList, TabsTrigger } from '@repo/ui';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@repo/ui/components/tabs';
import { useRouter, useSearchParams } from 'next/navigation';
import React from 'react';
import type { InfiniteReports } from '../report/[id]/_components/report/report.action';
diff --git a/apps/admin/src/app/_components/challenge-reviews/columns.tsx b/apps/admin/src/app/_components/challenge-reviews/columns.tsx
index 9b3150ef..06a1e108 100644
--- a/apps/admin/src/app/_components/challenge-reviews/columns.tsx
+++ b/apps/admin/src/app/_components/challenge-reviews/columns.tsx
@@ -1,7 +1,7 @@
'use client';
import type { Challenge } from '@repo/db/types';
-import { Button } from '@repo/ui';
+import { Button } from '@repo/ui/components/button';
import { type ColumnDef } from '@tanstack/react-table';
import Link from 'next/link';
diff --git a/apps/admin/src/app/_components/reports.tsx b/apps/admin/src/app/_components/reports.tsx
index 91117aff..27c16a4b 100644
--- a/apps/admin/src/app/_components/reports.tsx
+++ b/apps/admin/src/app/_components/reports.tsx
@@ -2,15 +2,15 @@
import { useInfiniteQuery } from '@tanstack/react-query';
import { useRouter } from 'next/navigation';
import React from 'react';
+import { Pagination } from '@repo/ui/components/pagination';
import {
- Pagination,
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
-} from '@repo/ui';
+} from '@repo/ui/components/table';
import {
getInfiniteReports,
type InfiniteReports,
diff --git a/apps/admin/src/app/_components/tracks/action-bar.tsx b/apps/admin/src/app/_components/tracks/action-bar.tsx
index e19e78e6..1769b846 100644
--- a/apps/admin/src/app/_components/tracks/action-bar.tsx
+++ b/apps/admin/src/app/_components/tracks/action-bar.tsx
@@ -1,6 +1,13 @@
'use client';
-import { Button, Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from '@repo/ui';
+import {
+ Dialog,
+ DialogContent,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from '@repo/ui/components/dialog';
+import { Button } from '@repo/ui/components/button';
import { useState } from 'react';
import { AddTrackForm } from './add-track-form';
diff --git a/apps/admin/src/app/_components/tracks/add-track-form.tsx b/apps/admin/src/app/_components/tracks/add-track-form.tsx
index d5c89885..382d5295 100644
--- a/apps/admin/src/app/_components/tracks/add-track-form.tsx
+++ b/apps/admin/src/app/_components/tracks/add-track-form.tsx
@@ -1,21 +1,21 @@
import { zodResolver } from '@hookform/resolvers/zod';
+import { useQueryClient } from '@tanstack/react-query';
+import { useForm } from 'react-hook-form';
+import { z } from 'zod';
+import { createTrack } from './tracks.actions';
+import { useToast } from '@repo/ui/components/use-toast';
import {
- Button,
- Checkbox,
- DialogFooter,
Form,
- FormControl,
- FormField,
FormItem,
+ FormField,
FormLabel,
+ FormControl,
FormMessage,
- Input,
- useToast,
-} from '@repo/ui';
-import { useQueryClient } from '@tanstack/react-query';
-import { useForm } from 'react-hook-form';
-import { z } from 'zod';
-import { createTrack } from './tracks.actions';
+} from '@repo/ui/components/form';
+import { Input } from '@repo/ui/components/input';
+import { Checkbox } from '@repo/ui/components/checkbox';
+import { DialogFooter } from '@repo/ui/components/dialog';
+import { Button } from '@repo/ui/components/button';
const formSchema = z.object({
title: z.string().min(3),
diff --git a/apps/admin/src/app/_components/tracks/columns.tsx b/apps/admin/src/app/_components/tracks/columns.tsx
index 61f465ba..56c50c1c 100644
--- a/apps/admin/src/app/_components/tracks/columns.tsx
+++ b/apps/admin/src/app/_components/tracks/columns.tsx
@@ -1,7 +1,7 @@
'use client';
import type { Track, TrackChallenge } from '@repo/db/types';
-import { Button } from '@repo/ui';
+import { Button } from '@repo/ui/components/button';
import { type ColumnDef } from '@tanstack/react-table';
import Link from 'next/link';
diff --git a/apps/admin/src/app/_components/users.tsx b/apps/admin/src/app/_components/users.tsx
index d350571e..4fa1860d 100644
--- a/apps/admin/src/app/_components/users.tsx
+++ b/apps/admin/src/app/_components/users.tsx
@@ -1,20 +1,20 @@
'use client';
import {
- ActionMenu,
- Badge,
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
- TypographyH3,
- toast,
-} from '@repo/ui';
+} from '@repo/ui/components/table';
import { Unlock } from '@repo/ui/icons';
import { useRouter } from 'next/navigation';
import { unbanUser, type BannedUsers } from './admin.actions';
+import { toast } from '@repo/ui/components/use-toast';
+import { TypographyH3 } from '@repo/ui/components/typography/h3';
+import { Badge } from '@repo/ui/components/badge';
+import { ActionMenu } from '@repo/ui/components/action-menu';
interface BannedUsersProps {
data: BannedUsers;
diff --git a/apps/admin/src/app/challenge/[challengeId]/challenge-review.tsx b/apps/admin/src/app/challenge/[challengeId]/challenge-review.tsx
index 78260fb2..617cdfd9 100644
--- a/apps/admin/src/app/challenge/[challengeId]/challenge-review.tsx
+++ b/apps/admin/src/app/challenge/[challengeId]/challenge-review.tsx
@@ -4,10 +4,15 @@ import Link from 'next/link';
import { useRouter } from 'next/navigation';
import { useSession } from '@repo/auth/react';
import { useMemo } from 'react';
-import { Button, DifficultyBadge, Text, useToast, UserBadge, Markdown } from '@repo/ui';
import { CodeEditor } from '@repo/monaco/code-editor';
import type { ChallengeToReview } from './page';
import { approveChallenge, denyChallenge } from './challenge-review.action';
+import { Text } from '@repo/ui/components/typography/typography';
+import { useToast } from '@repo/ui/components/use-toast';
+import { Button } from '@repo/ui/components/button';
+import { Markdown } from '@repo/ui/components/markdown';
+import { DifficultyBadge } from '@repo/ui/components/difficulty-badge';
+import { UserBadge } from '@repo/ui/components/user-badge';
interface Props {
challenge: ChallengeToReview;
diff --git a/apps/admin/src/app/layout.tsx b/apps/admin/src/app/layout.tsx
index 3aaf81b8..cc23e4d9 100644
--- a/apps/admin/src/app/layout.tsx
+++ b/apps/admin/src/app/layout.tsx
@@ -1,6 +1,6 @@
import '../styles/globals.css';
-import { Toaster } from '@repo/ui';
+import { Toaster } from '@repo/ui/components/toaster';
import { Inter } from 'next/font/google';
import { Providers } from './providers';
import { Navigation } from '~/components/navigation';
diff --git a/apps/admin/src/app/providers.tsx b/apps/admin/src/app/providers.tsx
index 80d79dc5..e33fb0bf 100644
--- a/apps/admin/src/app/providers.tsx
+++ b/apps/admin/src/app/providers.tsx
@@ -3,7 +3,7 @@
import { SessionProvider } from '@repo/auth/react';
import { ThemeProvider } from 'next-themes';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { TooltipProvider } from '@repo/ui';
+import { TooltipProvider } from '@repo/ui/components/tooltip';
interface Props {
children: React.ReactNode;
diff --git a/apps/admin/src/app/report/[id]/_components/report/challenge.report.tsx b/apps/admin/src/app/report/[id]/_components/report/challenge.report.tsx
index 425ad530..db455d06 100644
--- a/apps/admin/src/app/report/[id]/_components/report/challenge.report.tsx
+++ b/apps/admin/src/app/report/[id]/_components/report/challenge.report.tsx
@@ -1,8 +1,10 @@
-import { Markdown, Text, UserBadge } from '@repo/ui';
import { ThumbsUp } from '@repo/ui/icons';
import Link from 'next/link';
import { getChallenge } from '~/app/_components/admin.actions';
import type { ReportWithInfo } from '../../report.action';
+import { UserBadge } from '@repo/ui/components/user-badge';
+import { Markdown } from '@repo/ui/components/markdown';
+import { Text } from '@repo/ui/components/typography/typography';
export interface ChallengeReportProps {
report: NonNullable<ReportWithInfo>;
diff --git a/apps/admin/src/app/report/[id]/_components/report/solution.report.tsx b/apps/admin/src/app/report/[id]/_components/report/solution.report.tsx
index 61c5d8f6..d2b45727 100644
--- a/apps/admin/src/app/report/[id]/_components/report/solution.report.tsx
+++ b/apps/admin/src/app/report/[id]/_components/report/solution.report.tsx
@@ -2,7 +2,8 @@
import Link from 'next/link';
import { prisma } from '@repo/db';
-import { Markdown, Text } from '@repo/ui';
+import { Text } from '@repo/ui/components/typography/typography';
+import { Markdown } from '@repo/ui/components/markdown';
import type { ReportWithInfo } from '../../report.action';
async function getSolutionChallenge(challengeId: number) {
diff --git a/apps/admin/src/app/report/[id]/_components/report/user.report.tsx b/apps/admin/src/app/report/[id]/_components/report/user.report.tsx
index 1650c116..1411b349 100644
--- a/apps/admin/src/app/report/[id]/_components/report/user.report.tsx
+++ b/apps/admin/src/app/report/[id]/_components/report/user.report.tsx
@@ -1,7 +1,9 @@
'use server';
-import { Expandable, Markdown, Text } from '@repo/ui';
// import { Comment } from '~/app/challenge/_components/comments/comment';
+import { Text } from '@repo/ui/components/typography/typography';
+import { Markdown } from '@repo/ui/components/markdown';
+import { Expandable } from '@repo/ui/components/expandable';
import { getReportedUserInformation, type ReportWithInfo } from '../../report.action';
interface UserReportProps {
diff --git a/apps/admin/src/app/report/[id]/actions.tsx b/apps/admin/src/app/report/[id]/actions.tsx
index b0570cd9..6ab4b15c 100644
--- a/apps/admin/src/app/report/[id]/actions.tsx
+++ b/apps/admin/src/app/report/[id]/actions.tsx
@@ -2,17 +2,13 @@
import { type User } from '@repo/db/types';
import {
- Button,
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
- Label,
- Textarea,
- toast,
-} from '@repo/ui';
+} from '@repo/ui/components/dialog';
import { useRouter } from 'next/navigation';
import { useMemo, useState } from 'react';
import {
@@ -23,6 +19,10 @@ import {
dismissReport,
} from '../../_components/admin.actions';
import { type ReportWithInfo } from './report.action';
+import { toast } from '@repo/ui/components/use-toast';
+import { Button } from '@repo/ui/components/button';
+import { Label } from '@repo/ui/components/label';
+import { Textarea } from '@repo/ui/components/textarea';
export interface ReportActionsProps {
report: NonNullable<ReportWithInfo>;
diff --git a/apps/admin/src/app/report/[id]/page.tsx b/apps/admin/src/app/report/[id]/page.tsx
index e7e1c970..3fcb396c 100644
--- a/apps/admin/src/app/report/[id]/page.tsx
+++ b/apps/admin/src/app/report/[id]/page.tsx
@@ -1,4 +1,6 @@
-import { Alert, AlertDescription, AlertTitle, Markdown, Text } from '@repo/ui';
+import { Alert, AlertDescription, AlertTitle } from '@repo/ui/components/alert';
+import { Text } from '@repo/ui/components/typography/typography';
+import { Markdown } from '@repo/ui/components/markdown';
import { AlertCircle, ChevronLeft } from '@repo/ui/icons';
import Link from 'next/link';
import { redirect } from 'next/navigation';
diff --git a/apps/admin/src/app/tracks/[trackId]/_components/update-track-form.tsx b/apps/admin/src/app/tracks/[trackId]/_components/update-track-form.tsx
index 97888e76..fde096c5 100644
--- a/apps/admin/src/app/tracks/[trackId]/_components/update-track-form.tsx
+++ b/apps/admin/src/app/tracks/[trackId]/_components/update-track-form.tsx
@@ -2,19 +2,13 @@
import { zodResolver } from '@hookform/resolvers/zod';
import {
- Button,
- Checkbox,
- DialogFooter,
- ForceRenderUntilClient,
Form,
FormControl,
FormField,
FormItem,
FormLabel,
FormMessage,
- Input,
- useToast,
-} from '@repo/ui';
+} from '@repo/ui/components/form';
import Link from 'next/link';
import { useMemo } from 'react';
import { useFieldArray, useForm } from 'react-hook-form';
@@ -23,6 +17,12 @@ import { z } from 'zod';
import { updateTrack } from '../_actions/update-track.action';
import type { ChallengesForTrack, TrackToManage } from '../page';
import { DraggableChallenge } from './draggable-challenge';
+import { useToast } from '@repo/ui/components/use-toast';
+import { Input } from '@repo/ui/components/input';
+import { Checkbox } from '@repo/ui/components/checkbox';
+import { DialogFooter } from '@repo/ui/components/dialog';
+import { Button } from '@repo/ui/components/button';
+import { ForceRenderUntilClient } from '@repo/ui/components/force-render-until-client';
const trackChallengeSchema = z.object({
challengeId: z.number(),
diff --git a/apps/admin/src/components/navigation.tsx b/apps/admin/src/components/navigation.tsx
index 5cd98774..21a1d0be 100644
--- a/apps/admin/src/components/navigation.tsx
+++ b/apps/admin/src/components/navigation.tsx
@@ -2,7 +2,12 @@
import { signIn, signOut, useSession } from '@repo/auth/react';
import { RoleTypes } from '@repo/db/types';
-import { Button, DropdownMenu, DropdownMenuContent, DropdownMenuTrigger } from '@repo/ui';
+import { Button } from '@repo/ui/components/button';
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuTrigger,
+} from '@repo/ui/components/dropdown-menu';
import { Loader2, LogIn, Moon, Sun, User } from '@repo/ui/icons';
import { useTheme } from 'next-themes';
import { useEffect, useState } from 'react';
diff --git a/apps/web/src/app/[locale]/_components/feature-card.tsx b/apps/web/src/app/[locale]/_components/feature-card.tsx
index fbda5c19..daa3b827 100644
--- a/apps/web/src/app/[locale]/_components/feature-card.tsx
+++ b/apps/web/src/app/[locale]/_components/feature-card.tsx
@@ -1,7 +1,6 @@
'use client';
import type { Challenge, Difficulty } from '@repo/db/types';
-import { Button, Markdown } from '@repo/ui';
import clsx from 'clsx';
import {
motion,
@@ -18,6 +17,8 @@ import { useInView } from 'react-intersection-observer';
import { Steps } from '~/components/wizard/Steps';
import { useIsMobile } from '~/utils/useIsMobile';
import { TrackChallenge } from '../tracks/_components/track-challenge-card';
+import { Button } from '@repo/ui/components/button';
+import { Markdown } from '@repo/ui/components/markdown';
type WrapperStyle = MotionStyle & {
'--x': MotionValue<string>;
diff --git a/apps/web/src/app/[locale]/_components/hero.tsx b/apps/web/src/app/[locale]/_components/hero.tsx
index 166051b1..c4dbb3ac 100644
--- a/apps/web/src/app/[locale]/_components/hero.tsx
+++ b/apps/web/src/app/[locale]/_components/hero.tsx
@@ -1,7 +1,7 @@
import { Github, Mail, Twitter } from '@repo/ui/icons';
import Link from 'next/link';
import { Balancer } from 'react-wrap-balancer';
-import { Button } from '@repo/ui';
+import { Button } from '@repo/ui/components/button';
import { HeroIllustration } from './hero-illustration';
import { getScopedI18n } from '~/locales/server';
diff --git a/apps/web/src/app/[locale]/_components/waitlist-banner.tsx b/apps/web/src/app/[locale]/_components/waitlist-banner.tsx
index 385c49ac..2e34e876 100644
--- a/apps/web/src/app/[locale]/_components/waitlist-banner.tsx
+++ b/apps/web/src/app/[locale]/_components/waitlist-banner.tsx
@@ -2,8 +2,8 @@ import Link from 'next/link';
import { clsx } from 'clsx';
import { Mail } from '@repo/ui/icons';
import { Balancer } from 'react-wrap-balancer';
-import { Button } from '@repo/ui';
import styles from './waitlist.module.css';
+import { Button } from '@repo/ui/components/button';
export function WaitlistBanner() {
return (
diff --git a/apps/web/src/app/[locale]/challenge/[id]/layout.tsx b/apps/web/src/app/[locale]/challenge/[id]/layout.tsx
index ece9c359..cc96d4dc 100644
--- a/apps/web/src/app/[locale]/challenge/[id]/layout.tsx
+++ b/apps/web/src/app/[locale]/challenge/[id]/layout.tsx
@@ -1,9 +1,9 @@
import { getServerAuthSession } from '@repo/auth/server';
-import { ForceRenderUntilClient } from '@repo/ui';
import { ChallengeLayout } from '../_components/challenge-layout';
import { getChallengeRouteData } from './getChallengeRouteData';
import { LeftWrapper } from './left-wrapper';
import { Wrapper } from './wrapper';
+import { ForceRenderUntilClient } from '@repo/ui/components/force-render-until-client';
export default async function LayoutData({
children,
diff --git a/apps/web/src/app/[locale]/challenge/[id]/left-wrapper.tsx b/apps/web/src/app/[locale]/challenge/[id]/left-wrapper.tsx
index 3e758f3a..d5101cf6 100644
--- a/apps/web/src/app/[locale]/challenge/[id]/left-wrapper.tsx
+++ b/apps/web/src/app/[locale]/challenge/[id]/left-wrapper.tsx
@@ -1,8 +1,8 @@
'use client';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@repo/ui/components/tabs';
import { usePathname, useRouter } from 'next/navigation';
import { useMemo, type ReactNode } from 'react';
-import { Tabs, TabsContent, TabsList, TabsTrigger } from '@repo/ui';
type Tab = 'description' | 'solutions' | 'submissions';
interface Props {
diff --git a/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/index.tsx b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/index.tsx
index a97e9862..d79a9b30 100644
--- a/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/index.tsx
+++ b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/index.tsx
@@ -3,12 +3,12 @@ import { ArrowUp, MessageCircle } from '@repo/ui/icons';
import { useSession } from '@repo/auth/react';
import Link from 'next/link';
import { useState } from 'react';
-import { Button } from '@repo/ui';
import { SolutionEditor } from './solution-editor';
import { NoSolutions } from './nosolutions';
import { SubmitSolution } from './submit-solution';
import type { ChallengeSolutionsRouteData } from '~/app/[locale]/challenge/[id]/solutions/page';
import { getRelativeTime } from '~/utils/relativeTime';
+import { Button } from '@repo/ui/components/button';
interface Props {
challenge: ChallengeSolutionsRouteData;
diff --git a/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-detail.tsx b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-detail.tsx
index a9cc0bb5..78d6de3a 100644
--- a/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-detail.tsx
+++ b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-detail.tsx
@@ -2,23 +2,17 @@
import { Calendar, Flag, Share, X } from '@repo/ui/icons';
import Link from 'next/link';
-import {
- Avatar,
- AvatarFallback,
- AvatarImage,
- Button,
- TypographyLarge,
- toast,
- UserBadge,
- ActionMenu,
- Tooltip,
- TooltipContent,
- TooltipTrigger,
- Markdown,
-} from '@repo/ui';
import { Comments } from '~/app/[locale]/challenge/_components/comments';
import type { ChallengeSolution } from '~/app/[locale]/challenge/[id]/solutions/[solutionId]/page';
import { ReportDialog } from '~/components/ReportDialog';
+import { ActionMenu } from '@repo/ui/components/action-menu';
+import { Avatar, AvatarImage, AvatarFallback } from '@repo/ui/components/avatar';
+import { Button } from '@repo/ui/components/button';
+import { toast } from '@repo/ui/components/use-toast';
+import { TypographyLarge } from '@repo/ui/components/typography/large';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';
+import { Markdown } from '@repo/ui/components/markdown';
+import { UserBadge } from '@repo/ui/components/user-badge';
interface Props {
solution: ChallengeSolution;
diff --git a/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-editor.tsx b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-editor.tsx
index 6e55eacc..fac4eb64 100644
--- a/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-editor.tsx
+++ b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-editor.tsx
@@ -2,21 +2,15 @@ import { zodResolver } from '@hookform/resolvers/zod';
import { useSession } from '@repo/auth/react';
import { useTheme } from 'next-themes';
import { useRouter } from 'next/navigation';
-import { useForm } from 'react-hook-form';
+import { Form, useForm } from 'react-hook-form';
import { z } from 'zod';
-import {
- Button,
- Form,
- FormControl,
- FormField,
- FormItem,
- FormMessage,
- Input,
- useToast,
-} from '@repo/ui';
import { postSolution } from './post-solution.action';
import { RichMarkdownEditor } from '~/components/ui/rich-markdown-editor';
import type { ChallengeSolutionsRouteData } from '~/app/[locale]/challenge/[id]/solutions/page';
+import { Button } from '@repo/ui/components/button';
+import { useToast } from '@repo/ui/components/use-toast';
+import { FormControl, FormField, FormItem, FormMessage } from '@repo/ui/components/form';
+import { Input } from '@repo/ui/components/input';
const getDefaultMarkdown = (solution: string) => `
## Thoughts
diff --git a/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-skeleton.tsx b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-skeleton.tsx
index 152c5fbe..0fbea07a 100644
--- a/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-skeleton.tsx
+++ b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-skeleton.tsx
@@ -1,4 +1,4 @@
-import { Skeleton } from '@repo/ui';
+import { Skeleton } from '@repo/ui/components/skeleton';
export function SolutionsSkeleton() {
return (
diff --git a/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/submit-solution.tsx b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/submit-solution.tsx
index 03d472c5..f492ae54 100644
--- a/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/submit-solution.tsx
+++ b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/submit-solution.tsx
@@ -1,5 +1,5 @@
+import { Button } from '@repo/ui/components/button';
import { Plus } from '@repo/ui/icons';
-import { Button } from '@repo/ui';
interface Props {
disabled: boolean;
diff --git a/apps/web/src/app/[locale]/challenge/[id]/submissions/[submissionId]/error.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/[submissionId]/error.tsx
index 2b0390a7..46ad8d8a 100644
--- a/apps/web/src/app/[locale]/challenge/[id]/submissions/[submissionId]/error.tsx
+++ b/apps/web/src/app/[locale]/challenge/[id]/submissions/[submissionId]/error.tsx
@@ -1,6 +1,7 @@
'use client'; // Error components must be Client Components
-import { Text, Button } from '@repo/ui';
+import { Button } from '@repo/ui/components/button';
+import { Text } from '@repo/ui/components/typography/typography';
export default function Error({ reset }: { reset: () => void }) {
return (
diff --git a/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/overview.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/overview.tsx
index 0ab9cfee..cd407c2a 100644
--- a/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/overview.tsx
+++ b/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/overview.tsx
@@ -1,17 +1,17 @@
import { useQuery } from '@tanstack/react-query';
import { Copy, X } from '@repo/ui/icons';
import Link from 'next/link';
+import { getBaseUrl } from '~/utils/getBaseUrl';
+import { getRelativeTime } from '~/utils/relativeTime';
+import { Button } from '@repo/ui/components/button';
+import { toast } from '@repo/ui/components/use-toast';
import {
- Markdown,
- Button,
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
- toast,
-} from '@repo/ui';
-import { getBaseUrl } from '~/utils/getBaseUrl';
-import { getRelativeTime } from '~/utils/relativeTime';
+} from '@repo/ui/components/tooltip';
+import { Markdown } from '@repo/ui/components/markdown';
interface Props {
submissionId: string;
diff --git a/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/submissions-skeleton.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/submissions-skeleton.tsx
index afc1a330..9eac730c 100644
--- a/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/submissions-skeleton.tsx
+++ b/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/submissions-skeleton.tsx
@@ -1,4 +1,4 @@
-import { Skeleton } from '@repo/ui';
+import { Skeleton } from '@repo/ui/components/skeleton';
export function SubmissionsSkeleton() {
return (
diff --git a/apps/web/src/app/[locale]/challenge/_components/comments/comment-input.tsx b/apps/web/src/app/[locale]/challenge/_components/comments/comment-input.tsx
index 01959c55..4f1db3af 100644
--- a/apps/web/src/app/[locale]/challenge/_components/comments/comment-input.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/comments/comment-input.tsx
@@ -1,7 +1,11 @@
import { Loader2 } from '@repo/ui/icons';
import { useSession } from '@repo/auth/react';
import { useEffect, useRef, useState, type RefObject } from 'react';
-import { Button, Textarea, Markdown, ToastAction, useToast } from '@repo/ui';
+import { Button } from '@repo/ui/components/button';
+import { useToast } from '@repo/ui/components/use-toast';
+import { ToastAction } from '@repo/ui/components/toast';
+import { Textarea } from '@repo/ui/components/textarea';
+import { Markdown } from '@repo/ui/components/markdown';
interface Props {
mode: 'create' | 'edit' | 'reply';
diff --git a/apps/web/src/app/[locale]/challenge/_components/comments/comment.tsx b/apps/web/src/app/[locale]/challenge/_components/comments/comment.tsx
index e4f3d277..3788bfbd 100644
--- a/apps/web/src/app/[locale]/challenge/_components/comments/comment.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/comments/comment.tsx
@@ -2,7 +2,6 @@
import { useSession } from '@repo/auth/react';
import { type CommentRoot } from '@repo/db/types';
-import { Tooltip, TooltipContent, Markdown, TooltipTrigger, UserBadge, toast } from '@repo/ui';
import { ChevronDown, ChevronUp, Pencil, Reply, Share, Trash2 } from '@repo/ui/icons';
import { useInfiniteQuery, useQueryClient } from '@tanstack/react-query';
import clsx from 'clsx';
@@ -16,6 +15,10 @@ import { CommentInput } from './comment-input';
import { replyComment, updateComment } from './comment.action';
import { CommentDeleteDialog } from './delete';
import { getPaginatedComments, type PaginatedComments } from './getCommentRouteData';
+import { toast } from '@repo/ui/components/use-toast';
+import { UserBadge } from '@repo/ui/components/user-badge';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';
+import { Markdown } from '@repo/ui/components/markdown';
interface SingleCommentProps {
comment: PaginatedComments['comments'][number];
diff --git a/apps/web/src/app/[locale]/challenge/_components/comments/delete/index.tsx b/apps/web/src/app/[locale]/challenge/_components/comments/delete/index.tsx
index 3078a4ea..fb977009 100644
--- a/apps/web/src/app/[locale]/challenge/_components/comments/delete/index.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/comments/delete/index.tsx
@@ -1,22 +1,20 @@
-import { type DialogTriggerProps } from '@radix-ui/react-dialog';
import {
- Button,
Dialog,
DialogContent,
DialogTrigger,
- Tooltip,
- TooltipContent,
- TooltipTrigger,
- TypographyLarge,
- TypographyP,
- Markdown,
- toast,
-} from '@repo/ui';
+ type DialogTriggerProps,
+} from '@radix-ui/react-dialog';
import { useQueryClient } from '@tanstack/react-query';
import { useState } from 'react';
import { getRelativeTime } from '~/utils/relativeTime';
import { deleteComment } from '../comment.action';
import { type PaginatedComments } from '../getCommentRouteData';
+import { Button } from '@repo/ui/components/button';
+import { TypographyLarge } from '@repo/ui/components/typography/large';
+import { TypographyP } from '@repo/ui/components/paragraph';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';
+import { Markdown } from '@repo/ui/components/markdown';
+import { toast } from '@repo/ui/components/use-toast';
interface CommentDeleteDialogProps extends DialogTriggerProps {
comment: PaginatedComments['comments'][number];
diff --git a/apps/web/src/app/[locale]/challenge/_components/comments/index.tsx b/apps/web/src/app/[locale]/challenge/_components/comments/index.tsx
index 27f867a0..ed7b5f7c 100644
--- a/apps/web/src/app/[locale]/challenge/_components/comments/index.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/comments/index.tsx
@@ -1,16 +1,6 @@
'use client';
import type { CommentRoot } from '@repo/db/types';
-import {
- Button,
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
- Toggle,
- toast,
-} from '@repo/ui';
import {
ChevronDown,
ChevronLeft,
@@ -28,6 +18,16 @@ import { CommentSkeleton } from './comment-skeleton';
import { addComment } from './comment.action';
import { getPaginatedComments, type SortOrder } from './getCommentRouteData';
import NoComments from './nocomments';
+import { Button } from '@repo/ui/components/button';
+import { Toggle } from '@repo/ui/components/toggle';
+import { toast } from '@repo/ui/components/use-toast';
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from '@repo/ui/components/select';
const sortKeys = [
{
diff --git a/apps/web/src/app/[locale]/challenge/_components/description/description-skeleton.tsx b/apps/web/src/app/[locale]/challenge/_components/description/description-skeleton.tsx
index 4d5ed698..fecb089a 100644
--- a/apps/web/src/app/[locale]/challenge/_components/description/description-skeleton.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/description/description-skeleton.tsx
@@ -1,4 +1,4 @@
-import { Skeleton } from '@repo/ui';
+import { Skeleton } from '@repo/ui/components/skeleton';
export function DescriptionSkeleton() {
return (
diff --git a/apps/web/src/app/[locale]/challenge/_components/description/index.tsx b/apps/web/src/app/[locale]/challenge/_components/description/index.tsx
index 12dcb867..8ee9d31f 100644
--- a/apps/web/src/app/[locale]/challenge/_components/description/index.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/description/index.tsx
@@ -1,21 +1,6 @@
'use client';
import { useSession } from '@repo/auth/react';
-import {
- ActionMenu,
- Dialog,
- DialogContent,
- DialogHeader,
- DialogTitle,
- DialogTrigger,
- DifficultyBadge,
- Tooltip,
- TooltipContent,
- TooltipTrigger,
- TypographyH3,
- UserBadge,
- Markdown,
-} from '@repo/ui';
import { Bookmark as BookmarkIcon, Flag, Share } from '@repo/ui/icons';
import { clsx } from 'clsx';
import { debounce } from 'lodash';
@@ -27,6 +12,19 @@ import { getRelativeTime } from '~/utils/relativeTime';
import { addOrRemoveBookmark } from '../bookmark.action';
import { ShareForm } from '../share-form';
import { Vote } from '../vote';
+import { ActionMenu } from '@repo/ui/components/action-menu';
+import { TypographyH3 } from '@repo/ui/components/typography/h3';
+import { UserBadge } from '@repo/ui/components/user-badge';
+import { DifficultyBadge } from '@repo/ui/components/difficulty-badge';
+import {
+ Dialog,
+ DialogContent,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from '@repo/ui/components/dialog';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';
+import { Markdown } from '@repo/ui/components/markdown';
interface Props {
challenge: ChallengeRouteData;
diff --git a/apps/web/src/app/[locale]/challenge/_components/editor-shortcuts/editor-shortcuts-button.tsx b/apps/web/src/app/[locale]/challenge/_components/editor-shortcuts/editor-shortcuts-button.tsx
index 915aba5c..7d2730e6 100644
--- a/apps/web/src/app/[locale]/challenge/_components/editor-shortcuts/editor-shortcuts-button.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/editor-shortcuts/editor-shortcuts-button.tsx
@@ -4,12 +4,10 @@ import {
DialogHeader,
DialogTitle,
DialogTrigger,
- Tooltip,
- TooltipContent,
- TooltipTrigger,
-} from '@repo/ui';
+} from '@repo/ui/components/dialog';
import { EditorShortcuts } from './editor-shortcuts-form';
import { SquareSlash } from '@repo/ui/icons';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';
export function EditorShortcutsButton() {
return (
diff --git a/apps/web/src/app/[locale]/challenge/_components/fullscreen.tsx b/apps/web/src/app/[locale]/challenge/_components/fullscreen.tsx
index f665845c..8c11311c 100644
--- a/apps/web/src/app/[locale]/challenge/_components/fullscreen.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/fullscreen.tsx
@@ -1,4 +1,4 @@
-import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';
import { Maximize2, Minimize2 } from '@repo/ui/icons';
import { useEffect } from 'react';
import { create } from 'zustand';
diff --git a/apps/web/src/app/[locale]/challenge/_components/left-panel-skeleton.tsx b/apps/web/src/app/[locale]/challenge/_components/left-panel-skeleton.tsx
index eb9d5373..65042f76 100644
--- a/apps/web/src/app/[locale]/challenge/_components/left-panel-skeleton.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/left-panel-skeleton.tsx
@@ -1,4 +1,4 @@
-import { Tabs, TabsContent, TabsList, TabsTrigger } from '@repo/ui';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@repo/ui/components/tabs';
export function DescriptionPanelSkeleton() {
return (
diff --git a/apps/web/src/app/[locale]/challenge/_components/reset-editor-button.tsx b/apps/web/src/app/[locale]/challenge/_components/reset-editor-button.tsx
index a5cbc974..dd77c8d8 100644
--- a/apps/web/src/app/[locale]/challenge/_components/reset-editor-button.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/reset-editor-button.tsx
@@ -1,17 +1,15 @@
import { useResetEditor } from '@repo/monaco/editor-hooks';
import {
AlertDialog,
- AlertDialogAction,
- AlertDialogCancel,
+ AlertDialogTrigger,
AlertDialogContent,
- AlertDialogFooter,
+ AlertDialogCancel,
AlertDialogHeader,
AlertDialogTitle,
- AlertDialogTrigger,
- Tooltip,
- TooltipContent,
- TooltipTrigger,
-} from '@repo/ui';
+ AlertDialogAction,
+ AlertDialogFooter,
+} from '@repo/ui/components/alert-dialog';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';
import { RotateCcw } from '@repo/ui/icons';
const ResetEditorButton = () => {
diff --git a/apps/web/src/app/[locale]/challenge/_components/settings/settings-button.tsx b/apps/web/src/app/[locale]/challenge/_components/settings/settings-button.tsx
index 2aaefc8b..139814e0 100644
--- a/apps/web/src/app/[locale]/challenge/_components/settings/settings-button.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/settings/settings-button.tsx
@@ -1,15 +1,13 @@
+import { Settings } from '@repo/ui/icons';
+import { SettingsForm } from './settings-form';
import {
Dialog,
DialogContent,
DialogHeader,
DialogTitle,
DialogTrigger,
- Tooltip,
- TooltipContent,
- TooltipTrigger,
-} from '@repo/ui';
-import { Settings } from '@repo/ui/icons';
-import { SettingsForm } from './settings-form';
+} from '@repo/ui/components/dialog';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';
export function SettingsButton() {
return (
diff --git a/apps/web/src/app/[locale]/challenge/_components/settings/settings-form.tsx b/apps/web/src/app/[locale]/challenge/_components/settings/settings-form.tsx
index 63f71f60..542b04e7 100644
--- a/apps/web/src/app/[locale]/challenge/_components/settings/settings-form.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/settings/settings-form.tsx
@@ -4,24 +4,26 @@ import { zodResolver } from '@hookform/resolvers/zod';
import * as DialogPrimitive from '@radix-ui/react-dialog';
import { useForm } from 'react-hook-form';
import * as z from 'zod';
+import { DEFAULT_SETTINGS, useEditorSettingsStore } from '@repo/monaco/settings-store';
+import { useToast } from '@repo/ui/components/use-toast';
import {
- Button,
Form,
FormControl,
FormField,
FormItem,
FormLabel,
FormMessage,
+} from '@repo/ui/components/form';
+import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
- useToast,
- DialogFooter,
- Textarea,
-} from '@repo/ui';
-import { DEFAULT_SETTINGS, useEditorSettingsStore } from '@repo/monaco/settings-store';
+} from '@repo/ui/components/select';
+import { DialogFooter } from '@repo/ui/components/dialog';
+import { Button } from '@repo/ui/components/button';
+import { Textarea } from '@repo/ui/components/textarea';
const formSchema = z.object({
fontSize: z.string(),
diff --git a/apps/web/src/app/[locale]/challenge/_components/share-form.tsx b/apps/web/src/app/[locale]/challenge/_components/share-form.tsx
index a45e3cc4..001dd489 100644
--- a/apps/web/src/app/[locale]/challenge/_components/share-form.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/share-form.tsx
@@ -1,10 +1,10 @@
'use client';
+import { DialogFooter } from '@repo/ui/components/dialog';
import { CheckCircle2 as CheckCircle2Icon, Clipboard as ClipboardIcon } from '@repo/ui/icons';
import lzstring from 'lz-string';
import { useParams } from 'next/navigation';
import { useCallback, useState } from 'react';
-import { DialogFooter } from '@repo/ui';
import { useLocalStorage } from '~/utils/useLocalStorage';
export function ShareForm() {
diff --git a/apps/web/src/app/[locale]/challenge/_components/vote.tsx b/apps/web/src/app/[locale]/challenge/_components/vote.tsx
index 36d2a1c7..9b5bf24f 100644
--- a/apps/web/src/app/[locale]/challenge/_components/vote.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/vote.tsx
@@ -2,12 +2,12 @@
import { useSession } from '@repo/auth/react';
import type { VoteType } from '@repo/db/types';
-import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui';
import { ThumbsUp } from '@repo/ui/icons';
import clsx from 'clsx';
import { debounce } from 'lodash';
import { useRef, useState } from 'react';
import { incrementOrDecrementUpvote } from '../increment.action';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';
interface VoteProps {
voteCount: number;
diff --git a/apps/web/src/app/[locale]/challenge/error.tsx b/apps/web/src/app/[locale]/challenge/error.tsx
index 5f9d7ef4..222be9e1 100644
--- a/apps/web/src/app/[locale]/challenge/error.tsx
+++ b/apps/web/src/app/[locale]/challenge/error.tsx
@@ -1,7 +1,8 @@
'use client'; // Error components must be Client Components
+import { Button } from '@repo/ui/components/button';
+import { Text } from '@repo/ui/components/typography/typography';
import Link from 'next/link';
-import { Button, Text } from '@repo/ui';
export default function Error() {
return (
diff --git a/apps/web/src/app/[locale]/explore/_components/explore-card-skeleton.tsx b/apps/web/src/app/[locale]/explore/_components/explore-card-skeleton.tsx
index 50f9d881..a320b2a0 100644
--- a/apps/web/src/app/[locale]/explore/_components/explore-card-skeleton.tsx
+++ b/apps/web/src/app/[locale]/explore/_components/explore-card-skeleton.tsx
@@ -1,4 +1,11 @@
-import { Card, CardContent, CardDescription, CardHeader, CardTitle, Skeleton } from '@repo/ui';
+import {
+ Card,
+ CardContent,
+ CardDescription,
+ CardHeader,
+ CardTitle,
+} from '@repo/ui/components/card';
+import { Skeleton } from '@repo/ui/components/skeleton';
export function ExploreCardSkeleton() {
return (
diff --git a/apps/web/src/app/[locale]/explore/_components/explore-card.tsx b/apps/web/src/app/[locale]/explore/_components/explore-card.tsx
index f408750b..f51adf15 100644
--- a/apps/web/src/app/[locale]/explore/_components/explore-card.tsx
+++ b/apps/web/src/app/[locale]/explore/_components/explore-card.tsx
@@ -1,15 +1,15 @@
+import { Circle, Diamond, MessageCircle, Plus, Sparkle, ThumbsUp, Triangle } from '@repo/ui/icons';
+import type { ExploreChallengeData } from './explore.action';
+import { getRelativeTime } from '~/utils/relativeTime';
import {
Card,
CardContent,
CardDescription,
CardHeader,
CardTitle,
- DifficultyBadge,
- Markdown,
-} from '@repo/ui';
-import { Circle, Diamond, MessageCircle, Plus, Sparkle, ThumbsUp, Triangle } from '@repo/ui/icons';
-import type { ExploreChallengeData } from './explore.action';
-import { getRelativeTime } from '~/utils/relativeTime';
+} from '@repo/ui/components/card';
+import { DifficultyBadge } from '@repo/ui/components/difficulty-badge';
+import { Markdown } from '@repo/ui/components/markdown';
interface ExploreCardProps {
challenge: Pick<
diff --git a/apps/web/src/app/[locale]/explore/_components/explore-section-skeleton.tsx b/apps/web/src/app/[locale]/explore/_components/explore-section-skeleton.tsx
index 91e0a925..739ac76a 100644
--- a/apps/web/src/app/[locale]/explore/_components/explore-section-skeleton.tsx
+++ b/apps/web/src/app/[locale]/explore/_components/explore-section-skeleton.tsx
@@ -1,4 +1,4 @@
-import { Skeleton } from '@repo/ui';
+import { Skeleton } from '@repo/ui/components/skeleton';
import { ExploreCardSkeleton } from './explore-card-skeleton';
export function ExploreSectionSkeleton() {
diff --git a/apps/web/src/app/[locale]/explore/_components/explore-slug-skeleton.tsx b/apps/web/src/app/[locale]/explore/_components/explore-slug-skeleton.tsx
index 60365f7b..f1990923 100644
--- a/apps/web/src/app/[locale]/explore/_components/explore-slug-skeleton.tsx
+++ b/apps/web/src/app/[locale]/explore/_components/explore-slug-skeleton.tsx
@@ -1,4 +1,4 @@
-import { Skeleton } from '@repo/ui';
+import { Skeleton } from '@repo/ui/components/skeleton';
import { ExploreCardSkeleton } from './explore-card-skeleton';
export function ExploreSlugSkeleton() {
diff --git a/apps/web/src/app/[locale]/explore/_components/explore-slug.tsx b/apps/web/src/app/[locale]/explore/_components/explore-slug.tsx
index 982104e1..de99b4aa 100644
--- a/apps/web/src/app/[locale]/explore/_components/explore-slug.tsx
+++ b/apps/web/src/app/[locale]/explore/_components/explore-slug.tsx
@@ -1,7 +1,7 @@
-import { TypographyH3 } from '@repo/ui';
import Link from 'next/link';
import { ExploreCard } from './explore-card';
import { getChallengesByTagOrDifficulty } from './explore.action';
+import { TypographyH3 } from '@repo/ui/components/typography/h3';
interface ExploreSlugProps {
slug: string;
diff --git a/apps/web/src/app/[locale]/explore/_components/view-more-button.tsx b/apps/web/src/app/[locale]/explore/_components/view-more-button.tsx
index 57335e6d..5d72c0a4 100644
--- a/apps/web/src/app/[locale]/explore/_components/view-more-button.tsx
+++ b/apps/web/src/app/[locale]/explore/_components/view-more-button.tsx
@@ -1,6 +1,6 @@
'use client';
-import { Button } from '@repo/ui';
+import { Button } from '@repo/ui/components/button';
import { ChevronRight } from '@repo/ui/icons';
import { useRouter } from 'next/navigation';
diff --git a/apps/web/src/app/[locale]/explore/error.tsx b/apps/web/src/app/[locale]/explore/error.tsx
index 1b1ecd44..6d2b0861 100644
--- a/apps/web/src/app/[locale]/explore/error.tsx
+++ b/apps/web/src/app/[locale]/explore/error.tsx
@@ -1,6 +1,7 @@
'use client'; // Error components must be Client Components
-import { Button, Text } from '@repo/ui';
+import { Button } from '@repo/ui/components/button';
+import { Text } from '@repo/ui/components/typography/typography';
import Link from 'next/link';
export default function Error() {
diff --git a/apps/web/src/app/[locale]/tracks/_components/enroll-button.tsx b/apps/web/src/app/[locale]/tracks/_components/enroll-button.tsx
index eea7ba25..d6beb12a 100644
--- a/apps/web/src/app/[locale]/tracks/_components/enroll-button.tsx
+++ b/apps/web/src/app/[locale]/tracks/_components/enroll-button.tsx
@@ -1,8 +1,9 @@
'use client';
-import { Button, toast } from '@repo/ui';
import { useRouter } from 'next/navigation';
import type { enrollUserInTrack, unenrollUserFromTrack } from './track.action';
+import { Button } from '@repo/ui/components/button';
+import { toast } from '@repo/ui/components/use-toast';
interface EnrollButtonProps {
action: typeof enrollUserInTrack | typeof unenrollUserFromTrack;
diff --git a/apps/web/src/app/[locale]/tracks/_components/personal-track-card.tsx b/apps/web/src/app/[locale]/tracks/_components/personal-track-card.tsx
index 7e3f03d9..5965ae60 100644
--- a/apps/web/src/app/[locale]/tracks/_components/personal-track-card.tsx
+++ b/apps/web/src/app/[locale]/tracks/_components/personal-track-card.tsx
@@ -1,8 +1,14 @@
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@repo/ui';
import { TrendingUpIcon } from '@repo/ui/icons';
import clsx from 'clsx';
import type { EnrolledTracks } from './track-enrolled-section';
import { TrackProgress } from './track-progress';
+import {
+ Card,
+ CardContent,
+ CardDescription,
+ CardHeader,
+ CardTitle,
+} from '@repo/ui/components/card';
interface PersonalTrackCardProps {
track: EnrolledTracks[number];
diff --git a/apps/web/src/app/[locale]/tracks/_components/track-card.tsx b/apps/web/src/app/[locale]/tracks/_components/track-card.tsx
index 3bd4f3a5..cc275f41 100644
--- a/apps/web/src/app/[locale]/tracks/_components/track-card.tsx
+++ b/apps/web/src/app/[locale]/tracks/_components/track-card.tsx
@@ -1,10 +1,10 @@
'use client';
-import { Button } from '@repo/ui';
import clsx from 'clsx';
import { useRouter } from 'next/navigation';
import { TrackChallenge } from './track-challenge-card';
import type { Tracks } from './track-grid';
+import { Button } from '@repo/ui/components/button';
interface TrackProps {
track: Tracks[number];
diff --git a/apps/web/src/app/[locale]/tracks/_components/track-progress.tsx b/apps/web/src/app/[locale]/tracks/_components/track-progress.tsx
index c9c387c1..afeb8db1 100644
--- a/apps/web/src/app/[locale]/tracks/_components/track-progress.tsx
+++ b/apps/web/src/app/[locale]/tracks/_components/track-progress.tsx
@@ -1,4 +1,4 @@
-import { Progress } from '@repo/ui';
+import { Progress } from '@repo/ui/components/progress';
interface TrackProgressProps {
totalChallenges: number;
diff --git a/apps/web/src/app/[locale]/waitlist/_components/waitlist-form.tsx b/apps/web/src/app/[locale]/waitlist/_components/waitlist-form.tsx
index 681701fc..0520f247 100644
--- a/apps/web/src/app/[locale]/waitlist/_components/waitlist-form.tsx
+++ b/apps/web/src/app/[locale]/waitlist/_components/waitlist-form.tsx
@@ -3,25 +3,21 @@
import { useState } from 'react';
import { z } from 'zod';
import { zodResolver } from '@hookform/resolvers/zod';
-import { useForm } from 'react-hook-form';
+import { Form, useForm } from 'react-hook-form';
import { AlertCircle, MailCheck } from '@repo/ui/icons';
import clsx from 'clsx';
+import { uploadWaitlistEntry } from './create.action';
+import { Alert, AlertDescription } from '@repo/ui/components/alert';
+import { FormControl, FormField, FormItem } from '@repo/ui/components/form';
+import { Input } from '@repo/ui/components/input';
import {
- Alert,
- AlertDescription,
- Button,
- Form,
- FormControl,
- FormField,
- FormItem,
- Input,
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
-} from '@repo/ui';
-import { uploadWaitlistEntry } from './create.action';
+} from '@repo/ui/components/select';
+import { Button } from '@repo/ui/components/button';
const waitlistFormSchema = z.object({
name: z.string().min(1, 'Please enter your name'),
diff --git a/apps/web/src/app/[locale]/wizard/error.tsx b/apps/web/src/app/[locale]/wizard/error.tsx
index 2b0390a7..94453f1a 100644
--- a/apps/web/src/app/[locale]/wizard/error.tsx
+++ b/apps/web/src/app/[locale]/wizard/error.tsx
@@ -1,6 +1,7 @@
'use client'; // Error components must be Client Components
-import { Text, Button } from '@repo/ui';
+import { Text } from '@repo/ui/components/typography/typography';
+import { Button } from '@repo/ui/components/button';
export default function Error({ reset }: { reset: () => void }) {
return (
diff --git a/apps/web/src/app/[locale]/wizard/page.tsx b/apps/web/src/app/[locale]/wizard/page.tsx
index c7dcc978..370d2dcc 100644
--- a/apps/web/src/app/[locale]/wizard/page.tsx
+++ b/apps/web/src/app/[locale]/wizard/page.tsx
@@ -1,5 +1,5 @@
import { getServerAuthSession } from '@repo/auth/server';
-import { TypographyH2 } from '@repo/ui';
+import { TypographyH2 } from '@repo/ui/components/typography/h2';
import type { Metadata } from 'next';
import { Wizard } from '~/components/wizard';
diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsx
index 5accdd05..531a0d6f 100644
--- a/apps/web/src/app/layout.tsx
+++ b/apps/web/src/app/layout.tsx
@@ -4,7 +4,7 @@ import '../styles/globals.css';
import { Inter } from 'next/font/google';
import type { Metadata } from 'next';
-import { Toaster } from '@repo/ui';
+import { Toaster } from '@repo/ui/components/toaster';
import { Providers } from './providers';
import { buildMetaForDefault } from './metadata';
import { Navigation } from '~/components/ui/navigation';
diff --git a/apps/web/src/app/providers.tsx b/apps/web/src/app/providers.tsx
index e7a6e879..530a63e8 100644
--- a/apps/web/src/app/providers.tsx
+++ b/apps/web/src/app/providers.tsx
@@ -2,7 +2,7 @@
import { VercelToolbar } from '@vercel/toolbar/next';
import { SessionProvider } from '@repo/auth/react';
-import { TooltipProvider } from '@repo/ui';
+import { TooltipProvider } from '@repo/ui/components/tooltip';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { ThemeProvider } from 'next-themes';
import React from 'react';
diff --git a/apps/web/src/components/ReportDialog/index.tsx b/apps/web/src/components/ReportDialog/index.tsx
index b8d36536..1bbffa3c 100644
--- a/apps/web/src/components/ReportDialog/index.tsx
+++ b/apps/web/src/components/ReportDialog/index.tsx
@@ -1,22 +1,6 @@
import { type IssueType } from '@repo/db/types';
import React from 'react';
import { useForm } from 'react-hook-form';
-import {
- Dialog,
- DialogContent,
- DialogHeader,
- DialogFooter,
- DialogTitle,
- DialogDescription,
- DialogTrigger,
- Button,
- FormField,
- FormItem,
- Text,
- Checkbox,
- Textarea,
- toast,
-} from '@repo/ui';
import {
type ChallengeReport,
type UserReport,
@@ -24,6 +8,21 @@ import {
addReport,
type SolutionReport,
} from './report-dialog.action';
+import {
+ Dialog,
+ DialogContent,
+ DialogDescription,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from '@repo/ui/components/dialog';
+import { toast } from '@repo/ui/components/use-toast';
+import { Text } from '@repo/ui/components/typography/typography';
+import { FormField, FormItem } from '@repo/ui/components/form';
+import { Checkbox } from '@repo/ui/components/checkbox';
+import { Textarea } from '@repo/ui/components/textarea';
+import { Button } from '@repo/ui/components/button';
export interface ReportDialogPropsBase {
triggerAsChild?: boolean;
diff --git a/apps/web/src/components/settings/index.tsx b/apps/web/src/components/settings/index.tsx
index 65abe45e..d2cbc1c4 100644
--- a/apps/web/src/components/settings/index.tsx
+++ b/apps/web/src/components/settings/index.tsx
@@ -1,12 +1,16 @@
'use client';
import { zodResolver } from '@hookform/resolvers/zod';
-import { useFieldArray, useForm, useWatch } from 'react-hook-form';
+import { Form, useFieldArray, useForm, useWatch } from 'react-hook-form';
import * as z from 'zod';
import Link from 'next/link';
-import { Button, Form, FormField, FormItem, FormMessage, Input, toast, MagicIcon } from '@repo/ui';
import { RichMarkdownEditor } from '../ui/rich-markdown-editor';
import { updateProfile } from './settings.action';
+import { toast } from '@repo/ui/components/use-toast';
+import { Button } from '@repo/ui/components/button';
+import { FormField, FormItem, FormMessage } from '@repo/ui/components/form';
+import { MagicIcon } from '@repo/ui/components/magic-icon';
+import { Input } from '@repo/ui/components/input';
export interface UserLinkType {
id: string | null;
diff --git a/apps/web/src/components/ui/navigation.tsx b/apps/web/src/components/ui/navigation.tsx
index 87ab7581..a057a0e3 100644
--- a/apps/web/src/components/ui/navigation.tsx
+++ b/apps/web/src/components/ui/navigation.tsx
@@ -2,14 +2,6 @@
import { signIn, signOut, useSession } from '@repo/auth/react';
import { type RoleTypes } from '@repo/db/types';
-import {
- Button,
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@repo/ui';
import { Loader2, LogIn, Moon, Plus, Settings, Settings2, Sun, User } from '@repo/ui/icons';
import clsx from 'clsx';
import { useTheme } from 'next-themes';
@@ -18,6 +10,14 @@ import { usePathname, useRouter } from 'next/navigation';
import { useContext, useEffect, useState } from 'react';
import { FeatureFlagContext } from '~/app/feature-flag-provider';
import { useFullscreenSettingsStore } from '../../app/[locale]/challenge/_components/fullscreen';
+import { Button } from '@repo/ui/components/button';
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuSeparator,
+ DropdownMenuTrigger,
+} from '@repo/ui/components/dropdown-menu';
export function getAdminUrl() {
// reference for vercel.com
diff --git a/apps/web/src/components/ui/rich-markdown-editor.tsx b/apps/web/src/components/ui/rich-markdown-editor.tsx
index 0d9b3c71..c7dcb096 100644
--- a/apps/web/src/components/ui/rich-markdown-editor.tsx
+++ b/apps/web/src/components/ui/rich-markdown-editor.tsx
@@ -2,9 +2,9 @@ import { useTheme } from 'next-themes';
import type { ChangeEvent } from 'react';
import { useContext, useEffect, useRef, useState } from 'react';
import MDEditor, { EditorContext, commands, type ICommand } from '@uiw/react-md-editor';
-import { toast } from '@repo/ui';
import { insertText } from '~/utils/domUtils';
import { useUploadThing } from '~/utils/useUploadthing';
+import { toast } from '@repo/ui/components/use-toast';
const codePreview: ICommand = {
name: 'preview',
diff --git a/apps/web/src/components/user/dashboard/bookmark-tab.tsx b/apps/web/src/components/user/dashboard/bookmark-tab.tsx
index e7b829ad..bace2354 100644
--- a/apps/web/src/components/user/dashboard/bookmark-tab.tsx
+++ b/apps/web/src/components/user/dashboard/bookmark-tab.tsx
@@ -6,7 +6,7 @@ import {
TableHead,
TableHeader,
TableRow,
-} from '@repo/ui';
+} from '@repo/ui/components/table';
const challengesList = [
{
diff --git a/apps/web/src/components/user/dashboard/in-progress-tab.tsx b/apps/web/src/components/user/dashboard/in-progress-tab.tsx
index 123e201f..52b3d062 100644
--- a/apps/web/src/components/user/dashboard/in-progress-tab.tsx
+++ b/apps/web/src/components/user/dashboard/in-progress-tab.tsx
@@ -6,7 +6,7 @@ import {
TableHead,
TableHeader,
TableRow,
-} from '@repo/ui';
+} from '@repo/ui/components/table';
const challengesList = [
{
diff --git a/apps/web/src/components/user/dashboard/index.tsx b/apps/web/src/components/user/dashboard/index.tsx
index 9a10af73..ae37c67f 100644
--- a/apps/web/src/components/user/dashboard/index.tsx
+++ b/apps/web/src/components/user/dashboard/index.tsx
@@ -1,17 +1,14 @@
import { getServerAuthSession } from '@repo/auth/server';
import { prisma } from '@repo/db';
import type { User } from '@repo/db/types';
+import { Card, CardContent, CardHeader, CardTitle } from '@repo/ui/components/card';
+import { MagicIcon } from '@repo/ui/components/magic-icon';
import {
- Card,
- CardContent,
- CardHeader,
- CardTitle,
- MagicIcon,
Tabs,
VerticalTabsContent,
VerticalTabsList,
VerticalTabsTrigger,
-} from '@repo/ui';
+} from '@repo/ui/components/tabs';
import { Bookmark, ChevronRightSquare, MessagesSquare, Play, Settings } from '@repo/ui/icons';
import Link from 'next/link';
import { ReactMarkdown } from 'react-markdown/lib/react-markdown';
diff --git a/apps/web/src/components/user/dashboard/overview.tsx b/apps/web/src/components/user/dashboard/overview.tsx
index ffc3fb95..270d47ca 100644
--- a/apps/web/src/components/user/dashboard/overview.tsx
+++ b/apps/web/src/components/user/dashboard/overview.tsx
@@ -6,7 +6,7 @@ import {
TableHead,
TableHeader,
TableRow,
-} from '@repo/ui';
+} from '@repo/ui/components/table';
const challengesList = [
{
diff --git a/apps/web/src/components/user/dashboard/solutions-tab.tsx b/apps/web/src/components/user/dashboard/solutions-tab.tsx
index 19963f56..4b4777ab 100644
--- a/apps/web/src/components/user/dashboard/solutions-tab.tsx
+++ b/apps/web/src/components/user/dashboard/solutions-tab.tsx
@@ -7,7 +7,7 @@ import {
TableHead,
TableHeader,
TableRow,
-} from '@repo/ui';
+} from '@repo/ui/components/table';
import type { UserData } from '.';
export function SolutionsTab({ submissions = [] }: { submissions: UserData['submission'] }) {
diff --git a/apps/web/src/components/user/dashboard/user-header.tsx b/apps/web/src/components/user/dashboard/user-header.tsx
index 2a0cacb8..d253c98f 100644
--- a/apps/web/src/components/user/dashboard/user-header.tsx
+++ b/apps/web/src/components/user/dashboard/user-header.tsx
@@ -2,8 +2,9 @@
import { type User } from '@repo/db/types';
import { Flag } from '@repo/ui/icons';
-import { ActionMenu, Text } from '@repo/ui';
import { ReportDialog } from '~/components/ReportDialog';
+import { ActionMenu } from '@repo/ui/components/action-menu';
+import { Text } from '@repo/ui/components/typography/typography';
export interface UserHeaderProps {
user: Pick<User, 'id' | 'name'>;
diff --git a/apps/web/src/components/wizard/ChallengeCardEditor.tsx b/apps/web/src/components/wizard/ChallengeCardEditor.tsx
index 97860371..97730725 100644
--- a/apps/web/src/components/wizard/ChallengeCardEditor.tsx
+++ b/apps/web/src/components/wizard/ChallengeCardEditor.tsx
@@ -1,24 +1,20 @@
'use client';
+import { useWatch } from 'react-hook-form';
+import type { WizardForm } from '.';
+import type { ExploreChallengeData } from '~/app/[locale]/explore/_components/explore.action';
+import { ExploreCard } from '~/app/[locale]/explore/_components/explore-card';
+import { TypographyH3 } from '@repo/ui/components/typography/h3';
+import { FormControl, FormField, FormItem, FormLabel, FormMessage } from '@repo/ui/components/form';
+import { Textarea } from '@repo/ui/components/textarea';
import {
- FormControl,
- FormField,
- FormItem,
- FormLabel,
- FormMessage,
- Input,
Select,
- SelectContent,
SelectItem,
+ SelectContent,
SelectTrigger,
SelectValue,
- Textarea,
- TypographyH3,
-} from '@repo/ui';
-import { useWatch } from 'react-hook-form';
-import type { WizardForm } from '.';
-import type { ExploreChallengeData } from '~/app/[locale]/explore/_components/explore.action';
-import { ExploreCard } from '~/app/[locale]/explore/_components/explore-card';
+} from '@repo/ui/components/select';
+import { Input } from '@repo/ui/components/input';
interface Props {
form: WizardForm;
diff --git a/apps/web/src/components/wizard/DescriptionEditor.tsx b/apps/web/src/components/wizard/DescriptionEditor.tsx
index 9815e5bc..4c2a476c 100644
--- a/apps/web/src/components/wizard/DescriptionEditor.tsx
+++ b/apps/web/src/components/wizard/DescriptionEditor.tsx
@@ -1,7 +1,9 @@
'use client';
import { useWatch } from 'react-hook-form';
-import { Markdown, FormField, FormItem, FormMessage, TypographyH3 } from '@repo/ui';
+import { FormField, FormItem, FormMessage } from '@repo/ui/components/form';
+import { TypographyH3 } from '@repo/ui/components/typography/h3';
+import { Markdown } from '@repo/ui/components/markdown';
import { RichMarkdownEditor } from '../ui/rich-markdown-editor';
import { type WizardForm } from '.';
diff --git a/apps/web/src/components/wizard/NextBack.tsx b/apps/web/src/components/wizard/NextBack.tsx
index 22b3ab6f..e67120f2 100644
--- a/apps/web/src/components/wizard/NextBack.tsx
+++ b/apps/web/src/components/wizard/NextBack.tsx
@@ -1,4 +1,4 @@
-import { Button } from '@repo/ui';
+import { Button } from '@repo/ui/components/button';
import { STEPS } from '.';
interface Props {
diff --git a/apps/web/src/components/wizard/TestCasesEditor.tsx b/apps/web/src/components/wizard/TestCasesEditor.tsx
index d0afbd86..ec2b4104 100644
--- a/apps/web/src/components/wizard/TestCasesEditor.tsx
+++ b/apps/web/src/components/wizard/TestCasesEditor.tsx
@@ -1,7 +1,8 @@
import type { OnChange } from '@monaco-editor/react';
import type { TsErrors } from '@repo/monaco';
import { CodeEditor, loadCheckingLib, type CodeEditorProps } from '@repo/monaco/code-editor';
-import { FormField, FormItem, FormMessage, TypographyH3 } from '@repo/ui';
+import { FormField, FormItem, FormMessage } from '@repo/ui/components/form';
+import { TypographyH3 } from '@repo/ui/components/typography/h3';
import { useCallback, useState } from 'react';
import type * as monaco from 'monaco-editor';
import dynamic from 'next/dynamic';
diff --git a/apps/web/src/components/wizard/index.tsx b/apps/web/src/components/wizard/index.tsx
index 7a363b9f..2eb19d0c 100644
--- a/apps/web/src/components/wizard/index.tsx
+++ b/apps/web/src/components/wizard/index.tsx
@@ -6,7 +6,7 @@ import { useEffect, useMemo, useState } from 'react';
import { useForm, type UseFormReturn } from 'react-hook-form';
import { z } from 'zod';
import { useSession } from '@repo/auth/react';
-import { Form } from '@repo/ui';
+import { Form } from '@repo/ui/components/form';
import type { TsErrors } from '@repo/monaco';
import { ChallengeCardEditor } from './ChallengeCardEditor';
import { DescriptionEditor } from './DescriptionEditor';
diff --git a/packages/monaco/src/index.tsx b/packages/monaco/src/index.tsx
index b2d91658..12382e75 100644
--- a/packages/monaco/src/index.tsx
+++ b/packages/monaco/src/index.tsx
@@ -6,12 +6,15 @@ import type * as monaco from 'monaco-editor';
import { useRouter, useSearchParams } from 'next/navigation';
import React, { useState } from 'react';
import lzstring from 'lz-string';
-import { Button, ToastAction, useToast, Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui';
import { useLocalStorage } from './useLocalStorage';
import SplitEditor, { TESTS_PATH, USER_CODE_PATH } from './split-editor';
import { createTwoslashInlayProvider } from './twoslash';
import { PrettierFormatProvider } from './prettier';
import { useResetEditor } from './editor-hooks';
+import { useToast } from '@repo/ui/components/use-toast';
+import { ToastAction } from '@repo/ui/components/toast';
+import { Button } from '@repo/ui/components/button';
+import { Tooltip, TooltipTrigger, TooltipContent } from '@repo/ui/components/tooltip';
export interface CodePanelProps {
challenge: {
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 54b3776a..e7b6b470 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -6,7 +6,7 @@
".": "./src/index.ts",
"./types": "./src/types.ts",
"./icons": "./src/icons.ts",
- "./components": "./src/components"
+ "./components/*": "./src/components/*"
},
"typesVersions": {
"*": {
diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts
deleted file mode 100644
index e00276a5..00000000
--- a/packages/ui/src/index.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-export * from './components/action-menu';
-export * from './components/alert';
-export * from './components/alert-dialog';
-export * from './components/avatar';
-export * from './components/badge';
-export * from './components/button';
-export * from './components/card';
-export * from './components/checkbox';
-export * from './components/dialog';
-export * from './components/difficulty-badge';
-export * from './components/dropdown-menu';
-export * from './components/expandable';
-export * from './components/force-render-until-client';
-export * from './components/form';
-export * from './components/icon-button';
-export * from './components/input';
-export * from './components/label';
-export * from './components/magic-icon';
-export * from './components/markdown';
-export * from './components/navigation-menu';
-export * from './components/pagination';
-export * from './components/paragraph';
-export * from './components/popover';
-export * from './components/progress';
-export * from './components/scroll-area';
-export * from './components/select';
-export * from './components/separator';
-export * from './components/skeleton';
-export * from './components/table';
-export * from './components/tabs';
-export * from './components/textarea';
-export * from './components/toast';
-export * from './components/toaster';
-export * from './components/toggle';
-export * from './components/tooltip';
-export * from './components/typography/h1';
-export * from './components/typography/h2';
-export * from './components/typography/h3';
-export * from './components/typography/large';
-export * from './components/typography/typography';
-export * from './components/use-toast';
-export * from './components/user-badge';