Add link from the results page to the contact page, skip shibbolet fo…

…r now
UniversityOfHelsinkiCS · Feb 21, 2023 · ae7ef62 · ae7ef62
1 parent 8a80c22
commit ae7ef62
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/src/client/components/ContactPage/Contact.tsx b/src/client/components/ContactPage/Contact.tsx
@@ -40,7 +40,7 @@ const Contact = () => {
 
         <Box sx={classes.card}>
           <FormControl>
-            <FormLabel id="contact-method-buttons">
+            <FormLabel sx={{ mt: 2 }} id="contact-method-buttons">
               {t('contact:contactMethodLabel')}
             </FormLabel>
             <RadioGroup

diff --git a/src/client/components/ContactPage/Ticket.tsx b/src/client/components/ContactPage/Ticket.tsx
@@ -43,9 +43,7 @@ const Ticket = () => {
               error={errors.title ? true : false} // eslint-disable-line no-unneeded-ternary
             />
             {errors.title && (
-              <Typography variant="inherit" color="textSecondary">
-                {errors.title?.message}
-              </Typography>
+              <Typography variant="body2">{errors.title?.message}</Typography>
             )}
 
             <TextField
@@ -61,9 +59,7 @@ const Ticket = () => {
               error={errors.content ? true : false} // eslint-disable-line no-unneeded-ternary
             />
             {errors.content && (
-              <Typography variant="inherit" color="textSecondary">
-                {errors.content?.message}
-              </Typography>
+              <Typography variant="body2">{errors.content?.message}</Typography>
             )}
             <Box mt={3}>
               <Button

diff --git a/src/client/components/ResultPage/EmailForm.tsx b/src/client/components/ResultPage/EmailForm.tsx
@@ -51,9 +51,7 @@ const EmailForm = () => {
               error={errors.email ? true : false} // eslint-disable-line no-unneeded-ternary
             />
             {errors.email && (
-              <Typography variant="inherit" color="textSecondary">
-                {errors.email?.message}
-              </Typography>
+              <Typography variant="body2">{errors.email?.message}</Typography>
             )}
             <Box mt={3}>
               <Button

diff --git a/src/client/components/ResultPage/Ending.tsx b/src/client/components/ResultPage/Ending.tsx
@@ -1,4 +1,5 @@
 import React, { useState } from 'react'
+import { Link } from 'react-router-dom'
 import { useTranslation } from 'react-i18next'
 import { Box, Button, Container, Stack, Typography } from '@mui/material'
 
@@ -39,7 +40,13 @@ const Ending = () => {
               >
                 {t('results:proceedToExit')}
               </Button>
-              <Button sx={classes.stackButton} variant="contained">
+
+              <Button
+                sx={classes.stackButton}
+                variant="contained"
+                component={Link}
+                to="/contact"
+              >
                 {t('results:proceedToConsultation')}
               </Button>
             </>