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