Merge branch 'Equal-Vote:main' into multiwinner_updates

.vscode/launch.json

@@ -23,6 +23,7 @@
         "sourceMaps": true,
         "skipFiles": ["<node_internals>/**"],
         "preLaunchTask": "Start All",
+        "postDebugTask": "Terminate All",
         "runtimeArgs": ["--remote-debugging-port=9222"],
         "env": {
           "NODE_ENV": "development"

.vscode/tasks.json

@@ -43,12 +43,24 @@
           }
         }
       },
+      {
+        "label": "Terminate All",
+        "command": "echo ${input:terminate}",
+      },
       {
         "label": "Start All",
         "dependsOn": ["Port-Forward PostgreSQL", "Start Backend", "Start Frontend"],
         "group": "build",
         "dependsOrder": "sequence"
       }
+    ],
+    "inputs": [
+      {
+        "id": "terminate",
+        "type": "command",
+        "command": "workbench.action.tasks.terminate",
+        "args": "terminateAll"
+      }
     ]
   }
 

packages/backend/src/Util.ts

@@ -93,7 +93,7 @@ export async function getMetaTags(req: any) : Promise<TagObject>  {
   let n_cropped = (len > 5) ? 0 : (5-len);
 
   return {
-      __META_TITLE__: election?.title ?? 'BetterVoting | Create polls & elections that don\'t spoil the vote',
+      __META_TITLE__: election?.title ?? 'BetterVoting | Create elections & polls that don\'t spoil the vote',
       __META_DESCRIPTION__: election?.description ?? "Create secure elections with voting methods that don't spoil the vote.",
       __META_IMAGE__: election == null ?
         'https://assets.nationbuilder.com/unifiedprimary/pages/1470/attachments/original/1702692040/Screenshot_2023-12-15_at_6.00.24_PM.png?1702692040' :

packages/frontend/src/App.tsx

@@ -5,7 +5,7 @@ import Header from './components/Header'
 import Election from './components/Election/Election'
 import Sandbox from './components/Sandbox'
 import LandingPage from './components/LandingPage'
-import { Box, Button, CssBaseline, Dialog } from '@mui/material'
+import { Box, Button, CssBaseline, Dialog, Typography } from '@mui/material'
 import { SnackbarContextProvider } from './components/SnackbarContext'
 import Footer from './components/Footer'
 import { ConfirmDialogProvider } from './components/ConfirmationDialogProvider'
@@ -20,8 +20,10 @@ import CreateElectionDialog, { CreateElectionContextProvider } from './component
 import ComposeContextProviders from './components/ComposeContextProviders'
 import './i18n/i18n'
 import ReturnToClassicDialog, { ReturnToClassicContextProvider } from './components/ReturnToClassicDialog'
+import { useSubstitutedTranslation } from './components/util'
 
 const App = () => {
+  const {t} = useSubstitutedTranslation();
   return (
     <Router>
       <ComposeContextProviders providers={[
@@ -37,6 +39,9 @@ const App = () => {
         <Box display='flex' flexDirection='column' minHeight={'100vh'} sx={{backgroundColor:'lightShade.main'}} >
           <Header />
           <CreateElectionDialog/>
+          <Typography sx={{textAlign:'center', padding: 2, opacity: 0.5}}>
+            {t('nav.beta_warning')}
+          </Typography>
           <ReturnToClassicDialog/>
           <Box
             sx={{

packages/frontend/src/components/Election/Voting/ApprovalBallotView.jsx

@@ -1,5 +1,5 @@
 import React, { useContext } from "react";
-import GenericBallotView from "./GenericBallotView";
+import GenericBallotView from "./GenericBallotView/GenericBallotView";
 import Typography from '@mui/material/Typography';
 import { BallotContext } from "./VotePage";