Merge branch 'release-1.0.0' into seventy

tekdi · Dec 2, 2024 · cab6bc1 · cab6bc1
2 parents a9f6159 + 82513b5
commit cab6bc1
Show file tree

Hide file tree

Showing 49 changed files with 1,376 additions and 870 deletions.
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "next dev",
+    "dev": "export NEXT_PRIVATE_LOCAL_WEBPACK=true && next dev",
     "build": "next build",
     "start": "next start",
     "lint": "next lint",

diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -141,7 +141,8 @@
     "PAGE_NOT_FOUND": "Page not found",
     "ACCESS_DENIED": "Access Denied",
     "YOU_DONT_HAVE_PERMISSION_TO_ACCESS_THIS_PAGE": "You don't have access to this page",
-    "RETURN_TO_LOGIN": "Return to Login"
+    "RETURN_TO_LOGIN": "Return to Login",
+    "COHORT_CODE_EXISTS": "Code already exists"
 
   },
   "LOGIN_PAGE": {
@@ -313,10 +314,10 @@
     "RENAME": "Rename",
     "CENTER_RENAMED": "Center Renamed Successfully!",
     "SEND_REQUEST": "Send Request",
-    "SURE_DELETE_CENTER": "Are you sure you want to Delete ",
-    "CENTER_UPDATE_SUCCESSFULLY": "Center has been Successfully Updated",
-    "CENTER_DELETE_SUCCESSFULLY": "Center has been Successfully Deleted",
-    "CENTER_CREATED_SUCCESSFULLY": "Center Created Successfully",
+    "SURE_DELETE_CENTER": "Are you sure you want to delete ",
+    "CENTER_UPDATE_SUCCESSFULLY": "Center has been successfully updated",
+    "CENTER_DELETE_SUCCESSFULLY": "Center has been successfully deleted",
+    "CENTER_CREATED_SUCCESSFULLY": "Center Created successfully",
     "SEARCHBAR_PLACEHOLDER": "Search Center..",
     "CENTER_UPDATE_FAILED": "Something went wrong while updating center",
     "YOU_CANT_DELETE_CENTER_HAS_ACTIVE_LEARNERS": "You can't delete the center because it has {{activeMembers}} Active Learners"

diff --git a/src/assets/images/Epub.svg b/src/assets/images/Epub.svg
diff --git a/src/assets/images/HTML.svg b/src/assets/images/HTML.svg
diff --git a/src/assets/images/MP4.svg b/src/assets/images/MP4.svg
diff --git a/src/assets/images/PDF.svg b/src/assets/images/PDF.svg
diff --git a/src/assets/images/Qml.svg b/src/assets/images/Qml.svg
diff --git a/src/assets/images/bgEpub.svg b/src/assets/images/bgEpub.svg
diff --git a/src/assets/images/bgHtml.svg b/src/assets/images/bgHtml.svg
diff --git a/src/assets/images/bgMP4 .svg b/src/assets/images/bgMP4 .svg
diff --git a/src/assets/images/bgPDF.svg b/src/assets/images/bgPDF.svg
diff --git a/src/assets/images/bgQml.svg b/src/assets/images/bgQml.svg
diff --git a/src/assets/images/bgYouTube.svg b/src/assets/images/bgYouTube.svg
diff --git a/src/assets/images/decorationBg.png b/src/assets/images/decorationBg.png
diff --git a/src/assets/images/youtube.svg b/src/assets/images/youtube.svg
diff --git a/src/components/AddBlockModal.tsx b/src/components/AddBlockModal.tsx
@@ -111,7 +111,7 @@ export const AddBlockModal: React.FC<AddBlockModalProps> = ({
       const districts = data?.result?.values || [];
       setDistrictsOptionRead(districts);
 
-      const districtNameArray = districts.map((item: any) => item.label);
+      const districtNameArray = districts.map((item: any) => item?.label?.toLowerCase());
       setDistrictNameArr(districtNameArray);
 
       const districtCodeArray = districts.map((item: any) => item.value);
@@ -162,7 +162,7 @@ export const AddBlockModal: React.FC<AddBlockModalProps> = ({
 
             const matchingDistrict = districtsOptionRead.find(
               (district: { label: string }) =>
-                district.label === transformedName
+                district?.label?.toLowerCase() === transformedName?.toLowerCase()
             );
             return {
               label: transformedName,
@@ -176,7 +176,7 @@ export const AddBlockModal: React.FC<AddBlockModalProps> = ({
           }
         )
         .filter((district: { label: any }) =>
-          districtNameArr.includes(district.label)
+          districtNameArr.includes(district?.label?.toLowerCase())
         );
       setDistricts(filteredDistrictData);
     } catch (error) {
@@ -403,4 +403,4 @@ export const AddBlockModal: React.FC<AddBlockModalProps> = ({
       </DialogActions>
     </Dialog>
   );
-};
+};
diff --git a/src/components/DeleteUserModal.tsx b/src/components/DeleteUserModal.tsx
@@ -183,4 +183,4 @@ const DeleteUserModal: React.FC<DeleteUserModalProps> = ({
   );
 };
 
-export default DeleteUserModal;
+export default DeleteUserModal;
diff --git a/src/components/DynamicForm.tsx b/src/components/DynamicForm.tsx
@@ -112,6 +112,8 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
     };
 
     const cleanedFormData = cleanAndReplace(event.formData);
+    console.log("cleanedFormData---", cleanedFormData);
+
     console.log("Form data changed:", cleanedFormData);
 
     setLocalFormData(cleanedFormData);
@@ -247,8 +249,12 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
       return error;
     });
   };
-  useEffect(() => {
-    // setSubmittedButtonStatus(false);
+ useEffect(() => {
+
+    const updatedFormData = Object.fromEntries(
+      Object.entries(localFormData)?.map(([key, value]) => [key, value === "undefined" ? "" : value])
+    ); 
+    setLocalFormData(updatedFormData);
   }, []);
   return (
     <div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -183,4 +183,4 @@ const DeleteUserModal: React.FC<DeleteUserModalProps> = ({ @@
       );
     };
-    export default DeleteUserModal;
+    export default DeleteUserModal;