Skip to content
Snippets Groups Projects
Commit da468b93 authored by Albin Henriksson's avatar Albin Henriksson
Browse files

Minor fixes

parent 509be414
No related branches found
No related tags found
1 merge request!123Minor fixes
Pipeline #43181 passed with warnings
import { Button, CircularProgress, Divider, Menu, MenuItem } from '@material-ui/core'
import { Button, ButtonGroup, CircularProgress, Divider, Menu, MenuItem } from '@material-ui/core'
import CssBaseline from '@material-ui/core/CssBaseline'
import ListItemText from '@material-ui/core/ListItemText'
import AddOutlinedIcon from '@material-ui/icons/AddOutlined'
......@@ -31,7 +31,6 @@ import {
ToolBarContainer,
ToolbarMargin,
ViewButton,
ViewButtonGroup,
} from './styled'
const initialState = {
......@@ -101,7 +100,7 @@ const PresentationEditorPage: React.FC = () => {
}
const viewTypes = useAppSelector((state) => state.types.viewTypes)
const [activeViewTypeName, setActiveViewTypeName] = useState('')
const [activeViewTypeName, setActiveViewTypeName] = useState('Audience')
const changeView = (clickedViewTypeName: string) => {
setActiveViewTypeName(clickedViewTypeName)
const clickedViewTypeId = viewTypes.find((viewType) => viewType.name === clickedViewTypeName)?.id
......@@ -122,10 +121,9 @@ const PresentationEditorPage: React.FC = () => {
{competition.name}
</CompetitionName>
<ViewButtonGroup>
<ButtonGroup color="secondary" variant="contained">
<ViewButton
$activeView={activeViewTypeName === 'Audience'}
variant="contained"
color="secondary"
onClick={() => changeView('Audience')}
>
......@@ -133,13 +131,12 @@ const PresentationEditorPage: React.FC = () => {
</ViewButton>
<ViewButton
$activeView={activeViewTypeName === 'Team'}
variant="contained"
color="secondary"
onClick={() => changeView('Team')}
>
Deltagarvy
</ViewButton>
</ViewButtonGroup>
</ButtonGroup>
</ToolBarContainer>
</AppBarEditor>
<LeftDrawer $leftDrawerWidth={leftDrawerWidth} $rightDrawerWidth={undefined} variant="permanent" anchor="left">
......@@ -166,7 +163,7 @@ const PresentationEditorPage: React.FC = () => {
<SlideListItem divider button onClick={() => createNewSlide()}>
<ListItemText primary="Ny sida" />
<AddOutlinedIcon />
</SlideListItem>
</SlideListItem>
</PositionBottom>
</FillLeftContainer>
</LeftDrawer>
......
......@@ -50,7 +50,7 @@ const TextComponentEdit = ({ component }: ImageComponentProps) => {
}
return (
<div style={{ minHeight: '300px', height: '100%', width: '100%' }}>
<>
<Editor
value={content || ''}
init={{
......@@ -81,7 +81,7 @@ const TextComponentEdit = ({ component }: ImageComponentProps) => {
<DeleteTextButton variant="contained" color="secondary" onClick={() => handleDeleteText(component.id)}>
Ta bort
</DeleteTextButton>
</div>
</>
)
}
......
......@@ -20,20 +20,13 @@ export const ToolBarContainer = styled(Toolbar)`
`
export const ViewButton = styled(Button)<ViewButtonProps>`
margin-right: 8px;
background: ${(props) => (props.$activeView ? '#5a0017' : undefined)};
`
export const ViewButtonClicked = styled(Button)`
margin-right: 8px;
background: #5a0017;
`
export const ViewButtonGroup = styled.div`
display: flex;
flex-direction: row;
`
export const SlideList = styled(List)`
height: calc(100% - ${SlideListHeight}px);
padding: 0px;
......
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