From af9438bbe998fcce542b7564c93686f0cb0202e9 Mon Sep 17 00:00:00 2001 From: Mahesh Mahajan Date: Fri, 16 Aug 2024 12:03:40 +0530 Subject: [PATCH 1/2] TASK #0000 show error message every time when user click on content if user not enrolled in course --- packages/nulp_elite/src/pages/content/joinCourse.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nulp_elite/src/pages/content/joinCourse.js b/packages/nulp_elite/src/pages/content/joinCourse.js index 7f03f8e5..93c7911a 100644 --- a/packages/nulp_elite/src/pages/content/joinCourse.js +++ b/packages/nulp_elite/src/pages/content/joinCourse.js @@ -513,7 +513,7 @@ const JoinCourse = () => { }, }); } else { - showOpenContenErrorMessage("You must join the course to get complete access to content."); + showErrorMessage("You must join the course to get complete access to content."); } }; From 54231d8f6c9c054103e7e8ec0420fd02b1842a53 Mon Sep 17 00:00:00 2001 From: Mahesh Mahajan Date: Fri, 16 Aug 2024 17:20:14 +0530 Subject: [PATCH 2/2] TASK : #0000 Changed se_boards to board on content search API filter on content List page --- .../cardBanner/environmentandclimate.png | Bin 0 -> 7555 bytes packages/nulp_elite/src/components/Card.js | 58 +++++++++--------- .../src/pages/search/ContentList.js | 2 +- 3 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 packages/nulp_elite/src/assets/cardBanner/environmentandclimate.png diff --git a/packages/nulp_elite/src/assets/cardBanner/environmentandclimate.png b/packages/nulp_elite/src/assets/cardBanner/environmentandclimate.png new file mode 100644 index 0000000000000000000000000000000000000000..43a8795d54dc54ff463fc36bb3661b9e7a164ff2 GIT binary patch literal 7555 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 C2K7$> literal 0 HcmV?d00001 diff --git a/packages/nulp_elite/src/components/Card.js b/packages/nulp_elite/src/components/Card.js index 7ae8c40f..d7543f40 100644 --- a/packages/nulp_elite/src/components/Card.js +++ b/packages/nulp_elite/src/components/Card.js @@ -10,7 +10,7 @@ import { Divider } from "native-base"; import RandomImage from "../assets/cardRandomImgs.json"; import { useTranslation } from "react-i18next"; const processString = (str) => { - return str.replace(/[^a-zA-Z0-9]/g, "").toLowerCase(); + return str?.replace(/[^a-zA-Z0-9]/g, "").toLowerCase(); }; export default function BoxCard({ items, index, onClick, continueLearning }) { const [imgUrl, setImgUrl] = useState(); @@ -210,34 +210,34 @@ export default function BoxCard({ items, index, onClick, continueLearning }) { items?.se_gradeLevels) && ( <> - {(items?.board || items?.se_boards) && ( - 1 - ? items.se_boards.join(", ") - : items?.se_boards?.[0] || "" - } - placement="top" - className="labelOne cardLabelEllips" - > - - - )} + {items?.board ? ( + + + +) : ( + 0 + ? items.se_boards.join(", ") + : "" + } + placement="top" + className="labelOne cardLabelEllips" + > + + +)} {(items.gradeLevel || items.se_gradeLevels) && ( 0 ? subDomainFilter