diff --git a/packages/nulp_elite/src/components/EventCard.js b/packages/nulp_elite/src/components/EventCard.js index 3d79677f..2cfbc523 100644 --- a/packages/nulp_elite/src/components/EventCard.js +++ b/packages/nulp_elite/src/components/EventCard.js @@ -163,7 +163,9 @@ export default function EventCard({ items, index, onClick }) { > {/* */} {/*
*/} - + {items.name && ( diff --git a/packages/nulp_elite/src/pages/content/joinCourse.js b/packages/nulp_elite/src/pages/content/joinCourse.js index 41f691e1..1f04691c 100644 --- a/packages/nulp_elite/src/pages/content/joinCourse.js +++ b/packages/nulp_elite/src/pages/content/joinCourse.js @@ -598,19 +598,29 @@ const JoinCourse = () => { if (isNotStarted) { return ( - - {!isCompleted && - - } + + + {!isCompleted && + + } + + {showConfirmation && ( @@ -642,65 +652,74 @@ const JoinCourse = () => { ); } else { - return ( + return ( <> - - + + + + {!isCompleted && + + } + - onClick={() => - handleLinkClick( - ContinueLearning ?? NotConsumedContent ?? childnode - ) - } - className="custom-btn-primary mr-5" - > - {t("CONTINUE_LEARNNG")} - - {!isCompleted && - - } - - {showConfirmation && ( - - - {t("LEAVE_COURSE_CONFIRMATION_TITLE")} - - - - {t("LEAVE_COURSE_CONFIRMATION_MESSAGE")} - - - - - - - - - )} - - {isCompleted && - - {t("COURSE_SUCCESSFULLY_COMPLETED")} + + {showConfirmation && ( + + + {t("LEAVE_COURSE_CONFIRMATION_TITLE")} + + + + {t("LEAVE_COURSE_CONFIRMATION_MESSAGE")} + + + + + + + + + )} - } - + {isCompleted && + + {t("COURSE_SUCCESSFULLY_COMPLETED")} + + } + ); } diff --git a/packages/nulp_elite/src/pages/voting/votingDashboard.js b/packages/nulp_elite/src/pages/voting/votingDashboard.js index 1ede02db..3e6c73ec 100644 --- a/packages/nulp_elite/src/pages/voting/votingDashboard.js +++ b/packages/nulp_elite/src/pages/voting/votingDashboard.js @@ -454,7 +454,7 @@ const votingDashboard = () => { className="d-flex h6-title mt-30" style={{ color: "#484848" }} > - + {moment(items.start_date).format( "dddd, MMMM Do YYYY, h:mm:ss a" @@ -759,7 +759,7 @@ const votingDashboard = () => { className="d-flex h6-title mt-30" style={{ color: "#484848" }} > - + {moment(items?.start_date).format( "dddd, MMMM Do YYYY, h:mm:ss a" @@ -1011,7 +1011,7 @@ const votingDashboard = () => { className="d-flex h6-title mt-30" style={{ color: "#484848" }} > - + {moment(items?.start_date).format( "dddd, MMMM Do YYYY, h:mm:ss a"