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

Chaitya/admin dropdown new #273

Merged
merged 15 commits into from
Jan 17, 2025
Merged

Chaitya/admin dropdown new #273

merged 15 commits into from
Jan 17, 2025

Conversation

Chaitya2108
Copy link
Contributor

Info

Closes [ISSUE NUMBER].

[description]

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.
  • 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

Chaitya2108 and others added 13 commits January 2, 2025 14:54
* Added new component for pickup dropdown for desktop view

* Conditionally adds visible overflow for desktop

* Removed min height
* 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
* 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
* Don't show onboarding when user has already attended events

* remove vim tab
* 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
* 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
*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]>
Copy link

vercel bot commented Jan 9, 2025

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 10, 2025 3:00am
testing-membership-portal-ui-v2 ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 10, 2025 3:00am

@SheepTester
Copy link
Member

oh maybe it didn't let you push to the old PR because I merged in changes from main, you probably just had to pull first

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.

lgtm!

src/components/common/VerticalFormItem/style.module.scss Outdated Show resolved Hide resolved
src/pages/admin/milestone.tsx Outdated Show resolved Hide resolved
src/pages/admin/points.tsx Outdated Show resolved Hide resolved
src/pages/admin/attendance.tsx Outdated Show resolved Hide resolved
@Chaitya2108 Chaitya2108 merged commit 43a3d88 into main Jan 17, 2025
8 checks passed
@Chaitya2108 Chaitya2108 deleted the chaitya/admin-dropdown-new branch January 17, 2025 00:22
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