139 operator view

client/src/pages/views/OperatorViewPage.tsx

@@ -39,19 +39,12 @@ import SlideDisplay from '../presentationEditor/components/SlideDisplay'
 import PresentationComponent from './components/PresentationComponent'
 import Timer from './components/Timer'
 import {
-<<<<<<< HEAD:client/src/pages/views/OperatorViewPage.tsx
   OperatorButton,
   OperatorContainer,
   OperatorFooter,
   OperatorHeader,
-=======
-  PresenterButton,
-  PresenterContainer,
-  PresenterContent,
-  PresenterFooter,
-  PresenterHeader,
-  PresenterInnerContent,
->>>>>>> 5404d2dcf781f8384bc4ee5fd08355a7ce22059f:client/src/pages/views/PresenterViewPage.tsx
+  OperatorContent,
+  OperatorInnerContent,
   SlideCounter,
   ToolBarContainer,
 } from './styled'
@@ -222,21 +215,15 @@ const OperatorViewPage: React.FC = () => {
             {presentation.slide.order + 1} / {presentation.competition.slides.length}
           </Typography>
         </SlideCounter>
-<<<<<<< HEAD:client/src/pages/views/OperatorViewPage.tsx
       </OperatorHeader>
-      <SlideDisplay />
-      <OperatorFooter>
-=======
-      </PresenterHeader>
       <div style={{ height: 0, paddingTop: 120 }} />
-      <PresenterContent>
-        <PresenterInnerContent>
+      <OperatorContent>
+        <OperatorInnerContent>
           <SlideDisplay />
-        </PresenterInnerContent>
-      </PresenterContent>
+        </OperatorInnerContent>
+      </OperatorContent>
       <div style={{ height: 0, paddingTop: 140 }} />
-      <PresenterFooter>
->>>>>>> 5404d2dcf781f8384bc4ee5fd08355a7ce22059f:client/src/pages/views/PresenterViewPage.tsx
+      <OperatorFooter>
         <ToolBarContainer>
           <Tooltip title="Föregående" arrow>
             <OperatorButton onClick={socketSetSlidePrev} variant="contained">
@@ -309,18 +296,11 @@ const OperatorViewPage: React.FC = () => {
         }}
       >
         <List>
-<<<<<<< HEAD:client/src/pages/views/OperatorViewPage.tsx
           {teams.map((team) => (
             <ListItem key={team.id}>
               {team.name} score: {team.question_answers}{' '}
             </ListItem>
           ))}
-=======
-          {/**  TODO:
-           *    Fix scoreboard
-           */}
-          {teams && teams.map((team) => <ListItem key={team.id}>{team.name} score: 20</ListItem>)}
->>>>>>> 5404d2dcf781f8384bc4ee5fd08355a7ce22059f:client/src/pages/views/PresenterViewPage.tsx
         </List>
       </Popover>
     </OperatorContainer>