diff --git a/packages/nulp_elite/public/locales/en/translation.json b/packages/nulp_elite/public/locales/en/translation.json index 661141cf..f3c5d794 100644 --- a/packages/nulp_elite/public/locales/en/translation.json +++ b/packages/nulp_elite/public/locales/en/translation.json @@ -295,30 +295,32 @@ "VIEW_STATUS": "View Status", "SEARCH_FOR_POLL": "Search for a Poll", "NO_POLL_AVAILABLE_NOW": " It looks like there are no polls at the moment.", - "ADMIN":"Admin", - "LEARNING_REPORT":"Learning Report", - "POPULAR_COURSES" : "Popular Courses", - "RECENTLY_ADDED":"Recently Added", - "THIS_CONTENT_IS_DERIVED_FROM":"This content is derived from", - "PUBLISHED_ON_NULP_BY":"PUBLISHED ON NULP BY", - "ACCEPT_THE_NULP_TERMS_OF_USE" : "I am 18+ years old and understand and accept the NULP Terms of Use", + "ADMIN": "Admin", + "LEARNING_REPORT": "Learning Report", + "POPULAR_COURSES": "Popular Courses", + "RECENTLY_ADDED": "Recently Added", + "THIS_CONTENT_IS_DERIVED_FROM": "This content is derived from", + "PUBLISHED_ON_NULP_BY": "PUBLISHED ON NULP BY", + "ACCEPT_THE_NULP_TERMS_OF_USE": "I am 18+ years old and understand and accept the NULP Terms of Use", "As_A_PATENT_GUARDIAN_ACCEPT_THE_NULP_TERMS_OF_USE": "As a parent/guardian I understand & accept the NULP Terms of Use agree my child to register on NULP with the given information.", "CONTENT_DERIVED_FROM": "This content is derived from", - "FILTERS":"Filters", - "EXPLORE_CONTENT":"Explore Content", + "FILTERS": "Filters", + "EXPLORE_CONTENT": "Explore Content", "COURSE_SUCCESSFULLY_COMPLETED": "Course completed Successfully", - "ID":"ID", - "ORGANIZATION_NAME":"Organization Name", - "ROLE":"Role", - "NO_CERTIFICATES_FOUND":"No certificates found", - "NOT_ENROLL_MESSAGE":"You are not enrolled in any course. Enroll now!", - "FIRST_NAME":"First Name", - "LAST_NAME":"Last Name", - "NO_CHAT_REQUEST" : "No Chat Request", - "PHONE":"Phone", - "PHONE_NUMBER":"(+91 11) 24617517, 24617543, 24617595", - "LERN_title":"Learnathon 2.0", - "LERN_MESSAGE":"Learnathon 2.0 has started from 20/09/2024 to 20/10/2024. You can now create and share your submissions!", - "CREATE_CONTENT":"Create Content", - "REQUEST_TO_CREATE":"Request to Create" + + "ID": "ID", + "ORGANIZATION_NAME": "Organization Name", + "ROLE": "Role", + "NO_CERTIFICATES_FOUND": "No certificates found", + "NOT_ENROLL_MESSAGE": "You are not enrolled in any course. Enroll now!", + "FIRST_NAME": "First Name", + "LAST_NAME": "Last Name", + "NO_CHAT_REQUEST": "No Chat Request", + "PHONE": "Phone", + "PHONE_NUMBER": "(+91 11) 24617517, 24617543, 24617595", + "SESSION_TIMEOUT_MESSAGE": "Failed to fetch data.please try again.", + "LERN_title": "Learnathon 2.0", + "LERN_MESSAGE": "Learnathon 2.0 has started from 20/09/2024 to 20/10/2024. You can now create and share your submissions!", + "CREATE_CONTENT": "Create Content", + "REQUEST_TO_CREATE": "Request to Create" } diff --git a/packages/nulp_elite/src/components/Card.js b/packages/nulp_elite/src/components/Card.js index 594a4832..81bbee96 100644 --- a/packages/nulp_elite/src/components/Card.js +++ b/packages/nulp_elite/src/components/Card.js @@ -18,6 +18,7 @@ export default function BoxCard({ items, index, onClick, continueLearning }) { const { t } = useTranslation(); useEffect(() => { + console.log("items-------", items); if (items.se_gradeLevels) { setSubdomain(processString(items.se_gradeLevels[0])); } else if (items.gradeLevel) { @@ -196,29 +197,108 @@ export default function BoxCard({ items, index, onClick, continueLearning }) { {items.name} )} - {items.organisation && items.organisation.length > 0 && ( - 1 - ? items.organisation.join(', ') - : items.organisation[0] - } - arrow - placement="top" - > - - - {items.organisation.length === 1 - ? items.organisation[0] - : `${items.organisation[0]} + ${items.organisation.length - 1}`} - - - - )} + + + {" "} + {items.organisation && items.organisation.length > 0 && ( + 1 + ? items.organisation.join(", ") + : items.organisation[0] + } + arrow + placement="top" + > + + + {items.organisation.length === 1 + ? items.organisation[0] + : `${items.organisation[0]} + ${ + items.organisation.length - 1 + }`} + + + + )} + + + {items?.medium || + (items?.se_mediums && ( + <> + {items?.medium && items.medium.length > 0 ? ( + 1 + ? items.medium.join(", ") + : items.medium[0] + } + arrow + placement="top" + > + + + {items.medium.length === 1 + ? items.medium[0] + : `${items.medium[0]} + ${items.medium.length - 1}`} + + + + ) : ( + 1 + ? items.se_mediums.join(", ") + : items.se_mediums[0] + } + arrow + placement="top" + > + + + {items.se_mediums.length === 1 + ? items.se_mediums[0] + : `${items.se_mediums[0]} + ${ + items.se_mediums.length - 1 + }`} + + + + )} + + ))} + + {(items?.board || items?.gradeLevel || diff --git a/packages/nulp_elite/src/pages/registration/Otp.js b/packages/nulp_elite/src/pages/registration/Otp.js index 96d9b9be..4c9b0519 100644 --- a/packages/nulp_elite/src/pages/registration/Otp.js +++ b/packages/nulp_elite/src/pages/registration/Otp.js @@ -289,13 +289,9 @@ const Otp = () => { const age = new Date().getFullYear() - birthYear; const tncText = age < 18 ? ( - - {t("As_A_PATENT_GUARDIAN_ACCEPT_THE_NULP_TERMS_OF_USE")} - + {t("As_A_PATENT_GUARDIAN_ACCEPT_THE_NULP_TERMS_OF_USE")} ) : ( - - {t("ACCEPT_THE_NULP_TERMS_OF_USE")} - + {t("ACCEPT_THE_NULP_TERMS_OF_USE")} ); const handleCheckboxChange = (event) => { setIsChecked(event.target.checked);