Skip to content

Commit

Permalink
Feat/my account (#128)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
8 people authored May 16, 2024
1 parent 9f35e7e commit 834748a
Show file tree
Hide file tree
Showing 21 changed files with 1,700 additions and 550 deletions.
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 834748a

Please sign in to comment.