Skip to content

Commit

Permalink
I1529 Frontend Dependancy Update (#1555)
Browse files Browse the repository at this point in the history
Co-authored-by: Jaydon Krooss <jkrooss@umich.edu>
Co-authored-by: jaydonkrooss <147423601+jaydonkrooss@users.noreply.github.com>
  • Loading branch information
3 people committed Jan 10, 2024
1 parent adcd874 commit dca2734
Show file tree
Hide file tree
Showing 42 changed files with 5,387 additions and 14,187 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Expand Up @@ -222,6 +222,15 @@
"code"
]
},
{
"login": "jaydonkrooss",
"name": "Jaydon Krooss",
"avatar_url": "https://avatars.githubusercontent.com/u/147423601?v=4",
"profile": "https://github.com/jaydonkrooss",
"contributions": [
"code"
]
},
{
"login": "dependabot",
"name": "Dependabot",
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Expand Up @@ -104,6 +104,7 @@ venv/
ENV/
env.bak/
venv.bak/
venv_*

# Spyder project settings
.spyderproject
Expand All @@ -125,3 +126,6 @@ dmypy.json
node_modules/

webpack-stats.json

# VSCode
.history/
25 changes: 15 additions & 10 deletions assets/src/components/AssignmentGoalInput.js
@@ -1,13 +1,19 @@
import React, { useEffect, useState, useRef } from 'react'
import { withStyles } from '@material-ui/core'
import Grid from '@material-ui/core/Grid'
import Button from '@material-ui/core/Button'
import { styled } from '@mui/material/styles'
import Grid from '@mui/material/Grid'
import Button from '@mui/material/Button'
import StyledTextField from './StyledTextField'
import debounce from 'lodash.debounce'
import { eventLogExtra } from '../util/object'

const styles = ({
goalGradeInput: {
const PREFIX = 'AssignmentGoalInput'

const classes = {
goalGradeInput: `${PREFIX}-goalGradeInput`
}

const StyledGrid = styled(Grid)({
[`& .${classes.goalGradeInput}`]: {
marginTop: 0,
width: 150
}
Expand All @@ -22,8 +28,7 @@ function AssignmentGoalInput (props) {
setEventLog,
eventLog,
handleClearGoalGrades,
mathWarning,
classes
mathWarning
} = props

const [goalGradeInternal, setGoalGradeInternal] = useState(goalGrade)
Expand All @@ -44,7 +49,7 @@ function AssignmentGoalInput (props) {
}, [goalGrade])

return (
<Grid item>
<StyledGrid item>
<StyledTextField
error={goalGradeInternal > 100 || mathWarning || goalGradeInternal > maxPossibleGrade}
id='standard-number'
Expand Down Expand Up @@ -84,8 +89,8 @@ function AssignmentGoalInput (props) {
>
Clear
</Button>
</Grid>
</StyledGrid>
)
}

export default withStyles(styles)(AssignmentGoalInput)
export default (AssignmentGoalInput)

0 comments on commit dca2734

Please sign in to comment.