Skip to content

Commit

Permalink
merging updates to main (#175)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
16 people authored May 19, 2024
1 parent 7176e6f commit 6f3994c
Show file tree
Hide file tree
Showing 73 changed files with 3,005 additions and 779 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/greetings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
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.
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 22. 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.
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 22. Thank you for your cooperation.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ node_modules/
build
BOSS
.eslintcache
yarn.lock
5 changes: 5 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/e-commerce_website.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6f3994c

Please sign in to comment.