diff --git a/package.json b/package.json
index 52f7735..e3c630e 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
"styled-components": "^6.1.12",
"swiper": "^11.1.9",
"vite": "^5.4.1",
- "zustand": "^4.5.5"
+ "zustand": "^5.0.0-rc.2"
},
"devDependencies": {
"@svgr/webpack": "^8.1.0",
diff --git a/public/fonts/SpoqaHanSansNeo-Bold.woff2 b/public/fonts/SpoqaHanSansNeo-Bold.woff2
new file mode 100644
index 0000000..da1dd60
Binary files /dev/null and b/public/fonts/SpoqaHanSansNeo-Bold.woff2 differ
diff --git a/public/fonts/SpoqaHanSansNeo-Medium.woff2 b/public/fonts/SpoqaHanSansNeo-Medium.woff2
new file mode 100644
index 0000000..0e9b8d7
Binary files /dev/null and b/public/fonts/SpoqaHanSansNeo-Medium.woff2 differ
diff --git a/public/fonts/SpoqaHanSansNeo-Regular.woff2 b/public/fonts/SpoqaHanSansNeo-Regular.woff2
new file mode 100644
index 0000000..1572319
Binary files /dev/null and b/public/fonts/SpoqaHanSansNeo-Regular.woff2 differ
diff --git a/src/app/(layouts)/header.tsx b/src/app/(layouts)/header.tsx
index f2244d6..542672e 100644
--- a/src/app/(layouts)/header.tsx
+++ b/src/app/(layouts)/header.tsx
@@ -85,11 +85,11 @@ export default function Header() {
if (accessToken && tokenExpiration) {
sessionStorage.setItem("AccessToken", accessToken);
sessionStorage.setItem("TokenExpiration", tokenExpiration.toString());
-
+
setAccessToken(accessToken);
- setLogin(true);
+ setLogin(true);
} else {
- logout();
+ logout();
}
} catch (error) {
console.error("Failed to refresh access token:", error);
@@ -104,7 +104,7 @@ export default function Header() {
}, [path]);
useEffect(() => {
- checkAndRefreshToken();
+ checkAndRefreshToken();
}, []);
return (
@@ -133,7 +133,11 @@ export default function Header() {
-
@@ -201,6 +205,7 @@ export default function Header() {
title="뒤로가기"
open={isModalOpen}
onCancel={handleCancel}
+ width={450}
centered
footer={[
diff --git a/src/app/(pages)/(landing)/page.module.css b/src/app/(pages)/(landing)/page.module.css
index 533758e..aadf610 100644
--- a/src/app/(pages)/(landing)/page.module.css
+++ b/src/app/(pages)/(landing)/page.module.css
@@ -3,5 +3,4 @@
display: flex;
flex-direction: column;
align-items: center;
- transition: background-color 1s ease;
}
diff --git a/src/app/(pages)/4q-create/page.tsx b/src/app/(pages)/4q-create/page.tsx
index 5d53e86..9382799 100644
--- a/src/app/(pages)/4q-create/page.tsx
+++ b/src/app/(pages)/4q-create/page.tsx
@@ -118,7 +118,7 @@ export default function Page() {
diff --git a/src/app/layout.module.css b/src/app/layout.module.css
index 4cc9503..0624ab3 100644
--- a/src/app/layout.module.css
+++ b/src/app/layout.module.css
@@ -1,7 +1,7 @@
-@import url(//spoqa.github.io/spoqa-han-sans/css/SpoqaHanSansNeo.css);
+/* @import url(//spoqa.github.io/spoqa-han-sans/css/SpoqaHanSansNeo.css); */
.container {
- font-family: "Spoqa Han Sans Neo", sans-serif;
+ /* font-family: "Spoqa Han Sans Neo", sans-serif; */
font-style: normal;
max-width: 600px;
height: 100vh;
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 091dba9..fa3cf36 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -7,11 +7,33 @@ import { Metadata } from "next";
import Head from "next/head";
import Header from "./(layouts)/header";
import styles from "./layout.module.css";
-import GoogleAnalytics from "../lib/GoogleAnalytics";
+import GoogleAnalytics from "@/lib/GoogleAnalytics";
import { GoogleTagManager } from "@next/third-parties/google";
-
+import localFont from 'next/font/local'
import { UserProvider } from "@/context/UserContext";
+const spoqaHanSansNeo = localFont({
+ src: [
+ {
+ path: "../../public/fonts/SpoqaHanSansNeo-Bold.woff2",
+ weight: "700",
+ style: "normal",
+ },
+ {
+ path: "../../public/fonts/SpoqaHanSansNeo-Medium.woff2",
+ weight: "500",
+ style: "normal",
+ },
+ {
+ path: "../../public/fonts/SpoqaHanSansNeo-Regular.woff2",
+ weight: "400",
+ style: "normal",
+ },
+ ],
+ variable: "--font-spoqaHanSansNeo",
+});
+
+
export const metadata: Metadata = {
robots: { index: true, follow: true },
metadataBase: new URL("https://qqqq.world"),
@@ -44,7 +66,7 @@ const config: ThemeConfig = {
export default function RootLayout({ children }: { children: ReactNode }) {
return (
-
+ {/* 폰트 적용 */}