resolve conflicts

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>

client/src/pages/views/TeamViewPage.test.tsx

@@ -3,12 +3,8 @@ import React from 'react'
 import { Provider } from 'react-redux'
 import { BrowserRouter } from 'react-router-dom'
 import store from '../../store'
-<<<<<<< HEAD:client/src/pages/views/TeamViewPage.test.tsx
 import TeamViewPage from './TeamViewPage'
-=======
-import ParticipantViewPage from './ParticipantViewPage'
 import mockedAxios from 'axios'
->>>>>>> 5404d2dcf781f8384bc4ee5fd08355a7ce22059f:client/src/pages/views/ParticipantViewPage.test.tsx
 
 it('renders participant view page', () => {
   const res = {

client/src/pages/views/TeamViewPage.tsx

@@ -2,7 +2,7 @@ import React, { useEffect } from 'react'
 import PresentationComponent from './components/PresentationComponent'
 import { useHistory } from 'react-router-dom'
 import SlideDisplay from '../presentationEditor/components/SlideDisplay'
-import { ParticipantContainer } from './styled'
+import { TeamContainer } from './styled'
 import { socketJoinPresentation, socket_connect } from '../../sockets'
 import { useAppSelector } from '../../hooks'
 
@@ -11,20 +11,16 @@ const TeamViewPage: React.FC = () => {
   const code = useAppSelector((state) => state.presentation.code)
   useEffect(() => {
     //hides the url so people can't sneak peak
-<<<<<<< HEAD:client/src/pages/views/TeamViewPage.tsx
-    history.push('operator')
-=======
-    history.push('participant')
+    history.push('team')
     if (code && code !== '') {
       socket_connect()
       socketJoinPresentation()
     }
->>>>>>> 5404d2dcf781f8384bc4ee5fd08355a7ce22059f:client/src/pages/views/ParticipantViewPage.tsx
   }, [])
   return (
-    <ParticipantContainer>
+    <TeamContainer>
       <SlideDisplay />
-    </ParticipantContainer>
+    </TeamContainer>
   )
 }
 

client/src/pages/views/styled.tsx

@@ -127,7 +127,7 @@ export const InnerContent = styled.div`
   max-width: calc(((100vh - 64px) / 9) * 16);
 `
 
-export const PresenterContent = styled.div`
+export const OperatorContent = styled.div`
   height: 100%;
   width: 100%;
   display: flex;
@@ -135,7 +135,7 @@ export const PresenterContent = styled.div`
   background-color: rgba(0, 0, 0, 0.08);
 `
 
-export const PresenterInnerContent = styled.div`
+export const OperatorInnerContent = styled.div`
   height: 100%;
   width: 100%;
   /* Makes sure width is not bigger than where a 16:9 display can fit 
@@ -143,7 +143,7 @@ export const PresenterInnerContent = styled.div`
   max-width: calc(((100vh - 260px) / 9) * 16);
 `
 
-export const ParticipantContainer = styled.div`
+export const TeamContainer = styled.div`
   max-width: calc((100vh / 9) * 16);
 `