Skip to content

Fix/exercise UI match ingredients #1235

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.

Sign up for GitHub

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

Open
Sahasra0108 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix/exercise UI match ingredients #1235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e7ebf6
feat: update exercise search UI to match ingredient search - add Tune…
Sahasra0108 Apr 11, 2026
36071cf
feat: update exercise search UI to match ingredient search
Sahasra0108 Apr 11, 2026
3902c5a
Add changes
Sahasra0108 Apr 11, 2026
d7aa96c
test: add tests for exercise UI improvements
Sahasra0108 Apr 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 51 additions & 21 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 23 additions & 5 deletions src/components/Exercises/ExerciseOverview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import AddIcon from '@mui/icons-material/Add';
import { Box, Button, Container, Pagination, Stack, Typography, useMediaQuery } from "@mui/material";
import FilterListIcon from '@mui/icons-material/FilterList';
import { Box, Button, Container, Pagination, Stack, Typography, useMediaQuery, IconButton } from "@mui/material";
import Grid from '@mui/material/Grid';
import { CategoryFilter, CategoryFilterDropdown } from "components/Exercises/Filter/CategoryFilter";
import { EquipmentFilter, EquipmentFilterDropdown } from "components/Exercises/Filter/EquipmentFilter";
Expand Down Expand Up @@ -80,6 +81,9 @@ export const ExerciseOverviewList = () => {
const isMobile = useMediaQuery('(max-width:600px)');

const [page, setPage] = React.useState(1);
const [showFilters, setShowFilters] = useState<boolean>(() => {
return localStorage.getItem("wger.exerciseSearch.showFilters") !== "false";
});
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const handlePageChange = (event: any, value: number) => {
setPage(value);
Expand Down Expand Up @@ -196,9 +200,23 @@ export const ExerciseOverviewList = () => {
<Grid
size={{
xs: 12,
sm: 3
sm: showFilters ? 3 : 6
}}>
<NameAutocompleter callback={exerciseAdded} />
<Stack direction="row" alignItems="center" spacing={1} sx={{ width: '100%' }}>
<Box sx={{ flexGrow: 1 }}>
<NameAutocompleter callback={exerciseAdded} />
</Box>
<IconButton
onClick={() => {
const newValue = !showFilters;
setShowFilters(newValue);
localStorage.setItem("wger.exerciseSearch.showFilters", String(newValue));
}}
title="Toggle filters"
>
<FilterListIcon />
</IconButton>
</Stack>
</Grid>
<Grid
size={{
Expand All @@ -216,7 +234,7 @@ export const ExerciseOverviewList = () => {
</>
)}

{!isMobile && (
{!isMobile && showFilters && (
<Grid
size={{
xs: 12,
Expand Down Expand Up @@ -249,7 +267,7 @@ export const ExerciseOverviewList = () => {
<Grid
size={{
xs: 12,
sm: 9
sm: showFilters ? 9 : 12
}}>
{exerciseQuery.isLoading
? <ExerciseGridSkeleton />
Expand Down
Loading
Loading