From 863648c89b5916ac932dd38e03444f1363d3c7b4 Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 09:06:32 -0700
Subject: [PATCH 01/27] feat: add additional theme properties for detail drawer

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 .../plugins/core/router/client/theme/muiTheme.js    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/imports/plugins/core/router/client/theme/muiTheme.js b/imports/plugins/core/router/client/theme/muiTheme.js
index a1b380e1f5f..8a6b5e0756a 100644
--- a/imports/plugins/core/router/client/theme/muiTheme.js
+++ b/imports/plugins/core/router/client/theme/muiTheme.js
@@ -11,6 +11,7 @@ const toolbarMobileHeight = 54;
 // Spacing
 export const defaultSpacingUnit = 8;
 export const drawerWidth = 280;
+export const detailDrawerWidth = 400;
 
 // Colors
 export const colorPrimaryMain = colors.coolGrey;
@@ -93,12 +94,16 @@ export const rawMuiTheme = {
   },
   spacing: {
     drawerWidth,
+    detailDrawerWidth,
     unit: defaultSpacingUnit
   },
   mixins: {
     leadingPaddingWhenPrimaryDrawerIsOpen: {
       paddingLeft: drawerWidth + (defaultSpacingUnit * 2)
     },
+    trailingPaddingWhenDetailDrawerIsOpen: {
+      paddingRight: detailDrawerWidth + (defaultSpacingUnit * 2)
+    },
     toolbar: {
       minHeight: toolbarHeight,
       [`${breakpoints.up("xs")} and (orientation: landscape)`]: {
@@ -204,6 +209,14 @@ export const rawMuiTheme = {
       },
       paperAnchorDockedLeft: {
         borderRight: "none"
+      },
+      paperAnchorRight: {
+        borderLeft: "none",
+        backgroundColor: colors.black02,
+        width: detailDrawerWidth
+      },
+      paperAnchorDockedRight: {
+        borderRight: "none"
       }
     },
     MuiFab: {

From 04346ba3ecc40267eaefe3250325bb4fe0bbb6f9 Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 09:14:24 -0700
Subject: [PATCH 02/27] feat: add detail drawer to UI context

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 imports/client/ui/context/UIContext.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/imports/client/ui/context/UIContext.js b/imports/client/ui/context/UIContext.js
index fef2ece383b..9cdc43b7c7b 100644
--- a/imports/client/ui/context/UIContext.js
+++ b/imports/client/ui/context/UIContext.js
@@ -1,8 +1,11 @@
 import { createContext } from "react";
 
 export const UIContext = createContext({
+  isDetailDrawerOpen: false,
   isMobile: false,
   isPrimarySidebarOpen: true,
+  onCloseDetailDrawer: () => { },
   onClosePrimarySidebar: () => { },
+  onToggleDetailDrawer: () => { },
   onTogglePrimarySidebar: () => { }
 });

From ab05a6402966e20adb0c23bbf554a6aca54cdaec Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 09:22:49 -0700
Subject: [PATCH 03/27] feat: update to support drawers open/closed from both
 the leading and trailing edges of the viewport

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 imports/client/ui/layouts/ContentViewFullLayout.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/imports/client/ui/layouts/ContentViewFullLayout.js b/imports/client/ui/layouts/ContentViewFullLayout.js
index 4e1fe60b729..f9b046e952c 100644
--- a/imports/client/ui/layouts/ContentViewFullLayout.js
+++ b/imports/client/ui/layouts/ContentViewFullLayout.js
@@ -17,16 +17,20 @@ const styles = (theme) => ({
     transition: "padding 225ms cubic-bezier(0, 0, 0.2, 1) 0ms",
     overflow: "hidden"
   },
-  leftSidebarOpen: {
+  leadingDrawerOpen: {
     paddingLeft: theme.spacing.drawerWidth
+  },
+  trailingDrawerOpen: {
+    paddingRight: theme.spacing.detailDrawerWidth
   }
 });
 
-const ContentViewFullLayout = ({ children, classes, isSidebarOpen }) => (
+const ContentViewFullLayout = ({ children, classes, isLeadingDrawerOpen, isTrailingDrawerOpen }) => (
   <div
     className={
       classNames(classes.root, {
-        [classes.leftSidebarOpen]: isSidebarOpen
+        [classes.leadingDrawerOpen]: isLeadingDrawerOpen,
+        [classes.trailingDrawerOpen]: isTrailingDrawerOpen
       })
     }
   >
@@ -37,8 +41,9 @@ const ContentViewFullLayout = ({ children, classes, isSidebarOpen }) => (
 ContentViewFullLayout.propTypes = {
   children: PropTypes.node,
   classes: PropTypes.object,
+  isLeadingDrawerOpen: PropTypes.bool,
   isMobile: PropTypes.bool,
-  isSidebarOpen: PropTypes.bool
+  isTrailingDrawerOpen: PropTypes.bool
 };
 
 export default withStyles(styles, { name: "RuiContentViewFullLayout" })(ContentViewFullLayout);

From efa5969f2dfa2257541d3ebf2b484affcc67bda6 Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 09:22:59 -0700
Subject: [PATCH 04/27] feat: update to support drawers open/closed from both
 the leading and trailing edges of the viewport

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 .../client/ui/layouts/ContentViewExtraWideLayout.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/imports/client/ui/layouts/ContentViewExtraWideLayout.js b/imports/client/ui/layouts/ContentViewExtraWideLayout.js
index 26d536e5c72..69d55d0de5f 100644
--- a/imports/client/ui/layouts/ContentViewExtraWideLayout.js
+++ b/imports/client/ui/layouts/ContentViewExtraWideLayout.js
@@ -18,16 +18,20 @@ const styles = (theme) => ({
     flexGrow: 1,
     transition: "padding 225ms cubic-bezier(0, 0, 0.2, 1) 0ms"
   },
-  leftSidebarOpen: {
+  leadingDrawerOpen: {
+    ...theme.mixins.leadingPaddingWhenPrimaryDrawerIsOpen
+  },
+  trailingDrawerOpen: {
     ...theme.mixins.leadingPaddingWhenPrimaryDrawerIsOpen
   }
 });
 
-const ContentViewExtraWideLayout = ({ children, classes, isSidebarOpen }) => (
+const ContentViewExtraWideLayout = ({ children, classes, isLeadingDrawerOpen, isTrailingDrawerOpen }) => (
   <div
     className={
       classNames(classes.root, {
-        [classes.leftSidebarOpen]: isSidebarOpen
+        [classes.leadingDrawerOpen]: isLeadingDrawerOpen,
+        [classes.trailingDrawerOpen]: isTrailingDrawerOpen
       })
     }
   >
@@ -38,8 +42,9 @@ const ContentViewExtraWideLayout = ({ children, classes, isSidebarOpen }) => (
 ContentViewExtraWideLayout.propTypes = {
   children: PropTypes.node,
   classes: PropTypes.object,
+  isLeadingDrawerOpen: PropTypes.bool,
   isMobile: PropTypes.bool,
-  isSidebarOpen: PropTypes.bool
+  isTrailingDrawerOpen: PropTypes.bool
 };
 
 export default withStyles(styles, { name: "RuiContentViewExtraWideLayout" })(ContentViewExtraWideLayout);

From 9c7ddeb874848c58bce873e70d46ba23f35a9603 Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 09:23:07 -0700
Subject: [PATCH 05/27] feat: update to support drawers open/closed from both
 the leading and trailing edges of the viewport

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 .../client/ui/layouts/ContentViewStandardLayout.js  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/imports/client/ui/layouts/ContentViewStandardLayout.js b/imports/client/ui/layouts/ContentViewStandardLayout.js
index 5865c6bf140..8341214805b 100644
--- a/imports/client/ui/layouts/ContentViewStandardLayout.js
+++ b/imports/client/ui/layouts/ContentViewStandardLayout.js
@@ -17,16 +17,20 @@ const styles = (theme) => ({
     paddingBottom: theme.spacing.unit * 2,
     margin: "0 auto"
   },
-  leftSidebarOpen: {
+  leadingDrawerOpen: {
     paddingLeft: theme.spacing.drawerWidth
+  },
+  trailingDrawerOpen: {
+    paddingRight: theme.spacing.detailDrawerWidth
   }
 });
 
-const ContentViewStandardLayout = ({ children, classes, isSidebarOpen }) => (
+const ContentViewStandardLayout = ({ children, classes, isLeadingDrawerOpen, isTrailingDrawerOpen }) => (
   <div
     className={
       classNames(classes.root, {
-        [classes.leftSidebarOpen]: isSidebarOpen
+        [classes.leadingDrawerOpen]: isLeadingDrawerOpen,
+        [classes.trailingDrawerOpen]: isTrailingDrawerOpen
       })
     }
   >
@@ -39,8 +43,9 @@ const ContentViewStandardLayout = ({ children, classes, isSidebarOpen }) => (
 ContentViewStandardLayout.propTypes = {
   children: PropTypes.node,
   classes: PropTypes.object,
+  isLeadingDrawerOpen: PropTypes.bool,
   isMobile: PropTypes.bool,
-  isSidebarOpen: PropTypes.bool
+  isTrailingDrawerOpen: PropTypes.bool
 };
 
 export default withStyles(styles, { name: "RuiContentViewStandardLayout" })(ContentViewStandardLayout);

From 797d5d7169901a1f2b13adc8a5df8acccb2a04aa Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 09:24:26 -0700
Subject: [PATCH 06/27] feat: add state management to UIContext for the
 DetailDrawer

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 imports/client/ui/layouts/Dashboard.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/imports/client/ui/layouts/Dashboard.js b/imports/client/ui/layouts/Dashboard.js
index f607229f6b7..4f7985c4eb8 100644
--- a/imports/client/ui/layouts/Dashboard.js
+++ b/imports/client/ui/layouts/Dashboard.js
@@ -44,10 +44,13 @@ class Dashboard extends Component {
     // State also contains the updater function so it will
     // be passed down into the context provider
     this.state = {
+      isDetailDrawerOpen: false,
       isMobile: false,
       isPrimarySidebarOpen: true,
       onClosePrimarySidebar: this.onClosePrimarySidebar,
-      onTogglePrimarySidebar: this.onTogglePrimarySidebar
+      onTogglePrimarySidebar: this.onTogglePrimarySidebar,
+      onCloseDetailDrawer: this.onCloseDetailDrawer,
+      onToggleDetailDrawer: this.onToggleDetailDrawer
     };
   }
 
@@ -76,12 +79,23 @@ class Dashboard extends Component {
     }));
   };
 
+  onToggleDetailDrawer = () => {
+    this.setState((state) => ({
+      isDetailDrawerOpen: !state.isDetailDrawerOpen
+    }));
+  };
+
+  onCloseDetailDrawer = () => {
+    this.setState({ isDetailDrawerOpen: false });
+  };
+
   onClosePrimarySidebar = () => {
     this.setState({ isPrimarySidebarOpen: false });
   };
 
   render() {
     const { classes, width } = this.props;
+    const { isDetailDrawerOpen, isPrimarySidebarOpen } = this.state;
     const isMobile = isWidthDown("sm", width);
 
     return (

From aeec4fa86cae3e110c516d0748ac15a1f11b7370 Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 09:26:59 -0700
Subject: [PATCH 07/27] feat: force the primary sidebar to be closed while the
 detail drawer is open at mobile viewport sizes

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 imports/client/ui/layouts/Dashboard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/imports/client/ui/layouts/Dashboard.js b/imports/client/ui/layouts/Dashboard.js
index 4f7985c4eb8..e67bc84835d 100644
--- a/imports/client/ui/layouts/Dashboard.js
+++ b/imports/client/ui/layouts/Dashboard.js
@@ -106,7 +106,7 @@ class Dashboard extends Component {
           </PrimaryAppBar>
           <Sidebar
             isMobile={isMobile}
-            isSidebarOpen={this.state.isPrimarySidebarOpen}
+            isSidebarOpen={isPrimarySidebarOpen && !isDetailDrawerOpen}
             setIsSidebarOpen={(value) => {
               this.setState({ isPrimarySidebarOpen: value });
             }}

From 45a9fd868b5c14a0659925c8a991104270a7cb2f Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 09:27:40 -0700
Subject: [PATCH 08/27] feat: pass props for leading and trailing drawer open
 states

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 imports/client/ui/layouts/Dashboard.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/imports/client/ui/layouts/Dashboard.js b/imports/client/ui/layouts/Dashboard.js
index e67bc84835d..8cd00ed88f8 100644
--- a/imports/client/ui/layouts/Dashboard.js
+++ b/imports/client/ui/layouts/Dashboard.js
@@ -124,7 +124,10 @@ class Dashboard extends Component {
                     // If the layout component is explicitly null
                     if (route.layoutComponent === null) {
                       return (
-                        <ContentViewFullLayout isSidebarOpen={!isMobile}>
+                        <ContentViewFullLayout
+                          isLeadingDrawerOpen={!isMobile}
+                          isTrailingDrawerOpen={isDetailDrawerOpen && !isMobile}
+                        >
                           <route.mainComponent uiState={this.state} {...props} />
                         </ContentViewFullLayout>
                       );
@@ -133,7 +136,10 @@ class Dashboard extends Component {
                     const LayoutComponent = route.layoutComponent || ContentViewStandardLayout;
 
                     return (
-                      <LayoutComponent isSidebarOpen={!isMobile}>
+                      <LayoutComponent
+                        isLeadingDrawerOpen={!isMobile}
+                        isTrailingDrawerOpen={isDetailDrawerOpen && !isMobile}
+                      >
                         <route.mainComponent uiState={this.state} {...props} />
                       </LayoutComponent>
                     );

From 146df21307682a4819d2dde072c78007a8a1eeea Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 11:13:18 -0700
Subject: [PATCH 09/27] feat: add DetailDrawerComponent

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 .../components/DetailDrawer/DetailDrawer.js   | 84 +++++++++++++++++++
 .../ui/components/DetailDrawer/index.js       |  1 +
 2 files changed, 85 insertions(+)
 create mode 100644 imports/client/ui/components/DetailDrawer/DetailDrawer.js
 create mode 100644 imports/client/ui/components/DetailDrawer/index.js

diff --git a/imports/client/ui/components/DetailDrawer/DetailDrawer.js b/imports/client/ui/components/DetailDrawer/DetailDrawer.js
new file mode 100644
index 00000000000..f37ee050e96
--- /dev/null
+++ b/imports/client/ui/components/DetailDrawer/DetailDrawer.js
@@ -0,0 +1,84 @@
+import React, { Children } from "react";
+import PropTypes from "prop-types";
+import AppBar from "@material-ui/core/AppBar";
+import IconButton from "@material-ui/core/IconButton";
+import Toolbar from "@material-ui/core/Toolbar";
+import Drawer from "@material-ui/core/Drawer";
+import withStyles from "@material-ui/core/styles/withStyles";
+import CloseIcon from "mdi-material-ui/Close";
+import { Typography } from "@material-ui/core";
+import { UIContext } from "../../context/UIContext";
+
+const styles = (theme) => ({
+  action: {
+    marginLeft: theme.spacing.unit
+  },
+  content: {
+    paddingTop: theme.spacing.unit,
+    marginLeft: "-1px",
+    marginRight: "-1px"
+  },
+  title: {
+    flex: 1
+  }
+});
+
+/**
+ * Detail drawer used for displaying supplementary info and actions for a view.
+ * @param {Object} props Component props
+ * @returns {React.Component} Sidebar component
+ */
+function DetailDrawer(props) {
+  const {
+    anchor,
+    children,
+    classes,
+    title
+  } = props;
+
+  return (
+    <UIContext.Consumer>
+      {({ isMobile, onCloseDetailDrawer, isDetailDrawerOpen }) => (
+        <Drawer
+          elevation={2}
+          variant={isMobile ? "temporary" : "persistent"}
+          anchor={anchor}
+          open={isDetailDrawerOpen}
+          onClose={onCloseDetailDrawer}
+          ModalProps={{
+            keepMounted: true // Better open performance on mobile.
+          }}
+        >
+          <AppBar
+            color="default"
+            elevation={0}
+            position="sticky"
+          >
+            <Toolbar>
+              <Typography className={classes.title} variant="h6">{title}</Typography>
+              <IconButton color="secondary" onClick={onCloseDetailDrawer} size="small">
+                <CloseIcon />
+              </IconButton>
+            </Toolbar>
+          </AppBar>
+          {Children.map(children, (child) => (
+            <div className={classes.content}>{child}</div>
+          ))}
+        </Drawer>
+      )}
+    </UIContext.Consumer>
+  );
+}
+
+DetailDrawer.propTypes = {
+  anchor: PropTypes.oneOf(["left", "right", "top", "bottom"]),
+  children: PropTypes.node,
+  classes: PropTypes.object,
+  title: PropTypes.string
+};
+
+DetailDrawer.defaultProps = {
+  anchor: "right"
+};
+
+export default withStyles(styles, { name: "RuiDetailDrawer" })(DetailDrawer);
diff --git a/imports/client/ui/components/DetailDrawer/index.js b/imports/client/ui/components/DetailDrawer/index.js
new file mode 100644
index 00000000000..26662fa57bb
--- /dev/null
+++ b/imports/client/ui/components/DetailDrawer/index.js
@@ -0,0 +1 @@
+export { default } from "./DetailDrawer";

From 460d059bfa31058ce12d2227ce650a0823fa4d3d Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 11:14:12 -0700
Subject: [PATCH 10/27] feat: add DetailDrawerButton component

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 .../DetailDrawerButton/DetailDrawerButton.js  | 36 +++++++++++++++++++
 .../ui/components/DetailDrawerButton/index.js |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 imports/client/ui/components/DetailDrawerButton/DetailDrawerButton.js
 create mode 100644 imports/client/ui/components/DetailDrawerButton/index.js

diff --git a/imports/client/ui/components/DetailDrawerButton/DetailDrawerButton.js b/imports/client/ui/components/DetailDrawerButton/DetailDrawerButton.js
new file mode 100644
index 00000000000..9d0951b1420
--- /dev/null
+++ b/imports/client/ui/components/DetailDrawerButton/DetailDrawerButton.js
@@ -0,0 +1,36 @@
+import React from "react";
+import PropTypes from "prop-types";
+import Button from "@material-ui/core/Button";
+import { UIContext } from "../../context/UIContext";
+
+/**
+ * Detail drawer open button
+ * @param {Object} props Component props
+ * @returns {React.Component} Sidebar component
+ */
+function DetailDrawerButton(props) {
+  const {
+    component: ComponentProp,
+    children,
+    ...otherProps
+  } = props;
+
+  return (
+    <UIContext.Consumer>
+      {({ onToggleDetailDrawer }) => (
+        <ComponentProp {...otherProps} onClick={onToggleDetailDrawer}>{children}</ComponentProp>
+      )}
+    </UIContext.Consumer>
+  );
+}
+
+DetailDrawerButton.propTypes = {
+  children: PropTypes.node,
+  component: PropTypes.func
+};
+
+DetailDrawerButton.defaultProps = {
+  component: Button
+};
+
+export default DetailDrawerButton;
diff --git a/imports/client/ui/components/DetailDrawerButton/index.js b/imports/client/ui/components/DetailDrawerButton/index.js
new file mode 100644
index 00000000000..b3ee599e5e3
--- /dev/null
+++ b/imports/client/ui/components/DetailDrawerButton/index.js
@@ -0,0 +1 @@
+export { default } from "./DetailDrawerButton";

From d54cf1c9c3d8ebddba97b8bfdcd6edd117639cb3 Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 11:14:57 -0700
Subject: [PATCH 11/27] feat: support detail drawer open state

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 .../ui/components/PrimaryAppBar/PrimaryAppBar.js    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/imports/client/ui/components/PrimaryAppBar/PrimaryAppBar.js b/imports/client/ui/components/PrimaryAppBar/PrimaryAppBar.js
index 5a19e7a318f..8ec2b058a62 100644
--- a/imports/client/ui/components/PrimaryAppBar/PrimaryAppBar.js
+++ b/imports/client/ui/components/PrimaryAppBar/PrimaryAppBar.js
@@ -17,6 +17,9 @@ const styles = (theme) => ({
   primarySidebarOpen: {
     ...theme.mixins.leadingPaddingWhenPrimaryDrawerIsOpen
   },
+  detailDrawerOpen: {
+    ...theme.mixins.trailingPaddingWhenDetailDrawerIsOpen
+  },
   title: {
     flex: 1
   }
@@ -31,13 +34,17 @@ const styles = (theme) => ({
 function PrimaryAppBar({ children, classes, title }) {
   return (
     <UIContext.Consumer>
-      {({ isMobile, isPrimarySidebarOpen, onTogglePrimarySidebar }) => {
+      {({ isMobile, isDetailDrawerOpen, isPrimarySidebarOpen, onTogglePrimarySidebar }) => {
         const toolbarClassName = classNames({
-          // Add padding to the right when the primary sidebar is open,
+          // Add padding to the left when the primary sidebar is open,
           // only if we're on desktop. On mobile the sidebar floats over
           // the content like a modal that's docked to either the left
           // or right side of the screen.
-          [classes.primarySidebarOpen]: isPrimarySidebarOpen && !isMobile
+          [classes.primarySidebarOpen]: isPrimarySidebarOpen && !isMobile,
+
+          // Add padding to the right when the detail sidebar is open.
+          // Omit on mobile as the sidebar will float over content.
+          [classes.detailDrawerOpen]: isDetailDrawerOpen && !isMobile
         });
 
         return (

From 7f60f36b92b8d5271521e9510752f6c663a53f3f Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 11:16:37 -0700
Subject: [PATCH 12/27] refactor: suppress eslint issue for deprecated React
 lifecycle method

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 .../core/accounts/client/components/accountsDashboard.js       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/imports/plugins/core/accounts/client/components/accountsDashboard.js b/imports/plugins/core/accounts/client/components/accountsDashboard.js
index e6e3f38cee5..0fac2c978f2 100644
--- a/imports/plugins/core/accounts/client/components/accountsDashboard.js
+++ b/imports/plugins/core/accounts/client/components/accountsDashboard.js
@@ -24,7 +24,8 @@ class AccountsDashboard extends Component {
     };
   }
 
-  componentWillReceiveProps(nextProps) {
+  // eslint-disable-next-line camelcase
+  UNSAFE_componentWillReceiveProps(nextProps) {
     const { adminGroups, accounts, groups } = nextProps;
     const sortedGroups = sortUsersIntoGroups({ groups: sortGroups(adminGroups), accounts });
     const selectedGroup = adminGroups.find((grp) => grp._id === (this.state.selectedGroup || {})._id);

From ed2822403b293be8a0fae91b6331b4495ec76611 Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 11:16:45 -0700
Subject: [PATCH 13/27] refactor: suppress eslint issue for deprecated React
 lifecycle method

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 .../plugins/core/accounts/client/components/adminInviteForm.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/imports/plugins/core/accounts/client/components/adminInviteForm.js b/imports/plugins/core/accounts/client/components/adminInviteForm.js
index 63c2d826f0d..c9a55c6316a 100644
--- a/imports/plugins/core/accounts/client/components/adminInviteForm.js
+++ b/imports/plugins/core/accounts/client/components/adminInviteForm.js
@@ -36,7 +36,8 @@ class AdminInviteForm extends Component {
     this.handleSubmit = this.handleSubmit.bind(this);
   }
 
-  componentWillReceiveProps(nextProps) {
+  // eslint-disable-next-line camelcase
+  UNSAFE_componentWillReceiveProps(nextProps) {
     const { groups } = nextProps;
     this.setState({ groups, group: getDefaultUserInviteGroup(groups) });
   }

From 20dbca25e95e32fa23d8dbf83c396f83ac1e3feb Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 11:16:52 -0700
Subject: [PATCH 14/27] refactor: suppress eslint issue for deprecated React
 lifecycle method

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 imports/plugins/core/accounts/client/components/editGroup.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/imports/plugins/core/accounts/client/components/editGroup.js b/imports/plugins/core/accounts/client/components/editGroup.js
index 5fa74862f5c..c83fcb0bb62 100644
--- a/imports/plugins/core/accounts/client/components/editGroup.js
+++ b/imports/plugins/core/accounts/client/components/editGroup.js
@@ -41,7 +41,8 @@ class EditGroup extends Component {
     };
   }
 
-  componentWillReceiveProps(nextProps) {
+  // eslint-disable-next-line camelcase
+  UNSAFE_componentWillReceiveProps(nextProps) {
     const { groups, selectedGroup } = nextProps;
     this.setState({ groups, selectedGroup: selectedGroup || {} });
   }

From 052ad4a44ae0555d17bcfdb28a63ea55dff3a3fd Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 11:17:01 -0700
Subject: [PATCH 15/27] refactor: suppress eslint issue for deprecated React
 lifecycle method

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 .../plugins/core/accounts/client/components/manageGroups.js    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/imports/plugins/core/accounts/client/components/manageGroups.js b/imports/plugins/core/accounts/client/components/manageGroups.js
index 64b95142b8a..881b494079a 100644
--- a/imports/plugins/core/accounts/client/components/manageGroups.js
+++ b/imports/plugins/core/accounts/client/components/manageGroups.js
@@ -24,7 +24,8 @@ class ManageGroups extends Component {
     };
   }
 
-  componentWillReceiveProps(nextProps) {
+  // eslint-disable-next-line camelcase
+  UNSAFE_componentWillReceiveProps(nextProps) {
     const { group, groups, adminGroups, accounts } = nextProps;
     this.setState({ group, groups, accounts, adminGroups });
   }

From d1b74d0e3b12eb7d4b5995f1d9ea9a64d06d0187 Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 11:17:42 -0700
Subject: [PATCH 16/27] feat: update layout to use the DetailDrawer component
 and button

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 .../accounts/client/components/accountsDashboard.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/imports/plugins/core/accounts/client/components/accountsDashboard.js b/imports/plugins/core/accounts/client/components/accountsDashboard.js
index 0fac2c978f2..5bca1b57570 100644
--- a/imports/plugins/core/accounts/client/components/accountsDashboard.js
+++ b/imports/plugins/core/accounts/client/components/accountsDashboard.js
@@ -2,6 +2,8 @@ import React, { Component } from "react";
 import PropTypes from "prop-types";
 import { Components } from "@reactioncommerce/reaction-components";
 import sortUsersIntoGroups, { sortGroups } from "../helpers/accountsHelper";
+import DetailDrawer from "/imports/client/ui/components/DetailDrawer";
+import DetailDrawerButton from "/imports/client/ui/components/DetailDrawerButton";
 
 class AccountsDashboard extends Component {
   static propTypes = {
@@ -87,13 +89,14 @@ class AccountsDashboard extends Component {
 
   render() {
     return (
-      <div className="row list-group accounts-table">
-        <div className="col-md-9">
-          {this.renderGroupsTable(this.state.adminGroups)}
+      <div className="accounts-table">
+        <div className="group-container" style={{ textAlign: "right" }}>
+          <DetailDrawerButton color="primary" variant="outlined">{"Manage Groups"}</DetailDrawerButton>
         </div>
-        <div className="col-md-3">
+        {this.renderGroupsTable(this.state.adminGroups)}
+        <DetailDrawer title={"Manage Groups"}>
           {this.renderGroupDetail()}
-        </div>
+        </DetailDrawer>
       </div>
     );
   }

From 5497bcd5ca8231a510492c377547b808f0fbe381 Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 11:18:46 -0700
Subject: [PATCH 17/27] refactor: use MUI Card

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 .../client/components/adminInviteForm.js        | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/imports/plugins/core/accounts/client/components/adminInviteForm.js b/imports/plugins/core/accounts/client/components/adminInviteForm.js
index c9a55c6316a..e9eab9841d6 100644
--- a/imports/plugins/core/accounts/client/components/adminInviteForm.js
+++ b/imports/plugins/core/accounts/client/components/adminInviteForm.js
@@ -5,6 +5,9 @@ import _ from "lodash";
 import { Components, registerComponent } from "@reactioncommerce/reaction-components";
 import ReactionAlerts from "/imports/plugins/core/layout/client/templates/layout/alerts/inlineAlerts";
 import { Reaction, i18next } from "/client/api";
+import Card from "@material-ui/core/Card";
+import CardContent from "@material-ui/core/CardContent";
+import CardHeader from "@material-ui/core/CardHeader";
 import { getDefaultUserInviteGroup } from "../helpers/accountsHelper";
 
 /**
@@ -184,17 +187,15 @@ class AdminInviteForm extends Component {
 
   render() {
     return (
-      <Components.Card>
-        <Components.CardHeader
-          actAsExpander={true}
+      <Card elevation={0}>
+        <CardHeader
           data-i18n="accountsUI.info.addAdminUser"
-          title="Add Admin User"
-          id="accounts"
+          title={i18next.t("accountsUI.info.addAdminUser", { defaultValue: "Add Admin User" })}
         />
-        <Components.CardBody expandable={true}>
+        <CardContent>
           {this.renderForm()}
-        </Components.CardBody>
-      </Components.Card>
+        </CardContent>
+      </Card>
     );
   }
 }

From a9aaafe7cfea1d035001bba1bca6b0aee8471ff7 Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 11:18:57 -0700
Subject: [PATCH 18/27] refactor: use MUI Card

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 .../core/accounts/client/components/editGroup.js  | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/imports/plugins/core/accounts/client/components/editGroup.js b/imports/plugins/core/accounts/client/components/editGroup.js
index c83fcb0bb62..edcac619675 100644
--- a/imports/plugins/core/accounts/client/components/editGroup.js
+++ b/imports/plugins/core/accounts/client/components/editGroup.js
@@ -5,7 +5,10 @@ import classnames from "classnames";
 import PropTypes from "prop-types";
 import { Components } from "@reactioncommerce/reaction-components";
 import ReactionAlerts from "/imports/plugins/core/layout/client/templates/layout/alerts/inlineAlerts";
-import { Reaction } from "/client/api";
+import { Reaction, i18next } from "/client/api";
+import Card from "@material-ui/core/Card";
+import CardContent from "@material-ui/core/CardContent";
+import CardHeader from "@material-ui/core/CardHeader";
 import { groupPermissions } from "../helpers/accountsHelper";
 
 /**
@@ -180,17 +183,17 @@ class EditGroup extends Component {
     const alertId = this.state.alertOptions.id;
     return (
       <div className="edit-group-container">
-        <Components.Card>
-          <Components.CardHeader actAsExpander={true} i18nKeyTitle="admin.groups.editGroups" title="Edit Groups" />
-          <Components.CardBody expandable={true}>
+        <Card elevation={0}>
+          <CardHeader title={i18next.t("admin.groups.editGroups", { defaultValue: "Edit Groups" })} />
+          <CardContent>
             <div className="settings">
               <Components.Alerts placement={alertId} id={alertId} onAlertRemove={this.removeAlert} />
               {this.renderGroups()}
               {this.renderGroupForm()}
               {this.renderPermissionsList()}
             </div>
-          </Components.CardBody>
-        </Components.Card>
+          </CardContent>
+        </Card>
       </div>
     );
   }

From fad69dae3e379ed3bd0acea4195b5bdd33bbd255 Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 11:30:52 -0700
Subject: [PATCH 19/27] feat: top padding to the edit group

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 .../client/components/manageGroups.js         | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/imports/plugins/core/accounts/client/components/manageGroups.js b/imports/plugins/core/accounts/client/components/manageGroups.js
index 881b494079a..83769c2e1f2 100644
--- a/imports/plugins/core/accounts/client/components/manageGroups.js
+++ b/imports/plugins/core/accounts/client/components/manageGroups.js
@@ -1,12 +1,20 @@
 import React, { Component } from "react";
 import PropTypes from "prop-types";
 import { Components, registerComponent } from "@reactioncommerce/reaction-components";
+import withStyles from "@material-ui/core/styles/withStyles";
 import { getInvitableGroups } from "../helpers/accountsHelper";
 
+const styles = (theme) => ({
+  editGroup: {
+    paddingTop: theme.spacing.unit
+  }
+});
+
 class ManageGroups extends Component {
   static propTypes = {
     accounts: PropTypes.array,
     adminGroups: PropTypes.array,
+    classes: PropTypes.object,
     group: PropTypes.object,
     groups: PropTypes.array,
     isAdmin: PropTypes.bool,
@@ -31,6 +39,7 @@ class ManageGroups extends Component {
   }
 
   render() {
+    const { classes } = this.props;
     // this gets a list of groups the user can invite to, we show only those in the dropdown
     // see doc for getInvitableGroups in helpers/accountsHelper.js
     const groupsInvitable = getInvitableGroups(this.state.adminGroups);
@@ -43,19 +52,23 @@ class ManageGroups extends Component {
           />
         }
         {this.props.isAdmin &&
-          <Components.EditGroup
-            // filter out owner group from editable groups.
-            // The edit group meteor method also prevents editing owner group
-            groups={this.state.groups.filter((grp) => grp.slug !== "owner")}
-            selectedGroup={this.state.group}
-            onChangeGroup={this.props.onChangeGroup}
-          />
+          <div className={classes.editGroup}>
+            <Components.EditGroup
+              // filter out owner group from editable groups.
+              // The edit group meteor method also prevents editing owner group
+              groups={this.state.groups.filter((grp) => grp.slug !== "owner")}
+              selectedGroup={this.state.group}
+              onChangeGroup={this.props.onChangeGroup}
+            />
+          </div>
         }
       </div>
     );
   }
 }
 
-registerComponent("ManageGroups", ManageGroups);
+registerComponent("ManageGroups", ManageGroups, [
+  withStyles(styles, { name: "RuiManageGroups" })
+]);
 
-export default ManageGroups;
+export default withStyles(styles, { name: "RuiManageGroups" })(ManageGroups);

From 46eafc57741df8429dec0165ff964a1c6b875e7f Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 11:31:33 -0700
Subject: [PATCH 20/27] feat: add translation for "Manage Groups"

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 imports/plugins/core/accounts/server/i18n/en.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/imports/plugins/core/accounts/server/i18n/en.json b/imports/plugins/core/accounts/server/i18n/en.json
index a33b98d4d45..9d64b9366fb 100644
--- a/imports/plugins/core/accounts/server/i18n/en.json
+++ b/imports/plugins/core/accounts/server/i18n/en.json
@@ -7,7 +7,8 @@
         "dashboard": {
           "accountsLabel": "Accounts",
           "accountsTitle": "Accounts",
-          "accountsDescription": "Account Settings"
+          "accountsDescription": "Account Settings",
+          "manageGroups": "Manage Groups"
         },
         "settings": {
           "continue": "Continue",

From ff2cf20057f66e103285f74008b6eed85a5ad763 Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 11:31:41 -0700
Subject: [PATCH 21/27] feat: add translation for "Manage Groups"

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 .../core/accounts/client/components/accountsDashboard.js     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/imports/plugins/core/accounts/client/components/accountsDashboard.js b/imports/plugins/core/accounts/client/components/accountsDashboard.js
index 5bca1b57570..7cadef9f5f4 100644
--- a/imports/plugins/core/accounts/client/components/accountsDashboard.js
+++ b/imports/plugins/core/accounts/client/components/accountsDashboard.js
@@ -1,6 +1,7 @@
 import React, { Component } from "react";
 import PropTypes from "prop-types";
 import { Components } from "@reactioncommerce/reaction-components";
+import { i18next } from "/client/api";
 import sortUsersIntoGroups, { sortGroups } from "../helpers/accountsHelper";
 import DetailDrawer from "/imports/client/ui/components/DetailDrawer";
 import DetailDrawerButton from "/imports/client/ui/components/DetailDrawerButton";
@@ -91,10 +92,10 @@ class AccountsDashboard extends Component {
     return (
       <div className="accounts-table">
         <div className="group-container" style={{ textAlign: "right" }}>
-          <DetailDrawerButton color="primary" variant="outlined">{"Manage Groups"}</DetailDrawerButton>
+          <DetailDrawerButton color="primary" variant="outlined">{i18next.t("admin.dashboard.manageGroups")}</DetailDrawerButton>
         </div>
         {this.renderGroupsTable(this.state.adminGroups)}
-        <DetailDrawer title={"Manage Groups"}>
+        <DetailDrawer title={i18next.t("admin.dashboard.manageGroups")}>
           {this.renderGroupDetail()}
         </DetailDrawer>
       </div>

From 4fa49bd1169f556e8948eeee25687419c4e3a9da Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 14:15:20 -0700
Subject: [PATCH 22/27] feat: update fonts

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 .../core/router/client/theme/muiTheme.js      | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/imports/plugins/core/router/client/theme/muiTheme.js b/imports/plugins/core/router/client/theme/muiTheme.js
index 8ce706dd4fd..d8881ec94cf 100644
--- a/imports/plugins/core/router/client/theme/muiTheme.js
+++ b/imports/plugins/core/router/client/theme/muiTheme.js
@@ -10,7 +10,7 @@ const toolbarMobileHeight = 54;
 
 // Colors
 export const colorPrimaryMain = colors.coolGrey;
-export const colorSecondaryMain = colors.darkBlue500;
+export const colorSecondaryMain = colors.reactionBlue;
 
 // Spacing
 export const defaultSpacingUnit = 8;
@@ -19,6 +19,11 @@ export const detailDrawerWidth = 400;
 
 // Typography
 export const defaultFontSize = 16;
+export const fontWeightLight = 400;
+export const fontWeightRegular = 400;
+export const fontWeightMedium = 500;
+export const fontWeightSemiBold = 600;
+export const fontWeightBold = 700;
 
 export const rawMuiTheme = {
   palette: {
@@ -43,11 +48,11 @@ export const rawMuiTheme = {
   typography: {
     fontSize: defaultFontSize,
     fontFamily: typography.bodyText.fontFamily,
-    fontWeightLight: 400,
-    fontWeightRegular: 400,
-    fontWeightMedium: 500,
-    fontWeightSemiBold: 600,
-    fontWeightBold: 700,
+    fontWeightLight,
+    fontWeightRegular,
+    fontWeightMedium,
+    fontWeightSemiBold,
+    fontWeightBold,
     useNextVariants: true,
     subtitle1: {
       fontSize: defaultFontSize
@@ -72,15 +77,17 @@ export const rawMuiTheme = {
       fontSize: defaultFontSize * 1.125
     },
     h4: {
-      fontSize: defaultFontSize
+      fontSize: defaultFontSize,
+      fontWeight: fontWeightSemiBold
     },
     h5: {
-      fontSize: defaultFontSize * 0.875
+      fontSize: defaultFontSize * 0.875,
+      fontWeight: fontWeightSemiBold
     },
     h6: {
-      fontSize: defaultFontSize * 0.75
+      fontSize: defaultFontSize * 0.75,
+      fontWeight: fontWeightSemiBold
     }
-
   },
   shadows: [
     "none",
@@ -148,7 +155,7 @@ export const rawMuiTheme = {
     },
     MuiCardHeader: {
       titleTypographyProps: {
-        variant: "h6"
+        variant: "h4"
       }
     }
   },

From 42adf21cdc19fd3710fb1e03ea7e297844bbc5c7 Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 14:17:05 -0700
Subject: [PATCH 23/27] feat: close detail drawer on route change

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 imports/client/ui/layouts/Dashboard.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/imports/client/ui/layouts/Dashboard.js b/imports/client/ui/layouts/Dashboard.js
index 8cd00ed88f8..2fff6b1fa97 100644
--- a/imports/client/ui/layouts/Dashboard.js
+++ b/imports/client/ui/layouts/Dashboard.js
@@ -6,6 +6,7 @@ import withWidth, { isWidthDown } from "@material-ui/core/withWidth";
 import { CustomPropTypes } from "@reactioncommerce/components/utils";
 import { withComponents } from "@reactioncommerce/components-context";
 import { Route, Switch } from "react-router";
+import { withRouter } from "react-router-dom";
 import PrimaryAppBar from "../components/PrimaryAppBar/PrimaryAppBar";
 import ProfileImageWithData from "../components/ProfileImageWithData";
 import Sidebar from "../components/Sidebar";
@@ -35,6 +36,7 @@ class Dashboard extends Component {
     components: PropTypes.shape({
       IconHamburger: CustomPropTypes.component.isRequired
     }),
+    location: PropTypes.object,
     width: PropTypes.string
   };
 
@@ -55,7 +57,7 @@ class Dashboard extends Component {
   }
 
   componentDidUpdate(prevProps, prevState) {
-    const { width } = this.props;
+    const { width, location } = this.props;
     const isMobile = isWidthDown("sm", width);
 
     if (prevState.isMobile !== isMobile) {
@@ -71,6 +73,14 @@ class Dashboard extends Component {
         isPrimarySidebarOpen: true
       });
     }
+
+    // Close the detail drawer on route change
+    if (location.pathname !== prevProps.location.pathname) {
+      // eslint-disable-next-line react/no-did-update-set-state
+      this.setState({
+        isDetailDrawerOpen: false
+      });
+    }
   }
 
   onTogglePrimarySidebar = () => {
@@ -156,6 +166,7 @@ class Dashboard extends Component {
 
 export default compose(
   withComponents,
+  withRouter,
   withWidth({ initialWidth: "md" }),
   withStyles(styles, { name: "RuiDashboard" })
 )(Dashboard);

From b3eb479dafaac431da201657579160d8cc9bb408 Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 14:17:20 -0700
Subject: [PATCH 24/27] fix: close button colors

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 imports/client/ui/components/Sidebar/Sidebar.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/imports/client/ui/components/Sidebar/Sidebar.js b/imports/client/ui/components/Sidebar/Sidebar.js
index 5c909f7d4d7..2dc799f20bc 100644
--- a/imports/client/ui/components/Sidebar/Sidebar.js
+++ b/imports/client/ui/components/Sidebar/Sidebar.js
@@ -25,6 +25,17 @@ const activeClassName = "nav-item-active";
 const routeSort = (routeA, routeB) => (routeA.priority || Number.MAX_SAFE_INTEGER) - (routeB.priority || Number.MAX_SAFE_INTEGER);
 
 const styles = (theme) => ({
+  closeButton: {
+    "color": theme.palette.colors.white,
+    "backgroundColor": theme.palette.colors.darkBlue500,
+    "&:hover": {
+      "backgroundColor": theme.palette.colors.darkBlue600,
+      // Reset on touch devices, it doesn't add specificity
+      "@media (hover: none)": {
+        backgroundColor: theme.palette.colors.darkBlue500
+      }
+    }
+  },
   icon: {
     width: 32,
     display: "flex",
@@ -115,7 +126,7 @@ function Sidebar(props) {
           <ShopLogoWithData className={classes.shopLogo} shouldShowShopName size={32} />
 
           <Hidden mdUp>
-            <Fab color="secondary" onClick={onDrawerClose} size="small">
+            <Fab classes={{ root: classes.closeButton }} onClick={onDrawerClose} size="small">
               <CloseIcon />
             </Fab>
           </Hidden>

From c337e27e355cda0831a4c4a3b5e70b216540d136 Mon Sep 17 00:00:00 2001
From: Mike Murray <hellomikemurray@gmail.com>
Date: Wed, 26 Jun 2019 14:19:43 -0700
Subject: [PATCH 25/27] fix: add additional left padding

Signed-off-by: Mike Murray <hellomikemurray@gmail.com>
---
 imports/client/ui/components/DetailDrawer/DetailDrawer.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/imports/client/ui/components/DetailDrawer/DetailDrawer.js b/imports/client/ui/components/DetailDrawer/DetailDrawer.js
index f37ee050e96..74a4165aaac 100644
--- a/imports/client/ui/components/DetailDrawer/DetailDrawer.js
+++ b/imports/client/ui/components/DetailDrawer/DetailDrawer.js
@@ -19,7 +19,8 @@ const styles = (theme) => ({
     marginRight: "-1px"
   },
   title: {
-    flex: 1
+    flex: 1,
+    paddingLeft: theme.spacing.unit
   }
 });
 
@@ -55,8 +56,8 @@ function DetailDrawer(props) {
             position="sticky"
           >
             <Toolbar>
-              <Typography className={classes.title} variant="h6">{title}</Typography>
-              <IconButton color="secondary" onClick={onCloseDetailDrawer} size="small">
+              <Typography className={classes.title} variant="h3">{title}</Typography>
+              <IconButton onClick={onCloseDetailDrawer} size="small">
                 <CloseIcon />
               </IconButton>
             </Toolbar>

From 3b2bf45ec377f4283e16fde3dd69c15f1e073626 Mon Sep 17 00:00:00 2001
From: Erik Kieckhafer <ek@ato.la>
Date: Wed, 26 Jun 2019 15:25:03 -0700
Subject: [PATCH 26/27] update component library version to fix snyk

Signed-off-by: Erik Kieckhafer <ek@ato.la>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6856274cf73..bd0d6acc5a8 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "@fortawesome/free-solid-svg-icons": "^5.7.1",
     "@fortawesome/react-fontawesome": "^0.1.4",
     "@material-ui/core": "^3.9.2",
-    "@reactioncommerce/components": "^0.62.1",
+    "@reactioncommerce/components": "^0.65.4",
     "@reactioncommerce/components-context": "1.2.0",
     "@reactioncommerce/data-factory": "^1.0.0",
     "@reactioncommerce/file-collections": "0.6.0",

From 11378c29653ffc60b87ac81f5ce846965e2b7cb5 Mon Sep 17 00:00:00 2001
From: Erik Kieckhafer <ek@ato.la>
Date: Wed, 26 Jun 2019 15:38:12 -0700
Subject: [PATCH 27/27] commit package-lock.json

Signed-off-by: Erik Kieckhafer <ek@ato.la>
---
 package-lock.json | 300 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 247 insertions(+), 53 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 54e362bda39..e0f63c5742b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1626,9 +1626,9 @@
       }
     },
     "@babel/types": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz",
-      "integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz",
+      "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==",
       "requires": {
         "esutils": "^2.0.2",
         "lodash": "^4.17.11",
@@ -2003,26 +2003,89 @@
       "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="
     },
     "@reactioncommerce/components": {
-      "version": "0.62.1",
-      "resolved": "https://registry.npmjs.org/@reactioncommerce/components/-/components-0.62.1.tgz",
-      "integrity": "sha512-0A5jPvuN5syOr+BRi8SKJIr5pFLdQgno1fK6xn0uArMGi2z5Sffbpv6Xp2HyYcUVSNvjb+xF89FvWIOi0eLZYw==",
-      "requires": {
-        "@material-ui/core": "^3.1.0",
-        "accounting-js": "^1.1.1",
-        "lodash.debounce": "^4.0.8",
-        "lodash.get": "^4.4.2",
-        "lodash.isempty": "^4.4.0",
-        "lodash.isequal": "^4.5.0",
-        "lodash.uniqueid": "^4.0.1",
-        "mdi-material-ui": "^5.8.0",
-        "react-is": "^16.4.1",
-        "react-select": "^2.0.0"
+      "version": "0.65.4",
+      "resolved": "https://registry.npmjs.org/@reactioncommerce/components/-/components-0.65.4.tgz",
+      "integrity": "sha512-bq3J4JcytdDW9lTm9piV2u7gDGDDOzeo5UOCDpFxDShiy5IIfqY8VvADQExT8JMtbr0KHvYybjZP7RqKIDtt+g==",
+      "requires": {
+        "@babel/runtime": "~7.3.1",
+        "@material-ui/core": "~3.1.0",
+        "accounting-js": "~1.1.1",
+        "lodash.debounce": "~4.0.8",
+        "lodash.get": "~4.4.2",
+        "lodash.isempty": "~4.4.0",
+        "lodash.isequal": "~4.5.0",
+        "lodash.uniqueid": "~4.0.1",
+        "mdi-material-ui": "~5.8.0",
+        "react-is": "~16.4.1",
+        "react-select": "~2.4.0"
       },
       "dependencies": {
+        "@babel/runtime": {
+          "version": "7.3.4",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.3.4.tgz",
+          "integrity": "sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g==",
+          "requires": {
+            "regenerator-runtime": "^0.12.0"
+          }
+        },
+        "@material-ui/core": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-3.1.2.tgz",
+          "integrity": "sha512-tTRjlTVJY78GDKRHKSuxpoghrFyDAu9GrYCnaARHaZ2pZWiBHuviqUgAC8n8jWUXG3e6vfAXn9zZWzFedb4LwQ==",
+          "requires": {
+            "@babel/runtime": "7.0.0",
+            "@types/jss": "^9.5.6",
+            "@types/react-transition-group": "^2.0.8",
+            "brcast": "^3.0.1",
+            "classnames": "^2.2.5",
+            "csstype": "^2.5.2",
+            "debounce": "^1.1.0",
+            "deepmerge": "^2.0.1",
+            "dom-helpers": "^3.2.1",
+            "hoist-non-react-statics": "^2.5.0",
+            "is-plain-object": "^2.0.4",
+            "jss": "^9.3.3",
+            "jss-camel-case": "^6.0.0",
+            "jss-default-unit": "^8.0.2",
+            "jss-global": "^3.0.0",
+            "jss-nested": "^6.0.1",
+            "jss-props-sort": "^6.0.0",
+            "jss-vendor-prefixer": "^7.0.0",
+            "keycode": "^2.1.9",
+            "normalize-scroll-left": "^0.1.2",
+            "popper.js": "^1.14.1",
+            "prop-types": "^15.6.0",
+            "react-event-listener": "^0.6.2",
+            "react-jss": "^8.1.0",
+            "react-transition-group": "^2.2.1",
+            "recompose": "0.28.0 - 0.30.0",
+            "warning": "^4.0.1"
+          },
+          "dependencies": {
+            "@babel/runtime": {
+              "version": "7.0.0",
+              "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0.tgz",
+              "integrity": "sha512-7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA==",
+              "requires": {
+                "regenerator-runtime": "^0.12.0"
+              }
+            }
+          }
+        },
+        "brcast": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/brcast/-/brcast-3.0.1.tgz",
+          "integrity": "sha512-eI3yqf9YEqyGl9PCNTR46MGvDylGtaHjalcz6Q3fAPnP/PhpKkkve52vFdfGpwp4VUvK6LUr4TQN+2stCrEwTg=="
+        },
+        "deepmerge": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz",
+          "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="
+        },
         "react-select": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/react-select/-/react-select-2.4.2.tgz",
-          "integrity": "sha512-5xFOQ6JJktkY5NTaHrc6x9mKwIjhNIiBkGic1j71uyY+ulFpRFra6f4WKLd9fuCylk4WjLpO5zDhdF4CAcwFzA==",
+          "version": "2.4.4",
+          "resolved": "https://registry.npmjs.org/react-select/-/react-select-2.4.4.tgz",
+          "integrity": "sha512-C4QPLgy9h42J/KkdrpVxNmkY6p4lb49fsrbDk/hRcZpX7JvZPNb6mGj+c5SzyEtBv1DmQ9oPH4NmhAFvCrg8Jw==",
           "requires": {
             "classnames": "^2.2.5",
             "emotion": "^9.1.2",
@@ -2032,6 +2095,32 @@
             "react-input-autosize": "^2.2.1",
             "react-transition-group": "^2.2.1"
           }
+        },
+        "recompose": {
+          "version": "0.30.0",
+          "resolved": "https://registry.npmjs.org/recompose/-/recompose-0.30.0.tgz",
+          "integrity": "sha512-ZTrzzUDa9AqUIhRk4KmVFihH0rapdCSMFXjhHbNrjAWxBuUD/guYlyysMnuHjlZC/KRiOKRtB4jf96yYSkKE8w==",
+          "requires": {
+            "@babel/runtime": "^7.0.0",
+            "change-emitter": "^0.1.2",
+            "fbjs": "^0.8.1",
+            "hoist-non-react-statics": "^2.3.1",
+            "react-lifecycles-compat": "^3.0.2",
+            "symbol-observable": "^1.0.4"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.12.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
+          "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="
+        },
+        "warning": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+          "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+          "requires": {
+            "loose-envify": "^1.0.0"
+          }
         }
       }
     },
@@ -3659,9 +3748,9 @@
       }
     },
     "babel-plugin-macros": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.5.1.tgz",
-      "integrity": "sha512-xN3KhAxPzsJ6OQTktCanNpIFnnMsCV+t8OloKxIL72D6+SUZYFn9qfklPgef5HyyDtzYZqqb+fs1S12+gQY82Q==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.6.1.tgz",
+      "integrity": "sha512-6W2nwiXme6j1n2erPOnmRiWfObUhWH7Qw1LMi9XZy8cj+KtESu3T6asZvtk5bMQQjX8te35o7CFueiSdL/2NmQ==",
       "requires": {
         "@babel/runtime": "^7.4.2",
         "cosmiconfig": "^5.2.0",
@@ -3669,9 +3758,9 @@
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.4.3",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.3.tgz",
-          "integrity": "sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==",
+          "version": "7.4.5",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz",
+          "integrity": "sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==",
           "requires": {
             "regenerator-runtime": "^0.13.2"
           }
@@ -3687,9 +3776,9 @@
           "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA=="
         },
         "resolve": {
-          "version": "1.10.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
-          "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+          "version": "1.11.1",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
+          "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
           "requires": {
             "path-parse": "^1.0.6"
           }
@@ -4848,20 +4937,20 @@
       }
     },
     "cosmiconfig": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.0.tgz",
-      "integrity": "sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
       "requires": {
         "import-fresh": "^2.0.0",
         "is-directory": "^0.3.1",
-        "js-yaml": "^3.13.0",
+        "js-yaml": "^3.13.1",
         "parse-json": "^4.0.0"
       },
       "dependencies": {
         "js-yaml": {
-          "version": "3.13.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
-          "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
+          "version": "3.13.1",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+          "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
           "requires": {
             "argparse": "^1.0.7",
             "esprima": "^4.0.0"
@@ -7074,7 +7163,8 @@
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -7098,13 +7188,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
           "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -7121,19 +7213,22 @@
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
           "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -7264,7 +7359,8 @@
           "version": "2.0.3",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -7278,6 +7374,7 @@
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -7294,6 +7391,7 @@
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -7302,13 +7400,15 @@
           "version": "0.0.8",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
           "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz",
           "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -7329,6 +7429,7 @@
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -7417,7 +7518,8 @@
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
           "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -7431,6 +7533,7 @@
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -7526,7 +7629,8 @@
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
           "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -7568,6 +7672,7 @@
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -7589,6 +7694,7 @@
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -7637,13 +7743,15 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
           "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
           "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -8914,6 +9022,11 @@
         "number-is-nan": "^1.0.0"
       }
     },
+    "is-function": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz",
+      "integrity": "sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU="
+    },
     "is-generator-fn": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-1.0.0.tgz",
@@ -11121,11 +11234,32 @@
         "hyphenate-style-name": "^1.0.2"
       }
     },
+    "jss-compose": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/jss-compose/-/jss-compose-5.0.0.tgz",
+      "integrity": "sha512-YofRYuiA0+VbeOw0VjgkyO380sA4+TWDrW52nSluD9n+1FWOlDzNbgpZ/Sb3Y46+DcAbOS21W5jo6SAqUEiuwA==",
+      "requires": {
+        "warning": "^3.0.0"
+      }
+    },
     "jss-default-unit": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/jss-default-unit/-/jss-default-unit-8.0.2.tgz",
       "integrity": "sha512-WxNHrF/18CdoAGw2H0FqOEvJdREXVXLazn7PQYU7V6/BWkCV0GkmWsppNiExdw8dP4TU1ma1dT9zBNJ95feLmg=="
     },
+    "jss-expand": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/jss-expand/-/jss-expand-5.3.0.tgz",
+      "integrity": "sha512-NiM4TbDVE0ykXSAw6dfFmB1LIqXP/jdd0ZMnlvlGgEMkMt+weJIl8Ynq1DsuBY9WwkNyzWktdqcEW2VN0RAtQg=="
+    },
+    "jss-extend": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jss-extend/-/jss-extend-6.2.0.tgz",
+      "integrity": "sha512-YszrmcB6o9HOsKPszK7NeDBNNjVyiW864jfoiHoMlgMIg2qlxKw70axZHqgczXHDcoyi/0/ikP1XaHDPRvYtEA==",
+      "requires": {
+        "warning": "^3.0.0"
+      }
+    },
     "jss-global": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/jss-global/-/jss-global-3.0.0.tgz",
@@ -11139,11 +11273,36 @@
         "warning": "^3.0.0"
       }
     },
+    "jss-preset-default": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/jss-preset-default/-/jss-preset-default-4.5.0.tgz",
+      "integrity": "sha512-qZbpRVtHT7hBPpZEBPFfafZKWmq3tA/An5RNqywDsZQGrlinIF/mGD9lmj6jGqu8GrED2SMHZ3pPKLmjCZoiaQ==",
+      "requires": {
+        "jss-camel-case": "^6.1.0",
+        "jss-compose": "^5.0.0",
+        "jss-default-unit": "^8.0.2",
+        "jss-expand": "^5.3.0",
+        "jss-extend": "^6.2.0",
+        "jss-global": "^3.0.0",
+        "jss-nested": "^6.0.1",
+        "jss-props-sort": "^6.0.0",
+        "jss-template": "^1.0.1",
+        "jss-vendor-prefixer": "^7.0.0"
+      }
+    },
     "jss-props-sort": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/jss-props-sort/-/jss-props-sort-6.0.0.tgz",
       "integrity": "sha512-E89UDcrphmI0LzmvYk25Hp4aE5ZBsXqMWlkFXS0EtPkunJkRr+WXdCNYbXbksIPnKlBenGB9OxzQY+mVc70S+g=="
     },
+    "jss-template": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/jss-template/-/jss-template-1.0.1.tgz",
+      "integrity": "sha512-m5BqEWha17fmIVXm1z8xbJhY6GFJxNB9H68GVnCWPyGYfxiAgY9WTQyvDAVj+pYRgrXSOfN5V1T4+SzN1sJTeg==",
+      "requires": {
+        "warning": "^3.0.0"
+      }
+    },
     "jss-vendor-prefixer": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/jss-vendor-prefixer/-/jss-vendor-prefixer-7.0.0.tgz",
@@ -11233,6 +11392,11 @@
         "safe-buffer": "^5.0.1"
       }
     },
+    "keycode": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.0.tgz",
+      "integrity": "sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ="
+    },
     "kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -11802,9 +11966,9 @@
       "dev": true
     },
     "mdi-material-ui": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/mdi-material-ui/-/mdi-material-ui-5.10.0.tgz",
-      "integrity": "sha512-vxInUhZBere/acbErn6MMNn2szHmexEgDuBJ3XzgG2GffIPI6s8e1z4iOnU+19cHUC6oeuayUNI82duvoh591A=="
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/mdi-material-ui/-/mdi-material-ui-5.8.0.tgz",
+      "integrity": "sha512-KixZVfNg0ejURv9CIliB1M3kl4Soe6f6yAFjFNsoYPMvGGw1AhnQKGZ3EOEKOIdp2X9YeZFOaO+i9e4ZHUrpNA=="
     },
     "meant": {
       "version": "1.0.1",
@@ -11826,9 +11990,9 @@
       }
     },
     "memoize-one": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.0.2.tgz",
-      "integrity": "sha512-o7lldN4fs/axqctc03NF+PMhd2veRrWeJ2n2GjEzUPBD4F9rmNg4A+bQCACIzwjHJEXuYv4aFFMaH35KZfHUrw=="
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.0.4.tgz",
+      "integrity": "sha512-P0z5IeAH6qHHGkJIXWw0xC2HNEgkx/9uWWBQw64FJj3/ol14VYdfVGWWr0fXfjhhv3TKVIqUq65os6O4GUNksA=="
     },
     "memory-pager": {
       "version": "1.5.0",
@@ -14491,6 +14655,18 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.4.2.tgz",
       "integrity": "sha512-rI3cGFj/obHbBz156PvErrS5xc6f1eWyTwyV4mo0vF2lGgXgS+mm7EKD5buLJq6jNgIagQescGSVG2YzgXt8Yg=="
     },
+    "react-jss": {
+      "version": "8.6.1",
+      "resolved": "https://registry.npmjs.org/react-jss/-/react-jss-8.6.1.tgz",
+      "integrity": "sha512-SH6XrJDJkAphp602J14JTy3puB2Zxz1FkM3bKVE8wON+va99jnUTKWnzGECb3NfIn9JPR5vHykge7K3/A747xQ==",
+      "requires": {
+        "hoist-non-react-statics": "^2.5.0",
+        "jss": "^9.7.0",
+        "jss-preset-default": "^4.3.0",
+        "prop-types": "^15.6.0",
+        "theming": "^1.3.0"
+      }
+    },
     "react-lifecycles-compat": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
@@ -17148,6 +17324,24 @@
       "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
       "dev": true
     },
+    "theming": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/theming/-/theming-1.3.0.tgz",
+      "integrity": "sha512-ya5Ef7XDGbTPBv5ENTwrwkPUexrlPeiAg/EI9kdlUAZhNlRbCdhMKRgjNX1IcmsmiPcqDQZE6BpSaH+cr31FKw==",
+      "requires": {
+        "brcast": "^3.0.1",
+        "is-function": "^1.0.1",
+        "is-plain-object": "^2.0.1",
+        "prop-types": "^15.5.8"
+      },
+      "dependencies": {
+        "brcast": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/brcast/-/brcast-3.0.1.tgz",
+          "integrity": "sha512-eI3yqf9YEqyGl9PCNTR46MGvDylGtaHjalcz6Q3fAPnP/PhpKkkve52vFdfGpwp4VUvK6LUr4TQN+2stCrEwTg=="
+        }
+      }
+    },
     "then-fs": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/then-fs/-/then-fs-2.0.0.tgz",