Merge pull request #152 from dedis/front-num-voters

Display the number of ballot cast so far on election page

Author: nkcr

web/frontend/src/components/utils/FillElectionInfo.tsx

@@ -11,6 +11,7 @@ const useFillElectionInfo = (electionData: ElectionInfo) => {
   const [chunksPerBallot, setChunksPerBallot] = useState<number>(0);
   const [ballotSize, setBallotSize] = useState<number>(0);
   const [configObj, setConfigObj] = useState(null);
+  const [voters, setVoters] = useState<string[]>(null);
   const [isResultSet, setIsResultSet] = useState<boolean>(false);
 
   useEffect(() => {
@@ -23,6 +24,8 @@ const useFillElectionInfo = (electionData: ElectionInfo) => {
       setChunksPerBallot(electionData.ChunksPerBallot);
       setBallotSize(electionData.BallotSize);
       setConfigObj(electionData.Configuration);
+      setVoters(electionData.Voters);
+
       if (electionData.Result.length > 0) {
         setIsResultSet(true);
       }
@@ -42,6 +45,7 @@ const useFillElectionInfo = (electionData: ElectionInfo) => {
     configObj,
     isResultSet,
     setIsResultSet,
+    voters,
   };
 };
 

web/frontend/src/components/utils/useElection.tsx

@@ -29,6 +29,7 @@ const useElection = (electionID: ID) => {
     configObj,
     isResultSet,
     setIsResultSet,
+    voters,
   } = useFillElectionInfo(data);
 
   return {
@@ -45,6 +46,7 @@ const useElection = (electionID: ID) => {
     configObj,
     isResultSet,
     setIsResultSet,
+    voters,
     error,
   };
 };

web/frontend/src/language/en.json

@@ -86,10 +86,10 @@
     "enterSubjectTitle": "Enter the Subject Title",
     "errorCandidates": "You must add at least one candidate!",
     "errorNewCandidate": "Are you sure you don't want to add ",
-    "errorRetrievingElections": "An error seems to have occurred while retrieving all the elections from our server. Contact the administrator of this website.",
-    "errorRetrievingElection": "An error seems to have occurred while retrieving the election from our server. Contact the administrator of this website.",
-    "errorRetrievingProxy": "An error seems to have occurred while retrieving the addresses of the proxies from our server. Contact the administrator of this website.",
-    "errorRetrievingNodes": "An error seems to have occurred while retrieving the status of the nodes from our server. Contact the administrator of this website.",
+    "errorRetrievingElections": "An error seems to have occurred while retrieving all the elections from our server. Contact the administrator of this website. Error: ",
+    "errorRetrievingElection": "An error seems to have occurred while retrieving the election from our server. Contact the administrator of this website. Error: ",
+    "errorRetrievingProxy": "An error seems to have occurred while retrieving the addresses of the proxies from our server. Contact the administrator of this website. ",
+    "errorRetrievingNodes": "An error seems to have occurred while retrieving the status of the nodes from our server. Contact the administrator of this website. ",
     "errorRetrievingKey": "An error seems to have occurred while retrieving the public key from our server. Contact the administrator of this website.",
     "errorServerDown": "One of our servers seems to be down. Contact the administrator of this website.",
     "electionSuccess": "Your election was successfully submitted!",
@@ -160,7 +160,7 @@
     "errorRemoveUser": "Error while removing the user",
     "errorFetchingUsers": "Error while fetching the users",
     "voteFailure": "Your ballot hasn't been taken into account. It might be that the election has been closed or cancelled. Try refreshing the page.",
-    "ballotFailure": "An error occurred while sending your ballot. Please contact the administrator of this website",
+    "ballotFailure": "An error occurred while sending your ballot. Please contact the administrator of this website. ",
     "incompleteBallot": "Some answers are not complete.",
     "selectMin": "Select {{minSelect}} {{singularPlural}}. ",
     "selectMax": "Select at most {{maxSelect}} {{singularPlural}}. ",
@@ -236,6 +236,13 @@
     "invalidProxyError": "Error: the address you entered is not a valid URL.",
     "learnMore": "Learn more about D-Voting platform",
     "aboutPlatform": "About the Platform",
-    "whatMakesUsDifferent": "What makes us different"
+    "whatMakesUsDifferent": "What makes us different",
+    "numVotes": "Number of ballot cast: {{num}}",
+    "userID": "User ID of voters",
+    "nodeUnreachable": "Timeout: the node ({{node}}) could not be reached. ",
+    "proxyUnreachable": "Timeout: the address of the proxy for the node ({{node}}) could not be resolved. ",
+    "error": "Error: ",
+    "actionLoading": "Action loading...",
+    "statusLoading": "Status loading..."
   }
 }

web/frontend/src/layout/Footer.tsx

@@ -5,17 +5,17 @@ const Footer = () => (
     <footer>
       <div className="hidden sm:flex flex-row items-center max-w-7xl mx-auto py-2 px-4 overflow-hidden sm:px-6 lg:px-8">
         <span className="text-gray-400"> &copy; 2022 DEDIS LAB - </span>
-        <a className="text-gray-600" href="https://github.com/dedis/dela">
-          https://github.com/dedis/dela
+        <a className="text-gray-600" href="https://github.com/dedis/d-voting">
+          https://github.com/dedis/d-voting
         </a>
         <div className="px-10">
           <ProxyInput />
         </div>
       </div>
       <div className="flex sm:hidden flex-col items-center max-w-7xl mx-auto py-2 px-4 overflow-hidden sm:px-6 lg:px-8">
         <span className="text-gray-400"> &copy; 2022 DEDIS LAB - </span>
-        <a className="text-gray-600" href="https://github.com/dedis/dela">
-          https://github.com/dedis/dela
+        <a className="text-gray-600" href="https://github.com/dedis/d-voting">
+          https://github.com/dedis/d-voting
         </a>
         <div className="pt-2">
           <ProxyInput />

web/frontend/src/mocks/handlers.ts

@@ -142,6 +142,7 @@ export const handlers = [
         Configuration: configuration,
         BallotSize: 291,
         ChunksPerBallot: 11,
+        Voters: [],
       });
 
       return newElectionID;
@@ -157,8 +158,18 @@ export const handlers = [
 
   rest.post(endpoints.newElectionVote(':ElectionID'), async (req, res, ctx) => {
     const { Ballot }: NewElectionVoteBody = req.body as NewElectionVoteBody;
+    const { ElectionID } = req.params;
+
     await new Promise((r) => setTimeout(r, RESPONSE_TIME));
 
+    const Voters = mockElections.get(ElectionID as string).Voters;
+    Voters.push('userID' + (Voters.length + 1));
+
+    mockElections.set(ElectionID as string, {
+      ...mockElections.get(ElectionID as string),
+      Voters,
+    });
+
     return res(
       ctx.status(200),
       ctx.json({

web/frontend/src/mocks/setupMockElections.ts

@@ -54,6 +54,7 @@ const setupMockElection = () => {
     Configuration: unmarshalConfig(mockElection1),
     BallotSize: 174,
     ChunksPerBallot: 6,
+    Voters: [],
   });
 
   mockResults.set(electionID1, [mockElectionResult11, mockElectionResult12]);
@@ -69,6 +70,7 @@ const setupMockElection = () => {
     Configuration: unmarshalConfig(mockElection2),
     BallotSize: 174,
     ChunksPerBallot: 6,
+    Voters: ['aefae', 'ozeivn', 'ovaeop'],
   });
 
   mockResults.set(electionID2, [mockElectionResult21, mockElectionResult22, mockElectionResult23]);
@@ -83,6 +85,7 @@ const setupMockElection = () => {
     Configuration: unmarshalConfig(mockElection3),
     BallotSize: 291,
     ChunksPerBallot: 11,
+    Voters: [],
   });
 
   mockResults.set(electionID3, [mockElectionResult31, mockElectionResult32, mockElectionResult33]);