Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added pre-commit hooks #118

Merged
merged 16 commits into from
May 15, 2024
Merged

Added pre-commit hooks #118

merged 16 commits into from
May 15, 2024

Conversation

AvdhutPailwan
Copy link
Contributor

@AvdhutPailwan AvdhutPailwan commented May 14, 2024

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

Description

Motivation and Context

It can solve the problem of inconsistent code styling across all development platforms and the pre-commit can also be used to check if all test pass before every run

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.

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

vercel bot commented May 14, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
nestondc ❌ Failed (Inspect) May 15, 2024 4:39pm

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Welcome to Our repository.🎊 Thank you so much for taking the time to point this out.

Prettier configurations are added and prettier configured to work with pre-commit hooks and lint-staged
@MAVRICK-1
Copy link
Owner

MAVRICK-1 commented May 15, 2024

@ratnesh-maurya please review this PR

@MAVRICK-1 MAVRICK-1 added GSSoC'24 Under GirlScript Summer of code level3 hard gssoc Under GirlScript Summer of code labels May 15, 2024
@MAVRICK-1
Copy link
Owner

@AvdhutPailwan their is merge conflict plz solve it , then it is ready to merge

@AvdhutPailwan
Copy link
Contributor Author

@MAVRICK-1 I have resolved the merge conflict please check it.

deployment was failing because it couldn't find ResetPassword
This reverts commit 558218c.
@AvdhutPailwan
Copy link
Contributor Author

I have resolved merge conflict please merge it

@AvdhutPailwan
Copy link
Contributor Author

AvdhutPailwan commented May 15, 2024

I have resolved merge conflict please merge it

@MAVRICK-1 deployment may fail due to a not found file but you can merge this successfully

@MAVRICK-1
Copy link
Owner

@AvdhutPailwan why so much commits? you can do it easy way by accepting both the changes.

@MAVRICK-1 MAVRICK-1 merged commit a9a3023 into MAVRICK-1:dev May 15, 2024
1 of 2 checks passed
@MAVRICK-1
Copy link
Owner

@AvdhutPailwan Don't forget to give us a ⭐

@AvdhutPailwan
Copy link
Contributor Author

@AvdhutPailwan Don't forget to give us a ⭐

Yup 👍🏻

@AvdhutPailwan
Copy link
Contributor Author

@AvdhutPailwan why so much commits? you can do it easy way by accepting both the changes.

Actually I made changes but as new commits were getting merged new conflicts were arising that's why I made changes then reverted and deployment were failing as well so that's why so many commits happened 😅

MAVRICK-1 added a commit that referenced this pull request May 15, 2024
* 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>
MAVRICK-1 added a commit that referenced this pull request May 16, 2024
* My_Account_form_feature_added

* refac:storing data in firebase storage of user

* for edit feature added

* refac:some UI of MY_Account feature

* refac:some bug fix about conflict

* refac:bug fix of deployment issue

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

* refac:feature_fix/user primary key to uid,default photo, name, email in user firebase , if the user logged in from Google

* refac:conflict resolved

---------

Co-authored-by: anwesha <ANWESHA@DESKTOP-ALJFO4P.com>
Co-authored-by: Rishi Mondal <146999057+MAVRICK-1@users.noreply.github.com>
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>
MAVRICK-1 added a commit that referenced this pull request May 19, 2024
* 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

* Feat/my account (#128)

* My_Account_form_feature_added

* refac:storing data in firebase storage of user

* for edit feature added

* refac:some UI of MY_Account feature

* refac:some bug fix about conflict

* refac:bug fix of deployment issue

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

* refac:feature_fix/user primary key to uid,default photo, name, email in user firebase , if the user logged in from Google

* refac:conflict resolved

---------

Co-authored-by: anwesha <ANWESHA@DESKTOP-ALJFO4P.com>
Co-authored-by: Rishi Mondal <146999057+MAVRICK-1@users.noreply.github.com>
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>

* feat:GoToTop button added (#148)

* Issue/149: Image Optimization for reducing loading time (#153)

* optimized images to reduce the loading time

* optimized images to reduce the loading time

* Compare page and it's functionality Fixed (#160)

* New branch

* compare

* Re design card (#173)

* add search route for display search products

* search the products

* dependencies

* add yarn.lock in gitignore

* redesign the card sucessfully

---------

Co-authored-by: Varsani2520 <varsaniranjani2520@gmail.com>

* updated about (#177)

* updated about

* updated about

* Shop dropdown text (#176)

* add the hyperlink in my wishlist (#174)

Co-authored-by: Rishi Mondal <146999057+MAVRICK-1@users.noreply.github.com>

* Update greetings.yaml

* Location. (no need for country names, Indian cities name should be there) Fixed (#179)

* New branch

* cities added

* Chatbot added (#180)

---------

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>
Co-authored-by: Anwesha Das <116761608+anwesha2002@users.noreply.github.com>
Co-authored-by: anwesha <ANWESHA@DESKTOP-ALJFO4P.com>
Co-authored-by: Arghyadeep09 <90449806+Arghyadeep09@users.noreply.github.com>
Co-authored-by: Siddhi T <82750191+SiddhiT28@users.noreply.github.com>
Co-authored-by: v_a_r_s_a_n_i <137641079+Varsani2520@users.noreply.github.com>
Co-authored-by: Varsani2520 <varsaniranjani2520@gmail.com>
Co-authored-by: Rajveer <142779809+root-0101@users.noreply.github.com>
Co-authored-by: Vedant Anand <136731196+VedantAnand17@users.noreply.github.com>
Co-authored-by: aashkaaaaaa <138461600+aashkaaaaaa@users.noreply.github.com>
Co-authored-by: sau-mili <146661411+sau-mili@users.noreply.github.com>
@MAVRICK-1 MAVRICK-1 mentioned this pull request May 19, 2024
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
gssoc Under GirlScript Summer of code GSSoC'24 Under GirlScript Summer of code level3 hard
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants