FIX: Cyclic Import

This is not clear for now atleast. Feel free to update with the changes. Will be resolving in hotly.

apps/web/app/admin/page.tsx

@@ -1,4 +1,4 @@
-import { Admin } from "@repo/ui/pages";
+import { Admin } from "../../components/pages";
 import { AppbarClient } from "../../components/AppbarClient";
 
 export default async function AdminPage() {

packages/ui/src/AddProblemCard.tsx → apps/web/components/AddProblemCard.tsx

@@ -1,15 +1,12 @@
 "use client";
 import { useState } from "react";
-import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "./shad/ui/card";
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "./shad/ui/select";
-import { Input } from "./shad/ui/input";
-import { Button } from "./shad/ui/button";
-import { useToast } from "./shad/ui/use-toast";
-import { createProblem } from "../../../apps/web/components/utils";
-import { useRouter } from "next/navigation";
-import { Problem,ProblemType } from "@prisma/client";
-import { createProblem, createProblemStatement } from "../../../apps/web/components/utils";
-import ProblemStatementForm from "./code/admin/ProblemStatementForm";
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@repo/ui/shad/ui";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@repo/ui/shad/ui";
+import { Input } from "@repo/ui/shad/ui";
+import { Button } from "@repo/ui/shad/ui";
+import { useToast } from "@repo/ui/shad/ui";
+import { ProblemType } from "@prisma/client";
+import { createProblem, createProblemStatement } from "./utils";
 
 interface Problem {
   id: string;

apps/web/components/AddProblemStatementForm.tsx

@@ -1,14 +1,14 @@
 "use client";
-import { Input } from "@repo/ui/input";
+import { Input } from "@repo/ui/shad/ui";
 import { useState } from "react";
 import { Problem, CodeLanguage } from "@prisma/client";
-import { Button } from "@repo/ui/button";
-import { Label } from "@repo/ui/label";
-import { Checkbox } from "@repo/ui/checkbox";
+import { Button } from "@repo/ui/shad/ui";
+import { Label } from "@repo/ui/shad/ui";
+import { Checkbox } from "@repo/ui/shad/ui";
 import AddTestCase from "./AddTestCase";
 import { useRecoilValue } from "recoil";
 import { adminTestCasesState } from "@repo/store";
-import { Card, CardContent } from "@repo/ui/card";
+import { Card, CardContent } from "@repo/ui/shad/ui";
 import { createProblemStatement } from "./utils";
 
 export const AddProblemStatementForm = ({ problem, languages }: { problem: Problem; languages: CodeLanguage[] }) => {

apps/web/components/AddTestCase.tsx

@@ -1,9 +1,9 @@
 "use client";
-import { Input } from "@repo/ui/input";
-import { Button } from "@repo/ui/button";
-import { Label } from "@repo/ui/label";
+import { Input } from "@repo/ui/shad/ui";
+import { Button } from "@repo/ui/shad/ui";
+import { Label } from "@repo/ui/shad/ui";
 
-import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from "@repo/ui/components";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from "@repo/ui/shad/ui";
 import { useState } from "react";
 import { useSetRecoilState } from "recoil";
 import { adminTestCasesState } from "@repo/store";

packages/ui/src/AddTrackCard.tsx → apps/web/components/AddTrackCard.tsx

@@ -1,9 +1,9 @@
 "use client";
 import { useState } from "react";
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "./shad/ui/card";
-import { Input } from "./shad/ui/input";
-import { Button } from "./shad/ui/button";
-import { useToast } from "./shad/ui/use-toast";
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@repo/ui/shad/ui";
+import { Input } from "@repo/ui/shad/ui";
+import { Button } from "@repo/ui/shad/ui";
+import { useToast } from "@repo/ui/shad/ui";
 import { createTrack } from "../../../apps/web/components/utils";
 import { Categories } from "@prisma/client";
 import { Track } from "@prisma/client";

packages/ui/src/AdminAddMCQ.tsx → apps/web/components/AdminAddMCQ.tsx

@@ -1,8 +1,8 @@
 import { useEffect, useState } from "react";
-import { Sheet, SheetContent, SheetTrigger } from "./shad/ui/sheet";
-import { Button } from "./shad/ui/button";
-import { Input } from "./shad/ui/input";
-import { Card, CardDescription, CardTitle } from "./shad/ui/card";
+import { Sheet, SheetContent, SheetTrigger } from "@repo/ui/shad/ui";
+import { Button } from "@repo/ui/shad/ui";
+import { Input } from "@repo/ui/shad/ui";
+import { Card, CardDescription, CardTitle } from "@repo/ui/shad/ui";
 import { MCQQuestion, Problem } from "@prisma/client";
 import { createMCQ, deleteMCQ, getAllMCQQuestion } from "web/components/utils";
 import EditMCQ from "./mcq/EditMCQ";

packages/ui/src/AdminButton.tsx → apps/web/components/AdminButton.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useEffect, useState } from "react";
-import { Button } from ".";
+import { Button } from "@repo/ui/shad/ui";
 import { useRouter } from "next/navigation";
 
 export const AdminButton = () => {

packages/ui/src/AdminMCQ.tsx → apps/web/components/AdminMCQ.tsx

@@ -1,7 +1,7 @@
 "use client";
 import { useEffect, useState } from "react";
 import {  getAllMCQs } from "../../../apps/web/components/utils";
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "./shad/ui/card";
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@repo/ui/shad/ui";
 import { Problem, MCQQuestion } from "@prisma/client";
 import AdminAddMCQ from "./AdminAddMCQ";
 

packages/ui/src/Appbar.tsx → apps/web/components/Appbar.tsx

@@ -1,5 +1,5 @@
 import Link from "next/link";
-import { Button } from ".";
+import { Button } from "@repo/ui/shad/ui";
 import { ModeToggle } from "./ModeToggle";
 import { signIn } from "next-auth/react";
 

apps/web/components/AppbarClient.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { Appbar } from "@repo/ui/components";
+import { Appbar } from "../components/Appbar";
 import { Track, Problem } from "@prisma/client";
 
 export const AppbarClient = ({ tracks }: { tracks: (Track & { problems: Problem[] })[] }) => {

packages/ui/src/BlogAppbar.tsx → apps/web/components/BlogAppbar.tsx

@@ -1,15 +1,15 @@
 "use client";
 
-import { Button } from "./shad/ui/button";
+import { Button } from "@repo/ui/shad/ui";
 import { Problem, Track, CodeLanguage, ProblemStatement, TestCase } from "@prisma/client";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useState } from "react";
 import Link from "next/link";
 import { ChevronLeftIcon, ChevronRightIcon, DownloadIcon } from "@radix-ui/react-icons";
 import { ModeToggle } from "./ModeToggle";
 import { PageToggle } from "./PageToggle";
 import { useRouter } from "next/navigation";
 import UserAccountDropDown from "./UserAccountDropDown";
-import { Codebar } from "./code/Codebar";
+import { Codebar } from "web/components/code/Codebar";
 
 export const BlogAppbar = ({
   problem,

packages/ui/src/Categories.tsx → apps/web/components/Categories.tsx

@@ -1,8 +1,8 @@
 "use client";
 import { useRecoilState } from "recoil";
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "./shad/ui/select";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@repo/ui/shad/ui";
 import { category } from "@repo/store";
-import { Button } from "./shad/ui/button";
+import { Button } from "@repo/ui/shad/ui";
 
 interface Category {
   category: string;

packages/ui/src/CodeBlock.tsx → apps/web/components/CodeBlock.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from "react";
 import hljs from "highlight.js";
 import javascript from "highlight.js/lib/languages/javascript";
-import styles from "../app/CodeBlock.module.css";
+import styles from "./CodeBlock.module.css";
 import "highlight.js/styles/github-dark.css";
 
 export default function CodeBlock({ block }: { block: any }) {

packages/ui/src/CompleteAddTracks.tsx → apps/web/components/CompleteAddTracks.tsx

@@ -1,9 +1,9 @@
 "use client";
 import { useEffect, useState } from "react";
-import { Input } from "./shad/ui/input";
-import { Track,Categories,TrackCategory } from "@prisma/client";
+import { Input } from "@repo/ui/shad/ui";
+import { Categories } from "@prisma/client";
 import CompleteTrackCard from "./CompleteTrackCard";
-import { Button } from "./shad/ui/button";
+import { Button } from "@repo/ui/shad/ui";
 
 export interface CompleteTrack {
   trackId: string;

packages/ui/src/CompleteTrackCard.tsx → apps/web/components/CompleteTrackCard.tsx

@@ -1,8 +1,8 @@
 import { Prisma, ProblemType } from "@prisma/client";
 import { useEffect, useState } from "react";
-import { Sheet, SheetContent, SheetDescription, SheetHeader, SheetTitle, SheetTrigger } from "./shad/ui/sheet";
+import { Sheet, SheetContent, SheetDescription, SheetHeader, SheetTitle, SheetTrigger } from "@repo/ui/shad/ui";
 import EditProblem from "./EditProblem";
-import { Button } from "./shad/ui/button";
+import { Button } from "@repo/ui/shad/ui";
 import { createTrack } from "../../../apps/web/components/utils";
 
 interface CompleteProblemCard {

packages/ui/src/EditProblem.tsx → apps/web/components/EditProblem.tsx

@@ -1,9 +1,9 @@
 "use client";
 import { Prisma } from "@prisma/client";
 import { useState } from "react";
-import { Button } from "./shad/ui/button";
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "./shad/ui/card";
-import { Input } from "./shad/ui/input";
+import { Button } from "@repo/ui/shad/ui";
+import { Card, CardContent, CardHeader, CardTitle } from "@repo/ui/shad/ui";
+import { Input } from "@repo/ui/shad/ui";
 
 const EditProblem = ({ problem }: { problem: Prisma.ProblemCreateManyInput }) => {
   const [isEditing, setIsEditing] = useState(false);

packages/ui/src/EditTrackCard.tsx → apps/web/components/EditTrackCard.tsx

@@ -1,9 +1,9 @@
 "use client";
 import { useState } from "react";
-import { Button } from "./shad/ui/button";
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "./shad/ui/card";
+import { Button } from "@repo/ui/shad/ui";
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@repo/ui/shad/ui";
 import { Track,Categories } from "@prisma/client";
-import { Input } from "./shad/ui/input";
+import { Input } from "@repo/ui/shad/ui";
 import { updateTrack } from "../../../apps/web/components/utils";
 
 interface TrackCardProps extends Track {

apps/web/components/LessonView.tsx

@@ -1,12 +1,12 @@
-import { Blog } from "@repo/ui/Blog";
-import { CodeProblemRenderer } from "@repo/ui/CodeProblemRenderer";
+import { Blog } from "./Blog";
 import { Problem, Track, ProblemStatement, CodeLanguage, TestCase } from "@prisma/client";
-import MCQRenderer from "@repo/ui/MCQRenderer";
-import RedirectToLoginCard from '@repo/ui/RedirectToLoginCard';
+import MCQRenderer from "./mcq/MCQRenderer";
+import RedirectToLoginCard from './RedirectToLoginCard';
 
 import db from "@repo/db/client";
 import { getServerSession } from "next-auth";
 import { authOptions } from "../lib/auth";
+import { CodeProblemRenderer } from "./code/CodeProblemRenderer";
 
 const getSubmissions = async (problemStatementId: string) => {
   const session = await getServerSession(authOptions);

packages/ui/src/LinkCard.tsx → apps/web/components/LinkCard.tsx

@@ -1,12 +1,12 @@
 "use client";
-import { Button } from "./shad/ui/button";
+import { Button } from "@repo/ui/shad/ui";
 import { TrackProblems, Track } from "@prisma/client";
-import { Input } from "./shad/ui/input";
-import { Sheet, SheetContent, SheetTrigger } from "./shad/ui/sheet";
+import { Input } from "@repo/ui/shad/ui";
+import { Sheet, SheetContent, SheetTrigger } from "@repo/ui/shad/ui";
 import ProblemCard from "./ProblemCard";
 import { useState } from "react";
 import { createTrackProblems } from "../../../apps/web/components/utils";
-import { Card, CardDescription, CardTitle } from "./shad/ui/card";
+import { Card, CardDescription, CardTitle } from "@repo/ui/shad/ui";
 
 interface LinkCardProps extends Track {
   problems: {

packages/ui/src/LinkProblems.tsx → apps/web/components/LinkProblems.tsx

@@ -1,11 +1,10 @@
 "use client";
-import { ScrollArea } from "./shad/ui/scroll-area";
+import { ScrollArea } from "@repo/ui/shad/ui";
 import { Track } from "@prisma/client";
-import { Input } from "./shad/ui/input";
+import { Input } from "@repo/ui/shad/ui";
 import { MagnifyingGlassIcon } from "@radix-ui/react-icons";
 import { useEffect, useState } from "react";
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "./shad/ui/card";
-import { Button } from "./shad/ui/button";
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@repo/ui/shad/ui";
 import LinkCard from "./LinkCard";
 
 interface LinkProblemsProps extends Track {

packages/ui/src/ModeToggle.tsx → apps/web/components/ModeToggle.tsx

@@ -2,8 +2,8 @@
 import { MoonIcon, SunIcon } from "@radix-ui/react-icons";
 import { useTheme } from "next-themes";
 
-import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "./shad/ui/dropdown-menu";
-import { Button } from "./shad/ui/button";
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@repo/ui/shad/ui";
+import { Button } from "@repo/ui/shad/ui";
 
 export function ModeToggle() {
   const { setTheme } = useTheme();

packages/ui/src/PageToggle.tsx → apps/web/components/PageToggle.tsx

@@ -1,8 +1,8 @@
 import { ArrowTopRightIcon } from "@radix-ui/react-icons";
 import { useParams } from "next/navigation";
-import { cn } from "../lib/utils";
-import { Button } from "./shad/ui/button";
-import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "./shad/ui/dropdown-menu";
+import { cn } from "@repo/ui/utils";
+import { Button } from "@repo/ui/shad/ui";
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@repo/ui/shad/ui";
 import { Track, Problem } from "@prisma/client";
 import Link from "next/link";
 

packages/ui/src/ProblemCard.tsx → apps/web/components/ProblemCard.tsx

@@ -1,11 +1,11 @@
 "use client";
 import { useState } from "react";
-import { Button } from "./shad/ui/button";
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "./shad/ui/card";
+import { Button } from "@repo/ui/shad/ui";
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@repo/ui/shad/ui";
 import { Problem, ProblemStatement } from "@prisma/client";
-import { Input } from "./shad/ui/input";
+import { Input } from "@repo/ui/shad/ui";
 import { updateProblem } from "../../../apps/web/components/utils";
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "./shad/ui/select";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@repo/ui/shad/ui";
 import { useRouter } from "next/navigation";
 
 const ProblemCard = ({ problem }: { problem: Problem & { problemStatement: ProblemStatement | null } }) => {

packages/ui/src/ProblemEditor.tsx → apps/web/components/ProblemEditor.tsx

@@ -1,5 +1,5 @@
 import { Problem, ProblemStatement } from "@prisma/client";
-import { ScrollArea } from "./shad/ui/scroll-area";
+import { ScrollArea } from "@repo/ui/shad/ui";
 import ProblemCard from "./ProblemCard";
 import AddProblemCard from "./AddProblemCard";
 

apps/web/components/ProblemSubmissionTable.tsx

@@ -1,6 +1,6 @@
 "use client";
 import React from "react";
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@repo/ui/table";
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@repo/ui/shad/ui";
 import { Clock4, CodeXml } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { Submission } from "@prisma/client";

apps/web/components/ProfileSidebar.tsx

@@ -1,8 +1,8 @@
 "use client";
 import React from "react";
-import UserImage from "@repo/ui/UserImage";
+import UserImage from "./UserImage";
 import { UserRound } from "lucide-react";
-import ProfileOptions from "@repo/ui/profileOptions";
+import ProfileOptions from "./profile/ProfileOptions";
 import { useRecoilValue } from "recoil";
 import { profileSidebar } from "@repo/store";
 import { useSession } from "next-auth/react";

apps/web/components/Providers.tsx

@@ -5,14 +5,14 @@ import * as React from "react";
 import { ThemeProvider as NextThemesProvider } from "next-themes";
 import { type ThemeProviderProps } from "next-themes/dist/types";
 import { SessionProvider } from "next-auth/react";
-import { Toaster } from "@repo/ui/toaster";
+import {  } from "@repo/ui/shad/ui";
 
 export const Providers = ({ children }: { children: React.ReactNode }) => {
   return (
     <SessionProvider>
       <RecoilRoot>
         {children}
-        <Toaster />
+        {/* < /> */}
       </RecoilRoot>
     </SessionProvider>
   );

apps/web/components/RedirectToLastSolved.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { Loader } from "@repo/ui/components";
+import { Loader } from "./Loader";
 import { useEffect } from "react";
 import { useRouter } from "next/navigation";
 import { getFirstProblemForTrack } from "./utils";

packages/ui/src/RedirectToLoginCard.tsx → apps/web/components/RedirectToLoginCard.tsx

@@ -1,7 +1,7 @@
 "use client";
 import { usePathname, useRouter } from "next/navigation";
-import { Button } from "./shad/ui/button";
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "./shad/ui/card";
+import { Button } from "@repo/ui/shad/ui";
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@repo/ui/shad/ui";
 
 const RedirectToLoginCard = () => {
   const router = useRouter();

packages/ui/src/SearchDialog.tsx → apps/web/components/SearchDialog.tsx

@@ -1,10 +1,10 @@
 "use client";
 
 import { Cross2Icon, MagnifyingGlassIcon } from "@radix-ui/react-icons";
-import { Button } from "./shad/ui/button";
-import { Dialog, DialogClose, DialogContent } from "./shad/ui/dailog";
+import { Button } from "@repo/ui/shad/ui";
+import { Dialog, DialogClose, DialogContent } from "@repo/ui/shad/ui";
 import { useEffect, useRef, useState } from "react";
-import { Input } from "./shad/ui/input";
+import { Input } from "@repo/ui/shad/ui";
 import { Track, Problem } from "@prisma/client";
 import { TrackList } from "./TrackList";
 import Link from "next/link";

packages/ui/src/TrackCard.tsx → apps/web/components/TrackCard.tsx

@@ -1,5 +1,5 @@
-import { Button } from "./shad/ui/button";
-import { Card, CardDescription, CardHeader, CardTitle } from "./shad/ui/card";
+import { Button } from "@repo/ui/shad/ui";
+import { Card, CardDescription, CardHeader, CardTitle } from "@repo/ui/shad/ui";
 
 import { ArrowRightIcon, ChevronRightIcon } from "@radix-ui/react-icons";
 import { Track, Problem } from "@prisma/client";

packages/ui/src/Tracks.tsx → apps/web/components/Tracks.tsx

@@ -1,11 +1,11 @@
 "use client";
 import Link from "next/link";
-import { TrackCard } from "@repo/ui/components";
+import { TrackCard } from "./TrackCard";
 import { category } from "@repo/store";
 import { Track, Problem } from "@prisma/client";
 import { useRecoilValue } from "recoil";
 import { useEffect, useState } from "react";
-import { Select, SelectTrigger, SelectValue, SelectContent, SelectGroup, SelectItem } from "./shad/ui/select";
+import { Select, SelectTrigger, SelectValue, SelectContent, SelectGroup, SelectItem } from "@repo/ui/shad/ui";
 
 interface Tracks extends Track {
   problems: Problem[];