Merge pull request #30 from Jittojoyes98/develop

Bugfix and more.

src/Dashboard/DashboardCard.jsx

@@ -37,7 +37,9 @@ const DashboardCard = ({ formData }) => {
         // onClick={() => currentFormDetails(formData)}
       >
         <div className="form-name">
-          <p>{formData.form_name}</p>
+          <p title={formData.form_name} data-toggle="tooltip">
+            {formData.form_name}
+          </p>
         </div>
       </Link>
       <Box className="form-details-wrapper">

src/Editor/InputSettings.jsx

@@ -47,7 +47,6 @@ const StyledTab = styled((props) => <Tab disableRipple {...props} />)(
 );
 
 const InputSettings = ({ currentInput }) => {
-  // console.log(questionName);
   // issue with selcting the last question on clicking from one question to another.
   const [updateQuestionName] = useQuestions((state) => {
     return [state.updateQuestionName];

src/ForgotPassword/ForgotPassword.jsx

@@ -2,40 +2,39 @@ import React from "react";
 import { useAuthContext } from "../auth";
 import { useNavigate } from "react-router-dom";
 
-
-
 const ForgotPassword = () => {
-  const { forgotPassword } = useAuthContext()
-  const navigate=useNavigate()
-  const handleForm=async(e)=>{
-    e.preventDefault()
+  const { forgotPassword } = useAuthContext();
+  const navigate = useNavigate();
+  const handleForm = async (e) => {
+    e.preventDefault();
     try {
-      const { data, error } = await forgotPassword(e.target.uname.value)
-      if(!error && data){
-        console.log("Password reset has been sent to your email");
+      const { data, error } = await forgotPassword(e.target.uname.value);
+      if (!error && data) {
         // show toast or something
-        navigate("/login")
+        navigate("/login");
       }
-      if(error){
-      // form error
+      if (error) {
+        // form error
       }
     } catch (error) {
       console.log("there was an unexpected error");
       // form error
     }
-  }
+  };
   return (
     <div>
-        <form onSubmit={handleForm}>
-            <div>
-                <h1>Forgot password ?</h1>
-                <label for="uname"><b>Email</b></label>
-                  <input type="email" placeholder="Enter Email" name="uname" required />
-            </div>
-            <button type="submit">Send Instructions</button>
-        </form>
+      <form onSubmit={handleForm}>
+        <div>
+          <h1>Forgot password ?</h1>
+          <label for="uname">
+            <b>Email</b>
+          </label>
+          <input type="email" placeholder="Enter Email" name="uname" required />
+        </div>
+        <button type="submit">Send Instructions</button>
+      </form>
     </div>
-  )
+  );
 };
 
-export  {ForgotPassword};
+export { ForgotPassword };

src/ForgotPassword/NewPassword.jsx

@@ -4,32 +4,38 @@ import { supabase } from "../_supabase/supabaseInitialize";
 import { useNavigate } from "react-router-dom";
 
 const NewPassword = () => {
-    const { updatePassword } = useAuthContext()
-    const navigate=useNavigate()
-    const handleForm=async(e)=>{
-        e.preventDefault()
-        try {
-            const { data, error } = await updatePassword(e.target.uname.value)
-            console.log(data);
-            console.log("Password was updated !!");
-            navigate("/dashboard")
-        } catch (error) {
-            alert("There was an error updating your password.")
-        }
+  const { updatePassword } = useAuthContext();
+  const navigate = useNavigate();
+  const handleForm = async (e) => {
+    e.preventDefault();
+    try {
+      const { data, error } = await updatePassword(e.target.uname.value);
+      // show toast
+      navigate("/dashboard");
+    } catch (error) {
+      alert("There was an error updating your password.");
     }
-
-    return (
+  };
+
+  return (
+    <div>
+      <form onSubmit={handleForm}>
         <div>
-            <form onSubmit={handleForm}>
-                <div>
-                    <h1>Your new password</h1>
-                    <label for="uname"><b>Password</b></label>
-                    <input type="text" placeholder="Enter password" name="uname" required />
-                </div>
-                <button type="submit">Change</button>
-            </form>
+          <h1>Your new password</h1>
+          <label for="uname">
+            <b>Password</b>
+          </label>
+          <input
+            type="text"
+            placeholder="Enter password"
+            name="uname"
+            required
+          />
         </div>
-    )
+        <button type="submit">Change</button>
+      </form>
+    </div>
+  );
 };
 
 export default NewPassword;

src/Input/InputCommon.jsx

@@ -43,7 +43,9 @@ const InputCommon = ({
           spacing={2}
         >
           <Box className="input-text-handle-content-name">
-            <Typography>{questionName}</Typography>
+            <Typography data-toggle="tooltip" title={questionName}>
+              {questionName}
+            </Typography>
           </Box>
           <Box onClick={handleDelete}>
             <img

src/LoginPage/index.jsx

@@ -62,10 +62,10 @@ const LoginPage = () => {
     try {
       const { data, error } = await signInWithGoogle();
       if (!error && data) {
-        console.log("Google sign in success");
+        // show toast
       }
       if (error) {
-        console.log("There was an error");
+        // show toast
       }
     } catch (error) {
       setError("There was an unsupported response from server.");
@@ -74,10 +74,10 @@ const LoginPage = () => {
   const handleAnonymous = async () => {
     try {
       await signInOutsider();
-      console.log("WE ARE MOVING TO DASHBOARD");
+      // show toast
       navigate("/dashboard");
     } catch (error) {
-      console.log("Error occured");
+      // show toast
     }
   };
   const formik = useFormik({

src/SignupPage/SignUpEmail.jsx

@@ -4,10 +4,8 @@ import * as yup from "yup";
 import { Button, InputAdornment, TextField } from "@mui/material";
 import { Link, useNavigate } from "react-router-dom";
 import { useAuthContext } from "../auth";
-import eyeLineCross from "../../assets/download-eye.svg"
-import eyeLine from "../../assets/download-eye-text.svg"
-
-
+import eyeLineCross from "../../assets/download-eye.svg";
+import eyeLine from "../../assets/download-eye-text.svg";
 
 const signupSchema = yup.object({
   email: yup
@@ -25,43 +23,46 @@ const signupSchema = yup.object({
 });
 
 const SignUpEmail = () => {
-  const [error, setError] = useState("")
-  const [loading, setLoading] = useState(false)
-  const [show,setShow]=useState(true)
-  const { signup, currentUser, setCurrentUser, signUpWithGoogle,signUpWithEmail } = useAuthContext()
-  const navigate = useNavigate()
+  const [error, setError] = useState("");
+  const [loading, setLoading] = useState(false);
+  const [show, setShow] = useState(true);
+  const {
+    signup,
+    currentUser,
+    setCurrentUser,
+    signUpWithGoogle,
+    signUpWithEmail,
+  } = useAuthContext();
+  const navigate = useNavigate();
   const handleForm = async (email, password) => {
     try {
-      setError("")
-      setLoading(true)
-      const { data, error } =await signUpWithEmail(email, password)
-      if(!error && data) {
-        console.log("Registration Successful. Check your email to confirm your account");
-        navigate("/dashboard")
-      }else{
-        setError("Registration denied,Please see if this email already exist") 
+      setError("");
+      setLoading(true);
+      const { data, error } = await signUpWithEmail(email, password);
+      if (!error && data) {
+        // show toast
+        navigate("/dashboard");
+      } else {
+        setError("Registration denied,Please see if this email already exist");
       }
     } catch (error) {
-      setError("Registration denied,Please see if this email already exist")
+      setError("Registration denied,Please see if this email already exist");
     }
-    setLoading(false)
-  }
+    setLoading(false);
+  };
   const formik = useFormik({
     initialValues: {
       email: "",
       password: "",
     },
     validationSchema: signupSchema,
     onSubmit: (values) => {
-      console.log(values);
-      handleForm(values.email, values.password)
+      handleForm(values.email, values.password);
     },
   });
   const HandleFormError = () => {
-    return (
-      <p className="validation-error">{formik.errors.email}</p>
-    )
-  }
+    return <p className="validation-error">{formik.errors.email}</p>;
+  };
   const handleErrorBox = () => {
     return (
       <div className="error-box-wrapper">
@@ -70,11 +71,11 @@ const SignUpEmail = () => {
           <p>{error}</p>
         </div>
       </div>
-    )
-  }
-  const handleHide=()=>{
-    setShow(!show)
-  }
+    );
+  };
+  const handleHide = () => {
+    setShow(!show);
+  };
   return (
     <div className="centre-div auth-height">
       <div>
@@ -86,7 +87,10 @@ const SignUpEmail = () => {
         </span>
         <div className="login-form-wrapper">
           <div className="signup-email-wrapper">
-            <h2 className="login-title align-center">Get better data with conversational forms, surveys, quizzes & more.</h2>
+            <h2 className="login-title align-center">
+              Get better data with conversational forms, surveys, quizzes &
+              more.
+            </h2>
             <div className="centre-div">
               <div className="fix-width ">
                 <form onSubmit={formik.handleSubmit}>
@@ -106,7 +110,11 @@ const SignUpEmail = () => {
                       placeholder="[email protected]"
                       variant="outlined"
                     />
-                    {(formik.touched.email && Boolean(formik.errors.email)) ? HandleFormError() : <></>}
+                    {formik.touched.email && Boolean(formik.errors.email) ? (
+                      HandleFormError()
+                    ) : (
+                      <></>
+                    )}
                   </div>
                   <div>
                     <div className="label-wrapper">
@@ -117,11 +125,15 @@ const SignUpEmail = () => {
                         endAdornment: (
                           <InputAdornment position="end">
                             {show ? (
-                              <img src={eyeLine} className="icon-password" onClick={handleHide} />
+                              <img
+                                src={eyeLine}
+                                className="icon-password"
+                                onClick={handleHide}
+                              />
                             ) : (
                               <img
                                 src={eyeLineCross}
-                                  className="icon-password"
+                                className="icon-password"
                                 onClick={handleHide}
                               />
                             )}
@@ -132,27 +144,41 @@ const SignUpEmail = () => {
                       className="credential-field-inactive"
                       value={formik.values.password}
                       onChange={formik.handleChange}
-                      type={show ? "text": "password"}
+                      type={show ? "text" : "password"}
                       name="password"
                       placeholder="Atleast 8 characters"
                       variant="outlined"
                     />
-                    {(formik.touched.password && Boolean(formik.errors.password)) ? <p className="validation-error">{formik.errors.password}</p> : <></>}
+                    {formik.touched.password &&
+                    Boolean(formik.errors.password) ? (
+                      <p className="validation-error">
+                        {formik.errors.password}
+                      </p>
+                    ) : (
+                      <></>
+                    )}
                   </div>
 
-
                   <div style={{ marginBottom: "25px", paddingTop: "5px" }}>
                     {/* <Link to="password/request" className="forgot-link small-text-light">Forgot Password?</Link> */}
                   </div>
-                  <Button disabled={loading}  style={{ marginBottom: "25px" }} variant='contained' type="submit" className='secondary-button auth-button'>Create my free account</Button>
+                  <Button
+                    disabled={loading}
+                    style={{ marginBottom: "25px" }}
+                    variant="contained"
+                    type="submit"
+                    className="secondary-button auth-button"
+                  >
+                    Create my free account
+                  </Button>
                 </form>
               </div>
             </div>
           </div>
         </div>
       </div>
     </div>
-  )
+  );
 };
 
 export default SignUpEmail;

src/SignupPage/index.jsx

@@ -14,10 +14,10 @@ const SignupPage = () => {
     try {
       const { data, error } = await signInWithGoogle();
       if (!error && data) {
-        console.log("Google sign in success");
+        // show toast
       }
     } catch (error) {
-      console.log("Error occured");
+      // show toast
     }
   };