Merge branch 'develop' into dayana

1 files changed, 60 insertions, 9 deletions

diff --git a/front/odiparpack/app/components/Notification/Notification.js b/front/odiparpack/app/components/Notification/Notification.js
index 7e73896..fcc53a4 100644
--- a/front/odiparpack/app/components/Notification/Notification.js
+++ b/front/odiparpack/app/components/Notification/Notification.js
@@ -2,8 +2,13 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { withStyles } from '@material-ui/core/styles';
 import CloseIcon from '@material-ui/icons/Close';
+import classNames from 'classnames';
+import CheckCircleOutlinedIcon from '@material-ui/icons/CheckCircleOutlined';
+import ErrorOutlineOutlinedIcon from '@material-ui/icons/ErrorOutlineOutlined';
+import InfoOutlinedIcon from '@material-ui/icons/InfoOutlined';
+import ReportProblemOutlinedIcon from '@material-ui/icons/ReportProblemOutlined';
 
-import { Snackbar, IconButton } from '@material-ui/core';
+import { Snackbar, IconButton, SnackbarContent } from '@material-ui/core';
 
 const styles = theme => ({
   close: {
@@ -11,6 +16,41 @@ const styles = theme => ({
   },
 });
 
+const variantIcon = {
+  success: CheckCircleOutlinedIcon,
+  warning: ReportProblemOutlinedIcon,
+  error: ErrorOutlineOutlinedIcon,
+  info: InfoOutlinedIcon,
+};
+
+const styles1 = theme => ({
+  success: {
+    backgroundColor: '#b6f8c4',
+  },
+  error: {
+    backgroundColor: '#faabab',
+  },
+  info: {
+    backgroundColor: '#b2e7f5',
+  },
+  warning: {
+    backgroundColor: '#f5ea9f',
+  },
+  icon: {
+    fontSize: 20,
+    color: 'black'
+  },
+  iconVariant: {
+    opacity: 0.9,
+    marginRight: theme.spacing(1),
+  },
+  message: {
+    display: 'flex',
+    alignItems: 'center',
+    color: 'black'
+  },
+});
+
 class Notification extends React.Component {
   handleClose = (event, reason) => {
     if (reason === 'clickaway') {
@@ -20,20 +60,30 @@ class Notification extends React.Component {
   };
 
   render() {
-    const { classes, message } = this.props;
+    const { classes, message, variant } = this.props;
+    const Icon = variantIcon[variant];
     return (
       <Snackbar
-        anchorOrigin={{
-          vertical: 'bottom',
-          horizontal: 'left',
-        }}
         open={message !== ''}
         autoHideDuration={3000}
         onClose={() => this.handleClose()}
         ContentProps={{
           'aria-describedby': 'message-id',
         }}
-        message={message}
+        anchorOrigin={{
+          vertical: 'top',
+          horizontal: 'right',
+        }}
+      
+      >
+      <SnackbarContent
+        className={classNames(classes[variant])}
+        message={(
+          <span id="client-snackbar" className={classes.message}>
+            <Icon className={classNames(classes.icon, classes.iconVariant)} />
+            {message}
+          </span>
+        )}
         action={[
           <IconButton
             key="close"
@@ -42,10 +92,11 @@ class Notification extends React.Component {
             className={classes.close}
             onClick={() => this.handleClose()}
           >
-            <CloseIcon />
+            <CloseIcon className={classes.icon}/>
           </IconButton>,
         ]}
       />
+    </Snackbar>
     );
   }
 }
@@ -56,4 +107,4 @@ Notification.propTypes = {
   message: PropTypes.string.isRequired,
 };
 
-export default withStyles(styles)(Notification);
+export default withStyles(styles1)(Notification);