From 6514ed55e3f608f468e103cacad547aed276b8bf Mon Sep 17 00:00:00 2001 From: eug-vs Date: Fri, 9 Oct 2020 03:26:42 +0300 Subject: feat: display version chip on ReviewCard --- src/components/ReviewCard/ReviewCard.tsx | 17 +++++++++++++++-- src/containers/Home/Home.tsx | 7 ++++--- src/containers/Home/ReviewForm.tsx | 7 +++++-- src/hooks/APIClient.ts | 2 +- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/components/ReviewCard/ReviewCard.tsx b/src/components/ReviewCard/ReviewCard.tsx index 2016a5e..ccf051c 100644 --- a/src/components/ReviewCard/ReviewCard.tsx +++ b/src/components/ReviewCard/ReviewCard.tsx @@ -4,7 +4,8 @@ import { Card, CardContent, Typography, - Divider + Divider, + Chip } from '@material-ui/core/'; import { Rating } from '@material-ui/lab'; import { Feedback } from 'which-types'; @@ -17,7 +18,13 @@ interface PropTypes { const useStyles = makeStyles(theme => ({ root: { - margin: theme.spacing(4, 0, 1, 0) + margin: theme.spacing(4, 0, 1, 0), + position: 'relative' + }, + versionChip: { + position: 'absolute', + right: theme.spacing(2), + top: theme.spacing(2) } })); @@ -30,6 +37,12 @@ const ReviewCard: React.FC = ({ feedback }) => { user={feedback.author} info={} /> + {feedback.contents && ( <> diff --git a/src/containers/Home/Home.tsx b/src/containers/Home/Home.tsx index 71b902b..4fd2833 100644 --- a/src/containers/Home/Home.tsx +++ b/src/containers/Home/Home.tsx @@ -38,8 +38,9 @@ const useStyles = makeStyles(theme => ({ marginLeft: theme.spacing(2) }, reviews: { + margin: 'auto', [theme.breakpoints.up('md')]: { - padding: theme.spacing(0, 10) + width: '70%' } } })); @@ -75,7 +76,7 @@ const Home: React.FC = () => { ); const FeedbackSection = feedbacks && feedbacks.findIndex( - (feedback: Feedback) => feedback.author._id === user?._id + (feedback: Feedback) => (feedback.author._id === user?._id && feedback.version === release?.version) ) >= 0 ? (

You have already left feedback for this version. @@ -88,7 +89,7 @@ const Home: React.FC = () => { 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).

- {isAuthenticated ? : ( + {isAuthenticated ? : ( <>

You must be authorized to leave feedback.