Skip to content

Commit

Permalink
chore: update import to use alias
Browse files Browse the repository at this point in the history
  • Loading branch information
andostronaut committed Jul 13, 2024
1 parent 2579127 commit 11da0aa
Show file tree
Hide file tree
Showing 21 changed files with 54 additions and 49 deletions.
6 changes: 3 additions & 3 deletions app/blog/[slug]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions app/blog/page.tsx
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
10 changes: 5 additions & 5 deletions app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down
2 changes: 1 addition & 1 deletion app/not-found.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
10 changes: 5 additions & 5 deletions app/page.tsx
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions components/hackathon-card.tsx
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion components/magicui/blur-fade-text.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion components/magicui/dock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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<typeof dockVariants> {
className?: string
Expand Down
2 changes: 1 addition & 1 deletion components/mode-toggle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
18 changes: 11 additions & 7 deletions components/navbar.tsx
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
12 changes: 9 additions & 3 deletions components/project-card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions components/resume-card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion components/ui/avatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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<typeof AvatarPrimitive.Root>,
Expand Down
2 changes: 1 addition & 1 deletion components/ui/badge.tsx
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
2 changes: 1 addition & 1 deletion components/ui/button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion components/ui/card.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react'

import { cn } from '../../lib/utils'
import { cn } from '@/lib/utils'

const Card = React.forwardRef<
HTMLDivElement,
Expand Down
2 changes: 1 addition & 1 deletion components/ui/separator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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<typeof SeparatorPrimitive.Root>,
Expand Down
2 changes: 1 addition & 1 deletion components/ui/tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion data/resume.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Icons } from '../components/icons'
import { Icons } from '@/components/icons'
import { CodeIcon, HomeIcon } from 'lucide-react'

export const DATA = {
Expand Down
7 changes: 1 addition & 6 deletions tailwind.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
],
"paths": {
"@/*": ["./src/*"]
"@/*": ["./*"]
}
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
Expand Down

0 comments on commit 11da0aa

Please sign in to comment.