Skip to content

Comments

feat(settings form): add exercise category tabs with corresponding multi-select exercise dropdowns#27

Closed
aman-coder03 wants to merge 3 commits intoCode-Cause-Collective:mainfrom
aman-coder03:feature/exercise-category-dropdown
Closed

feat(settings form): add exercise category tabs with corresponding multi-select exercise dropdowns#27
aman-coder03 wants to merge 3 commits intoCode-Cause-Collective:mainfrom
aman-coder03:feature/exercise-category-dropdown

Conversation

@aman-coder03
Copy link

this PR adds a multi-select dropdown in the Settings modal that allows users to filter which exercise categories are used when generating random exercises after a Pomodoro session.

included:

  • new multi-select dropdown for exercise categories in Settings
  • persistent storage of selected categories using existing settings store
  • exercise generation now respects the selected categories
  • default behavior remains unchanged when no categories are selected (all allowed)

images:

Screenshot 2025-12-04 160915 Screenshot 2025-12-04 161002

fixes #26

@changeset-bot
Copy link

changeset-bot bot commented Dec 4, 2025

⚠️ No Changeset found

Latest commit: c6ff2af

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@brysonbw
Copy link
Collaborator

brysonbw commented Dec 5, 2025

@aman-coder03 I’ve updated the issue linked to your PR - will need an additional select dropdown for exercises

@aman-coder03
Copy link
Author

sure! working on it! @brysonbw

@aman-coder03
Copy link
Author

@brysonbw Ihave implemented the multi-select dropdowns for both exercise categories and individual exercises as requested. The settings now persist correctly and filtering logic has been updated accordingly.

image

@aman-coder03
Copy link
Author

@brysonbw i have implemented the changes, you can have a look!!

@brysonbw
Copy link
Collaborator

brysonbw commented Dec 7, 2025

@brysonbw i have implemented the changes, you can have a look!!

Ok, smooth. Thanks. Might want to rebase and get latest changes from main - I added select fields as well alongside other changes

@aman-coder03
Copy link
Author

done, you can have a look!!

@brysonbw
Copy link
Collaborator

brysonbw commented Dec 9, 2025

done, you can have a look!!

It seems when you merged and grabbed latest you resolved merge conflicts by accepting your current changes and not incoming (main). Thus, your diff files shows latest main changes being deleted - maybe try undoing latest merge commit on your branch and rebase from main or merge main into your branch again?

@aman-coder03 aman-coder03 force-pushed the feature/exercise-category-dropdown branch from f336179 to fdb8d47 Compare December 9, 2025 13:37
@aman-coder03
Copy link
Author

Screenshot 2025-12-09 191018

can you please tell me what should I do here?

@brysonbw
Copy link
Collaborator

brysonbw commented Dec 11, 2025

Screenshot 2025-12-09 191018

can you please tell me what should I do here?

Give this a try:

  1. git pull upstream main in your forked repo main branch
  2. cd into feature branch and run git rebase main
  3. Your editor or IDE should show merge conflicts and allow you to chose to accept current or incoming (main) changes or both. After seeing conflicts, I think you might want to accept both. Afterwards, double check after accepting both that you still have your changes

@aman-coder03
Copy link
Author

Synced my branch with latest main, resolved all conflicts, and updated the PR @brysonbw

@brysonbw
Copy link
Collaborator

brysonbw commented Dec 13, 2025

Synced my branch with latest main, resolved all conflicts, and updated the PR @brysonbw

@aman-coder03 Thanks. Instead of adding comment reviews on the PR, I think collaborating directly is smoother. I also pushed some changes to your working branch. Initially, I was thinking both could be dropdowns. Yet, I think having category tabs with corresponding multi-select exercise dropdowns would be smoother but open to something else if you think differently

image

If you agree, I left a TODO comment for you here (https://github.com/aman-coder03/studytimer.io/blob/feature/exercise-category-dropdown/src/pages/home.js#L472) to populate exercises table based on settings form category exercises selections

@brysonbw brysonbw changed the title add multi-select exercise category dropdown in settings feat(settings form): add exercise category tabs with corresponding multi-select exercise dropdowns Dec 13, 2025
@brysonbw
Copy link
Collaborator

@aman-coder03 Thank you for your efforts in looking into this. After reviewing the issue, I don’t believe it qualifies as a “good first issue,” so I’ll assign it to myself for now. I really appreciate your help, and I’m sure there will be other issues better suited to pick up. Likewise, I will close this PR

@brysonbw brysonbw closed this Dec 19, 2025
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.

Add dropdown to select exercises by category

2 participants