diff --git a/packages/nulp_elite/public/locales/be/translation.json b/packages/nulp_elite/public/locales/be/translation.json index 9a36a857..1bbf9a13 100644 --- a/packages/nulp_elite/public/locales/be/translation.json +++ b/packages/nulp_elite/public/locales/be/translation.json @@ -261,5 +261,6 @@ "CONNECTION_REQUEST": "সংযোগ অনুরোধ", "BLOCKED_USERS": "ব্লক করা ব্যবহারকারীরা", "What do you want to learn today? ": "আজ আপনি কী শিখতে চান?", - "REGISTRATION_FORM": "ইভেন্টের জন্য নিবন্ধন করুন" + "REGISTRATION_FORM": "ইভেন্টের জন্য নিবন্ধন করুন", + "COURSE & CERTIFICATES":"কোর্স এবং সার্টিফিকেট" } diff --git a/packages/nulp_elite/public/locales/en/translation.json b/packages/nulp_elite/public/locales/en/translation.json index d2f9fbef..bdc7003f 100644 --- a/packages/nulp_elite/public/locales/en/translation.json +++ b/packages/nulp_elite/public/locales/en/translation.json @@ -281,5 +281,6 @@ "SHARE_RESULTS": "Share Results", "UPDATE_VOTE": "Update Vote", "What do you want to learn today? ": "What do you want to learn today? ", - "REGISTRATION_FORM": "Register For Event" + "REGISTRATION_FORM": "Register For Event", + "COURSE & CERTIFICATES":"Course & Certificates" } diff --git a/packages/nulp_elite/public/locales/gg/translation.json b/packages/nulp_elite/public/locales/gg/translation.json index af2fd7eb..af30561c 100644 --- a/packages/nulp_elite/public/locales/gg/translation.json +++ b/packages/nulp_elite/public/locales/gg/translation.json @@ -269,5 +269,6 @@ "CONNECTION_REQUEST": "કનેક્શન વિનંતીઓ", "BLOCKED_USERS": "અબ્લોક કરેલા યૂઝર્સ", "What do you want to learn today? ": "આજે તમે શું શીખવા માંગો છો?", - "REGISTRATION_FORM": "ઇવેન્ટ માટે નોંધણી કરો" + "REGISTRATION_FORM": "ઇવેન્ટ માટે નોંધણી કરો", + "COURSE & CERTIFICATES": "અભ્યાસક્રમ અને પ્રમાણપત્રો" } diff --git a/packages/nulp_elite/public/locales/hi/translation.json b/packages/nulp_elite/public/locales/hi/translation.json index 605ae33d..7edf77d4 100644 --- a/packages/nulp_elite/public/locales/hi/translation.json +++ b/packages/nulp_elite/public/locales/hi/translation.json @@ -260,5 +260,6 @@ "CONNECTION_REQUEST": "कनेक्शन अनुरोध", "BLOCKED_USERS": "ब्लॉक किए गए उपयोगकर्ता", "What do you want to learn today? ": "आज आप क्या सीखना चाहते हैं?", - "REGISTRATION_FORM": "इवेंट के लिए पंजीकरण करें" + "REGISTRATION_FORM": "इवेंट के लिए पंजीकरण करें", + "COURSE & CERTIFICATES": "पाठ्यक्रम एवं प्रमाणपत्र" } diff --git a/packages/nulp_elite/public/locales/ma/translation.json b/packages/nulp_elite/public/locales/ma/translation.json index 2dc8487d..b8264045 100644 --- a/packages/nulp_elite/public/locales/ma/translation.json +++ b/packages/nulp_elite/public/locales/ma/translation.json @@ -261,5 +261,6 @@ "CONNECTION_REQUEST": "कनेक्शन विनंत्या", "BLOCKED_USERS": "ब्लॉक वापरकर्ते", "What do you want to learn today? ": "आज तुम्हाला काय शिकायचे आहे?", - "REGISTRATION_FORM": "इव्हेंटसाठी नोंदणी करा" + "REGISTRATION_FORM": "इव्हेंटसाठी नोंदणी करा", + "COURSE & CERTIFICATES": "अभ्यासक्रम आणि प्रमाणपत्रे" } diff --git a/packages/nulp_elite/public/locales/mal/translation.json b/packages/nulp_elite/public/locales/mal/translation.json index 21ffad4c..39d2714f 100644 --- a/packages/nulp_elite/public/locales/mal/translation.json +++ b/packages/nulp_elite/public/locales/mal/translation.json @@ -261,5 +261,6 @@ "CONNECTION_REQUEST": "കണക്ഷൻ അഭ്യർത്ഥനകൾ", "BLOCKED_USERS": "അടച്ച ഉപയോക്താക്കൾ", "What do you want to learn today? ": "ഇന്ന് നിങ്ങൾ എന്താണ് പഠിക്കാൻ ആഗ്രഹിക്കുന്നത്?", - "REGISTRATION_FORM": "ഇവെന്റിനായി രജിസ്റ്റർ ചെയ്യുക" + "REGISTRATION_FORM": "ഇവെന്റിനായി രജിസ്റ്റർ ചെയ്യുക", + "COURSE & CERTIFICATES": "കോഴ്സും സർട്ടിഫിക്കറ്റുകളും" } diff --git a/packages/nulp_elite/public/locales/ta/translation.json b/packages/nulp_elite/public/locales/ta/translation.json index 7246cc0d..fca9a37e 100644 --- a/packages/nulp_elite/public/locales/ta/translation.json +++ b/packages/nulp_elite/public/locales/ta/translation.json @@ -284,5 +284,6 @@ "CONNECTION_REQUEST": "இணைப்பு கோரிக்கைகள்", "BLOCKED_USERS": "தடுக்கும் பயனர்கள்", "What do you want to learn today? ": "இன்று நீங்கள் என்ன கற்க விரும்புகிறீர்கள்?", - "REGISTRATION_FORM": "நிகழ்வுக்கு பதிவு செய்யுங்கள்" + "REGISTRATION_FORM": "நிகழ்வுக்கு பதிவு செய்யுங்கள்", + "COURSE & CERTIFICATES": "பாடநெறி & சான்றிதழ்கள்" } diff --git a/packages/nulp_elite/public/locales/te/translation.json b/packages/nulp_elite/public/locales/te/translation.json index bbe7e114..8f936ac8 100644 --- a/packages/nulp_elite/public/locales/te/translation.json +++ b/packages/nulp_elite/public/locales/te/translation.json @@ -222,5 +222,6 @@ "DASHBOARD": "డాష్‌బోర్డ్", "EVENTS_DASHBOARD": "ఈవెంట్స్ డాష్‌బోర్డ్", "TOTAl_EVENTS": "మొత్తం ఈవెంట్స్", - "EVENTS_THIS_MONTH": "ఈ నెలలో ఈవెంట్స్" + "EVENTS_THIS_MONTH": "ఈ నెలలో ఈవెంట్స్", + "COURSE & CERTIFICATES": "కోర్సు & సర్టిఫికెట్లు" } diff --git a/packages/nulp_elite/src/App.js b/packages/nulp_elite/src/App.js index bb79503c..f4635f6f 100644 --- a/packages/nulp_elite/src/App.js +++ b/packages/nulp_elite/src/App.js @@ -53,8 +53,8 @@ import votingDashboard from "pages/voting/votingDashboard"; import pollsDetails from "pages/voting/pollsDetails"; const urlConfig = require("./configs/urlConfig.json"); const routeConfig = require("./configs/routeConfig.json"); -import PopupForm from "pages/profileData" -import axios from 'axios'; +import PopupForm from "pages/profileData"; +import axios from "axios"; function App() { // const [t] = useTranslation(); @@ -66,7 +66,7 @@ function App() { const [checkPref, setCheckPref] = React.useState(true); const _userId = util.userId(); const [orgId, setOrgId] = useState(); - const[userData,setUserData]=React.useState(false) + const [userData, setUserData] = React.useState(false); const routes = [ { @@ -241,27 +241,25 @@ function App() { console.error("Error fetching user data:", error); } }; - const UserData=async()=>{ -const url = `${urlConfig.URLS.POFILE_PAGE.USER_READ}` -const requestBody={ - user_ids:[_userId] -} -const response=await axios.post(url,requestBody); -const Data=response.data; -console.log("Data of user----------- ",Data); -if( - Array.isArray(Data?.result) && Data.result.length === 0 || - (Array.isArray(Data?.result) && Data.result.length > 0 && - ( - Data.result[0]?.designation === null || + const UserData = async () => { + const url = `${urlConfig.URLS.POFILE_PAGE.USER_READ}`; + const requestBody = { + user_ids: [_userId], + }; + const response = await axios.post(url, requestBody); + const Data = response.data; + console.log("Data of user----------- ", Data); + if ( + (Array.isArray(Data?.result) && Data.result.length === 0) || + (Array.isArray(Data?.result) && + Data.result.length > 0 && + (Data.result[0]?.designation === null || Data.result[0]?.user_type === null || - Data.result[0]?.organisation === null - ) - ) -){ - setUserData(true) -} - } + Data.result[0]?.organisation === null)) + ) { + setUserData(true); + } + }; const fetchData = async () => { try { const url = `${urlConfig.URLS.LEARNER_PREFIX}${urlConfig.URLS.USER.GET_PROFILE}${_userId}`; @@ -318,12 +316,12 @@ if( onClose={() => setCheckPref(true)} /> )} - {userData && ( setUserData(false)} - > + {userData && ( + setUserData(false)} + > )} - 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 00000000..43a8795d Binary files /dev/null and b/packages/nulp_elite/src/assets/cardBanner/environmentandclimate.png differ diff --git a/packages/nulp_elite/src/components/Card.js b/packages/nulp_elite/src/components/Card.js index 7ae8c40f..d092b804 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(); @@ -91,7 +91,7 @@ export default function BoxCard({ items, index, onClick, continueLearning }) { color="#5B5B5B" style={{ fontSize: "11px", - padding: "10px 0", + padding: "10px 0 0 0", textAlign: "left", }} > @@ -109,7 +109,11 @@ export default function BoxCard({ items, index, onClick, continueLearning }) { {t("ENROLLED_ON")} :{" "} @@ -122,14 +126,12 @@ export default function BoxCard({ items, index, onClick, continueLearning }) { { if (items.status === 2) return "#065872"; else if (items.batch.status === 2) return "#FF0000"; else if (items.batch.status === 1) return "#579b00"; })(), fontSize: "12px", - padding: "10px 0", textAlign: "left", fontWeight: "500", }} @@ -210,34 +212,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) && ( { +const FeedbackPopup = ({ open, onClose, contentId }) => { const [rating, setRating] = useState(0); const [feedback, setFeedback] = useState(""); const [additionalFeedback, setAdditionalFeedback] = useState(""); const [showTextBox, setShowTextBox] = useState(false); const [checkboxes, setCheckboxes] = useState({}); - const _userId = util.userId(); - + const _userId = util.userId(); - const BootstrapDialog = styled(Dialog)(({ theme }) => ({ - "& .MuiDialogContent-root": { - padding: theme.spacing(2), - }, - "& .MuiDialogActions-root": { - padding: theme.spacing(1), - }, - })); + // const BootstrapDialog = styled(Dialog)(({ theme }) => ({ + // "& .MuiDialogContent-root": { + // padding: theme.spacing(2), + // }, + // "& .MuiDialogActions-root": { + // padding: theme.spacing(1), + // }, + // })); // Mapping of checkbox names to labels const checkboxLabels = { conceptWell: "Understood the concept well", @@ -91,44 +88,42 @@ const FeedbackPopup = ({ open, onClose,contentId }) => { setAdditionalFeedback(event.target.value); }; - const handleSubmit = async () => { - try { - let selectedCheckboxes = []; + const handleSubmit = async () => { + try { + let selectedCheckboxes = []; - Object.keys(checkboxes).forEach((key) => { - if (checkboxes[key] && checkboxLabels[key] !== 'Other') { - selectedCheckboxes.push(checkboxLabels[key]); - } - }); + Object.keys(checkboxes).forEach((key) => { + if (checkboxes[key] && checkboxLabels[key] !== "Other") { + selectedCheckboxes.push(checkboxLabels[key]); + } + }); - const url = `${urlConfig.URLS.FEEDBACK.CREATE}`; - const request = { - content_id: contentId, - user_id: _userId, - rating: rating, - default_feedback: selectedCheckboxes, - other_feedback: additionalFeedback, - }; + const url = `${urlConfig.URLS.FEEDBACK.CREATE}`; + const request = { + content_id: contentId, + user_id: _userId, + rating: rating, + default_feedback: selectedCheckboxes, + other_feedback: additionalFeedback, + }; - const response = await axios.post(url, request); - console.log("response.data", response.data); - - console.log("Rating:", rating); - console.log("Selected Checkboxes:", selectedCheckboxes); - console.log("Additional Feedback:", additionalFeedback); - - onClose(); - } catch (error) { - console.error("Error submitting feedback:", error); - } -}; + const response = await axios.post(url, request); + console.log("response.data", response.data); + console.log("Rating:", rating); + console.log("Selected Checkboxes:", selectedCheckboxes); + console.log("Additional Feedback:", additionalFeedback); - - const handleClose = () => { - setOpen(false); + onClose(); + } catch (error) { + console.error("Error submitting feedback:", error); + } }; + // const handleClose = () => { + // setOpen(false); + // }; + const renderCheckboxes = () => { if (rating >= 5) { return ( @@ -293,13 +288,11 @@ const FeedbackPopup = ({ open, onClose,contentId }) => { }; return ( - - - Feedback - + + Feedback { Submit - + // // Feedback diff --git a/packages/nulp_elite/src/components/FloatingChatIcon.js b/packages/nulp_elite/src/components/FloatingChatIcon.js index bb726e2b..d126f784 100644 --- a/packages/nulp_elite/src/components/FloatingChatIcon.js +++ b/packages/nulp_elite/src/components/FloatingChatIcon.js @@ -43,7 +43,7 @@ const FloatingChatIcon = () => { }} >