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

redirection to home if no share or gallery content is available

Browse Source
This commit is contained in:
Delucse 2020-12-01 19:05:14 +01:00
parent 2dfd146d18
commit 0d4072ab17
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/Home.js
View File

@ -87,12 +87,22 @@ class Home extends Component {
this.setState({progress: true}); this.setState({progress: true});
axios.get(`${process.env.REACT_APP_BLOCKLY_API}/${param}/${id}`) axios.get(`${process.env.REACT_APP_BLOCKLY_API}/${param}/${id}`)
.then(res => { .then(res => {
this.props.workspaceName(res.data[param].name ? res.data[param].name : res.data[param].title); var data = param === 'share' ? 'content' : param;
this.setState({ projectToLoad: res.data[param], progress: false }); if(res.data[data]){
this.props.workspaceName(res.data[data].name ? res.data[data].name : res.data[data].title);
this.setState({ projectToLoad: res.data[data], progress: false });
}
else {
this.props.workspaceName(createNameId());
this.setState({ progress: false });
this.props.history.push('/');
}
}) })
.catch(err => { .catch(err => {
// TODO: // TODO:
this.setState({ progress: false, snackbar: true, key: Date.now(), message: `Fehler beim Aufrufen des angeforderten Programms. Versuche es noch einmal.`, type: 'error' }); this.setState({ progress: false, snackbar: true, key: Date.now(), message: `Fehler beim Aufrufen des angeforderten Programms. Versuche es noch einmal.`, type: 'error' });
this.props.workspaceName(createNameId());
this.props.history.push('/');
window.scrollTo(0, 0); window.scrollTo(0, 0);
}); });
} }

2
src/components/WorkspaceFunc.js
View File

@ -332,7 +332,7 @@ class WorkspaceFunc extends Component {
: this.state.share ? : this.state.share ?
<div style={{ marginTop: '10px' }}> <div style={{ marginTop: '10px' }}>
<Typography>Über den folgenden Link kannst du dein Programm teilen:</Typography> <Typography>Über den folgenden Link kannst du dein Programm teilen:</Typography>
<Link to={`/share/${this.state.id}`} className={this.props.classes.link}>{`${window.location.origin}/share/${this.state.id}`}</Link> <Link to={`/share/${this.state.id}`} onClick={() => this.toggleDialog()} className={this.props.classes.link}>{`${window.location.origin}/share/${this.state.id}`}</Link>
<Tooltip title='Link kopieren' arrow style={{ marginRight: '5px' }}> <Tooltip title='Link kopieren' arrow style={{ marginRight: '5px' }}>
<IconButton <IconButton
onClick={() => { onClick={() => {