Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add clsx, twMerge and cva to make css easier #12

Merged
merged 9 commits into from
Jun 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 44 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,12 @@
"build-storybook": "storybook build"
},
"dependencies": {
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"next": "14.2.3",
"react": "^18",
"react-dom": "^18"
"react-dom": "^18",
"tailwind-merge": "^2.3.0"
},
"devDependencies": {
"@chromatic-com/storybook": "^1.4.0",
Expand Down
32 changes: 32 additions & 0 deletions src/app/cc/error.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
'use client'

import { useEffect } from 'react'
import { Button } from '@/components/button'

const Error = ({
error,
reset,
}: {
error: Error & { digest?: string }
reset: () => void
}) => {
useEffect(() => {
// Log the error to an error reporting service
console.error(error)
}, [error])

return (
<div>
<h2>Something went wrong!</h2>
<Button
label="Try again"
onClick={
// Attempt to recover by trying to re-render the segment
() => reset()
}
/>
</div>
)
}

export default Error
9 changes: 9 additions & 0 deletions src/app/cc/layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const Layout = ({ children }: React.PropsWithChildren) => {
return (
<div className="w-full min-h-screen flex flex-col justify-center items-center gap-4">
{children}
</div>
)
}

export default Layout
32 changes: 32 additions & 0 deletions src/app/cc/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
'use client'

import React, { Suspense, use } from 'react'

import { fetchData } from '@/app/data'
import { Button } from '@/components/button'
import LoadingIndicator from '@/components/loading-indicator'
import { ResponseOk } from '@/models/interface'

const Message = () => {
const data: ResponseOk = use(fetchData('/api/delay'))

return <div>{data?.message}</div>
}

const Page = () => {
return (
<>
<h1 className="text-lg font-semibold">Data received during SSR</h1>
<Suspense fallback={<LoadingIndicator />}>
<Message />
</Suspense>
<Button
label="클릭"
className="bg-sky-400"
onClick={() => alert('ok!')}
/>
</>
)
}

export default Page
37 changes: 37 additions & 0 deletions src/app/data.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { APIError } from '@/models/interface'

const getDelay = async () => {
try {
const res = await fetch('http://localhost:3000/api/delay?delay=1000', {
headers: {
'Content-Type': 'application/json',
},
})

const data = await res.json()
if (Reflect.has(data, 'ok') && Reflect.has(data, 'message')) return data

throw new APIError({ name: 'api/delay', message: 'API Error' })
} catch (e) {
if (e instanceof Error) {
return e
}
}
}

const getData = async (url: string) => {
if (url === '/api/delay') {
return getDelay()
} else {
throw Error('Not implemented')
}
}

let cache = new Map()

export const fetchData = (url: string) => {
if (!cache.has(url)) {
cache.set(url, getData(url))
}
return cache.get(url)
}
6 changes: 0 additions & 6 deletions src/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@

body {
color: rgb(var(--foreground-rgb));
background: linear-gradient(
to bottom,
transparent,
rgb(var(--background-end-rgb))
)
rgb(var(--background-start-rgb));
}

@layer utilities {
Expand Down
127 changes: 18 additions & 109 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,113 +1,22 @@
import Image from "next/image";
import Link from 'next/link'

export default function Home() {
const Home = () => {
return (
<main className="flex min-h-screen flex-col items-center justify-between p-24">
<div className="z-10 w-full max-w-5xl items-center justify-between font-mono text-sm lg:flex">
<p className="fixed left-0 top-0 flex w-full justify-center border-b border-gray-300 bg-gradient-to-b from-zinc-200 pb-6 pt-8 backdrop-blur-2xl dark:border-neutral-800 dark:bg-zinc-800/30 dark:from-inherit lg:static lg:w-auto lg:rounded-xl lg:border lg:bg-gray-200 lg:p-4 lg:dark:bg-zinc-800/30">
Get started by editing&nbsp;
<code className="font-mono font-bold">src/app/page.tsx</code>
</p>
<div className="fixed bottom-0 left-0 flex h-48 w-full items-end justify-center bg-gradient-to-t from-white via-white dark:from-black dark:via-black lg:static lg:size-auto lg:bg-none">
<a
className="pointer-events-none flex place-items-center gap-2 p-8 lg:pointer-events-auto lg:p-0"
href="https://vercel.com?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
target="_blank"
rel="noopener noreferrer"
>
By{" "}
<Image
src="/vercel.svg"
alt="Vercel Logo"
className="dark:invert"
width={100}
height={24}
priority
/>
</a>
</div>
</div>

<div className="relative z-[-1] flex place-items-center before:absolute before:h-[300px] before:w-full before:-translate-x-1/2 before:rounded-full before:bg-gradient-radial before:from-white before:to-transparent before:blur-2xl before:content-[''] after:absolute after:-z-20 after:h-[180px] after:w-full after:translate-x-1/3 after:bg-gradient-conic after:from-sky-200 after:via-blue-200 after:blur-2xl after:content-[''] before:dark:bg-gradient-to-br before:dark:from-transparent before:dark:to-blue-700 before:dark:opacity-10 after:dark:from-sky-900 after:dark:via-[#0141ff] after:dark:opacity-40 sm:before:w-[480px] sm:after:w-[240px] before:lg:h-[360px]">
<Image
className="relative dark:drop-shadow-[0_0_0.3rem_#ffffff70] dark:invert"
src="/next.svg"
alt="Next.js Logo"
width={180}
height={37}
priority
/>
</div>

<div className="mb-32 grid text-center lg:mb-0 lg:w-full lg:max-w-5xl lg:grid-cols-4 lg:text-left">
<a
href="https://nextjs.org/docs?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
target="_blank"
rel="noopener noreferrer"
>
<h2 className="mb-3 text-2xl font-semibold">
Docs{" "}
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-&gt;
</span>
</h2>
<p className="m-0 max-w-[30ch] text-sm opacity-50">
Find in-depth information about Next.js features and API.
</p>
</a>

<a
href="https://nextjs.org/learn?utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app"
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
target="_blank"
rel="noopener noreferrer"
>
<h2 className="mb-3 text-2xl font-semibold">
Learn{" "}
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-&gt;
</span>
</h2>
<p className="m-0 max-w-[30ch] text-sm opacity-50">
Learn about Next.js in an interactive course with&nbsp;quizzes!
</p>
</a>

<a
href="https://vercel.com/templates?framework=next.js&utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
target="_blank"
rel="noopener noreferrer"
>
<h2 className="mb-3 text-2xl font-semibold">
Templates{" "}
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-&gt;
</span>
</h2>
<p className="m-0 max-w-[30ch] text-sm opacity-50">
Explore starter templates for Next.js.
</p>
</a>

<a
href="https://vercel.com/new?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
target="_blank"
rel="noopener noreferrer"
>
<h2 className="mb-3 text-2xl font-semibold">
Deploy{" "}
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-&gt;
</span>
</h2>
<p className="m-0 max-w-[30ch] text-balance text-sm opacity-50">
Instantly deploy your Next.js site to a shareable URL with Vercel.
</p>
</a>
</div>
<main className="w-full min-h-screen flex flex-col justify-center items-center">
<ul className="list-disc text-xl space-y-4">
<li>
<Link href="/cc" className="underline hover:text-sky-400">
Client Components Example
</Link>
</li>
<li>
<Link href="/rsc" className="underline hover:text-sky-400">
React Server Components Example
</Link>
</li>
</ul>
</main>
);
)
}

export default Home
9 changes: 9 additions & 0 deletions src/app/rsc/layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const Layout = ({ children }: React.PropsWithChildren) => {
return (
<div className="w-full min-h-screen flex flex-col justify-center items-center gap-4">
{children}
</div>
)
}

export default Layout
23 changes: 23 additions & 0 deletions src/app/rsc/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { Suspense } from 'react'

import { fetchData } from '@/app/data'
import { Button } from '@/components/button'
import LoadingIndicator from '@/components/loading-indicator'
import { ResponseOk } from '@/models/interface'

const Page = async () => {
const data: ResponseOk = await fetchData('/api/delay')
const message: string = data.message

return (
<>
<h1 className="text-lg font-semibold">Data received during RSC render</h1>
<Suspense fallback={<LoadingIndicator />}>
<div>{message}</div>
<Button variant="secondary" label="아무 일도 일어나지 않는 버튼" />
</Suspense>
</>
)
}

export default Page
Loading
Loading