Skip to content

Commit

Permalink
Merge pull request #2 from andostronaut/develop
Browse files Browse the repository at this point in the history
feat: re-arrange import
  • Loading branch information
andostronaut authored Jul 12, 2024
2 parents e240ad3 + 49ea2e2 commit d0235d4
Show file tree
Hide file tree
Showing 12 changed files with 45 additions and 24 deletions.
8 changes: 5 additions & 3 deletions src/app/blog/[slug]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { getPost } from '@/data/blog'
import { DATA } from '@/data/resume'
import { formatDate } from '@/lib/utils'
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 { formatDate } from '@/lib/utils'

export async function generateMetadata({
params,
}: {
Expand Down
4 changes: 3 additions & 1 deletion src/app/blog/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import Link from 'next/link'

import BlurFade from '@/components/magicui/blur-fade'

import { getBlogPosts } from '@/data/blog'
import Link from 'next/link'

export const metadata = {
title: 'Blog',
Expand Down
10 changes: 7 additions & 3 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
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 { DATA } from '@/data/resume'

import { cn } from '@/lib/utils'
import type { Metadata } from 'next'
import { Inter as FontSans } from 'next/font/google'
import './globals.css'

const fontSans = FontSans({
subsets: ['latin'],
Expand Down
6 changes: 4 additions & 2 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import Link from 'next/link'
import Markdown from 'react-markdown'

import { HackathonCard } from '@/components/hackathon-card'
import BlurFade from '@/components/magicui/blur-fade'
import BlurFadeText from '@/components/magicui/blur-fade-text'
import { ProjectCard } from '@/components/project-card'
import { ResumeCard } from '@/components/resume-card'
import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'
import { Badge } from '@/components/ui/badge'

import { DATA } from '@/data/resume'
import Link from 'next/link'
import Markdown from 'react-markdown'

const BLUR_FADE_DELAY = 0.04

Expand Down
3 changes: 2 additions & 1 deletion src/components/hackathon-card.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Link from 'next/link'

import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'
import { Badge } from '@/components/ui/badge'
import Link from 'next/link'

interface Props {
title: string
Expand Down
5 changes: 3 additions & 2 deletions src/components/magicui/blur-fade-text.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
'use client'

import { cn } from '@/lib/utils'
import { AnimatePresence, motion, Variants } from 'framer-motion'
import { useMemo } from 'react'
import { AnimatePresence, motion, Variants } from 'framer-motion'

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

interface BlurFadeTextProps {
text: string
Expand Down
2 changes: 1 addition & 1 deletion src/components/magicui/blur-fade.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client'

import { AnimatePresence, motion, useInView, Variants } from 'framer-motion'
import { useRef } from 'react'
import { AnimatePresence, motion, useInView, Variants } from 'framer-motion'

interface BlurFadeProps {
children: React.ReactNode
Expand Down
5 changes: 3 additions & 2 deletions src/components/magicui/dock.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
'use client'

import { cn } from '@/lib/utils'
import React, { PropsWithChildren, useRef } from 'react'
import { cva, type VariantProps } from 'class-variance-authority'
import { motion, useMotionValue, useSpring, useTransform } from 'framer-motion'
import React, { PropsWithChildren, useRef } from 'react'

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

export interface DockProps extends VariantProps<typeof dockVariants> {
className?: string
Expand Down
3 changes: 2 additions & 1 deletion src/components/mode-toggle.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
'use client'

import { Button } from '@/components/ui/button'
import { MoonIcon, SunIcon } from '@radix-ui/react-icons'
import { useTheme } from 'next-themes'

import { Button } from '@/components/ui/button'

export function ModeToggle() {
const { theme, setTheme } = useTheme()

Expand Down
5 changes: 4 additions & 1 deletion src/components/navbar.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import Link from 'next/link'

import { Dock, DockIcon } from '@/components/magicui/dock'
import { ModeToggle } from '@/components/mode-toggle'
import { buttonVariants } from '@/components/ui/button'
Expand All @@ -7,9 +9,10 @@ import {
TooltipContent,
TooltipTrigger,
} from '@/components/ui/tooltip'

import { DATA } from '@/data/resume'

import { cn } from '@/lib/utils'
import Link from 'next/link'

export default function Navbar() {
return (
Expand Down
8 changes: 5 additions & 3 deletions src/components/project-card.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import Image from 'next/image'
import Link from 'next/link'
import Markdown from 'react-markdown'

import { Badge } from '@/components/ui/badge'
import {
Card,
Expand All @@ -6,10 +10,8 @@ import {
CardHeader,
CardTitle,
} from '@/components/ui/card'

import { cn } from '@/lib/utils'
import Image from 'next/image'
import Link from 'next/link'
import Markdown from 'react-markdown'

interface Props {
title: string
Expand Down
10 changes: 6 additions & 4 deletions src/components/resume-card.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
'use client'

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 { motion } from 'framer-motion'
import { ChevronRightIcon } from 'lucide-react'
import Link from 'next/link'
import React from 'react'

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'

interface ResumeCardProps {
logoUrl: string
altText: string
Expand Down

0 comments on commit d0235d4

Please sign in to comment.