Merge pull request #676 from NIUANULP/main

Dev deployment - Oct 8
NIUANULP · Oct 8, 2024 · 3a8e6b0 · 3a8e6b0
2 parents 9299f84 + 241024f
commit 3a8e6b0
Show file tree

Hide file tree

Showing 9 changed files with 1,078 additions and 974 deletions.
diff --git a/packages/nulp_elite/src/App.js b/packages/nulp_elite/src/App.js
@@ -326,7 +326,7 @@ function App() {
             ))}
           </Routes>
         </Router>
-        <LernModal />
+      <LernModal />
       </React.Suspense>
       {/* </ChakraProvider> */}
       {/* </ChakraProvider> */}

diff --git a/packages/nulp_elite/src/components/header.js b/packages/nulp_elite/src/components/header.js
@@ -216,9 +216,9 @@ function Header({ globalSearchQuery }) {
     boxShadow: searchQuery ? '0 2px 4px rgba(0, 0, 0, 0.2)' : 'none',
     color: searchQuery ? '#fff' : "#000"
   };
-const handleLogout =() => {
-  sessionStorage.setItem('isModalShown', 'false');
-}
+  const handleLogout = () => {
+    sessionStorage.setItem('isModalShown', 'false');
+  }
   return (
     <>
       <Box
@@ -615,9 +615,9 @@ const handleLogout =() => {
                 </MenuItem>
               </Link>
               <Link href="/logoff" underline="none" textAlign="center"
-               onClick={handleLogout}>
+                onClick={handleLogout}>
                 <MenuItem>
-                
+
 
                   {t("LOGOUT")}
 
@@ -738,6 +738,11 @@ const handleLogout =() => {
                     >
                       <MenuItem value="en">{t("ENGLISH")}</MenuItem>
                       <MenuItem value="hi">{t("HINDI")}</MenuItem>
+                      <MenuItem value="ma">{t("MARATHI")}</MenuItem>
+                      <MenuItem value="gg">{t("GUJARATI")}</MenuItem>
+                      <MenuItem value="ta">{t("TAMIL")}</MenuItem>
+                      <MenuItem value="be">{t("BENGALI")}</MenuItem>
+                      <MenuItem value="mal">{t("MALAYALAM")}</MenuItem>
                     </Select>
                   </FormControl>
                 </Box>
@@ -873,9 +878,9 @@ const handleLogout =() => {
                         className="ml-10"
                         onClick={() => {
                           sessionStorage.setItem("urlPath", "learningreport");
-                          window.open(routeConfig.ROUTES.LEARNING_REPORT, "_blank"); 
+                          window.open(routeConfig.ROUTES.LEARNING_REPORT, "_blank");
                         }}
-                        style={{color:'#1976d2'}}
+                        style={{ color: '#1976d2' }}
                       >
                         {t("LEARNING_REPORT")}
                       </MenuItem>

diff --git a/packages/nulp_elite/src/pages/content/Player.js b/packages/nulp_elite/src/pages/content/Player.js
@@ -261,17 +261,20 @@ const updateContentStateForAssessment = async () => {
   return (
     <div>
       <Header />
-      <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
+      <Box>
       <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 mr-20 my-20 px-10"
             style={{ alignItems: "center",justifyContent:'space-between' }}
           >
-            <Link onClick={handleBackNavigation} className="viewAll mr-17 mt-10">
+            <Button
+            onClick={handleBackNavigation}
+              className="custom-btn-primary mr-17 mt-15"
+            >
               {t("BACK")}
-            </Link>
+            </Button>
           </Box>
           </Grid>
           <Grid item xs={12} md={9} lg={9}>