eleven-solutions-common-website-unique-web 3.0.23 → 3.0.24

package/dist/components/admin/TaxonomyForm.js

@@ -120,6 +120,17 @@ const TaxonomyForm = () => {
             alert("Failed to add/update Taxonomy");
         }
     });
+    // useEffect(() => {
+    //   const fetchIsMultiple = async () => {
+    //     try {
+    //       const result = await isMultipleApi(type);
+    //       setIsMultiple(typeof result === "boolean");
+    //     } catch (error) {
+    //       console.error("Error checking if taxonomy is multiple:", error);
+    //     }
+    //   };
+    //   fetchIsMultiple();
+    // }, [type]);
     useEffect(() => {
         const fetchIsMultiple = () => __awaiter(void 0, void 0, void 0, function* () {
             try {
@@ -131,7 +142,7 @@ const TaxonomyForm = () => {
             }
         });
         fetchIsMultiple();
-    }, [type]);
+    }, [location.pathname, type]);
     const handleCancelClick = () => {
         setType("");
         setCode("");
@@ -225,7 +236,7 @@ const TaxonomyForm = () => {
             console.error("Error deleting Taxonomy:", error);
         }
     });
-    return (_jsxs("div", { className: `${isEditMode && isMultiple ? "w-full" : "max-w-4xl"} p-6 mx-auto dark:bg-gray-800`, children: [_jsxs("div", { className: `transition duration-300 ${isModalOpen ? "filter blur-sm" : ""}`, children: [_jsx("h1", { className: "text-3xl font-bold text-center text-blue-600 capitalize dark:text-white mb-4", children: isEditMode ? "Edit Taxonomy" : "Add Taxonomy" }), _jsx("h1", { className: "text-2xl   text-blue-600 capitalize dark:text-white mb-4", children: isEditMode ? `Taxonomy Type: ${type}` : "" }), _jsxs("form", { children: [!isEditMode && (_jsxs("div", { className: "mb-6 w-full", children: [_jsxs("label", { className: "text-gray-900 dark:text-gray-200 font-semibold", children: ["Type ", _jsx("span", { className: "text-red-500", children: "*" })] }), _jsx("input", { required: true, value: type, onChange: (e) => setType(e.target.value), type: "text", className: "w-full px-4 py-2 mt-2  text-gray-800  bg-white border border-gray-400 rounded-md dark:bg-gray-800 dark:text-gray-300 dark:border-gray-800 focus:border-blue-400 focus:ring-blue-300 focus:ring-opacity-40 dark:focus:border-blue-300 focus:outline-none focus:ring", placeholder: "Enter Type" })] })), _jsxs("div", { className: "mb-6 w-full", children: [_jsxs("label", { className: "text-gray-900 dark:text-gray-200 font-semibold", children: ["Code ", _jsx("span", { className: "text-red-500", children: "*" })] }), _jsx("input", { required: true, value: code, onChange: (e) => setCode(e.target.value === "" ? "" : Number(e.target.value)), type: "number", className: "w-full px-4 py-2 mt-2  text-gray-800  bg-white border border-gray-400 rounded-md dark:bg-gray-800 dark:text-gray-300 dark:border-gray-800 focus:border-blue-400 focus:ring-blue-300 focus:ring-opacity-40 dark:focus:border-blue-300 focus:outline-none focus:ring", placeholder: "Enter Code", disabled: similarTaxonomies.some((taxonomy) => taxonomy.isEdit === false) })] }), _jsxs("div", { className: "mb-6 w-full", children: [_jsxs("label", { className: "text-gray-900 dark:text-gray-200 font-semibold", children: ["Value ", _jsx("span", { className: "text-red-500", children: "*" })] }), _jsx("input", { required: true, value: value, onChange: (e) => setValue(e.target.value), type: "text", className: "w-full px-4 py-2 mt-2  text-gray-800  bg-white border border-gray-400 rounded-md dark:bg-gray-800 dark:text-gray-300 dark:border-gray-800 focus:border-blue-400 focus:ring-blue-300 focus:ring-opacity-40 dark:focus:border-blue-300 focus:outline-none focus:ring", placeholder: "Enter Value", disabled: similarTaxonomies.some((taxonomy) => taxonomy.isEdit === false) })] }), _jsxs("div", { className: "flex space-x-4 mt-6 justify-between", children: [_jsx("div", { children: isEditMode && (
+    return (_jsxs("div", { className: `${isEditMode && isMultiple ? "w-full" : "max-w-4xl"} p-6 mx-auto dark:bg-gray-800`, children: [_jsxs("div", { className: `transition duration-300 ${isModalOpen ? "filter blur-sm" : ""}`, children: [_jsx("h1", { className: "text-3xl font-bold text-center text-blue-600 capitalize dark:text-white mb-4", children: isEditMode ? "Edit Taxonomy" : "Add Taxonomy" }), _jsx("h1", { className: "text-2xl   text-blue-600 capitalize dark:text-white mb-4", children: isEditMode ? `Taxonomy Type: ${type}` : "" }), !isMultiple && (_jsxs("form", { children: [!isEditMode && (_jsxs("div", { className: "mb-6 w-full", children: [_jsxs("label", { className: "text-gray-900 dark:text-gray-200 font-semibold", children: ["Type ", _jsx("span", { className: "text-red-500", children: "*" })] }), _jsx("input", { required: true, value: type, onChange: (e) => setType(e.target.value), type: "text", className: "w-full px-4 py-2 mt-2  text-gray-800  bg-white border border-gray-400 rounded-md dark:bg-gray-800 dark:text-gray-300 dark:border-gray-800 focus:border-blue-400 focus:ring-blue-300 focus:ring-opacity-40 dark:focus:border-blue-300 focus:outline-none focus:ring", placeholder: "Enter Type" })] })), _jsxs("div", { className: "mb-6 w-full", children: [_jsxs("label", { className: "text-gray-900 dark:text-gray-200 font-semibold", children: ["Code ", _jsx("span", { className: "text-red-500", children: "*" })] }), _jsx("input", { required: true, value: code, onChange: (e) => setCode(e.target.value === "" ? "" : Number(e.target.value)), type: "number", className: "w-full px-4 py-2 mt-2  text-gray-800  bg-white border border-gray-400 rounded-md dark:bg-gray-800 dark:text-gray-300 dark:border-gray-800 focus:border-blue-400 focus:ring-blue-300 focus:ring-opacity-40 dark:focus:border-blue-300 focus:outline-none focus:ring", placeholder: "Enter Code", disabled: similarTaxonomies.some((taxonomy) => taxonomy.isEdit === false) })] }), _jsxs("div", { className: "mb-6 w-full", children: [_jsxs("label", { className: "text-gray-900 dark:text-gray-200 font-semibold", children: ["Value ", _jsx("span", { className: "text-red-500", children: "*" })] }), _jsx("input", { required: true, value: value, onChange: (e) => setValue(e.target.value), type: "text", className: "w-full px-4 py-2 mt-2  text-gray-800  bg-white border border-gray-400 rounded-md dark:bg-gray-800 dark:text-gray-300 dark:border-gray-800 focus:border-blue-400 focus:ring-blue-300 focus:ring-opacity-40 dark:focus:border-blue-300 focus:outline-none focus:ring", placeholder: "Enter Value", disabled: similarTaxonomies.some((taxonomy) => taxonomy.isEdit === false) })] }), _jsxs("div", { className: "flex space-x-4 mt-6 justify-between", children: [_jsx("div", { children: isEditMode && (
                                         // <div>
                                         //   {similarTaxonomies.some((taxonomy) => taxonomy.isEdit) && (
                                         //     <button
@@ -244,7 +255,7 @@ const TaxonomyForm = () => {
                                                     handleDeleteClick(id);
                                                     window.location.href = "/admin/taxinomies";
                                                 }, className: "px-8 py-2.5 leading-5 text-white transition-colors duration-300 transform bg-blue-600 rounded-md hover:bg-blue-500 focus:outline-none focus:bg-gray-600", children: "Delete" })) })) }), _jsxs("div", { className: "flex space-x-4 justify-end", children: [similarTaxonomies.some((taxonomy) => taxonomy.isEdit) && (_jsx("button", { type: "submit", onClick: handleSave, className: "px-8 py-2.5 leading-5 text-white transition-colors duration-300 transform bg-blue-600 rounded-md hover:bg-blue-500 focus:outline-none focus:bg-gray-600", children: isEditMode ? "Save" : "Add" })), !similarTaxonomies.some((taxonomy) => taxonomy.isEdit) &&
-                                                !isEditMode && (_jsx("button", { type: "submit", onClick: handleSave, className: "px-8 py-2.5 leading-5 text-white transition-colors duration-300 transform bg-blue-600 rounded-md hover:bg-blue-500 focus:outline-none focus:bg-gray-600", children: isEditMode ? "Save" : "Add" })), _jsx("button", { onClick: handleCancelClick, type: "button", className: "px-8 py-2.5 leading-5 text-white transition-colors duration-300 transform bg-blue-600 rounded-md hover:bg-blue-500 focus:outline-none focus:bg-gray-600", children: "Cancel" })] })] })] }), isSimilarTaxonomyOpen && isMultiple && isEditMode && (_jsxs("div", { className: "flex-grow ml-0 mt-4 w-full", children: [_jsx("div", { className: "overflow-hidden border border-gray-200 dark:border-gray-700 md:rounded-lg mt-6", children: _jsxs("table", { className: "min-w-full divide-y divide-gray-200 dark:divide-gray-700", children: [_jsx("thead", { className: "bg-gray-50 dark:bg-gray-800", children: _jsxs("tr", { children: [similarTaxonomies.some((taxonomy) => taxonomy.isEdit) && (_jsx("th", { className: "px-4 py-3.5 text-md font-normal text-left rtl:text-right text-gray-500 dark:text-gray-400", children: "Actions" })), _jsx("th", { className: "px-4 py-3.5 text-md font-normal text-left rtl:text-right text-gray-500 dark:text-gray-400", children: "Code" }), _jsx("th", { className: "px-4 py-3.5 text-md font-normal text-left rtl:text-right text-gray-500 dark:text-gray-400", children: "Value" })] }) }), _jsx("tbody", { className: "divide-y divide-gray-200", children: similarTaxonomies.map((taxonomy, index) => (_jsxs("tr", { children: [similarTaxonomies.some((taxonomy) => taxonomy.isEdit) && (_jsx("td", { className: "px-4 py-4 text-sm whitespace-nowrap", children: _jsxs("div", { className: "flex items-center gap-x-6", children: [_jsx("button", { type: "button", onClick: () => handleDeleteClick(taxonomy.id), className: "text-gray-500 transition-colors duration-200 dark:hover:text-red-600 dark:text-gray-300 hover:text-red-500 focus:outline-none", children: _jsx("svg", { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 24 24", "stroke-width": "1.5", stroke: "currentColor", className: "w-5 h-5", children: _jsx("path", { "stroke-linecap": "round", "stroke-linejoin": "round", d: "M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0" }) }) }), _jsx("button", { type: "button", onClick: () => {
+                                                !isEditMode && (_jsx("button", { type: "submit", onClick: handleSave, className: "px-8 py-2.5 leading-5 text-white transition-colors duration-300 transform bg-blue-600 rounded-md hover:bg-blue-500 focus:outline-none focus:bg-gray-600", children: isEditMode ? "Save" : "Add" })), _jsx("button", { onClick: handleCancelClick, type: "button", className: "px-8 py-2.5 leading-5 text-white transition-colors duration-300 transform bg-blue-600 rounded-md hover:bg-blue-500 focus:outline-none focus:bg-gray-600", children: "Cancel" })] })] })] })), isSimilarTaxonomyOpen && isMultiple && isEditMode && (_jsxs("div", { className: "flex-grow ml-0 mt-4 w-full", children: [_jsx("div", { className: "overflow-hidden border border-gray-200 dark:border-gray-700 md:rounded-lg mt-6", children: _jsxs("table", { className: "min-w-full divide-y divide-gray-200 dark:divide-gray-700", children: [_jsx("thead", { className: "bg-gray-50 dark:bg-gray-800", children: _jsxs("tr", { children: [similarTaxonomies.some((taxonomy) => taxonomy.isEdit) && (_jsx("th", { className: "px-4 py-3.5 text-md font-normal text-left rtl:text-right text-gray-500 dark:text-gray-400", children: "Actions" })), _jsx("th", { className: "px-4 py-3.5 text-md font-normal text-left rtl:text-right text-gray-500 dark:text-gray-400", children: "Code" }), _jsx("th", { className: "px-4 py-3.5 text-md font-normal text-left rtl:text-right text-gray-500 dark:text-gray-400", children: "Value" })] }) }), _jsx("tbody", { className: "divide-y divide-gray-200", children: similarTaxonomies.map((taxonomy, index) => (_jsxs("tr", { children: [similarTaxonomies.some((taxonomy) => taxonomy.isEdit) && (_jsx("td", { className: "px-4 py-4 text-sm whitespace-nowrap", children: _jsxs("div", { className: "flex items-center gap-x-6", children: [_jsx("button", { type: "button", onClick: () => handleDeleteClick(taxonomy.id), className: "text-gray-500 transition-colors duration-200 dark:hover:text-red-600 dark:text-gray-300 hover:text-red-500 focus:outline-none", children: _jsx("svg", { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 24 24", "stroke-width": "1.5", stroke: "currentColor", className: "w-5 h-5", children: _jsx("path", { "stroke-linecap": "round", "stroke-linejoin": "round", d: "M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0" }) }) }), _jsx("button", { type: "button", onClick: () => {
                                                                         handleEditClick(index, taxonomy.id);
                                                                     }, className: "text-gray-500 transition-colors duration-200 dark:hover:text-yellow-500 dark:text-gray-300 hover:text-yellow-500 focus:outline-none", children: _jsx("svg", { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 24 24", "stroke-width": "1.5", stroke: "currentColor", className: "w-5 h-5", children: _jsx("path", { "stroke-linecap": "round", "stroke-linejoin": "round", d: "M16.862 4.487l1.687-1.688a1.875 1.875 0 112.652 2.652L10.582 16.07a4.5 4.5 0 01-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 011.13-1.897l8.932-8.931zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0115.75 21H5.25A2.25 2.25 0 013 18.75V8.25A2.25 2.25 0 015.25 6H10" }) }) })] }) })), _jsx("td", { className: "px-4 py-4 text-sm text-gray-500 dark:text-gray-400", children: taxonomy.code }), _jsx("td", { className: "px-4 py-4 text-sm font-medium text-gray-900 dark:text-white", children: taxonomy.value })] }, index))) })] }) }), similarTaxonomies.some((taxonomy) => taxonomy.isEdit) && (_jsx("div", { className: "flex space-x-4 mt-6 justify-start", children: _jsxs("button", { type: "button", onClick: handleOpenModal, className: "flex items-center justify-center px-6 py-2 font-medium tracking-wide text-white capitalize transition-colors duration-300 transform bg-blue-600 rounded-lg hover:bg-blue-500 focus:outline-none focus:ring focus:ring-blue-300 focus:ring-opacity-80", children: [_jsx(FaPlus, { className: "mr-2 font-medium" }), "Add Multiple Values"] }) }))] })), isEditMode && (_jsx(_Fragment, { children: tempTaxonomy.length > 0 && (_jsxs("div", { className: "flex-grow ml-0 mt-4 w-full", children: [_jsx("div", { className: "overflow-hidden border border-gray-200 dark:border-gray-700 md:rounded-lg mt-6", children: _jsxs("table", { className: "min-w-full divide-y divide-gray-200 dark:divide-gray-700", children: [_jsx("thead", { className: "bg-gray-50 dark:bg-gray-800", children: _jsxs("tr", { children: [_jsx("th", { scope: "col", className: "px-4 py-3.5 text-md font-normal text-left rtl:text-right text-gray-500 dark:text-gray-400", children: "Edit/Delete" }), _jsx("th", { scope: "col", className: "px-4 py-3.5 text-md font-normal text-left text-gray-500 dark:text-gray-400", children: "Code" }), _jsx("th", { scope: "col", className: "px-4 py-3.5 text-md font-normal text-left text-gray-500 dark:text-gray-400", children: "Value" })] }) }), _jsx("tbody", { className: "bg-white divide-y divide-gray-200 dark:bg-gray-800 dark:divide-gray-700", children: [...tempTaxonomy].map((item, index) => (_jsxs("tr", { children: [_jsx("td", { className: "px-4 py-4 text-sm whitespace-nowrap", children: _jsxs("div", { className: "flex items-center gap-x-6", children: [_jsx("button", { type: "button", onClick: () => {
                                                                             const newTempTaxonomy = [...tempTaxonomy];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eleven-solutions-common-website-unique-web",
-  "version": "3.0.23",
+  "version": "3.0.24",
   "main": "./dist/index.js",
   "scripts": {
     "build": "tsc",

package/src/components/admin/TaxonomyForm.tsx

@@ -148,6 +148,19 @@ const TaxonomyForm = () => {
     }
   };
 
+  // useEffect(() => {
+  //   const fetchIsMultiple = async () => {
+  //     try {
+  //       const result = await isMultipleApi(type);
+  //       setIsMultiple(typeof result === "boolean");
+  //     } catch (error) {
+  //       console.error("Error checking if taxonomy is multiple:", error);
+  //     }
+  //   };
+
+  //   fetchIsMultiple();
+  // }, [type]);
+
   useEffect(() => {
     const fetchIsMultiple = async () => {
       try {
@@ -159,7 +172,7 @@ const TaxonomyForm = () => {
     };
 
     fetchIsMultiple();
-  }, [type]);
+  }, [location.pathname, type]);
 
   const handleCancelClick = () => {
     setType("");
@@ -294,104 +307,94 @@ const TaxonomyForm = () => {
           {isEditMode ? `Taxonomy Type: ${type}` : ""}
         </h1>
 
-        {/* {!isMultiple && ( */}
-        <form>
-          {!isEditMode && (
+        {!isMultiple && (
+          <form>
+            {!isEditMode && (
+              <div className="mb-6 w-full">
+                <label className="text-gray-900 dark:text-gray-200 font-semibold">
+                  Type <span className="text-red-500">*</span>
+                </label>
+                <input
+                  required
+                  value={type}
+                  onChange={(e) => setType(e.target.value)}
+                  type="text"
+                  className="w-full px-4 py-2 mt-2  text-gray-800  bg-white border border-gray-400 rounded-md dark:bg-gray-800 dark:text-gray-300 dark:border-gray-800 focus:border-blue-400 focus:ring-blue-300 focus:ring-opacity-40 dark:focus:border-blue-300 focus:outline-none focus:ring"
+                  placeholder="Enter Type"
+                />
+              </div>
+            )}
+            <div className="mb-6 w-full">
+              <label className="text-gray-900 dark:text-gray-200 font-semibold">
+                Code <span className="text-red-500">*</span>
+              </label>
+              <input
+                required
+                value={code}
+                onChange={(e) =>
+                  setCode(e.target.value === "" ? "" : Number(e.target.value))
+                }
+                type="number"
+                className="w-full px-4 py-2 mt-2  text-gray-800  bg-white border border-gray-400 rounded-md dark:bg-gray-800 dark:text-gray-300 dark:border-gray-800 focus:border-blue-400 focus:ring-blue-300 focus:ring-opacity-40 dark:focus:border-blue-300 focus:outline-none focus:ring"
+                placeholder="Enter Code"
+                disabled={similarTaxonomies.some(
+                  (taxonomy) => taxonomy.isEdit === false
+                )}
+              />
+            </div>
             <div className="mb-6 w-full">
               <label className="text-gray-900 dark:text-gray-200 font-semibold">
-                Type <span className="text-red-500">*</span>
+                Value <span className="text-red-500">*</span>
               </label>
               <input
                 required
-                value={type}
-                onChange={(e) => setType(e.target.value)}
+                value={value}
+                onChange={(e) => setValue(e.target.value)}
                 type="text"
                 className="w-full px-4 py-2 mt-2  text-gray-800  bg-white border border-gray-400 rounded-md dark:bg-gray-800 dark:text-gray-300 dark:border-gray-800 focus:border-blue-400 focus:ring-blue-300 focus:ring-opacity-40 dark:focus:border-blue-300 focus:outline-none focus:ring"
-                placeholder="Enter Type"
+                placeholder="Enter Value"
+                disabled={similarTaxonomies.some(
+                  (taxonomy) => taxonomy.isEdit === false
+                )}
               />
             </div>
-          )}
-          <div className="mb-6 w-full">
-            <label className="text-gray-900 dark:text-gray-200 font-semibold">
-              Code <span className="text-red-500">*</span>
-            </label>
-            <input
-              required
-              value={code}
-              onChange={(e) =>
-                setCode(e.target.value === "" ? "" : Number(e.target.value))
-              }
-              type="number"
-              className="w-full px-4 py-2 mt-2  text-gray-800  bg-white border border-gray-400 rounded-md dark:bg-gray-800 dark:text-gray-300 dark:border-gray-800 focus:border-blue-400 focus:ring-blue-300 focus:ring-opacity-40 dark:focus:border-blue-300 focus:outline-none focus:ring"
-              placeholder="Enter Code"
-              disabled={similarTaxonomies.some(
-                (taxonomy) => taxonomy.isEdit === false
-              )}
-            />
-          </div>
-          <div className="mb-6 w-full">
-            <label className="text-gray-900 dark:text-gray-200 font-semibold">
-              Value <span className="text-red-500">*</span>
-            </label>
-            <input
-              required
-              value={value}
-              onChange={(e) => setValue(e.target.value)}
-              type="text"
-              className="w-full px-4 py-2 mt-2  text-gray-800  bg-white border border-gray-400 rounded-md dark:bg-gray-800 dark:text-gray-300 dark:border-gray-800 focus:border-blue-400 focus:ring-blue-300 focus:ring-opacity-40 dark:focus:border-blue-300 focus:outline-none focus:ring"
-              placeholder="Enter Value"
-              disabled={similarTaxonomies.some(
-                (taxonomy) => taxonomy.isEdit === false
-              )}
-            />
-          </div>
 
-          <div className="flex space-x-4 mt-6 justify-between">
-            <div>
-              {isEditMode && (
-                // <div>
-                //   {similarTaxonomies.some((taxonomy) => taxonomy.isEdit) && (
-                //     <button
-                //       type="button"
-                //       onClick={() => {
-                //         handleDeleteClick(id);
-                //         navigate("/admin/taxonomy");
-                //       }}
-                //       className="px-8 py-2.5 leading-5 text-white transition-colors duration-300 transform bg-blue-600 rounded-md hover:bg-blue-500 focus:outline-none focus:bg-gray-600"
-                //     >
-                //       Delete
-                //     </button>
-                //   )}
-                // </div>
-                <div>
-                  {similarTaxonomies.some((taxonomy) => taxonomy.isEdit) && (
-                    <button
-                      type="button"
-                      onClick={() => {
-                        handleDeleteClick(id);
-                        window.location.href = "/admin/taxinomies";
-                      }}
-                      className="px-8 py-2.5 leading-5 text-white transition-colors duration-300 transform bg-blue-600 rounded-md hover:bg-blue-500 focus:outline-none focus:bg-gray-600"
-                    >
-                      Delete
-                    </button>
-                  )}
-                </div>
-              )}
-            </div>
+            <div className="flex space-x-4 mt-6 justify-between">
+              <div>
+                {isEditMode && (
+                  // <div>
+                  //   {similarTaxonomies.some((taxonomy) => taxonomy.isEdit) && (
+                  //     <button
+                  //       type="button"
+                  //       onClick={() => {
+                  //         handleDeleteClick(id);
+                  //         navigate("/admin/taxonomy");
+                  //       }}
+                  //       className="px-8 py-2.5 leading-5 text-white transition-colors duration-300 transform bg-blue-600 rounded-md hover:bg-blue-500 focus:outline-none focus:bg-gray-600"
+                  //     >
+                  //       Delete
+                  //     </button>
+                  //   )}
+                  // </div>
+                  <div>
+                    {similarTaxonomies.some((taxonomy) => taxonomy.isEdit) && (
+                      <button
+                        type="button"
+                        onClick={() => {
+                          handleDeleteClick(id);
+                          window.location.href = "/admin/taxinomies";
+                        }}
+                        className="px-8 py-2.5 leading-5 text-white transition-colors duration-300 transform bg-blue-600 rounded-md hover:bg-blue-500 focus:outline-none focus:bg-gray-600"
+                      >
+                        Delete
+                      </button>
+                    )}
+                  </div>
+                )}
+              </div>
 
-            <div className="flex space-x-4 justify-end">
-              {similarTaxonomies.some((taxonomy) => taxonomy.isEdit) && (
-                <button
-                  type="submit"
-                  onClick={handleSave}
-                  className="px-8 py-2.5 leading-5 text-white transition-colors duration-300 transform bg-blue-600 rounded-md hover:bg-blue-500 focus:outline-none focus:bg-gray-600"
-                >
-                  {isEditMode ? "Save" : "Add"}
-                </button>
-              )}
-              {!similarTaxonomies.some((taxonomy) => taxonomy.isEdit) &&
-                !isEditMode && (
+              <div className="flex space-x-4 justify-end">
+                {similarTaxonomies.some((taxonomy) => taxonomy.isEdit) && (
                   <button
                     type="submit"
                     onClick={handleSave}
@@ -400,17 +403,27 @@ const TaxonomyForm = () => {
                     {isEditMode ? "Save" : "Add"}
                   </button>
                 )}
-              <button
-                onClick={handleCancelClick}
-                type="button"
-                className="px-8 py-2.5 leading-5 text-white transition-colors duration-300 transform bg-blue-600 rounded-md hover:bg-blue-500 focus:outline-none focus:bg-gray-600"
-              >
-                Cancel
-              </button>
+                {!similarTaxonomies.some((taxonomy) => taxonomy.isEdit) &&
+                  !isEditMode && (
+                    <button
+                      type="submit"
+                      onClick={handleSave}
+                      className="px-8 py-2.5 leading-5 text-white transition-colors duration-300 transform bg-blue-600 rounded-md hover:bg-blue-500 focus:outline-none focus:bg-gray-600"
+                    >
+                      {isEditMode ? "Save" : "Add"}
+                    </button>
+                  )}
+                <button
+                  onClick={handleCancelClick}
+                  type="button"
+                  className="px-8 py-2.5 leading-5 text-white transition-colors duration-300 transform bg-blue-600 rounded-md hover:bg-blue-500 focus:outline-none focus:bg-gray-600"
+                >
+                  Cancel
+                </button>
+              </div>
             </div>
-          </div>
-        </form>
-        {/* )} */}
+          </form>
+        )}
 
         {/* Table for Displaying Similar Taxonomies */}
         {isSimilarTaxonomyOpen && isMultiple && isEditMode && (

package/src/components/admin/Users.tsx

@@ -201,14 +201,7 @@ function Users() {
                           />
                         </svg>
                       </button>
-                      {/* 
-                      <a
-                        href={`/admin/users/userform?id=${user.id}`}
-                        onClick={(e) => {
-                          e.preventDefault();
-                          handleEditClick(user.id);
-                        }}
-                      > */}
+
                       <button
                         onClick={(event) =>
                           handleEditClick(
@@ -347,28 +340,3 @@ function Users() {
 }
 
 export default Users;
-
-// import React from "react";
-
-// function Users() {
-//   const handleNavigation = (event: React.MouseEvent, path: string) => {
-//     event.preventDefault();
-//     window.history.pushState({}, "", path);
-//     window.dispatchEvent(new PopStateEvent("popstate"));
-//   };
-
-//   return (
-//     <div>
-//       Users
-//       <button
-//         type="button"
-//         onClick={(event) => handleNavigation(event, "/admin/users/userform")}
-//         className="flex items-center justify-center px-6 py-2 font-medium tracking-wide text-white capitalize transition-colors duration-300 transform bg-blue-600 rounded-lg hover:bg-blue-500 focus:outline-none focus:ring focus:ring-blue-300 focus:ring-opacity-80"
-//       >
-//         User
-//       </button>
-//     </div>
-//   );
-// }
-
-// export default Users;