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

Re design card #173

Merged
merged 6 commits into from
May 18, 2024
Merged

Re design card #173

merged 6 commits into from
May 18, 2024

Conversation

Varsani2520
Copy link
Contributor

Description

i reDesign the card Ui

Screenshots (if appropriate):

image

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.

Copy link

vercel bot commented May 18, 2024

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

Name Status Preview Comments Updated (UTC)
nestondc ✅ Ready (Inspect) Visit Preview 💬 Add feedback May 18, 2024 9:06am

@Varsani2520
Copy link
Contributor Author

Varsani2520 commented May 18, 2024

Hey @MAVRICK-1 ,
i like to work with you because you helped me for choose the Ui ...
i wish to work with you in next time ..
if you have any issue then you assigned me ,i ll do it fast
check and merged it

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

@Varsani2520 nice work merging it now , there few ui to change but will discuss about this in next issue , dont forget to give us a like

@MAVRICK-1 MAVRICK-1 merged commit c4e1de2 into MAVRICK-1:dev May 18, 2024
3 checks passed
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.

2 participants