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

Merge branch 'assessment' into instruction

Browse Source
This commit is contained in:
Delucse 2020-09-15 18:44:23 +02:00
commit 20ac45a48d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/CodeViewer.js
View File

@ -7,6 +7,7 @@ import "prismjs/themes/prism.css";
import "prismjs/plugins/line-numbers/prism-line-numbers"; import "prismjs/plugins/line-numbers/prism-line-numbers";
import "prismjs/plugins/line-numbers/prism-line-numbers.css"; import "prismjs/plugins/line-numbers/prism-line-numbers.css";
import withWidth from '@material-ui/core/withWidth';
import { withStyles } from '@material-ui/core/styles'; import { withStyles } from '@material-ui/core/styles';
import MuiAccordion from '@material-ui/core/Accordion'; import MuiAccordion from '@material-ui/core/Accordion';
import MuiAccordionSummary from '@material-ui/core/AccordionSummary'; import MuiAccordionSummary from '@material-ui/core/AccordionSummary';
@ -136,4 +137,4 @@ const mapStateToProps = state => ({
xml: state.workspace.code.xml xml: state.workspace.code.xml
}); });
export default connect(mapStateToProps, null)(CodeViewer); export default connect(mapStateToProps, null)(withWidth()(CodeViewer));

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

@ -6,6 +6,7 @@ import BlocklyWindow from '../Blockly/BlocklyWindow';
import SolutionCheck from './SolutionCheck'; import SolutionCheck from './SolutionCheck';
import CodeViewer from '../CodeViewer'; import CodeViewer from '../CodeViewer';
import withWidth, { isWidthDown } from '@material-ui/core/withWidth';
import Grid from '@material-ui/core/Grid'; import Grid from '@material-ui/core/Grid';
import Card from '@material-ui/core/Card'; import Card from '@material-ui/core/Card';
import Typography from '@material-ui/core/Typography'; import Typography from '@material-ui/core/Typography';
@ -27,12 +28,12 @@ class Assessment extends Component {
<SolutionCheck /> <SolutionCheck />
<BlocklyWindow initialXml={statusTask ? statusTask.xml ? statusTask.xml : null : null}/> <BlocklyWindow initialXml={statusTask ? statusTask.xml ? statusTask.xml : null : null}/>
</Grid> </Grid>
<Grid item xs={12} md={6} lg={4}> <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.text1}</Typography> <Typography>{currentTask.text1}</Typography>
</Card> </Card>
<div style={{height: '50%'}}> <div style={isWidthDown('sm', this.props.width) ? {height: '500px'} : {height: '50%'}}>
<CodeViewer /> <CodeViewer />
</div> </div>
</Grid> </Grid>
@ -54,4 +55,4 @@ const mapStateToProps = state => ({
currentTutorialId: state.tutorial.currentId currentTutorialId: state.tutorial.currentId
}); });
export default connect(mapStateToProps, null)(Assessment); export default connect(mapStateToProps, null)(withWidth()(Assessment));