Merge branch 'dev' into dev

MAVRICK-1 · Jul 26, 2024 · 69f2046 · 69f2046
2 parents 3565b6a + 7ddefcd
commit 69f2046
Show file tree

Hide file tree

Showing 9 changed files with 149 additions and 35 deletions.
diff --git a/contributing.md b/contributing.md
@@ -38,33 +38,45 @@ in case you are stuck:
    Launch GitHub Desktop and log in to your GitHub account if you haven't already.
 
 2. **Clone the Repository:**
-   - If you haven't cloned the ResourceHub repository yet, you can do so by clicking on the "File" menu and selecting "Clone Repository."
-   - Choose the ResourceHub repository from the list of repositories on GitHub and clone it to your local machine.
+   - If you haven't cloned the e-commerce_website repository yet, you can do so by clicking on the "File" menu and selecting "Clone Repository."
+   - Choose the e-commerce_website repository from the list of repositories on GitHub and clone it to your local machine.
+
+   ![image](https://github.com/PradnyaGaitonde/e-commerce_website/assets/116059908/fb977144-9f4f-490e-bc4c-2aaa79ab3c7a)
+
+   ![image](https://github.com/PradnyaGaitonde/e-commerce_website/assets/116059908/69c3cd00-371b-48e3-bf3a-35b8425d40b6)
 
 3. **Switch to the Correct Branch:**
    - Ensure you are on the branch that you want to submit a pull request for.
    - If you need to switch branches, you can do so by clicking on the "Current Branch" dropdown menu and selecting the desired branch.
 
+   ![image](https://github.com/PradnyaGaitonde/e-commerce_website/assets/116059908/e613f4bd-fdf1-4013-a136-699d9229534c)
+
 4. **Make Changes:**
    Make your changes to the code or files in the repository using your preferred code editor(like vs code).
 
 5. **Commit Changes:**
    - In GitHub Desktop, you'll see a list of the files you've changed. Check the box next to each file you want to include in the commit.
    - Enter a summary and description for your changes in the "Summary" and "Description" fields, respectively. Click the "Commit to <branch-name>" button to commit your changes to the local branch.
 
+   ![image](https://github.com/PradnyaGaitonde/e-commerce_website/assets/116059908/43c78f86-4855-479c-8ee5-8d2932d2f519)
+
 6. **Push Changes to GitHub:**
      After committing your changes, click the "Push origin" button in the top right corner of GitHub Desktop to push your changes to your forked repository on GitHub.
 
+   ![image](https://github.com/PradnyaGaitonde/e-commerce_website/assets/116059908/d0107e08-989c-4020-a0f6-5da3a3ad5cb0)
+
 7. **Create a Pull Request:**
-     -  Go to the GitHub website and navigate to your fork of the ResourceHub repository.
+     -  Go to the GitHub website and navigate to your fork of the e-commerce_website repository.
      -  You should see a button to "Compare & pull request" between your fork and the original repository. Click on it.
 
+   ![image](https://github.com/PradnyaGaitonde/e-commerce_website/assets/116059908/8fedc72c-151a-4554-bd29-357c3339a70f)
+
 8. **Review and Submit:**
    - On the pull request page, review your changes and add any additional information, such as a title and description, that you want to include with your pull request.
    - Once you're satisfied, click the "Create pull request" button to submit your pull request.
 
 9. **Wait for Review:**
-    Your pull request will now be available for review by the project maintainers. They may provide feedback or ask for changes before merging your pull request into the main branch of the ResourceHub repository.
+    Your pull request will now be available for review by the project maintainers. They may provide feedback or ask for changes before merging your pull request into the main branch of the e-commerce_website repository.
 
 
 ## **Pull Request Process**

diff --git a/src/components/footer/footer.js b/src/components/footer/footer.js
@@ -62,6 +62,7 @@ const Footer = () => {
       data: [
         { link: '/AboutUs', text: 'About Us' },
         { link: '/delivery', text: 'Delivery Information' },
+        { link: '*', text: 'Delivery Information' },
         { link: '/privacy-policy', text: 'Privacy Policy' },
         { link: '/termsandconditions', text: 'Terms & Conditions' },
         { link: '/contact', text: 'Contact Us' },
@@ -80,6 +81,12 @@ const Footer = () => {
         { link: '/contact', text: 'Contact Us' },
         { link: '/support', text: 'Support Center' },
         { link: '/careers', text: 'Careers' },
+        { link: '*', title: 'Delivery Information' },
+        { link: '/privacy-policy', text: 'Privacy Policy' },
+        { link: '/termsandconditions', text: 'Terms & Conditions' },
+        { link: '/contact', text: 'Contact Us' },
+        { link: '*', text: 'Support Center' },
+        { link: '*', text: 'Careers' },
         { link: '/contributors', text: 'Contributors' }
       ]
     },
@@ -93,6 +100,12 @@ const Footer = () => {
         { link: '/contact', text: 'Contact Us' },
         { link: '/support', text: 'Support Center' },
         { link: '/careers', text: 'Careers' },
+        { link: '*', text: 'Delivery Information' },
+        { link: '/privacy-policy', text: 'Privacy Policy' },
+        { link: '/termsandconditions', text: 'Terms & Conditions' },
+        { link: '/contact', text: 'Contact Us' },
+        { link: '*', text: 'Support Center' },
+        { link: '*', text: 'Careers' },
         { link: '/contributors', text: 'Contributors' }
       ]
     }

diff --git a/src/components/header/nav/nav.css b/src/components/header/nav/nav.css
@@ -108,16 +108,24 @@
 .nav nav .dropdown_menu {
   position: absolute;
   top: 150%;
+  margin-top: -8px;
   left: 0;
   width: 300px;
   background: #fff;
   box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
-  padding: 10px 0;
+  padding: 10px 0px;
   z-index: 100;
   opacity: 0;
   visibility: hidden;
   transition: all 0.1s ease-in-out;
 }
+.shpmenu{
+  margin-top: -15px !important;
+  padding: 40px 50px !important;
+}
+.nav nav .dropdown_menu .row{
+  align-items: flex-start !important;
+}
 
 .nav nav .dropdown_menu li {
   list-style: none;
@@ -143,8 +151,9 @@
 .nav nav .all_menu {
   position: absolute;
   top: 100%;
-  left: 0;
+  left: 20px;
   width: 35vw;
+  margin-top: -9px;
   background: #fff;
   box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
   padding: 10px 0;
@@ -153,7 +162,18 @@
   visibility: hidden;
   transition: all 0.1s ease-in-out;
 }
-
+.list_item_nav{
+  padding: 10px 20px ;
+}
+.list_item_nav a{
+  color: #191717 !important;
+  text-decoration: none !important;
+  font-size: 24px !important;
+  text-transform: capitalize;
+}
+.list_item_nav a:hover{
+  color: #267550!important;
+}
 .nav nav .all_menu.browse_menu {
   width: 50vw;
 }
@@ -194,13 +214,15 @@
 
 .text-beox {
   color: #191717;
-  font-size: 16px;
+  font-size: 22px !important;
   margin: 0;
   padding: 0;
   display: flex;
   align-items: center;
 }
-
+.green-icon{
+  width: 50px;
+}
 .set-box:hover .text-beox {
   color: #267550;
 }
@@ -234,4 +256,8 @@
   color: rgba(0, 0, 0, 0.7);
   font-size: 25px;
   text-decoration: none;
+  transition: 0.3s ease-in-out;
 }
+.megaMenu .col ul li a:hover{
+  font-weight: 600 !important;
+}
diff --git a/src/components/header/nav/nav.js b/src/components/header/nav/nav.js
@@ -215,14 +215,19 @@ const Nav = (props) => {
                           >
                             <ul>
                               {item.items.map((item_, index_) => (
-                                <li key={index_}>
-                                  <Button
+                                <li key={index_} onClick={() => {
+                                  props.closeNav();
+                                  setDropdownMenu(!openDropdownMenu);
+                                  setDropdownMenuIndex(null);}}
+                                  className='list_item_nav'
+                                  >
+                                  {/* <Button
                                     onClick={() => {
                                       props.closeNav();
                                       setDropdownMenu(!openDropdownMenu);
                                       setDropdownMenuIndex(null);
                                     }}
-                                  >
+                                  > */}
                                     <a
                                       href={`/cat/${item.cat_name.toLowerCase()}/${item_.cat_name
                                         .replace(/\s/g, '-')
@@ -236,7 +241,7 @@ const Nav = (props) => {
                                     >
                                       {item_.cat_name}
                                     </a>
-                                  </Button>
+                                  {/* </Button> */}
                                 </li>
                               ))}
                             </ul>
@@ -268,7 +273,7 @@ const Nav = (props) => {
                       </Link>
                     </Button>
                     <div
-                      className={`dropdown_menu megaMenu w-100 ${
+                      className={`dropdown_menu megaMenu shpmenu w-100 ${
                         openMegaMenu === true && 'open'
                       }`}
                     >

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">

diff --git a/src/pages/SignIn/index.js b/src/pages/SignIn/index.js
@@ -185,7 +185,7 @@ const SignIn = () => {
               <CircularProgress color="inherit" />
             </Backdrop>
 
-            <h3 className="text-center h-size">Sign In</h3>
+            <h3 className="text-center signin_head h-size">Sign In</h3>
             <form className="mt-4">
               <div className="form-group mb-4 w-100">
                 <TextField
@@ -232,7 +232,7 @@ const SignIn = () => {
           ,}}
                   />
                   <Button
-                    className="icon"
+                    className="icon back_icon"
                     onClick={() => setShowPassword(!showPassword)}
                   >
                     {showPassword === false ? (
@@ -258,28 +258,28 @@ const SignIn = () => {
                 </div>
               )}
 
-              <div className="form-group mt-3 mb-4 w-100 d-flex justify-content-end">
-                <Button
-                  className="btn btn-link float-end"
+              <div className="form-group mt-1 mb-1 w-100 d-flex justify-content-end">
+                <p
+                  className="forgot_pass"
                   onClick={forgotPassword}
                   sx={{fontSize:"1.3rem"}}
                 >
                   Forgot Password?
-                </Button>
+                </p>
               </div>
 
-              <div className="form-group mt-5 mb-4 w-100">
+              <div className="form-group  mt-1 mb-4 w-100">
                 <Button
                   disabled={isDisabled}
-                  className="btn btn-g btn-lg w-100 "
+                  className="btn  sign_in_but btn-g btn-lg w-100 "
                   onClick={signIn}
                 >
                   Sign In
                 </Button>
               </div>
 
-              <div className="form-group  mb-4 w-100 signInOr  " >
-                <p className="text-center">OR</p>
+              <div className="form-group  mb-2 w-100 signInOr  " >
+               <div className='or_contain'> <p className="text-center">OR</p></div>
                 <Button
                   className="w-100"
                   variant="outlined"
@@ -289,10 +289,10 @@ const SignIn = () => {
                 </Button>
               </div>
 
-              <p className="text-center" style={{fontSize:"1.6rem",cursor:"auto"}}>
+              <p className="text-center mt-4" style={{fontSize:"1.6rem",cursor:"auto"}}>
                 Don't have an account?{' '}
                 <b>
-                  <Link to="/signup" >Sign Up</Link>
+                  <Link to="/signup " className='signin_link' >Sign Up</Link>
                 </b>
               </p>
             </form>

diff --git a/src/pages/SignIn/style.css b/src/pages/SignIn/style.css
@@ -5,8 +5,55 @@
 .loginWrapper {
   padding: 75px 0px;
   background: #f1f1f1;
+  background: url('../../assets/images/bg.webp') !important;
   height: auto;
 }
+.sign_in_but{
+  background-color: #0b830b !important;
+  transition: 0.3s all ease-in-out !important;
+}
+.sign_in_but:hover{
+  background-color: #016201 !important;
+}
+.or_contain{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 20px !important;
+  margin-top: 10px;
+}
+.signin_head{
+  color: #016201 !important;
+}
+.or_contain p{
+  font-size: 24px !important;
+}
+.forgot_pass{
+  font-size: 24px !important;
+  color: #016201 !important;
+  font-weight: 400;
+  transition: 0.3s all ease-in-out;
+}
+.forgot_pass:hover{
+text-decoration: underline;
+
+}
+.send_otp{
+  color: #007bff !important; 
+  font-size: 24px !important;
+  font-weight: 600;
+  transition: 0.3s all ease-in-out;
+  padding-bottom: 0px !important;
+}
+.send_otp:hover{
+  text-decoration: underline;
+
+}
+
+.back_icon :hover{
+  color: white !important;
+  background-color: transparent !important;
+}
 .btn :hover{
   color: white ;
 }
@@ -86,6 +133,9 @@ form{
   margin-right: 15px;
 
 }
+.signin_link{
+  font-weight: 600 !important;
+}
 .loginWrapper{
   height: 1000px;
 }