From ccf901d20bd0c974961fbe944c5df69f8329e12e Mon Sep 17 00:00:00 2001
From: Delucse <46593742+Delucse@users.noreply.github.com>
Date: Wed, 2 Sep 2020 11:43:17 +0200
Subject: [PATCH] error page requesting a tutorial that does not (longer) exist

---
 src/App.css                             |  2 +-
 src/actions/workspaceActions.js         |  4 +--
 src/components/Breadcrumbs.js           |  2 +-
 src/components/Home.js                  | 14 +++++++++-
 src/components/NotFound.js              | 34 +++++++++++++++++++++++--
 src/components/Tutorial/Tutorial.js     | 21 +++++++++------
 src/components/Tutorial/TutorialHome.js |  2 +-
 src/components/Tutorial/tutorials.json  | 12 ++++++++-
 src/components/WorkspaceStats.js        |  4 +--
 src/reducers/workspaceReducer.js        |  4 +--
 10 files changed, 78 insertions(+), 21 deletions(-)

diff --git a/src/App.css b/src/App.css
index adadb75..0241c45 100644
--- a/src/App.css
+++ b/src/App.css
@@ -1,5 +1,5 @@
 .wrapper {
-  min-height: 100vh; /* will cover the 100% of viewport */
+  min-height: calc(100vh - 60px); /* will cover the 100% of viewport - height of footer (padding-bottom) */
   overflow: hidden;
   display: block;
   position: relative;
diff --git a/src/actions/workspaceActions.js b/src/actions/workspaceActions.js
index e7e08ab..be36338 100644
--- a/src/actions/workspaceActions.js
+++ b/src/actions/workspaceActions.js
@@ -58,10 +58,10 @@ export const onChangeWorkspace = (event) => (dispatch, getState) => {
 
 export const clearStats = () => (dispatch) => {
   var stats = {
-    create: 0,
+    create: -1, // initialXML is created automatically, Block is not part of the statistics
     change: 0,
     delete: 0,
-    move: 0
+    move: -1 // initialXML is moved automatically, Block is not part of the statistics
   };
   dispatch({
     type: CLEAR_STATS,
diff --git a/src/components/Breadcrumbs.js b/src/components/Breadcrumbs.js
index cf41351..bc3874d 100644
--- a/src/components/Breadcrumbs.js
+++ b/src/components/Breadcrumbs.js
@@ -9,7 +9,7 @@ class MyBreadcrumbs extends Component {
   render() {
     return (
       this.props.content && this.props.content.length > 1 ?
-        <Breadcrumbs separator="›">
+        <Breadcrumbs separator="›" style={{marginBottom: '20px'}}>
           {this.props.content.splice(0, this.props.content.length-1).map((content, i) => (
             <Link to={content.link} style={{textDecoration: 'none'}} key={i}>
               <Typography color="secondary">{content.title}</Typography>
diff --git a/src/components/Home.js b/src/components/Home.js
index 3779d3b..5b6f71f 100644
--- a/src/components/Home.js
+++ b/src/components/Home.js
@@ -1,4 +1,7 @@
 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import { clearStats } from '../actions/workspaceActions';
 
 import * as Blockly from 'blockly/core';
 
@@ -53,6 +56,10 @@ class Home extends Component {
     Blockly.svgResize(workspace);
   }
 
+  componentWillUnmount(){
+    this.props.clearStats();
+  }
+
   onChange = () => {
     this.setState({ codeOn: !this.state.codeOn });
     const workspace = Blockly.getMainWorkspace();
@@ -92,4 +99,9 @@ class Home extends Component {
   };
 }
 
-export default withStyles(styles, { withTheme: true })(Home);
+Home.propTypes = {
+  clearStats: PropTypes.func.isRequired
+};
+
+
+export default connect(null, { clearStats })(withStyles(styles, { withTheme: true })(Home));
diff --git a/src/components/NotFound.js b/src/components/NotFound.js
index 132451a..44b3ddb 100644
--- a/src/components/NotFound.js
+++ b/src/components/NotFound.js
@@ -1,11 +1,41 @@
 import React, { Component } from 'react';
 
+import Breadcrumbs from './Breadcrumbs';
+
+import { withRouter } from 'react-router-dom';
+
+import Button from '@material-ui/core/Button';
+import Typography from '@material-ui/core/Typography';
+
 class NotFound extends Component {
   render() {
     return (
-      <h1>404 Not Found</h1>
+      <div>
+        <Breadcrumbs content={[{link: '/', title: 'Home'}, {link: this.props.location.pathname, title: 'Error'}]}/>
+        <Typography variant='h4' style={{marginBottom: '5px'}}>Die von Ihnen angeforderte Seite kann nicht gefunden werden.</Typography>
+        <Typography variant='body1'>Die gesuchte Seite wurde möglicherweise entfernt, ihr Name wurde geändert oder sie ist vorübergehend nicht verfügbar.</Typography>
+        {this.props.button ?
+          <Button
+            style={{marginTop: '20px'}}
+            variant="contained"
+            color="primary"
+            onClick={() => {this.props.history.push(this.props.button.link)}}
+          >
+            {this.props.button.title}
+          </Button>
+        :
+          <Button
+            style={{marginTop: '20px'}}
+            variant="contained"
+            color="primary"
+            onClick={() => {this.props.history.push('/')}}
+          >
+            Zurück zur Startseite
+          </Button>
+        }
+      </div>
     );
   };
 }
 
-export default NotFound;
+export default withRouter(NotFound);
diff --git a/src/components/Tutorial/Tutorial.js b/src/components/Tutorial/Tutorial.js
index 8b4cfa2..1f85ba8 100644
--- a/src/components/Tutorial/Tutorial.js
+++ b/src/components/Tutorial/Tutorial.js
@@ -1,10 +1,11 @@
 import React, { Component } from 'react';
 
-import { withRouter, Link } from 'react-router-dom';
+import { withRouter } from 'react-router-dom';
 
 import Breadcrumbs from '../Breadcrumbs';
 import BlocklyWindow from '../Blockly/BlocklyWindow';
 import CodeViewer from '../CodeViewer';
+import NotFound from '../NotFound';
 
 import tutorials from './tutorials.json';
 
@@ -47,29 +48,33 @@ class Tutorial extends Component {
   }
 
   render() {
+    var tutorialId = Number(this.props.match.params.tutorialId);
     return (
+      !Number.isInteger(tutorialId) || tutorialId < 1 || tutorialId > tutorials.length ?
+      <NotFound button={{title: 'Zurück zur Tutorials-Übersicht', link: '/tutorial'}}/>
+        :
       <div>
-        <Breadcrumbs content={[{link: '/', title: 'Home'},{link: '/tutorial', title: 'Tutorial'}, {link: `/tutorial/${this.props.match.params.tutorialId}`, title: this.props.match.params.tutorialId}]}/>
+        <Breadcrumbs content={[{link: '/', title: 'Home'},{link: '/tutorial', title: 'Tutorial'}, {link: `/tutorial/${tutorialId}`, title: tutorials[tutorialId-1].title}]}/>
 
         {/* Stepper */}
         <div className={this.props.classes.stepper}>
           <Button
-            disabled={parseInt(this.props.match.params.tutorialId)-1 === 0}
-            onClick={() => {this.props.history.push(`/tutorial/${parseInt(this.props.match.params.tutorialId)-1}`)}}
+            disabled={tutorialId-1 === 0}
+            onClick={() => {this.props.history.push(`/tutorial/${tutorialId-1}`)}}
           >
             {'<'}
           </Button>
-          <Stepper activeStep={this.props.match.params.tutorialId} orientation="horizontal"
+          <Stepper activeStep={tutorialId} orientation="horizontal"
                    style={{padding: 0}} classes={{root: this.props.classes.color}}>
             <Step expanded completed={false}>
               <StepLabel icon={``}>
-                <h1 style={{margin: 0}}>Tutorial {this.props.match.params.tutorialId}</h1>
+                <h1 style={{margin: 0}}>{tutorials[tutorialId-1].title}</h1>
               </StepLabel>
             </Step>
           </Stepper>
           <Button
-            disabled={parseInt(this.props.match.params.tutorialId)+1 > tutorials.length}
-            onClick={() => {this.props.history.push(`/tutorial/${parseInt(this.props.match.params.tutorialId)+1}`)}}
+            disabled={tutorialId+1 > tutorials.length}
+            onClick={() => {this.props.history.push(`/tutorial/${tutorialId+1}`)}}
           >
             {'>'}
           </Button>
diff --git a/src/components/Tutorial/TutorialHome.js b/src/components/Tutorial/TutorialHome.js
index edd125d..323f5f1 100644
--- a/src/components/Tutorial/TutorialHome.js
+++ b/src/components/Tutorial/TutorialHome.js
@@ -20,7 +20,7 @@ class TutorialHome extends Component {
           {tutorials.map((tutorial, i) => (
             <Grid item xs={12} sm={6} md={4} xl={3} key={i}>
               <Link to={`/tutorial/${i+1}`} style={{textDecoration: 'none', color: 'inherit'}}>
-                <Paper style={{height: '150px', padding: '10px'}}>Tutorial {i+1}</Paper>
+                <Paper style={{height: '150px', padding: '10px'}}>{tutorials[i].title}</Paper>
               </Link>
             </Grid>
           ))}
diff --git a/src/components/Tutorial/tutorials.json b/src/components/Tutorial/tutorials.json
index d4bd5f9..7b96432 100644
--- a/src/components/Tutorial/tutorials.json
+++ b/src/components/Tutorial/tutorials.json
@@ -1 +1,11 @@
-[{},{},{},{},{},{},{},{},{},{},{},{},{},{},{}]
+[
+  {
+    "title": "erste Schritte"
+  },
+  {
+    "title": "if-Bedingung"
+  },
+  {
+    "title": "for-Schleife"
+  }
+]
diff --git a/src/components/WorkspaceStats.js b/src/components/WorkspaceStats.js
index c3cacee..b18d4e3 100644
--- a/src/components/WorkspaceStats.js
+++ b/src/components/WorkspaceStats.js
@@ -42,7 +42,7 @@ class WorkspaceStats extends Component {
             style={{ marginRight: '1rem' }}
             color="primary"
             avatar={<Avatar><FontAwesomeIcon icon={faPlus} /></Avatar>}
-            label={this.props.create}>
+            label={this.props.create > 0 ? this.props.create : 0}> // initialXML is created automatically, Block is not part of the statistics
           </Chip>
         </Tooltip>
         <Tooltip title="Anzahl veränderter Blöcke" >
@@ -58,7 +58,7 @@ class WorkspaceStats extends Component {
             style={{ marginRight: '1rem' }}
             color="primary"
             avatar={<Avatar><FontAwesomeIcon icon={faArrowsAlt} /></Avatar>}
-            label={this.props.move}>
+            label={this.props.move > 0 ? this.props.move : 0}> // initialXML is moved automatically, Block is not part of the statistics
           </Chip>
         </Tooltip>
         <Tooltip title="Anzahl gelöschter Blöcke" >
diff --git a/src/reducers/workspaceReducer.js b/src/reducers/workspaceReducer.js
index c5bc543..dc4987f 100644
--- a/src/reducers/workspaceReducer.js
+++ b/src/reducers/workspaceReducer.js
@@ -7,10 +7,10 @@ const initialState = {
     xml: ''
   },
   stats: {
-    create: 0,
+    create: -1, // initialXML is created automatically, Block is not part of the statistics
     change: 0,
     delete: 0,
-    move: 0
+    move: -1 // initialXML is moved automatically, Block is not part of the statistics
   },
   change: 0
 };