From 1f646377c35b65b97d6eeebb1e88f6d8307e1ef0 Mon Sep 17 00:00:00 2001
From: eug-vs <eug-vs@keemail.me>
Date: Mon, 29 Jun 2020 23:59:15 +0300
Subject: feat!: create useAuth hook

---
 src/pages/AuthPage/AuthPage.tsx       | 11 +++--------
 src/pages/AuthPage/SignInForm.tsx     | 10 ++++------
 src/pages/AuthPage/SignUpForm.tsx     |  9 ++++-----
 src/pages/FeedPage/FeedPage.tsx       |  7 ++++---
 src/pages/FeedPage/PollSubmission.tsx |  9 +++++----
 src/pages/ProfilePage/MoreMenu.tsx    | 11 +++++------
 src/pages/ProfilePage/ProfileInfo.tsx | 24 ++++++++++++------------
 src/pages/ProfilePage/ProfilePage.tsx | 10 ++--------
 8 files changed, 39 insertions(+), 52 deletions(-)

(limited to 'src/pages')

diff --git a/src/pages/AuthPage/AuthPage.tsx b/src/pages/AuthPage/AuthPage.tsx
index d2c2eec..ad93463 100644
--- a/src/pages/AuthPage/AuthPage.tsx
+++ b/src/pages/AuthPage/AuthPage.tsx
@@ -3,11 +3,6 @@ import { makeStyles } from '@material-ui/core/styles';
 import SignInForm from './SignInForm';
 import SignUpForm from './SignUpForm';
 
-
-interface PropTypes {
-  logIn: (name: string, password: string, remember?: boolean) => Promise<boolean>;
-}
-
 const useStyles = makeStyles({
   formTransfer: {
     display: 'flex',
@@ -20,7 +15,7 @@ const useStyles = makeStyles({
   }
 });
 
-const AuthPage: React.FC<PropTypes> = ({ logIn }) => {
+const AuthPage: React.FC = () => {
   const [auth, setAuth] = useState<'signIn' | 'signUp'>('signIn');
   const classes = useStyles();
 
@@ -35,8 +30,8 @@ const AuthPage: React.FC<PropTypes> = ({ logIn }) => {
 
   return (
     <>
-      {auth === 'signIn' && <SignInForm logIn={logIn} />}
-      {auth === 'signUp' && <SignUpForm logIn={logIn} />}
+      {auth === 'signIn' && <SignInForm />}
+      {auth === 'signUp' && <SignUpForm />}
       <div className={classes.formTransfer}>
         <div>{footerInfo[auth][0]}</div>
         <span
diff --git a/src/pages/AuthPage/SignInForm.tsx b/src/pages/AuthPage/SignInForm.tsx
index 1dad153..662a312 100644
--- a/src/pages/AuthPage/SignInForm.tsx
+++ b/src/pages/AuthPage/SignInForm.tsx
@@ -6,10 +6,7 @@ import {
   FormControlLabel,
   Switch
 } from '@material-ui/core';
-
-interface PropTypes {
-  logIn: (name: string, password: string, remember?: boolean) => Promise<boolean>;
-}
+import { useAuth } from '../../hooks/useAuth';
 
 const useStyles = makeStyles(theme => ({
   root: {
@@ -28,12 +25,13 @@ const useStyles = makeStyles(theme => ({
   }
 }));
 
-const SignInForm: React.FC<PropTypes> = ({ logIn }) => {
+const SignInForm: React.FC = () => {
   const [error, setError] = useState<boolean>(false);
   const [remember, setRemember] = useState<boolean>(true);
   const classes = useStyles();
   const nameRef = useRef<HTMLInputElement>();
   const passwordRef = useRef<HTMLInputElement>();
+  const { login } = useAuth();
 
   const handleCheck = () => {
     setRemember(!remember);
@@ -43,7 +41,7 @@ const SignInForm: React.FC<PropTypes> = ({ logIn }) => {
     const name = nameRef.current?.value;
     const password = passwordRef.current?.value;
     if (name && password) {
-      logIn(name, password, remember).then(success => {
+      login(name, password, remember).then(success => {
         if (!success) setError(true);
       });
     }
diff --git a/src/pages/AuthPage/SignUpForm.tsx b/src/pages/AuthPage/SignUpForm.tsx
index 25b79ff..af7a0f8 100644
--- a/src/pages/AuthPage/SignUpForm.tsx
+++ b/src/pages/AuthPage/SignUpForm.tsx
@@ -3,10 +3,8 @@ import { makeStyles } from '@material-ui/core/styles';
 import TextField from '@material-ui/core/TextField';
 import Button from '@material-ui/core/Button';
 import { post } from '../../requests';
+import { useAuth } from '../../hooks/useAuth';
 
-interface PropTypes {
-  logIn: (name: string, password: string) => Promise<boolean>;
-}
 
 const useStyles = makeStyles(theme => ({
   root: {
@@ -25,12 +23,13 @@ const useStyles = makeStyles(theme => ({
   }
 }));
 
-const SignUpForm: React.FC<PropTypes> = ({ logIn }) => {
+const SignUpForm: React.FC = () => {
   const [error, setError] = useState<boolean>(false);
   const classes = useStyles();
   const usernameRef = useRef<HTMLInputElement>();
   const emailRef = useRef<HTMLInputElement>();
   const passwordRef = useRef<HTMLInputElement>();
+  const { login } = useAuth();
 
   const onClick = () => {
     const username = usernameRef.current?.value;
@@ -38,7 +37,7 @@ const SignUpForm: React.FC<PropTypes> = ({ logIn }) => {
     const email = emailRef.current?.value;
     if (username && password) {
       post('/users', { username, password, email }).then(() => {
-        logIn(username, password);
+        login(username, password);
       });
     } else setError(true);
   };
diff --git a/src/pages/FeedPage/FeedPage.tsx b/src/pages/FeedPage/FeedPage.tsx
index 0017275..6561991 100644
--- a/src/pages/FeedPage/FeedPage.tsx
+++ b/src/pages/FeedPage/FeedPage.tsx
@@ -4,15 +4,16 @@ import { Poll, User } from 'which-types';
 import Feed from '../../components/Feed/Feed';
 import { get } from '../../requests';
 import PollSubmission from './PollSubmission';
+import { useAuth } from '../../hooks/useAuth';
 
 
 interface PropTypes {
   navigate: (prefix: string, id: string) => void;
-  user: User | undefined;
 }
 
-const FeedPage: React.FC<PropTypes> = ({ navigate, user }) => {
+const FeedPage: React.FC<PropTypes> = ({ navigate }) => {
   const [polls, setPolls] = useState<Poll[]>([]);
+  const { isAuthenticated } = useAuth();
 
   useEffect(() => {
     get('/feed').then(response => {
@@ -28,7 +29,7 @@ const FeedPage: React.FC<PropTypes> = ({ navigate, user }) => {
 
   return (
     <>
-      {user && <PollSubmission user={user} addPoll={addPoll} />}
+      {isAuthenticated() && <PollSubmission addPoll={addPoll} />}
       <Feed polls={polls} navigate={navigate} />
     </>
   );
diff --git a/src/pages/FeedPage/PollSubmission.tsx b/src/pages/FeedPage/PollSubmission.tsx
index 16c8350..4e06254 100644
--- a/src/pages/FeedPage/PollSubmission.tsx
+++ b/src/pages/FeedPage/PollSubmission.tsx
@@ -12,9 +12,9 @@ import PollSubmissionImage from './PollSubmissionImage';
 import UserStrip from '../../components/UserStrip/UserStrip';
 import { post } from '../../requests';
 import { Contents } from './types';
+import { useAuth } from '../../hooks/useAuth';
 
 interface PropTypes{
-  user: User;
   addPoll: (poll: Poll) => void;
 }
 
@@ -30,10 +30,11 @@ const emptyContents: Contents = {
   right: { url: '' }
 };
 
-const PollSubmission: React.FC<PropTypes> = ({ user, addPoll }) => {
+const PollSubmission: React.FC<PropTypes> = ({ addPoll }) => {
   const classes = useStyles();
   const [expanded, setExpanded] = useState(false);
   const [contents, setContents] = useState<Contents>(emptyContents);
+  const { user } = useAuth();
 
   const readyToSubmit = contents.left.url && contents.right.url;
 
@@ -47,7 +48,7 @@ const PollSubmission: React.FC<PropTypes> = ({ user, addPoll }) => {
 
   const handleClick = () => {
     if (expanded && readyToSubmit) {
-      post('/polls/', { authorId: user._id, contents }).then(response => {
+      post('/polls/', { contents }).then(response => {
         addPoll(response.data);
       });
       setContents({ ...emptyContents });
@@ -59,7 +60,7 @@ const PollSubmission: React.FC<PropTypes> = ({ user, addPoll }) => {
     <ClickAwayListener onClickAway={handleClickAway}>
       <Card>
         <Collapse in={expanded} timeout="auto" unmountOnExit>
-          <UserStrip user={user} info="" navigate={() => {}} />
+          {user && <UserStrip user={user} info="" navigate={() => {}} />}
           <Divider />
           <div className={classes.root}>
             <PollSubmissionImage url={contents.left.url} setUrl={setUrl('left')} />
diff --git a/src/pages/ProfilePage/MoreMenu.tsx b/src/pages/ProfilePage/MoreMenu.tsx
index bf3347b..7c17f1e 100644
--- a/src/pages/ProfilePage/MoreMenu.tsx
+++ b/src/pages/ProfilePage/MoreMenu.tsx
@@ -4,10 +4,7 @@ import Menu from '@material-ui/core/Menu';
 import MenuItem from '@material-ui/core/MenuItem';
 import MoreHorizIcon from '@material-ui/icons/MoreHoriz';
 import { makeStyles } from '@material-ui/core';
-
-interface PropTypes {
-  logOut: () => void;
-}
+import { useAuth } from '../../hooks/useAuth';
 
 const ITEM_HEIGHT = 48;
 
@@ -19,9 +16,11 @@ const useStyles = makeStyles({
   }
 });
 
-const MoreMenu: React.FC<PropTypes> = ({ logOut }) => {
+const MoreMenu: React.FC = () => {
   const classes = useStyles();
   const [anchorEl, setAnchorEl] = React.useState<HTMLButtonElement | null>(null);
+  const { logout } = useAuth();
+
   const open = Boolean(anchorEl);
 
   const handleClick = (event: React.MouseEvent<HTMLButtonElement>) => {
@@ -56,7 +55,7 @@ const MoreMenu: React.FC<PropTypes> = ({ logOut }) => {
             }
           }}
         >
-          <MenuItem onClick={logOut}>Log out</MenuItem>
+          <MenuItem onClick={logout}>Log out</MenuItem>
         </Menu>
       </div>
     </div>
diff --git a/src/pages/ProfilePage/ProfileInfo.tsx b/src/pages/ProfilePage/ProfileInfo.tsx
index 9fe5912..9557a5e 100644
--- a/src/pages/ProfilePage/ProfileInfo.tsx
+++ b/src/pages/ProfilePage/ProfileInfo.tsx
@@ -8,15 +8,14 @@ import MoreMenu from './MoreMenu';
 import Highlight from './Highlight';
 import UploadImage from '../../components/UploadImage/UploadImage';
 import { patch } from '../../requests';
+import { useAuth } from '../../hooks/useAuth';
 
 
 interface PropTypes {
-  user: User | undefined;
-  logOut: () => void;
   savedPolls: number;
   totalVotes: number;
-  setUserInfo: (a: User) => void;
-  setUser: (a:User) => void;
+  userInfo: User | undefined;
+  setUserInfo: (userInfo: User) => void;
 }
 
 const useStyles = makeStyles(theme => ({
@@ -78,13 +77,14 @@ const useStyles = makeStyles(theme => ({
 
 
 const ProfileInfo: React.FC<PropTypes> = ({
-  user, logOut, savedPolls, totalVotes, setUserInfo, setUser
+  savedPolls, totalVotes, setUserInfo, userInfo
 }) => {
   const classes = useStyles();
   const [input, setInput] = useState(false);
+  const { setUser } = useAuth();
 
 
-  const dateSince = new Date(user?.createdAt || '').toLocaleDateString();
+  const dateSince = new Date(userInfo?.createdAt || '').toLocaleDateString();
 
   const handleClick = () => {
     setInput(!input);
@@ -101,10 +101,10 @@ const ProfileInfo: React.FC<PropTypes> = ({
   return (
     <div className={classes.root}>
       {
-        user?._id === localStorage.getItem('userId')
+        userInfo?._id === localStorage.getItem('userId')
           ? (
             <div>
-              <MoreMenu logOut={logOut} />
+              <MoreMenu />
               <div className={classes.avatarContainer}>
                 <Badge
                   overlap="circle"
@@ -118,17 +118,17 @@ const ProfileInfo: React.FC<PropTypes> = ({
                     </div>
                   )}
                 >
-                  <Avatar className={classes.avatar} src={user?.avatarUrl} />
+                  <Avatar className={classes.avatar} src={userInfo?.avatarUrl} />
                 </Badge>
               </div>
               <UploadImage isOpen={input} setIsOpen={setInput} callback={patchAvatar} />
             </div>
 )
-          : <Avatar className={classes.avatar} src={user?.avatarUrl} />
+          : <Avatar className={classes.avatar} src={userInfo?.avatarUrl} />
       }
       <Typography variant="h5" className={classes.name}>
-        {user?.username}
-        {user?.verified && <VerifiedIcon className={classes.verified} color="primary" />}
+        {userInfo?.username}
+        {userInfo?.verified && <VerifiedIcon className={classes.verified} color="primary" />}
       </Typography>
       <div className={classes.profileMenu}>
         <Highlight text="Polls" value={savedPolls} />
diff --git a/src/pages/ProfilePage/ProfilePage.tsx b/src/pages/ProfilePage/ProfilePage.tsx
index b0ac103..ad2da46 100644
--- a/src/pages/ProfilePage/ProfilePage.tsx
+++ b/src/pages/ProfilePage/ProfilePage.tsx
@@ -6,15 +6,11 @@ import Feed from '../../components/Feed/Feed';
 import { get } from '../../requests';
 
 interface PropTypes {
-  logOut: () => void;
   navigate: (prefix: string, id: string) => void;
   id: string;
-  setUser:(a:User)=>void;
 }
 
-const ProfilePage: React.FC<PropTypes> = ({
-  logOut, id, navigate, setUser
-}) => {
+const ProfilePage: React.FC<PropTypes> = ({ id, navigate }) => {
   const [userInfo, setUserInfo] = useState<User>();
   const [polls, setPolls] = useState<Poll[]>([]);
   const [totalVotes, setTotalVotes] = useState<number>(0);
@@ -40,10 +36,8 @@ const ProfilePage: React.FC<PropTypes> = ({
   return (
     <>
       <ProfileInfo
-        user={userInfo}
+        userInfo={userInfo}
         setUserInfo={setUserInfo}
-        setUser={setUser}
-        logOut={logOut}
         savedPolls={polls.length}
         totalVotes={totalVotes}
       />
-- 
cgit v1.2.3