Merge branch 'main' into fp06_474_day-2

varun2696 · Mar 29, 2023 · df18d64 · df18d64
2 parents 8c6e442 + 99e8275
commit df18d64
Show file tree

Hide file tree

Showing 15 changed files with 1,254 additions and 6 deletions.
diff --git a/pharmeasy/package-lock.json b/pharmeasy/package-lock.json
diff --git a/pharmeasy/package.json b/pharmeasy/package.json
@@ -14,6 +14,7 @@
     "framer-motion": "^6.5.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+    "react-icons": "^4.8.0",
     "react-redux": "^8.0.5",
     "react-router-dom": "^6.9.0",
     "react-scripts": "5.0.1",

diff --git a/pharmeasy/public/images/logo.png b/pharmeasy/public/images/logo.png
diff --git a/pharmeasy/src/App.js b/pharmeasy/src/App.js
@@ -1,16 +1,22 @@
 import "./App.css";
+
 import { NavContents } from "./Components/NavContents";
 import { ProductCard } from "./Pages/ProductPage/ProductCard";
 import { Products } from "./Pages/ProductPage/Products";
+import Content from "./Components/HomePage/Content";
+import NavBar from "./Components/Navbar";
 
 function App() {
   return <div>
 
-
+     <NavBar />
+      <Content />
     <NavContents/>
     <Products/>
     <ProductCard/>
   </div>;
+
+
 }
 
 export default App;