resolve conflits

Sunbird-ALL · Nov 29, 2024 · fdb4057 · fdb4057
2 parents df6c2b3 + ee5e5f0
commit fdb4057
Show file tree

Hide file tree

Showing 11 changed files with 172 additions and 142 deletions.
diff --git a/.github/workflows/all-app-sandbox.yml b/.github/workflows/all-app-sandbox.yml
@@ -78,6 +78,7 @@ jobs:
           REACT_APP_AWS_ACCESS_KEY_ID: ${{ secrets.REACT_APP_AWS_ACCESS_KEY_ID }}
           REACT_APP_AWS_SECRET_ACCESS_KEY: ${{ secrets.REACT_APP_AWS_SECRET_ACCESS_KEY }}
           REACT_APP_SHOW_HELP_VIDEO: ${{ vars.REACT_APP_SHOW_HELP_VIDEO }}
+          REACT_APP_PARENT_ORIGIN_URL: ${{ vars.REACT_APP_PARENT_ORIGIN_URL }}
           REACT_APP_SHOW_HELP_VIDEO_LINK: ${{ vars.REACT_APP_SHOW_HELP_VIDEO_LINK }}
           CI: false # Disabling CI to not treat warnings as errors
         run: npm run build

diff --git a/.github/workflows/all-dev-rig.yml b/.github/workflows/all-dev-rig.yml
@@ -78,6 +78,7 @@ jobs:
           REACT_APP_AWS_ACCESS_KEY_ID: ${{ secrets.REACT_APP_AWS_ACCESS_KEY_ID }}
           REACT_APP_AWS_SECRET_ACCESS_KEY: ${{ secrets.REACT_APP_AWS_SECRET_ACCESS_KEY }}
           REACT_APP_SHOW_HELP_VIDEO: ${{ vars.REACT_APP_SHOW_HELP_VIDEO }}
+          REACT_APP_PARENT_ORIGIN_URL: ${{ vars.REACT_APP_PARENT_ORIGIN_URL }}
           REACT_APP_SHOW_HELP_VIDEO_LINK: ${{ vars.REACT_APP_SHOW_HELP_VIDEO_LINK }}
           CI: false # Disabling CI to not treat warnings as errors
         run: npm run build

diff --git a/.github/workflows/all-dev-tn-new.yml b/.github/workflows/all-dev-tn-new.yml
@@ -74,6 +74,7 @@ jobs:
           REACT_APP_AWS_ACCESS_KEY_ID: ${{ secrets.REACT_APP_AWS_ACCESS_KEY_ID }}
           REACT_APP_AWS_SECRET_ACCESS_KEY: ${{ secrets.REACT_APP_AWS_SECRET_ACCESS_KEY }}
           REACT_APP_SHOW_HELP_VIDEO: ${{ vars.REACT_APP_SHOW_HELP_VIDEO }}
+          REACT_APP_PARENT_ORIGIN_URL: ${{ vars.REACT_APP_PARENT_ORIGIN_URL }}
           REACT_APP_SHOW_HELP_VIDEO_LINK: ${{ vars.REACT_APP_SHOW_HELP_VIDEO_LINK }}
           CI: false # Disabling CI to not treat warnings as errors
         run: npm run build

diff --git a/.github/workflows/all-dev-tn.yml b/.github/workflows/all-dev-tn.yml
@@ -73,8 +73,9 @@ jobs:
           REACT_APP_LANGUAGES: ${{ vars.REACT_APP_LANGUAGES }}
           REACT_APP_AWS_ACCESS_KEY_ID: ${{ secrets.REACT_APP_AWS_ACCESS_KEY_ID }}
           REACT_APP_AWS_SECRET_ACCESS_KEY: ${{ secrets.REACT_APP_AWS_SECRET_ACCESS_KEY }}
-          REACT_APP_SHOW_HELP_VIDEO:${{ vars.REACT_APP_SHOW_HELP_VIDEO }}
-          REACT_APP_SHOW_HELP_VIDEO_LINK:${{ vars.REACT_APP_SHOW_HELP_VIDEO_LINK }}
+          REACT_APP_SHOW_HELP_VIDEO: ${{ vars.REACT_APP_SHOW_HELP_VIDEO }}
+          REACT_APP_PARENT_ORIGIN_URL: ${{ vars.REACT_APP_PARENT_ORIGIN_URL }}
+          REACT_APP_SHOW_HELP_VIDEO_LINK: ${{ vars.REACT_APP_SHOW_HELP_VIDEO_LINK }}
           CI: false # Disabling CI to not treat warnings as errors
         run: npm run build
 

diff --git a/.github/workflows/all-prod-rig.yml b/.github/workflows/all-prod-rig.yml
@@ -78,6 +78,7 @@ jobs:
           REACT_APP_AWS_ACCESS_KEY_ID: ${{ secrets.REACT_APP_AWS_ACCESS_KEY_ID }}
           REACT_APP_AWS_SECRET_ACCESS_KEY: ${{ secrets.REACT_APP_AWS_SECRET_ACCESS_KEY }}
           REACT_APP_SHOW_HELP_VIDEO: ${{ vars.REACT_APP_SHOW_HELP_VIDEO }}
+          REACT_APP_PARENT_ORIGIN_URL: ${{ vars.REACT_APP_PARENT_ORIGIN_URL }}
           REACT_APP_SHOW_HELP_VIDEO_LINK: ${{ vars.REACT_APP_SHOW_HELP_VIDEO_LINK }}
           CI: false # Disabling CI to not treat warnings as errors
         run: npm run build

diff --git a/.github/workflows/all-prod-tn.yml b/.github/workflows/all-prod-tn.yml
@@ -76,6 +76,7 @@ jobs:
           REACT_APP_IS_IN_APP_AUTHORISATION: ${{ vars.REACT_APP_IS_IN_APP_AUTHORISATION }}
           REACT_APP_LANGUAGES: ${{ vars.REACT_APP_LANGUAGES }}
           REACT_APP_SHOW_HELP_VIDEO: ${{ vars.REACT_APP_SHOW_HELP_VIDEO }}
+          REACT_APP_PARENT_ORIGIN_URL: ${{ vars.REACT_APP_PARENT_ORIGIN_URL }}
           REACT_APP_SHOW_HELP_VIDEO_LINK: ${{ vars.REACT_APP_SHOW_HELP_VIDEO_LINK }}
           CI: false  # Disabling CI to not treat warnings as errors
         run: npm run build

diff --git a/.github/workflows/all-staging-tn.yml b/.github/workflows/all-staging-tn.yml
@@ -78,6 +78,7 @@ jobs:
           REACT_APP_AWS_ACCESS_KEY_ID: ${{ secrets.REACT_APP_AWS_ACCESS_KEY_ID }}
           REACT_APP_AWS_SECRET_ACCESS_KEY: ${{ secrets.REACT_APP_AWS_SECRET_ACCESS_KEY }}
           REACT_APP_SHOW_HELP_VIDEO: ${{ vars.REACT_APP_SHOW_HELP_VIDEO }}
+          REACT_APP_PARENT_ORIGIN_URL: ${{ vars.REACT_APP_PARENT_ORIGIN_URL }}
           REACT_APP_SHOW_HELP_VIDEO_LINK: ${{ vars.REACT_APP_SHOW_HELP_VIDEO_LINK }}
           CI: false # Disabling CI to not treat warnings as errors
         run: npm run build

diff --git a/src/components/Assesment/Assesment.jsx b/src/components/Assesment/Assesment.jsx
@@ -1,13 +1,6 @@
 import MainLayout from "../Layouts.jsx/MainLayout";
 import assessmentBackground from "../../assets/images/assessmentBackground.png";
-import {
-  Box,
-  Grid,
-  IconButton,
-  Tooltip,
-  Typography,
-  Dialog,
-} from "@mui/material";
+import { Box, Grid, IconButton, Tooltip, Typography } from "@mui/material";
 import LogoutImg from "../../assets/images/logout.svg";
 import { styled } from "@mui/material/styles";
 import {
@@ -24,7 +17,6 @@ import practicebg from "../../assets/images/practice-bg.svg";
 import { useNavigate } from "react-router-dom";
 import React, { useEffect, useState } from "react";
 import HelpLogo from "../../assets/help.png";
-import CloseIcon from "@mui/icons-material/Close";
 
 import axios from "axios";
 // import { useDispatch } from 'react-redux';
@@ -311,6 +303,9 @@ export const TestModal = ({ setOpenTestModal }) => {
     </Box>
   );
 };
+TestModal.propTypes = {
+  setOpenTestModal: PropTypes.func,
+};
 
 export const MessageDialog = ({
   message,
@@ -573,7 +568,7 @@ export const ProfileHeader = ({
               >
                 <img
                   src={profilePic}
-                  alt="Profile picture"
+                  alt="Profile"
                   style={{ height: "30px" }}
                   width="30" // Set width attribute
                   height="30" // Set height attribute
@@ -646,7 +641,7 @@ export const ProfileHeader = ({
               }
             >
               <Box sx={{ position: "relative", cursor: "pointer" }}>
-                <div
+                <button
                   style={{
                     display: "inline-flex",
                     justifyContent: "center",
@@ -660,14 +655,14 @@ export const ProfileHeader = ({
                     cursor: "pointer",
                     boxShadow: "0 4px 6px rgba(0, 0, 0, 0.1)",
                     transition: "background-color 0.3s, transform 0.3s",
+                    border: "none",
                   }}
                   onMouseEnter={(e) => {
                     e.target.style.transform = "scale(1.1)";
                   }}
                   onMouseLeave={(e) => {
                     e.target.style.transform = "scale(1)";
                   }}
-                  role="button"
                   tabIndex="0"
                   onKeyDown={(e) => {
                     if (e.key === "Enter") {
@@ -678,7 +673,7 @@ export const ProfileHeader = ({
                   <span style={{ fontWeight: "bold", marginBottom: "2px" }}>
                     ?
                   </span>
-                </div>
+                </button>
               </Box>
             </Box>
             <Box
@@ -736,6 +731,7 @@ ProfileHeader.propTypes = {
   handleBack: PropTypes.func,
   profileName: PropTypes.string,
   lang: PropTypes.string,
+  setOpenTestModal: PropTypes.func,
 };
 
 const Assesment = ({ discoverStart }) => {

diff --git a/src/components/Assesment/AudioDiagnosticTool.jsx b/src/components/Assesment/AudioDiagnosticTool.jsx
@@ -4,6 +4,7 @@ import record from "../.././assets/mic.png";
 import { StopButton } from "../../utils/constants";
 import { Box } from "@mui/material";
 import { Line } from "react-chartjs-2";
+import PropTypes from "prop-types";
 import {
   Chart as ChartJS,
   CategoryScale,
@@ -422,21 +423,34 @@ function AudioDiagnosticTool() {
     );
   };
 
+  TestSection.propTypes = {
+    title: PropTypes.string.isRequired,
+    isRecording: PropTypes.bool.isRequired,
+    startRecording: PropTypes.func.isRequired,
+    stopRecording: PropTypes.func.isRequired,
+    record: PropTypes.string.isRequired,
+    testIndex: PropTypes.number.isRequired,
+    currentIndex: PropTypes.number.isRequired,
+    loading: PropTypes.bool.isRequired,
+  };
+
   const RecordingButton = ({ startRecording, record }) => (
-    <div
+    <button
       onClick={startRecording}
-      role="button"
-      tabIndex="0"
       onKeyDown={(e) => {
         if (e.key === "Enter") {
           startRecording();
         }
       }}
     >
       <img src={record} alt="Record" style={{ height: "50px" }} />
-    </div>
+    </button>
   );
 
+  RecordingButton.propTypes = {
+    startRecording: PropTypes.func.isRequired,
+    record: PropTypes.string.isRequired,
+  };
   return (
     <div
       style={{

diff --git a/src/components/Layouts.jsx/MainLayout.jsx b/src/components/Layouts.jsx/MainLayout.jsx
@@ -9,9 +9,6 @@ import practicebg2 from "../../assets/images/practice-bg2.svg";
 import practicebg3 from "../../assets/images/practice-bg3.svg";
 import gameWon from "../../assets/images/gameWon.svg";
 import gameLost from "../../assets/images/gameLost.svg";
-import correctImage from "../../assets/correct.svg";
-import wrongImage from "../../assets/wrong.svg";
-import turtleImage from "../../assets/turtle.svg";
 import clouds from "../../assets/images/clouds.svg";
 import catLoading from "../../assets/images/catLoading.gif";
 import textureImage from "../../assets/images/textureImage.png";
@@ -359,7 +356,7 @@ const MainLayout = (props) => {
                     const showGreen = step + 1 <= currentStep;
                     return (
                       <Box
-                        key={index}
+                        key={step}
                         index={index}
                         sx={{
                           height: "8px",
@@ -384,14 +381,14 @@ const MainLayout = (props) => {
                     <Box display={"flex"}>
                       {[...Array(Math.max(0, redLivesToShow) || 0).keys()]?.map(
                         (elem) => (
-                          <Diamond />
+                          <Diamond key={elem} />
                         )
                       )}
 
                       {[
                         ...Array(Math.max(0, blackLivesToShow) || 0).keys(),
                       ]?.map((elem) => (
-                        <HeartBlack />
+                        <HeartBlack key={elem} />
                       ))}
                     </Box>
                     <span
@@ -833,7 +830,7 @@ const MainLayout = (props) => {
                                 props.pageName === "m5") &&
                                 storedData?.map((elem, index) => (
                                   <Stack
-                                    key={index}
+                                    key={elem}
                                     justifyContent={"start"}
                                     alignItems={"center"}
                                     direction={"row"}
@@ -1184,24 +1181,46 @@ const MainLayout = (props) => {
 };
 
 MainLayout.propTypes = {
-  contentType: PropTypes.string,
-  handleBack: PropTypes.func,
-  disableScreen: PropTypes.bool,
-  isShowCase: PropTypes.bool,
-  showProgress: PropTypes.bool,
-  setOpenLangModal: PropTypes.func,
-  setOpenTestModal: PropTypes.func,
-  points: PropTypes.number,
-  handleNext: PropTypes.any,
+  level: PropTypes.number,
+  handleNext: PropTypes.func,
   enableNext: PropTypes.bool,
   showNext: PropTypes.bool,
   showTimer: PropTypes.bool,
   nextLessonAndHome: PropTypes.bool,
+  cardBackground: PropTypes.string,
+  backgroundImage: PropTypes.string,
+  points: PropTypes.number,
+  progressData: PropTypes.shape({
+    currentPracticeStep: PropTypes.number,
+    currentPracticeProgress: PropTypes.number,
+  }),
+  showProgress: PropTypes.bool,
+  setOpenLangModal: PropTypes.func,
+  setOpenTestModal: PropTypes.func,
+  lang: PropTypes.string,
+  handleBack: PropTypes.func,
+  disableScreen: PropTypes.bool,
+  isShowCase: PropTypes.bool,
   startShowCase: PropTypes.bool,
+  contentType: PropTypes.string,
+  percentage: PropTypes.number,
+  fluency: PropTypes.bool,
   setStartShowCase: PropTypes.func,
+  livesData: PropTypes.shape({
+    blackLivesToShow: PropTypes.number,
+    redLivesToShow: PropTypes.number,
+    lives: PropTypes.number,
+  }),
+  gameOverData: PropTypes.shape({
+    userWon: PropTypes.bool,
+  }),
   loading: PropTypes.bool,
   storedData: PropTypes.array,
   resetStoredData: PropTypes.func,
+  steps: PropTypes.number,
+  currentStep: PropTypes.number,
+  background: PropTypes.string,
+  children: PropTypes.node,
   pageName: PropTypes.string,
 };