Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 4 additions & 22 deletions components/Account/Modal.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { useState } from 'react';
import PropTypes from 'prop-types';
import {
Button, Modal, makeStyles, Snackbar,
Button, Modal, makeStyles,
} from '@material-ui/core';
import Alert from '@material-ui/lab/Alert';

import api from '../../utils/api';
import { useAuth } from '../../src/contexts/auth';
import SnackAlert from '../shared/alert';

function getModalStyle() {
const top = 50;
Expand Down Expand Up @@ -90,26 +90,8 @@ function DeleteAccountModal({ open, setOpen }) {
>
Delete Account
</Button>
<Snackbar
anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
open={successOpen}
autoHideDuration={3000}
onClose={handleSnackClose}
>
<Alert onClose={handleSnackClose} severity="success">
Account has been deleted. Redirecting...
</Alert>
</Snackbar>
<Snackbar
anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
open={errorOpen}
autoHideDuration={3000}
onClose={handleSnackClose}
>
<Alert onClose={handleSnackClose} severity="error">
Some error occurred. Please try again later.
</Alert>
</Snackbar>
<SnackAlert open={successOpen} onClose={handleSnackClose} severity="success" message="Account has been deleted. Redirecting..." />
<SnackAlert open={errorOpen} onClose={handleSnackClose} severity="error" message="Some error occurred. Please try again later." />
</div>
</Modal>
);
Expand Down
25 changes: 3 additions & 22 deletions components/Editor/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ import {
Button,
makeStyles,
Grid,
Snackbar,
} from '@material-ui/core';
import Alert from '@material-ui/lab/Alert';
import PropTypes from 'prop-types';
import { Formik, Form } from 'formik';
import { useRouter } from 'next/router';
Expand All @@ -20,6 +18,7 @@ import EnvironmentVariablesCard from './EnvironmentVariablesCard';
import HeadersCard from './HeadersCard';

import api from '../../utils/api';
import SnackAlert from '../shared/alert';

const useStyles = makeStyles((theme) => ({
root: {
Expand Down Expand Up @@ -198,26 +197,8 @@ function Editor({ bridge, isEditView }) {
</Formik>
</Grid>
</Grid>
<Snackbar
open={open}
autoHideDuration={3000}
onClose={handleClose}
anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
>
<Alert onClose={handleClose} severity="success">
Bridge has been saved.
</Alert>
</Snackbar>
<Snackbar
open={errorOpen}
autoHideDuration={3000}
onClose={handleClose}
anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
>
<Alert onClose={handleClose} severity="error">
Some error has occured. Please try again.
</Alert>
</Snackbar>
<SnackAlert open={open} onClose={handleClose} severity="success" message="Bridge has been saved." />
<SnackAlert open={errorOpen} onClose={handleClose} severity="error" message="Some error has occured. Please try again." />
</>
);
}
Expand Down
33 changes: 33 additions & 0 deletions components/shared/alert/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import PropTypes from 'prop-types';
import { Snackbar } from '@material-ui/core';
import Alert from '@material-ui/lab/Alert';

function SnackAlert({
open, severity, message, onClose,
}) {
return (
<Snackbar
anchorOrigin={{ vertical: 'top', horizontal: 'center' }}
open={open}
onClose={onClose}
autoHideDuration={3000}
>
<Alert severity={severity}>
{ message }
</Alert>
</Snackbar>
);
}

export default SnackAlert;

SnackAlert.propTypes = {
open: PropTypes.bool.isRequired,
onClose: PropTypes.func,
severity: PropTypes.string.isRequired,
message: PropTypes.string.isRequired,
};

SnackAlert.defaultProps = {
onClose: () => {},
};
25 changes: 3 additions & 22 deletions pages/users/account.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ import {
Container,
Grid,
Typography,
Snackbar,
} from '@material-ui/core';
import Alert from '@material-ui/lab/Alert';
import { TextField, CheckboxWithLabel } from 'formik-material-ui';

import Navbar from '../../components/shared/dashboard/Navbar';
Expand All @@ -19,6 +17,7 @@ import ProtectRoute from '../../utils/ProtectRoute';

import api from '../../utils/api';
import fetchDataOrRedirect from '../../utils/ssrRedirect';
import SnackAlert from '../../components/shared/alert';

function Account({ user }) {
const [open, setOpen] = useState(false);
Expand Down Expand Up @@ -212,26 +211,8 @@ function Account({ user }) {
</Form>
)}
</Formik>
<Snackbar
anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
open={successOpen}
autoHideDuration={3000}
onClose={handleSnackClose}
>
<Alert onClose={handleSnackClose} severity="success">
Account info has been updated.
</Alert>
</Snackbar>
<Snackbar
anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
open={errorOpen}
autoHideDuration={3000}
onClose={handleSnackClose}
>
<Alert onClose={handleSnackClose} severity="error">
Some error occurred. Please try again later.
</Alert>
</Snackbar>
<SnackAlert open={successOpen} onClose={handleSnackClose} severity="success" message="Account info has been updated." />
<SnackAlert open={errorOpen} onClose={handleSnackClose} severity="error" message="Some error occurred. Please try again later." />
</ProtectRoute>
);
}
Expand Down
25 changes: 3 additions & 22 deletions pages/users/signup.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ import {
makeStyles,
Link,
Paper,
Snackbar,
} from '@material-ui/core';
import Alert from '@material-ui/lab/Alert';
import { useRouter } from 'next/router';

import { Formik, Form, Field } from 'formik';
Expand All @@ -18,6 +16,7 @@ import { TextField } from 'formik-material-ui';
import { useAuth } from '../../src/contexts/auth';
import emailValidator from '../../utils/emailValidator';
import api from '../../utils/api';
import SnackAlert from '../../components/shared/alert';

const useStyles = makeStyles((theme) => ({
paper: {
Expand Down Expand Up @@ -179,26 +178,8 @@ function Signup() {
</Link>
</Container>
</Paper>
<Snackbar
anchorOrigin={{ vertical: 'top', horizontal: 'center' }}
open={successOpen}
autoHideDuration={3000}
onClose={handleSnackClose}
>
<Alert onClose={handleSnackClose} severity="success">
Account has been created. Redirecting...
</Alert>
</Snackbar>
<Snackbar
anchorOrigin={{ vertical: 'top', horizontal: 'center' }}
open={errorOpen}
autoHideDuration={3000}
onClose={handleSnackClose}
>
<Alert onClose={handleSnackClose} severity="error">
Some error occurred. Please try again.
</Alert>
</Snackbar>
<SnackAlert open={successOpen} onClose={handleSnackClose} severity="success" message="Account has been created. Redirecting..." />
<SnackAlert open={errorOpen} onClose={handleSnackClose} severity="error" message="Some error occurred. Please try again." />
</Grid>
);
}
Expand Down