From 68782649c013a44948ba466cef317033908255f4 Mon Sep 17 00:00:00 2001
From: Jun Hee Jung <wjdtka1325@naver.com>
Date: Thu, 21 Nov 2024 19:11:43 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EB=A1=9C=EA=B3=A0=20=EC=9D=B4=EB=AF=B8?=
 =?UTF-8?q?=EC=A7=80=20=EC=98=A4=EB=A5=98=20=EC=97=90=EB=9F=AC=20=ED=95=B4?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/client/package.json                        |   3 ---
 .../{asset/corineeLogo.png => public/favicon.png}   | Bin
 packages/client/src/components/Header.tsx           |   4 +++-
 yarn.lock                                           |   2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename packages/client/{asset/corineeLogo.png => public/favicon.png} (100%)

diff --git a/packages/client/package.json b/packages/client/package.json
index 021e79d4..19e87458 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -13,10 +13,7 @@
     "@material-tailwind/react": "^2.1.10",
     "@tanstack/react-query": "^5.59.19",
     "axios": "^1.7.7",
-<<<<<<< HEAD
     "chart.js": "^4.4.6",
-=======
->>>>>>> 508ddb7 (fix: deploy fix)
     "lightweight-charts": "^4.2.1",
     "lodash": "^4.17.21",
     "lottie-react": "^2.4.0",
diff --git a/packages/client/asset/corineeLogo.png b/packages/client/public/favicon.png
similarity index 100%
rename from packages/client/asset/corineeLogo.png
rename to packages/client/public/favicon.png
diff --git a/packages/client/src/components/Header.tsx b/packages/client/src/components/Header.tsx
index 56794f40..2b1b5644 100644
--- a/packages/client/src/components/Header.tsx
+++ b/packages/client/src/components/Header.tsx
@@ -3,6 +3,8 @@ import { Button, Navbar } from '@material-tailwind/react';
 import { Link } from 'react-router-dom';
 import { useAuthStore } from '@/store/authStore';
 import { useToast } from '@/hooks/useToast';
+import logoImage from '@asset/corineeLogo.png'
+
 function Header() {
 	const { login, logout } = useAuth();
 	const isAuthenticated = useAuthStore((state) => state.isAuthenticated);
@@ -17,7 +19,7 @@ function Header() {
 			>
 				<div>
 					<Link to={'/'} className="flex gap-2 items-center">
-						<img className="w-12 h-12" src="../asset/corineeLogo.png" />
+						<img className="w-12 h-12" src={logoImage} />
 						<h1 className="text-black text-xl font-semibold">Corinee</h1>
 					</Link>
 				</div>
diff --git a/yarn.lock b/yarn.lock
index 642c2974..99b197e7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3726,7 +3726,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chokidar@npm:3.6.0, chokidar@npm:^3.5.3":
+"chokidar@npm:3.6.0, chokidar@npm:^3.5.3, chokidar@npm:^3.6.0":
   version: 3.6.0
   resolution: "chokidar@npm:3.6.0"
   dependencies: