Merge branch 'feature/mainPage' into develop

4bujak-4bujak · May 28, 2024 · b182d2e · b182d2e
2 parents 3cd2d98 + edd8230
commit b182d2e
Show file tree

Hide file tree

Showing 26 changed files with 557 additions and 0 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,6 +12,7 @@
     "@tanstack/react-query": "^5.36.0",
     "@tanstack/react-query-devtools": "^5.36.0",
     "axios": "^1.6.8",
+    "date-fns": "^3.6.0",
     "framer-motion": "^11.1.9",
     "haversine": "^1.1.1",
     "next": "14.2.3",

diff --git a/public/home/G_Room.svg b/public/home/G_Room.svg
diff --git a/public/home/Inquiry_white.svg b/public/home/Inquiry_white.svg
diff --git a/public/home/M_Room.svg b/public/home/M_Room.svg
diff --git a/public/home/Notification_white.svg b/public/home/Notification_white.svg
diff --git a/public/home/R_Room.svg b/public/home/R_Room.svg
diff --git a/public/home/isRight.svg b/public/home/isRight.svg
diff --git a/public/home/location.svg b/public/home/location.svg
diff --git a/public/home/logo_white.png b/public/home/logo_white.png
diff --git a/public/home/notice.svg b/public/home/notice.svg