M app/.eslintrc → app/.eslintrc

@@ -34,7 +34,7 @@ }
   },
   "rules": {
     "prefer-const": "error",
-    "complexity": ["warn", 16],
+    "complexity": ["warn", 20],
     "max-len": ["warn", 110],
     "arrow-parens": "off",
     "prefer-destructuring": "error",

M app/src/containers/EventAppBar/EventAppBar.js → app/src/containers/EventAppBar/EventAppBar.js

@@ -186,9 +186,11 @@ },
           ].filter(Boolean)}
         />
       </Toolbar>
-      <Container className={classes.container} maxWidth="sm">
-        <EventDetails toggleDetails={toggleDetails} />
-      </Container>
+      {detailsOpen && (
+        <Container className={classes.container} maxWidth="sm">
+          <EventDetails toggleDetails={toggleDetails} />
+        </Container>
+      )}
     </AppBar>
   );
 };
@@ -200,6 +202,7 @@ },
   appbar: ({detailsOpen}) => ({
     overflow: 'hidden',
     height: detailsOpen ? '100vh' : theme.mixins.toolbar.minHeight,
+    overflowY: detailsOpen ? 'scroll' : 'hidden',
     transition: 'height 0.3s ease',
     zIndex: theme.zIndex.appBar,
     position: 'fixed',

M app/src/pages/Event.js → app/src/pages/Event.js

@@ -45,149 +45,9 @@ </Layout>
   );
 };
 
-// const EventWithContext = props => (
-//   <EventProvider {...props}>
-//     <Event {...props} />
-//   </EventProvider>
-// );
-// export default EventWithContext;
-
-// <AppBar
-// position="static"
-// color="primary"
-// className={classes.appbar}
-// id={(isEditing && 'EditEvent') || (detailsOpen && 'Details') || 'Menu'}
-// >
-// <Toolbar>
-//   <div className={classes.name}>
-//     <Typography variant="h6" noWrap id="MenuHeaderTitle">
-//       {event.name}
-//     </Typography>
-//     {detailsOpen && !isEditing && (
-//       <IconButton
-//         color="inherit"
-//         edge="end"
-//         id="CloseDetailsBtn"
-//         onClick={() => setIsEditing(true)}
-//       >
-//         <Icon>edit</Icon>
-//       </IconButton>
-//     )}
-//     {detailsOpen && isEditing && (
-//       <IconButton
-//         color="inherit"
-//         edge="end"
-//         id="EditEventSubmit"
-//         onClick={onEventSave}
-//       >
-//         <Icon>done</Icon>
-//       </IconButton>
-//     )}
-//   </div>
-//   {!detailsOpen && (
-//     <>
-//       <IconButton
-//         color="inherit"
-//         edge="end"
-//         id="ShareBtn"
-//         onClick={onShare}
-//         className={classes.shareIcon}
-//       >
-//         <Icon>share</Icon>
-//       </IconButton>
-//       <IconButton
-//         color="inherit"
-//         edge="end"
-//         id="MenuMoreInfo"
-//         onClick={e => setAnchorEl(e.currentTarget)}
-//       >
-//         <Icon>more_vert</Icon>
-//       </IconButton>
-//     </>
-//   )}
-//   {detailsOpen && (
-//     <IconButton
-//       color="inherit"
-//       edge="end"
-//       id="CloseDetailsBtn"
-//       onClick={() => {
-//         setIsEditing(false);
-//         toggleDetails();
-//       }}
-//     >
-//       <Icon>close</Icon>
-//     </IconButton>
-//   )}
-//   <EventMenu
-//     anchorEl={anchorEl}
-//     setAnchorEl={setAnchorEl}
-//     actions={[
-//       {
-//         label: detailsOpen
-//           ? t('event.actions.hide_details')
-//           : t('event.actions.show_details'),
-//         onClick: toggleDetails,
-//         id: 'DetailsTab',
-//       },
-//       !token && {
-//         label: t('event.actions.add_to_my_events'),
-//         onClick: addToMyEvents,
-//         id: 'AddToMyEventsTab',
-//       },
-//       !!token && {
-//         label: t('menu.dashboard'),
-//         onClick: goToDashboard,
-//         id: 'GoToDashboardTab',
-//       },
-//       !token && {
-//         label: t('menu.login'),
-//         onClick: signIn,
-//         id: 'SignInTab',
-//       },
-//       !token && {
-//         label: t('menu.register'),
-//         onClick: signUp,
-//         id: 'SignUpTab',
-//       },
-//       !!token && {
-//         label: t('menu.profile'),
-//         onClick: goProfile,
-//         id: 'ProfileTab',
-//       },
-//       {
-//         label: t('menu.about'),
-//         onClick: goAbout,
-//         id: 'AboutTab',
-//       },
-//     ].filter(Boolean)}
-//   />
-// </Toolbar>
-// {detailsOpen && (
-//   <Container className={classes.container} maxWidth="sm">
-//     <EventDetails toggleDetails={toggleDetails} />
-//   </Container>
-// )}
-// </AppBar>
-
-// const useStyles = makeStyles(theme => ({
-//   container: {
-//     padding: theme.spacing(2),
-//   },
-//   appbar: ({detailsOpen}) => ({
-//     overflow: 'hidden',
-//     height: detailsOpen ? '100vh' : theme.mixins.toolbar.minHeight,
-//     overflowY: detailsOpen ? 'scroll' : 'hidden',
-//     transition: 'height 0.3s ease',
-//     zIndex: theme.zIndex.appBar,
-//     position: 'fixed',
-//     top: 0,
-//   }),
-//   name: {
-//     flexGrow: 1,
-//     display: 'flex',
-//     alignItems: 'center',
-//   },
-//   shareIcon: {
-//     marginRight: theme.spacing(0),
-//   },
-// }));
+const EventWithContext = props => (
+  <EventProvider {...props}>
+    <Event {...props} />
+  </EventProvider>
+);
+export default EventWithContext;