fix tutorial assessment view
This commit is contained in:
		
							parent
							
								
									b6da61fae0
								
							
						
					
					
						commit
						7ab3f91ed8
					
				| @ -161,7 +161,7 @@ void loop() { | |||||||
|             {`${error}`}{" "} |             {`${error}`}{" "} | ||||||
|           </p> |           </p> | ||||||
|         </Drawer> |         </Drawer> | ||||||
|         <Grid item lg={8}> |         <Grid item lg={8} md={8}> | ||||||
|           <div style={{ display: "flex", alignItems: "center" }}> |           <div style={{ display: "flex", alignItems: "center" }}> | ||||||
|             <h1>Code Editor</h1> |             <h1>Code Editor</h1> | ||||||
|             <SaveIcon loading={autoSave} /> |             <SaveIcon loading={autoSave} /> | ||||||
| @ -193,7 +193,7 @@ void loop() { | |||||||
|             }} |             }} | ||||||
|           /> |           /> | ||||||
|         </Grid> |         </Grid> | ||||||
|         <Grid item lg={4}> |         <Grid item lg={4} md={4}> | ||||||
|           <Button |           <Button | ||||||
|             style={{ padding: "1rem", margin: "1rem" }} |             style={{ padding: "1rem", margin: "1rem" }} | ||||||
|             variant="contained" |             variant="contained" | ||||||
|  | |||||||
| @ -8,12 +8,10 @@ import Typography from "@material-ui/core/Typography"; | |||||||
| import { LibraryVersions } from "../../data/versions.js"; | import { LibraryVersions } from "../../data/versions.js"; | ||||||
| import { useMonaco } from "@monaco-editor/react"; | import { useMonaco } from "@monaco-editor/react"; | ||||||
| import { Button } from "@material-ui/core"; | import { Button } from "@material-ui/core"; | ||||||
| import Dialog from "../Dialog"; |  | ||||||
| import SerialMonitor from "./SerialMonitor.js"; | import SerialMonitor from "./SerialMonitor.js"; | ||||||
| import axios from "axios"; | import axios from "axios"; | ||||||
| 
 | 
 | ||||||
| const Sidebar = () => { | const Sidebar = () => { | ||||||
|   const [alert, setAlert] = React.useState(false); |  | ||||||
|   //const [examples, setExamples] = React.useState([]);
 |   //const [examples, setExamples] = React.useState([]);
 | ||||||
|   const user = useSelector((state) => state.auth.user); |   const user = useSelector((state) => state.auth.user); | ||||||
|   // useEffect(() => {
 |   // useEffect(() => {
 | ||||||
| @ -28,10 +26,6 @@ const Sidebar = () => { | |||||||
|     monaco.editor.getModels()[0].setValue(code); |     monaco.editor.getModels()[0].setValue(code); | ||||||
|   }; |   }; | ||||||
| 
 | 
 | ||||||
|   const toggleDialog = () => { |  | ||||||
|     setAlert(false); |  | ||||||
|   }; |  | ||||||
| 
 |  | ||||||
|   const getOsemScript = (id) => { |   const getOsemScript = (id) => { | ||||||
|     axios |     axios | ||||||
|       .get(`https://api.opensensemap.org/boxes/${id}/script/`) |       .get(`https://api.opensensemap.org/boxes/${id}/script/`) | ||||||
| @ -138,25 +132,6 @@ const Sidebar = () => { | |||||||
|             })} |             })} | ||||||
|           </Typography> |           </Typography> | ||||||
|         </AccordionDetails> |         </AccordionDetails> | ||||||
|         <Dialog |  | ||||||
|           style={{ zIndex: 9999999 }} |  | ||||||
|           fullWidth |  | ||||||
|           maxWidth={"sm"} |  | ||||||
|           open={alert} |  | ||||||
|           title={Blockly.Msg.tabletDialog_headline} |  | ||||||
|           content={""} |  | ||||||
|           onClose={() => toggleDialog()} |  | ||||||
|           onClick={() => toggleDialog()} |  | ||||||
|           button={Blockly.Msg.button_close} |  | ||||||
|         > |  | ||||||
|           <div>{Blockly.Msg.tabletDialog_text}</div> |  | ||||||
|           <div> |  | ||||||
|             {Blockly.Msg.tabletDialog_more}{" "} |  | ||||||
|             <a href="https://sensebox.de/app" target="_blank" rel="noreferrer"> |  | ||||||
|               https://sensebox.de/app
 |  | ||||||
|             </a> |  | ||||||
|           </div> |  | ||||||
|         </Dialog> |  | ||||||
|       </Accordion> |       </Accordion> | ||||||
|     </div> |     </div> | ||||||
|   ); |   ); | ||||||
|  | |||||||
| @ -86,49 +86,7 @@ class Assessment extends Component { | |||||||
|           <Grid |           <Grid | ||||||
|             item |             item | ||||||
|             xs={12} |             xs={12} | ||||||
|             md={6} |             md={this.state.codeOn ? 6 : 9} | ||||||
|             lg={3} |  | ||||||
|             style={{ |  | ||||||
|               position: "relative", |  | ||||||
|               // isWidthDown("sm", this.props.width)
 |  | ||||||
|               //   ? { height: "max-content" }
 |  | ||||||
|               //   : {}
 |  | ||||||
|             }} |  | ||||||
|           > |  | ||||||
|             <Card |  | ||||||
|               style={{ |  | ||||||
|                 height: "calc(45vH - 30px)", |  | ||||||
|                 padding: "10px", |  | ||||||
|                 marginBottom: "10px", |  | ||||||
|               }} |  | ||||||
|             > |  | ||||||
|               <Typography> |  | ||||||
|                 <ReactMarkdown remarkPlugins={[remarkGfm, remarkGemoji]}> |  | ||||||
|                   {currentTask.text} |  | ||||||
|                 </ReactMarkdown> |  | ||||||
|               </Typography> |  | ||||||
|             </Card> |  | ||||||
|             <Card |  | ||||||
|               style={{ |  | ||||||
|                 height: "20vH", |  | ||||||
|                 padding: "10px", |  | ||||||
|                 marginBottom: "10px", |  | ||||||
|               }} |  | ||||||
|             > |  | ||||||
|               <TooltipViewer /> |  | ||||||
|             </Card> |  | ||||||
|             <div |  | ||||||
|               style={ |  | ||||||
|                 isWidthDown("sm", this.props.width) |  | ||||||
|                   ? { height: "500px" } |  | ||||||
|                   : { height: "50%" } |  | ||||||
|               } |  | ||||||
|             ></div> |  | ||||||
|           </Grid> |  | ||||||
|           <Grid |  | ||||||
|             item |  | ||||||
|             xs={12} |  | ||||||
|             md={this.state.codeOn ? 6 : 6} |  | ||||||
|             lg={this.state.codeOn ? 6 : 9} |             lg={this.state.codeOn ? 6 : 9} | ||||||
|             style={{ position: "relative" }} |             style={{ position: "relative" }} | ||||||
|           > |           > | ||||||
| @ -169,6 +127,48 @@ class Assessment extends Component { | |||||||
|               <CodeViewer /> |               <CodeViewer /> | ||||||
|             </Grid> |             </Grid> | ||||||
|           ) : null} |           ) : null} | ||||||
|  |           <Grid | ||||||
|  |             item | ||||||
|  |             xs={12} | ||||||
|  |             md={3} | ||||||
|  |             lg={3} | ||||||
|  |             style={{ | ||||||
|  |               position: "relative", | ||||||
|  |               // isWidthDown("sm", this.props.width)
 | ||||||
|  |               //   ? { height: "max-content" }
 | ||||||
|  |               //   : {}
 | ||||||
|  |             }} | ||||||
|  |           > | ||||||
|  |             <Card | ||||||
|  |               style={{ | ||||||
|  |                 height: "calc(44vH - 35px)", | ||||||
|  |                 padding: "10px", | ||||||
|  |                 marginBottom: "10px", | ||||||
|  |               }} | ||||||
|  |             > | ||||||
|  |               <Typography> | ||||||
|  |                 <ReactMarkdown remarkPlugins={[remarkGfm, remarkGemoji]}> | ||||||
|  |                   {currentTask.text} | ||||||
|  |                 </ReactMarkdown> | ||||||
|  |               </Typography> | ||||||
|  |             </Card> | ||||||
|  |             {/* <Card | ||||||
|  |               style={{ | ||||||
|  |                 height: "20vH", | ||||||
|  |                 padding: "10px", | ||||||
|  |                 marginBottom: "10px", | ||||||
|  |               }} | ||||||
|  |             > */} | ||||||
|  |             <TooltipViewer /> | ||||||
|  |             {/* </Card> */} | ||||||
|  |             <div | ||||||
|  |               style={ | ||||||
|  |                 isWidthDown("sm", this.props.width) | ||||||
|  |                   ? { height: "500px" } | ||||||
|  |                   : { height: "50%" } | ||||||
|  |               } | ||||||
|  |             ></div> | ||||||
|  |           </Grid> | ||||||
|         </Grid> |         </Grid> | ||||||
|       </div> |       </div> | ||||||
|     ); |     ); | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user