diff --git a/src/App.css b/src/App.css index e9d7fc2..afc53a1 100644 --- a/src/App.css +++ b/src/App.css @@ -53,7 +53,7 @@ td { padding-top: 12px; padding-bottom: 12px; text-align: left; - background-color: #4eaf47; + border-color: #4eaf47; color: white; } diff --git a/src/App.js b/src/App.js index 06bca0b..fd19339 100644 --- a/src/App.js +++ b/src/App.js @@ -9,11 +9,11 @@ import { loadUser } from "./actions/authActions"; import "./App.css"; -import { ThemeProvider, StyledEngineProvider, createTheme, adaptV4Theme } from "@mui/material/styles"; +import { ThemeProvider, StyledEngineProvider, createTheme } from "@mui/material/styles"; import Content from "./components/Content"; -const theme = createTheme(adaptV4Theme({ +const theme = createTheme({ palette: { primary: { main: "#4EAF47", @@ -26,7 +26,7 @@ const theme = createTheme(adaptV4Theme({ compile: "#e27136", }, }, -})); +}); class App extends Component { componentDidMount() { diff --git a/src/components/Breadcrumbs.js b/src/components/Breadcrumbs.js index 6246e13..b8cad33 100644 --- a/src/components/Breadcrumbs.js +++ b/src/components/Breadcrumbs.js @@ -30,7 +30,7 @@ class Breadcrumbs extends Component { this.props.content && this.props.content.length > 0 ? - + {this.props.content.splice(0, this.props.content.length-1).map((content, i) => ( diff --git a/src/components/CodeEditor/Compile.js b/src/components/CodeEditor/Compile.js index 898f311..dba8ea9 100644 --- a/src/components/CodeEditor/Compile.js +++ b/src/components/CodeEditor/Compile.js @@ -189,7 +189,7 @@ class Compile extends Component { className={`compileBlocks ${this.props.classes.iconButton}`} onClick={() => this.compile()} size="large"> - + ) : ( @@ -201,6 +201,7 @@ class Compile extends Component { > {" "} Kompilieren @@ -301,6 +302,7 @@ class Compile extends Component { > {" "} Starte Übertragung diff --git a/src/components/CodeEditor/SaveIcon.js b/src/components/CodeEditor/SaveIcon.js index 3c4ec71..9400fc7 100644 --- a/src/components/CodeEditor/SaveIcon.js +++ b/src/components/CodeEditor/SaveIcon.js @@ -17,6 +17,7 @@ const SaveIcon = ({ loading }) => ( ( transform: "translate(-50%,-50%)", }} icon={faSave} + color={loading ? "grey" : "green"} size={loading ? "1x" : "lg"} /> diff --git a/src/components/Home.js b/src/components/Home.js index 7f8e1d9..0b008b2 100644 --- a/src/components/Home.js +++ b/src/components/Home.js @@ -161,7 +161,7 @@ class Home extends Component { }} onClick={() => this.onChange()} size="large"> - + diff --git a/src/components/Navbar.js b/src/components/Navbar.js index 5e0bef6..9b03d76 100644 --- a/src/components/Navbar.js +++ b/src/components/Navbar.js @@ -214,11 +214,11 @@ class Navbar extends Component { {[ - { - text: Blockly.Msg.navbar_blockly, - icon: faPuzzlePiece, - link: "/", - }, + { + text: Blockly.Msg.navbar_blockly, + icon: faPuzzlePiece, + link: "/", + }, { text: Blockly.Msg.navbar_tutorials, icon: faChalkboardTeacher, @@ -329,9 +329,9 @@ class Navbar extends Component { onClick={ item.function ? () => { - item.function(); - this.toggleDrawer(); - } + item.function(); + this.toggleDrawer(); + } : this.toggleDrawer } > diff --git a/src/components/Snackbar.js b/src/components/Snackbar.js index f70d20d..554f335 100644 --- a/src/components/Snackbar.js +++ b/src/components/Snackbar.js @@ -70,7 +70,7 @@ class Snackbar extends Component { className={this.props.type === 'error' ? this.props.classes.error : this.props.classes.success} action={ - + } message={this.props.message} diff --git a/src/components/Tutorial/Assessment.js b/src/components/Tutorial/Assessment.js index 52eb49a..a3131ac 100644 --- a/src/components/Tutorial/Assessment.js +++ b/src/components/Tutorial/Assessment.js @@ -116,7 +116,7 @@ class Assessment extends Component { }} onClick={() => this.onChange()} size="large"> - + this.onChange(e.target.checked)} - color="primary" /> } /> diff --git a/src/components/Tutorial/Builder/Builder.js b/src/components/Tutorial/Builder/Builder.js index a9aa80b..d1c6052 100644 --- a/src/components/Tutorial/Builder/Builder.js +++ b/src/components/Tutorial/Builder/Builder.js @@ -407,7 +407,7 @@ class Builder extends Component { } + control={} label={Blockly.Msg.builder_createNew} labelPlacement="end" /> @@ -417,7 +417,7 @@ class Builder extends Component { style={{ color: "black" }} disabled={this.props.index === 0} value="change" - control={} + control={} label={Blockly.Msg.builder_changeExisting} labelPlacement="end" /> @@ -425,7 +425,7 @@ class Builder extends Component { style={{ color: "black" }} disabled={this.props.index === 0} value="delete" - control={} + control={} label={Blockly.Msg.builder_deleteExisting} labelPlacement="end" /> diff --git a/src/components/Tutorial/Builder/Media.js b/src/components/Tutorial/Builder/Media.js index 2e4d450..3f949e7 100644 --- a/src/components/Tutorial/Builder/Media.js +++ b/src/components/Tutorial/Builder/Media.js @@ -97,7 +97,6 @@ class Media extends Component { this.onChangeSwitch(e.target.checked)} - color="primary" /> } /> @@ -106,13 +105,13 @@ class Media extends Component { {this.onChangeRadio(e.target.value);}}> } + control={} label="Bild" labelPlacement="end" /> } + control={} label="Youtube-Video" labelPlacement="end" /> diff --git a/src/components/Tutorial/Builder/Public.js b/src/components/Tutorial/Builder/Public.js index 0e7a2d8..d7f9a9e 100644 --- a/src/components/Tutorial/Builder/Public.js +++ b/src/components/Tutorial/Builder/Public.js @@ -63,7 +63,6 @@ class Public extends Component { diff --git a/src/components/Tutorial/Builder/Requirements.js b/src/components/Tutorial/Builder/Requirements.js index 265987f..cee1bd3 100644 --- a/src/components/Tutorial/Builder/Requirements.js +++ b/src/components/Tutorial/Builder/Requirements.js @@ -41,7 +41,6 @@ class Requirements extends Component { checked={this.props.value.filter(id => id === tutorial._id).length > 0} onChange={(e) => this.onChange(e)} name="requirements" - color="primary" /> } label={tutorial.title} diff --git a/src/components/Tutorial/Builder/Review.js b/src/components/Tutorial/Builder/Review.js index e24480e..b1f866d 100644 --- a/src/components/Tutorial/Builder/Review.js +++ b/src/components/Tutorial/Builder/Review.js @@ -64,7 +64,6 @@ class Review extends Component { diff --git a/src/components/Tutorial/Builder/Step.js b/src/components/Tutorial/Builder/Step.js index b68bb39..764f57e 100644 --- a/src/components/Tutorial/Builder/Step.js +++ b/src/components/Tutorial/Builder/Step.js @@ -86,7 +86,7 @@ class Step extends Component { style={index === 0 ? {} : { marginBottom: "5px" }} onClick={() => this.props.addStep(index + 1)} size="large"> - + {index !== 0 ? ( @@ -101,7 +101,7 @@ class Step extends Component { style={{ marginBottom: "5px" }} onClick={() => this.props.changeStepIndex(index, index - 1)} size="large"> - + this.props.changeStepIndex(index, index + 1)} size="large"> - + @@ -126,7 +126,7 @@ class Step extends Component { )} onClick={() => this.props.removeStep(index)} size="large"> - + diff --git a/src/components/Tutorial/Builder/StepType.js b/src/components/Tutorial/Builder/StepType.js index a5a5397..69d5e99 100644 --- a/src/components/Tutorial/Builder/StepType.js +++ b/src/components/Tutorial/Builder/StepType.js @@ -23,14 +23,14 @@ class StepType extends Component { this.onChange(e.target.value)}> } + control={} label="Anleitung" labelPlacement="end" /> } + control={} label="Aufgabe" labelPlacement="end" /> diff --git a/src/components/Tutorial/Hardware.js b/src/components/Tutorial/Hardware.js index 27fc86b..41bd285 100644 --- a/src/components/Tutorial/Hardware.js +++ b/src/components/Tutorial/Hardware.js @@ -98,7 +98,7 @@ class Hardware extends Component { aria-label="Vollbild" onClick={() => this.handleClickOpen(hardwareInfo)} size="large"> - + } /> diff --git a/src/components/Tutorial/HintTutorialExists.js b/src/components/Tutorial/HintTutorialExists.js index 3c34752..302a94c 100644 --- a/src/components/Tutorial/HintTutorialExists.js +++ b/src/components/Tutorial/HintTutorialExists.js @@ -78,7 +78,6 @@ class HintTutorialExists extends Component { checked={this.state.checked} onChange={(e) => this.onChange(e)} name="dialog" - color="primary" /> } label={Blockly.Msg.labels_donotshowagain} diff --git a/src/components/Tutorial/Requirement.js b/src/components/Tutorial/Requirement.js index 70d8b74..df5988c 100644 --- a/src/components/Tutorial/Requirement.js +++ b/src/components/Tutorial/Requirement.js @@ -166,6 +166,7 @@ class Requirement extends Component { icon={ tutorialStatus === "Success" ? faCheck : faTimes } + /> ) : ( this.check()} size="large"> - + diff --git a/src/components/Tutorial/StepperHorizontal.js b/src/components/Tutorial/StepperHorizontal.js index ce3e793..9e5d509 100644 --- a/src/components/Tutorial/StepperHorizontal.js +++ b/src/components/Tutorial/StepperHorizontal.js @@ -127,6 +127,7 @@ class StepperHorizontal extends Component { ) : null} diff --git a/src/components/Tutorial/TutorialHome.js b/src/components/Tutorial/TutorialHome.js index c6c6d67..815f8ba 100644 --- a/src/components/Tutorial/TutorialHome.js +++ b/src/components/Tutorial/TutorialHome.js @@ -287,6 +287,7 @@ class TutorialHome extends Component { icon={ tutorialStatus === "Success" ? faCheck : faTimes } + /> ) : ( - + - + {tutorial.review ? ( diff --git a/src/components/User/Account.js b/src/components/User/Account.js index e30193c..bcae7c0 100644 --- a/src/components/User/Account.js +++ b/src/components/User/Account.js @@ -42,7 +42,7 @@ export class Account extends Component { - + @@ -50,14 +50,14 @@ export class Account extends Component { - + - + @@ -98,7 +98,7 @@ export class Account extends Component { - +
@@ -109,7 +109,7 @@ export class Account extends Component { - +
@@ -120,7 +120,7 @@ export class Account extends Component { - +
diff --git a/src/components/User/Login.js b/src/components/User/Login.js index bd6cb3d..4d2933e 100644 --- a/src/components/User/Login.js +++ b/src/components/User/Login.js @@ -165,6 +165,7 @@ export class Login extends Component { diff --git a/src/components/Workspace/Compile.js b/src/components/Workspace/Compile.js index 898f311..bad5025 100644 --- a/src/components/Workspace/Compile.js +++ b/src/components/Workspace/Compile.js @@ -189,7 +189,7 @@ class Compile extends Component { className={`compileBlocks ${this.props.classes.iconButton}`} onClick={() => this.compile()} size="large"> - + ) : ( @@ -202,6 +202,7 @@ class Compile extends Component { {" "} Kompilieren @@ -302,6 +303,7 @@ class Compile extends Component { {" "} Starte Übertragung diff --git a/src/components/Workspace/DeleteProject.js b/src/components/Workspace/DeleteProject.js index 1cf70b4..3cd9712 100644 --- a/src/components/Workspace/DeleteProject.js +++ b/src/components/Workspace/DeleteProject.js @@ -62,7 +62,7 @@ class DeleteProject extends Component { className={this.props.classes.buttonTrash} onClick={() => this.props.deleteProject(this.props.projectType, this.props.project._id)} size="large"> - + diff --git a/src/components/Workspace/DownloadProject.js b/src/components/Workspace/DownloadProject.js index 41b86e7..8eb117e 100644 --- a/src/components/Workspace/DownloadProject.js +++ b/src/components/Workspace/DownloadProject.js @@ -47,7 +47,7 @@ class DownloadProject extends Component { className={`saveBlocks ${this.props.classes.button}`} onClick={() => this.downloadXmlFile()} size="large"> - +
diff --git a/src/components/Workspace/ResetWorkspace.js b/src/components/Workspace/ResetWorkspace.js index 29519d1..894ca73 100644 --- a/src/components/Workspace/ResetWorkspace.js +++ b/src/components/Workspace/ResetWorkspace.js @@ -49,11 +49,11 @@ class ResetWorkspace extends Component { } toggleDialog = () => { - this.setState({ open: !this.state}); + this.setState({ open: !this.state }); } openDialog = () => { - this.setState({open: true}); + this.setState({ open: true }); } resetWorkspace = () => { @@ -82,7 +82,7 @@ class ResetWorkspace extends Component { className={this.props.classes.button} onClick={() => this.openDialog()} size="large"> - + @@ -92,7 +92,7 @@ class ResetWorkspace extends Component { type={this.state.type} key={this.state.key} /> - { this.toggleDialog(); }} button={Blockly.Msg.button_cancel} >
- - -
+ + +
); }; diff --git a/src/components/Workspace/WorkspaceName.js b/src/components/Workspace/WorkspaceName.js index ec327af..41f2bed 100644 --- a/src/components/Workspace/WorkspaceName.js +++ b/src/components/Workspace/WorkspaceName.js @@ -152,6 +152,7 @@ class WorkspaceName extends Component {