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.

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

Chanes done by Dev Joshi 202452315 #21

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+42 −46
Open

Chanes done by Dev Joshi 202452315 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae2e75e
Update AppBar.jsx
devj-arch Nov 17, 2024
228ba5f
Update TransactionChart.jsx
devj-arch Nov 17, 2024
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
83 changes: 39 additions & 44 deletions client/src/components/AppBar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,47 @@
import AppBar from '@mui/material/AppBar';
import Box from '@mui/material/Box';
import Toolbar from '@mui/material/Toolbar';
import Typography from '@mui/material/Typography';
import Button from '@mui/material/Button';
import { Link } from 'react-router-dom';
import { useDispatch, useSelector } from 'react-redux';
import { setMessage } from '../reducers/messageReducer';
import { ArgumentScale, Animation } from '@devexpress/dx-react-chart';
import { scaleBand } from '@devexpress/dx-chart-core';

const linkStyle = {
textDecoration: 'none',
color: 'white',
cursor: 'pointer'
}
import Paper from '@mui/material/Paper';
import {
Chart,
BarSeries,
ArgumentAxis,
ValueAxis,
Tooltip,
} from '@devexpress/dx-react-chart-material-ui';
import { EventTracker } from '@devexpress/dx-react-chart';
import { Typography } from '@mui/material';

export default function ButtonAppBar() {
const user = useSelector(state => state.auth.user)
const dispatch = useDispatch()
const TransactionChart = ({chartData}) => {

const logout = () => {
localStorage.removeItem('expenseTrackerToken')
dispatch(setMessage(['User logged out', true]))
setTimeout(() => dispatch(setMessage(null)), 5000)
if(!chartData.length>0){
return(
<Typography variant='h4' sx={{ textAlign: 'center', margin: 5 }}>
Add a transaction to view chart
</Typography>
)
}

return (
<Box sx={{ flexGrow: 1, width: '30%' }}>
<AppBar position="static">
<Toolbar>

<Typography variant="h6" component="div" sx={{ flexGrow: 1 }}>
<Link style={linkStyle} to='/'>Expense Tracker</Link>
</Typography>
return (
//changed width from 80% to 100%
<Paper style={{ marginTop: 20, width: '100%' }}>
<Chart
data={chartData}
>

{user &&
<>
<Button color="inherit"><Link style={linkStyle} to='/category'>category</Link></Button>
<Button color="inherit" onClick={logout}>Logout</Button>
</>
}
<ArgumentScale factory={scaleBand} />
<ArgumentAxis />
<ValueAxis />

{!user &&
<>
<Button color="inherit"><Link style={linkStyle} to='/login'>Login</Link></Button>
<Button color="inherit"><Link style={linkStyle} to='/register'>Register</Link></Button>
</>
}
</Toolbar>
</AppBar>
</Box>
);
<BarSeries
valueField="Expense"
argumentField="Category"
/>
<Animation />
<EventTracker/>
<Tooltip />
</Chart>
</Paper>
);
}
export default TransactionChart
5 changes: 3 additions & 2 deletions client/src/components/TransactionChart.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ const TransactionChart = ({chartData}) => {
return(
<Typography variant='h4' sx={{ textAlign: 'center', margin: 5 }}>
Add a transaction to view chart
</Typography>
</Typography>
)
}

return (
<Paper style={{ marginTop: 20, width: '20%' }}>
//changed width from 80% to 100%
<Paper style={{ marginTop: 20, width: '100%' }}>
<Chart
data={chartData}
>
Expand Down