Merge pull request #657 from NIUANULP/main

Prod deployment - 1 Oct
NIUANULP · Oct 1, 2024 · 5d4134f · 5d4134f
2 parents eca80e2 + 0e17cf7
commit 5d4134f
Show file tree

Hide file tree

Showing 30 changed files with 112 additions and 112 deletions.
diff --git 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": "ইভেন্টের জন্য নিবন্ধন করুন",
 
   "SELECT_CATEGORY_FIRST":"প্রথমে একটি বিভাগ নির্বাচন করুন",

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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() {
         </Box>
       </Box>
         <Box
-          className="xs-hide"
-          style={{
-            background: "#065872",
-            color: "#fff",
-            padding: "15px 15px 13px",
-            marginTop: "auto",
-            position: 'absolute',
-            bottom: '0px',
-            width:'100%',
-            boxSizing: 'border-box'
-          }}
+          className="xs-hide footer"
         >
-          {/* <Box>dfgdfgsg */}
-
-          <Grid container spacing={2} className="footer">
+          <Grid container spacing={2}>
             <Grid
               item
               xs={8}

diff --git a/packages/nulp_elite/src/components/drawerFilter.js b/packages/nulp_elite/src/components/drawerFilter.js
@@ -468,7 +468,7 @@ const uniqueFilteredSubCategories = [...new Set(filteredSubCategories.map(item =
         </Box>
       ) : (
         <Box className="header-bg-blue p-15 filter-bx">
-          <Box className="d-flex jc-bw" style={{ paddingTop: "10px" }}>
+          <Box className="d-flex" style={{ paddingTop: "10px",justifyContent:"space-between" }}>
             <Box className="filter-title">{t("FILTER_BY")} :</Box>
             <Button
               type="button"

diff --git 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"
         }
       >
         <Box
@@ -242,7 +242,7 @@ function Header({ globalSearchQuery }) {
           </Link>
 
           <Box
-            className="xs-hide1 d-flex explore explore-text"
+            className="d-flex explore explore-text"
             style={{
               alignItems: "center",
               paddingLeft: "8px",
@@ -252,7 +252,7 @@ function Header({ globalSearchQuery }) {
             <Box className="h5-title px-10">{t("EXPLORE")}</Box>
             <Box style={{ width: "100%" }}>
               <TextField
-                placeholder={t("What do you want to learn today?  ")}
+                placeholder={t("WHAT_DO_YOU_WANT_TO_LEARN_TODAY")}
                 variant="outlined"
                 size="small"
                 style={textFieldStyle}
@@ -865,21 +865,16 @@ function Header({ globalSearchQuery }) {
                             </MenuItem>
                           </Link>
                         )}
-                      <Link
-                        href={routeConfig.ROUTES.LEARNING_REPORT}
-                        underline="none"
-                        textAlign="center"
+                      <MenuItem
+                        className="ml-10"
+                        onClick={() => {
+                          sessionStorage.setItem("urlPath", "learningreport");
+                          window.open(routeConfig.ROUTES.LEARNING_REPORT, "_blank"); 
+                        }}
+                        style={{color:'#1976d2'}}
                       >
-                        <MenuItem
-                          className="ml-10"
-                          onClick={() => {
-                            sessionStorage.setItem("urlPath", "learningreport");
-                            window.open(routeConfig.ROUTES.LEARNING_REPORT, "_blank");
-                          }}
-                        >
-                          {t("LEARNING_REPORT")}
-                        </MenuItem>
-                      </Link>
+                        {t("LEARNING_REPORT")}
+                      </MenuItem>
                     </List>
                   </Collapse>
                   {roleNames.some((role) =>

diff --git a/packages/nulp_elite/src/pages/FAQPage.js b/packages/nulp_elite/src/pages/FAQPage.js
@@ -62,6 +62,7 @@ const FAQPage = () => {
   return (
     <div>
       <Header />
+      <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
       {setLanguage && url && <Container maxWidth="xl" role="main" className="min-472 pb-30">
         {error && (
           <Alert severity="error" className="my-10">
@@ -161,6 +162,7 @@ const FAQPage = () => {
           </Grid>
         </Grid>
       </Container>}
+      </Box>
       <Footer />
     </div>
   );

diff --git 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,

diff --git a/packages/nulp_elite/src/pages/connections/AddConnections.js b/packages/nulp_elite/src/pages/connections/AddConnections.js
@@ -1289,6 +1289,7 @@ const AddConnections = () => {
     <Box>
       <Header />
       {toasterMessage && <ToasterCommon response={toasterMessage} />}
+      <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
       <Container maxWidth="xl" role="main" className="pt-0 xs-pb-62 pt-108">
         {error && (
           <Alert severity="error" className="my-10">
@@ -2024,6 +2025,7 @@ const AddConnections = () => {
         </Box> */}
       </Container>
       <FloatingChatIcon />
+      </Box>
       <Footer />
     </Box>
   );

diff --git a/packages/nulp_elite/src/pages/content/AllContent.js b/packages/nulp_elite/src/pages/content/AllContent.js
@@ -305,10 +305,13 @@ const AllContent = () => {
 
   return (
     <>
+    <Box>
       <Header />
       {toasterMessage && <ToasterCommon response={toasterMessage} />}
 
-      {domain ? (
+     <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}
+     >
+     {domain ? (
         <DomainCarousel onSelectDomain={handleDomainFilter} domains={domain} />
       ) : (
         <SkeletonLoader />
@@ -320,8 +323,8 @@ const AllContent = () => {
       >
         {domainName && (
           <Box
-            className="d-flex jc-bw my-20 px-10"
-            style={{ alignItems: "center" }}
+            className="d-flex my-20 px-10"
+            style={{ alignItems: "center",justifyContent:'space-between' }}
           >
             <Box
               sx={{ marginTop: "10px", alignItems: "center" }}
@@ -466,7 +469,10 @@ const AllContent = () => {
 
       </Container>
       <FloatingChatIcon />
+     </Box>
       <Footer />
+      </Box>
+
     </>
   );
 };

diff --git a/packages/nulp_elite/src/pages/content/CategoryPage.js b/packages/nulp_elite/src/pages/content/CategoryPage.js
@@ -248,6 +248,7 @@ const CategoryPage = () => {
   return (
     <>
       <Header />
+     <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
       {toasterMessage && <ToasterCommon response={toasterMessage} />}
       {domain.length > 0 ? (
         <DomainCarousel onSelectDomain={handleDomainFilter} domains={domain} selectedDomainCode={preselectedDomain}/>
@@ -261,8 +262,8 @@ const CategoryPage = () => {
       >
         {(domainName || (clearDomains && clearDomains !== "null")) && (
           <Box
-            className="d-flex jc-bw mr-20 my-20"
-            style={{ alignItems: "center" }}
+            className="d-flex mr-20 my-20"
+            style={{ alignItems: "center",justifyContent:'space' }}
           >
             <Box
               sx={{ marginTop: "10px", alignItems: "center" }}
@@ -307,8 +308,8 @@ const CategoryPage = () => {
         )}
         {category && (
           <Box
-            className="d-flex jc-bw mr-20 my-20 px-10"
-            style={{ alignItems: "center" }}
+            className="d-flex mr-20 my-20 px-10"
+            style={{ alignItems: "center",justifyContent:'space-between'}}
           >
             <p className="h3-title">{category === "Course" ? "Courses" : category}</p>
             <Link onClick={handleGoBack} className="viewAll mr-17">
@@ -353,6 +354,7 @@ const CategoryPage = () => {
         )}
 
       </Container>
+      </Box>
       <Footer />
     </>
   );

diff --git a/packages/nulp_elite/src/pages/content/Player.js b/packages/nulp_elite/src/pages/content/Player.js
@@ -261,12 +261,13 @@ const updateContentStateForAssessment = async () => {
   return (
     <div>
       <Header />
+      <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
       <Container maxWidth="xl" role="main" className="player mt-15">
         <Grid container spacing={2} className="mt-10 mb-30">
           <Grid item xs={12} md={12} lg={12}>
           <Box
-            className="d-flex jc-bw mr-20 my-20 px-10"
-            style={{ alignItems: "center" }}
+            className="d-flex mr-20 my-20 px-10"
+            style={{ alignItems: "center",justifyContent:'space-between' }}
           >
             <Link onClick={handleBackNavigation} className="viewAll mr-17 mt-10">
               {t("BACK")}
@@ -423,6 +424,8 @@ const updateContentStateForAssessment = async () => {
                   ].includes(type)
                 ) {
                   handleTrackData(data);
+                }else if(["application/vnd.ekstep.html-archive","application/vnd.ekstep.html-archive","application/epub"].includes(type)){
+                  handleTrackData(data);
                 } else if (
                   ["application/vnd.sunbird.questionset"].includes(type)
                 ) {
@@ -520,6 +523,7 @@ const updateContentStateForAssessment = async () => {
         />
       )}
       <FloatingChatIcon />
+      </Box>
       <Footer />
     </div>
   );

diff --git a/packages/nulp_elite/src/pages/content/joinCourse.js b/packages/nulp_elite/src/pages/content/joinCourse.js
@@ -982,6 +982,7 @@ const JoinCourse = () => {
     <div>
       <Header />
       {toasterMessage && <ToasterCommon response={toasterMessage} />}
+      <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
       <Snackbar
         open={showEnrollmentSnackbar}
         autoHideDuration={6000}
@@ -2033,6 +2034,7 @@ const JoinCourse = () => {
         </Grid>
       </Container>
       <FloatingChatIcon />
+      </Box>
       <Footer />
     </div>
   );

diff --git a/packages/nulp_elite/src/pages/content/pdf.js b/packages/nulp_elite/src/pages/content/pdf.js
@@ -20,7 +20,7 @@ const PDFContent = () => {
   return (
     <div>
       <Header />
-
+      <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
       <Container maxWidth="md" role="main" className="container-pb">
         <Grid container spacing={2}>
           <Grid item xs={8}>
@@ -98,6 +98,7 @@ const PDFContent = () => {
         PDF will be intergrated Here
       </Container>
       <FloatingChatIcon />
+      </Box>
       <Footer />
     </div>
   );