Merge pull request #15 from final-project-temporaryName/chore/design-…

…system [송규경] Chore/Design: Design System 세팅 및 Nested CSS warning 해결
ArtTalkTalk · Jan 25, 2024 · 6beb387 · 6beb387
2 parents cd397f1 + 062ee1b
commit 6beb387
Show file tree

Hide file tree

Showing 11 changed files with 177 additions and 222 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,6 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
+    "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e",
     "@tanstack/react-query": "^5.17.19",
     "@tanstack/react-query-devtools": "^5.17.21",
     "axios": "^1.6.5",

diff --git a/postcss.config.js b/postcss.config.js
@@ -1,5 +1,6 @@
 module.exports = {
   plugins: {
+    'tailwindcss/nesting': {},
     tailwindcss: {},
     autoprefixer: {},
   },

diff --git a/src/app/(auth)/[username]/_components/.gitkeep b/src/app/(auth)/[username]/_components/.gitkeep
diff --git a/src/app/(auth)/[username]/page.tsx b/src/app/(auth)/[username]/page.tsx
@@ -0,0 +1,3 @@
+export default function Home() {
+  return <main className="flex min-h-screen flex-col items-center justify-between p-24">마이 페이지</main>;
+}
diff --git a/src/app/(auth)/[username]/status/[id]/.gitkeep b/src/app/(auth)/[username]/status/[id]/.gitkeep
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,9 +1,13 @@
 import type { Metadata } from 'next';
-import { Inter } from 'next/font/google';
+import { Noto_Sans_KR } from 'next/font/google';
 import '../styles/globals.css';
 import ReactQueryProviders from '@/utils/react-query-provider';
 
-const inter = Inter({ subsets: ['latin'] });
+// Noto sans 폰트 적용
+const notoSansKr = Noto_Sans_KR({
+  preload: false,
+  weight: ['100', '200', '300', '400', '500', '600', '700', '800', '900'],
+});
 
 export const metadata: Metadata = {
   title: 'Team Six',
@@ -17,7 +21,7 @@ export default function RootLayout({
 }>) {
   return (
     <html lang="ko">
-      <body className={inter.className}>
+      <body className={notoSansKr.className}>
         <ReactQueryProviders>{children}</ReactQueryProviders>
       </body>
     </html>

diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -3,6 +3,7 @@ export default function Home() {
     <main className="flex min-h-screen flex-col items-center justify-between p-24">
       main
       <p>dev 브랜치 자동 배포 테스트용 텍스트입니다..!</p>
+      <p className="font-light">test</p>
     </main>
   );
 }
diff --git a/src/components/.gitkeep b/src/components/.gitkeep