diff --git a/client/src/pages/presentationEditor/components/Alternatives.tsx b/client/src/pages/presentationEditor/components/Alternatives.tsx index c8b9a131059b407a14198a219f49ebd93cf5718e..e699d003f7f3433e2caf25a26185ad5141c6f694 100644 --- a/client/src/pages/presentationEditor/components/Alternatives.tsx +++ b/client/src/pages/presentationEditor/components/Alternatives.tsx @@ -42,7 +42,7 @@ const Alternatives = ({ activeSlide, competitionId }: AlternativeProps) => { } else newValue = 0 await axios .put( - `/competitions/${competitionId}/slides/${activeSlide?.id}/questions/${activeSlide?.questions[0].id}/alternatives/${alternative.id}`, + `/api/competitions/${competitionId}/slides/${activeSlide?.id}/questions/${activeSlide?.questions[0].id}/alternatives/${alternative.id}`, { value: newValue } ) .then(() => { @@ -56,7 +56,7 @@ const Alternatives = ({ activeSlide, competitionId }: AlternativeProps) => { if (activeSlide && activeSlide.questions[0]) { await axios .put( - `/competitions/${competitionId}/slides/${activeSlide?.id}/questions/${activeSlide?.questions[0].id}/alternatives/${alternative_id}`, + `/api/competitions/${competitionId}/slides/${activeSlide?.id}/questions/${activeSlide?.questions[0].id}/alternatives/${alternative_id}`, { text: newText } ) .then(() => { @@ -70,7 +70,7 @@ const Alternatives = ({ activeSlide, competitionId }: AlternativeProps) => { if (activeSlide && activeSlide.questions[0]) { await axios .post( - `/competitions/${competitionId}/slides/${activeSlide?.order}/questions/${activeSlide?.questions[0].id}/alternatives`, + `/api/competitions/${competitionId}/slides/${activeSlide?.id}/questions/${activeSlide?.questions[0].id}/alternatives`, { text: '', value: 0 } ) .then(() => { @@ -84,7 +84,7 @@ const Alternatives = ({ activeSlide, competitionId }: AlternativeProps) => { if (activeSlide && activeSlide.questions[0]) { await axios .delete( - `/competitions/${competitionId}/slides/${activeSlideId}/questions/${activeSlide?.questions[0].id}/alternatives/${alternative_id}` + `/api/competitions/${competitionId}/slides/${activeSlideId}/questions/${activeSlide?.questions[0].id}/alternatives/${alternative_id}` ) .then(() => { dispatch(getEditorCompetition(competitionId)) diff --git a/client/src/pages/presentationEditor/components/SlideType.tsx b/client/src/pages/presentationEditor/components/SlideType.tsx index e5b904208e0b94d0e3ff8cba2bbcf5bd7ac27d49..ba104fe6ce7088d6aec076359d9f3f1361de3262 100644 --- a/client/src/pages/presentationEditor/components/SlideType.tsx +++ b/client/src/pages/presentationEditor/components/SlideType.tsx @@ -6,6 +6,7 @@ import { DialogContentText, DialogTitle, InputLabel, + ListItem, MenuItem, Select, Typography, @@ -15,7 +16,7 @@ import React, { useState } from 'react' import { getEditorCompetition } from '../../../actions/editor' import { useAppDispatch } from '../../../hooks' import { RichSlide } from '../../../interfaces/ApiRichModels' -import { Center, FormControlDropdown, WhiteBackground } from './styled' +import { Center, FormControlDropdown, SlideTypeInputLabel, WhiteBackground } from './styled' type SlideTypeProps = { activeSlide: RichSlide @@ -86,7 +87,7 @@ const SlideType = ({ activeSlide, competitionId }: SlideTypeProps) => { return ( <WhiteBackground> <FormControlDropdown variant="outlined"> - <InputLabel>Sidtyp</InputLabel> + <SlideTypeInputLabel>Sidtyp</SlideTypeInputLabel> <Select fullWidth={true} value={activeSlide?.questions[0]?.type_id || 0} label="Sidtyp"> <MenuItem value={0}> <Typography variant="button" onClick={() => openSlideTypeDialog(0)}> diff --git a/client/src/pages/presentationEditor/components/styled.tsx b/client/src/pages/presentationEditor/components/styled.tsx index 487359149515d7e7e379a8025da5edac8994232c..a636d9d2d4d3f7faac3eef6166e5c07544c5a596 100644 --- a/client/src/pages/presentationEditor/components/styled.tsx +++ b/client/src/pages/presentationEditor/components/styled.tsx @@ -1,4 +1,15 @@ -import { FormControl, List, Tab, TextField, Typography, Button, Card, ListItem } from '@material-ui/core' +import { + FormControl, + List, + Tab, + TextField, + Typography, + Button, + Card, + ListItem, + Select, + InputLabel, +} from '@material-ui/core' import styled from 'styled-components' export const SettingsTab = styled(Tab)` @@ -46,18 +57,21 @@ export const ToolbarPadding = styled.div` ` export const FormControlDropdown = styled(FormControl)` - ${({ theme }) => ` - margin: ${theme.spacing(2)}px; - width: 87%; - padding: 0; -`} + width: 100%; + margin-top: 10px; + padding: 8px; + padding-left: 16px; + padding-right: 16px; +` + +export const SlideTypeInputLabel = styled(InputLabel)` + width: 100%; + padding: 10px; + padding-left: 22px; ` export const TextInput = styled(TextField)` - ${({ theme }) => ` - margin: ${theme.spacing(2)}px; width: 87%; -`} ` export const NoPadding = styled.div` @@ -75,10 +89,8 @@ export const Center = styled.div` ` export const SlidePanel = styled.div` - ${({ theme }) => ` - margin: ${theme.spacing(1)}px; + padding: 10px; width: 100%; -`} ` export const WhiteBackground = styled.div`