Skip to content
Snippets Groups Projects

Resolve "Fix alert dialogs"

Merged Björn Modée requested to merge 106-alert-dialogs into dev
1 file
+ 7
3
Compare changes
  • Side-by-side
  • Inline
<<<<<<< HEAD
import {
Button,
Dialog,
@@ -11,7 +12,7 @@ import {
Tooltip,
Typography,
useMediaQuery,
useTheme,
useTheme
} from '@material-ui/core'
import AssignmentIcon from '@material-ui/icons/Assignment'
import BackspaceIcon from '@material-ui/icons/Backspace'
@@ -31,7 +32,7 @@ import {
socketSetSlidePrev,
socketStartPresentation,
socketStartTimer,
socket_connect,
socket_connect
} from '../../sockets'
import SlideDisplay from './components/SlideDisplay'
import Timer from './components/Timer'
@@ -41,8 +42,11 @@ import {
PresenterFooter,
PresenterHeader,
SlideCounter,
ToolBarContainer,
ToolBarContainer
} from './styled'
=======
import { List, ListItem, Popover, Tooltip, Typography } from '@material-ui/core'
>>>>>>> d488a39fed5732129f8adc7b12b9d77e077c8354
const PresenterViewPage: React.FC = () => {
// for dialog alert
Loading