Merge pull request #473 from UtkarshBirla28/dev

Routing fixed
MAVRICK-1 · Jul 25, 2024 · 7ddefcd · 7ddefcd
2 parents daba7b6 + 9a4f9b2
commit 7ddefcd
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/src/components/footer/footer.js b/src/components/footer/footer.js
@@ -61,39 +61,39 @@ const Footer = () => {
       title: 'Company',
       data: [
         { link: '/AboutUs', text: 'About Us' },
-        { link: '#', text: 'Delivery Information' },
+        { link: '*', text: 'Delivery Information' },
         { link: '/privacy-policy', text: 'Privacy Policy' },
         { link: '/termsandconditions', text: 'Terms & Conditions' },
-        { link: '#', text: 'Contact Us' },
+        { link: '/contact', text: 'Contact Us' },
         { link: '/faq', text: 'FAQ' },
         { link: '/feedback', text: 'Feedback' },
-        { link: '#', text: 'Contributors' }
+        { link: '/contributors', text: 'Contributors' }
       ]
     },
     {
       title: 'Corporate',
       data: [
         { link: '/AboutUs', title: 'About Us' },
-        { link: '#', title: 'Delivery Information' },
+        { link: '*', title: 'Delivery Information' },
         { link: '/privacy-policy', text: 'Privacy Policy' },
         { link: '/termsandconditions', text: 'Terms & Conditions' },
-        { link: '#', text: 'Contact Us' },
-        { link: '#', text: 'Support Center' },
-        { link: '#', text: 'Careers' },
-        { link: '#', text: 'Contributors' }
+        { link: '/contact', text: 'Contact Us' },
+        { link: '*', text: 'Support Center' },
+        { link: '*', text: 'Careers' },
+        { link: '/contributors', text: 'Contributors' }
       ]
     },
     {
       title: 'Popular',
       data: [
         { link: '/AboutUs', text: 'About Us' },
-        { link: '#', text: 'Delivery Information' },
+        { link: '*', text: 'Delivery Information' },
         { link: '/privacy-policy', text: 'Privacy Policy' },
         { link: '/termsandconditions', text: 'Terms & Conditions' },
-        { link: '#', text: 'Contact Us' },
-        { link: '#', text: 'Support Center' },
-        { link: '#', text: 'Careers' },
-        { link: '#', text: 'Contributors' }
+        { link: '/contact', text: 'Contact Us' },
+        { link: '*', text: 'Support Center' },
+        { link: '*', text: 'Careers' },
+        { link: '/contributors', text: 'Contributors' }
       ]
     }
   ];

diff --git a/src/pages/Contributors/Contributors.jsx b/src/pages/Contributors/Contributors.jsx
@@ -7,6 +7,7 @@ function Contributors() {
   const [contributors, setContributors] = useState([]);
 
   useEffect(() => {
+    window.scrollTo(0, 0);
     async function fetchContributors() {
       try {
         const response = await axios.get(

diff --git a/src/pages/NotFound/index.js b/src/pages/NotFound/index.js
@@ -1,10 +1,17 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import './style.css';
 import NotFoundImg from '../../assets/images/page-404.webp';
 import { Button } from '@mui/material';
 import { Link } from 'react-router-dom';
 
 const NotFound = () => {
+  useEffect(()=>{
+    window.scrollTo(0, 0);
+
+    return ()=>{
+      window.scrollTo(0,0);
+    }
+  },[])
   return (
     <section className="notFound">
       <div className="container-fluid">