Merge pull request AditiSharma00#12 from AditiSharma00/day_3

added
varun2696 · Apr 1, 2023 · 0f6ec34 · 0f6ec34
2 parents 6357f1f + 0bb74a4
commit 0f6ec34
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/pharmeasy/src/Components/Navbar/Navbar.jsx b/pharmeasy/src/Components/Navbar/Navbar.jsx
@@ -32,6 +32,7 @@ import Tabs from "./Tabs";
 // import { LoginIndividualSlider } from "";
 import { useDispatch, useSelector } from "react-redux";
 import { LoginIndividualSlider } from "../../Pages/LogInPages/QuickLogin";
+import { NavContents } from "./NavContents";
 
 // import { getCartTotal } from "../../Redux/Cart/action";
 
@@ -322,7 +323,10 @@ function Navbar() {
           </DrawerContent>
         </Drawer>
       </Box>
-      <Box height="65px" width="100%"></Box>
+      <Box height="65px" width="100%">
+        {" "}
+        <NavContents />
+      </Box>
     </Box>
   );
 }

diff --git a/pharmeasy/src/Pages/AllRoutes.jsx b/pharmeasy/src/Pages/AllRoutes.jsx
@@ -3,14 +3,18 @@ import { Route, Routes } from "react-router-dom";
 import Search from "./Search";
 import Home from "./Home";
 import NotFound from "./NotFound";
+import { Products } from "../Pages/ProductPage/Products";
+// import { SingleProductPage } from "../Pages/SingleProdPage/SingleProductPage";
+
 function AllRoutes() {
   return (
     <Routes>
       <Route path="/" element={<Home />} />
-      {/* <Route path="/login" element={<Login />} /> */}
       <Route path="*" element={<NotFound />} />
-      {/* <Route path="/signup" element={<Signup />} /> */}
-      {/* <Route path="/logout" element={<Logout />} /> */}
+
+      <Route path="/products" element={<Products />} />
+      {/* <Route path="/products/:id" element={<SingleProductPage />} /> */}
+
       <Route path="/search/:name" element={<Search />}></Route>
     </Routes>
   );