From 0f0bfb98c656059a6d8cef7737ba9f96dbcf51b2 Mon Sep 17 00:00:00 2001
From: Delucse <46593742+Delucse@users.noreply.github.com>
Date: Mon, 21 Sep 2020 11:41:19 +0200
Subject: [PATCH] add snackbar to tutorial builder
---
src/actions/tutorialBuilderActions.js | 1 +
src/components/Tutorial/Builder/Builder.js | 23 +++++++++++++++++++++-
src/components/Tutorial/Builder/Step.js | 12 ++++++++++-
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/src/actions/tutorialBuilderActions.js b/src/actions/tutorialBuilderActions.js
index 48d4bc2..6509a6b 100644
--- a/src/actions/tutorialBuilderActions.js
+++ b/src/actions/tutorialBuilderActions.js
@@ -220,6 +220,7 @@ export const progress = (inProgress) => (dispatch) => {
};
export const resetTutorial = () => (dispatch, getState) => {
+ dispatch(jsonString(''));
dispatch(tutorialTitle(''));
dispatch(tutorialId(''));
var steps = [
diff --git a/src/components/Tutorial/Builder/Builder.js b/src/components/Tutorial/Builder/Builder.js
index 58fbae3..462ad6e 100644
--- a/src/components/Tutorial/Builder/Builder.js
+++ b/src/components/Tutorial/Builder/Builder.js
@@ -12,6 +12,7 @@ import Id from './Id';
import Textfield from './Textfield';
import Step from './Step';
import Dialog from '../../Dialog';
+import Snackbar from '../../Snackbar';
import { withStyles } from '@material-ui/core/styles';
import Button from '@material-ui/core/Button';
@@ -34,14 +35,21 @@ class Builder extends Component {
open: false,
title: '',
content: '',
- string: false
+ string: false,
+ snackbar: false,
+ message: ''
};
this.inputRef = React.createRef();
}
+ componentWillUnmount(){
+ this.reset();
+ }
+
submit = () => {
var isError = this.props.checkError();
if(isError){
+ this.setState({ snackbar: true, message: `Die Angaben für das Tutorial sind nicht vollständig.`, type: 'error'});
window.scrollTo(0, 0);
}
else{
@@ -57,6 +65,7 @@ class Builder extends Component {
reset = () => {
this.props.resetTutorial();
+ this.setState({ snackbar: true, message: `Das Tutorial wurde erfolgreich zurückgesetzt.`, type: 'success'});
window.scrollTo(0, 0);
}
@@ -86,6 +95,7 @@ class Builder extends Component {
result.steps = [{}];
}
this.props.readJSON(result);
+ this.setState({ snackbar: true, message: `${isFile ? 'Die übergebene JSON-Datei' : 'Der übergebene JSON-String'} wurde erfolgreich übernommen.`, type: 'success'});
} catch(err){
console.log(err);
this.props.progress(false);
@@ -105,6 +115,10 @@ class Builder extends Component {
this.setState({ open: !this.state });
}
+ toggleSnackbar = () => {
+ this.setState({ snackbar: !this.state, message: '', type: null });
+ }
+
render() {
return (
@@ -169,6 +183,13 @@ class Builder extends Component {
: null}
+
+
);
};
diff --git a/src/components/Tutorial/Builder/Step.js b/src/components/Tutorial/Builder/Step.js
index ac5bde6..24c75ac 100644
--- a/src/components/Tutorial/Builder/Step.js
+++ b/src/components/Tutorial/Builder/Step.js
@@ -3,6 +3,8 @@ import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { addStep, removeStep, changeStepIndex } from '../../../actions/tutorialBuilderActions';
+import clsx from 'clsx';
+
import Textfield from './Textfield';
import StepType from './StepType';
import BlocklyExample from './BlocklyExample';
@@ -27,6 +29,14 @@ const styles = (theme) => ({
backgroundColor: theme.palette.primary.main,
color: theme.palette.primary.contrastText,
}
+ },
+ delete: {
+ backgroundColor: theme.palette.error.dark,
+ color: theme.palette.error.contrastText,
+ '&:hover': {
+ backgroundColor: theme.palette.error.dark,
+ color: theme.palette.error.contrastText,
+ }
}
});
@@ -74,7 +84,7 @@ class Step extends Component {
this.props.removeStep(index)}
>