Merge pull request #388 from rvpanoz/develop

Hotfix/update mui (#386)
rvpanoz · Jul 23, 2019 · ea1f8f3 · ea1f8f3
2 parents ab24bc8 + cf8d473
commit ea1f8f3
Show file tree

Hide file tree

Showing 98 changed files with 1,336 additions and 1,169 deletions.
diff --git a/SECURITY.md b/SECURITY.md
diff --git a/app/app.global.css b/app/app.global.css
@@ -18,17 +18,6 @@ body {
   overflow-y: hidden;
 }
 
-#app {
-  padding: 0;
-  margin: 0;
-}
-
-#loadingScreen {
-  height: '100%';
-  padding: 0;
-  margin: 0;
-}
-
 ::-webkit-scrollbar {
   width: 12px;
   border-radius: 10px;

diff --git a/app/app.html b/app/app.html
@@ -20,7 +20,7 @@
     </script>
   </head>
   <body>
-    <div id="root"></div>
+    <div id="app"></div>
     <script>
       {
         const scripts = [];

diff --git a/app/components/common/AppError.js b/app/components/common/AppError.js
@@ -6,7 +6,7 @@ import Typography from '@material-ui/core/Typography';
 
 const styles = theme => ({
   root: {
-    padding: theme.spacing.unit
+    padding: theme.spacing(1)
   }
 });
 

diff --git a/app/components/common/AppLoader.js b/app/components/common/AppLoader.js
@@ -34,8 +34,8 @@ const AppLoader = ({ loading, classes, children, message, relative, mini }) =>
       )}
     </div>
   ) : (
-      children
-    );
+    children
+  );
 
 AppLoader.propTypes = {
   classes: objectOf(string).isRequired,

diff --git a/app/components/common/AppTabs.js b/app/components/common/AppTabs.js
@@ -30,34 +30,26 @@ const AppTabs = ({ classes, children }) => {
       <AppBar
         position="static"
         color="inherit"
-        classes={{
-          root: classes.appBar
-        }}
       >
         <Tabs
           value={value}
           onChange={(e, tabValue) => setValue(tabValue)}
-          classes={{
-            root: classes.noMargin,
-            indicator: classes.indicator
-          }}
-          variant="fullWidth"
         >
           <Tab
             classes={{
-              label: classes.tabLabel
+              root: classes.tabLabel
             }}
             label="Project"
           />
           <Tab
             classes={{
-              label: classes.tabLabel
+              root: classes.tabLabel
             }}
             label="Actions"
           />
           <Tab
             classes={{
-              label: classes.tabLabel
+              root: classes.tabLabel
             }}
             label="History"
           />

diff --git a/app/components/common/SnackbarContent.js b/app/components/common/SnackbarContent.js
@@ -1,5 +1,3 @@
-/* eslint-disable react/require-default-props */
-
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
@@ -16,7 +14,6 @@ import CloseIcon from '@material-ui/icons/Close';
 import InfoIcon from '@material-ui/icons/Info';
 
 import { withStyles } from '@material-ui/core/styles';
-import { defaultFont } from 'styles/variables';
 
 const styles = theme => ({
   root: {
@@ -39,18 +36,18 @@ const styles = theme => ({
     backgroundColor: theme.palette.warning.light
   },
   icon: {
-    fontSize: 20
+    fontSize: 25
   },
   iconVariant: {
     opacity: 0.9,
-    marginRight: theme.spacing.unit
+    marginRight: theme.spacing(1)
   },
   message: {
     display: 'flex'
   },
   text: {
-    ...defaultFont,
-    color: theme.palette.common.white,
+    fontSize: 14,
+    color: theme.palette.common.white
   }
 });
 
@@ -61,48 +58,48 @@ const AppSnackbarContent = ({
   variant,
   ...other
 }) => (
-    <SnackbarContent
-      className={classNames(classes[variant], classes.root)}
-      aria-describedby="cli-snackbar"
-      message={
-        <div id="cli-snackbar" className={classes.message}>
-          {variant === 'info' && (
-            <InfoIcon className={classNames(classes.icon, classes.iconVariant)} />
-          )}
-          {variant === 'error' && (
-            <ErrorIcon
-              className={classNames(classes.icon, classes.iconVariant)}
-            />
-          )}
-          {variant === 'warning' && (
-            <WarningIcon
-              className={classNames(classes.icon, classes.iconVariant)}
-            />
-          )}
-          {variant === 'success' && (
-            <CheckCircleIcon
-              className={classNames(classes.icon, classes.iconVariant)}
-            />
-          )}
-          <Typography className={classes.text}>{message}</Typography>
-        </div>
-      }
-      action={[
-        typeof onClose === 'function' && (
-          <IconButton
-            key="close"
-            aria-label="Close"
-            color="inherit"
-            className={classes.close}
-            onClick={onClose}
-          >
-            <CloseIcon className={classes.icon} />
-          </IconButton>
-        )
-      ]}
-      {...other}
-    />
-  );
+  <SnackbarContent
+    className={classNames(classes[variant], classes.root)}
+    aria-describedby="cli-snackbar"
+    message={
+      <div id="cli-snackbar" className={classes.message}>
+        {variant === 'info' && (
+          <InfoIcon className={classNames(classes.icon, classes.iconVariant)} />
+        )}
+        {variant === 'error' && (
+          <ErrorIcon
+            className={classNames(classes.icon, classes.iconVariant)}
+          />
+        )}
+        {variant === 'warning' && (
+          <WarningIcon
+            className={classNames(classes.icon, classes.iconVariant)}
+          />
+        )}
+        {variant === 'success' && (
+          <CheckCircleIcon
+            className={classNames(classes.icon, classes.iconVariant)}
+          />
+        )}
+        <Typography className={classes.text}>{message}</Typography>
+      </div>
+    }
+    action={[
+      typeof onClose === 'function' && (
+        <IconButton
+          key="close"
+          aria-label="Close"
+          color="inherit"
+          className={classes.close}
+          onClick={onClose}
+        >
+          <CloseIcon className={classes.icon} />
+        </IconButton>
+      )
+    ]}
+    {...other}
+  />
+);
 
 AppSnackbarContent.defaultProps = {
   variant: 'info'

diff --git a/app/components/common/Widget.js b/app/components/common/Widget.js
@@ -27,15 +27,15 @@ const Widget = ({
         <div className={classes.widgetHeader}>
           {!header && title ? (
             <React.Fragment>
-              <Typography variant="h6" color="textSecondary">
+              <Typography variant="h4" color="textSecondary">
                 {title}
               </Typography>
             </React.Fragment>
           ) : (
             header
           )}
         </div>
-        {title && <Divider light />}
+        {title && <Divider />}
         <div
           className={cn(classes.widgetBody, {
             [classes.noPadding]: noBodyPadding,

diff --git a/app/components/common/styles/appLoader.js b/app/components/common/styles/appLoader.js
@@ -1,5 +1,3 @@
-import { defaultFont } from 'styles/variables';
-
 const styles = () => ({
   loader: {
     display: 'flex',
@@ -21,8 +19,6 @@ const styles = () => ({
     margin: 0
   },
   message: {
-    ...defaultFont,
-    fontSize: 14,
     padding: 0,
     margin: 0
   }

diff --git a/app/components/common/styles/appTabs.js b/app/components/common/styles/appTabs.js
@@ -2,7 +2,6 @@ import { defaultFont } from 'styles/variables';
 
 const styles = theme => ({
   root: {
-    position: 'relative',
     width: '100%',
     backgroundColor: theme.palette.background.paper
   },
@@ -12,14 +11,14 @@ const styles = theme => ({
   tabLabel: {
     ...defaultFont,
     fontSize: 16,
-    paddingBottom: theme.spacing.unit
+    paddingBottom: theme.spacing(1)
   },
   noMargin: {
     margin: 0
   },
   appBar: {
-    marginLeft: theme.spacing.unit,
-    marginRight: theme.spacing.unit / 2
+    marginLeft: theme.spacing(0.5),
+    marginRight: theme.spacing(0.5)
   }
 });
 

diff --git a/app/components/common/styles/card.js b/app/components/common/styles/card.js
@@ -3,9 +3,9 @@ import { whiteColor } from 'styles/variables';
 const style = theme => ({
   card: {
     border: 0,
-    marginBottom: theme.spacing.unit * 3,
-    marginTop: theme.spacing.unit * 3,
-    borderRadius: theme.spacing.unit,
+    marginBottom: theme.spacing(3),
+    marginTop: theme.spacing(3),
+    borderRadius: theme.spacing(1),
     background: whiteColor,
     width: '100%',
     position: 'relative',
@@ -20,7 +20,7 @@ const style = theme => ({
     boxShadow: 'none'
   },
   cardProfile: {
-    marginTop: theme.spacing.unit * 3,
+    marginTop: theme.spacing(3),
     textAlign: 'center'
   },
   cardChart: {

diff --git a/app/components/common/styles/categories.js b/app/components/common/styles/categories.js
@@ -7,7 +7,7 @@ const styles = theme => ({
     padding: 0
   },
   chip: {
-    margin: theme.spacing.unit / 2
+    margin: theme.spacing(0.5)
   }
 });
 

diff --git a/app/components/common/styles/controlTypes.js b/app/components/common/styles/controlTypes.js
@@ -1,6 +1,6 @@
 const styles = theme => ({
   formControl: {
-    padding: theme.spacing.unit * 2,
+    padding: theme.spacing(2),
     minWidth: 120
   }
 });

diff --git a/app/components/common/styles/footer.js b/app/components/common/styles/footer.js
@@ -7,8 +7,8 @@ const styles = theme => ({
     maxWidth: 600,
     position: 'absolute',
     bottom: 0,
-    margin: theme.spacing.unit,
-    padding: theme.spacing.unit
+    margin: theme.spacing(1),
+    padding: theme.spacing(1)
   }
 });
 

diff --git a/app/components/common/styles/helperText.js b/app/components/common/styles/helperText.js
@@ -6,13 +6,13 @@ const styles = theme => ({
     display: 'flex',
     flexDirection: 'column',
     alignItems: 'center',
-    paddingTop: theme.spacing.unit * 2
+    paddingTop: theme.spacing(2)
   },
   noData: {
     ...defaultFont
   },
   withPadding: {
-    padding: theme.spacing.unit
+    padding: theme.spacing(1)
   },
   helperText: {
     ...defaultFont,
@@ -22,7 +22,7 @@ const styles = theme => ({
   buttonFix: {
     ...defaultFont,
     fontWeight: 300,
-    margin: theme.spacing.unit
+    margin: theme.spacing(1)
   }
 });
 

diff --git a/app/components/common/styles/installFromSources.js b/app/components/common/styles/installFromSources.js
@@ -13,13 +13,13 @@ const styles = theme => ({
     ...defaultFont,
     color: darken(grayColor, 0.7),
     fontSize: 18,
-    marginBottom: theme.spacing.unit
+    marginBottom: theme.spacing(1)
   },
   description: {
     ...defaultFont
   },
   listItem: {
-    padding: theme.spacing.unit,
+    padding: theme.spacing(1),
     margin: 0
   },
   secondaryColor: {

diff --git a/app/components/common/styles/terminalStyles.js b/app/components/common/styles/terminalStyles.js
@@ -45,7 +45,7 @@ const styles = theme => ({
   terminal: {
     display: 'flex',
     flexDirection: 'column',
-    padding: theme.spacing.unit / 2,
+    padding: theme.spacing(0.5),
     backgroundColor: 'black',
     opacity: '0.7',
     minHeight: 150,
@@ -60,7 +60,7 @@ const styles = theme => ({
     borderBottomRightRadius: 5,
     '& > span': {
       width: '100%',
-      padding: theme.spacing.unit
+      padding: theme.spacing(1)
     }
   }
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ import Typography from '@material-ui/core/Typography'; @@
     const styles = theme => ({
       root: {
-        padding: theme.spacing.unit
+        padding: theme.spacing(1)
       }
     });
@@ Expand Down @@