form update and election status

ashishlamsal · Jul 7, 2022 · 5126207 · 5126207
1 parent 266535b
commit 5126207
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 27 deletions.
diff --git a/client/src/App.jsx b/client/src/App.jsx
@@ -1,6 +1,6 @@
 import { Routes, Route } from 'react-router-dom';
 
-import Admin from './screens/Admin';
+import CandidateForm from './screens/CandidateForm';
 import Home from './screens/Home';
 import Navbar from './components/Navbar';
 import Login from './screens/Login';
@@ -19,6 +19,7 @@ function App() {
       <Routes>
             <Route path="/login" element={<Login />} />
             <Route path="/home" element={<Home />} />
+            <Route path="/add" element={<CandidateForm />} />
         </Routes>
       </div>
 

diff --git a/client/src/screens/Admin.js b/client/src/screens/Admin.js
@@ -8,7 +8,6 @@ import Dialog from '@mui/material/Dialog';
 import DialogActions from '@mui/material/DialogActions';
 import DialogContent from '@mui/material/DialogContent';
 import DialogContentText from '@mui/material/DialogContentText';
-import DialogTitle from '@mui/material/DialogTitle';
 
 import Candidate from '../components/CandidateCard';
 
@@ -20,6 +19,7 @@ export default function Admin({role, contract, web3, currentAccount}) {
     // const [web3, setWeb3] = useState(null);
     // const [currentAccount, setCurrentAccount] = useState(null);
     // const [contract, setContract] = useState(null);
+    const [electionState, setElectionState] = useState("NotStarted");
     const [loading, setLoading] = useState(true);
     const [candidates, setCandidates] = useState([]);
 
@@ -44,25 +44,34 @@ export default function Admin({role, contract, web3, currentAccount}) {
     //   }
     // };
 
-  const getCandidates = async () => {
-      if (contract) {
-          const count = await contract.methods.candidatesCount().call();
-          const temp = [];
-          for (let i = 0; i < count; i++) {
-              const candidate = await contract.methods.getCandidateDetails(i).call();
-              temp.push({ name: candidate[0], votes: candidate[1] });
-          }
-          setCandidates(temp);
-          setLoading(false);
-          console.log(temp)
-      }
-  };
+    const getCandidates = async () => {
+        if (contract) {
+            console.log(contract)
+            const count = await contract.methods.candidatesCount().call();
+            const temp = [];
+            for (let i = 0; i < count; i++) {
+                const candidate = await contract.methods.getCandidateDetails(i).call();
+                temp.push({ name: candidate[0], votes: candidate[1] });
+            }
+            setCandidates(temp);
+            setLoading(false);
+            console.log(temp)
+        }
+    };
+
+    const getElectionState = async () => {
+        if (contract) {
+            const state = await contract.methods.electionState().call();
+            setElectionState(state);
+        }
+    }
 
     // useEffect(() => {
     //     loadWeb3();
     // }, []);
 
     useEffect(() => {
+        getElectionState();
         getCandidates();
     }, [contract]);
 
@@ -75,8 +84,10 @@ export default function Admin({role, contract, web3, currentAccount}) {
     };
 
     const handleAgree = async () => {
-        console.log("Ending Election");
-        await contract.methods.endElection().call();
+        if (electionState==="NotStarted")
+            await contract.methods.startElection().call();
+        else if (electionState==="InProgress")
+            await contract.methods.endElection().call();
     }
 
     return (
@@ -93,7 +104,8 @@ export default function Admin({role, contract, web3, currentAccount}) {
                                 sx={{width: "100%"}}
                                 onClick={handleEnd}
                             >
-                                End Election
+                                { electionState && electionState==="NotStarted" && "Start Election"}
+                                { electionState && electionState==="InProgress" && "End Election"}
                             </Button>
                         </div>
                     </Grid>
@@ -124,7 +136,8 @@ export default function Admin({role, contract, web3, currentAccount}) {
                 >
                 <DialogContent>
                     <DialogContentText id="alert-dialog-description">
-                    Do you want to end the election?
+                    { electionState && electionState==="NotStarted" && "Do you want to start the election?"}
+                    { electionState && electionState==="InProgress" && "Do you want to end the election?"}
                     </DialogContentText>
                 </DialogContent>
                 <DialogActions>

diff --git a/client/src/screens/CandidateForm.js b/client/src/screens/CandidateForm.js
@@ -0,0 +1,64 @@
+import { useState } from 'react';
+import { styled } from '@mui/material/styles';
+import Box from '@mui/material/Box';
+import Button from '@mui/material/Button';
+import TextField from '@mui/material/TextField';
+import Grid from '@mui/material/Grid';
+
+const Input = styled('input')({
+    display: 'none',
+});
+
+export default function CandidateForm(){//({role, contract, web3, currentAccount}) {
+    const [name, setName] = useState('');
+    const [file, setFile] = useState(null);
+
+    const handleForm = async () => {
+        console.log("handleForm");
+        await contract.methods.addCandidate(name).call();
+    }
+
+    const handleNameChange = (event) => {
+        setName(event.target.value);
+    };
+
+    const handleFileChange = (event) => {
+        setFile(event.target.files[0]);
+    };
+
+    return(
+        <Box>
+            <Grid container spacing={3}>
+
+                <Grid item xs={12}>
+                    Candidate Form
+                </Grid>
+
+                <Grid item xs={12}>
+                    <label htmlFor="contained-button-file">
+                        <Input accept="image/*" id="contained-button-file" onChange={handleFileChange}/>
+                        <Button variant="contained" component="span">
+                        Upload Candidate List
+                        </Button>
+                    </label>
+                </Grid>
+
+                <Grid item xs={12}>
+                    <form onSubmit={handleForm}>
+                        <TextField 
+                            id="outlined-basic" 
+                            label="Candidate Name" 
+                            variant="outlined"
+                            value={name}
+                            onChange={handleNameChange}
+                        />
+                        <Button variant="contained" type="submit"> Submit </Button>
+                    </form>
+                </Grid>
+
+            </Grid>
+
+        </Box>
+
+    )
+}
diff --git a/client/src/screens/Home.js b/client/src/screens/Home.js
@@ -35,7 +35,7 @@ export default function Home() {
     const getRole = async () => {
         if (contract) {
             // const role = await contract.methods.getRole().call();
-            const role = 2;
+            const role = 1;
             setRole(role);
             setLoading(false);
         }
@@ -55,13 +55,13 @@ export default function Home() {
                 <h1>Loading the page !!!</h1>
             ) : (
                 <Box>
-                    { role===1 && <Vote role={role} 
+                    { role===1 && <Admin role={role} 
                                                 contract={contract} 
                                                 web3={web3} 
                                                 currentAccount={currentAccount}/>
                     }
 
-                    { role===2 && <Admin role={role} 
+                    { role===2 && <Vote role={role} 
                                                 contract={contract} 
                                                 web3={web3} 
                                                 currentAccount={currentAccount}/>

diff --git a/client/src/screens/Vote.js b/client/src/screens/Vote.js
@@ -4,11 +4,6 @@ import Grid from '@mui/material/Grid';
 import Button from '@mui/material/Button';
 import Typography from '@mui/material/Typography';
 import Divider from '@mui/material/Divider';
-import Dialog from '@mui/material/Dialog';
-import DialogActions from '@mui/material/DialogActions';
-import DialogContent from '@mui/material/DialogContent';
-import DialogContentText from '@mui/material/DialogContentText';
-import DialogTitle from '@mui/material/DialogTitle';
 
 import Radio from '@mui/material/Radio';
 import RadioGroup from '@mui/material/RadioGroup';