From ce87d1387649839c4b140c95320ebb590afa8ca4 Mon Sep 17 00:00:00 2001
From: Zheng Fu <24203166+fuzheng1998@users.noreply.github.com>
Date: Sun, 24 Sep 2023 19:43:25 +1000
Subject: [PATCH] 1. add dialog ui for error display while Login 2. clean up
 code

---
 frontend/src/Router.jsx     |  2 --
 frontend/src/page/Login.jsx | 43 ++++++++++++++++++++++++++-----------
 frontend/src/util/api.js    |  5 +++--
 3 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/frontend/src/Router.jsx b/frontend/src/Router.jsx
index 0ba6674..4ffc4c4 100644
--- a/frontend/src/Router.jsx
+++ b/frontend/src/Router.jsx
@@ -1,9 +1,7 @@
 import React from 'react';
-import { render } from "react-dom";
 import {
   Routes,
   Route,
-  useNavigate,
 } from 'react-router-dom';
 
 import Site from './page/Site';
diff --git a/frontend/src/page/Login.jsx b/frontend/src/page/Login.jsx
index d9e444e..d282276 100644
--- a/frontend/src/page/Login.jsx
+++ b/frontend/src/page/Login.jsx
@@ -1,20 +1,15 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Avatar from '@material-ui/core/Avatar';
 import Button from '@material-ui/core/Button';
 import CssBaseline from '@material-ui/core/CssBaseline';
 import Radio from '@mui/material/Radio';
 import RadioGroup from '@mui/material/RadioGroup';
 import FormControlLabel from '@mui/material/FormControlLabel';
 import FormControl from '@mui/material/FormControl';
-
+import { Dialog, DialogTitle, DialogContent, DialogContentText, DialogActions} from '@mui/material';
 import FormLabel from '@mui/material/FormLabel';
-import Checkbox from '@material-ui/core/Checkbox';
 import Input from '@material-ui/core/Input';
-import MenuItem from '@mui/material/MenuItem';
-import Select from '@material-ui/core/Select';
 import InputLabel from '@material-ui/core/InputLabel';
-import LockOutlinedIcon from '@material-ui/icons/LockOutlined';
 import Paper from '@material-ui/core/Paper';
 import Typography from '@material-ui/core/Typography';
 import withStyles from '@material-ui/core/styles/withStyles';
@@ -25,7 +20,6 @@ import { useCookies } from 'react-cookie';
 import AppLoad from '../component/AppLoad';
 import { apiCall } from '../util/api';
 import config from '../config';
-import makePage from '../component/makePage';
 import { Context, useContext } from '../context';
 
 /* Sourced https://github.com/mui-org/material-ui/blob/v3.x/docs/src/pages/getting-started/page-layout-examples/sign-in/SignIn.js */
@@ -72,13 +66,25 @@ const styles = theme => ({
 });
 
 const SignIn = (props) => {
-  const { getters, setters } = useContext(Context);
+  // dialog state
+  const [open, setOpen] = React.useState(false);
+  const { getters } = useContext(Context);
   const [zid, setZid] = React.useState('');
   const [zpass, setZpass] = React.useState('');
   const [term, setTerm] = React.useState(['sample']);
-  const [cookies, setCookie] = useCookies();
+  const [cookies] = useCookies();
   const [loading, setLoading] = React.useState(false);
   const navigate = useNavigate();
+  const [errorMessage, setErrorMessage] = React.useState('');
+
+  const handleClickOpen = (message) => {
+    setErrorMessage(message); // Set the error message
+    setOpen(true);
+  };
+
+  const handleClose = () => {
+    setOpen(false);
+  };
 
   React.useEffect(() => {
     if (cookies.eckles_loggedin) {
@@ -92,7 +98,7 @@ const SignIn = (props) => {
 
   const login = (zid, zpass, term) => {
     setLoading(true);
-    apiCall('login', { term, zid, zpass })
+    apiCall('login', { term, zid, zpass }, 'POST', handleClickOpen)
       .then(_ => {
         localStorage.removeItem('eckles_content');
         localStorage.removeItem('eckles_expiry');
@@ -106,12 +112,12 @@ const SignIn = (props) => {
   if (loading) {
     return <AppLoad />;
   }
-
+  
   return (
     <main className={classes.main}>
       <CssBaseline />
       <Paper className={classes.paper}>
-        <img className={classes.logo} src={mainlogo} />
+        <img className={classes.logo} src={mainlogo} alt='mainlogo'/>
         <Typography component="h1" variant="h5">
           Sign in to COMP6080
         </Typography>
@@ -157,6 +163,19 @@ const SignIn = (props) => {
           </Button>
         </form>
       </Paper>
+      <Dialog open={open} onClose={handleClose}>
+        <DialogTitle>{"Error"}</DialogTitle>
+        <DialogContent>
+          <DialogContentText>
+              {errorMessage}
+          </DialogContentText>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={handleClose} color="primary">
+            Close
+          </Button>
+        </DialogActions>
+      </Dialog>
     </main>
   );
 }
diff --git a/frontend/src/util/api.js b/frontend/src/util/api.js
index b2e7b0a..ecb2fa1 100644
--- a/frontend/src/util/api.js
+++ b/frontend/src/util/api.js
@@ -1,6 +1,6 @@
 import config from '../config';
 
-export const apiCall = (path, data, type) => {
+export const apiCall = (path, data, type, callback) => {
   return new Promise((resolve, reject) => {
     fetch(`${config.BASE_URL}/api/${path}`, {
       method: type ?? 'POST',
@@ -15,7 +15,8 @@ export const apiCall = (path, data, type) => {
         return response.json().then(resolve);
       } else if (response.status === 400) {
         return response.json().then(obj => {
-          alert(obj.err);
+          // alert(obj.err);
+          callback(obj.err);
           reject(obj.err);
         });
       } else {