diff --git a/src/components/login/Login.tsx b/src/components/login/Login.tsx index 1850d21..f06c2b0 100644 --- a/src/components/login/Login.tsx +++ b/src/components/login/Login.tsx @@ -5,7 +5,6 @@ import Container from "@mui/material/Container"; import TextField from "@mui/material/TextField"; import Button from "@mui/material/Button"; import hsbcLogo from "../../assets/logo-png.png"; -import zoomLogo from "../../assets/zoom.png"; import LoginIcon from "@mui/icons-material/Login"; import useAuth from "../../hooks/useAuth"; import axios from "../../api/axios"; @@ -30,6 +29,7 @@ const Login: React.FC = () => { const [email, setEmail] = useState(""); const [password, setPassword] = useState(""); + const [hasError, setHasError] = useState(false); // const [errMsg, setErrMsg] = useState(''); // const userRef = useRef(); @@ -73,6 +73,7 @@ const Login: React.FC = () => { if (logedInUserId != undefined) { setAuth["uuid"] = logedInUserId; setAuth["isLoggedIn"] = true; + setHasError(false); store.dispatch(fetchMeetings(logedInUserId)); store.dispatch(fetchUsers(logedInUserId)); store.dispatch(fetchFavorites(logedInUserId)); @@ -81,6 +82,7 @@ const Login: React.FC = () => { } } catch (error) { console.log(error); + setHasError(true); } setEmail(email); setPassword(""); @@ -109,6 +111,8 @@ const Login: React.FC = () => { variant="outlined" value={password} placeholder="Password" + error={hasError} + helperText={hasError ? "Email or Password Incorrect!" : ""} type="password" onChange={(event) => { setPassword(event.target.value); diff --git a/src/components/meeting-details/meeting-details-components/Body.tsx b/src/components/meeting-details/meeting-details-components/Body.tsx index 936b0c3..1f2b378 100644 --- a/src/components/meeting-details/meeting-details-components/Body.tsx +++ b/src/components/meeting-details/meeting-details-components/Body.tsx @@ -78,7 +78,7 @@ const Body: React.FC = ({ meeting }) => { hourMod + ":" + // isoTime.slice(3, 5) + - date.getMinutes() + + (date.getMinutes() < 10 ? "0" + date.getMinutes() : "" + date.getMinutes()) + (hour > 11 ? "PM" : "AM") ); };