Merge pull request #47 from Kernel360/develop

Create Pull_Request_template.md
Kernel360 · Dec 14, 2023 · 57a3e7d · 57a3e7d
2 parents f7ccf9d + 0d04f41
commit 57a3e7d
Show file tree

Hide file tree

Showing 10 changed files with 145 additions and 31 deletions.
diff --git a/.github/Pull_Request_template.md b/.github/Pull_Request_template.md
@@ -0,0 +1,29 @@
+## PR Type
+
+What kind of change does this PR introduce?
+
+<!-- 'x'를 이용하여 이 PR에 적용되는 항목을 확인해 주세요. -->
+
+- [ ] 버그를 수정했어요.
+- [ ] 새로운 기능을 추가했어요.
+- [ ] 코드 스타일 업데이트를 했어요(포맷팅, 지역변수)
+- [ ] 리팩토링을 했어요 (기능적인 변화 없이, api 변경 없이)
+- [ ] 환경설정을 변경했어요.
+- [ ] 문서 내용을 변경했어요.
+- [ ] 기타 사항을 설명해 주세요.
+
+## Related Issues
+
+<!--#을 눌러 이슈와 연결해 주세요-->
+
+## What does this PR do?
+
+<!--무엇을 하셨나요?-->
+
+- [ ]
+- [ ]
+- [ ]
+
+## Other information
+
+<!--참고한 자료, 추가적인 사항, 기타 의견-->
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -9,21 +9,22 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "react": "^18",
-    "react-dom": "^18",
-    "next": "14.0.4",
     "@auth/core": "^0.18.5",
-    "next-auth": "^4.24.5"
+    "axios": "^1.6.2",
+    "next": "14.0.4",
+    "next-auth": "^4.24.5",
+    "react": "^18",
+    "react-dom": "^18"
   },
   "devDependencies": {
-    "typescript": "^5",
     "@types/node": "^20",
     "@types/react": "^18",
     "@types/react-dom": "^18",
     "autoprefixer": "^10.0.1",
+    "eslint": "^8",
+    "eslint-config-next": "14.0.4",
     "postcss": "^8",
     "tailwindcss": "^3.3.0",
-    "eslint": "^8",
-    "eslint-config-next": "14.0.4"
+    "typescript": "^5"
   }
-}
+}
diff --git a/frontend/src/app/(afterlogin)/layout.tsx b/frontend/src/app/(afterlogin)/layout.tsx
@@ -1,5 +1,3 @@
-import NavBar from '../../../../../yigil-prac/src/app/_components/navBar/NavBar'
-
 export const metadata = {
   title: 'Next.js',
   description: 'Generated by Next.js',
@@ -10,7 +8,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
     <html lang="en">
       <body>
         {children}
-        <NavBar />
+        {/* <NavBar /> */}
       </body>
     </html>
   )

diff --git a/frontend/src/app/(beforelogin)/login/page.tsx b/frontend/src/app/(beforelogin)/login/page.tsx
@@ -3,6 +3,7 @@
 import React from 'react'
 import KakaoBtn from '@/app/_components/ui/button/Kakao'
 import MainLogo from '@/app/_components/ui/main-logo/MainLogo'
+import { useSession } from 'next-auth/react'
 // import GoogleBtn from '@/app/_components/ui/button/Google'
 
 export default function LoginPage() {

diff --git a/frontend/src/app/api/auth/[...nextauth]/route.ts b/frontend/src/app/api/auth/[...nextauth]/route.ts
@@ -13,12 +13,13 @@ const handler = NextAuth({
       clientSecret: process.env.KAKAO_SECRET || '',
     }),
   ],
+  secret: process.env.NEXTAUTH_SECRET || '',
   callbacks: {
     async signIn({ user }) {
       console.log(user)
       /**
        * 백엔드와 api 통신
-       * 회원가입 해야 하는 
+       * 회원가입 해야 하는
        * if(user.email)
        */
       // 로그인 된 다면 true 안되면 redirect end
@@ -36,6 +37,7 @@ const handler = NextAuth({
 
   pages: {
     signIn: '/login',
+    error: '/login_error',
   },
 })
 

diff --git a/frontend/src/app/globals.css b/frontend/src/app/globals.css
@@ -12,13 +12,3 @@ body {
   width: 100vw;
   height: 100vh;
 }
-@layer base {
-  html {
-    font-family: 'Jalnan', system-ui, sans-serif;
-  }
-}
-
-@font-face {
-  font-family: 'Jalnan';
-  src: url('/fonts/Jalnan2TTF.ttf');
-}
diff --git a/frontend/src/app/layout.tsx b/frontend/src/app/layout.tsx
@@ -7,11 +7,17 @@ export const metadata: Metadata = {
   title: 'Create Next App',
   description: 'Generated by create next app',
 }
+import localFont from 'next/font/local'
+
+const Jalnan = localFont({
+  src: '../../public/fonts/Jalnan2TTF.ttf',
+  display: 'swap',
+})
 
 export default function RootLayout({ children }: { children: React.ReactNode }) {
   return (
-    <html lang="en">
-      <body className="">
+    <html lang="en" className={Jalnan.className}>
+      <body>
         <AuthContext>{children}</AuthContext>
       </body>
     </html>

diff --git a/frontend/src/app/page.tsx b/frontend/src/app/page.tsx
@@ -14,9 +14,5 @@ export default function Home() {
     }, 1500)
     return () => clearTimeout(timer)
   }, [])
-  return (
-    <>
-      <LandingPage />
-    </>
-  )
+  return <LandingPage />
 }
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
@@ -11,8 +11,8 @@
     "strict": true,
     "noEmit": true,
     "esModuleInterop": true,
-    "module": "esnext",
-    "moduleResolution": "Node16",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",