Skip to content

Commit

Permalink
Merge pull request #69 from Chicago-Deep-Dish/uitestbranch
Browse files Browse the repository at this point in the history
gil didnt approve my my drop down text
  • Loading branch information
gilcohen67 authored Jul 1, 2022
2 parents 12d34ce + 286d631 commit 2627bd4
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 16 deletions.
6 changes: 3 additions & 3 deletions src/components/HomePage/HomeGraphs/AreaGraph.js
Original file line number Diff line number Diff line change
Expand Up @@ -436,11 +436,11 @@ return (
<ReactEcharts option={option} />
</Box>
<Container sx={{backgroundColor: '#1A2027', width: '500px', padding: 1}}>
<div style={{display: 'flex', justifyContent: 'center'}}>
<IconButton sx={{right: '30%'}} onClick={() => setToggleGraphMenu(!toggleGraphMenu)}>
<div style={{display: 'flex', justifyContent: 'flex-start'}}>
<IconButton sx={{right: 0}} onClick={() => setToggleGraphMenu(!toggleGraphMenu)}>
{toggleGraphMenu ? (<ArrowDropUp/>) : (<ArrowDropDown />)}
</IconButton>
<Typography style={{marginRight: '1%'}}>Hide Graph Menu</Typography>

</div>
</Container>
<Collapse in={toggleGraphMenu}>
Expand Down
5 changes: 2 additions & 3 deletions src/components/HomePage/HomeGraphs/BarGraph.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,10 @@ export default function Bar() {
<ReactEcharts option={option} />
</Box>
<Container sx={{backgroundColor: '#1A2027', width: '500px', padding: 1}}>
<div style={{display: 'flex', justifyContent: 'center'}}>
<IconButton sx={{right: '30%'}} onClick={() => setToggleGraphMenu(!toggleGraphMenu)}>
<div style={{display: 'flex', justifyContent: 'flex-start'}}>
<IconButton onClick={() => setToggleGraphMenu(!toggleGraphMenu)}>
{toggleGraphMenu ? (<ArrowDropUp/>) : (<ArrowDropDown />)}
</IconButton>
<Typography style={{marginRight: '1%'}}>Hide Graph Menu</Typography>
</div>
</Container>
<Collapse in={toggleGraphMenu}>
Expand Down
5 changes: 2 additions & 3 deletions src/components/HomePage/HomeGraphs/DonutGraph.js
Original file line number Diff line number Diff line change
Expand Up @@ -287,11 +287,10 @@ return (
<ReactEcharts option={option} />
</Box>
<Container sx={{backgroundColor: '#1A2027', width: '500px', padding: 1}}>
<div style={{display: 'flex', justifyContent: 'center'}}>
<IconButton sx={{right: '30%'}} onClick={() => setToggleGraphMenu(!toggleGraphMenu)}>
<div style={{display: 'flex', justifyContent: 'flex-start'}}>
<IconButton onClick={() => setToggleGraphMenu(!toggleGraphMenu)}>
{toggleGraphMenu ? (<ArrowDropUp/>) : (<ArrowDropDown />)}
</IconButton>
<Typography style={{marginRight: '1%'}}>Hide Graph Menu</Typography>
</div>
</Container>
<Collapse in={toggleGraphMenu}>
Expand Down
7 changes: 3 additions & 4 deletions src/components/HomePage/HomeGraphs/LineGraph.js
Original file line number Diff line number Diff line change
Expand Up @@ -289,12 +289,11 @@ if (graph === 'totalTime' && selection === 'difficulty') {
<ReactEcharts option={option} />
</Box>
<Container sx={{backgroundColor: '#1A2027', width: '500px', padding: 1}}>
<div style={{display: 'flex', justifyContent: 'center'}}>
<IconButton sx={{right: '30%'}} onClick={() => setToggleGraphMenu(!toggleGraphMenu)}>
<div style={{display: 'flex', justifyContent: 'flex-start'}}>
<IconButton onClick={() => setToggleGraphMenu(!toggleGraphMenu)}>
{toggleGraphMenu ? (<ArrowDropUp/>) : (<ArrowDropDown />)}
</IconButton>
<Typography style={{marginRight: '1%'}}>Hide Graph Menu</Typography>
</div>
</div>
</Container>
<Collapse in={toggleGraphMenu}>
<MenuBar
Expand Down
5 changes: 2 additions & 3 deletions src/components/HomePage/HomeGraphs/PieGraph.js
Original file line number Diff line number Diff line change
Expand Up @@ -281,11 +281,10 @@ return (
<ReactEcharts option={option} />
</Box>
<Container sx={{backgroundColor: '#1A2027', width: '500px', padding: 1}}>
<div style={{display: 'flex', justifyContent: 'center'}}>
<IconButton sx={{right: '30%'}} onClick={() => setToggleGraphMenu(!toggleGraphMenu)}>
<div style={{display: 'flex', justifyContent: 'flex-start'}}>
<IconButton onClick={() => setToggleGraphMenu(!toggleGraphMenu)}>
{toggleGraphMenu ? (<ArrowDropUp/>) : (<ArrowDropDown />)}
</IconButton>
<Typography style={{marginRight: '1%'}}>Hide Graph Menu</Typography>
</div>

</Container>
Expand Down

0 comments on commit 2627bd4

Please sign in to comment.