naresh
/
our-sejahtera
mirror of https://github.com/naresh97/our-sejahtera
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

ran linter

pull/10/head
Nareshkumar Rao 3 years ago
parent
32739d2a05
commit
75c884740c
7 changed files with 151 additions and 86 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/features/auth/covidSlice.js
  2. 59
      src/screens/HomeScreen.js
  3. 56
      src/screens/LockoutScreen.js
  4. 16
      src/screens/ScannerScreen.js
  5. 9
      src/screens/SuccessScreen.js
  6. 9
      src/screens/VerifyScreen.js

2
src/features/auth/covidSlice.js
View File

@ -16,7 +16,7 @@ export const covidSlice = createSlice({
setCovidNegative: state => {
state.isCovidPositive = false;
Cookies.set('covidPositive', false);
}
},
},
});

59
src/screens/HomeScreen.js
View File

@ -50,37 +50,43 @@ function QRCode() {
}
function ConfirmCOVIDPositiveAlertDialog() {
const [isOpen, setOpen] = useState(false);
const toast = useToast();
const history = useHistory();
const dispatch = useDispatch();
const onClose = () => { setOpen(false) }
const showErrorToast = (errorMessage = "An error has occured.") => {
const onClose = () => {
setOpen(false);
};
const showErrorToast = (errorMessage = 'An error has occured.') => {
toast.closeAll();
toast({
title: 'Error!',
description: errorMessage,
status: 'error',
duration: 5000
duration: 5000,
});
}
};
const onConfirm = () => {
toast({
title: 'Confirming',
description: 'Hold on while we confirm with our servers.',
status: 'info',
duration: 10000
duration: 10000,
});
axios.post(`${process.env.REACT_APP_API_URL}/covid`,{
axios
.post(
`${process.env.REACT_APP_API_URL}/covid`,
{
setPositive: true,
},{withCredentials:true})
},
{ withCredentials: true }
)
.then(res => {
if (res.data.covidPositive) {
dispatch(setCovidPositive());
toast.closeAll();
toast({
title: "Confirmed!",
title: 'Confirmed!',
status: 'info',
duration: 2000,
});
@ -92,8 +98,8 @@ function ConfirmCOVIDPositiveAlertDialog() {
console.log(err);
try {
if (err.response.status === 401) {
showErrorToast("You are not logged in!");
history.push("/login");
showErrorToast('You are not logged in!');
history.push('/login');
} else {
showErrorToast();
}
@ -102,12 +108,18 @@ function ConfirmCOVIDPositiveAlertDialog() {
}
});
setOpen(false);
}
};
const cancelRef = useRef();
return (
<>
<Button colorScheme="red" mb={6} onClick={() => { setOpen(true); }}>
<Button
colorScheme="red"
mb={6}
onClick={() => {
setOpen(true);
}}
>
Report Positive COVID19
</Button>
<AlertDialog
@ -121,13 +133,17 @@ function ConfirmCOVIDPositiveAlertDialog() {
Confirm Tested COVID19 Positive
</AlertDialogHeader>
<AlertDialogBody>
Please confirm that you have been tested POSITIVE with
COVID19. Upon confirmation, this app will inform the people
you have come in contact with in the last 7 days.
Please confirm that you have been tested POSITIVE with COVID19.
Upon confirmation, this app will inform the people you have come
in contact with in the last 7 days.
</AlertDialogBody>
<AlertDialogFooter>
<Button ref={cancelRef} onClick={onClose}>Cancel</Button>
<Button colorScheme="red" onClick={onConfirm} ml={3}>Confirm</Button>
<Button ref={cancelRef} onClick={onClose}>
Cancel
</Button>
<Button colorScheme="red" onClick={onConfirm} ml={3}>
Confirm
</Button>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialogOverlay>
@ -148,7 +164,12 @@ 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})
axios
.post(
`${process.env.REACT_APP_API_URL}/covid`,
{},
{ withCredentials: true }
)
.then(res => {
if (res.data.covidPositive) {
dispatch(setCovidPositive());

56
src/screens/LockoutScreen.js
View File

@ -1,10 +1,13 @@
import { Flex, Heading, Text, useToast } from "@chakra-ui/react";
import axios from "axios";
import { useEffect } from "react";
import { useDispatch, useSelector } from "react-redux";
import { Redirect, useHistory } from "react-router-dom";
import { authLogout } from "../features/auth/authSlice";
import { setCovidNegative, setCovidPositive } from "../features/auth/covidSlice";
import { Flex, Heading, Text, useToast } from '@chakra-ui/react';
import axios from 'axios';
import { useEffect } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { Redirect, useHistory } from 'react-router-dom';
import { authLogout } from '../features/auth/authSlice';
import {
setCovidNegative,
setCovidPositive,
} from '../features/auth/covidSlice';
function Lockout() {
const isAuthenticated = useSelector(state => state.auth.isAuthenticated);
@ -19,7 +22,12 @@ function Lockout() {
status: 'info',
duration: 10000,
});
axios.post(`${process.env.REACT_APP_API_URL}/covid`, {}, { withCredentials: true })
axios
.post(
`${process.env.REACT_APP_API_URL}/covid`,
{},
{ withCredentials: true }
)
.then(res => {
toast.closeAll();
if (res.data.covidPositive) {
@ -33,7 +41,7 @@ function Lockout() {
try {
if (err.response.status === 401) {
dispatch(authLogout());
history.push("/login");
history.push('/login');
} else {
toast({
title: 'Server Error Occurred',
@ -41,10 +49,8 @@ function Lockout() {
duration: 10000,
});
}
}
catch (e) { }
} catch (e) {}
});
}, [dispatch, history, toast]);
if (!isAuthenticated) return <Redirect to="/login" />;
@ -57,15 +63,27 @@ function Lockout() {
alignItems="center"
justifyContent="center"
>
<Flex direction="column" background="white" mt={5} mb={5} p={12} rounded={6} id="contentFlex">
<Flex
direction="column"
background="white"
mt={5}
mb={5}
p={12}
rounded={6}
id="contentFlex"
>
<Heading>Lockout</Heading>
<Text>
You have reported that you have been tested <b>POSITIVE</b> with COVID19.
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 />
<b>Please avoid contact with other people for the duration of this lockout!</b>
You have reported that you have been tested <b>POSITIVE</b> with
COVID19. 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 />
<b>
Please avoid contact with other people for the duration of this
lockout!
</b>
</Text>
</Flex>
</Flex>

16
src/screens/ScannerScreen.js
View File

@ -90,7 +90,12 @@ function Scanner() {
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})
axios
.post(
`${process.env.REACT_APP_API_URL}/covid`,
{},
{ withCredentials: true }
)
.then(res => {
if (res.data.covidPositive) {
dispatch(setCovidPositive());
@ -108,7 +113,14 @@ function Scanner() {
alignItems="center"
justifyContent="center"
>
<Flex direction="column" background="white" p={12} mb={6} mt={6} rounded={6}>
<Flex
direction="column"
background="white"
p={12}
mb={6}
mt={6}
rounded={6}
>
<QrReader
mb={6}
delay={300}

9
src/screens/SuccessScreen.js
View File

@ -11,7 +11,14 @@ function Success() {
alignItems="center"
justifyContent="center"
>
<Flex direction="column" background="white" mb={6} mt={6} p={12} rounded={6}>
<Flex
direction="column"
background="white"
mb={6}
mt={6}
p={12}
rounded={6}
>
<Heading>Success!</Heading>
<Text fontSize="lg">
We have succesfully saved your contact! Stay safe out there, and let

9
src/screens/VerifyScreen.js
View File

@ -48,7 +48,14 @@ function Verify(props) {
alignItems="center"
justifyContent="center"
>
<Flex direction="column" background="white" p={12} mt={6} mb={6} rounded={6}>
<Flex
direction="column"
background="white"
p={12}
mt={6}
mb={6}
rounded={6}
>
{verifyError ? errorMessage : loadingMessage}
</Flex>
</Flex>

Write Preview
Loading…
Cancel
Save