Merge Dev to main (#146)

* rectified all the css error except about page (#114)

* proceed fixed (#115)

* rectified all the css error except about page (#116)

* Update greetings.yaml

* Create Contributing.md (#122)

* Rename create contributing.md to contributing.md

* Forgot password (#134)

* added forget password feature

* reverted changes made to the package.json

* made a change in the reset password folder

* Main page groceries, electronics, fashion buttons Not Working Fixed (#137)

* New branch

* Issue fixed

* Fix issue 72 (#143)

* rectified all the css error except about page

* Updated Footer

---------

Co-authored-by: MAVRICK <mavrickrishi@gmail.com>

* Added pre-commit hooks (#118)

* Added pre-commit hooks

Description: pre-commit hooks added using husky and lint-staged is used which will run on every commit

* Added prettier

Prettier configurations are added and prettier configured to work with pre-commit hooks and lint-staged

* Try formatting with prettier and pre-commit hook

* Try formatting with prettier and pre-commit hook 2

* Docs: after adding pre-commit hooks did the necessary documentation update in README.md

* Update App.js to resolve merge conflict

* Update App.js to resolve deployment failure

deployment was failing because it couldn't find ResetPassword

* Revert "Added prettier"

This reverts commit 558218c.

* Reapply "Added prettier"

This reverts commit 5775c97.

* Revert "Update App.js to resolve deployment failure"

This reverts commit b9c90f6.

* Revert "Update App.js to resolve merge conflict"

This reverts commit aaa78c0.

* Update nav.js to resolve merge conflict in nav.js

* Revert "Update nav.js to resolve merge conflict in nav.js"

This reverts commit 82d8bfb.

* Update App.js to resolve merge conflict in App.js

* Update footer.js to resolve merge conflict in footer.js

* Update nav.js to resolve merge conflict in nav.js

---------

Co-authored-by: Hemanth kumar <rajva5727@gmail.com>
Co-authored-by: deekshithapalla <159523774+deekshithapalla@users.noreply.github.com>
Co-authored-by: Niharika Goulikar <124892559+Niharika0104@users.noreply.github.com>
Co-authored-by: Adarsh <120160355+jinx-vi-0@users.noreply.github.com>
Co-authored-by: Avdhut Pailwan <74597375+AvdhutPailwan@users.noreply.github.com>

.github/workflows/greetings.yaml

@@ -1,7 +1,5 @@
 name: Greetings
-
 on: [pull_request_target, issues]
-
 jobs:
   greeting:
     runs-on: ubuntu-latest
@@ -12,5 +10,13 @@ jobs:
     - uses: actions/first-interaction@v1
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        issue-message: "Hi there! Thanks for opening this issue. We appreciate your contribution to this open-source project. We aim to respond or assign your issue as soon as possible."
-        pr-message: "Welcome to Our repository.🎊 Thank you so much for taking the time to point this out."
+        issue-message: |
+          Hi there!
+          
+          Thanks for opening this issue. We appreciate your contribution to this open-source project. We aim to respond or assign your issue as soon as possible.
+          
+          Please note that this is the project owner, @MAVRICK-1. I won't be available for 3-4 days and will reply to every PR after May 18. Thank you for your cooperation.
+        pr-message: |
+          Welcome to our repository. 🎊
+          
+          Thank you so much for taking the time to point this out. Please note that this is the project owner, @MAVRICK-1. I won't be available for 3-4 days and will reply to every PR after May 18. Thank you for your cooperation.

.husky/pre-commit

@@ -0,0 +1 @@
+npx lint-staged

.prettierignore

@@ -0,0 +1,13 @@
+.env
+.eslintrc.js
+.gitignore
+.prettierignore
+.prettierrc
+*.md
+*.json
+*.lock
+*.yaml
+*.html
+.husky
+.github
+node_modules

.prettierrc

@@ -0,0 +1,6 @@
+{
+  "trailingComma": "none",
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": true
+}

README.md

@@ -83,6 +83,9 @@ Our project is an ONDC (Open Network for Digital Commerce) site integrated with
     ```bash
     npm install
     ```
+    ```bash
+    npm run prepare
+    ```
 4. **Run the development server:** 
     ```bash
     npm start

contributing.md

@@ -0,0 +1,78 @@
+# **Contributing Guidelines**
+This documentation contains a set of guidelines to help you during the contribution process.
+We are happy to welcome all the contributions from anyone willing to improve/add new scripts to this project.
+Thank you for helping out and remember, **no contribution is too small.**
+<br>
+Please note we have a [code of conduct](CODE_OF_CONDUCT.md)  please follow it in all your interactions with the project.
+
+
+
+<br>
+
+## **Creating a new issue process**
+
+1. Go to the project's issues.
+2. click on "new issue". 
+3. Give proper title and required description for the issue.
+4. Don't spam to get the assignment of the issue.
+5. Wait for till someone is looking into it.
+6. Start working on issue only after you got assigned that issue.
+
+
+## **Need some help regarding the basics?**
+
+You can refer to the following articles on basics of Git and Github and also contact the Project Mentors,
+in case you are stuck:
+
+- [Forking a Repo](https://help.github.com/en/github/getting-started-with-github/fork-a-repo)
+- [Cloning a Repo](https://help.github.com/en/desktop/contributing-to-projects/creating-an-issue-or-pull-request)
+- [How to create a Pull Request](https://opensource.com/article/19/7/create-pull-request-github)
+- [Getting started with Git and GitHub](https://towardsdatascience.com/getting-started-with-git-and-github-6fcd0f2d4ac6)
+- [Learn GitHub from Scratch](https://docs.github.com/en/get-started/start-your-journey/git-and-github-learning-resources)
+
+<br>
+
+### Steps need to be followed to contribute:
+
+1. **Open GitHub Desktop:**
+   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.
+
+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.
+
+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.
+
+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.
+
+7. **Create a Pull Request:**
+     -  Go to the GitHub website and navigate to your fork of the ResourceHub repository.
+     -  You should see a button to "Compare & pull request" between your fork and the original repository. Click on it.
+
+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.
+
+
+## **Pull Request Process**
+
+1. Ensure that you have self reviewed your code.
+2. Make sure you have added the proper description for the functionality of the code
+3. Submit your PR by giving the necesarry information in PR template and wait for PR to review it.
+
+<br>
+
+Thank you for your interest in contributing to **e-commerce website.**

package.json

@@ -41,7 +41,26 @@
     "test": "react-scripts test",
     "eject": "react-scripts eject",
     "lint": "eslint . --ext .js,.jsx",
-    "lint:fix": "eslint . --cache --quiet --fix --ext .js,.jsx"
+    "lint:fix": "eslint . --cache --quiet --fix --ext .js,.jsx",
+    "prepare": "husky"
+  },
+  "lint-staged": {
+    "./**/*.js": [
+      "eslint",
+      "prettier --write ."
+    ],
+    "./**/*.jsx": [
+      "eslint",
+      "prettier --write ."
+    ],
+    "./**/*.ts": [
+      "eslint",
+      "prettier --write ."
+    ],
+    "./**/*.tsx": [
+      "eslint",
+      "prettier --write ."
+    ]
   },
   "eslintConfig": {
     "extends": [
@@ -66,6 +85,8 @@
     "@babel/plugin-transform-private-property-in-object": "^7.24.5",
     "@babel/preset-react": "^7.24.1",
     "eslint-plugin-react": "^7.34.1",
+    "husky": "^9.0.11",
+    "lint-staged": "^15.2.2",
     "prettier": "3.0.1"
   },
   "description": "<img src=\"./Images/WebsiteImg.png\">",

src/App.css

@@ -1,14 +1,14 @@
-@import url("https://fonts.googleapis.com/css2?family=Italiana&family=Lato:wght@100;300;400;700;900&family=Roboto:wght@100;300;400;500;700;900&display=swap");
-@import url("https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.6.0/slick.min.css");
-@import url("https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.6.0/slick-theme.min.css");
+@import url('https://fonts.googleapis.com/css2?family=Italiana&family=Lato:wght@100;300;400;700;900&family=Roboto:wght@100;300;400;500;700;900&display=swap');
+@import url('https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.6.0/slick.min.css');
+@import url('https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.6.0/slick-theme.min.css');
 
 * {
   margin: 0px;
   padding: 0px;
   box-sizing: border-box;
 }
 body {
-  font-family: "Lato", sans-serif;
+  font-family: 'Lato', sans-serif;
   font-size: 22px;
 }
 #root {
@@ -117,7 +117,7 @@ p {
   opacity: 0;
 }
 [tooltip]::before {
-  content: "";
+  content: '';
   border: 5px solid transparent; /* opinion 4 */
   z-index: 1001; /* absurdity 1 */
 }
@@ -152,68 +152,68 @@ p {
 }
 
 /* don't show empty tooltips */
-[tooltip=""]::before,
-[tooltip=""]::after {
+[tooltip='']::before,
+[tooltip='']::after {
   display: none !important;
 }
 
 /* FLOW: UP */
 [tooltip]:not([flow])::before,
-[tooltip][flow^="up"]::before {
+[tooltip][flow^='up']::before {
   bottom: 100%;
   border-bottom-width: 0;
   border-top-color: #3bb77e;
 }
 [tooltip]:not([flow])::after,
-[tooltip][flow^="up"]::after {
+[tooltip][flow^='up']::after {
   bottom: calc(100% + 5px);
 }
 [tooltip]:not([flow])::before,
 [tooltip]:not([flow])::after,
-[tooltip][flow^="up"]::before,
-[tooltip][flow^="up"]::after {
+[tooltip][flow^='up']::before,
+[tooltip][flow^='up']::after {
   left: 50%;
   transform: translate(-50%, -0.5em);
 }
 
 /* FLOW: DOWN */
-[tooltip][flow^="down"]::before {
+[tooltip][flow^='down']::before {
   top: 100%;
   border-top-width: 0;
   border-bottom-color: #333;
 }
-[tooltip][flow^="down"]::after {
+[tooltip][flow^='down']::after {
   top: calc(100% + 5px);
 }
-[tooltip][flow^="down"]::before,
-[tooltip][flow^="down"]::after {
+[tooltip][flow^='down']::before,
+[tooltip][flow^='down']::after {
   left: 50%;
   transform: translate(-50%, 0.5em);
 }
 
 /* FLOW: LEFT */
-[tooltip][flow^="left"]::before {
+[tooltip][flow^='left']::before {
   top: 50%;
   border-right-width: 0;
   border-left-color: #333;
   left: calc(0em - 5px);
   transform: translate(-0.5em, -50%);
 }
-[tooltip][flow^="left"]::after {
+[tooltip][flow^='left']::after {
   top: 50%;
   right: calc(100% + 5px);
   transform: translate(-0.5em, -50%);
 }
 
 /* FLOW: RIGHT */
-[tooltip][flow^="right"]::before {
+[tooltip][flow^='right']::before {
   top: 50%;
   border-left-width: 0;
   border-right-color: #3bb77e;
   right: calc(0em - 5px);
   transform: translate(0.5em, -50%);
 }
-[tooltip][flow^="right"]::after {
+[tooltip][flow^='right']::after {
   top: 50%;
   left: calc(100% + 5px);
   transform: translate(0.5em, -50%);
@@ -237,17 +237,17 @@ p {
 /* FX All The Things */
 [tooltip]:not([flow]):hover::before,
 [tooltip]:not([flow]):hover::after,
-[tooltip][flow^="up"]:hover::before,
-[tooltip][flow^="up"]:hover::after,
-[tooltip][flow^="down"]:hover::before,
-[tooltip][flow^="down"]:hover::after {
+[tooltip][flow^='up']:hover::before,
+[tooltip][flow^='up']:hover::after,
+[tooltip][flow^='down']:hover::before,
+[tooltip][flow^='down']:hover::after {
   animation: tooltips-vert 300ms ease-out forwards;
 }
 
-[tooltip][flow^="left"]:hover::before,
-[tooltip][flow^="left"]:hover::after,
-[tooltip][flow^="right"]:hover::before,
-[tooltip][flow^="right"]:hover::after {
+[tooltip][flow^='left']:hover::before,
+[tooltip][flow^='left']:hover::after,
+[tooltip][flow^='right']:hover::before,
+[tooltip][flow^='right']:hover::after {
   animation: tooltips-horz 300ms ease-out forwards;
 }
 
@@ -307,7 +307,7 @@ p {
   margin-bottom: 30px;
 }
 .sidebarWrapper h3:after {
-  content: "";
+  content: '';
   width: 100%;
   height: 3px;
   background: #f0f0f0;
@@ -317,7 +317,7 @@ p {
 }
 
 .sidebarWrapper h3:before {
-  content: "";
+  content: '';
   width: 20%;
   height: 3px;
   background: #b0e5c2;
@@ -447,7 +447,7 @@ ul.breadcrumb li {
 ul.breadcrumb li + li:before {
   padding: 8px;
   color: black;
-  content: "/\00a0";
+  content: '/\00a0';
 }
 ul.breadcrumb li a {
   color: #3bb77e;
@@ -560,7 +560,7 @@ input::-webkit-inner-spin-button {
 }
 
 /* Firefox */
-input[type="number"] {
+input[type='number'] {
   -moz-appearance: textfield;
 }