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

Store Orders Page: Specific Order UI #102

Merged
merged 11 commits into from
Dec 31, 2023
Merged

Conversation

alexzhang1618
Copy link
Contributor

@alexzhang1618 alexzhang1618 commented Dec 30, 2023

Description

What changes did you make? List all distinct problems that this PR addresses. Explain any relevant
motivation or context.

  • Implemented examining the info of a specific order

Things I still need to do:

  • Discount price displays
  • Flows for doing stuff (cancelling, rescheduling, etc etc)
  • animation for opening a card? this might be difficult
  • The specific event card header orientation for mobile (the status symbol moves to the top)

Changes

  • [Fill in here]

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

Screenshot 2023-12-30 at 12 05 36 AM Screenshot 2023-12-30 at 12 06 00 AM

Copy link

vercel bot commented Dec 30, 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 Dec 31, 2023 5:34am

@alexzhang1618 alexzhang1618 changed the title UI for examining a specific order Store Orders Page: Specific Order UI Dec 30, 2023
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.

I think the text contrast could be improved. Probably the background color should be dark blue for dark theme

image

maybe on mobile, the text should show below the image?

image

  • animation for opening a card? this might be difficult

yes it will be, i recommend putting this off for later

src/components/store/OrderCard/index.tsx Outdated Show resolved Hide resolved
src/components/store/OrderSummary/index.tsx Outdated Show resolved Hide resolved
src/components/store/OrderSummary/index.tsx Outdated Show resolved Hide resolved
src/components/store/OrderSummary/index.tsx Show resolved Hide resolved
@alexzhang1618
Copy link
Contributor Author

Since the last review:

  • Fixed some color contrast stuff for order status
  • Implemented the Discount price views
  • Made each card openable and moved API code into the card
  • Added mobile layout for status
  • Added action buttons to view pickup event, reschedule, and cancel order
    • I'm going to wait until Modal is merged in Edit profile page #91 before implementing these since I want to use it for these buttons
Screenshot 2023-12-30 at 1 37 38 PM Screenshot 2023-12-30 at 1 38 20 PM Screenshot 2023-12-30 at 1 38 29 PM Screenshot 2023-12-30 at 1 38 56 PM Screenshot 2023-12-30 at 1 41 19 PM

Copy link
Member

@farisashai farisashai left a comment

Choose a reason for hiding this comment

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

image

can you fix the blue color on the orders card and dropdown and also the padding for the store navbar is inconsistent with the page padding

@alexzhang1618
Copy link
Contributor Author

fixed by adding to reset.scss, I also removed the change in EventCard since this covers it as well. padding also fixed too

src/components/store/Diamonds/index.tsx Outdated Show resolved Hide resolved
src/components/store/Diamonds/index.tsx Outdated Show resolved Hide resolved
src/components/store/OrderCard/index.tsx Show resolved Hide resolved
src/components/store/OrderCard/style.module.scss Outdated Show resolved Hide resolved
@alexzhang1618 alexzhang1618 merged commit e42e317 into main Dec 31, 2023
4 checks passed
@alexzhang1618 alexzhang1618 deleted the feature/store-orders-page branch December 31, 2023 05:34
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