From 908a0dccac3c1d640eae7501a8cf853129a7e42a Mon Sep 17 00:00:00 2001 From: Mahesh Mahajan Date: Tue, 24 Sep 2024 18:20:21 +0530 Subject: [PATCH 01/16] TASK : #0000 Changed Keywords for eventOrganisedBy and IssueCerificate --- packages/nulp_elite/src/pages/events/dashboard.js | 4 ++-- packages/nulp_elite/src/pages/events/eventDetails.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/nulp_elite/src/pages/events/dashboard.js b/packages/nulp_elite/src/pages/events/dashboard.js index 283676bc..d3b0a2a9 100644 --- a/packages/nulp_elite/src/pages/events/dashboard.js +++ b/packages/nulp_elite/src/pages/events/dashboard.js @@ -886,8 +886,8 @@ const Dashboard = () => { {event.totalParticipants} - {event.IssueCerificate} - {event.EventOrganisedby} + {event.IssueCerificate || event.issueCerificate} + {event.EventOrganisedby || event.eventOrganisedBy} handleDownloadClick(event.identifier)} diff --git a/packages/nulp_elite/src/pages/events/eventDetails.js b/packages/nulp_elite/src/pages/events/eventDetails.js index 5defa02d..8e2eab9e 100644 --- a/packages/nulp_elite/src/pages/events/eventDetails.js +++ b/packages/nulp_elite/src/pages/events/eventDetails.js @@ -787,7 +787,7 @@ const formatTimeWithTimezone = (date) => { - {detailData.eventOrganisedby} + {detailData.eventOrganisedBy || detailData.eventOrganisedby} From 590b8d9830d61d21fe4749e15ab5ecdb25eaac8f Mon Sep 17 00:00:00 2001 From: sonaligarud Date: Wed, 25 Sep 2024 12:03:56 +0530 Subject: [PATCH 02/16] Bug #227680 - [webapp => profile] showing hand cursor for role tags on profile page.PFA --- packages/nulp_elite/src/pages/profile/Profile.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/nulp_elite/src/pages/profile/Profile.js b/packages/nulp_elite/src/pages/profile/Profile.js index 12f68281..131c730f 100644 --- a/packages/nulp_elite/src/pages/profile/Profile.js +++ b/packages/nulp_elite/src/pages/profile/Profile.js @@ -593,6 +593,7 @@ const Profile = () => { fontSize: "10px", margin: "0 10px 3px 6px", background: "#e3f5ff", + cursor: 'auto', }} > {roleName} From f232bb37096e3f4aafd32cb32798c1caffbd45bd Mon Sep 17 00:00:00 2001 From: sonaligarud Date: Wed, 25 Sep 2024 12:19:32 +0530 Subject: [PATCH 03/16] Bug #227322 - [webapp => poll] social medial icons should be visible in one line on poll card --- .../nulp_elite/src/pages/voting/pollsDetails.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/nulp_elite/src/pages/voting/pollsDetails.js b/packages/nulp_elite/src/pages/voting/pollsDetails.js index 2bc20679..69798403 100644 --- a/packages/nulp_elite/src/pages/voting/pollsDetails.js +++ b/packages/nulp_elite/src/pages/voting/pollsDetails.js @@ -235,7 +235,7 @@ const pollsDetailes = () => { { openSocialMediaLink(event, shareUrl); @@ -251,7 +251,7 @@ const pollsDetailes = () => { url={shareUrl} title={`Check out this poll: ${items.title}`} separator=":: " - className="pr-5" + className="pr-3" onClick={(event) => openSocialMediaLink(event, shareUrl) } @@ -260,7 +260,7 @@ const pollsDetailes = () => { { @@ -271,7 +271,7 @@ const pollsDetailes = () => { { openSocialMediaLink(event, shareUrl); @@ -406,7 +406,7 @@ const pollsDetailes = () => { { openSocialMediaLink(event, shareUrl); @@ -422,7 +422,7 @@ const pollsDetailes = () => { url={shareUrl} title={`Check out this poll: ${items.title}`} separator=":: " - className="pr-5" + className="pr-3" onClick={(event) => openSocialMediaLink(event, shareUrl) } @@ -431,7 +431,7 @@ const pollsDetailes = () => { { @@ -442,7 +442,7 @@ const pollsDetailes = () => { { openSocialMediaLink(event, shareUrl); From fe334b6cc299da09a641f007e3fd42fadeeceb59 Mon Sep 17 00:00:00 2001 From: Mahesh Mahajan Date: Wed, 25 Sep 2024 12:48:17 +0530 Subject: [PATCH 04/16] Bug #227683 : [desktop => preference popup] User information popup getting closed when clicking outside the popup for old users. --- packages/nulp_elite/src/pages/profileData.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/nulp_elite/src/pages/profileData.js b/packages/nulp_elite/src/pages/profileData.js index b2e281fc..fc975a2c 100644 --- a/packages/nulp_elite/src/pages/profileData.js +++ b/packages/nulp_elite/src/pages/profileData.js @@ -133,7 +133,11 @@ const PopupForm = ({ open, handleClose }) => { return ( { + if (reason !== "backdropClick" && reason !== "escapeKeyDown") { + handleClose(); + } + }} aria-labelledby="modal-modal-title" aria-describedby="modal-modal-description" > From 6ca3c8df39995ff705a3fcda7d025a83814e66c9 Mon Sep 17 00:00:00 2001 From: sonaligarud Date: Wed, 25 Sep 2024 14:15:02 +0530 Subject: [PATCH 05/16] Bug #225739 - [Webapp] On hovering top trending events graph,unable to see the full event name. --- packages/nulp_elite/src/components/header.js | 23 ++++++++------------ 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/packages/nulp_elite/src/components/header.js b/packages/nulp_elite/src/components/header.js index 3b62a401..8f8f8a9d 100644 --- a/packages/nulp_elite/src/components/header.js +++ b/packages/nulp_elite/src/components/header.js @@ -865,21 +865,16 @@ function Header({ globalSearchQuery }) { )} - { + sessionStorage.setItem("urlPath", "learningreport"); + window.open(routeConfig.ROUTES.LEARNING_REPORT, "_blank"); + }} + style={{color:'#1976d2'}} > - { - sessionStorage.setItem("urlPath", "learningreport"); - window.open(routeConfig.ROUTES.LEARNING_REPORT, "_blank"); - }} - > - {t("LEARNING_REPORT")} - - + {t("LEARNING_REPORT")} + {roleNames.some((role) => From 28f551b868de8d26d74f77b998ad2871d6c24a8e Mon Sep 17 00:00:00 2001 From: Mahesh Mahajan Date: Wed, 25 Sep 2024 14:20:59 +0530 Subject: [PATCH 06/16] Bug #227681 : [webapp => update preferences] update api is getting failed with 400 bad request while updating preferences for old user. --- packages/nulp_elite/src/pages/SelectPreference.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nulp_elite/src/pages/SelectPreference.js b/packages/nulp_elite/src/pages/SelectPreference.js index 90890791..231c0c4c 100644 --- a/packages/nulp_elite/src/pages/SelectPreference.js +++ b/packages/nulp_elite/src/pages/SelectPreference.js @@ -295,7 +295,7 @@ setSubCategories(data?.result?.framework?.categories[SubCategoryindex]?.terms); board: [selectedCategory], medium: selectedLanguages, gradeLevel: selectedSubCategory, - subject: [selectedTopic], + // subject: [selectedTopic], id: "nulp-domain", }, userId: _userId, From 2ec03943bed29e70f7a59a3e841af68ba8ad435a Mon Sep 17 00:00:00 2001 From: Shivani Parit <58217306+paritshivani@users.noreply.github.com> Date: Wed, 25 Sep 2024 17:45:18 +0530 Subject: [PATCH 07/16] Update App.js for dev --- packages/nulp_elite/src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nulp_elite/src/App.js b/packages/nulp_elite/src/App.js index bd156a4e..0b3ed72b 100644 --- a/packages/nulp_elite/src/App.js +++ b/packages/nulp_elite/src/App.js @@ -286,7 +286,7 @@ function App() { console.error("Error fetching user data:", error); } }; - +console.log("dev here") fetchData(); UserData(); }, []); From 6be1c60dd1b21cc0e2cd6c87c2d93b8a4a2af949 Mon Sep 17 00:00:00 2001 From: sonaligarud Date: Wed, 25 Sep 2024 19:34:10 +0530 Subject: [PATCH 08/16] Bug #224665 - Date filter is not working on poll list page --- packages/nulp_elite/src/pages/voting/votingList.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/nulp_elite/src/pages/voting/votingList.js b/packages/nulp_elite/src/pages/voting/votingList.js index 03110642..c828d1f0 100644 --- a/packages/nulp_elite/src/pages/voting/votingList.js +++ b/packages/nulp_elite/src/pages/voting/votingList.js @@ -21,6 +21,7 @@ import FloatingChatIcon from "components/FloatingChatIcon"; const urlConfig = require("../../configs/urlConfig.json"); import { useTranslation } from "react-i18next"; import { Loading } from "@shiksha/common-lib"; +import dayjs from "dayjs"; const VotingList = () => { const [toasterOpen, setToasterOpen] = useState(false); @@ -42,22 +43,17 @@ const VotingList = () => { selectedEndDate: null, status: ["Live"], }); + const [finalFilters, setFinalFilters] = useState({}); const handleFilterChange = (newFilters) => { - const formatDateToISO = (dateStr) => { - const localDate = new Date(dateStr); - localDate.setUTCHours(0, 0, 0, 0); - return localDate.toISOString(); - }; - const formattedFilters = { ...newFilters, selectedStartDate: newFilters.selectedStartDate - ? formatDateToISO(newFilters.selectedStartDate) + ? dayjs(newFilters.selectedStartDate).format("YYYY-MM-DD") : null, selectedEndDate: newFilters.selectedEndDate - ? formatDateToISO(newFilters.selectedEndDate) + ? dayjs(newFilters.selectedEndDate).format("YYYY-MM-DD") : null, }; setFilters(formattedFilters); @@ -257,4 +253,4 @@ const VotingList = () => { ); }; -export default VotingList; +export default VotingList; \ No newline at end of file From 438046fc32164e7e0bf5b418eba39631ce2b941a Mon Sep 17 00:00:00 2001 From: sonaligarud Date: Thu, 26 Sep 2024 12:11:38 +0530 Subject: [PATCH 09/16] Bug #227084 - [Home=>Mobile] Explore bar is missing on home page --- packages/nulp_elite/public/locales/be/translation.json | 2 +- packages/nulp_elite/public/locales/en/translation.json | 2 +- packages/nulp_elite/public/locales/gg/translation.json | 2 +- packages/nulp_elite/public/locales/hi/translation.json | 2 +- packages/nulp_elite/public/locales/ma/translation.json | 2 +- packages/nulp_elite/public/locales/mal/translation.json | 2 +- packages/nulp_elite/public/locales/ta/translation.json | 2 +- packages/nulp_elite/public/locales/te/translation.json | 3 ++- packages/nulp_elite/src/pages/search/DomainList.js | 4 ++-- packages/nulp_elite/src/styles/style.css | 3 +++ 10 files changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/nulp_elite/public/locales/be/translation.json b/packages/nulp_elite/public/locales/be/translation.json index a6a59e95..da1837ed 100644 --- a/packages/nulp_elite/public/locales/be/translation.json +++ b/packages/nulp_elite/public/locales/be/translation.json @@ -271,7 +271,7 @@ "MY_CONNECTION": "আমার সংযোগ", "CONNECTION_REQUEST": "সংযোগ অনুরোধ", "BLOCKED_USERS": "ব্লক করা ব্যবহারকারীরা", - "What do you want to learn today? ": "আজ আপনি কী শিখতে চান?", + "What_do_you_want_to_learn_today": "আজ আপনি কী শিখতে চান?", "REGISTRATION_FORM": "ইভেন্টের জন্য নিবন্ধন করুন", "COURSE & CERTIFICATES": "কোর্স এবং সার্টিফিকেট", "ALL_PLAYER": "সমস্ত খেলোয়াড়", diff --git a/packages/nulp_elite/public/locales/en/translation.json b/packages/nulp_elite/public/locales/en/translation.json index 6fa249f8..107c9092 100644 --- a/packages/nulp_elite/public/locales/en/translation.json +++ b/packages/nulp_elite/public/locales/en/translation.json @@ -273,7 +273,7 @@ "BLOCKED_USERS": "Blocked Users", "SHARE_RESULTS": "Share Results", "UPDATE_VOTE": "Update Vote", - "What do you want to learn today? ": "What do you want to learn today? ", + "What_do_you_want_to_learn_today": "What do you want to learn today?", "REGISTRATION_FORM": "Register For Event", "COURSE & CERTIFICATES": "Course & Certificates", "ALL_PLAYER": "All Player", diff --git a/packages/nulp_elite/public/locales/gg/translation.json b/packages/nulp_elite/public/locales/gg/translation.json index 42844d1e..1679d2ad 100644 --- a/packages/nulp_elite/public/locales/gg/translation.json +++ b/packages/nulp_elite/public/locales/gg/translation.json @@ -279,7 +279,7 @@ "MY_CONNECTION": "મારા કનેક્શન્સ", "CONNECTION_REQUEST": "કનેક્શન વિનંતીઓ", "BLOCKED_USERS": "અબ્લોક કરેલા યૂઝર્સ", - "What do you want to learn today? ": "આજે તમે શું શીખવા માંગો છો?", + "What_do_you_want_to_learn_today": "આજે તમે શું શીખવા માંગો છો?", "REGISTRATION_FORM": "ઇવેન્ટ માટે નોંધણી કરો", "COURSE & CERTIFICATES": "અભ્યાસક્રમ અને પ્રમાણપત્રો", "ALL_PLAYER": "എല്ലാ കളിക്കാരും", diff --git a/packages/nulp_elite/public/locales/hi/translation.json b/packages/nulp_elite/public/locales/hi/translation.json index b73c0677..7063ed3d 100644 --- a/packages/nulp_elite/public/locales/hi/translation.json +++ b/packages/nulp_elite/public/locales/hi/translation.json @@ -269,7 +269,7 @@ "MY_CONNECTION": "मेरे कनेक्शन", "CONNECTION_REQUEST": "कनेक्शन अनुरोध", "BLOCKED_USERS": "ब्लॉक किए गए उपयोगकर्ता", - "What do you want to learn today? ": "आज आप क्या सीखना चाहते हैं?", + "What_do_you_want_to_learn_today": "आज आप क्या सीखना चाहते हैं?", "REGISTRATION_FORM": "इवेंट के लिए पंजीकरण करें", "COURSE & CERTIFICATES": "पाठ्यक्रम एवं प्रमाणपत्र", "ALL_PLAYER": "सभी प्लेयर", diff --git a/packages/nulp_elite/public/locales/ma/translation.json b/packages/nulp_elite/public/locales/ma/translation.json index 1ed66579..afb530da 100644 --- a/packages/nulp_elite/public/locales/ma/translation.json +++ b/packages/nulp_elite/public/locales/ma/translation.json @@ -270,7 +270,7 @@ "MY_CONNECTION": "माझे कनेक्शन", "CONNECTION_REQUEST": "कनेक्शन विनंत्या", "BLOCKED_USERS": "ब्लॉक वापरकर्ते", - "What do you want to learn today? ": "आज तुम्हाला काय शिकायचे आहे?", + "What_do_you_want_to_learn_today": "आज तुम्हाला काय शिकायचे आहे?", "REGISTRATION_FORM": "इव्हेंटसाठी नोंदणी करा", "COURSE & CERTIFICATES": "अभ्यासक्रम आणि प्रमाणपत्रे", "ALL_PLAYER": "सर्व प्लेयर", diff --git a/packages/nulp_elite/public/locales/mal/translation.json b/packages/nulp_elite/public/locales/mal/translation.json index a02e7d11..b09fec8d 100644 --- a/packages/nulp_elite/public/locales/mal/translation.json +++ b/packages/nulp_elite/public/locales/mal/translation.json @@ -270,7 +270,7 @@ "MY_CONNECTION": "എന്റെ കണക്ഷനുകൾ", "CONNECTION_REQUEST": "കണക്ഷൻ അഭ്യർത്ഥനകൾ", "BLOCKED_USERS": "അടച്ച ഉപയോക്താക്കൾ", - "What do you want to learn today? ": "ഇന്ന് നിങ്ങൾ എന്താണ് പഠിക്കാൻ ആഗ്രഹിക്കുന്നത്?", + "What_do_you_want_to_learn_today": "ഇന്ന് നിങ്ങൾ എന്താണ് പഠിക്കാൻ ആഗ്രഹിക്കുന്നത്?", "REGISTRATION_FORM": "ഇവെന്റിനായി രജിസ്റ്റർ ചെയ്യുക", "COURSE & CERTIFICATES": "കോഴ്സും സർട്ടിഫിക്കറ്റുകളും", "ALL_PLAYER": "എല്ലാ കളിക്കാരും", diff --git a/packages/nulp_elite/public/locales/ta/translation.json b/packages/nulp_elite/public/locales/ta/translation.json index 79f2503b..6ffde1d6 100644 --- a/packages/nulp_elite/public/locales/ta/translation.json +++ b/packages/nulp_elite/public/locales/ta/translation.json @@ -294,7 +294,7 @@ "MY_CONNECTION": "என் இணைப்புகள்", "CONNECTION_REQUEST": "இணைப்பு கோரிக்கைகள்", "BLOCKED_USERS": "தடுக்கும் பயனர்கள்", - "What do you want to learn today? ": "இன்று நீங்கள் என்ன கற்க விரும்புகிறீர்கள்?", + "What_do_you_want_to_learn_today": "இன்று நீங்கள் என்ன கற்க விரும்புகிறீர்கள்?", "REGISTRATION_FORM": "நிகழ்வுக்கு பதிவு செய்யுங்கள்", "COURSE & CERTIFICATES": "பாடநெறி & சான்றிதழ்கள்", "ALL_PLAYER": "அனைத்து வீரர்", diff --git a/packages/nulp_elite/public/locales/te/translation.json b/packages/nulp_elite/public/locales/te/translation.json index ff15d7cc..f61b0afb 100644 --- a/packages/nulp_elite/public/locales/te/translation.json +++ b/packages/nulp_elite/public/locales/te/translation.json @@ -279,5 +279,6 @@ "LAST_NAME":"చివరి పేరు", "NO_CHAT_REQUEST": "చాట్ అభ్యర్థన లేదు", "PHONE":"ఫోన్", - "PHONE_NUMBER":"(+91 11) 24617517, 24617543, 24617595" + "PHONE_NUMBER":"(+91 11) 24617517, 24617543, 24617595", + "What_do_you_want_to_learn_today":"ఈరోజు మీరు ఏమి నేర్చుకోవాలనుకుంటున్నారు" } diff --git a/packages/nulp_elite/src/pages/search/DomainList.js b/packages/nulp_elite/src/pages/search/DomainList.js index 3be72758..a1bf29f0 100644 --- a/packages/nulp_elite/src/pages/search/DomainList.js +++ b/packages/nulp_elite/src/pages/search/DomainList.js @@ -383,11 +383,11 @@ const DomainList = ({ globalSearchQuery }) => { {/* Search Box */} Date: Thu, 26 Sep 2024 12:38:44 +0530 Subject: [PATCH 10/16] Bug #227764 : Date filter is not working on poll list page --- packages/nulp_elite/src/pages/voting/votingList.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nulp_elite/src/pages/voting/votingList.js b/packages/nulp_elite/src/pages/voting/votingList.js index c828d1f0..6cab22cc 100644 --- a/packages/nulp_elite/src/pages/voting/votingList.js +++ b/packages/nulp_elite/src/pages/voting/votingList.js @@ -50,10 +50,10 @@ const VotingList = () => { const formattedFilters = { ...newFilters, selectedStartDate: newFilters.selectedStartDate - ? dayjs(newFilters.selectedStartDate).format("YYYY-MM-DD") + ? dayjs(newFilters.selectedStartDate).set('hour', 0).set('minute', 0).set('second', 0).set('millisecond', 0).format("YYYY-MM-DDTHH:mm:ss.SSS[Z]") : null, selectedEndDate: newFilters.selectedEndDate - ? dayjs(newFilters.selectedEndDate).format("YYYY-MM-DD") + ? dayjs(newFilters.selectedEndDate).set('hour', 18).set('minute', 30).set('second', 0).set('millisecond', 0).format("YYYY-MM-DDTHH:mm:ss.SSS[Z]") : null, }; setFilters(formattedFilters); From 35cb8b48e8e4c8bcdb604488201e7709b8186142 Mon Sep 17 00:00:00 2001 From: sonaligarud Date: Thu, 26 Sep 2024 16:32:18 +0530 Subject: [PATCH 11/16] resolved comment --- packages/nulp_elite/public/locales/be/translation.json | 2 +- packages/nulp_elite/public/locales/en/translation.json | 2 +- packages/nulp_elite/public/locales/gg/translation.json | 2 +- packages/nulp_elite/public/locales/hi/translation.json | 2 +- packages/nulp_elite/public/locales/ma/translation.json | 2 +- packages/nulp_elite/public/locales/mal/translation.json | 2 +- packages/nulp_elite/public/locales/ta/translation.json | 2 +- packages/nulp_elite/public/locales/te/translation.json | 2 +- packages/nulp_elite/src/components/header.js | 6 +++--- packages/nulp_elite/src/pages/search/DomainList.js | 4 +++- 10 files changed, 14 insertions(+), 12 deletions(-) diff --git a/packages/nulp_elite/public/locales/be/translation.json b/packages/nulp_elite/public/locales/be/translation.json index da1837ed..fa23a728 100644 --- a/packages/nulp_elite/public/locales/be/translation.json +++ b/packages/nulp_elite/public/locales/be/translation.json @@ -271,7 +271,7 @@ "MY_CONNECTION": "আমার সংযোগ", "CONNECTION_REQUEST": "সংযোগ অনুরোধ", "BLOCKED_USERS": "ব্লক করা ব্যবহারকারীরা", - "What_do_you_want_to_learn_today": "আজ আপনি কী শিখতে চান?", + "WHAT_DO_YOU_WANT_TO_LEARN_TODAY": "আজ আপনি কী শিখতে চান?", "REGISTRATION_FORM": "ইভেন্টের জন্য নিবন্ধন করুন", "COURSE & CERTIFICATES": "কোর্স এবং সার্টিফিকেট", "ALL_PLAYER": "সমস্ত খেলোয়াড়", diff --git a/packages/nulp_elite/public/locales/en/translation.json b/packages/nulp_elite/public/locales/en/translation.json index 107c9092..5dd84928 100644 --- a/packages/nulp_elite/public/locales/en/translation.json +++ b/packages/nulp_elite/public/locales/en/translation.json @@ -273,7 +273,7 @@ "BLOCKED_USERS": "Blocked Users", "SHARE_RESULTS": "Share Results", "UPDATE_VOTE": "Update Vote", - "What_do_you_want_to_learn_today": "What do you want to learn today?", + "WHAT_DO_YOU_WANT_TO_LEARN_TODAY": "What do you want to learn today?", "REGISTRATION_FORM": "Register For Event", "COURSE & CERTIFICATES": "Course & Certificates", "ALL_PLAYER": "All Player", diff --git a/packages/nulp_elite/public/locales/gg/translation.json b/packages/nulp_elite/public/locales/gg/translation.json index 1679d2ad..72de3600 100644 --- a/packages/nulp_elite/public/locales/gg/translation.json +++ b/packages/nulp_elite/public/locales/gg/translation.json @@ -279,7 +279,7 @@ "MY_CONNECTION": "મારા કનેક્શન્સ", "CONNECTION_REQUEST": "કનેક્શન વિનંતીઓ", "BLOCKED_USERS": "અબ્લોક કરેલા યૂઝર્સ", - "What_do_you_want_to_learn_today": "આજે તમે શું શીખવા માંગો છો?", + "WHAT_DO_YOU_WANT_TO_LEARN_TODAY": "આજે તમે શું શીખવા માંગો છો?", "REGISTRATION_FORM": "ઇવેન્ટ માટે નોંધણી કરો", "COURSE & CERTIFICATES": "અભ્યાસક્રમ અને પ્રમાણપત્રો", "ALL_PLAYER": "എല്ലാ കളിക്കാരും", diff --git a/packages/nulp_elite/public/locales/hi/translation.json b/packages/nulp_elite/public/locales/hi/translation.json index 7063ed3d..79124644 100644 --- a/packages/nulp_elite/public/locales/hi/translation.json +++ b/packages/nulp_elite/public/locales/hi/translation.json @@ -269,7 +269,7 @@ "MY_CONNECTION": "मेरे कनेक्शन", "CONNECTION_REQUEST": "कनेक्शन अनुरोध", "BLOCKED_USERS": "ब्लॉक किए गए उपयोगकर्ता", - "What_do_you_want_to_learn_today": "आज आप क्या सीखना चाहते हैं?", + "WHAT_DO_YOU_WANT_TO_LEARN_TODAY": "आज आप क्या सीखना चाहते हैं?", "REGISTRATION_FORM": "इवेंट के लिए पंजीकरण करें", "COURSE & CERTIFICATES": "पाठ्यक्रम एवं प्रमाणपत्र", "ALL_PLAYER": "सभी प्लेयर", diff --git a/packages/nulp_elite/public/locales/ma/translation.json b/packages/nulp_elite/public/locales/ma/translation.json index afb530da..c4adb363 100644 --- a/packages/nulp_elite/public/locales/ma/translation.json +++ b/packages/nulp_elite/public/locales/ma/translation.json @@ -270,7 +270,7 @@ "MY_CONNECTION": "माझे कनेक्शन", "CONNECTION_REQUEST": "कनेक्शन विनंत्या", "BLOCKED_USERS": "ब्लॉक वापरकर्ते", - "What_do_you_want_to_learn_today": "आज तुम्हाला काय शिकायचे आहे?", + "WHAT_DO_YOU_WANT_TO_LEARN_TODAY": "आज तुम्हाला काय शिकायचे आहे?", "REGISTRATION_FORM": "इव्हेंटसाठी नोंदणी करा", "COURSE & CERTIFICATES": "अभ्यासक्रम आणि प्रमाणपत्रे", "ALL_PLAYER": "सर्व प्लेयर", diff --git a/packages/nulp_elite/public/locales/mal/translation.json b/packages/nulp_elite/public/locales/mal/translation.json index b09fec8d..63c41051 100644 --- a/packages/nulp_elite/public/locales/mal/translation.json +++ b/packages/nulp_elite/public/locales/mal/translation.json @@ -270,7 +270,7 @@ "MY_CONNECTION": "എന്റെ കണക്ഷനുകൾ", "CONNECTION_REQUEST": "കണക്ഷൻ അഭ്യർത്ഥനകൾ", "BLOCKED_USERS": "അടച്ച ഉപയോക്താക്കൾ", - "What_do_you_want_to_learn_today": "ഇന്ന് നിങ്ങൾ എന്താണ് പഠിക്കാൻ ആഗ്രഹിക്കുന്നത്?", + "WHAT_DO_YOU_WANT_TO_LEARN_TODAY": "ഇന്ന് നിങ്ങൾ എന്താണ് പഠിക്കാൻ ആഗ്രഹിക്കുന്നത്?", "REGISTRATION_FORM": "ഇവെന്റിനായി രജിസ്റ്റർ ചെയ്യുക", "COURSE & CERTIFICATES": "കോഴ്സും സർട്ടിഫിക്കറ്റുകളും", "ALL_PLAYER": "എല്ലാ കളിക്കാരും", diff --git a/packages/nulp_elite/public/locales/ta/translation.json b/packages/nulp_elite/public/locales/ta/translation.json index 6ffde1d6..47cdf866 100644 --- a/packages/nulp_elite/public/locales/ta/translation.json +++ b/packages/nulp_elite/public/locales/ta/translation.json @@ -294,7 +294,7 @@ "MY_CONNECTION": "என் இணைப்புகள்", "CONNECTION_REQUEST": "இணைப்பு கோரிக்கைகள்", "BLOCKED_USERS": "தடுக்கும் பயனர்கள்", - "What_do_you_want_to_learn_today": "இன்று நீங்கள் என்ன கற்க விரும்புகிறீர்கள்?", + "WHAT_DO_YOU_WANT_TO_LEARN_TODAY": "இன்று நீங்கள் என்ன கற்க விரும்புகிறீர்கள்?", "REGISTRATION_FORM": "நிகழ்வுக்கு பதிவு செய்யுங்கள்", "COURSE & CERTIFICATES": "பாடநெறி & சான்றிதழ்கள்", "ALL_PLAYER": "அனைத்து வீரர்", diff --git a/packages/nulp_elite/public/locales/te/translation.json b/packages/nulp_elite/public/locales/te/translation.json index f61b0afb..1f10a2ba 100644 --- a/packages/nulp_elite/public/locales/te/translation.json +++ b/packages/nulp_elite/public/locales/te/translation.json @@ -280,5 +280,5 @@ "NO_CHAT_REQUEST": "చాట్ అభ్యర్థన లేదు", "PHONE":"ఫోన్", "PHONE_NUMBER":"(+91 11) 24617517, 24617543, 24617595", - "What_do_you_want_to_learn_today":"ఈరోజు మీరు ఏమి నేర్చుకోవాలనుకుంటున్నారు" + "WHAT_DO_YOU_WANT_TO_LEARN_TODAY":"ఈరోజు మీరు ఏమి నేర్చుకోవాలనుకుంటున్నారు" } diff --git a/packages/nulp_elite/src/components/header.js b/packages/nulp_elite/src/components/header.js index 8f8f8a9d..ad3f27bf 100644 --- a/packages/nulp_elite/src/components/header.js +++ b/packages/nulp_elite/src/components/header.js @@ -223,7 +223,7 @@ function Header({ globalSearchQuery }) { className={ scrolled ? "pos-fixed xs-hide d-flex bg-white" - : " xs-hide d-flex bg-white" + : "xs-hide d-flex bg-white" } > {t("EXPLORE")} {
{toasterMessage && } + {/* Search Box */} { borderRadius: '10px'}} > { +
); From af8cc5619c83a52fabe172753e9d883da3a2cf87 Mon Sep 17 00:00:00 2001 From: sonaligarud Date: Thu, 26 Sep 2024 18:06:33 +0530 Subject: [PATCH 12/16] flickering issue --- packages/nulp_elite/src/components/Footer.js | 31 ++----------------- .../nulp_elite/src/components/drawerFilter.js | 2 +- packages/nulp_elite/src/pages/FAQPage.js | 2 ++ .../src/pages/connections/AddConnections.js | 2 ++ .../src/pages/content/AllContent.js | 12 +++++-- .../src/pages/content/CategoryPage.js | 10 +++--- .../nulp_elite/src/pages/content/Player.js | 6 ++-- .../src/pages/content/joinCourse.js | 2 ++ packages/nulp_elite/src/pages/content/pdf.js | 3 +- .../nulp_elite/src/pages/events/dashboard.js | 3 +- .../src/pages/events/eventDetails.js | 3 +- .../nulp_elite/src/pages/events/eventList.js | 2 ++ .../src/pages/profile/certificate.js | 2 ++ .../src/pages/search/ContentList.js | 8 +++-- .../src/pages/voting/pollsDetails.js | 3 +- packages/nulp_elite/src/styles/style.css | 31 ++++++++----------- 16 files changed, 59 insertions(+), 63 deletions(-) diff --git a/packages/nulp_elite/src/components/Footer.js b/packages/nulp_elite/src/components/Footer.js index a59b9b61..61cb1133 100644 --- a/packages/nulp_elite/src/components/Footer.js +++ b/packages/nulp_elite/src/components/Footer.js @@ -2,15 +2,10 @@ import * as React from "react"; import Box from "@mui/material/Box"; import BottomNavigation from "@mui/material/BottomNavigation"; import BottomNavigationAction from "@mui/material/BottomNavigationAction"; -import SearchSharpIcon from "@mui/icons-material/SearchSharp"; -import GroupsOutlinedIcon from "@mui/icons-material/GroupsOutlined"; -import AccountCircleOutlinedIcon from "@mui/icons-material/AccountCircleOutlined"; -import EditNoteOutlinedIcon from "@mui/icons-material/EditNoteOutlined"; -import Container from "@mui/material/Container"; import Link from "@mui/material/Link"; import Grid from "@mui/material/Grid"; import { useTranslation } from "react-i18next"; -import { useParams, useNavigate } from "react-router-dom"; +import { useNavigate } from "react-router-dom"; import MenuBookOutlinedIcon from "@mui/icons-material/MenuBookOutlined"; import ChatOutlinedIcon from "@mui/icons-material/ChatOutlined"; import TwitterIcon from "@mui/icons-material/Twitter"; @@ -24,14 +19,6 @@ import VideocamOutlinedIcon from "@mui/icons-material/VideocamOutlined"; import Groups2OutlinedIcon from "@mui/icons-material/Groups2Outlined"; import HomeOutlinedIcon from "@mui/icons-material/HomeOutlined"; -// const styles = { -// BottomNavigation: { -// width: '100%', -// position: 'fixed', -// bottom: 0, -// }, -// }; - export default function Footer() { const { t } = useTranslation(); const [value, setValue] = React.useState(0); @@ -174,21 +161,9 @@ export default function Footer() { - {/* dfgdfgsg */} - - + ) : ( - + {t("FILTER_BY")} : */} - +