fix stupid mistakes

src/components/Classroom/ProjectList.js

@@ -58,38 +58,38 @@ const ProjectList = ({ projects }) => {
                 justifyContent: 'space-between',
               }}
             >
-                <div style={{ position: 'relative' }}>
-                  <BlocklyWindow
-                    svg
-                    blockDisabled
-                    initialXml={project.xml}
-                  />
-                  <IconButton
-                    style={{
-                      position: 'absolute',
-                      top: '10px',
-                      right: '10px',
-                      backgroundColor: '#fff',
-                      padding: '8px',
-                      borderRadius: '50%',
-                    }}
-                    onClick={(e) => handleMenuClick(e, project)}
-                  >
-                    <FontAwesomeIcon icon={faGear} />
-                  </IconButton>
-                </div>
-                <h3 style={{ marginTop: 0 }}>{project.title}</h3>
-                <Divider style={{ marginTop: "1rem", marginBottom: "10px" }} />
-                <Typography
-                  variant="body2"
+              <div style={{ position: 'relative' }}>
+                <BlocklyWindow
+                  svg
+                  blockDisabled
+                  initialXml={project.xml}
+                />
+                <IconButton
                   style={{
-                    fontStyle: "italic",
-                    margin: 0,
-                    marginTop: "-10px",
+                    position: 'absolute',
+                    top: '10px',
+                    right: '10px',
+                    backgroundColor: '#fff',
+                    padding: '8px',
+                    borderRadius: '50%',
                   }}
+                  onClick={(e) => handleMenuClick(e, project)}
                 >
-                  {project.description}
-                </Typography>
+                  <FontAwesomeIcon icon={faGear} />
+                </IconButton>
+              </div>
+              <h3 style={{ marginTop: 0 }}>{project.title}</h3>
+              <Divider style={{ marginTop: "1rem", marginBottom: "10px" }} />
+              <Typography
+                variant="body2"
+                style={{
+                  fontStyle: "italic",
+                  margin: 0,
+                  marginTop: "-10px",
+                }}
+              >
+                {project.description}
+              </Typography>
 
               <div style={{ marginTop: '1rem' }}>
                 <Button
@@ -118,7 +118,6 @@ const ProjectList = ({ projects }) => {
         ))}
       </Grid>
 
-      {/* Menu for project options */}
       <Menu
         anchorEl={anchorEl}
         open={Boolean(anchorEl)}

src/components/Project/ProjectHome.js

@@ -49,14 +49,8 @@ class ProjectHome extends Component {
     this.handleMessages(this.props.message, type);
   }
 
-<<<<<<< Updated upstream
-  componentDidUpdate(props) {
-    console.log(this.props.message);
-    if (props.location.pathname !== this.props.location.pathname) {
-=======
   componentDidUpdate(prevProps) {
     if (prevProps.location.pathname !== this.props.location.pathname) {
->>>>>>> Stashed changes
       this.setState({ snackbar: false });
       this.props.getProjects(this.props.location.pathname.replace("/", ""));
     }

src/components/User/Account.js

@@ -24,19 +24,33 @@ export class Account extends Component {
 
   render() {
     const { user } = this.props;
+    const { classroomUser } = this.props;
+    var userAccount = null;
+    if (!user) {
+      userAccount = { classroomUser};
+    }
+    else {
+      userAccount = user;
+    }
+    console.log(userAccount);
     return (
       <div>
         <Breadcrumbs content={[{ link: '/user', title: 'Account' }]} />
 
         <h1>Account</h1>
+        {user ? (
         <Alert>
           Alle Angaben stammen von <Link
           color='primary'
           rel="noreferrer"
           target="_blank"
           href={'https://opensensemap.org/'}
           underline="hover">openSenseMap</Link> und können dort verwaltet werden.
-        </Alert>
+        </Alert>) : null}
+        {classroomUser ? (
+          <Alert>
+            Classroom User
+            </Alert>) : null}
         <Paper style={{ width: 'max-content', maxWidth: '100%' }}>
           <List>
             <ListItem>
@@ -45,9 +59,10 @@ export class Account extends Component {
                   <FontAwesomeIcon icon={faUser}  />
                 </ListItemIcon>
               </Tooltip>
-              <ListItemText primary={`Name: ${user.name}`} />
+              {user? <ListItemText primary={`Name: ${user.name}`} /> : classroomUser ? <ListItemText primary={`Name: ${classroomUser.name}`} /> : null}
+
             </ListItem>
-            <ListItem>
+            {/* <ListItem>
               <Tooltip title='Email'>
                 <ListItemIcon>
                   <FontAwesomeIcon icon={faAt}  />
@@ -60,12 +75,12 @@ export class Account extends Component {
                 <FontAwesomeIcon icon={faUserTag}  />
               </ListItemIcon>
               <ListItemText primary={`Userrolle: ${user.blocklyRole}`} />
-            </ListItem>
+            </ListItem> */}
           </List>
         </Paper>
         <Divider style={{ marginBottom: '16px', marginTop: '16px' }} />
-        <div style={{ marginBottom: '8px' }}>
-          {this.props.user.boxes.length < 1 ?
+        {/* <div style={{ marginBottom: '8px' }}>
+          {userAccount.boxes.length < 1 ?
             <Typography>
               Du hast noch keine senseBox registriert. Besuche <Link
               color='primary'
@@ -77,8 +92,8 @@ export class Account extends Component {
             : <Typography style={{ fontWeight: 'bold', fontSize: '1.1rem' }}>
               Du hast {this.props.user.boxes.length} {this.props.user.boxes.length === 1 ? 'senseBox' : 'senseBoxen'} registriert:
           </Typography>}
-        </div>
-        <Grid container spacing={2}>
+        </div> */}
+        {/* <Grid container spacing={2}>
           {this.props.user.boxes.map((box, i) => {
             var sensors = box.sensors.map(sensor => sensor.title);
             return (
@@ -134,11 +149,11 @@ export class Account extends Component {
               </Grid>
             );
           })}
+        </Grid>
             <Typography style={{ fontWeight: 'bold', fontSize: '1.1rem' }}>
               Du hast {this.props.user.boxes.length} {this.props.user.boxes.length === 1 ? 'senseBox' : 'senseBoxen'} registriert:
           </Typography>
-        </Grid>
-
+        </Grid> */}
       </div>
     );
   }
@@ -151,6 +166,7 @@ Account.propTypes = {
 
 const mapStateToProps = state => ({
   user: state.auth.user,
+  classroomUser: state.classroomAuth.classroomUser,
 });
 
 export default connect(mapStateToProps, null)(Account);