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

Reordered checkout layout for store #263

Merged
merged 3 commits into from
Aug 19, 2024
Merged

Reordered checkout layout for store #263

merged 3 commits into from
Aug 19, 2024

Conversation

angela139
Copy link
Contributor

Info

Closes #243

Restructured store layout and added dropdown component for desktop view

Changes

  • Reordered store checkout layout for mobile/desktop
  • Added dropdown component similar to reschedule event modal for desktop view
  • Kept original pickup event picker for mobile view

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.
  • on the live deployment preview on Desktop.
  • on the live deployment preview on Mobile.
  • I have added new Cypress tests that are passing.

Checklist

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

Screenshots

Screenshot 2024-08-12 at 10 39 27 PM Screenshot 2024-08-12 at 10 34 58 PM Screenshot 2024-08-12 at 10 35 39 PM

Copy link

vercel bot commented Aug 13, 2024

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 Aug 16, 2024 1:53am
testing-membership-portal-ui-v2 ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 16, 2024 1:53am

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.

Changes LGTM, just one nit:

@angela139 angela139 merged commit da303fc into main Aug 19, 2024
8 checks passed
@angela139 angela139 deleted the angela/checkout-layout branch August 19, 2024 18:32
Chaitya2108 pushed a commit that referenced this pull request Jan 9, 2025
* Added new component for pickup dropdown for desktop view

* Conditionally adds visible overflow for desktop

* Removed min height
Chaitya2108 added a commit that referenced this pull request Jan 17, 2025
* Added retroactive attendance / milestone for admin

* Fixed feedback from Sean

* fixed feedback

* fixed feedback

* Reordered checkout layout for store (#263)

* Added new component for pickup dropdown for desktop view

* Conditionally adds visible overflow for desktop

* Removed min height

* fulfill (#244)

* Add fulfill button

* Remove Fulfill view and move fulfill buttons to prepare view

* Do not show fulfill button if it's already fulfilled

* make order status component

* hide fulfill button if pickup event hasnt started yet

* Apparently partially fulfilled means they are missing some items

* move order row to separate component

* fulfill selected

* fix type errors

* always show fulfilled items

* sorting things and other misc changes:

- show green "fulfilled" when fulfilling a previously partially fulfilled order
- sort orders by PLACED first
- sort items alphabetically
- item breakdown: ignore fulfilled. (hmm, this isn't the right thing to do for rescheduled orders)
- indicate when no items were picked up

* exclude fulfilled items from item breakdown

* default checkboxes to unchecked

* fix fulfilling selected. always indicate whether an item was fulfilled

* Show fulfilled badges

* Labels back to emoji, have checkbox select all of an entire variant at a time

If we want granularity in the future then that can be added later

* Display "fulfilled" on fulfilled items in fulfilled/partially fulfilled orders

* Make "picked up" badge green

* Address feedback

* Use Pacific Time on server side (#264)

* feat: Onboarding (#265)

* set up a modal for onboarding

* Show steps and progress bar

* Change design of buttons

* Create onboarding page

* Add animations for steps 1 and 5

* temporary images for intro

* add rainbow bar to top of page previews

* Quiet navbar, perhaps?

* address some feedback

* Move event list to its own component

* separate event filter into its own component

* try annotating badges on event card

* store collection

* Combine Store and Events components

* Make annotations look nicer

* Leaderboard rows

* start onboarding after checking in

* fix type error

* un-component EventList so the diff is cleaner

* move EventsPageProps back where it used to be

* Remove periods and exclamation marks from onboarding headings

* Reduce onboarding frequency (#266)

* Don't show onboarding when user has already attended events

* remove vim tab

* Add A.S. funded food field to event form (#269)

* Add A.S. funded food field to event form

* Make food items nullable

* Make food items nullable in apiRequests.ts as well

Mostly out of laIziness (idk if backend truly would enjoy receiving a null) but it's in line with Discord events

* Minor updates to onboarding (#267)

* add potential photos for onboarding first slide from justin

* increase leaderboard row height on mobile??

* fmt

* fmt

* use css var for positioning

* Arrange onboarding photos

* 3d effect for mouse users

* mobile collage layout

* improve leaderboard on mobile

* use backend support for whether onboarding seen

* refactor intro images

* [ImgBot] Optimize images (#271)

*Total -- 56,903.46kb -> 54,747.72kb (3.79%)

/public/assets/graphics/onboarding/Fall23Allocation-JustinLu.jpg -- 4,898.92kb -> 4,580.26kb (6.5%)
/public/assets/graphics/onboarding/Fall24Kickoff_1-JustinLu.jpg -- 9,357.62kb -> 8,933.71kb (4.53%)
/public/assets/graphics/onboarding/Fall24Bonfire_2-JustinLu.jpg -- 7,035.56kb -> 6,719.17kb (4.5%)
/public/assets/graphics/onboarding/Fall24BitByteInfo_1-JustinLu.jpg -- 7,678.81kb -> 7,348.67kb (4.3%)
/public/assets/graphics/onboarding/Fall24Bonfire_1-JustinLu.jpg -- 8,132.33kb -> 7,887.40kb (3.01%)
/public/assets/graphics/onboarding/Fall24Kickoff_3-JustinLu.jpg -- 7,072.95kb -> 6,867.79kb (2.9%)
/public/assets/graphics/onboarding/Fall24Kickoff_2-JustinLu.jpg -- 9,441.28kb -> 9,170.39kb (2.87%)
/public/assets/graphics/onboarding/Fall24BitByteInfo_2-JustinLu.jpg -- 3,285.99kb -> 3,240.33kb (1.39%)

Signed-off-by: ImgBotApp <[email protected]>
Co-authored-by: ImgBotApp <[email protected]>

* fixed errors

* fixed feedback

---------

Signed-off-by: ImgBotApp <[email protected]>
Co-authored-by: Angela Hu <[email protected]>
Co-authored-by: Sean <[email protected]>
Co-authored-by: imgbot[bot] <31301654+imgbot[bot]@users.noreply.github.com>
Co-authored-by: ImgBotApp <[email protected]>
Chaitya2108 added a commit that referenced this pull request Jan 31, 2025
* Added retroactive attendance / milestone for admin

* Fixed feedback from Sean

* fixed feedback

* fixed feedback

* Reordered checkout layout for store (#263)

* Added new component for pickup dropdown for desktop view

* Conditionally adds visible overflow for desktop

* Removed min height

* fulfill (#244)

* Add fulfill button

* Remove Fulfill view and move fulfill buttons to prepare view

* Do not show fulfill button if it's already fulfilled

* make order status component

* hide fulfill button if pickup event hasnt started yet

* Apparently partially fulfilled means they are missing some items

* move order row to separate component

* fulfill selected

* fix type errors

* always show fulfilled items

* sorting things and other misc changes:

- show green "fulfilled" when fulfilling a previously partially fulfilled order
- sort orders by PLACED first
- sort items alphabetically
- item breakdown: ignore fulfilled. (hmm, this isn't the right thing to do for rescheduled orders)
- indicate when no items were picked up

* exclude fulfilled items from item breakdown

* default checkboxes to unchecked

* fix fulfilling selected. always indicate whether an item was fulfilled

* Show fulfilled badges

* Labels back to emoji, have checkbox select all of an entire variant at a time

If we want granularity in the future then that can be added later

* Display "fulfilled" on fulfilled items in fulfilled/partially fulfilled orders

* Make "picked up" badge green

* Address feedback

* Use Pacific Time on server side (#264)

* feat: Onboarding (#265)

* set up a modal for onboarding

* Show steps and progress bar

* Change design of buttons

* Create onboarding page

* Add animations for steps 1 and 5

* temporary images for intro

* add rainbow bar to top of page previews

* Quiet navbar, perhaps?

* address some feedback

* Move event list to its own component

* separate event filter into its own component

* try annotating badges on event card

* store collection

* Combine Store and Events components

* Make annotations look nicer

* Leaderboard rows

* start onboarding after checking in

* fix type error

* un-component EventList so the diff is cleaner

* move EventsPageProps back where it used to be

* Remove periods and exclamation marks from onboarding headings

* Reduce onboarding frequency (#266)

* Don't show onboarding when user has already attended events

* remove vim tab

* Add A.S. funded food field to event form (#269)

* Add A.S. funded food field to event form

* Make food items nullable

* Make food items nullable in apiRequests.ts as well

Mostly out of laIziness (idk if backend truly would enjoy receiving a null) but it's in line with Discord events

* Minor updates to onboarding (#267)

* add potential photos for onboarding first slide from justin

* increase leaderboard row height on mobile??

* fmt

* fmt

* use css var for positioning

* Arrange onboarding photos

* 3d effect for mouse users

* mobile collage layout

* improve leaderboard on mobile

* use backend support for whether onboarding seen

* refactor intro images

* [ImgBot] Optimize images (#271)

*Total -- 56,903.46kb -> 54,747.72kb (3.79%)

/public/assets/graphics/onboarding/Fall23Allocation-JustinLu.jpg -- 4,898.92kb -> 4,580.26kb (6.5%)
/public/assets/graphics/onboarding/Fall24Kickoff_1-JustinLu.jpg -- 9,357.62kb -> 8,933.71kb (4.53%)
/public/assets/graphics/onboarding/Fall24Bonfire_2-JustinLu.jpg -- 7,035.56kb -> 6,719.17kb (4.5%)
/public/assets/graphics/onboarding/Fall24BitByteInfo_1-JustinLu.jpg -- 7,678.81kb -> 7,348.67kb (4.3%)
/public/assets/graphics/onboarding/Fall24Bonfire_1-JustinLu.jpg -- 8,132.33kb -> 7,887.40kb (3.01%)
/public/assets/graphics/onboarding/Fall24Kickoff_3-JustinLu.jpg -- 7,072.95kb -> 6,867.79kb (2.9%)
/public/assets/graphics/onboarding/Fall24Kickoff_2-JustinLu.jpg -- 9,441.28kb -> 9,170.39kb (2.87%)
/public/assets/graphics/onboarding/Fall24BitByteInfo_2-JustinLu.jpg -- 3,285.99kb -> 3,240.33kb (1.39%)

Signed-off-by: ImgBotApp <[email protected]>
Co-authored-by: ImgBotApp <[email protected]>

* fixed errors

* fixed feedback

* pushed progress

* fixed

* cors error

* fixed errors

* fixed chrome bug

* fixed sean's feedback

---------

Signed-off-by: ImgBotApp <[email protected]>
Co-authored-by: Angela Hu <[email protected]>
Co-authored-by: Sean <[email protected]>
Co-authored-by: imgbot[bot] <31301654+imgbot[bot]@users.noreply.github.com>
Co-authored-by: ImgBotApp <[email protected]>
Co-authored-by: = <[email protected]>
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.

Store - Checkout Layout
2 participants