aboutsummaryrefslogtreecommitdiff
path: root/src/pages
diff options
context:
space:
mode:
authoreug-vs <eug-vs@keemail.me>2020-06-24 00:52:26 +0300
committereug-vs <eug-vs@keemail.me>2020-06-24 00:57:29 +0300
commitfbdaa40e7ce585b65038835c05a283cec6f28d0e (patch)
treef7cf1593109a21841a93d237b1e28cb7735637d0 /src/pages
parent8930046d41841cba6cf368076b86e26088807848 (diff)
downloadwhich-ui-fbdaa40e7ce585b65038835c05a283cec6f28d0e.tar.gz
chore: migrate to which-types@1.3.1
Diffstat (limited to 'src/pages')
-rw-r--r--src/pages/AuthPage/SignUpForm.tsx9
-rw-r--r--src/pages/FeedPage/FeedPage.tsx3
-rw-r--r--src/pages/ProfilePage/ProfileInfo.tsx4
-rw-r--r--src/pages/ProfilePage/ProfilePage.tsx3
4 files changed, 10 insertions, 9 deletions
diff --git a/src/pages/AuthPage/SignUpForm.tsx b/src/pages/AuthPage/SignUpForm.tsx
index 2769eb0..0e3d0c7 100644
--- a/src/pages/AuthPage/SignUpForm.tsx
+++ b/src/pages/AuthPage/SignUpForm.tsx
@@ -31,12 +31,11 @@ const SignUpForm: React.FC<PropTypes> = ({ logIn }) => {
const inputRefPassword = useRef<HTMLInputElement>();
const onClick = () => {
- const name = inputRef.current?.value;
+ const username = inputRef.current?.value;
const password = inputRefPassword.current?.value;
- const newUser = { name, password };
- if (name && password) {
- post('/users', newUser).then(() => {
- logIn(name, password);
+ if (username && password) {
+ post('/users', { username, password }).then(() => {
+ logIn(username, password);
});
}
};
diff --git a/src/pages/FeedPage/FeedPage.tsx b/src/pages/FeedPage/FeedPage.tsx
index fd75190..937b0a9 100644
--- a/src/pages/FeedPage/FeedPage.tsx
+++ b/src/pages/FeedPage/FeedPage.tsx
@@ -1,5 +1,6 @@
import React, { useState, useEffect } from 'react';
-import { Poll } from '../../types';
+import { Poll } from 'which-types';
+
import Feed from '../../components/Feed/Feed';
import { get } from '../../requests';
diff --git a/src/pages/ProfilePage/ProfileInfo.tsx b/src/pages/ProfilePage/ProfileInfo.tsx
index bddecd8..7208ec8 100644
--- a/src/pages/ProfilePage/ProfileInfo.tsx
+++ b/src/pages/ProfilePage/ProfileInfo.tsx
@@ -2,7 +2,7 @@ import React from 'react';
import { Avatar } from '@material-ui/core/';
import { makeStyles } from '@material-ui/core/styles';
import Button from '@material-ui/core/Button/Button';
-import { User } from '../../types';
+import { User } from 'which-types';
interface PropTypes {
user: User | undefined;
@@ -41,7 +41,7 @@ const ProfileInfo: React.FC<PropTypes> = ({ user, logOut }) => {
<div>
<Avatar className={classes.avatar} src={user?.avatarUrl} />
<div className={classes.name}>
- {user?.name}
+ {user?.username}
</div>
<div className={classes.profileMenu}>
<div style={{ borderBottom: '1px solid green', color: 'green' }} className={classes.menuButton}>
diff --git a/src/pages/ProfilePage/ProfilePage.tsx b/src/pages/ProfilePage/ProfilePage.tsx
index 0f5fb2b..363d4ff 100644
--- a/src/pages/ProfilePage/ProfilePage.tsx
+++ b/src/pages/ProfilePage/ProfilePage.tsx
@@ -1,5 +1,6 @@
import React, { useState, useEffect } from 'react';
-import { User, Poll } from '../../types';
+import { User, Poll } from 'which-types';
+
import ProfileInfo from './ProfileInfo';
import Feed from '../../components/Feed/Feed';
import { get } from '../../requests';