Merge branch 'main' into style/update-style-guide

Team-pingping · Oct 25, 2024 · 622d79e · 622d79e
2 parents 9835cb0 + 46584d0
commit 622d79e
Show file tree

Hide file tree

Showing 22 changed files with 499 additions and 178 deletions.
diff --git a/fe/package-lock.json b/fe/package-lock.json
diff --git a/fe/package.json b/fe/package.json
@@ -11,14 +11,18 @@
     "prepare": "husky install"
   },
   "dependencies": {
+    "@react-spring/web": "^9.7.5",
+    "@use-gesture/react": "^10.3.1",
     "axios": "^1.7.7",
     "dotenv": "^16.4.5",
     "express": "^4.21.0",
     "next": "14.2.13",
     "next-auth": "^4.24.8",
     "react": "^18",
     "react-dom": "^18",
-    "winston": "^3.14.2"
+    "tailwind-scrollbar-hide": "^1.1.7",
+    "winston": "^3.14.2",
+    "zustand": "^5.0.0"
   },
   "devDependencies": {
     "@types/navermaps": "^3.7.8",

diff --git a/fe/public/svg/Grabber.svg b/fe/public/svg/Grabber.svg
diff --git a/fe/public/svg/add.svg b/fe/public/svg/add.svg
diff --git a/fe/public/svg/arrow-back.svg b/fe/public/svg/arrow-back.svg
diff --git a/fe/public/svg/edit.svg b/fe/public/svg/edit.svg
diff --git a/fe/public/svg/my-location.svg b/fe/public/svg/my-location.svg
diff --git a/fe/public/svg/refresh.svg b/fe/public/svg/refresh.svg
diff --git a/fe/public/svg/share.svg b/fe/public/svg/share.svg
diff --git a/fe/src/app/layout.tsx b/fe/src/app/layout.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import "../styles/globals.css";
-import Script from "next/script";
 
 export default function RootLayout({
   children,
@@ -11,20 +10,14 @@ export default function RootLayout({
   return (
     <html lang="en">
       <body>
-        <header>
+        {/* <header>
           <nav>
             <a href="/">Home</a>
             <a href="/dashboard">Dashboard</a>
           </nav>
-        </header>
+        </header> */}
         <main>{children}</main>
-        <footer>© 2024 My App</footer>
-
-        {/* 네이버 지도 API 스크립트 로드 */}
-        <Script
-          src={`https://openapi.map.naver.com/openapi/v3/maps.js?ncpClientId=${process.env.NEXT_PUBLIC_NAVER_MAP_CLIENT_ID}&submodules=geocoder`}
-          strategy="afterInteractive"
-        />
+        {/* <footer>© 2024 My App</footer> */}
       </body>
     </html>
   );