aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorilyayudovin <46264063+ilyayudovin@users.noreply.github.com>2020-10-10 01:05:06 +0300
committerGitHub <noreply@github.com>2020-10-10 01:05:06 +0300
commit40ac5922118015aae943872717730d7068976b1a (patch)
tree8affbbac3fa19cd43cc0f0730dcee80733fc2bfa
parentfcaddcd6ad8607d05279acdb87675de6180ac1cb (diff)
parent76e235f22f15b0590d2c6594f9c298d94ba59307 (diff)
downloadwhich-ui-40ac5922118015aae943872717730d7068976b1a.tar.gz
Merge pull request #105 from which-ecosystem/correction
Correction
-rw-r--r--debug.log1
-rw-r--r--src/components/PollCard/PollCard.tsx3
-rw-r--r--src/components/UserStrip/UserStrip.tsx90
-rw-r--r--src/containers/Home/Home.tsx6
-rw-r--r--src/containers/PollCreation/PollCreation.tsx5
5 files changed, 53 insertions, 52 deletions
diff --git a/debug.log b/debug.log
new file mode 100644
index 0000000..fbab42b
--- /dev/null
+++ b/debug.log
@@ -0,0 +1 @@
+[1009/214654.488:ERROR:directory_reader_win.cc(43)] FindFirstFile: Системе не удается найти указанный путь. (0x3)
diff --git a/src/components/PollCard/PollCard.tsx b/src/components/PollCard/PollCard.tsx
index a06bad8..64fab34 100644
--- a/src/components/PollCard/PollCard.tsx
+++ b/src/components/PollCard/PollCard.tsx
@@ -44,7 +44,8 @@ const useStyles = makeStyles(theme => ({
transitionDuration: '0.5s'
},
description: {
- padding: theme.spacing(1, 2),
+ fontSize: 14,
+ padding: theme.spacing(0, 2, 1.25),
wordWrap: 'break-word',
whiteSpace: 'pre-wrap'
}
diff --git a/src/components/UserStrip/UserStrip.tsx b/src/components/UserStrip/UserStrip.tsx
index a837961..bdb36bd 100644
--- a/src/components/UserStrip/UserStrip.tsx
+++ b/src/components/UserStrip/UserStrip.tsx
@@ -1,45 +1,45 @@
-import React from 'react';
-import { makeStyles } from '@material-ui/core/styles';
-import VerifiedIcon from '@material-ui/icons/CheckCircleOutline';
-import { CardHeader } from '@material-ui/core/';
-import { User } from 'which-types';
-
-import Avatar from '../Avatar/Avatar';
-
-
-interface PropTypes {
- user: User;
- info?: string | JSX.Element
-}
-
-
-const useStyles = makeStyles(theme => ({
- root: {
- display: 'flex',
- alignItems: 'center'
- },
- verified: {
- marginLeft: theme.spacing(0.5),
- width: theme.spacing(2),
- height: theme.spacing(2)
- }
-}));
-
-
-const UserStrip: React.FC<PropTypes> = ({ user, info }) => {
- const classes = useStyles();
- const { username, verified } = user;
-
- const avatar = <Avatar user={user} />;
-
- const title = (
- <div className={classes.root}>
- {username}
- {verified && <VerifiedIcon color="primary" className={classes.verified} />}
- </div>
- );
-
- return <CardHeader avatar={avatar} title={title} subheader={info} />;
-};
-
-export default UserStrip;
+import React from 'react';
+import { makeStyles } from '@material-ui/core/styles';
+import VerifiedIcon from '@material-ui/icons/CheckCircleOutline';
+import { CardHeader } from '@material-ui/core/';
+import { User } from 'which-types';
+
+import Avatar from '../Avatar/Avatar';
+
+
+interface PropTypes {
+ user: User;
+ info?: string | JSX.Element
+}
+
+
+const useStyles = makeStyles(theme => ({
+ root: {
+ display: 'flex',
+ alignItems: 'center'
+ },
+ verified: {
+ marginLeft: theme.spacing(0.5),
+ width: theme.spacing(2),
+ height: theme.spacing(2)
+ }
+}));
+
+
+const UserStrip: React.FC<PropTypes> = ({ user, info }) => {
+ const classes = useStyles();
+ const { username, verified } = user;
+
+ const avatar = <Avatar user={user} />;
+
+ const title = (
+ <div className={classes.root}>
+ {username}
+ {verified && <VerifiedIcon color="primary" className={classes.verified} />}
+ </div>
+ );
+
+ return <CardHeader avatar={avatar} title={title} subheader={info} />;
+};
+
+export default UserStrip;
diff --git a/src/containers/Home/Home.tsx b/src/containers/Home/Home.tsx
index 4fd2833..e97d640 100644
--- a/src/containers/Home/Home.tsx
+++ b/src/containers/Home/Home.tsx
@@ -71,7 +71,7 @@ const Home: React.FC = () => {
const Reviews = (
<div className={classes.reviews}>
- {feedbacks?.map((feedback: Feedback) => <ReviewCard feedback={feedback} />)}
+ {feedbacks?.map((feedback: Feedback, index) => <ReviewCard key={index} feedback={feedback} />)}
</div>
);
@@ -130,7 +130,7 @@ const Home: React.FC = () => {
<Grid item>
<Typography variant="h4"> Which one to choose? </Typography>
<Divider />
- <Typography>
+ <Typography component="span">
<p>
Have you ever found yourself stuck between two options, not being able to choose any?
This is exactly the problem we are going to solve!
@@ -156,7 +156,7 @@ const Home: React.FC = () => {
<Grid item>
<Typography variant="h4">{`What's new in ${release?.version}?`}</Typography>
<Divider />
- <Typography className={classes.patchNotes}>
+ <Typography component="span" className={classes.patchNotes}>
<p>{release?.description}</p>
</Typography>
<Button
diff --git a/src/containers/PollCreation/PollCreation.tsx b/src/containers/PollCreation/PollCreation.tsx
index 2e2bd06..b761c73 100644
--- a/src/containers/PollCreation/PollCreation.tsx
+++ b/src/containers/PollCreation/PollCreation.tsx
@@ -14,7 +14,6 @@ import { post } from '../../requests';
import { useFeed, useProfile } from '../../hooks/APIClient';
import { useAuth } from '../../hooks/useAuth';
-
const useStyles = makeStyles(theme => ({
images: {
height: theme.spacing(50),
@@ -25,11 +24,11 @@ const useStyles = makeStyles(theme => ({
height: 100
},
description: {
+ fontSize: 14,
padding: theme.spacing(1, 2)
}
}));
-
const PollCreation: React.FC = () => {
const [description, setDescription] = useState<string>('');
const classes = useStyles();
@@ -84,7 +83,7 @@ const PollCreation: React.FC = () => {
<Container maxWidth="sm" disableGutters>
<Card elevation={3}>
{user && <UserStrip user={user} />}
- <Typography>
+ <Typography component="span">
<InputBase
multiline
fullWidth