up updates

JSConfBp · Jun 16, 2024 · c006281 · c006281
1 parent 38b8d89
commit c006281
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 32 deletions.
diff --git a/src/components/PresentationStates/index.js b/src/components/PresentationStates/index.js
@@ -16,31 +16,31 @@ const PresentationStates = ({
     return (<>
       <FormControlLabel
         disabled={ !presentationEnabled }
-        control={<Switch checked={ presentation }
+        control={<Switch checked={ presentation } color="warning"
         onChange={ (event) => onChange('presentation', event.target.checked) } />}
         label="Presentation active"
       />
       <Divider light />
       <FormControlLabel
-        control={<Switch checked={ midsession }
+        control={<Switch checked={ midsession } color="secondary"
         onChange={ (event) => onChange('midsession', event.target.checked) } />}
         label="Mid-session slides active"
       />
       <Divider light />
       <FormControlLabel
-        control={<Switch checked={ coffee }
+        control={<Switch checked={ coffee }  color="success"
         onChange={ (event) => onChange('coffee', event.target.checked) } />}
         label="Coffee break"
       />
       <Divider light />
       <FormControlLabel
-        control={<Switch checked={ lunch }
+        control={<Switch checked={ lunch }  color="success"
         onChange={ (event) => onChange('lunch', event.target.checked) } />}
         label="Lunch break"
       />
       <Divider light />
       <FormControlLabel
-        control={<Switch checked={ logoOnly }
+        control={<Switch checked={ logoOnly }  color="secondary"
         onChange={ (event) => onChange('logoOnly', event.target.checked) } />}
         label="Logo only"
       />

diff --git a/src/components/Status/index.js b/src/components/Status/index.js
@@ -17,7 +17,7 @@ import Divider from '@mui/material/Divider';
 import colors from '../../../colors'
 
 const MyChip = styled(Chip)`
-	margin: 16px;
+	margin: 4px;
 	margin:left: 0;
 `
 const getColorChip = (color) => styled(MyChip)(({ theme }) => ({
@@ -43,7 +43,7 @@ const Status = ({
 } ) => {
     const presentationChip = {
         label: presentationState ? 'Presentation active' : 'No active presentation',
-        color: presentationState ? 'primary' : 'default',
+        color: presentationState ? 'warning' : 'default',
 	}
 
     const midslideChip = {
@@ -57,19 +57,24 @@ const Status = ({
 
 
     return (<List>
-        <ListItem css={css`
-			padding-left: 0;
-			padding-right: 0;
-			flex-wrap: wrap;
-		`}>
+        <ListItem sx={{
+          padding: 0
+        }}>
             <MyChip
                 icon={<FaceIcon />}
                 { ...presentationChip }
-            />
+            /></ListItem>        <ListItem sx={{
+              padding: 0
+            }}>
             <MyChip
                 icon={<PhotoIcon />}
                 { ...midslideChip }
             />
+            </ListItem>        <ListItem css={css`
+			padding-left: 0;
+			padding-right: 0;
+			flex-wrap: wrap;
+		`}>
             { color && (() => {
 				let ColorChip = getColorChip(color);
 				let ColorIcon = getColorIcon(color);

diff --git a/src/pages/index.js b/src/pages/index.js
@@ -254,23 +254,7 @@ const Index = (props) => {
 		<Container maxWidth="xl">
 			<Grid container spacing={3}>
 
-				<Grid item xs={12} md={6} css={css`
-					height: calc(100vh - 64px);
-					overflow: auto;
-				`}>
-					<SubPaper>
-						<SectionTitle variant="h5">
-							Speakers
-						</SectionTitle>
-						<Speakers
-							speakers={ getSpeakers(stage) }
-							currentSpeaker={ stage.speaker }
-							onClick={ item => onSpeakerSelect(item) }
-						/>
-					</SubPaper>
-				</Grid>
-
-				<Grid item xs={12} md={6} >
+      <Grid item xs={12} md={6} >
 					<SubPaper>
 						<SectionTitle variant="h5">
 							Status
@@ -299,14 +283,30 @@ const Index = (props) => {
 					/>
 				</SubPaper>
 
-				{ stage && stage.event.startsWith('js') && (<SubPaper>
+{/* 				{ stage && stage.event.startsWith('js') && (<SubPaper>
 					<SectionTitle variant="h5">
 						Colors
 					</SectionTitle>
 					<Colors onChange={ color => onColorChange(color) } />
-				</SubPaper>)}
+				</SubPaper>)} */}
 
 			</Grid>
+				<Grid item xs={12} md={6} css={css`
+					height: calc(100vh - 64px);
+					overflow: auto;
+				`}>
+					<SubPaper>
+						<SectionTitle variant="h5">
+							Speakers
+						</SectionTitle>
+						<Speakers
+							speakers={ getSpeakers(stage) }
+							currentSpeaker={ stage.speaker }
+							onClick={ item => onSpeakerSelect(item) }
+						/>
+					</SubPaper>
+				</Grid>
+
 		</Grid>
 	</Container>
 	<Snackbar