lockout updates

src/screens/HomeScreen.js

@@ -146,6 +146,15 @@ function Home() {
 
   const isAuthenticated = useSelector(state => state.auth.isAuthenticated);
   const isCovidPositive = useSelector(state => state.covid.isCovidPositive);
+  useEffect( ()=>{
+    axios.post(`${process.env.REACT_APP_API_URL}/covid`,{},{withCredentials:true})
+    .then(res=>{
+        if(res.data.covidPositive){
+            dispatch(setCovidPositive());
+        }
+    })
+    .catch(err=>{});
+}, [dispatch]);
   if (!isAuthenticated) return <Redirect to="/login" />;
   if (isCovidPositive) return <Redirect to="/lockout" />;
 

src/screens/LockoutScreen.js

@@ -2,27 +2,36 @@ import { Flex, Heading, Text } from "@chakra-ui/react";
 import axios from "axios";
 import { useEffect } from "react";
 import { useDispatch, useSelector } from "react-redux";
-import { Redirect } from "react-router-dom";
-import { setCovidPositive } from "../features/auth/covidSlice";
+import { Redirect, useHistory } from "react-router-dom";
+import { authLogout } from "../features/auth/authSlice";
+import { setCovidNegative, setCovidPositive } from "../features/auth/covidSlice";
 
-function Lockout(){
+function Lockout() {
   const isAuthenticated = useSelector(state => state.auth.isAuthenticated);
   const isCovidPositive = useSelector(state => state.covid.isCovidPositive);
   const dispatch = useDispatch();
+  const history = useHistory();
 
-    useEffect( ()=>{
-
-        axios.post(`${process.env.REACT_APP_API_URL}/covid`,{},{withCredentials:true})
-        .then(res=>{
-            if(res.body.positivity){
+  useEffect(() => {
+    axios.post(`${process.env.REACT_APP_API_URL}/covid`, {}, { withCredentials: true })
+      .then(res => {
+        if (res.data.covidPositive) {
           dispatch(setCovidPositive());
+        } else if (res.data.covidPositive === false) {
+          dispatch(setCovidNegative());
         }
       })
-        .catch(err=>{
-
+      .catch(err => {
+        try {
+          if (err.response.status === 401) {
+            dispatch(authLogout());
+            history.push("/login");
+          }
+        }
+        catch (e) { }
       });
 
-    }, [dispatch]);
+  }, [dispatch, history]);
 
   if (!isAuthenticated) return <Redirect to="/login" />;
   if (!isCovidPositive) return <Redirect to="/home" />;
@@ -41,7 +50,7 @@ function Lockout(){
           This lockout is to remind you to quarantine yourself according to local
           COVID19 health policies. This lockout will automatically be lifted after
           14 days.
-              <br/><br/>
+          <br /><br />
           <b>Please avoid contact with other people for the duration of this lockout!</b>
         </Text>
       </Flex>

src/screens/ScannerScreen.js

@@ -5,6 +5,7 @@ import QrReader from 'react-qr-reader';
 import { useDispatch, useSelector } from 'react-redux';
 import { Redirect, useHistory } from 'react-router-dom';
 import { authLogout } from '../features/auth/authSlice';
+import { setCovidPositive } from '../features/auth/covidSlice';
 
 function Scanner() {
   const toast = useToast();
@@ -87,7 +88,18 @@ function Scanner() {
   }, [scanData, dispatch, history, toast]);
 
   const isAuthenticated = useSelector(state => state.auth.isAuthenticated);
+  const isCovidPositive = useSelector(state => state.covid.isCovidPositive);
+  useEffect( ()=>{
+    axios.post(`${process.env.REACT_APP_API_URL}/covid`,{},{withCredentials:true})
+    .then(res=>{
+        if(res.data.covidPositive){
+            dispatch(setCovidPositive());
+        }
+    })
+    .catch(err=>{});
+}, [dispatch]);
   if (!isAuthenticated) return <Redirect to="/login" />;
+  if (isCovidPositive) return <Redirect to="/lockout" />;
 
   return (
     <Flex