Skip to content
Snippets Groups Projects
Commit 5effacbb authored by Emil's avatar Emil
Browse files

fix: client test, alternative api calls

parent b3d60d9e
No related branches found
No related tags found
1 merge request!92Resolve "Refactor/minimize editor code"
Pipeline #42231 failed
This commit is part of merge request !92. Comments created here will be created in the context of that merge request.
......@@ -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))
......
......@@ -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)}>
......
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`
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment