diff --git a/app/blog/[slug]/page.tsx b/app/blog/[slug]/page.tsx index d04a79c..587adb9 100755 --- a/app/blog/[slug]/page.tsx +++ b/app/blog/[slug]/page.tsx @@ -2,10 +2,10 @@ import type { Metadata } from 'next' import { notFound } from 'next/navigation' import { Suspense } from 'react' -import { getPost } from '../../../data/blog' -import { DATA } from '../../../data/resume' +import { getPost } from '@/data/blog' +import { DATA } from '@/data/resume' -import { formatDate } from '../../../lib/utils' +import { formatDate } from '@/lib/utils' export async function generateMetadata({ params, diff --git a/app/blog/page.tsx b/app/blog/page.tsx index cd1f205..d4e81ca 100755 --- a/app/blog/page.tsx +++ b/app/blog/page.tsx @@ -1,8 +1,8 @@ import Link from 'next/link' -import BlurFade from '../../components/magicui/blur-fade' +import BlurFade from '@/components/magicui/blur-fade' -import { getBlogPosts } from '../../data/blog' +import { getBlogPosts } from '@/data/blog' export const metadata = { title: 'Blog', diff --git a/app/layout.tsx b/app/layout.tsx index 929557f..caa6736 100755 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -3,13 +3,13 @@ import './globals.css' import type { Metadata } from 'next' import { Inter as FontSans } from 'next/font/google' -import Navbar from '../components/navbar' -import { ThemeProvider } from '../components/theme-provider' -import { TooltipProvider } from '../components/ui/tooltip' +import Navbar from '@/components/navbar' +import { ThemeProvider } from '@/components/theme-provider' +import { TooltipProvider } from '@/components/ui/tooltip' -import { DATA } from '../data/resume' +import { DATA } from '@/data/resume' -import { cn } from '../lib/utils' +import { cn } from '@/lib/utils' const fontSans = FontSans({ subsets: ['latin'], diff --git a/app/not-found.tsx b/app/not-found.tsx index 68b95a1..bdb5ac6 100644 --- a/app/not-found.tsx +++ b/app/not-found.tsx @@ -2,7 +2,7 @@ import { useRouter } from 'next/navigation' -import { Button } from '../components/ui/button' +import { Button } from '@/components/ui/button' export default function NotFound() { const router = useRouter() diff --git a/app/page.tsx b/app/page.tsx index 1caf772..3221a2e 100755 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,12 +1,12 @@ import Link from 'next/link' import Markdown from 'react-markdown' -import BlurFade from '../components/magicui/blur-fade' -import BlurFadeText from '../components/magicui/blur-fade-text' -import { ProjectCard } from '../components/project-card' -import { Badge } from '../components/ui/badge' +import BlurFade from '@/components/magicui/blur-fade' +import BlurFadeText from '@/components/magicui/blur-fade-text' +import { ProjectCard } from '@/components/project-card' +import { Badge } from '@/components/ui/badge' -import { DATA } from '../data/resume' +import { DATA } from '@/data/resume' const BLUR_FADE_DELAY = 0.04 diff --git a/components/hackathon-card.tsx b/components/hackathon-card.tsx index d474085..6825695 100755 --- a/components/hackathon-card.tsx +++ b/components/hackathon-card.tsx @@ -1,7 +1,7 @@ import Link from 'next/link' -import { Avatar, AvatarFallback, AvatarImage } from './ui/avatar' -import { Badge } from './ui/badge' +import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar' +import { Badge } from '@/components/ui/badge' interface Props { title: string diff --git a/components/magicui/blur-fade-text.tsx b/components/magicui/blur-fade-text.tsx index 437aedf..a54928e 100755 --- a/components/magicui/blur-fade-text.tsx +++ b/components/magicui/blur-fade-text.tsx @@ -3,7 +3,7 @@ import { useMemo } from 'react' import { AnimatePresence, motion, Variants } from 'framer-motion' -import { cn } from '../../lib/utils' +import { cn } from '@/lib/utils' interface BlurFadeTextProps { text: string diff --git a/components/magicui/dock.tsx b/components/magicui/dock.tsx index 4cb5f05..cf4c37e 100755 --- a/components/magicui/dock.tsx +++ b/components/magicui/dock.tsx @@ -4,7 +4,7 @@ import React, { PropsWithChildren, useRef } from 'react' import { cva, type VariantProps } from 'class-variance-authority' import { motion, useMotionValue, useSpring, useTransform } from 'framer-motion' -import { cn } from '../../lib/utils' +import { cn } from '@/lib/utils' export interface DockProps extends VariantProps { className?: string diff --git a/components/mode-toggle.tsx b/components/mode-toggle.tsx index 00cfa60..dcd4eaf 100755 --- a/components/mode-toggle.tsx +++ b/components/mode-toggle.tsx @@ -3,7 +3,7 @@ import { MoonIcon, SunIcon } from '@radix-ui/react-icons' import { useTheme } from 'next-themes' -import { Button } from './ui/button' +import { Button } from '@/components/ui/button' export function ModeToggle() { const { theme, setTheme } = useTheme() diff --git a/components/navbar.tsx b/components/navbar.tsx index 63c1ed8..90b3f5b 100755 --- a/components/navbar.tsx +++ b/components/navbar.tsx @@ -1,14 +1,18 @@ import Link from 'next/link' -import { Dock, DockIcon } from './magicui/dock' -import { ModeToggle } from './mode-toggle' -import { buttonVariants } from './ui/button' -import { Separator } from './ui/separator' -import { Tooltip, TooltipContent, TooltipTrigger } from './ui/tooltip' +import { Dock, DockIcon } from '@/components/magicui/dock' +import { ModeToggle } from '@/components/mode-toggle' +import { buttonVariants } from '@/components/ui/button' +import { Separator } from '@/components/ui/separator' +import { + Tooltip, + TooltipContent, + TooltipTrigger, +} from '@/components/ui/tooltip' -import { DATA } from '../data/resume' +import { DATA } from '@/data/resume' -import { cn } from '../lib/utils' +import { cn } from '@/lib/utils' export default function Navbar() { return ( diff --git a/components/project-card.tsx b/components/project-card.tsx index 86ca9ef..615b159 100755 --- a/components/project-card.tsx +++ b/components/project-card.tsx @@ -2,10 +2,16 @@ import Image from 'next/image' import Link from 'next/link' import Markdown from 'react-markdown' -import { Badge } from './ui/badge' -import { Card, CardContent, CardFooter, CardHeader, CardTitle } from './ui/card' +import { Badge } from '@/components/ui/badge' +import { + Card, + CardContent, + CardFooter, + CardHeader, + CardTitle, +} from '@/components/ui/card' -import { cn } from '../lib/utils' +import { cn } from '@/lib/utils' interface Props { title: string diff --git a/components/resume-card.tsx b/components/resume-card.tsx index 843530e..4e4bb81 100755 --- a/components/resume-card.tsx +++ b/components/resume-card.tsx @@ -5,11 +5,11 @@ import { ChevronRightIcon } from 'lucide-react' import Link from 'next/link' import React from 'react' -import { Avatar, AvatarFallback, AvatarImage } from './ui/avatar' -import { Badge } from './ui/badge' -import { Card, CardHeader } from './ui/card' +import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar' +import { Badge } from '@/components/ui/badge' +import { Card, CardHeader } from '@/components/ui/card' -import { cn } from '../lib/utils' +import { cn } from '@/lib/utils' interface ResumeCardProps { logoUrl: string diff --git a/components/ui/avatar.tsx b/components/ui/avatar.tsx index 5234ecb..4ea9b93 100755 --- a/components/ui/avatar.tsx +++ b/components/ui/avatar.tsx @@ -3,7 +3,7 @@ import * as React from 'react' import * as AvatarPrimitive from '@radix-ui/react-avatar' -import { cn } from '../../lib/utils' +import { cn } from '@/lib/utils' const Avatar = React.forwardRef< React.ElementRef, diff --git a/components/ui/badge.tsx b/components/ui/badge.tsx index 0ba76d0..c4457ec 100755 --- a/components/ui/badge.tsx +++ b/components/ui/badge.tsx @@ -1,7 +1,7 @@ import * as React from 'react' import { cva, type VariantProps } from 'class-variance-authority' -import { cn } from '../../lib/utils' +import { cn } from '@/lib/utils' const badgeVariants = cva( 'inline-flex items-center rounded-md border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2', diff --git a/components/ui/button.tsx b/components/ui/button.tsx index 799d022..b19b265 100755 --- a/components/ui/button.tsx +++ b/components/ui/button.tsx @@ -2,7 +2,7 @@ import { Slot } from '@radix-ui/react-slot' import { cva, type VariantProps } from 'class-variance-authority' import * as React from 'react' -import { cn } from '../../lib/utils' +import { cn } from '@/lib/utils' const buttonVariants = cva( 'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50', diff --git a/components/ui/card.tsx b/components/ui/card.tsx index 09a3ecc..c0b918c 100755 --- a/components/ui/card.tsx +++ b/components/ui/card.tsx @@ -1,6 +1,6 @@ import * as React from 'react' -import { cn } from '../../lib/utils' +import { cn } from '@/lib/utils' const Card = React.forwardRef< HTMLDivElement, diff --git a/components/ui/separator.tsx b/components/ui/separator.tsx index 428739a..6c55e0b 100755 --- a/components/ui/separator.tsx +++ b/components/ui/separator.tsx @@ -3,7 +3,7 @@ import * as React from 'react' import * as SeparatorPrimitive from '@radix-ui/react-separator' -import { cn } from '../../lib/utils' +import { cn } from '@/lib/utils' const Separator = React.forwardRef< React.ElementRef, diff --git a/components/ui/tooltip.tsx b/components/ui/tooltip.tsx index c3ca4f5..65cfdeb 100755 --- a/components/ui/tooltip.tsx +++ b/components/ui/tooltip.tsx @@ -3,7 +3,7 @@ import * as TooltipPrimitive from '@radix-ui/react-tooltip' import * as React from 'react' -import { cn } from '../../lib/utils' +import { cn } from '@/lib/utils' const TooltipProvider = TooltipPrimitive.Provider diff --git a/data/resume.tsx b/data/resume.tsx index dc78d80..dce5506 100755 --- a/data/resume.tsx +++ b/data/resume.tsx @@ -1,4 +1,4 @@ -import { Icons } from '../components/icons' +import { Icons } from '@/components/icons' import { CodeIcon, HomeIcon } from 'lucide-react' export const DATA = { diff --git a/tailwind.config.ts b/tailwind.config.ts index c692a20..6dbf2fa 100755 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -3,12 +3,7 @@ import { fontFamily } from 'tailwindcss/defaultTheme' const config = { darkMode: ['class'], - content: [ - './pages/**/*.{ts,tsx}', - './components/**/*.{ts,tsx}', - './app/**/*.{ts,tsx}', - './src/**/*.{ts,tsx}', - ], + content: ['./components/**/*.{ts,tsx}', './app/**/*.{ts,tsx}'], prefix: '', theme: { container: { diff --git a/tsconfig.json b/tsconfig.json index 7b28589..e7ff90f 100755 --- a/tsconfig.json +++ b/tsconfig.json @@ -18,7 +18,7 @@ } ], "paths": { - "@/*": ["./src/*"] + "@/*": ["./*"] } }, "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],