t push

Merge branch 'master' of github.com:chamhayden/eckles

frontend/src/page/Assessments/AssessmentsAssignments.jsx

@@ -41,12 +41,13 @@ const AssessmentsAssignments = ({ }) => {
   return (
     <SubNavWrapper baseUrl={'/assessments/assignments'} menu={menu}>
       <>
-        <h2>{params.ass} has {['ass1','ass2','ass3'].includes(params.ass) ? '' : 'not '} been released!</h2>
-        {['ass1','ass2','ass3'].includes(params.ass) && (<Button variant="contained" size="large">
+        <h2>{params.ass} has {['ass1','ass2','ass3','ass4'].includes(params.ass) ? '' : 'not '} been released!</h2>
+        {['ass1','ass2','ass3','ass4'].includes(params.ass) && (<Button variant="contained" size="large">
           <a style={{ color: '#fff' }} target="_blank" href={
             params.ass === 'ass1' ? `/~cs6080/redirect/?path=COMP6080/${getters.term}/students/_/pictocode/` :
             params.ass === 'ass2' ? `/~cs6080/redirect/?path=COMP6080/${getters.term}/students/_/funform/` :
-            params.ass === 'ass3' ? `https://docs.google.com/spreadsheets/d/1QZ1p5HSFyZmdfyvt7kyKpA_BfQdCDWs8T24o0S08nfQ/`
+            params.ass === 'ass3' ? `https://docs.google.com/spreadsheets/d/1QZ1p5HSFyZmdfyvt7kyKpA_BfQdCDWs8T24o0S08nfQ/` :
+            params.ass === 'ass4' ? `https://docs.google.com/spreadsheets/d/1QRaHRbuvlbeptyfUDw91NZjSdQcu-SrMr5wOfgeuDfk/`
             : `/~cs6080/redirect/?path=COMP6080/${getters.term}/students/_/${params.ass}/`}>
             View on gitlab
           </a>

frontend/src/page/Assessments/Exams/Exam23T1.jsx

@@ -41,7 +41,7 @@ const CourseOutline22T3 = () => {
         Date, Time, and Duration
       </Typography>
       <Typography variant="body1" component="div" gutterBottom>
-        The final exam will be a 3 hour exam that begins at 2pm (AEDT) and ends at 5pm (AEDT) on Monday the 5th December, 2022.
+        The final exam will be a 3 hour exam that begins at 9am (AEST) and ends at 12pm (AEST) on Tuesday 2nd May.
       </Typography>
       <Typography variant="body1" component="div" gutterBottom>
         Students outside of Asia-Pacific region, or students with ELS requirements, may have their exam time altered and communicated to the lecturer in charge privately. If you have been given alternate instructions about start and finish times, they apply.
@@ -53,7 +53,7 @@ const CourseOutline22T3 = () => {
         Exam Structure
       </Typography>
       <Typography variant="body1" component="div" gutterBottom>
-        The exam will be worth X marks. those X marks will make up the 20% value of the course. X will be determined closer to the exam.
+        Your exam will be worth a certain number of arbitrary marks, but these marks will make up 20% of the course (the size of this assessment).
       </Typography>
       <Typography variant="body1" component="div" gutterBottom>
         The exam will be very similar to assignment 3, with the following simplified criteria:

frontend/src/page/Login.jsx

@@ -106,7 +106,7 @@ const SignIn = (props) => {
   if (loading) {
     return <AppLoad />;
   }
-  
+
   return (
     <main className={classes.main}>
       <CssBaseline />
@@ -118,7 +118,7 @@ const SignIn = (props) => {
         <form className={classes.form}>
           <FormControl margin="normal" required fullWidth>
             <InputLabel htmlFor="email">zid</InputLabel>
-            <Input id="email" name="email" autoComplete="email" autoFocus placeholder="z1234567" value={zid} onChange={e => setZid(e.target.value)} />
+            <Input id="username" name="username" autoComplete="username" autoFocus placeholder="z1234567" value={zid} onChange={e => setZid(e.target.value)} />
           </FormControl>
           <FormControl margin="normal" required fullWidth>
             <InputLabel htmlFor="password">zpass</InputLabel>
@@ -165,4 +165,4 @@ SignIn.propTypes = {
   classes: PropTypes.object.isRequired,
 };
 
-export default withStyles(styles)(SignIn);
+export default withStyles(styles)(SignIn);