From 709fc75cdf91bcabac41573da5c36fe0cf72f869 Mon Sep 17 00:00:00 2001 From: ilyayudovin Date: Sun, 7 Jun 2020 00:40:37 +0300 Subject: refactor: change names and imports --- src/PollCard/PollCard.tsx | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 src/PollCard/PollCard.tsx (limited to 'src/PollCard') diff --git a/src/PollCard/PollCard.tsx b/src/PollCard/PollCard.tsx new file mode 100644 index 0000000..24ad3eb --- /dev/null +++ b/src/PollCard/PollCard.tsx @@ -0,0 +1,44 @@ +import React from 'react'; +import {makeStyles} from '@material-ui/core/styles'; +import Card from '@material-ui/core/Card'; +import CardActionArea from '@material-ui/core/CardActionArea'; +import CardActions from '@material-ui/core/CardActions'; +import CardContent from '@material-ui/core/CardContent'; +import CardMedia from '@material-ui/core/CardMedia'; +import Button from '@material-ui/core/Button'; +import Typography from '@material-ui/core/Typography'; + +const useStyles = makeStyles({ + root: { + maxWidth: 600, + height: 500, + margin: '20px auto', + }, + images: { + height: 400, + width: 300, + margin:'20px 0', + }, + imagesBlock: { + display:'flex', + } +}); + +const PollCard: React.FC = () =>{ + const classes = useStyles(); + + return ( + + +
+ + +
+
+ +
+ ); +} +export default PollCard; \ No newline at end of file -- cgit v1.2.3 From e8b723ae4f046c9f0bee667569e08f7a856855f2 Mon Sep 17 00:00:00 2001 From: ilyayudovin Date: Sun, 7 Jun 2020 02:37:23 +0300 Subject: feat:add avatar and nickname --- src/PollCard/PollCard.tsx | 45 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) (limited to 'src/PollCard') diff --git a/src/PollCard/PollCard.tsx b/src/PollCard/PollCard.tsx index 24ad3eb..b514397 100644 --- a/src/PollCard/PollCard.tsx +++ b/src/PollCard/PollCard.tsx @@ -7,6 +7,10 @@ import CardContent from '@material-ui/core/CardContent'; import CardMedia from '@material-ui/core/CardMedia'; import Button from '@material-ui/core/Button'; import Typography from '@material-ui/core/Typography'; +import Avatar from '@material-ui/core/Avatar'; +import CardHeader from '@material-ui/core/CardHeader'; + + const useStyles = makeStyles({ root: { @@ -17,27 +21,52 @@ const useStyles = makeStyles({ images: { height: 400, width: 300, - margin:'20px 0', }, imagesBlock: { - display:'flex', + display: 'flex', + }, + percentageLeft:{ + position:'absolute', + color: 'white', + top: '86%', + left:30, + fontSize:20, + }, + percentageRight:{ + position: 'absolute', + color: 'white', + top: '86%', + right:30, + fontSize:20, } + }); -const PollCard: React.FC = () =>{ +const PollCard: React.FC = () => { const classes = useStyles(); return ( - -
+ + R + + } + title="Nick Name" + /> +
+ +
25%
+
+ -
- - +
75%
+ +
); } -- cgit v1.2.3 From 4d3e2f0d19c1957feeebda7f476f4d56b377b86e Mon Sep 17 00:00:00 2001 From: ilyayudovin Date: Sun, 7 Jun 2020 02:58:36 +0300 Subject: fix: fixing all eslint errors --- src/PollCard/PollCard.tsx | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) (limited to 'src/PollCard') diff --git a/src/PollCard/PollCard.tsx b/src/PollCard/PollCard.tsx index b514397..a157411 100644 --- a/src/PollCard/PollCard.tsx +++ b/src/PollCard/PollCard.tsx @@ -1,43 +1,38 @@ import React from 'react'; -import {makeStyles} from '@material-ui/core/styles'; +import { makeStyles } from '@material-ui/core/styles'; import Card from '@material-ui/core/Card'; import CardActionArea from '@material-ui/core/CardActionArea'; -import CardActions from '@material-ui/core/CardActions'; -import CardContent from '@material-ui/core/CardContent'; import CardMedia from '@material-ui/core/CardMedia'; -import Button from '@material-ui/core/Button'; -import Typography from '@material-ui/core/Typography'; import Avatar from '@material-ui/core/Avatar'; import CardHeader from '@material-ui/core/CardHeader'; - const useStyles = makeStyles({ root: { maxWidth: 600, height: 500, - margin: '20px auto', + margin: '20px auto' }, images: { height: 400, - width: 300, + width: 300 }, imagesBlock: { - display: 'flex', + display: 'flex' }, - percentageLeft:{ - position:'absolute', + percentageLeft: { + position: 'absolute', color: 'white', top: '86%', - left:30, - fontSize:20, + left: 30, + fontSize: 20 }, - percentageRight:{ + percentageRight: { position: 'absolute', color: 'white', top: '86%', - right:30, - fontSize:20, + right: 30, + fontSize: 20 } }); @@ -48,26 +43,30 @@ const PollCard: React.FC = () => { return ( R - } + )} title="Nick Name" />
- +
25%
- +
75%
); -} -export default PollCard; \ No newline at end of file +}; +export default PollCard; -- cgit v1.2.3 From 9f3d7a362a2d15d72afd9852e115fff39b960acb Mon Sep 17 00:00:00 2001 From: ilyayudovin Date: Sun, 7 Jun 2020 15:26:20 +0300 Subject: fix:fixing imports and max-len eslint --- src/PollCard/PollCard.tsx | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'src/PollCard') diff --git a/src/PollCard/PollCard.tsx b/src/PollCard/PollCard.tsx index a157411..353c33c 100644 --- a/src/PollCard/PollCard.tsx +++ b/src/PollCard/PollCard.tsx @@ -1,11 +1,17 @@ import React from 'react'; import { makeStyles } from '@material-ui/core/styles'; -import Card from '@material-ui/core/Card'; -import CardActionArea from '@material-ui/core/CardActionArea'; -import CardMedia from '@material-ui/core/CardMedia'; -import Avatar from '@material-ui/core/Avatar'; -import CardHeader from '@material-ui/core/CardHeader'; - +import { + Card, + CardActionArea, + CardMedia, + Avatar, + CardHeader +} from '@material-ui/core/'; +// import Card from '@material-ui/core/Card'; +// import CardActionArea from '@material-ui/core/CardActionArea'; +// import CardMedia from '@material-ui/core/CardMedia'; +// import Avatar from '@material-ui/core/Avatar'; +// import CardHeader from '@material-ui/core/CardHeader'; const useStyles = makeStyles({ root: { @@ -54,6 +60,7 @@ const PollCard: React.FC = () => {
25%
@@ -61,6 +68,7 @@ const PollCard: React.FC = () => {
75%
-- cgit v1.2.3 From 584ca75571a73479ee5379ecf2c0a657de365c53 Mon Sep 17 00:00:00 2001 From: ilyayudovin Date: Sun, 7 Jun 2020 15:27:47 +0300 Subject: fix: deleting comments --- src/PollCard/PollCard.tsx | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/PollCard') diff --git a/src/PollCard/PollCard.tsx b/src/PollCard/PollCard.tsx index 353c33c..05e941c 100644 --- a/src/PollCard/PollCard.tsx +++ b/src/PollCard/PollCard.tsx @@ -7,11 +7,6 @@ import { Avatar, CardHeader } from '@material-ui/core/'; -// import Card from '@material-ui/core/Card'; -// import CardActionArea from '@material-ui/core/CardActionArea'; -// import CardMedia from '@material-ui/core/CardMedia'; -// import Avatar from '@material-ui/core/Avatar'; -// import CardHeader from '@material-ui/core/CardHeader'; const useStyles = makeStyles({ root: { -- cgit v1.2.3