-
Notifications
You must be signed in to change notification settings - Fork 114
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
Main #218
Open
MAVRICK-1
wants to merge
5
commits into
dev
Choose a base branch
from
main
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> Co-authored-by: deekshithapalla <[email protected]> Co-authored-by: Niharika Goulikar <[email protected]> Co-authored-by: Adarsh <[email protected]> Co-authored-by: Avdhut Pailwan <[email protected]> * 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 <[email protected]> Co-authored-by: Rishi Mondal <[email protected]> Co-authored-by: Hemanth kumar <[email protected]> Co-authored-by: deekshithapalla <[email protected]> Co-authored-by: Niharika Goulikar <[email protected]> Co-authored-by: Adarsh <[email protected]> Co-authored-by: Avdhut Pailwan <[email protected]> * 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 <[email protected]> * updated about (#177) * updated about * updated about * Shop dropdown text (#176) * add the hyperlink in my wishlist (#174) Co-authored-by: Rishi Mondal <[email protected]> * 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 <[email protected]> Co-authored-by: deekshithapalla <[email protected]> Co-authored-by: Niharika Goulikar <[email protected]> Co-authored-by: Adarsh <[email protected]> Co-authored-by: Avdhut Pailwan <[email protected]> Co-authored-by: Anwesha Das <[email protected]> Co-authored-by: anwesha <[email protected]> Co-authored-by: Arghyadeep09 <[email protected]> Co-authored-by: Siddhi T <[email protected]> Co-authored-by: v_a_r_s_a_n_i <[email protected]> Co-authored-by: Varsani2520 <[email protected]> Co-authored-by: Rajveer <[email protected]> Co-authored-by: Vedant Anand <[email protected]> Co-authored-by: aashkaaaaaa <[email protected]> Co-authored-by: sau-mili <[email protected]>
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
* feat #260 : Order tracking Functionality * responsive link --------- Co-authored-by: MAVRICK <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Motivation and Context
How Has This Been Tested?
Screenshots (if appropriate):
Types of changes
Checklist: