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.

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

CHG Assignment Card #256

Merged
merged 7 commits into from
Oct 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,27 +1,67 @@
import React from 'react';

import {useHistory} from 'react-router-dom';
import Card from '@material-ui/core/Card';
import CardContent from '@material-ui/core/CardContent';
import CardActions from '@material-ui/core/CardActions';
import CardActionArea from '@material-ui/core/CardActionArea';
import Typography from '@material-ui/core/Typography';
import Button from '@material-ui/core/Button';
import Box from '@material-ui/core/Box';
import clsx from 'clsx';

import {useStyles} from './AssignmentCardV2.styles';

const AssignmentCard = ({

const AssignmentCardV2 = ({
id,
name,
due_date,
course,
repo_url,
}) => {
const history = useHistory();
const classes = useStyles();

const due_days = Math.round((new Date(due_date) - new Date())/(1000*3600*24));
return (
<div>

</div>
<Box className={classes.asignmentContainer}>
synoet marked this conversation as resolved.
Show resolved Hide resolved
{due_days > 0 &&
<Box
className={
clsx(classes.dueBadge,
due_days > 7 ? classes.greenBadge :due_days <= 5 && due_days > 3 ? classes.orangeBadge : classes.redBadge)
}
>
<Typography className={classes.dueDate} align='center'>
{`${due_days} ${due_days == 1 ? 'day' : 'days'}`} remaining
</Typography>
</Box>
}
<Typography className={classes.assignmentName}>{name}</Typography>
<Typography className={classes.courseName}>{course.name}</Typography>
<Box className={classes.courseActionsContainer}>
<Button
onClick = {() => {
history.push(`/courses/assignment?assignmentId=${id}`);
}}
className={classes.openCourseButton}
>
Open Assignment
</Button>
<Button
onClick = {() => {
history.push(repo_url);
}}
className={classes.viewRepoButon}
>
View Repo
</Button>
</Box>

</Box>

);
};

export default AssignmentCard;

export default AssignmentCardV2;
Original file line number Diff line number Diff line change
@@ -1,7 +1,70 @@
import {makeStyles} from '@material-ui/core/styles';

export const useStyles = makeStyles((theme) => ({
courseCardContainer: {
minWidth: '300px',
asignmentContainer: {
position: 'relative',
color: theme.palette.white,
flexGrow: 1,
minWidth: 275,
maxWidth: 280,
backgroundColor: theme.palette.dark.blue['200'],
display: 'flex',
flexDirection: 'column',
justifyContent: 'space-between',
padding: `${theme.spacing(2.5)}px`,
borderRadius: `${theme.spacing(1.25)}px`,
margin: theme.spacing(5),
},
dueBadge: {
boxShadow: '0px 4px 4px rgba(0, 0, 0, 0.25)',
position: 'absolute',
padding: `${theme.spacing(0.5)}px ${theme.spacing(1.5)}px ${theme.spacing(0.5)}px ${theme.spacing(1.5)}px`,
borderRadius: '3px',
top: -theme.spacing(2),
right: -theme.spacing(1),
flexGrow: 1,
minWidth: 100,
maxWidth: 150,
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
},
dueDate: {
color: 'black',
},
greenBadge: {
backgroundColor: theme.palette.color.green,
},
redBadge: {
backgroundColor: theme.palette.color.red,
},
orangeBadge: {
backgroundColor: theme.palette.color.orange,
},
assignmentName: {
fontSize: '20px',
},
courseName: {
fontSize: '16px',
color: theme.palette.gray['200'],
},
courseActionsContainer: {
marginTop: '20px',
display: 'flex',
flexDirection: 'row',
alignItems: 'center',
width: '100%',
},
openCourseButton: {
fontSize: '14px',
borderRadius: '3px',
backgroundColor: theme.palette.primary.main,
padding: '5px 10px 5px',
},
viewRepoButon: {
fontSize: '.8rem',
backgroundColor: theme.palette.dark.blue['0'],
marginLeft: '10px;',
color: theme.palette.gray['200'],
},
}));
10 changes: 2 additions & 8 deletions web/src/Pages/Public/Assignments.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Grid from '@material-ui/core/Grid';
import Grow from '@material-ui/core/Grow';
import useQuery from '../../hooks/useQuery';

import AssignmentCard from '../../Components/Public/Assignments/AssignmentCard';
import AssignmentCardV2 from '../../Components/Public/Assignments/AssignmentCardV2/AssignmentCardV2';
import axios from 'axios';
import standardErrorHandler from '../../Utils/standardErrorHandler';
import {useSnackbar} from 'notistack';
Expand Down Expand Up @@ -77,13 +77,7 @@ const Assignments = () => {
style={{transformOrigin: '0 0 0'}}
{...({timeout: 300 * (pos + 1)})}
>
<AssignmentCard
assignment={assignment}
setSelectedTheia={setSelectedTheia}
runAssignmentPolling={assignment.id === pollingAssignmentId && runAssignmentPolling}
setRunAssignmentPolling={setRunAssignmentPolling}
setPollingAssignmentId={setPollingAssignmentId}
/>
<AssignmentCardV2 {... assignment}/>
</Grow>
</Grid>
))}
Expand Down