Adding the initial poll detail pages

Reviewed-on: #21

client/package-lock.json

@@ -12,11 +12,13 @@
         "@emotion/styled": "^11.14.1",
         "@mui/icons-material": "^7.3.7",
         "@mui/material": "^7.3.7",
+        "axios": "^1.13.2",
         "cra-template-pwa": "2.0.0",
         "react": "^19.2.3",
         "react-dom": "^19.2.3",
         "react-router": "7.12.0",
-        "react-scripts": "5.0.1"
+        "react-scripts": "5.0.1",
+        "recharts": "^3.7.0"
       }
     },
     "node_modules/@alloc/quick-lru": {
@@ -3164,6 +3166,40 @@
         "url": "https://opencollective.com/popperjs"
       }
     },
+    "node_modules/@reduxjs/toolkit": {
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.11.2.tgz",
+      "integrity": "sha512-Kd6kAHTA6/nUpp8mySPqj3en3dm0tdMIgbttnQ1xFMVpufoj+ADi8pXLBsd4xzTRHQa7t/Jv8W5UnCuW4kuWMQ==",
+      "dependencies": {
+        "@standard-schema/spec": "^1.0.0",
+        "@standard-schema/utils": "^0.3.0",
+        "immer": "^11.0.0",
+        "redux": "^5.0.1",
+        "redux-thunk": "^3.1.0",
+        "reselect": "^5.1.0"
+      },
+      "peerDependencies": {
+        "react": "^16.9.0 || ^17.0.0 || ^18 || ^19",
+        "react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "react": {
+          "optional": true
+        },
+        "react-redux": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@reduxjs/toolkit/node_modules/immer": {
+      "version": "11.1.3",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-11.1.3.tgz",
+      "integrity": "sha512-6jQTc5z0KJFtr1UgFpIL3N9XSC3saRaI9PwWtzM2pSqkNGtiNkYY2OSwkOGDK2XcTRcLb1pi/aNkKZz0nxVH4Q==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/immer"
+      }
+    },
     "node_modules/@rollup/plugin-babel": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
@@ -3269,6 +3305,16 @@
         "@sinonjs/commons": "^1.7.0"
       }
     },
+    "node_modules/@standard-schema/spec": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
+      "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="
+    },
+    "node_modules/@standard-schema/utils": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@standard-schema/utils/-/utils-0.3.0.tgz",
+      "integrity": "sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g=="
+    },
     "node_modules/@surma/rollup-plugin-off-main-thread": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz",
@@ -3574,6 +3620,60 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/d3-array": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.2.tgz",
+      "integrity": "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw=="
+    },
+    "node_modules/@types/d3-color": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
+      "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A=="
+    },
+    "node_modules/@types/d3-ease": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
+      "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA=="
+    },
+    "node_modules/@types/d3-interpolate": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
+      "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
+      "dependencies": {
+        "@types/d3-color": "*"
+      }
+    },
+    "node_modules/@types/d3-path": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz",
+      "integrity": "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg=="
+    },
+    "node_modules/@types/d3-scale": {
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz",
+      "integrity": "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==",
+      "dependencies": {
+        "@types/d3-time": "*"
+      }
+    },
+    "node_modules/@types/d3-shape": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.8.tgz",
+      "integrity": "sha512-lae0iWfcDeR7qt7rA88BNiqdvPS5pFVPpo5OfjElwNaT2yyekbM0C9vK+yqBqEmHr6lDkRnYNoTBYlAgJa7a4w==",
+      "dependencies": {
+        "@types/d3-path": "*"
+      }
+    },
+    "node_modules/@types/d3-time": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz",
+      "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g=="
+    },
+    "node_modules/@types/d3-timer": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
+      "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw=="
+    },
     "node_modules/@types/eslint": {
       "version": "8.56.12",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.12.tgz",
@@ -3826,6 +3926,11 @@
       "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
       "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw=="
     },
+    "node_modules/@types/use-sync-external-store": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz",
+      "integrity": "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg=="
+    },
     "node_modules/@types/ws": {
       "version": "8.18.1",
       "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
@@ -4763,6 +4868,31 @@
         "node": ">=4"
       }
     },
+    "node_modules/axios": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.2.tgz",
+      "integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==",
+      "dependencies": {
+        "follow-redirects": "^1.15.6",
+        "form-data": "^4.0.4",
+        "proxy-from-env": "^1.1.0"
+      }
+    },
+    "node_modules/axios/node_modules/form-data": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
+      "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/axobject-query": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
@@ -6136,6 +6266,116 @@
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
       "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ=="
     },
+    "node_modules/d3-array": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
+      "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+      "dependencies": {
+        "internmap": "1 - 2"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-color": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
+      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-ease": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
+      "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-format": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.2.tgz",
+      "integrity": "sha512-AJDdYOdnyRDV5b6ArilzCPPwc1ejkHcoyFarqlPqT7zRYjhavcT3uSrqcMvsgh2CgoPbK3RCwyHaVyxYcP2Arg==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-interpolate": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+      "dependencies": {
+        "d3-color": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-path": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
+      "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-scale": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
+      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+      "dependencies": {
+        "d3-array": "2.10.0 - 3",
+        "d3-format": "1 - 3",
+        "d3-interpolate": "1.2.0 - 3",
+        "d3-time": "2.1.1 - 3",
+        "d3-time-format": "2 - 4"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-shape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
+      "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+      "dependencies": {
+        "d3-path": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-time": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
+      "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+      "dependencies": {
+        "d3-array": "2 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-time-format": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
+      "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+      "dependencies": {
+        "d3-time": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-timer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
+      "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/damerau-levenshtein": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
@@ -6223,6 +6463,11 @@
       "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
       "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg=="
     },
+    "node_modules/decimal.js-light": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/decimal.js-light/-/decimal.js-light-2.5.1.tgz",
+      "integrity": "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg=="
+    },
     "node_modules/dedent": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
@@ -6801,6 +7046,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/es-toolkit": {
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.44.0.tgz",
+      "integrity": "sha512-6penXeZalaV88MM3cGkFZZfOoLGWshWWfdy0tWw/RlVVyhvMaWSBTOvXNeiW3e5FwdS5ePW0LGEu17zT139ktg=="
+    },
     "node_modules/escalade": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
@@ -8786,6 +9036,14 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/internmap": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
+      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/ipaddr.js": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.3.0.tgz",
@@ -12713,6 +12971,11 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
     "node_modules/psl": {
       "version": "1.15.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
@@ -12973,6 +13236,28 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
     },
+    "node_modules/react-redux": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.2.0.tgz",
+      "integrity": "sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g==",
+      "dependencies": {
+        "@types/use-sync-external-store": "^0.0.6",
+        "use-sync-external-store": "^1.4.0"
+      },
+      "peerDependencies": {
+        "@types/react": "^18.2.25 || ^19",
+        "react": "^18.0 || ^19",
+        "redux": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "redux": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/react-refresh": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
@@ -13133,6 +13418,46 @@
         "node": ">=8.10.0"
       }
     },
+    "node_modules/recharts": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/recharts/-/recharts-3.7.0.tgz",
+      "integrity": "sha512-l2VCsy3XXeraxIID9fx23eCb6iCBsxUQDnE8tWm6DFdszVAO7WVY/ChAD9wVit01y6B2PMupYiMmQwhgPHc9Ew==",
+      "dependencies": {
+        "@reduxjs/toolkit": "1.x.x || 2.x.x",
+        "clsx": "^2.1.1",
+        "decimal.js-light": "^2.5.1",
+        "es-toolkit": "^1.39.3",
+        "eventemitter3": "^5.0.1",
+        "immer": "^10.1.1",
+        "react-redux": "8.x.x || 9.x.x",
+        "reselect": "5.1.1",
+        "tiny-invariant": "^1.3.3",
+        "use-sync-external-store": "^1.2.2",
+        "victory-vendor": "^37.0.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-is": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/recharts/node_modules/eventemitter3": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz",
+      "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw=="
+    },
+    "node_modules/recharts/node_modules/immer": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-10.2.0.tgz",
+      "integrity": "sha512-d/+XTN3zfODyjr89gM3mPq1WNX2B8pYsu7eORitdwyA2sBubnTl3laYlBk4sXY5FUa5qTZGBDPJICVbvqzjlbw==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/immer"
+      }
+    },
     "node_modules/recursive-readdir": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
@@ -13144,6 +13469,19 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/redux": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
+      "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w=="
+    },
+    "node_modules/redux-thunk": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz",
+      "integrity": "sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==",
+      "peerDependencies": {
+        "redux": "^5.0.0"
+      }
+    },
     "node_modules/reflect.getprototypeof": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
@@ -13283,6 +13621,11 @@
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
       "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
     },
+    "node_modules/reselect": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz",
+      "integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w=="
+    },
     "node_modules/resolve": {
       "version": "1.22.11",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
@@ -14978,6 +15321,11 @@
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
       "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
     },
+    "node_modules/tiny-invariant": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
+      "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg=="
+    },
     "node_modules/tinyglobby": {
       "version": "0.2.15",
       "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
@@ -15424,6 +15772,14 @@
         "requires-port": "^1.0.0"
       }
     },
+    "node_modules/use-sync-external-store": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz",
+      "integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==",
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -15490,6 +15846,27 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/victory-vendor": {
+      "version": "37.3.6",
+      "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-37.3.6.tgz",
+      "integrity": "sha512-SbPDPdDBYp+5MJHhBCAyI7wKM3d5ivekigc2Dk2s7pgbZ9wIgIBYGVw4zGHBml/qTFbexrofXW6Gu4noGxrOwQ==",
+      "dependencies": {
+        "@types/d3-array": "^3.0.3",
+        "@types/d3-ease": "^3.0.0",
+        "@types/d3-interpolate": "^3.0.1",
+        "@types/d3-scale": "^4.0.2",
+        "@types/d3-shape": "^3.1.0",
+        "@types/d3-time": "^3.0.0",
+        "@types/d3-timer": "^3.0.0",
+        "d3-array": "^3.1.6",
+        "d3-ease": "^3.0.1",
+        "d3-interpolate": "^3.0.1",
+        "d3-scale": "^4.0.2",
+        "d3-shape": "^3.1.0",
+        "d3-time": "^3.0.0",
+        "d3-timer": "^3.0.1"
+      }
+    },
     "node_modules/w3c-hr-time": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",

client/package.json

@@ -7,11 +7,13 @@
     "@emotion/styled": "^11.14.1",
     "@mui/icons-material": "^7.3.7",
     "@mui/material": "^7.3.7",
+    "axios": "^1.13.2",
     "cra-template-pwa": "2.0.0",
     "react": "^19.2.3",
     "react-dom": "^19.2.3",
     "react-router": "7.12.0",
-    "react-scripts": "5.0.1"
+    "react-scripts": "5.0.1",
+    "recharts": "^3.7.0"
   },
   "scripts": {
     "start": "react-scripts start",

client/src/App.css

@@ -36,3 +36,38 @@
     transform: rotate(360deg);
   }
 }
+
+.dropdown {
+  display: inline-block;
+}
+
+.dropbtn {
+  background-color: #f5f5f5;
+  border: none;
+  cursor: pointer;
+}
+
+.dropdown-content {
+  display: none; /* Hidden by default */
+  position: absolute;
+  background-color: #f9f9f9;
+  min-width: 160px;
+  box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
+}
+
+.dropdown-content a {
+  color: black;
+  padding: 12px 16px;
+  text-decoration: none;
+  display: block;
+}
+
+/* Show the dropdown menu on hover */
+.dropdown:hover .dropdown-content {
+  display: block;
+}
+
+/* Add zebra striping to tables */
+table tr:nth-child(odd) {
+  background-color: #f5f5f5;
+}

client/src/App.js

@@ -4,22 +4,45 @@ import Home from "./pages/Home";
 import AdminLogin from "./pages/AdminLogin";
 import AdminMembers from "./pages/AdminMembers";
 import AdminMembersView from "./pages/AdminMembersView";
+import AdminCreateVote from "./pages/AdminCreateVote";
+import PollList from "./pages/PollList";
+import PollDetails from "./pages/PollDetails";
+import './App.css';
 
 export default function App() {
   return (
     <BrowserRouter>
       <nav style={{ padding: "1rem", background: "#f5f5f5" }}>
-        <Link to="/">Home</Link> | 
+        <Link to="/">Home</Link> |
-        <Link to="/admin-login">Admin Login</Link> | 
+        <Link to="/admin-login">Admin Login</Link> |
-        <Link to="/admin-members">Admin Members</Link> | 
+        {/* Member dropdown */}
-        <Link to="/admin-members-view">View Members</Link>
+        <div className="dropdown">
+          <button className="dropbtn">Member ▼</button>
+          <div className="dropdown-content">
+            <a href="/admin-members">Upload Members</a>
+            <a href="/admin-members-view">View Members</a>
+          </div>
+        </div> | 
+        <div className="dropdown">
+          <button className="dropbtn">Vote ▼</button>
+          <div className="dropdown-content">
+            <a href="/create-vote">Create Vote</a>
+            <a href="/polls">Poll List</a>
+            <a href="/poll-details/:id">View Poll Details</a> {/* Add this line */}
+          </div>
+        </div>
       </nav>
 
       <Routes>
         <Route path="/" element={<Home />} />
         <Route path="/admin-login" element={<AdminLogin />} />
+        {/* Member routes */}
         <Route path="/admin-members" element={<AdminMembers />} />
         <Route path="/admin-members-view" element={<AdminMembersView />} />
+        {/* Vote routes */}
+        <Route path="/create-vote" element={<AdminCreateVote />} />
+        <Route path="/polls" element={<PollList />} />
+        <Route path="/poll-details/:id" element={<PollDetails />} /> {/* Add this route */}
       </Routes>
     </BrowserRouter>
   );

client/src/pages/AdminCreateVote.js

@@ -0,0 +1,67 @@
+import React, { useState } from 'react';
+
+function AdminCreateVote() {
+  const [question, setQuestion] = useState('');
+  const [expiresInHours, setExpiresInHours] = useState('');
+  const [status, setStatus] = useState("");
+  
+
+  const handleSubmit = async (e) => {
+    e.preventDefault();
+    
+    const formData = new FormData();
+    formData.append("question", question);
+    formData.append("expiresInHours", expiresInHours);
+
+    try {
+      const resp = await fetch("/api/admin/new-vote", {
+        method: "POST",
+        body: formData,
+      });
+
+      const data = await resp.json();
+
+      if (data.success) {
+        setStatus(`✅ Vote created with ID`);
+      } else {
+        setStatus(`❌ Server error: ${data.error}`);
+      }
+    } catch (error) {
+      setStatus("❌ Failed to create vote. Please try again: " + (error.response?.data?.error || error.message));
+    }
+  };
+
+  return (
+    <div>
+      <h1>Create New Vote</h1>
+      <form onSubmit={handleSubmit}>
+        <div>
+          <label>Question:</label>
+          <input
+            type="text"
+            value={question}
+            onChange={(e) => setQuestion(e.target.value)}
+            required
+          />
+        </div>
+        
+        <div>
+          <label>Expires In (hours):</label>
+          <input
+            type="number"
+            min="1"
+            value={expiresInHours}
+            onChange={(e) => setExpiresInHours(e.target.value)}
+            required
+          />
+        </div>
+
+        <button type="submit">Create Vote</button>
+      </form>
+
+      {status && <p style={{ marginTop: "1rem" }}>{status}</p>}
+    </div>
+  );
+}
+
+export default AdminCreateVote;

client/src/pages/PollDetail.js

@@ -0,0 +1,92 @@
+import React, { useEffect, useState } from 'react';
+import axios from 'axios';
+import {
+  PieChart,
+  Pie,
+  Cell,
+  Tooltip,
+  Legend,
+} from 'recharts';
+
+const COLORS = ['#0088FE', '#FEB43C'];
+
+export default function PollDetail({ question }) {
+  const [poll, setPoll] = useState(null);
+
+  useEffect(() => {
+    fetchPoll();
+  }, [question]);
+
+  const fetchPoll = async () => {
+    try {
+      const response = await axios.post('/api/admin/view-votes', { question });
+      setPoll(response.data[0]);
+    } catch (error) {
+      console.error('Error fetching poll:', error);
+    }
+  };
+
+  if (!poll) return <div>Loading...</div>;
+
+  const memberData = [
+    { name: 'Yes', value: poll.member_yes },
+    { name: 'No', value: poll.member_no },
+  ];
+
+  const nonMemberData = [
+    { name: 'Yes', value: poll.non_member_yes },
+    { name: 'No', value: poll.non_member_no },
+  ];
+
+  return (
+    <div>
+      <h1>{poll.question}</h1>
+      <p>Created At: {new Date(poll.created_at).toLocaleString()}</p>
+
+      <div style={{ width: '40%', margin: '20px' }}>
+        <PieChart width={400} height={300}>
+          <Pie
+            data={memberData}
+            cx="50%"
+            cy="50%"
+            labelLine={false}
+            outerRadius={80}
+            fill="#8884d8"
+            dataKey="value"
+          >
+            {memberData.map((entry, index) => (
+              <Cell key={`cell-${index}`} fill={COLORS[index % COLORS.length]} />
+            ))}
+          </Pie>
+          <Tooltip />
+          <Legend />
+        </PieChart>
+      </div>
+
+      <div style={{ width: '40%', margin: '20px' }}>
+        <PieChart width={400} height={300}>
+          <Pie
+            data={nonMemberData}
+            cx="50%"
+            cy="50%"
+            labelLine={false}
+            outerRadius={80}
+            fill="#8884d8"
+            dataKey="value"
+          >
+            {nonMemberData.map((entry, index) => (
+              <Cell key={`cell-${index}`} fill={COLORS[index % COLORS.length]} />
+            ))}
+          </Pie>
+          <Tooltip />
+          <Legend />
+        </PieChart>
+      </div>
+
+      <p>Member Yes Votes: {poll.member_yes}</p>
+      <p>Member No Votes: {poll.member_no}</p>
+      <p>Non-Member Yes Votes: {poll.non_member_yes}</p>
+      <p>Non-Member No Votes: {poll.non_member_no}</p>
+    </div>
+  );
+}

client/src/pages/PollDetails.js

@@ -0,0 +1,103 @@
+import React, { useState, useEffect } from "react";
+import axios from 'axios';
+import {
+  PieChart,
+  Pie,
+  Tooltip,
+  Legend,
+  Cell,
+} from 'recharts';
+
+const COLORS = ['#0088FE', '#FEB43C'];
+
+export default function PollDetails() {
+  const [poll, setPoll] = useState(null);
+  const [loading, setLoading] = useState(true);
+
+  // Get poll ID from URL parameters
+  const match = window.location.pathname.match(/\/poll-details\/(\d+)/);
+  const pollId = match ? parseInt(match[1], 10) : null;
+
+  useEffect(() => {
+    if (pollId) {
+      fetchPollDetails(pollId);
+    }
+  }, [pollId]);
+
+  const fetchPollDetails = async (id) => {
+    try {
+      setLoading(true);
+      const response = await axios.post(`/api/poll/${id}`);
+      setPoll(response.data);
+    } catch (error) {
+      console.error('Error fetching poll details:', error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  if (loading || !poll) return <div>Loading...</div>;
+
+  // Define data for pie charts
+  const memberData = [
+    { name: 'Yes', value: poll.member_yes },
+    { name: 'No', value: poll.member_no }
+  ];
+
+  const nonMemberData = [
+    { name: 'Yes', value: poll.non_member_yes },
+    { name: 'No', value: poll.non_member_no }
+  ];
+
+  return (
+    <div className="poll-details">
+      <h1>{poll.question}</h1>
+      <p>Created At: {new Date(poll.created_at).toLocaleString()}</p>
+
+      <div style={{ width: '40%', margin: '20px' }}>
+        <PieChart width={400} height={300}>
+          <Pie
+            data={memberData}
+            cx="50%"
+            cy="50%"
+            labelLine={false}
+            outerRadius={80}
+            fill="#8884d8"
+            dataKey="value"
+          >
+            {memberData.map((entry, index) => (
+              <Cell key={`cell-${index}`} fill={COLORS[index % COLORS.length]} />
+            ))}
+          </Pie>
+          <Tooltip />
+          <Legend />
+        </PieChart>
+      </div>
+
+      <div style={{ width: '40%', margin: '20px' }}>
+        <PieChart width={400} height={300}>
+          <Pie
+            data={nonMemberData}
+            cx="50%"
+            cy="50%"
+            labelLine={false}
+            outerRadius={80}
+            fill="#8884d8"
+            dataKey="value"
+          >
+            {nonMemberData.map((entry, index) => (
+              <Cell key={`cell-${index}`} fill={COLORS[index % COLORS.length]} />
+            ))}
+          </Pie>
+          <Tooltip />
+          <Legend />
+        </PieChart>
+      </div>
+
+      <p>Member Yes Votes: {poll.member_yes}</p>
+      <p>Member No Votes: {poll.member_no}</p>
+      <p>Non-Member Yes Votes: {poll.non_member_yes}</p>
+      <p>Non-Member No Votes: {poll.non_member_no}</p>
+    </div>
+  );
+}

client/src/pages/PollList.js

@@ -0,0 +1,33 @@
+import React, { useEffect, useState } from 'react';
+import axios from 'axios';
+import { Link } from 'react-router';
+
+export default function PollList() {
+  const [polls, setPolls] = useState([]);
+
+  useEffect(() => {
+    fetchPolls();
+  }, []);
+
+  const fetchPolls = async () => {
+    try {
+      const response = await axios.post('/api/admin/view-votes');
+      setPolls(response.data);
+    } catch (error) {
+      console.error('Error fetching polls:', error);
+    }
+  };
+
+  return (
+    <div className="poll-list">
+      <h1>Poll List</h1>
+      {polls.map((poll) => (
+        <div key={poll.id} className="poll-item">
+          <Link to={`/poll-details/${poll.id}`}>
+            <h2>{poll.question}</h2>
+          </Link>
+        </div>
+      ))}
+    </div>
+  );
+}

server/common/common.go

@@ -0,0 +1,16 @@
+package common
+
+import (
+	"encoding/json"
+	"net/http"
+)
+
+const (
+	DATE_FORMAT = "2006-01-02 15:04:05"
+	SUCCESS = "success"
+)
+
+func SendError(w http.ResponseWriter, errStr string, statusCode int) {
+	w.WriteHeader(statusCode)
+	json.NewEncoder(w).Encode(map[string]string{"error": errStr})
+}

server/main.go

@@ -2,243 +2,215 @@ package main
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"fmt"
 	"log"
+	"math/rand"
 	"net/http"
 	"os"
-	"strconv"
 	"path/filepath"
+	"strconv"
+	"time"
 
 	"github.com/gorilla/mux"
+
+	"go-sjles-pta-vote/server/common"
 	"go-sjles-pta-vote/server/models"
 	"go-sjles-pta-vote/server/services"
 )
 
-func voteHandler(w http.ResponseWriter, r *http.Request) {
+func voteHandler(resWriter http.ResponseWriter, request *http.Request) {
 	var vote models.Vote
-	if err := json.NewDecoder(r.Body).Decode(&vote); err != nil {
+	if err := json.NewDecoder(request.Body).Decode(&vote); err != nil {
-		http.Error(w, "Invalid request payload", http.StatusBadRequest)
+		common.SendError(resWriter, "Invalid JSON", http.StatusBadRequest)
 		return
 	}
 
-	err := services.SetVote(&vote)
+	if err := services.SetVote(&vote); err != nil {
-	if err != nil {
+		common.SendError(resWriter, "Failed to set vote", http.StatusInternalServerError)
-		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
 
-	w.WriteHeader(http.StatusOK)
+	resWriter.WriteHeader(http.StatusOK)
 }
 
-func voteIDHandler(w http.ResponseWriter, r *http.Request) {
+func voteIDHandler(resWriter http.ResponseWriter, request *http.Request) {
-	vars := mux.Vars(r)
+	vars := mux.Vars(request)
 	idStr := vars["id"]
 	id, err := strconv.ParseInt(idStr, 10, 64)
 	if err != nil {
-		http.Error(w, "Invalid poll ID", http.StatusBadRequest)
+		common.SendError(resWriter, "Invalid poll ID", http.StatusBadRequest)
 		return
 	}
 
 	vote := models.Vote{
 		PollId: id,
 		Email:  "example@example.com", // Replace with actual email retrieval logic
-		Vote:   true,                    // Replace with actual vote retrieval logic
+		Vote:   true,                  // Replace with actual vote retrieval logic
 	}
 
 	err = services.SetVote(&vote)
 	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
+		common.SendError(resWriter, "Failed to set vote", http.StatusInternalServerError)
 		return
 	}
 
-	w.WriteHeader(http.StatusOK)
+	resWriter.WriteHeader(http.StatusOK)
 }
 
-func statsHandler(w http.ResponseWriter, r *http.Request) {
+func statsHandler(resWriter http.ResponseWriter, request *http.Request) {
-	if r.Method == "GET" {
+	if request.Method == http.MethodGet {
 		filePath := "./server/templates/stats.html"
-		http.ServeFile(w, r, filePath)
+		http.ServeFile(resWriter, request, filePath)
-	} else if r.Method == "POST" {
+	} else if request.Method == http.MethodPost {
-		vars := mux.Vars(r)
+		vars := mux.Vars(request)
 		id := vars["id"]
 
 		poll, err := services.GetPollByQuestion(id)
 		if err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
+			common.SendError(resWriter, "Failed to get poll", http.StatusInternalServerError)
 			return
 		}
 
-		json.NewEncoder(w).Encode(poll)
+		json.NewEncoder(resWriter).Encode(poll)
 	} else {
-		w.WriteHeader(http.StatusMethodNotAllowed)
+		resWriter.WriteHeader(http.StatusMethodNotAllowed)
 	}
 }
 
-func statsIDHandler(w http.ResponseWriter, r *http.Request) {
+func pollsIDHandler(resWriter http.ResponseWriter, request *http.Request) {
-	vars := mux.Vars(r)
+	vars := mux.Vars(request)
-	id := vars["id"]
+	id, err := strconv.ParseInt(vars["id"], 10, 64)
-
-	poll, err := services.GetPollByQuestion(id)
 	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
+		common.SendError(resWriter, "Invalid poll ID", http.StatusBadRequest)
 		return
 	}
 
-	json.NewEncoder(w).Encode(poll)
+	poll, err := services.GetPollById(id)
+	if err == services.ErrPollNotFound {
+		common.SendError(resWriter, "Poll not found", http.StatusNotFound)
+		return
+	} else if err != nil {
+		common.SendError(resWriter, "Failed to get poll", http.StatusInternalServerError)
+		return
+	}
+
+	json.NewEncoder(resWriter).Encode(poll)
 }
 
-func adminHandler(w http.ResponseWriter, r *http.Request) {
+func adminLoginHandler(resWriter http.ResponseWriter, request *http.Request) {
-	// Add admin functionality here
+	if request.Method != http.MethodPost {
-	w.WriteHeader(http.StatusOK)
+		common.SendError(resWriter, "Method not allowed", http.StatusMethodNotAllowed)
-}
-
-func adminIDHandler(w http.ResponseWriter, r *http.Request) {
-	//vars := mux.Vars(r)
-	//id := vars["id"]
-
-	// Add admin functionality here
-	w.WriteHeader(http.StatusOK)
-}
-
-func adminLoginHandler(w http.ResponseWriter, r *http.Request) {
-	if r.Method != http.MethodPost {
-		w.WriteHeader(http.StatusMethodNotAllowed)
-		json.NewEncoder(w).Encode(map[string]string{"error": "Method not allowed"})
 		return
 	}
 
 	var loginReq services.LoginRequest
-	if err := json.NewDecoder(r.Body).Decode(&loginReq); err != nil {
+	if err := json.NewDecoder(request.Body).Decode(&loginReq); err != nil {
-		w.WriteHeader(http.StatusBadRequest)
+		common.SendError(resWriter, "Invalid JSON", http.StatusBadRequest)
-		json.NewEncoder(w).Encode(map[string]string{"error": "Invalid request payload"})
 		return
 	}
 
 	// Validate admin credentials
 	isValid, err := services.ValidateAdminLogin(loginReq.Username, loginReq.Password)
 	if err != nil {
-		w.WriteHeader(http.StatusBadRequest)
+		common.SendError(resWriter, "Invalid username or password", http.StatusBadRequest)
-		json.NewEncoder(w).Encode(map[string]string{"error": err.Error()})
 		return
 	}
 
 	if !isValid {
-		w.WriteHeader(http.StatusUnauthorized)
+		common.SendError(resWriter, "Invalid username or password", http.StatusUnauthorized)
-		json.NewEncoder(w).Encode(map[string]string{"error": "Invalid username or password"})
 		return
 	}
 
 	// Generate JWT token
 	token, err := services.GenerateAuthToken(loginReq.Username)
 	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
+		common.SendError(resWriter, "Failed to generate auth token", http.StatusInternalServerError)
-		json.NewEncoder(w).Encode(map[string]string{"error": "Failed to generate token"})
 		return
 	}
 
-	w.WriteHeader(http.StatusOK)
+	resWriter.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(services.LoginResponse{
+	json.NewEncoder(resWriter).Encode(services.LoginResponse{
 		Success: true,
 		Token:   token,
 	})
 }
 
-func adminMembersHandler(w http.ResponseWriter, r *http.Request) {
+func initDatabase() error {
-	if r.Method != http.MethodPost {
+	// Seed random generator for reproducible results in tests
-		w.WriteHeader(http.StatusMethodNotAllowed)
+	rand.Seed(42)
-		return
+
+	polls := []models.Poll{
+		{
+			ID:           1,
+			Question:     "Should we increase the budget?",
+			MemberYes:    rand.Int63n(50),
+			MemberNo:     rand.Int63n(50),
+			NonMemberYes: rand.Int63n(20),
+			NonMemberNo:  rand.Int63n(20),
+			TotalVotes:   int(rand.Int63n(100)),
+			WhoVoted:     []string{"email1@example.com", "email2@example.com", "email3@example.com", "email4@example.com"},
+			CreatedAt:    time.Now().Format(time.RFC3339),
+			UpdatedAt:    time.Now().Format(time.RFC3339),
+			ExpiresAt:    time.Now().Add(24 * time.Hour).Format(time.RFC3339),
+		},
+		{
+			ID:           2,
+			Question:     "Should we hire more staff?",
+			MemberYes:    rand.Int63n(50),
+			MemberNo:     rand.Int63n(50),
+			NonMemberYes: rand.Int63n(20),
+			NonMemberNo:  rand.Int63n(20),
+			TotalVotes:   int(rand.Int63n(100)),
+			WhoVoted:     []string{"email1@example.com", "email2@example.com", "email3@example.com", "email4@example.com"},
+			CreatedAt:    time.Now().Format(time.RFC3339),
+			UpdatedAt:    time.Now().Format(time.RFC3339),
+			ExpiresAt:    time.Now().Add(24 * time.Hour).Format(time.RFC3339),
+		},
+		{
+			ID:           3,
+			Question:     "Should we renovate the building?",
+			MemberYes:    rand.Int63n(50),
+			MemberNo:     rand.Int63n(50),
+			NonMemberYes: rand.Int63n(20),
+			NonMemberNo:  rand.Int63n(20),
+			TotalVotes:   int(rand.Int63n(100)),
+			WhoVoted:     []string{"email1@example.com", "email2@example.com", "email3@example.com", "email4@example.com"},
+			CreatedAt:    time.Now().Format(time.RFC3339),
+			UpdatedAt:    time.Now().Format(time.RFC3339),
+			ExpiresAt:    time.Now().Add(24 * time.Hour).Format(time.RFC3339),
+		},
 	}
 
-	var year int
+	for _, poll := range polls {
-	var err error
+		if err := services.CreatePollIgnore(&poll); err != nil {
-
+			return fmt.Errorf("failed to create poll %d: %v", poll.ID, err)
-	if err = r.ParseMultipartForm(10 << 20); err != nil {
-		http.Error(w, "Failed to parse multipart form", http.StatusBadRequest)
-		return
-	}
-
-	year_from_form := r.FormValue("year")
-	if year_from_form == "" {
-		http.Error(w, "Year is required", http.StatusBadRequest)
-		return
-	} else {
-		year, err = strconv.Atoi(year_from_form)
-		if err != nil {
-			http.Error(w, "Invalid year", http.StatusBadRequest)
-			return
 		}
 	}
-
+	return nil
-	file, _, err := r.FormFile("members.csv")
-	if err != nil {
-		http.Error(w, "Failed to upload file", http.StatusBadRequest)
-		return
-	}
-	defer file.Close()
-
-	fileBytes, err := ioutil.ReadAll(file)
-	if err != nil {
-		http.Error(w, "Failed to read file", http.StatusInternalServerError)
-		return
-	}
-
-	if err = services.ParseMembersFromBytes(year, fileBytes); err != nil {
-		w.WriteHeader(http.StatusBadRequest)
-		json.NewEncoder(w).Encode(map[string]string{"error": err.Error()})
-		return
-	}
-
-	w.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(map[string]bool{"success": true})
-}
-
-func adminMembersView(w http.ResponseWriter, r *http.Request) {
-	yearStr := r.URL.Query().Get("year")
-	if yearStr == "" {
-		http.Error(w, "Year is required", http.StatusBadRequest)
-		return
-	}
-
-	year, err := strconv.Atoi(yearStr)
-	if err != nil {
-		http.Error(w, "Invalid year", http.StatusBadRequest)
-		return
-	}
-
-	members, err := services.GetMembersByYear(year)
-	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		json.NewEncoder(w).Encode(map[string]interface{}{
-			"success": false,
-			"error":   err.Error(),
-		})
-		return
-	}
-
-	w.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(map[string]interface{}{
-		"success": true,
-		"members": members,
-	})
 }
 
 func main() {
 	log.SetOutput(os.Stdout)
 	log.SetFlags(log.LstdFlags | log.Lshortfile)
 
+	// Initialize database with sample data
+	if err := initDatabase(); err != nil {
+		log.Fatalf("Failed to initialize database: %v", err)
+	}
+
 	http.HandleFunc("/api/vote", voteHandler)
 	http.HandleFunc("/api/vote/{id}", voteIDHandler)
 	http.HandleFunc("/api/stats", statsHandler)
-	http.HandleFunc("/api/stats/{id}", statsIDHandler)
+	http.HandleFunc("/api/polls/{id}", pollsIDHandler)
-	http.HandleFunc("/api/admin", adminHandler)
+	http.HandleFunc("/api/admin/new-vote", services.AdminNewVoteHandler)
-	http.HandleFunc("/api/admin/{id}", adminIDHandler)
+	http.HandleFunc("/api/admin/view-votes", services.AdminViewVoteHandler)
 	http.HandleFunc("/api/admin/login", adminLoginHandler)
-	http.HandleFunc("/api/admin/members", adminMembersHandler)
+	http.HandleFunc("/api/admin/members", services.AdminMembersHandler)
-	http.HandleFunc("/api/admin/members/view", adminMembersView)
+	http.HandleFunc("/api/admin/members/view", services.AdminMembersView)
 
 	buildPath := filepath.Join(".", "client", "build")
 	fs := http.FileServer(http.Dir(buildPath))
-	
+
 	http.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		// If the file exists on disk, let the file server handle it.
 		if _, err := os.Stat(filepath.Join(buildPath, r.URL.Path)); err == nil {

server/models/poll.go

@@ -1,15 +1,15 @@
 package models
 
 type Poll struct {
-	ID int64 `json:"id"`
+	ID           int64    `json:"id"`
-	Question string `json:"question"`
+	Question     string   `json:"question"`
-	MemberYes int64 `json:"member_yes"`
+	MemberYes    int64    `json:"member_yes"`
-	MemberNo int64 `json:"member_no"`
+	MemberNo     int64    `json:"member_no"`
-	NonMemberYes int64 `json:"non_member_yes`
+	NonMemberYes int64    `json:"non_member_yes"`
-	NonMemberNo int64 `json:"non_member_no`
+	NonMemberNo  int64    `json:"non_member_no"`
-	TotalVotes int `json:"total_votes"`
+	TotalVotes   int      `json:"total_votes"`
-	WhoVoted []string `json:"who_voted"`
+	WhoVoted     []string `json:"who_voted"`
-	CreatedAt string `json:"created_at"`
+	CreatedAt    string   `json:"created_at"`
-	UpdatedAt string `json:"updated_at"`
+	UpdatedAt    string   `json:"updated_at"`
-	ExpiresAt string `json:"expires_at"`
+	ExpiresAt    string   `json:"expires_at"`
-}
+}

server/services/members.go

@@ -5,9 +5,14 @@ import (
 	"fmt"
 	"log"
 	"strings"
+	"net/http"
+	"strconv"
+	"io/ioutil"
+	"encoding/json"
 
 	"github.com/pkg/errors"
 
+	"go-sjles-pta-vote/server/common"
 	"go-sjles-pta-vote/server/db"
 )
 
@@ -17,6 +22,81 @@ type Member struct {
 }
 
 const BATCH_SIZE = 100
+const CVS_FILE_FIELD = "members.csv"
+
+func AdminMembersHandler(resWriter http.ResponseWriter, request *http.Request) {
+	if request.Method != http.MethodPost {
+		resWriter.WriteHeader(http.StatusMethodNotAllowed)
+		return
+	}
+
+	var year int
+	var err error
+
+	if err = request.ParseMultipartForm(10 << 20); err != nil {
+		common.SendError(resWriter, "Failed to parse multipart form", http.StatusBadRequest)
+		return
+	}
+
+	year_from_form := request.FormValue("year")
+	if year_from_form == "" {
+		common.SendError(resWriter, "Year is required", http.StatusBadRequest)
+		return
+	} else {
+		year, err = strconv.Atoi(year_from_form)
+		if err != nil {
+			common.SendError(resWriter, "Invalid year", http.StatusBadRequest)
+			return
+		}
+	}
+
+	file, _, err := request.FormFile(CVS_FILE_FIELD)
+	if err != nil {
+		common.SendError(resWriter, "Failed to read " + CVS_FILE_FIELD + " file", http.StatusBadRequest)
+		return
+	}
+	defer file.Close()
+
+	fileBytes, err := ioutil.ReadAll(file)
+	if err != nil {
+		common.SendError(resWriter, "Failed to read " + CVS_FILE_FIELD + " file", http.StatusInternalServerError)
+		return
+	}
+
+	if err = ParseMembersFromBytes(year, fileBytes); err != nil {
+		common.SendError(resWriter, "Failed to parse members from CSV", http.StatusBadRequest)
+		return
+	}
+
+	resWriter.WriteHeader(http.StatusOK)
+	json.NewEncoder(resWriter).Encode(map[string]bool{common.SUCCESS: true})
+}
+
+func AdminMembersView(resWriter http.ResponseWriter, request *http.Request) {
+	yearStr := request.URL.Query().Get("year")
+	if yearStr == "" {
+		common.SendError(resWriter, "Year is required", http.StatusBadRequest)
+		return
+	}
+
+	year, err := strconv.Atoi(yearStr)
+	if err != nil {
+		common.SendError(resWriter, "Invalid year", http.StatusBadRequest)
+		return
+	}
+
+	members, err := GetMembersByYear(year)
+	if err != nil {
+		common.SendError(resWriter, "Failed to get members", http.StatusInternalServerError)
+		return
+	}
+
+	resWriter.WriteHeader(http.StatusOK)
+	json.NewEncoder(resWriter).Encode(map[string]interface{}{
+		common.SUCCESS: true,
+		"members": members,
+	})
+}
 
 func ParseMembersFromBytes(year int, fileBytes []byte) error {
 	reader := csv.NewReader(strings.NewReader(string(fileBytes)))

server/services/poll.go

@@ -2,24 +2,73 @@ package services
 
 import (
 	"database/sql"
+	"encoding/json"
 	"errors"
+	"log"
+	"net/http"
+	"strconv"
 	"time"
 
+	"go-sjles-pta-vote/server/common"
 	"go-sjles-pta-vote/server/db"
 	"go-sjles-pta-vote/server/models"
 )
 
-var ErrQuestionAlreadyExists = errors.New("Question already exists")
+var (
-var ErrQuestionDoesntExist = errors.New("Question does not exist yet")
+	ErrQuestionAlreadyExists = errors.New("Question already exists")
-var ErrVoterAlreadyVoted = errors.New("Voter already voted")
+	ErrQuestionDoesntExist   = errors.New("Question does not exist yet")
-var ErrPollNotFound = errors.New("Poll not found")
+	ErrVoterAlreadyVoted     = errors.New("Voter already voted")
+	ErrPollNotFound          = errors.New("Poll not found")
+	ErrFailedToUpdateVote    = errors.New("Failed to update vote")
+	ErrFailedToDeletePoll    = errors.New("Failed to delete poll")
+)
 
-func CreatePoll(poll *models.Poll) (*models.Poll, error) {
+const (
-	new_poll := models.Poll{}
+	DEFAULT_POLL_DURATION_HOURS = 24
+)
 
+func AdminNewVoteHandler(resWriter http.ResponseWriter, request *http.Request) {
+	if request.Method != http.MethodPost {
+		resWriter.WriteHeader(http.StatusMethodNotAllowed)
+		return
+	}
+
+	question := request.FormValue("question")
+	if question == "" {
+		common.SendError(resWriter, "Question is required", http.StatusBadRequest)
+		return
+	}
+
+	durationHours := DEFAULT_POLL_DURATION_HOURS
+	if durationStr := request.FormValue("duration"); durationStr != "" {
+		var err error
+		durationHours, err = strconv.Atoi(durationStr)
+		if err != nil {
+			common.SendError(resWriter, "Invalid duration", http.StatusBadRequest)
+			return
+		}
+	}
+
+	poll := models.Poll{
+		Question:  question,
+		ExpiresAt: time.Now().Add(time.Duration(durationHours) * time.Hour).Format(common.DATE_FORMAT),
+	}
+
+	_, err := CreatePoll(&poll)
+	if err != nil {
+		common.SendError(resWriter, "Failed to create poll", http.StatusInternalServerError)
+		return
+	}
+
+	resWriter.WriteHeader(http.StatusOK)
+	json.NewEncoder(resWriter).Encode(map[string]bool{common.SUCCESS: true})
+}
+
+func CreatePoll(poll *models.Poll) (int64, error) {
 	db_conn, err := db.Connect()
 	if err != nil {
-		return nil, err
+		log.Printf("Failed to connect to database: %s", err.Error())
+		return -1, err
 	}
 	defer db.Close()
 
@@ -29,19 +78,21 @@ func CreatePoll(poll *models.Poll) (*models.Poll, error) {
 			WHERE question == $1
 	`)
 	if err != nil {
-		return nil, err
+		log.Printf("%s", err.Error())
+		return -1, err
 	}
 	defer get_stmt.Close()
 
 	var id int
 	err = get_stmt.QueryRow(poll.Question).Scan(&id)
-	if err != sql.ErrNoRows {
+	if err != nil {
-		if err != nil {
+		if err != sql.ErrNoRows {
-			return nil, err
+			log.Printf("%s", err.Error())
+			return -1, err
 		}
-		return nil, ErrQuestionAlreadyExists
+		return -1, ErrQuestionAlreadyExists
 	}
-	
+
 	stmt, err := db_conn.Prepare(`
 		INSERT INTO polls (
 			question,
@@ -53,26 +104,109 @@ func CreatePoll(poll *models.Poll) (*models.Poll, error) {
 	`)
 
 	if err != nil {
-		return nil, err
+		log.Printf("%s", err.Error())
+		return -1, err
 	}
 
 	defer stmt.Close()
 
 	res, err := stmt.Exec(poll.Question, poll.ExpiresAt)
 	if err != nil {
-		return nil, err
+		log.Printf("%s", err.Error())
+		return -1, err
 	}
 
-	new_poll.ID, err = res.LastInsertId()
+	new_poll_id, err := res.LastInsertId()
-	
+	return new_poll_id, err
-	return &new_poll, err
+}
+
+func AdminViewVoteHandler(resWriter http.ResponseWriter, request *http.Request) {
+	if request.Method != http.MethodPost {
+		resWriter.WriteHeader(http.StatusMethodNotAllowed)
+		return
+	}
+
+	var polls []models.Poll
+	var err error
+	question := request.FormValue("question")
+	if question == "" {
+		polls, err = GetAllPolls()
+		if err != nil {
+			common.SendError(resWriter, "Failed to get polls", http.StatusInternalServerError)
+			return
+		}
+	} else {
+		poll, err := GetPollByQuestion(question)
+		if err != nil {
+			common.SendError(resWriter, "Failed to get poll question "+question, http.StatusInternalServerError)
+			return
+		}
+		polls = append(polls, *poll)
+	}
+
+	err = json.NewEncoder(resWriter).Encode(polls)
+	if err != nil {
+		log.Printf("Error encoding response: %v", err)
+		common.SendError(resWriter, "Failed to encode polls", http.StatusInternalServerError)
+		return
+	}
+}
+
+func GetAllPolls() ([]models.Poll, error) {
+	db_conn, err := db.Connect()
+	if err != nil {
+		log.Printf("%s", err.Error())
+		return nil, err
+	}
+	defer db.Close()
+
+	get_polls_stmt, err := db_conn.Prepare(`
+		SELECT 
+			id, question, 
+			member_yes_votes, member_no_votes,
+			non_member_yes_votes, non_member_no_votes,
+			created_at, updated_at,
+			expires_at
+		FROM polls 
+	`)
+	if err != nil {
+		log.Printf("%s", err.Error())
+		return nil, err
+	}
+	defer get_polls_stmt.Close()
+
+	rows, err := get_polls_stmt.Query()
+	if err != nil {
+		log.Printf("%s", err.Error())
+		return nil, err
+	}
+	defer rows.Close()
+
+	var polls []models.Poll
+	for rows.Next() {
+		new_poll := models.Poll{}
+		err = rows.Scan(
+			&new_poll.ID, &new_poll.Question,
+			&new_poll.MemberYes, &new_poll.MemberNo,
+			&new_poll.NonMemberYes, &new_poll.NonMemberNo,
+			&new_poll.CreatedAt, &new_poll.UpdatedAt,
+			&new_poll.ExpiresAt,
+		)
+		if err != nil {
+			log.Printf("%s", err.Error())
+			return nil, err
+		}
+
+		polls = append(polls, new_poll)
+	}
+
+	return polls, nil
 }
 
 func GetPollByQuestion(question string) (*models.Poll, error) {
-	new_poll := models.Poll{}
-
 	db_conn, err := db.Connect()
 	if err != nil {
+		log.Printf("%s", err.Error())
 		return nil, err
 	}
 	defer db.Close()
@@ -88,10 +222,12 @@ func GetPollByQuestion(question string) (*models.Poll, error) {
 		WHERE question == $1
 	`)
 	if err != nil {
+		log.Printf("%s", err.Error())
 		return nil, err
 	}
 	defer get_poll_stmt.Close()
 
+	new_poll := models.Poll{}
 	err = get_poll_stmt.QueryRow(question).Scan(
 		&new_poll.ID, &new_poll.Question,
 		&new_poll.MemberYes, &new_poll.MemberNo,
@@ -103,10 +239,11 @@ func GetPollByQuestion(question string) (*models.Poll, error) {
 	if err == sql.ErrNoRows {
 		return nil, ErrPollNotFound
 	} else if err != nil {
+		log.Printf("%s", err.Error())
 		return nil, err
 	}
 
-	get_voters_stmt, err := db_conn.Prepare (`
+	get_voters_stmt, err := db_conn.Prepare(`
 		SELECT voter_email 
 		FROM voters
 		WHERE poll_id == $1
@@ -117,11 +254,11 @@ func GetPollByQuestion(question string) (*models.Poll, error) {
 	defer get_voters_stmt.Close()
 
 	rows, err := get_voters_stmt.Query(new_poll.ID)
-
 	for rows.Next() {
 		var voter_email string
 		err = rows.Scan(&voter_email)
 		if err != nil {
+			log.Printf("%s", err.Error())
 			return nil, err
 		}
 		new_poll.WhoVoted = append(new_poll.WhoVoted, voter_email)
@@ -130,13 +267,56 @@ func GetPollByQuestion(question string) (*models.Poll, error) {
 	return &new_poll, nil
 }
 
+func GetPollById(id int64) (*models.Poll, error) {
+	db_conn, err := db.Connect()
+	if err != nil {
+		log.Printf("%s", err.Error())
+		return nil, err
+	}
+	defer db.Close()
+
+	get_poll_stmt, err := db_conn.Prepare(`
+		SELECT 
+			id, question, 
+			member_yes_votes, member_no_votes,
+			non_member_yes_votes, non_member_no_votes,
+			created_at, updated_at,
+			expires_at
+		FROM polls 
+		WHERE id == $1
+	`)
+	if err != nil {
+		log.Printf("%s", err.Error())
+		return nil, err
+	}
+	defer get_poll_stmt.Close()
+
+	new_poll := models.Poll{}
+	err = get_poll_stmt.QueryRow(id).Scan(
+		&new_poll.ID, &new_poll.Question,
+		&new_poll.MemberYes, &new_poll.MemberNo,
+		&new_poll.NonMemberYes, &new_poll.NonMemberNo,
+		&new_poll.CreatedAt, &new_poll.UpdatedAt,
+		&new_poll.ExpiresAt,
+	)
+
+	if err == sql.ErrNoRows {
+		return nil, ErrPollNotFound
+	} else if err != nil {
+		log.Printf("%s", err.Error())
+		return nil, err
+	}
+
+	return &new_poll, nil
+}
+
 func GetAndCreatePollByQuestion(question string) (*models.Poll, error) {
 	new_poll, err := GetPollByQuestion(question)
 
 	if err == ErrPollNotFound {
 		create_poll := &models.Poll{
-			Question: question,
+			Question:  question,
-			ExpiresAt: time.Now().Add(time.Hour * 10).Format("2006-01-02 15:04:05"),
+			ExpiresAt: time.Now().Add(time.Hour * 10).Format(common.DATE_FORMAT),
 		}
 
 		if _, err = CreatePoll(create_poll); err != nil {
@@ -145,16 +325,17 @@ func GetAndCreatePollByQuestion(question string) (*models.Poll, error) {
 
 		return GetPollByQuestion(question)
 	} else if err != nil {
+		log.Printf("%s", err.Error())
 		return nil, err
 	} else {
 		return new_poll, err
 	}
 }
 
-// Use models.Vote to set votes
 func SetVote(vote *models.Vote) error {
 	db_conn, err := db.Connect()
 	if err != nil {
+		log.Printf("%s", err.Error())
 		return err
 	}
 	defer db.Close()
@@ -165,18 +346,21 @@ func SetVote(vote *models.Vote) error {
 		VALUES ($1, $2)
 	`)
 	if err != nil {
+		log.Printf("%s", err.Error())
 		return err
 	}
 	defer set_voter_stmt.Close()
 
 	res, err := set_voter_stmt.Exec(vote.PollId, vote.Email)
 	if err != nil {
+		log.Printf("%s", err.Error())
 		return err
 	} else {
 		rows_changed, err := res.RowsAffected()
 		if rows_changed != 1 {
 			return ErrVoterAlreadyVoted
 		} else if err != nil {
+			log.Printf("%s", err.Error())
 			return err
 		}
 	}
@@ -187,6 +371,7 @@ func SetVote(vote *models.Vote) error {
 		WHERE email == $1
 	`)
 	if err != nil {
+		log.Printf("%s", err.Error())
 		return err
 	}
 	defer is_voter_member_stmt.Close()
@@ -197,6 +382,7 @@ func SetVote(vote *models.Vote) error {
 	if err == sql.ErrNoRows {
 		is_member = false
 	} else if err != nil {
+		log.Printf("%s", err.Error())
 		return err
 	}
 
@@ -219,18 +405,21 @@ func SetVote(vote *models.Vote) error {
 		WHERE id == $1
 	`)
 	if err != nil {
+		log.Printf("%s", err.Error())
 		return err
 	}
 	defer add_vote_stmt.Close()
 
 	res, err = add_vote_stmt.Exec(vote.PollId)
 	if err != nil {
+		log.Printf("%s", err.Error())
 		return err
 	}
 
 	if num, err := res.RowsAffected(); num != 1 {
-		return errors.New("Failed to update votes")
+		return ErrFailedToUpdateVote
 	} else if err != nil {
+		log.Printf("%s", err.Error())
 		return err
 	}
 
@@ -241,6 +430,7 @@ func SetVote(vote *models.Vote) error {
 func DeletePollByQuestion(question string) error {
 	db_conn, err := db.Connect()
 	if err != nil {
+		log.Printf("%s", err.Error())
 		return err
 	}
 	defer db.Close()
@@ -254,12 +444,14 @@ func DeletePollByQuestion(question string) error {
 		)
 	`)
 	if err != nil {
+		log.Printf("%s", err.Error())
 		return err
 	}
 	defer delete_votes_stmt.Close()
 
 	_, err = delete_votes_stmt.Exec(question)
 	if err != nil {
+		log.Printf("%s", err.Error())
 		return err
 	}
 
@@ -268,20 +460,79 @@ func DeletePollByQuestion(question string) error {
 		WHERE question == $1
 	`)
 	if err != nil {
+		log.Printf("%s", err.Error())
 		return err
 	}
 	defer delete_poll_stmt.Close()
 
 	res, err := delete_poll_stmt.Exec(question)
 	if err != nil {
+		log.Printf("%s", err.Error())
 		return err
 	}
 
 	if num, err := res.RowsAffected(); num != 1 {
-		return errors.New("Failed to delete poll")
+		return ErrFailedToDeletePoll
 	} else if err != nil {
+		log.Printf("%s", err.Error())
 		return err
 	}
 
 	return nil
-}
+}
+
+func CreatePollIgnore(poll *models.Poll) error {
+	db_conn, err := db.Connect()
+	if err != nil {
+		log.Printf("%s", err.Error())
+		return err
+	}
+	defer db.Close()
+
+	stmt, err := db_conn.Prepare(`
+		INSERT OR IGNORE INTO polls (
+			question,
+			expires_at,
+			member_yes_votes,
+			member_no_votes,
+			non_member_yes_votes,
+			non_member_no_votes,
+			created_at,
+			updated_at
+		) VALUES (
+			$1,
+			$2,
+			$3,
+			$4,
+			$5,
+			$6,
+			$7,
+			$8
+		)
+	`)
+
+	if err != nil {
+		log.Printf("%s", err.Error())
+		return err
+	}
+
+	defer stmt.Close()
+
+	_, err = stmt.Exec(
+		poll.Question,
+		poll.ExpiresAt,
+		poll.MemberYes,
+		poll.MemberNo,
+		poll.NonMemberYes,
+		poll.NonMemberNo,
+		poll.CreatedAt,
+		poll.UpdatedAt,
+	)
+
+	if err != nil {
+		log.Printf("%s", err.Error())
+		return err
+	}
+
+	return nil
+}

server/services/putmembers_test.go

@@ -1,45 +0,0 @@
-package services
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestParseMembersFromBytes(t *testing.T) {
-	testCases := []struct {
-		name     string
-		input    string
-		expected []Member
-	}{
-		{
-			name: "Valid CSV with multiple members",
-			input: `date,First,Last,Email
-2023-01-01,John,Doe,john.doe@example.com
-2023-01-02,Jane,Smith,jane.smith@example.com`,
-			expected: []Member{
-				{Name: "John Doe", Email: "john.doe@example.com"},
-				{Name: "Jane Smith", Email: "jane.smith@example.com"},
-			},
-		},
-		{
-			name: "CSV with missing fields",
-			input: `date,First,Last
-2023-01-01,John,Doe`,
-			expected: []Member{},
-		},
-		{
-			name: "Empty CSV",
-			input: ``,
-			expected: []Member{},
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			members, err := ParseMembersFromBytes(2023, []byte(tc.input))
-			assert.NoError(t, err)
-			assert.Equal(t, tc.expected, members)
-		})
-	}
-}

server/services/services_test.go

@@ -13,8 +13,8 @@ import (
 
 const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-=`~!@#$%^&*()_+[]\\;',./{}|:\"<>?"
 
-var new_members = []struct{
+var new_members = []struct {
-	email string
+	email       string
 	member_name string
 }{
 	{"test1@mail.me", "test1"},
@@ -32,20 +32,20 @@ var new_members = []struct{
 	{"test105@mail.me", "test105"},
 }
 
-var new_polls = []struct{
+var new_polls = []struct {
-	question string
+	question             string
-	member_yes_votes int64
+	member_yes_votes     int64
-	member_no_votes int64
+	member_no_votes      int64
 	non_member_yes_votes int64
-	non_member_no_votes int64
+	non_member_no_votes  int64
 }{
 	{"ques1", 1, 2, 3, 4},
 	{"ques2", 3, 2, 4, 5},
 	{"ques3", 4, 3, 6, 5},
 }
 
-var new_voters = []struct{
+var new_voters = []struct {
-	poll_id int64
+	poll_id     int64
 	voter_email string
 }{
 	{1, "test1@mail.me"},
@@ -117,7 +117,7 @@ func PreLoadDB() error {
 
 	// Insert polls
 	for i := range new_polls {
-		result, err := db_conn.Exec(`INSERT INTO polls (question, member_yes_votes, member_no_votes, non_member_yes_votes, non_member_no_votes, expires_at) VALUES (?, ?, ?, ?, ?, ?)`, new_polls[i].question, new_polls[i].member_yes_votes, new_polls[i].member_no_votes, new_polls[i].non_member_yes_votes, new_polls[i].non_member_no_votes, time.Now().Add(time.Hour * 10).Format("2006-01-02 15:04:05"))
+		result, err := db_conn.Exec(`INSERT INTO polls (question, member_yes_votes, member_no_votes, non_member_yes_votes, non_member_no_votes, expires_at) VALUES (?, ?, ?, ?, ?, ?)`, new_polls[i].question, new_polls[i].member_yes_votes, new_polls[i].member_no_votes, new_polls[i].non_member_yes_votes, new_polls[i].non_member_no_votes, time.Now().Add(time.Hour*10).Format("2006-01-02 15:04:05"))
 		if err != nil {
 			return err
 		}
@@ -139,8 +139,8 @@ func PreLoadDB() error {
 }
 
 func TestCreatePoll(t *testing.T) {
-	parameters := []struct{
+	parameters := []struct {
-		question string
+		question    string
 		table_index int64
 	}{
 		{RandString(10) + "1", 1},
@@ -165,29 +165,29 @@ func TestCreatePoll(t *testing.T) {
 
 	defer os.Remove(tmp_db.Name())
 	tmp_db.Close()
-	
+
 	if _, err := db.Connect(); err != nil {
 		t.Errorf(`Failed to create the database: %v`, err)
 	}
 
 	for i := range parameters {
 		create_poll := &models.Poll{
-			Question: parameters[i].question,
+			Question:  parameters[i].question,
 			ExpiresAt: time.Now().Add(time.Hour * 10).Format("2006-01-02 15:04:05"),
 		}
 
-		new_poll, err := CreatePoll(create_poll)
+		new_poll_id, err := CreatePoll(create_poll)
 
 		if err != nil {
-			t.Fatalf(`Failed to create new poll %s: %v`, parameters[i].question, err)
+			t.Errorf(`Failed to create new poll %s: %v`, parameters[i].question, err)
 		}
 
-		if new_poll == nil {
+		if new_poll_id == -1 {
-			t.Fatalf(`Failed to insert %s into table`, parameters[i].question)
+			t.Errorf(`Failed to insert %s into table`, parameters[i].question)
 		}
 
-		if new_poll.ID != parameters[i].table_index {
+		if new_poll_id != parameters[i].table_index {
-			t.Fatalf(`Incorrect increment in index for %s: expected %d != %d`, parameters[i].question, parameters[i].table_index, new_poll.ID)
+			t.Errorf(`Incorrect increment in index for %s: expected %d != %d`, parameters[i].question, parameters[i].table_index, new_poll_id)
 		}
 	}
 }
@@ -207,30 +207,30 @@ func TestAlreadyExists(t *testing.T) {
 
 	defer os.Remove(tmp_db.Name())
 	tmp_db.Close()
-	
+
 	if _, err := db.Connect(); err != nil {
 		t.Errorf(`Failed to create the database: %v`, err)
 	}
 
 	create_poll := &models.Poll{
-		Question: question,
+		Question:  question,
 		ExpiresAt: time.Now().Add(time.Hour * 10).Format("2006-01-02 15:04:05"),
 	}
 
 	new_poll, err := CreatePoll(create_poll)
 
 	if err != nil {
-		t.Fatalf(`Failed to create new poll %s: %v`, question, err)
+		t.Errorf(`Failed to create new poll %s: %v`, question, err)
 	}
 
-	if new_poll == nil {
+	if new_poll == -1 {
-		t.Fatalf(`Failed to insert %s into table`, question)
+		t.Errorf(`Failed to insert %s into table`, question)
 	}
 
 	new_poll, err = CreatePoll(create_poll)
 
 	if err != ErrQuestionAlreadyExists {
-		t.Fatalf(`Should have failed adding %s as it already exists`, question)
+		t.Errorf(`Should have failed adding %s as it already exists`, question)
 	}
 }
 
@@ -249,40 +249,40 @@ func TestGetPollByQuestion(t *testing.T) {
 
 	defer os.Remove(tmp_db.Name())
 	tmp_db.Close()
-	
+
 	if _, err := db.Connect(); err != nil {
 		t.Errorf(`Failed to create the database: %v`, err)
 	}
 
 	create_poll := &models.Poll{
-		Question: question,
+		Question:  question,
 		ExpiresAt: time.Now().Add(time.Hour * 10).Format("2006-01-02 15:04:05"),
 	}
 
 	new_poll, err := CreatePoll(create_poll)
 
 	if err != nil {
-		t.Fatalf(`Failed to create new poll %s: %v`, question, err)
+		t.Errorf(`Failed to create new poll %s: %v`, question, err)
 	}
 
-	if new_poll == nil {
+	if new_poll == -1 {
-		t.Fatalf(`Failed to insert %s into table`, question)
+		t.Errorf(`Failed to insert %s into table`, question)
 	}
 
 	get_poll, err := GetPollByQuestion(question)
 
 	if err != nil {
-		t.Fatalf(`Failed to get the poll %s: %v`, question, err)
+		t.Errorf(`Failed to get the poll %s: %v`, question, err)
 	}
 
 	if get_poll.Question != question {
-		t.Fatalf(`Questions don't match: expected %s: recieved %s`, question, get_poll.Question)
+		t.Errorf(`Questions don't match: expected %s: recieved %s`, question, get_poll.Question)
 	}
 }
 
 func TestGetCreatePollByQuestion(t *testing.T) {
-	parameters := []struct{
+	parameters := []struct {
-		question string
+		question    string
 		table_index int64
 	}{
 		{RandString(10) + "1", 1},
@@ -305,7 +305,7 @@ func TestGetCreatePollByQuestion(t *testing.T) {
 
 	defer os.Remove(tmp_db.Name())
 	tmp_db.Close()
-	
+
 	if _, err := db.Connect(); err != nil {
 		t.Errorf(`Failed to create the database: %v`, err)
 	}
@@ -314,184 +314,184 @@ func TestGetCreatePollByQuestion(t *testing.T) {
 		new_poll, err := GetAndCreatePollByQuestion(parameters[i].question)
 
 		if err != nil {
-			t.Fatalf(`Failed to create new poll %s: %v`, parameters[i].question, err)
+			t.Errorf(`Failed to create new poll %s: %v`, parameters[i].question, err)
 		}
 
 		if new_poll == nil {
-			t.Fatalf(`Failed to insert %s into table`, parameters[i].question)
+			t.Errorf(`Failed to insert %s into table`, parameters[i].question)
 		}
 
 		if new_poll.ID != parameters[i].table_index {
-			t.Fatalf(`Incorrect increment in index for %s: expected %d != %d`, parameters[i].question, parameters[i].table_index, new_poll.ID)
+			t.Errorf(`Incorrect increment in index for %s: expected %d != %d`, parameters[i].question, parameters[i].table_index, new_poll.ID)
 		}
 
 		if new_poll.Question != parameters[i].question {
-			t.Fatalf(`Incorrect question returned: Expected %s != %s`, parameters[i].question, new_poll.Question)
+			t.Errorf(`Incorrect question returned: Expected %s != %s`, parameters[i].question, new_poll.Question)
 		}
 	}
 }
 
 func TestSetVote(t *testing.T) {
-    // Preload the database with members, polls, and voters
+	// Preload the database with members, polls, and voters
-    tmp_db, err := os.CreateTemp("", "vote_test.*.db")
+	tmp_db, err := os.CreateTemp("", "vote_test.*.db")
-    if err != nil {
+	if err != nil {
-        t.Fatalf("Failed to create temporary database: %v", err)
+		t.Errorf("Failed to create temporary database: %v", err)
-    }
+	}
-    defer os.Remove(tmp_db.Name())
+	defer os.Remove(tmp_db.Name())
 
-    init_conf := &config.Config{
+	init_conf := &config.Config{
-        DBPath: string(tmp_db.Name()),
+		DBPath: string(tmp_db.Name()),
-    }
+	}
-    config.SetConfig(init_conf)
+	config.SetConfig(init_conf)
 
-    err = PreLoadDB()
+	err = PreLoadDB()
-    if err != nil {
+	if err != nil {
-        t.Fatalf("Failed to preload database: %v", err)
+		t.Errorf("Failed to preload database: %v", err)
-    }
+	}
 
-    // Add a non-member vote
+	// Add a non-member vote
-    random_email := RandString(10) + "@mail.me"
+	random_email := RandString(10) + "@mail.me"
-    vote := &models.Vote{
+	vote := &models.Vote{
-        PollId: 1,
+		PollId: 1,
-        Email: random_email,
+		Email:  random_email,
-        Vote: true,
+		Vote:   true,
-    }
+	}
-    err = SetVote(vote)
+	err = SetVote(vote)
-    if err != nil {
+	if err != nil {
-        t.Fatalf("Failed to set non-member vote: %v", err)
+		t.Errorf("Failed to set non-member vote: %v", err)
-    }
+	}
 
-    // Add a member vote
+	// Add a member vote
-    member_email := "test100@mail.me"
+	member_email := "test100@mail.me"
-    vote = &models.Vote{
+	vote = &models.Vote{
-        PollId: 1,
+		PollId: 1,
-        Email: member_email,
+		Email:  member_email,
-        Vote: true,
+		Vote:   true,
-    }
+	}
-    err = SetVote(vote)
+	err = SetVote(vote)
-    if err != nil {
+	if err != nil {
-        t.Fatalf("Failed to set member vote: %v", err)
+		t.Errorf("Failed to set member vote: %v", err)
-    }
+	}
 
-    // Verify the votes were added correctly
+	// Verify the votes were added correctly
-    voters, err := models.GetVoters(1) // Use GetVoters from models
+	voters, err := models.GetVoters(1) // Use GetVoters from models
-    if err != nil {
+	if err != nil {
-        t.Fatalf("Failed to get voters: %v", err)
+		t.Errorf("Failed to get voters: %v", err)
-    }
+	}
 
-    expected_non_member_votes := 4 + 1 // Original non-member votes + new non-member vote
+	expected_non_member_votes := 4 + 1 // Original non-member votes + new non-member vote
-    expected_member_votes := 3 + 1    // Original member votes + new member vote
+	expected_member_votes := 3 + 1     // Original member votes + new member vote
 
-    for _, voter := range voters {
+	for _, voter := range voters {
-        if voter.Email == random_email && voter.YesVote {
+		if voter.Email == random_email && voter.YesVote {
-            expected_non_member_votes--
+			expected_non_member_votes--
-        } else if voter.Email == member_email && voter.YesVote {
+		} else if voter.Email == member_email && voter.YesVote {
-            expected_member_votes--
+			expected_member_votes--
-        }
+		}
-    }
+	}
 
-    if expected_non_member_votes != 5 || expected_member_votes != 4 {
+	if expected_non_member_votes != 5 || expected_member_votes != 4 {
-        t.Errorf("Expected %d non-member votes and %d member votes, but got %d non-member votes and %d member votes", 4+1, 3+1, expected_non_member_votes, expected_member_votes)
+		t.Errorf("Expected %d non-member votes and %d member votes, but got %d non-member votes and %d member votes", 4+1, 3+1, expected_non_member_votes, expected_member_votes)
-    }
+	}
 }
 
 func TestVoterAlreadyVoted(t *testing.T) {
-    // Preload the database with members, polls, and voters
+	// Preload the database with members, polls, and voters
-    tmp_db, err := os.CreateTemp("", "vote_test.*.db")
+	tmp_db, err := os.CreateTemp("", "vote_test.*.db")
-    if err != nil {
+	if err != nil {
-        t.Fatalf("Failed to create temporary database: %v", err)
+		t.Errorf("Failed to create temporary database: %v", err)
-    }
+	}
-    defer os.Remove(tmp_db.Name())
+	defer os.Remove(tmp_db.Name())
 
-    init_conf := &config.Config{
+	init_conf := &config.Config{
-        DBPath: string(tmp_db.Name()),
+		DBPath: string(tmp_db.Name()),
-    }
+	}
-    config.SetConfig(init_conf)
+	config.SetConfig(init_conf)
 
-    err = PreLoadDB()
+	err = PreLoadDB()
-    if err != nil {
+	if err != nil {
-        t.Fatalf("Failed to preload database: %v", err)
+		t.Errorf("Failed to preload database: %v", err)
-    }
+	}
 
-    // Add a non-member vote
+	// Add a non-member vote
-    random_email := RandString(10) + "@mail.me"
+	random_email := RandString(10) + "@mail.me"
-    vote := &models.Vote{
+	vote := &models.Vote{
-        PollId: 1,
+		PollId: 1,
-        Email: random_email,
+		Email:  random_email,
-        Vote: true,
+		Vote:   true,
-    }
+	}
-    err = SetVote(vote)
+	err = SetVote(vote)
-    if err != nil {
+	if err != nil {
-        t.Fatalf("Failed to set non-member vote: %v", err)
+		t.Errorf("Failed to set non-member vote: %v", err)
-    }
+	}
 
-    // Add a member vote
+	// Add a member vote
-    member_email := "test100@mail.me"
+	member_email := "test100@mail.me"
-    vote = &models.Vote{
+	vote = &models.Vote{
-        PollId: 1,
+		PollId: 1,
-        Email: member_email,
+		Email:  member_email,
-        Vote: true,
+		Vote:   true,
-    }
+	}
-    err = SetVote(vote)
+	err = SetVote(vote)
-    if err != nil {
+	if err != nil {
-        t.Fatalf("Failed to set member vote: %v", err)
+		t.Errorf("Failed to set member vote: %v", err)
-    }
+	}
 
-    // Attempt to add another non-member vote
+	// Attempt to add another non-member vote
-    vote = &models.Vote{
+	vote = &models.Vote{
-        PollId: 1,
+		PollId: 1,
-        Email: random_email,
+		Email:  random_email,
-        Vote: true,
+		Vote:   true,
-    }
+	}
-    err = SetVote(vote)
+	err = SetVote(vote)
-    if err != ErrVoterAlreadyVoted {
+	if err != ErrVoterAlreadyVoted {
-        t.Fatalf("Expected ErrVoterAlreadyVoted, but got %v", err)
+		t.Errorf("Expected ErrVoterAlreadyVoted, but got %v", err)
-    }
+	}
 
-    // Attempt to add another member vote
+	// Attempt to add another member vote
-    vote = &models.Vote{
+	vote = &models.Vote{
-        PollId: 1,
+		PollId: 1,
-        Email: member_email,
+		Email:  member_email,
-        Vote: true,
+		Vote:   true,
-    }
+	}
-    err = SetVote(vote)
+	err = SetVote(vote)
-    if err != ErrVoterAlreadyVoted {
+	if err != ErrVoterAlreadyVoted {
-        t.Fatalf("Expected ErrVoterAlreadyVoted, but got %v", err)
+		t.Errorf("Expected ErrVoterAlreadyVoted, but got %v", err)
-    }
+	}
 }
 
 func TestDeletePollByQuestion(t *testing.T) {
-    // Preload the database with members, polls, and voters
+	// Preload the database with members, polls, and voters
-    tmp_db, err := os.CreateTemp("", "vote_test.*.db")
+	tmp_db, err := os.CreateTemp("", "vote_test.*.db")
-    if err != nil {
+	if err != nil {
-        t.Fatalf("Failed to create temporary database: %v", err)
+		t.Errorf("Failed to create temporary database: %v", err)
-    }
+	}
-    defer os.Remove(tmp_db.Name())
+	defer os.Remove(tmp_db.Name())
 
-    init_conf := &config.Config{
+	init_conf := &config.Config{
-        DBPath: string(tmp_db.Name()),
+		DBPath: string(tmp_db.Name()),
-    }
+	}
-    config.SetConfig(init_conf)
+	config.SetConfig(init_conf)
 
-    err = PreLoadDB()
+	err = PreLoadDB()
-    if err != nil {
+	if err != nil {
-        t.Fatalf("Failed to preload database: %v", err)
+		t.Errorf("Failed to preload database: %v", err)
-    }
+	}
 
-    // Get a question from the new_polls array
+	// Get a question from the new_polls array
-    testQuestion := new_polls[0].question
+	testQuestion := new_polls[0].question
 
-    // Delete the poll by question
+	// Delete the poll by question
-    err = DeletePollByQuestion(testQuestion)
+	err = DeletePollByQuestion(testQuestion)
-    if err != nil {
+	if err != nil {
-        t.Fatalf("Failed to delete poll by question: %v", err)
+		t.Errorf("Failed to delete poll by question: %v", err)
-    }
+	}
 
-    // Verify that the poll was deleted
+	// Verify that the poll was deleted
-    _, err = GetPollByQuestion(testQuestion)
+	_, err = GetPollByQuestion(testQuestion)
-    if err == nil {
+	if err == nil {
-        t.Fatalf("Expected error when getting deleted poll, but got none")
+		t.Errorf("Expected error when getting deleted poll, but got none")
-    } else if err != ErrPollNotFound {
+	} else if err != ErrPollNotFound {
-        t.Fatalf("Expected ErrPollNotFound, but got %v", err)
+		t.Errorf("Expected ErrPollNotFound, but got %v", err)
-    }
+	}
-}
+}