Merge branch 'master' of https://github.com/prasukjain07/ShopNex

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "githubPullRequests.ignoredPullRequestBranches": [
+        "master"
+    ]
+}

src/App.js

@@ -1,47 +1,34 @@
-import "./App.css";
-import Navbar from "./Components/Navbar/Navbar";
-import { BrowserRouter, Routes, Route } from "react-router-dom";
-import Shop from "./Pages/Shop";
-import ShopCategory from "./Pages/ShopCategory";
-import Product from "./Pages/Product";
-import Cart from "./Pages/Cart";
-import LoginSignup from "./Pages/LoginSignup";
-import Footer from "./Components/Footer/Footer";
-import men_banner from "./Components/Assets/banner_mens.png";
-import women_banner from "./Components/Assets/banner_women.png";
-import kids_banner from "./Components/Assets/banner_kids.png";
-import ScrollUpButton from "./Components/ScrollUpButton/ScrollUpButton";
-import About from "./Pages/About";
-import Contact from "./Pages/Contact";
+
+import './App.css';
+import Navbar from './Components/Navbar/Navbar';
+import { BrowserRouter,Routes,Route } from 'react-router-dom';
+import Shop from './Pages/Shop';
+import ShopCategory from './Pages/ShopCategory';
+import Product from './Pages/Product';
+import Cart from './Pages/Cart';
+import LoginSignup from './Pages/LoginSignup';
+import Footer from './Components/Footer/Footer';
+import men_banner from './Components/Assets/banner_mens.png'
+import women_banner from './Components/Assets/banner_women.png'
+import kids_banner from './Components/Assets/banner_kids.png'
+
 function App() {
   return (
     <div>
       <BrowserRouter>
-        <Navbar />
-        <Routes>
-          <Route path="/" element={<Shop />} />
-          <Route
-            path="/men"
-            element={<ShopCategory banner={men_banner} category="men" />}
-          />
-          <Route
-            path="/women"
-            element={<ShopCategory banner={women_banner} category="women" />}
-          />
-          <Route
-            path="/kids"
-            element={<ShopCategory banner={kids_banner} category="kids" />}
-          />
-          <Route path="/product" element={<Product />}>
-            <Route path=":productId" element={<Product />} />
-          </Route>
-          <Route path="/cart" element={<Cart />} />
-          <Route path="/login" element={<LoginSignup />} />
-          <Route path='/about' element={<About/>} />
-        <Route path='/contact' element={<Contact/>} />
-        </Routes>
-        <ScrollUpButton />
-        <Footer />
+      <Navbar/>
+      <Routes>
+        <Route path='/' element={<Shop/>} />
+        <Route path='/men' element={<ShopCategory banner={men_banner} category="men"/>} />
+        <Route path='/women' element={<ShopCategory banner={women_banner} category="women"/>} />
+        <Route path='/kids' element={<ShopCategory banner={kids_banner} category="kids"/>} />
+        <Route path='/product' element={<Product/>}>
+          <Route path=':productId' element={<Product/>}/>
+        </Route>
+        <Route path='/cart' element={<Cart/>} />
+        <Route path='/login' element={<LoginSignup/>} />
+      </Routes>
+      <Footer/>
       </BrowserRouter>
     </div>
   );

src/Components/Footer/Footer.jsx

@@ -17,8 +17,8 @@ const Footer = () => {
                 <li>Company</li>
                 <li>Products</li>
                 <li>Offices</li>
-                <li> <Link className="link" to='/about'>About</Link></li>
-                <li> <Link className="link" to='/contact'>Contact Us</Link></li>
+                <li>About</li>
+                <li>Contact</li>
             </ul>
             <div className="footer-social-icon">
                 <div className="footer-icons-container">

src/Pages/Contact.jsx

@@ -1,21 +0,0 @@
-import React from 'react';
-import './CSS/Contact.css'
-
-const Contact = () => {
-  return (
-    <div className="container-my">
-      <h1 id="myheading">
-        Contact Us
-      </h1>
-      <p>
-      This is the official page of Shopnix, where you can share all your queries, feedback, complaints, or any concern you may have about our products.
-      </p>
-      <p>
-      In Case of any grievance, don't hesitate to get in touch with us on our official contact number xxxxxxxxxx. Or you can write to us at xyz@gmail.com.
-      </p>
-
-      </div>
-  );
-};
-
-export default Contact;