Fix bugs 🐛

tsaxena4k · tsaxena4k · commit 8bccf5a07af3 · 2020-11-11T22:22:07.000+05:30
diff --git a/components/setting.jsx b/components/setting.jsx
@@ -4,7 +4,7 @@ import { useCurrentUser } from '../lib/hooks';
 
 const ProfileSection = () => {
     const [user, { mutate }] = useCurrentUser();
-    const [isUpdating, setIsUpdating] = useState(false);
+    const [loading, isLoading] = useState(false);
     const nameRef = useRef();
     const bioRef = useRef();
     const profilePictureRef = useRef();
@@ -17,19 +17,15 @@ const ProfileSection = () => {
 
     const handleSubmit = async (event) => {
         event.preventDefault();
-
-        console.log(nameRef.current.value);
-
+        isLoading(true);
         const formData = new FormData();
-
         if (profilePictureRef.current.files[0]) { formData.append('profilePicture', profilePictureRef.current.files[0]); }
         formData.append('name', nameRef.current.value);
         formData.append('bio', bioRef.current.value);
 
-
         const res = await fetch('/api/user', {
             method: 'PATCH',
-            body:formData,
+            body: formData,
         });
         if (res.status === 200) {
             const userData = await res.json();
@@ -43,9 +39,11 @@ const ProfileSection = () => {
         } else {
             setMsg({ message: await res.text(), isError: true });
         }
+        isLoading(false);
     };
 
     const handleSubmitPasswordChange = async (e) => {
+        isLoading(true);
         e.preventDefault();
         const body = {
             oldPassword: e.currentTarget.oldPassword.value,
@@ -65,13 +63,17 @@ const ProfileSection = () => {
         } else {
             setMsg({ message: await res.text(), isError: true });
         }
+        isLoading(false);
     };
 
     return (
         <>
             <Head>
                 <title>Settings</title>
             </Head>
+            {loading ? <div className="progress" style={{ margin: 0 }}>
+                <div className="indeterminate"></div>
+            </div> : null}
             <section className="">
                 <h2>Edit Profile</h2>
                 {msg.message ? <p style={{ color: msg.isError ? 'red' : '#0070f3', textAlign: 'center' }}>{msg.message}</p> : null}
diff --git a/pages/api/user/password/index.js b/pages/api/user/password/index.js
@@ -9,7 +9,7 @@ handler.put(async (req, res) => {
   if (!req.user) { res.json(401).send('you need to be authenticated'); return; }
   const { oldPassword, newPassword } = req.body;
   if (!(await bcrypt.compare(oldPassword, req.user.password))) {
-    res.status(401).send('The password you has entered is incorrect.');
+    res.status(401).send('The old password you have entered is incorrect.');
   }
   const password = await bcrypt.hash(newPassword, 10);
   await req.db

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ handler.put(async (req, res) => {`
`9`	`9`	`if (!req.user) { res.json(401).send('you need to be authenticated'); return; }`
`10`	`10`	`const { oldPassword, newPassword } = req.body;`
`11`	`11`	`if (!(await bcrypt.compare(oldPassword, req.user.password))) {`
`12`		`- res.status(401).send('The password you has entered is incorrect.');`
	`12`	`+ res.status(401).send('The old password you have entered is incorrect.');`
`13`	`13`	`}`
`14`	`14`	`const password = await bcrypt.hash(newPassword, 10);`
`15`	`15`	`await req.db`