Skip to content
Snippets Groups Projects
Commit ca1133c2 authored by Victor Löfgren's avatar Victor Löfgren Committed by Josef Olsson
Browse files

Add ugly things that dones't work

parent 09643923
No related branches found
No related tags found
1 merge request!148Resolve "Styling"
This commit is part of merge request !148. Comments created here will be created in the context of that merge request.
...@@ -246,10 +246,10 @@ const OperatorViewPage: React.FC = () => { ...@@ -246,10 +246,10 @@ const OperatorViewPage: React.FC = () => {
</Button> </Button>
</DialogActions> </DialogActions>
</Dialog> </Dialog>
<OperatorHeader> <OperatorHeader color="primary" position="relative">
<Tooltip title="Avsluta tävling" arrow> <Tooltip title="Avsluta tävling" arrow>
<OperatorButton onClick={handleVerifyExit} variant="contained" color="secondary"> <OperatorButton onClick={handleVerifyExit} variant="contained" color="secondary">
<BackspaceIcon fontSize="large" /> <BackspaceIcon fontSize="small" />
</OperatorButton> </OperatorButton>
</Tooltip> </Tooltip>
...@@ -278,18 +278,18 @@ const OperatorViewPage: React.FC = () => { ...@@ -278,18 +278,18 @@ const OperatorViewPage: React.FC = () => {
</Typography> </Typography>
</OperatorHeaderItem> </OperatorHeaderItem>
</OperatorHeader> </OperatorHeader>
<div style={{ height: 0, paddingTop: 120 }} /> {/* <div style={{ minHeight: 64 }} /> */}
<OperatorContent> <OperatorContent>
<OperatorInnerContent> <OperatorInnerContent>
{activeViewTypeId && <SlideDisplay variant="presentation" activeViewTypeId={activeViewTypeId} />} {activeViewTypeId && <SlideDisplay variant="presentation" activeViewTypeId={activeViewTypeId} />}
</OperatorInnerContent> </OperatorInnerContent>
</OperatorContent> </OperatorContent>
<div style={{ height: 0, paddingTop: 140 }} /> {/* <div style={{ minHeight: 96 }} /> */}
<OperatorFooter> <OperatorFooter color="primary" position="fixed">
<ToolBarContainer> <ToolBarContainer>
<Tooltip title="Föregående sida" arrow> <Tooltip title="Föregående sida" arrow>
<OperatorButton onClick={handleSetPrevSlide} variant="contained" disabled={isFirstSlide}> <OperatorButton onClick={handleSetPrevSlide} variant="contained" disabled={isFirstSlide} color="secondary">
<ChevronLeftIcon fontSize="large" /> <ChevronLeftIcon fontSize="small" />
</OperatorButton> </OperatorButton>
</Tooltip> </Tooltip>
...@@ -299,29 +299,30 @@ const OperatorViewPage: React.FC = () => { ...@@ -299,29 +299,30 @@ const OperatorViewPage: React.FC = () => {
onClick={handleStartTimer} onClick={handleStartTimer}
variant="contained" variant="contained"
disabled={timer.value !== null && !timer.enabled} disabled={timer.value !== null && !timer.enabled}
color="secondary"
> >
<TimerIcon fontSize="large" /> <TimerIcon fontSize="small" />
<Timer disableText /> <Timer disableText />
</OperatorButton> </OperatorButton>
</Tooltip> </Tooltip>
)} )}
<Tooltip title="Visa ställning för publik" arrow> <Tooltip title="Visa ställning för publik" arrow>
<OperatorButton onClick={() => socketSync({ show_scoreboard: true })} variant="contained"> <OperatorButton onClick={() => socketSync({ show_scoreboard: true })} variant="contained" color="secondary">
<AssignmentIcon fontSize="large" /> <AssignmentIcon fontSize="small" />
</OperatorButton> </OperatorButton>
</Tooltip> </Tooltip>
{showScoreboard && <Scoreboard isOperator />} {showScoreboard && <Scoreboard isOperator />}
<Tooltip title="Visa koder" arrow> <Tooltip title="Visa koder" arrow>
<OperatorButton onClick={handleOpenCodes} variant="contained"> <OperatorButton onClick={handleOpenCodes} variant="contained" color="secondary">
<SupervisorAccountIcon fontSize="large" /> <SupervisorAccountIcon fontSize="small" />
</OperatorButton> </OperatorButton>
</Tooltip> </Tooltip>
<Tooltip title="Nästa sida" arrow> <Tooltip title="Nästa sida" arrow>
<OperatorButton onClick={handleSetNextSlide} variant="contained" disabled={isLastSlide}> <OperatorButton onClick={handleSetNextSlide} variant="contained" disabled={isLastSlide} color="secondary">
<ChevronRightIcon fontSize="large" /> <ChevronRightIcon fontSize="small" />
</OperatorButton> </OperatorButton>
</Tooltip> </Tooltip>
</ToolBarContainer> </ToolBarContainer>
......
...@@ -4,7 +4,7 @@ import React, { useEffect, useState } from 'react' ...@@ -4,7 +4,7 @@ import React, { useEffect, useState } from 'react'
import { useAppSelector } from '../../hooks' import { useAppSelector } from '../../hooks'
import { socketConnect } from '../../sockets' import { socketConnect } from '../../sockets'
import SlideDisplay from '../presentationEditor/components/SlideDisplay' import SlideDisplay from '../presentationEditor/components/SlideDisplay'
import { OperatorContainer, OperatorHeader, PresentationBackground, PresentationContainer } from './styled' import { OperatorContainer, PresentationBackground, PresentationContainer } from './styled'
const TeamViewPage: React.FC = () => { const TeamViewPage: React.FC = () => {
const code = useAppSelector((state) => state.presentation.code) const code = useAppSelector((state) => state.presentation.code)
...@@ -28,7 +28,6 @@ const TeamViewPage: React.FC = () => { ...@@ -28,7 +28,6 @@ const TeamViewPage: React.FC = () => {
}, []) }, [])
return ( return (
<OperatorContainer> <OperatorContainer>
<OperatorHeader></OperatorHeader>
<PresentationBackground> <PresentationBackground>
<PresentationContainer> <PresentationContainer>
{activeViewTypeId && <SlideDisplay variant="presentation" activeViewTypeId={activeViewTypeId} />} {activeViewTypeId && <SlideDisplay variant="presentation" activeViewTypeId={activeViewTypeId} />}
......
...@@ -35,32 +35,32 @@ export const ViewSelectButtonGroup = styled.div` ...@@ -35,32 +35,32 @@ export const ViewSelectButtonGroup = styled.div`
margin-right: auto; margin-right: auto;
` `
export const OperatorHeader = styled.div` export const OperatorHeader = styled(AppBar)`
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
height: 120px; align-content: center;
height: 64px;
width: 100%; width: 100%;
position: absolute;
` `
export const OperatorFooter = styled.div` export const OperatorFooter = styled(AppBar)`
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
height: 140px; align-content: center;
position: absolute; height: 96px;
top: auto;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
` `
export const OperatorButton = styled(Button)` export const OperatorButton = styled(Button)`
width: 100px; width: 64px;
height: 100px; height: 64px;
margin-left: 16px; margin-left: 16px;
margin-right: 16px; margin-right: 16px;
margin-top: 16px;
` `
export const OperatorHeaderItem = styled(Button)` export const OperatorHeaderItem = styled.div`
margin-left: 16px; margin-left: 16px;
margin-right: 16px; margin-right: 16px;
margin-top: 16px; margin-top: 16px;
......
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