From f6df7225cb9aa6fe2f7dd96acc2d36485d86d0e8 Mon Sep 17 00:00:00 2001 From: logan <2220110150@office.kopo.ac.kr> Date: Thu, 8 May 2025 17:00:56 +0900 Subject: [PATCH 1/2] WIP: Make some local changes before pull --- package-lock.json | 18 +++++++++--------- package.json | 7 +++---- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 76d87ba..6520167 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,14 +22,14 @@ "@tailwindcss/postcss": "^4", "@types/bcrypt": "^5.0.2", "@types/jsonwebtoken": "^9.0.9", - "@types/node": "^20", - "@types/react": "^19", + "@types/node": "20.17.45", + "@types/react": "19.1.3", "@types/react-dom": "^19", "eslint": "^9", "eslint-config-next": "15.3.1", "prisma": "^6.7.0", "tailwindcss": "^4", - "typescript": "^5" + "typescript": "5.8.3" } }, "node_modules/@alloc/quick-lru": { @@ -1790,9 +1790,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "20.17.32", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.32.tgz", - "integrity": "sha512-zeMXFn8zQ+UkjK4ws0RiOC9EWByyW1CcVmLe+2rQocXRsGEDxUCwPEIVgpsGcLHS/P8JkT0oa3839BRABS0oPw==", + "version": "20.17.45", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.45.tgz", + "integrity": "sha512-vO9+E1smq+149wsmmLdM8SKVW7gRzLjfo0mU7kiykhV6rL+GEUhUmW7VywJNSxJHQzt9QBIHEo+3SG4MrFTqbA==", "dev": true, "license": "MIT", "dependencies": { @@ -1800,9 +1800,9 @@ } }, "node_modules/@types/react": { - "version": "19.1.2", - "resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.2.tgz", - "integrity": "sha512-oxLPMytKchWGbnQM9O7D67uPa9paTNxO7jVoNMXgkkErULBPhPARCfkKL9ytcIJJRGjbsVwW4ugJzyFFvm/Tiw==", + "version": "19.1.3", + "resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.3.tgz", + "integrity": "sha512-dLWQ+Z0CkIvK1J8+wrDPwGxEYFA4RAyHoZPxHVGspYmFVnwGSNT24cGIhFJrtfRnWVuW8X7NO52gCXmhkVUWGQ==", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index cf96302..34fe3ef 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,3 @@ - { "name": "final-project-app", "version": "0.1.0", @@ -24,13 +23,13 @@ "@tailwindcss/postcss": "^4", "@types/bcrypt": "^5.0.2", "@types/jsonwebtoken": "^9.0.9", - "@types/node": "^20", - "@types/react": "^19", + "@types/node": "20.17.45", + "@types/react": "19.1.3", "@types/react-dom": "^19", "eslint": "^9", "eslint-config-next": "15.3.1", "prisma": "^6.7.0", "tailwindcss": "^4", - "typescript": "^5" + "typescript": "5.8.3" } } From 9f2f062a4b23953936c1419369cdb71b439e2fe7 Mon Sep 17 00:00:00 2001 From: logan <2220110150@office.kopo.ac.kr> Date: Thu, 8 May 2025 17:27:45 +0900 Subject: [PATCH 2/2] myong --- src/pages/_app.tsx | 17 +++++++++++++++-- src/pages/layout.tsx | 8 +------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index 74c6758..5fee24d 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -1,11 +1,24 @@ // src/pages/_app.tsx + +// next-auth에서 SessionProvider를 import 합니다. import { SessionProvider } from 'next-auth/react'; +// 글로벌 CSS 파일을 올바른 경로로 import 합니다. +// './globals.css' 경로는 실제 파일 위치에 맞게 수정해야 합니다. +// 만약 globals.css가 src/globals.css에 있다면 '../globals.css' +// 만약 globals.css가 src/styles/globals.css에 있다면 '../styles/globals.css' +// 만약 globals.css가 src/pages/globals.css에 있다면 './globals.css' +import './globals.css'; + import type { AppProps } from 'next/app'; -export default function App({ Component, pageProps: { session, ...pageProps } }: AppProps) { +function MyApp({ Component, pageProps }: AppProps) { + // 애플리케이션의 모든 페이지 컴포넌트와 하위 컴포넌트들이 + // 세션 정보에 접근할 수 있도록 SessionProvider로 감쌉니다. return ( - + ); } + +export default MyApp; diff --git a/src/pages/layout.tsx b/src/pages/layout.tsx index f7fa87e..1bb5009 100644 --- a/src/pages/layout.tsx +++ b/src/pages/layout.tsx @@ -1,6 +1,5 @@ -import type { Metadata } from "next"; import { Geist, Geist_Mono } from "next/font/google"; -import "./globals.css"; + const geistSans = Geist({ variable: "--font-geist-sans", @@ -12,11 +11,6 @@ const geistMono = Geist_Mono({ subsets: ["latin"], }); -export const metadata: Metadata = { - title: "Create Next App", - description: "Generated by create next app", -}; - export default function RootLayout({ children, }: Readonly<{