diff --git a/package.json b/package.json index baf73a140..d5724f05e 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,9 @@ "@date-io/moment": "^1.3.13", "@emotion/react": "^11.7.1", "@emotion/styled": "^11.6.0", + "@fortawesome/fontawesome-svg-core": "^1.2.36", + "@fortawesome/free-brands-svg-icons": "^5.15.4", + "@fortawesome/react-fontawesome": "^0.1.16", "@mui/icons-material": "^5.2.5", "@mui/lab": "^5.0.0-alpha.61", "@mui/material": "^5.2.5", diff --git a/src/components/Alerts/Alerts.js b/src/components/Alerts/Alerts.js index 77e974c28..67d5dd453 100644 --- a/src/components/Alerts/Alerts.js +++ b/src/components/Alerts/Alerts.js @@ -1,12 +1,10 @@ import React from 'react'; import { connect } from 'react-redux'; -import { Snackbar } from '@mui/material'; import makeStyles from '@mui/styles/makeStyles'; -import MuiAlert from '@mui/material/Alert'; +import { IconButton, Slide, Snackbar } from '@mui/material'; +import CloseIcon from '@mui/icons-material/Close'; import { hideAlert } from '@redux/alert/actions/alert.actions'; -const Alert = (props) => ; - const useStyles = makeStyles((theme) => ({ root: { width: '100%', @@ -14,6 +12,22 @@ const useStyles = makeStyles((theme) => ({ marginTop: theme.spacing(2), }, }, + success: { + backgroundColor: '#009900', + color: '#000', + }, + info: { + backgroundColor: '#0099CC', + color: '#000', + }, + warning: { + backgroundColor: '#FFCC33', + color: '#000', + }, + error: { + backgroundColor: '#FF0033', + color: '#000', + }, })); const Alerts = ({ data, dispatch }) => { @@ -24,20 +38,37 @@ const Alerts = ({ data, dispatch }) => { } dispatch(hideAlert()); }; + return (
- - {data && ( - - {data.message} - - )} - + {data && ( + ( + + )} + classes={{ + root: classes[data.type], + }} + action={( + <> + + + + + )} + /> + )}
); }; @@ -47,4 +78,4 @@ const mapStateToProps = (state, ownProps) => ({ ...state.alertReducer, }); -export default connect(mapStateToProps)(Alerts); +export default connect(mapStateToProps)(Alerts); \ No newline at end of file diff --git a/src/pages/NewProject/components/ProjectSetup.js b/src/pages/NewProject/components/ProjectSetup.js index 337314a4c..9e7907c61 100644 --- a/src/pages/NewProject/components/ProjectSetup.js +++ b/src/pages/NewProject/components/ProjectSetup.js @@ -14,6 +14,8 @@ import { FormControlLabel, Radio, } from '@mui/material'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' +import { faGithub, faTrello, faAtlassian, faJira } from '@fortawesome/free-brands-svg-icons' import makeStyles from '@mui/styles/makeStyles'; import { Autocomplete } from '@mui/material'; import DatePickerComponent from '@components/DatePicker/DatePicker'; @@ -110,6 +112,12 @@ const useStyles = makeStyles((theme) => ({ backgroundColor: "#106ba3", }, }, + radioButton: { + margin: theme.spacing(2, 2) + }, + radioLeft: { + marginLeft: theme.spacing(2) + }, })); export let checkIfProjectSetupEdited; @@ -130,6 +138,21 @@ function StyledRadio(props) { ); } +function StyledStart(props) { + return ( + + ); +} const ProjectSetup = (props) => { const { history, loading, dispatch, location, handleNext, handleCancel, @@ -299,57 +322,87 @@ const ProjectSetup = (props) => { Requirements - - - } - label="Trello" - /> - } - label="Atlassian" - /> - } - label="Start Fresh" - /> - - + + Connect to supported tool + + + } + label={ + <> + + Trello + + } + /> + } + label={ + <> + + Atlassian + + } + /> + } + label="Start Fresh" + /> + + + Issues - - - } - label="Github" - /> - } - label="Jira" - /> - } - label="Start Fresh" - /> - - + + Connect to supported tool + + + } + label={ + <> + + Github + + } + /> + } + label={ + <> + + Jira + + } + /> + } + label="Start Fresh" + /> + + + diff --git a/src/styles/theme.js b/src/styles/theme.js index 760b75982..3c69644d4 100644 --- a/src/styles/theme.js +++ b/src/styles/theme.js @@ -36,7 +36,15 @@ const theme = createTheme(({ }, }, }, + MuiSnackbarContent: { + styleOverrides: { + root: { + color: '#000', + backgroundColor: 'transparent', + }, + }, + }, }, })); -export default responsiveFontSizes(theme); +export default responsiveFontSizes(theme); \ No newline at end of file