diff --git a/cse2102-spring25-Team27 b/cse2102-spring25-Team27 index 8294fba..237b43a 160000 --- a/cse2102-spring25-Team27 +++ b/cse2102-spring25-Team27 @@ -1 +1 @@ -Subproject commit 8294fbabab995e3adb615aa724ff600da349a840 +Subproject commit 237b43a2c64e486722fcfce7c7e6a914e0b215de diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 5e3838d..d6179d5 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -9,7 +9,8 @@ "version": "0.0.0", "dependencies": { "react": "^19.0.0", - "react-dom": "^19.0.0" + "react-dom": "^19.0.0", + "react-icons": "^5.5.0" }, "devDependencies": { "@eslint/js": "^9.22.0", @@ -2822,6 +2823,15 @@ "react": "^19.1.0" } }, + "node_modules/react-icons": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.5.0.tgz", + "integrity": "sha512-MEFcXdkP3dLo8uumGI5xN3lDFNsRtrjbOEKDLD7yv76v4wpnEq2Lt2qeHaQOr34I/wPN3s3+N08WkQ+CW37Xiw==", + "license": "MIT", + "peerDependencies": { + "react": "*" + } + }, "node_modules/react-refresh": { "version": "0.17.0", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz", diff --git a/frontend/package.json b/frontend/package.json index d0c5a91..0328259 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -11,7 +11,8 @@ }, "dependencies": { "react": "^19.0.0", - "react-dom": "^19.0.0" + "react-dom": "^19.0.0", + "react-icons": "^5.5.0" }, "devDependencies": { "@eslint/js": "^9.22.0", diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index e0742c7..f235bc3 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -2,6 +2,9 @@ import { Routes, Route } from 'react-router-dom'; import Home from "./pages/Home.tsx"; import About from './pages/About'; import NavBar from './components/NavBar'; +import PetProfile from './pages/PetProfile'; + + function App() { return ( @@ -10,6 +13,7 @@ function App() { } /> } /> + } /> ); diff --git a/frontend/src/assets/bird.png b/frontend/src/assets/bird.png new file mode 100644 index 0000000..33d7db2 Binary files /dev/null and b/frontend/src/assets/bird.png differ diff --git a/frontend/src/assets/cat.png b/frontend/src/assets/cat.png new file mode 100644 index 0000000..a4e61ae Binary files /dev/null and b/frontend/src/assets/cat.png differ diff --git a/frontend/src/assets/dog2.png b/frontend/src/assets/dog2.png new file mode 100644 index 0000000..a405b79 Binary files /dev/null and b/frontend/src/assets/dog2.png differ diff --git a/frontend/src/assets/dogshake.png b/frontend/src/assets/dogshake.png new file mode 100644 index 0000000..6f0f261 Binary files /dev/null and b/frontend/src/assets/dogshake.png differ diff --git a/frontend/src/assets/max-cat.png b/frontend/src/assets/max-cat.png new file mode 100644 index 0000000..a4e61ae Binary files /dev/null and b/frontend/src/assets/max-cat.png differ diff --git a/frontend/src/assets/puppy.png b/frontend/src/assets/puppy.png new file mode 100644 index 0000000..0be0e4c Binary files /dev/null and b/frontend/src/assets/puppy.png differ diff --git a/frontend/src/assets/turtle.png b/frontend/src/assets/turtle.png new file mode 100644 index 0000000..a845e19 Binary files /dev/null and b/frontend/src/assets/turtle.png differ diff --git a/frontend/src/components/NavBar.tsx b/frontend/src/components/NavBar.tsx index eca984b..6d5b4a4 100644 --- a/frontend/src/components/NavBar.tsx +++ b/frontend/src/components/NavBar.tsx @@ -1,10 +1,20 @@ -import { Link } from 'react-router-dom'; +import { Link } from "react-router-dom"; +import { FaHome, FaSearch, FaUser } from "react-icons/fa"; export default function NavBar() { return ( -