schuelerlabor-cleverlab/smarti
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10 from sensebox/use-viewport-height

Browse Source 
use viewport height for blocklywindow
This commit is contained in:
Mario Pesch 2020-10-05 07:21:44 +00:00 committed by GitHub
commit c99ca92a4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/components/CodeViewer.js
View File

@ -1,4 +1,4 @@
import React, {Component} from 'react'; import React, { Component } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
@ -56,7 +56,7 @@ const AccordionDetails = withStyles((theme) => ({
class CodeViewer extends Component { class CodeViewer extends Component {
constructor(props){ constructor(props) {
super(props); super(props);
this.state = { this.state = {
expanded: true, expanded: true,
@ -67,12 +67,12 @@ class CodeViewer extends Component {
componentDidMount() { componentDidMount() {
Prism.highlightAll(); Prism.highlightAll();
this.setState({componentHeight: this.myDiv.current.offsetHeight+'px'}); this.setState({ componentHeight: this.myDiv.current.offsetHeight + 'px' });
} }
componentDidUpdate(props, state) { componentDidUpdate(props, state) {
if(this.myDiv.current && this.myDiv.current.offsetHeight+'px' !== this.state.componentHeight){ if (this.myDiv.current && this.myDiv.current.offsetHeight + 'px' !== this.state.componentHeight) {
this.setState({componentHeight: this.myDiv.current.offsetHeight+'px'}); this.setState({ componentHeight: this.myDiv.current.offsetHeight + 'px' });
} }
Prism.highlightAll(); Prism.highlightAll();
} }
@ -85,19 +85,19 @@ class CodeViewer extends Component {
var curlyBrackets = '{ }'; var curlyBrackets = '{ }';
var unequal = '<>'; var unequal = '<>';
return ( return (
<Card style={{height: '100%', maxHeight: '500px'}} ref={this.myDiv}> <Card style={{ height: '100%', maxHeight: '80vH' }} ref={this.myDiv}>
<Accordion <Accordion
square={true} square={true}
style={{margin: 0}} style={{ margin: 0 }}
expanded={this.state.expanded} expanded={this.state.expanded}
onChange={this.onChange} onChange={this.onChange}
> >
<AccordionSummary> <AccordionSummary>
<b style={{fontSize: '20px', marginRight: '5px', width: '35px'}}>{curlyBrackets}</b> <b style={{ fontSize: '20px', marginRight: '5px', width: '35px' }}>{curlyBrackets}</b>
<div style={{margin: 'auto 5px 2px 0px'}}>Arduino Quellcode</div> <div style={{ margin: 'auto 5px 2px 0px' }}>Arduino Quellcode</div>
</AccordionSummary> </AccordionSummary>
<AccordionDetails style={{padding: 0, height: `calc(${this.state.componentHeight} - 50px - 50px)`, backgroundColor: 'white'}}> <AccordionDetails style={{ padding: 0, height: `calc(${this.state.componentHeight} - 50px - 50px)`, backgroundColor: 'white' }}>
<pre className="line-numbers" style={{paddingBottom: 0, width: '100%', overflow: 'auto', scrollbarWidth: 'thin', height: 'calc(100% - 30px)', margin: '15px 0', paddingTop: 0, whiteSpace: 'pre-wrap', backgroundColor: 'white'}}> <pre className="line-numbers" style={{ paddingBottom: 0, width: '100%', overflow: 'auto', scrollbarWidth: 'thin', height: 'calc(100% - 30px)', margin: '15px 0', paddingTop: 0, whiteSpace: 'pre-wrap', backgroundColor: 'white' }}>
<code className="language-clike"> <code className="language-clike">
{this.props.arduino} {this.props.arduino}
</code> </code>
@ -106,16 +106,16 @@ class CodeViewer extends Component {
</Accordion> </Accordion>
<Accordion <Accordion
square={true} square={true}
style={{margin: 0}} style={{ margin: 0 }}
expanded={!this.state.expanded} expanded={!this.state.expanded}
onChange={this.onChange} onChange={this.onChange}
> >
<AccordionSummary> <AccordionSummary>
<b style={{fontSize: '20px', marginRight: '5px', width: '35px'}}>{unequal}</b> <b style={{ fontSize: '20px', marginRight: '5px', width: '35px' }}>{unequal}</b>
<div style={{margin: 'auto 5px 2px 0px'}}>XML Blöcke</div> <div style={{ margin: 'auto 5px 2px 0px' }}>XML Blöcke</div>
</AccordionSummary> </AccordionSummary>
<AccordionDetails style={{padding: 0, height: `calc(${this.state.componentHeight} - 50px - 50px)`, backgroundColor: 'white'}}> <AccordionDetails style={{ padding: 0, height: `calc(${this.state.componentHeight} - 50px - 50px)`, backgroundColor: 'white' }}>
<pre className="line-numbers" style={{paddingBottom: 0, width: '100%', overflow: 'auto', scrollbarWidth: 'thin', height: 'calc(100% - 30px)', margin: '15px 0', paddingTop: 0, whiteSpace: 'pre-wrap', backgroundColor: 'white'}}> <pre className="line-numbers" style={{ paddingBottom: 0, width: '100%', overflow: 'auto', scrollbarWidth: 'thin', height: 'calc(100% - 30px)', margin: '15px 0', paddingTop: 0, whiteSpace: 'pre-wrap', backgroundColor: 'white' }}>
<code className="language-xml"> <code className="language-xml">
{`${this.props.xml}`} {`${this.props.xml}`}
</code> </code>

12
src/components/Home.js
View File

@ -56,7 +56,7 @@ class Home extends Component {
Blockly.svgResize(workspace); Blockly.svgResize(workspace);
} }
componentWillUnmount(){ componentWillUnmount() {
this.props.clearStats(); this.props.clearStats();
this.props.workspaceName(null); this.props.workspaceName(null);
} }
@ -73,21 +73,21 @@ class Home extends Component {
render() { render() {
return ( return (
<div> <div>
<div style={{float: 'right', height: '40px', marginBottom: '20px'}}><WorkspaceFunc /></div> <div style={{ float: 'right', height: '40px', marginBottom: '20px' }}><WorkspaceFunc /></div>
<div style={{float: 'left', height: '40px', position: 'relative'}}><WorkspaceStats /></div> <div style={{ float: 'left', height: '40px', position: 'relative' }}><WorkspaceStats /></div>
<Grid container spacing={2}> <Grid container spacing={2}>
<Grid item xs={12} md={this.state.codeOn ? 6 : 12} style={{ position: 'relative' }}> <Grid item xs={12} md={this.state.codeOn ? 6 : 12} style={{ position: 'relative' }}>
<Tooltip title={this.state.codeOn ? 'Code ausblenden' : 'Code anzeigen'} > <Tooltip title={this.state.codeOn ? 'Code ausblenden' : 'Code anzeigen'} >
<IconButton <IconButton
className={this.state.codeOn ? this.props.classes.codeOn : this.props.classes.codeOff} className={this.state.codeOn ? this.props.classes.codeOn : this.props.classes.codeOff}
style={{width: '40px', height: '40px', position: 'absolute', top: -12, right: 8, zIndex: 21 }} style={{ width: '40px', height: '40px', position: 'absolute', top: -12, right: 8, zIndex: 21 }}
onClick={() => this.onChange()} onClick={() => this.onChange()}
> >
<FontAwesomeIcon icon={faCode} size="xs"/> <FontAwesomeIcon icon={faCode} size="xs" />
</IconButton> </IconButton>
</Tooltip> </Tooltip>
<TrashcanButtons /> <TrashcanButtons />
<BlocklyWindow blocklyCSS={{height: '500px'}} blockDisabled/> <BlocklyWindow blocklyCSS={{ height: '80vH' }} blockDisabled />
</Grid> </Grid>
{this.state.codeOn ? {this.state.codeOn ?
<Grid item xs={12} md={6}> <Grid item xs={12} md={6}>

22
src/components/Tutorial/Assessment.js
View File

@ -14,13 +14,13 @@ import Typography from '@material-ui/core/Typography';
class Assessment extends Component { class Assessment extends Component {
componentDidMount(){ componentDidMount() {
// alert(this.props.name); // alert(this.props.name);
this.props.workspaceName(this.props.name); this.props.workspaceName(this.props.name);
} }
componentDidUpdate(props){ componentDidUpdate(props) {
if(props.name !== this.props.name){ if (props.name !== this.props.name) {
// alert(this.props.name); // alert(this.props.name);
this.props.workspaceName(this.props.name); this.props.workspaceName(this.props.name);
} }
@ -34,23 +34,23 @@ class Assessment extends Component {
var statusTask = status.tasks[taskIndex]; var statusTask = status.tasks[taskIndex];
return ( return (
<div style={{width: '100%'}}> <div style={{ width: '100%' }}>
<Typography variant='h4' style={{float: 'left', marginBottom: '5px', height: '40px', display: 'table'}}>{currentTask.headline}</Typography> <Typography variant='h4' style={{ float: 'left', marginBottom: '5px', height: '40px', display: 'table' }}>{currentTask.headline}</Typography>
<div style={{float: 'right', height: '40px'}}><WorkspaceFunc solutionCheck/></div> <div style={{ float: 'right', height: '40px' }}><WorkspaceFunc solutionCheck /></div>
<Grid container spacing={2} style={{marginBottom: '5px'}}> <Grid container spacing={2} style={{ marginBottom: '5px' }}>
<Grid item xs={12} md={6} lg={8}> <Grid item xs={12} md={6} lg={8}>
<BlocklyWindow <BlocklyWindow
initialXml={statusTask ? statusTask.xml ? statusTask.xml : null : null} initialXml={statusTask ? statusTask.xml ? statusTask.xml : null : null}
blockDisabled blockDisabled
blocklyCSS={{height: '500px'}} blocklyCSS={{ height: '65vH' }}
/> />
</Grid> </Grid>
<Grid item xs={12} md={6} lg={4} style={isWidthDown('sm', this.props.width) ? {height: 'max-content'} : {}}> <Grid item xs={12} md={6} lg={4} style={isWidthDown('sm', this.props.width) ? { height: 'max-content' } : {}}>
<Card style={{height: 'calc(50% - 30px)', padding: '10px', marginBottom: '10px'}}> <Card style={{ height: 'calc(50% - 30px)', padding: '10px', marginBottom: '10px' }}>
<Typography variant='h5'>Arbeitsauftrag</Typography> <Typography variant='h5'>Arbeitsauftrag</Typography>
<Typography>{currentTask.text}</Typography> <Typography>{currentTask.text}</Typography>
</Card> </Card>
<div style={isWidthDown('sm', this.props.width) ? {height: '500px'} : {height: '50%'}}> <div style={isWidthDown('sm', this.props.width) ? { height: '500px' } : { height: '50%' }}>
<CodeViewer /> <CodeViewer />
</div> </div>
</Grid> </Grid>