Add files via upload

client/src/Account/AccountIndex.jsx

@@ -1,16 +1,12 @@
-import React, { useEffect } from "react";
+import React from "react";
 import { Route, Switch, useRouteMatch } from "react-router-dom";
 import VerifyEmail from "./VerifyEmail";
 
-
 function AccountIndex() {
   const { path } = useRouteMatch();
   return (
     <Switch>
-      <Route
-        path={`${path}/verify-email/:token`}
-        component={VerifyEmail}
-      />
+      <Route path={`${path}/verify-email/:token`} component={VerifyEmail} />
     </Switch>
   );
 }

client/src/Account/VerifyEmail.jsx

@@ -1,30 +1,26 @@
-import React, { useEffect } from 'react';
-import {  useParams, Redirect } from 'react-router-dom';
+import React, { useEffect } from "react";
+import { useParams } from "react-router-dom";
 import jwtDecode from "jwt-decode";
-import {verifyLearner} from "../Services/Learner"
+import { verifyLearner } from "../Services/Learner";
+import Spinner from "../UIHandlers/Spinner.js";
 
 function VerifyEmail() {
-    const {token} = useParams();
-    useEffect(() => {
-        async function verify(){
-            localStorage.setItem("token", token);
-            const res = await verifyLearner(jwtDecode(token)._id);
+  const { token } = useParams();
+  useEffect(() => {
+    async function verify() {
+      localStorage.setItem("token", token);
+      const res = await verifyLearner(jwtDecode(token)._id);
 
-window.location = "/"
-        };
-        try{
-            verify()
-        }
-        catch(err){
-            alert(err)
-        }
-    }, []);
+      window.location = "/";
+    }
+    try {
+      verify();
+    } catch (err) {
+      alert(err);
+    }
+  }, []);
 
-    return (
-        <div>
-            <h3 className="card-header">Verify Email</h3>
-        </div>
-    )
+  return <Spinner open={true} setOpen={() => console.log("Spinner")} />;
 }
 
-export default VerifyEmail; 
+export default VerifyEmail;

client/src/Admin/AddCat&SubCat/HandlerForCat.js

@@ -1,10 +1,10 @@
 import * as Yup from "yup";
-import { addCat } from "../../Services/AddCatAndSubCat";
+import { addCat, updateCat } from "../../Services/AddCatAndSubCat";
 
 export const initialValues = {
   name: "",
   subCategories: [""],
-  description: "Hello how are you",
+  description: "",
 };
 
 export const validationSchema = Yup.object({
@@ -16,22 +16,38 @@ export const validationSchema = Yup.object({
     .of(Yup.string().required("Select atleast one Sub-Category"))
     .required("Sub-Category option shouldn't be empty"),
   description: Yup.string()
-    .min(10, "Description must contain 2 characters or more")
-    .max(40, "Description must contain 40 characters or less")
+    .min(30, "Description must contain 30 characters or more")
+    .max(100, "Description must contain 100 characters or less")
     .required("Description is required"),
 });
 
 export const handleSubmit = (
   values,
   subCategories,
   categories,
-  setCategories
+  setCategories,
+  categoryInitVal,
+  resetForm,
+  setOpen
 ) => {
-  addCat({
+  categoryInitVal?updateCat({
     ...values,
     subCategories: values.subCategories.map(
       (s) => subCategories.find((su) => su.name === s)._id
     ),
-  });
+    _id:categoryInitVal._id
+  },
+  resetForm,
+  setOpen):
+  addCat(
+    {
+      ...values,
+      subCategories: values.subCategories.map(
+        (s) => subCategories.find((su) => su.name === s)._id
+      ),
+    },
+    resetForm,
+    setOpen
+  );
   setCategories([...categories]);
 };

client/src/Admin/AddCat&SubCat/HandlerForSubCat.js

@@ -1,22 +1,29 @@
 import * as Yup from "yup";
-import {addSubCat} from "../../Services/AddCatAndSubCat";
+import { addSubCat } from "../../Services/AddCatAndSubCat";
 
 export const subCategories = {
-  name: [""],
+  name: "",
+  description: "",
 };
 
 export const validationSchema = Yup.object({
-  name: Yup.array()
-    .of(
-      Yup.string()
-        .min(2, "Every Field must contain 2 characters or more  ")
-        .max(30, "Every Field must contain 30 characters or less  ")
-        .required("No Field should be empty  ")
-    )
-    .required(),
+  name: Yup.string()
+    .min(2, "Name must contain 2 characters or more  ")
+    .max(30, "Name must contain 30 characters or less  ")
+    .required("Name shouldn't be empty  "),
+  description: Yup.string()
+    .min(30, "Description must contain 30 characters or more")
+    .max(100, "Description must contain 100 characters or less")
+    .required("Description is required"),
 });
 
-export const handleSubmit = (values,  subCategories, setSubCategories) => {
-  addSubCat(values, subCategories, setSubCategories)
+export const handleSubmit = (
+  values,
+  subCategories,
+  setSubCategories,
+  resetForm,
+  setOpen
+) => {
+  console.log(values);
+  addSubCat(values, subCategories, setSubCategories, resetForm, setOpen);
 };
-