+
+ {currentTask.headline}
+
+
-
-
- {Blockly.Msg.tutorials_assessment_task}
+
+
+
+ {Blockly.Msg.tutorials_assessment_task}
+
{currentTask.text}
-
+
+
+
);
- };
+ }
}
Assessment.propTypes = {
status: PropTypes.array.isRequired,
change: PropTypes.number.isRequired,
workspaceName: PropTypes.func.isRequired,
- tutorial: PropTypes.object.isRequired
+ tutorial: PropTypes.object.isRequired,
};
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
change: state.tutorial.change,
status: state.tutorial.status,
- tutorial: state.tutorial.tutorials[0]
+ tutorial: state.tutorial.tutorials[0],
});
-export default connect(mapStateToProps, { workspaceName })(withWidth()(Assessment));
+export default connect(mapStateToProps, { workspaceName })(
+ withWidth()(Assessment)
+);
diff --git a/src/components/Tutorial/Instruction.js b/src/components/Tutorial/Instruction.js
index ade6dfb..fc72447 100644
--- a/src/components/Tutorial/Instruction.js
+++ b/src/components/Tutorial/Instruction.js
@@ -1,57 +1,95 @@
-import React, { Component } from 'react';
+import React, { Component } from "react";
-import Hardware from './Hardware';
-import Requirement from './Requirement';
-import BlocklyWindow from '../Blockly/BlocklyWindow';
-
-import Grid from '@material-ui/core/Grid';
-import Typography from '@material-ui/core/Typography';
-import ReactMarkdown from 'react-markdown'
+import Hardware from "./Hardware";
+import Requirement from "./Requirement";
+import BlocklyWindow from "../Blockly/BlocklyWindow";
+import Grid from "@material-ui/core/Grid";
+import Typography from "@material-ui/core/Typography";
+import ReactMarkdown from "react-markdown";
class Instruction extends Component {
-
render() {
var step = this.props.step;
var isHardware = step.hardware && step.hardware.length > 0;
var areRequirements = step.requirements && step.requirements.length > 0;
return (
- {step.headline}
- {step.text}
-
-
+ {step.headline}
+
+
+
+ {step.text}
+
+
+ {isHardware ?
+
+
- : null}
+ ) : null}
);
- };
+ }
}
-
export default Instruction;
diff --git a/src/components/User/Login.js b/src/components/User/Login.js
index d667bf1..7119b22 100644
--- a/src/components/User/Login.js
+++ b/src/components/User/Login.js
@@ -1,76 +1,88 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { login } from '../../actions/authActions'
-import { clearMessages } from '../../actions/messageActions'
+import React, { Component } from "react";
+import PropTypes from "prop-types";
+import { connect } from "react-redux";
+import { login } from "../../actions/authActions";
+import { clearMessages } from "../../actions/messageActions";
-import { withRouter } from 'react-router-dom';
+import { withRouter } from "react-router-dom";
-import Snackbar from '../Snackbar';
-import Alert from '../Alert';
-import Breadcrumbs from '../Breadcrumbs';
+import Snackbar from "../Snackbar";
+import Alert from "../Alert";
+import Breadcrumbs from "../Breadcrumbs";
-import Button from '@material-ui/core/Button';
-import IconButton from '@material-ui/core/IconButton';
+import Button from "@material-ui/core/Button";
+import IconButton from "@material-ui/core/IconButton";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faEye, faEyeSlash } from "@fortawesome/free-solid-svg-icons";
-import TextField from '@material-ui/core/TextField';
-import Divider from '@material-ui/core/Divider';
-import InputAdornment from '@material-ui/core/InputAdornment';
-import CircularProgress from '@material-ui/core/CircularProgress';
-import Link from '@material-ui/core/Link';
-import * as Blockly from 'blockly'
+import TextField from "@material-ui/core/TextField";
+import Divider from "@material-ui/core/Divider";
+import InputAdornment from "@material-ui/core/InputAdornment";
+import CircularProgress from "@material-ui/core/CircularProgress";
+import Link from "@material-ui/core/Link";
+import * as Blockly from "blockly";
export class Login extends Component {
-
constructor(props) {
super(props);
this.state = {
- redirect: props.location.state ? props.location.state.from.pathname : null,
- email: '',
- password: '',
+ redirect: props.location.state
+ ? props.location.state.from.pathname
+ : null,
+ email: "",
+ password: "",
snackbar: false,
- type: '',
- key: '',
- message: '',
- showPassword: false
+ type: "",
+ key: "",
+ message: "",
+ showPassword: false,
};
}
componentDidUpdate(props) {
const { message } = this.props;
if (message !== props.message) {
- if (message.id === 'LOGIN_SUCCESS') {
+ if (message.id === "LOGIN_SUCCESS") {
if (this.state.redirect) {
this.props.history.push(this.state.redirect);
- }
- else {
+ } else {
this.props.history.goBack();
}
}
// Check for login error
- else if (message.id === 'LOGIN_FAIL') {
- this.setState({ email: '', password: '', snackbar: true, key: Date.now(), message: Blockly.Msg.messages_LOGIN_FAIL, type: 'error' });
+ else if (message.id === "LOGIN_FAIL") {
+ this.setState({
+ email: "",
+ password: "",
+ snackbar: true,
+ key: Date.now(),
+ message: Blockly.Msg.messages_LOGIN_FAIL,
+ type: "error",
+ });
}
}
}
- onChange = e => {
+ onChange = (e) => {
this.setState({ [e.target.name]: e.target.value });
};
- onSubmit = e => {
+ onSubmit = (e) => {
e.preventDefault();
const { email, password } = this.state;
- if (email !== '' && password !== '') {
+ if (email !== "" && password !== "") {
// create user object
const user = {
email,
- password
+ password,
};
this.props.login(user);
} else {
- this.setState({ snackbar: true, key: Date.now(), message: Blockly.Msg.messages_login_error, type: 'error' });
+ this.setState({
+ snackbar: true,
+ key: Date.now(),
+ message: Blockly.Msg.messages_login_error,
+ type: "error",
+ });
}
};
@@ -85,12 +97,25 @@ export class Login extends Component {
render() {
return (
- 
-
- : step.media.youtube ?
- /*16:9; width: 800px; height: width/16*9=450px*/
-
-
-
- : null
- : null}
- {step.xml ?
-
-
-
-
+
+
+ ) : step.media.youtube ? (
+ /*16:9; width: 800px; height: width/16*9=450px*/
+
+
+
+ ) : null
+ ) : null}
+ {step.xml ? (
+
+
+
+
-
+
- {Blockly.Msg.login_osem_account_01} openSenseMap {Blockly.Msg.login_osem_account_02}.
+ {Blockly.Msg.login_osem_account_01}{" "}
+
+ openSenseMap
+ {" "}
+ {Blockly.Msg.login_osem_account_02}.
+ endAdornment: (
+
-
+ ),
}}
onChange={this.onChange}
fullWidth={true}
/>
@@ -155,12 +212,14 @@ Login.propTypes = {
message: PropTypes.object.isRequired,
login: PropTypes.func.isRequired,
clearMessages: PropTypes.func.isRequired,
- progress: PropTypes.bool.isRequired
+ progress: PropTypes.bool.isRequired,
};
-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
message: state.message,
- progress: state.auth.progress
+ progress: state.auth.progress,
});
-export default connect(mapStateToProps, { login, clearMessages })(withRouter(Login));
+export default connect(mapStateToProps, { login, clearMessages })(
+ withRouter(Login)
+);
{Blockly.Msg.login_head}
-
-- {Blockly.Msg.login_lostpassword} +
+ + {Blockly.Msg.login_lostpassword} +
-
- {Blockly.Msg.login_createaccount}openSenseMap.
+
+ {Blockly.Msg.login_createaccount} + + openSenseMap + + .