Merge branch 'dev' into jsimj001/home-page-secondary-text

acm-ucr · Jan 31, 2025 · bed0825 · bed0825
2 parents ffa2b25 + 189bce6
commit bed0825
Show file tree

Hide file tree

Showing 7 changed files with 172 additions and 66 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,19 +13,20 @@
   },
   "dependencies": {
     "@tanstack/react-query": "~5.53.3",
-    "lucide-react": "~0.417.0",
-    "next": "~14.2.10",
+    "lucide-react": "^0.417.0",
+    "next": "^14.2.10",
     "react": "~18.3.1",
-    "react-dom": "~18.3.1"
+    "react-dom": "~18.3.1",
+    "react-icons": "^5.4.0"
   },
   "devDependencies": {
     "@eslint/js": "~9.8.0",
+    "@tanstack/eslint-plugin-query": "~5.53.0",
     "@types/node": "~22.1.0",
     "@types/react": "~18.3.3",
     "@types/react-dom": "~18.3.0",
     "@typescript-eslint/eslint-plugin": "~8.0.0",
     "@typescript-eslint/parser": "~8.0.0",
-    "@tanstack/eslint-plugin-query": "~5.53.0",
     "autoprefixer": "~10.4.19",
     "eslint": "~9.8.0",
     "eslint-config-prettier": "~9.1.0",

diff --git a/public/logo.webp b/public/logo.webp
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,5 +1,6 @@
 import "./globals.css";
 import { Montserrat } from "next/font/google";
+import Navigation from "@/components/Navigation";
 import { ReactQueryClientProvider } from "@/utils/react-query";
 
 const montserrat = Montserrat({ subsets: ["latin"] });
@@ -18,6 +19,7 @@ export default function RootLayout({ children }: LayoutProps) {
   return (
     <html lang="en">
       <body className={montserrat.className}>
+        <Navigation />
         <ReactQueryClientProvider>{children}</ReactQueryClientProvider>
       </body>
     </html>