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

55 create store collections page #92

Merged
merged 19 commits into from
Jan 20, 2024
Merged

Conversation

adahe8
Copy link
Contributor

@adahe8 adahe8 commented Nov 14, 2023

Info

Closes 55: Create Store Collections Page.

Description

The collections page opens when the user clicks open the collections cards on the store page, and it displays all the items within the collection.
Note: after I wrote and committed this code, I realized I was one change behind the main branch, so I merged the changes to my branch. It broke the code though, so I reversed the merge commit on this branch - that means I'm probably missing some code and this PR will look horrible to review - I will probably need some help fixing that aah

Changes

  • Added collections page
  • altered StoreAPI file to get necessary imports

Type of Change

  • 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 not work as
    expected)
  • Logistics Change (A change to a README, description, or dev workflow setup like
    linting/formatting)
  • Continuous Integration Change (Related to deployment steps or continuous integration
    workflows)
  • Other: (Fill In)

Testing

I have tested that my changes fully resolve the linked issue ...

  • locally on Desktop.
  • locally on mobile - use https://ngrok.io to get a copy on a mobile device
  • on the live deployment preview on Desktop.
  • on the live deployment preview on Mobile.
  • I have run and passed all new and existing Cypress tests. Add screenshots below.

Checklist

  • I have performed a self-review of my own code.
  • I have followed the style guidelines of this project.
  • I have documented my code's src/lib functions and commented hard to understand areas
    anywhere else.
  • My changes produce no new warnings.

Screenshots

Please include a screenshot of your Cypress testing suite passing successfully.

If you made any visual changes to the website, please include relevant screenshots below.
Screen Shot 2024-01-19 at 7 47 24 PM

Copy link

vercel bot commented Nov 14, 2023

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

Name Status Preview Comments Updated (UTC)
membership-portal-ui-v2 ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 20, 2024 6:46am

This reverts commit c7e4a93, reversing
changes made to d65d3fc.
Copy link
Contributor

@alexzhang1618 alexzhang1618 left a comment

Choose a reason for hiding this comment

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

I've fixed the merge compatibility issues and fixed some of the bugs I saw
(tip that I learned: using git checkout origin/main [filepathshere] is way more efficient than copying and pasting main's files by hand)

Copy link
Member

@SheepTester SheepTester left a comment

Choose a reason for hiding this comment

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

looks good to me!

everything is coming together 🦀🦀

src/lib/api/StoreAPI.ts Outdated Show resolved Hide resolved
src/pages/store/collection/[uuid].tsx Outdated Show resolved Hide resolved
src/styles/pages/store/collections.module.scss Outdated Show resolved Hide resolved
@adahe8
Copy link
Contributor Author

adahe8 commented Jan 20, 2024

Done! Thanks for fixing the merge problem Alex, and thanks for helping me find all the necessary files and imports Sean!

@adahe8 adahe8 merged commit d141450 into main Jan 20, 2024
5 checks passed
@adahe8 adahe8 deleted the 55-create-store-collections-page branch January 20, 2024 07:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants