Skip to content

merge dev into stage#111

Merged
aditya-arcot merged 12 commits intostagefrom
dev
Mar 27, 2026
Merged

merge dev into stage#111
aditya-arcot merged 12 commits intostagefrom
dev

Conversation

@aditya-arcot
Copy link
Copy Markdown
Member

No description provided.

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR merges recent dev changes into stage, primarily updating the client UI layout/components (Card overrides + data table responsiveness) and adding server-side Alembic migrations to seed lower-body exercises and normalize muscle group descriptions.

Changes:

  • Add migrations to seed lower-body exercises and strip trailing periods from muscle group descriptions.
  • Introduce a Card override component and enforce its usage via ESLint; update multiple pages to use the override.
  • Improve table toolbar/pagination/view-options responsiveness and tweak page layouts.

Reviewed changes

Copilot reviewed 18 out of 18 changed files in this pull request and generated 8 comments.

Show a summary per file
File Description
server/app/migrations/versions/2026_03_27_1021-4f30fca6e7aa_update_muscle_group_descriptions.py Strips trailing . from muscle_groups.description (and restores on downgrade).
server/app/migrations/versions/2026_03_27_0951-95ee94cb9cfc_seed_lower_body_exercises.py Seeds system lower-body exercises and their muscle group mappings.
client/src/pages/ResetPassword.tsx Switch to Card override + layout tweaks.
client/src/pages/RequestAccess.tsx Switch to Card override + layout tweaks.
client/src/pages/Register.tsx Switch to Card override + layout tweaks.
client/src/pages/Login.tsx Switch to Card override + layout tweaks.
client/src/pages/ForgotPassword.tsx Switch to Card override + layout tweaks.
client/src/pages/Exercises.tsx Use Card override and simplify heading markup.
client/src/pages/Dashboard.tsx Minor spacing and copy tweaks.
client/src/pages/Admin.tsx Use Card override and simplify headings.
client/src/layout/AppLayout.tsx Header/main container layout adjustments; remove Docs nav link.
client/src/components/ui/overrides/card.tsx New Card component wrappers with standardized spacing/styles.
client/src/components/exercises/ExercisesTable.tsx Capitalize exercise names in the table display.
client/src/components/data-table/DataTableViewOptions.tsx Improve responsiveness + add aria-label; hide “View” text on small screens.
client/src/components/data-table/DataTableToolbar.tsx Rework toolbar layout and actions placement for responsiveness.
client/src/components/data-table/DataTablePagination.tsx Rework pagination UI and add displayed-rows text helper.
client/src/components/data-table/DataTable.tsx Adjust spacing for the table container.
client/eslint.config.js Restrict imports to enforce Card override usage.

@aditya-arcot aditya-arcot merged commit a234797 into stage Mar 27, 2026
3 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants