From 6891c0dc1b4804f011849ee6eed7721f92dbe20c Mon Sep 17 00:00:00 2001 From: Albin Henriksson <albhe428@student.liu.se> Date: Thu, 20 May 2021 18:52:24 +0200 Subject: [PATCH] Minor fixes --- client/src/pages/admin/competitions/AddCompetition.tsx | 2 +- client/src/pages/admin/regions/AddRegion.tsx | 2 +- client/src/pages/admin/users/AddUser.tsx | 2 +- client/src/pages/admin/users/EditUser.tsx | 2 +- client/src/pages/login/components/AdminLogin.tsx | 2 +- client/src/pages/login/components/CompetitionLogin.tsx | 2 +- .../pages/presentationEditor/components/TextComponentEdit.tsx | 2 +- client/src/pages/views/components/JudgeScoreDisplay.tsx | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/src/pages/admin/competitions/AddCompetition.tsx b/client/src/pages/admin/competitions/AddCompetition.tsx index f2cdd1d1..e2bb126e 100644 --- a/client/src/pages/admin/competitions/AddCompetition.tsx +++ b/client/src/pages/admin/competitions/AddCompetition.tsx @@ -192,7 +192,7 @@ const AddCompetition: React.FC = (props: any) => { </Button> {formik.errors.error && ( <Alert severity="error"> - <AlertTitle>Error</AlertTitle> + <AlertTitle>Något gick fel</AlertTitle> {formik.errors.error} </Alert> )} diff --git a/client/src/pages/admin/regions/AddRegion.tsx b/client/src/pages/admin/regions/AddRegion.tsx index 5be77f28..7be2edab 100644 --- a/client/src/pages/admin/regions/AddRegion.tsx +++ b/client/src/pages/admin/regions/AddRegion.tsx @@ -102,7 +102,7 @@ const AddRegion: React.FC = (props: any) => { </FormControl> {formik.errors.error && ( <Alert severity="error"> - <AlertTitle>Error</AlertTitle> + <AlertTitle>Något gick fel</AlertTitle> {formik.errors.error} </Alert> )} diff --git a/client/src/pages/admin/users/AddUser.tsx b/client/src/pages/admin/users/AddUser.tsx index 3dbb7136..05f5745c 100644 --- a/client/src/pages/admin/users/AddUser.tsx +++ b/client/src/pages/admin/users/AddUser.tsx @@ -224,7 +224,7 @@ const AddUser: React.FC = (props: any) => { </Button> {formik.errors.error && ( <Alert severity="error"> - <AlertTitle>Error</AlertTitle> + <AlertTitle>Något gick fel</AlertTitle> {formik.errors.error} </Alert> )} diff --git a/client/src/pages/admin/users/EditUser.tsx b/client/src/pages/admin/users/EditUser.tsx index 5de773fe..44375e4a 100644 --- a/client/src/pages/admin/users/EditUser.tsx +++ b/client/src/pages/admin/users/EditUser.tsx @@ -322,7 +322,7 @@ const EditUser = ({ user }: UserIdProps) => { {formik.errors.error && ( <Alert severity="error"> - <AlertTitle>Error</AlertTitle> + <AlertTitle>Något gick fel</AlertTitle> {formik.errors.error} </Alert> )} diff --git a/client/src/pages/login/components/AdminLogin.tsx b/client/src/pages/login/components/AdminLogin.tsx index e4c383bb..e3ec7782 100644 --- a/client/src/pages/login/components/AdminLogin.tsx +++ b/client/src/pages/login/components/AdminLogin.tsx @@ -92,7 +92,7 @@ const AdminLogin: React.FC = () => { </Button> {errors.message && ( <Alert severity="error"> - <AlertTitle>Error</AlertTitle> + <AlertTitle>Något gick fel</AlertTitle> <Typography>Någonting gick fel. Kontrollera</Typography> <Typography>dina användaruppgifter och försök igen</Typography> </Alert> diff --git a/client/src/pages/login/components/CompetitionLogin.tsx b/client/src/pages/login/components/CompetitionLogin.tsx index 4e2429a3..ae01ec36 100644 --- a/client/src/pages/login/components/CompetitionLogin.tsx +++ b/client/src/pages/login/components/CompetitionLogin.tsx @@ -63,7 +63,7 @@ const CompetitionLogin: React.FC = () => { </Button> {errors && ( <Alert severity="error"> - <AlertTitle>Error</AlertTitle> + <AlertTitle>Något gick fel</AlertTitle> <Typography>En tävling med den koden existerar ej.</Typography> <Typography>Dubbelkolla koden och försök igen</Typography> </Alert> diff --git a/client/src/pages/presentationEditor/components/TextComponentEdit.tsx b/client/src/pages/presentationEditor/components/TextComponentEdit.tsx index a42bdb03..61dc1284 100644 --- a/client/src/pages/presentationEditor/components/TextComponentEdit.tsx +++ b/client/src/pages/presentationEditor/components/TextComponentEdit.tsx @@ -37,7 +37,7 @@ const TextComponentEdit = ({ component }: ImageComponentProps) => { setTimerHandle( window.setTimeout(async () => { await axios.put(`/api/competitions/${competitionId}/slides/${activeSlideId}/components/${component.id}`, { - alternative: newText, + text: newText, }) dispatch(getEditorCompetition(competitionId)) }, 250) diff --git a/client/src/pages/views/components/JudgeScoreDisplay.tsx b/client/src/pages/views/components/JudgeScoreDisplay.tsx index 40f545ec..7deb0f34 100644 --- a/client/src/pages/views/components/JudgeScoreDisplay.tsx +++ b/client/src/pages/views/components/JudgeScoreDisplay.tsx @@ -147,7 +147,7 @@ const JudgeScoreDisplay = ({ teamIndex, activeSlide }: ScoreDisplayProps) => { </Card> ))} </div> - Total poäng: {scores.reduce((a, b) => sumTwoScores(a, b), 0)} + Totala poäng: {scores.reduce((a, b) => sumTwoScores(a, b), 0)} </Typography> <AnswersDisplay> <Answers> -- GitLab