diff options
author | eug-vs <eug-vs@keemail.me> | 2020-07-05 12:18:55 +0300 |
---|---|---|
committer | eug-vs <eug-vs@keemail.me> | 2020-07-05 12:18:55 +0300 |
commit | c50c38657e23de012699781f07a51dd7e4199b77 (patch) | |
tree | 6839425564bd5ba4055d98cb362fc7193d57c804 /src | |
parent | ad049a20fa2d92d9d0cee0af25be799eadf02b46 (diff) | |
download | which-ui-c50c38657e23de012699781f07a51dd7e4199b77.tar.gz |
feat: implement feedback feature
Diffstat (limited to 'src')
-rw-r--r-- | src/pages/HomePage/HomePage.tsx | 62 | ||||
-rw-r--r-- | src/pages/HomePage/ReviewForm.tsx | 75 | ||||
-rw-r--r-- | src/pages/NotificationsPage/NotificationsPage.tsx | 2 |
3 files changed, 130 insertions, 9 deletions
diff --git a/src/pages/HomePage/HomePage.tsx b/src/pages/HomePage/HomePage.tsx index ab04281..7b04bff 100644 --- a/src/pages/HomePage/HomePage.tsx +++ b/src/pages/HomePage/HomePage.tsx @@ -4,9 +4,10 @@ import { Divider, Grid, Button, - Link + Link, + useMediaQuery } from '@material-ui/core/'; -import { makeStyles } from '@material-ui/core/styles'; +import { makeStyles, useTheme } from '@material-ui/core/styles'; import TrendingUpIcon from '@material-ui/icons/TrendingUp'; import { Rating } from '@material-ui/lab'; import { Feedback } from 'which-types'; @@ -15,6 +16,7 @@ import { useNavigate } from '../../hooks/useNavigate'; import { useAuth } from '../../hooks/useAuth'; import { get } from '../../requests'; import ReviewCard from '../../components/ReviewCard/ReviewCard'; +import ReviewForm from './ReviewForm'; const useStyles = makeStyles(theme => ({ root: { @@ -42,7 +44,9 @@ const HomePage: React.FC = () => { const [feedbacks, setFeedbacks] = useState<Feedback[]>([]); const classes = useStyles(); const { navigate } = useNavigate(); - const { isAuthenticated } = useAuth(); + const { isAuthenticated, user } = useAuth(); + const theme = useTheme(); + const isMobile = useMediaQuery(theme.breakpoints.down('sm')); const rating = feedbacks.length && feedbacks.reduce( (acc: number, feedback: Feedback) => acc + feedback.score, @@ -68,6 +72,7 @@ const HomePage: React.FC = () => { const ReactLink = <Link href="https://reactjs.org/">React</Link>; const FeathersLink = <Link href="https://feathersjs.com">Feathers</Link>; const MUILink = <Link href="https://material-ui.com">Material-UI</Link>; + const EmailLink = <Link href="mailto: eug-vs@keemail.me">eug-vs@keemail.me</Link> const Reviews = ( <div className={classes.reviews}> @@ -75,6 +80,33 @@ const HomePage: React.FC = () => { </div> ); + const FeedbackSection = feedbacks.findIndex((feedback: Feedback) => feedback.author._id === user?._id) >= 0 ? ( + <p> + You have already left feedback for this version. + If you have more to say, please open GitHub issue or contact us directly via email: {EmailLink}. + Alternatively, you can just wait for another application patch to come out. + </p> + ) : ( + <> + <p> + Here you can share your thougts about Which with us! + Note that you can ony leave feedback once per application version (there will be plenty of them later). + </p> + {isAuthenticated() ? <ReviewForm /> : ( + <> + <p> You must be authorized to leave feedback.</p> + <Button + variant="outlined" + color="primary" + onClick={handleSignUp} + > + sign in + </Button> + </> + )} + </> + ); + return ( <div className={classes.root}> <Grid container spacing={4}> @@ -84,15 +116,17 @@ const HomePage: React.FC = () => { <img src={`${process.env.PUBLIC_URL}/which-logo-512.png`} alt="logo" className={classes.logo} /> </Grid> <Grid item> - <Rating value={rating} readOnly size="large" /> + {rating && <Rating value={rating} readOnly size="large" />} </Grid> <Grid item> - <Typography variant="h5" className={classes.score}> - User score: {rating.toFixed(1)} - </Typography> + {rating && ( + <Typography variant="h5" className={classes.score}> + User score: {rating.toFixed(1)} + </Typography> + )} </Grid> </Grid> - {Reviews} + {isMobile || Reviews} </Grid> <Grid item xs={12} md={5}> <Grid container direction="column" spacing={6}> @@ -146,6 +180,18 @@ const HomePage: React.FC = () => { </Button> </Typography> </Grid> + <Grid item> + <Typography variant="h4"> Leave feedback </Typography> + <Divider /> + <Typography> + {FeedbackSection} + </Typography> + </Grid> + {isMobile && ( + <Grid item> + {Reviews} + </Grid> + )} </Grid> </Grid> </Grid> diff --git a/src/pages/HomePage/ReviewForm.tsx b/src/pages/HomePage/ReviewForm.tsx new file mode 100644 index 0000000..58a61b4 --- /dev/null +++ b/src/pages/HomePage/ReviewForm.tsx @@ -0,0 +1,75 @@ +import React, { useState, useRef } from 'react'; +import { makeStyles } from '@material-ui/core/styles'; +import { TextField, Button } from '@material-ui/core'; +import { Rating } from '@material-ui/lab'; +import { useSnackbar } from 'notistack'; + +import { post } from '../../requests'; +import { useAuth } from '../../hooks/useAuth'; +import { useNavigate } from '../../hooks/useNavigate'; + +const version = 'v1.0.0'; + +const useStyles = makeStyles(theme => ({ + root: { + display: 'flex', + flexDirection: 'column' + }, + textField: { + margin: theme.spacing(2, 0) + } +})); + +const ReviewForm: React.FC = () => { + const [contents, setContents] = useState<string>(''); + const [score, setScore] = useState<number>(0); + const classes = useStyles(); + const { navigate } = useNavigate(); + const { enqueueSnackbar } = useSnackbar(); + + const handleSubmit = (): void => { + if (contents && score) { + post('/feedback', { contents, score, version }).then(() => { + enqueueSnackbar('Your feedback has been submitted!', { + variant: 'success' + }); + navigate('feed'); + }); + } + }; + + const handleChange = (event: any): void => { + setContents(event.target?.value || ''); + }; + + const handleChangeRating = (event: any, newScore: any): void => { + setScore(newScore); + }; + + return ( + <div className={classes.root}> + <Rating value={score} onChange={handleChangeRating} size="large"/> + <TextField + value={contents} + onChange={handleChange} + label="Feedback" + variant="outlined" + className={classes.textField} + rows={4} + multiline + /> + <div> + <Button + variant="contained" + color="primary" + size="large" + onClick={handleSubmit} + > + submit + </Button> + </div> + </div> + ); +}; + +export default ReviewForm; diff --git a/src/pages/NotificationsPage/NotificationsPage.tsx b/src/pages/NotificationsPage/NotificationsPage.tsx index 3c39ba3..064fbd4 100644 --- a/src/pages/NotificationsPage/NotificationsPage.tsx +++ b/src/pages/NotificationsPage/NotificationsPage.tsx @@ -4,7 +4,7 @@ import { Typography } from '@material-ui/core'; const useStyles = makeStyles(theme => ({ root: { - marginTop: theme.spacing(40), + marginTop: theme.spacing(25), textAlign: 'center' } })); |