Merge pull request #162 from Sunbird-ALL/all-1.2-tn-staging

All 1.2 tn staging
Sunbird-ALL · Sep 12, 2024 · 45ce13f · 45ce13f
2 parents 68ce96b + 2ce70eb
commit 45ce13f
Show file tree

Hide file tree

Showing 13 changed files with 387 additions and 343 deletions.
diff --git a/.github/workflows/all-app-sandbox.yml b/.github/workflows/all-app-sandbox.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '18'
+          node-version: "18"
 
       - name: Install AWS CLI
         run: |
@@ -75,7 +75,9 @@ jobs:
           REACT_APP_IS_APP_IFRAME: ${{ vars.REACT_APP_IS_APP_IFRAME }}
           REACT_APP_IS_IN_APP_AUTHORISATION: ${{ vars.REACT_APP_IS_IN_APP_AUTHORISATION }}
           REACT_APP_LANGUAGES: ${{ vars.REACT_APP_LANGUAGES }}
-          CI: false  # Disabling CI to not treat warnings as errors
+          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 }}
+          CI: false # Disabling CI to not treat warnings as errors
         run: npm run build
 
       - name: Deploy to S3 Bucket
@@ -91,7 +93,7 @@ jobs:
         uses: chetan/invalidate-cloudfront-action@master
         env:
           DISTRIBUTION: ${{ secrets.AWS_DISTRIBUTION }}
-          PATHS: '/*'
+          PATHS: "/*"
           AWS_REGION: ${{ secrets.AWS_REGION }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/all-dev-rig.yml b/.github/workflows/all-dev-rig.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '18'
+          node-version: "18"
 
       - name: Install AWS CLI
         run: |
@@ -75,7 +75,9 @@ jobs:
           REACT_APP_IS_APP_IFRAME: ${{ vars.REACT_APP_IS_APP_IFRAME }}
           REACT_APP_IS_IN_APP_AUTHORISATION: ${{ vars.REACT_APP_IS_IN_APP_AUTHORISATION }}
           REACT_APP_LANGUAGES: ${{ vars.REACT_APP_LANGUAGES }}
-          CI: false  # Disabling CI to not treat warnings as errors
+          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 }}
+          CI: false # Disabling CI to not treat warnings as errors
         run: npm run build
 
       - name: Deploy to S3 Bucket
@@ -91,7 +93,7 @@ jobs:
         uses: chetan/invalidate-cloudfront-action@master
         env:
           DISTRIBUTION: ${{ secrets.AWS_DISTRIBUTION }}
-          PATHS: '/*'
+          PATHS: "/*"
           AWS_REGION: ${{ secrets.AWS_REGION }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/all-dev-tn.yml b/.github/workflows/all-dev-tn.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '18'
+          node-version: "18"
 
       - name: Install AWS CLI
         run: |
@@ -75,7 +75,9 @@ jobs:
           REACT_APP_IS_APP_IFRAME: ${{ vars.REACT_APP_IS_APP_IFRAME }}
           REACT_APP_IS_IN_APP_AUTHORISATION: ${{ vars.REACT_APP_IS_IN_APP_AUTHORISATION }}
           REACT_APP_LANGUAGES: ${{ vars.REACT_APP_LANGUAGES }}
-          CI: false  # Disabling CI to not treat warnings as errors
+          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 }}
+          CI: false # Disabling CI to not treat warnings as errors
         run: npm run build
 
       - name: Deploy to S3 Bucket
@@ -91,7 +93,7 @@ jobs:
         uses: chetan/invalidate-cloudfront-action@master
         env:
           DISTRIBUTION: ${{ secrets.AWS_DISTRIBUTION }}
-          PATHS: '/*'
+          PATHS: "/*"
           AWS_REGION: ${{ secrets.AWS_REGION }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/all-prod-rig.yml b/.github/workflows/all-prod-rig.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '18'
+          node-version: "18"
 
       - name: Install AWS CLI
         run: |
@@ -75,7 +75,9 @@ jobs:
           REACT_APP_IS_APP_IFRAME: ${{ vars.REACT_APP_IS_APP_IFRAME }}
           REACT_APP_IS_IN_APP_AUTHORISATION: ${{ vars.REACT_APP_IS_IN_APP_AUTHORISATION }}
           REACT_APP_LANGUAGES: ${{ vars.REACT_APP_LANGUAGES }}
-          CI: false  # Disabling CI to not treat warnings as errors
+          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 }}
+          CI: false # Disabling CI to not treat warnings as errors
         run: npm run build
 
       - name: Deploy to S3 Bucket
@@ -91,7 +93,7 @@ jobs:
         uses: chetan/invalidate-cloudfront-action@master
         env:
           DISTRIBUTION: ${{ secrets.AWS_DISTRIBUTION }}
-          PATHS: '/*'
+          PATHS: "/*"
           AWS_REGION: ${{ secrets.AWS_REGION }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/all-staging-tn.yml b/.github/workflows/all-staging-tn.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '18'
+          node-version: "18"
 
       - name: Install AWS CLI
         run: |
@@ -75,7 +75,9 @@ jobs:
           REACT_APP_IS_APP_IFRAME: ${{ vars.REACT_APP_IS_APP_IFRAME }}
           REACT_APP_IS_IN_APP_AUTHORISATION: ${{ vars.REACT_APP_IS_IN_APP_AUTHORISATION }}
           REACT_APP_LANGUAGES: ${{ vars.REACT_APP_LANGUAGES }}
-          CI: false  # Disabling CI to not treat warnings as errors
+          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 }}
+          CI: false # Disabling CI to not treat warnings as errors
         run: npm run build
 
       - name: Deploy to S3 Bucket
@@ -91,7 +93,7 @@ jobs:
         uses: chetan/invalidate-cloudfront-action@master
         env:
           DISTRIBUTION: ${{ secrets.AWS_DISTRIBUTION }}
-          PATHS: '/*'
+          PATHS: "/*"
           AWS_REGION: ${{ secrets.AWS_REGION }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/package.json b/package.json
@@ -21,6 +21,9 @@
     "canvas-confetti": "^1.9.2",
     "character-error-rate": "^1.1.4",
     "classnames": "^2.3.1",
+    "eslint-plugin-import": "^2.28.0",
+    "eslint-plugin-jsx-a11y": "^6.7.1",
+    "eslint-plugin-react": "^7.33.1",
     "faker": "^5.5.3",
     "homophones": "^1.0.1",
     "jwt-decode": "^4.0.0",
@@ -38,15 +41,13 @@
     "react-virtualized": "^9.22.3",
     "react-virtualized-auto-sizer": "^1.0.6",
     "react-window": "^1.8.6",
+    "recordrtc": "^5.6.2",
     "redux": "^4.1.2",
     "redux-saga": "^1.1.3",
     "sass": "^1.44.0",
     "split-graphemes": "^0.5.0",
     "use-sound": "^4.0.1",
-    "web-vitals": "^2.1.4",
-    "eslint-plugin-import": "^2.28.0",
-    "eslint-plugin-jsx-a11y": "^6.7.1",
-    "eslint-plugin-react": "^7.33.1"
+    "web-vitals": "^2.1.4"
   },
   "scripts": {
     "start": "react-scripts start",
@@ -87,16 +88,16 @@
     ]
   },
   "devDependencies": {
+    "@mui/styles": "^5.15.10",
     "eslint": "^7.32.0",
-    "prettier": "^2.3.2",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^3.4.0",
     "husky": "^9.0.11",
     "lint-staged": "^11.0.0",
-    "react": "^18.2.0",
-    "@mui/styles": "^5.15.10"
+    "prettier": "^2.3.2",
+    "react": "^18.2.0"
   },
-  "lint-staged": { 
+  "lint-staged": {
     "src/**/*.{js,jsx}": [
       "npx eslint --fix",
       "npx prettier --write"

diff --git a/src/components/Assesment/Assesment.jsx b/src/components/Assesment/Assesment.jsx
@@ -344,7 +344,7 @@ export const ProfileHeader = ({
   const handleProfileBack = () => {
     try {
       if (process.env.REACT_APP_IS_APP_IFRAME === "true") {
-        window.parent.postMessage({ type: "restore-iframe-content" });
+        window.parent.postMessage({ type: "restore-iframe-content" }, "*");
         navigate("/");
       } else {
         navigate("/discover-start");

diff --git a/src/components/DiscoverSentance/DiscoverSentance.jsx b/src/components/DiscoverSentance/DiscoverSentance.jsx
@@ -34,10 +34,9 @@ const SpeakSentenceComponent = () => {
   const [disableScreen, setDisableScreen] = useState(false);
   const [play] = useSound(LevelCompleteAudio);
   const [openMessageDialog, setOpenMessageDialog] = useState("");
-  const [totalSyllableCount, setTotalSyllableCount] = useState('');
+  const [totalSyllableCount, setTotalSyllableCount] = useState("");
   const [isNextButtonCalled, setIsNextButtonCalled] = useState(false);
 
-
   const callConfettiAndPlay = () => {
     play();
     callConfetti();
@@ -100,16 +99,19 @@ const SpeakSentenceComponent = () => {
   }, [voiceText]);
 
   const send = (score) => {
-    if (process.env.REACT_APP_IS_APP_IFRAME === 'true') {
-      window.parent.postMessage({
-        score: score,
-        message: "all-test-rig-score",
-      });
+    if (process.env.REACT_APP_IS_APP_IFRAME === "true") {
+      window.parent.postMessage(
+        {
+          score: score,
+          message: "all-test-rig-score",
+        },
+        "*"
+      );
     }
   };
 
   const handleNext = async () => {
-    setIsNextButtonCalled(true)
+    setIsNextButtonCalled(true);
     setEnableNext(false);
 
     try {
@@ -165,17 +167,17 @@ const SpeakSentenceComponent = () => {
         const { data: getSetData } = getSetResultRes;
         const data = JSON.stringify(getSetData?.data);
         Log(data, "discovery", "ET");
-        if(process.env.REACT_APP_POST_LEARNER_PROGRESS === "true"){
-        await axios.post(
-          `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.CREATE_LEARNER_PROGRESS}`,
-          {
-            userId: localStorage.getItem("virtualId"),
-            sessionId: localStorage.getItem("sessionId"),
-            subSessionId: sub_session_id,
-            milestoneLevel: getSetData?.data?.currentLevel,
-            language: localStorage.getItem("lang"),
-          }
-        );
+        if (process.env.REACT_APP_POST_LEARNER_PROGRESS === "true") {
+          await axios.post(
+            `${process.env.REACT_APP_LEARNER_AI_ORCHESTRATION_HOST}/${config.URLS.CREATE_LEARNER_PROGRESS}`,
+            {
+              userId: localStorage.getItem("virtualId"),
+              sessionId: localStorage.getItem("sessionId"),
+              subSessionId: sub_session_id,
+              milestoneLevel: getSetData?.data?.currentLevel,
+              language: localStorage.getItem("lang"),
+            }
+          );
         }
         if (
           getSetData.data.sessionResult === "pass" &&
@@ -193,7 +195,9 @@ const SpeakSentenceComponent = () => {
             `${process.env.REACT_APP_CONTENT_SERVICE_APP_HOST}/${config.URLS.GET_PAGINATION}?page=1&limit=5&collectionId=${sentences?.[newSentencePassedCounter]?.collectionId}`
           );
           setCurrentContentType("Sentence");
-          setTotalSyllableCount(resSentencesPagination?.data?.totalSyllableCount);
+          setTotalSyllableCount(
+            resSentencesPagination?.data?.totalSyllableCount
+          );
           setCurrentCollectionId(
             sentences?.[newSentencePassedCounter]?.collectionId
           );
@@ -274,7 +278,7 @@ const SpeakSentenceComponent = () => {
           `${process.env.REACT_APP_CONTENT_SERVICE_APP_HOST}/${config.URLS.GET_PAGINATION}?page=1&limit=5&collectionId=${sentences?.collectionId}`
         );
         setCurrentContentType("Sentence");
-        setTotalSyllableCount(resPagination?.data?.totalSyllableCount)
+        setTotalSyllableCount(resPagination?.data?.totalSyllableCount);
         setCurrentCollectionId(sentences?.collectionId);
         setAssessmentResponse(resAssessment);
         localStorage.setItem("storyTitle", sentences?.name);
@@ -289,7 +293,8 @@ const SpeakSentenceComponent = () => {
     })();
   }, []);
   const handleBack = () => {
-    const destination = process.env.REACT_APP_IS_APP_IFRAME === 'true' ? "/" : "/discover-start";
+    const destination =
+      process.env.REACT_APP_IS_APP_IFRAME === "true" ? "/" : "/discover-start";
     navigate(destination);
     // if (process.env.REACT_APP_IS_APP_IFRAME === 'true') {
     //   navigate("/");

diff --git a/src/components/Mechanism/WordsOrImage.jsx b/src/components/Mechanism/WordsOrImage.jsx
@@ -46,7 +46,7 @@ const WordsOrImage = ({
   loading,
   setOpenMessageDialog,
   isNextButtonCalled,
-  setIsNextButtonCalled
+  setIsNextButtonCalled,
 }) => {
   const audioRef = createRef(null);
   const [duration, setDuration] = useState(0);
@@ -90,7 +90,7 @@ const WordsOrImage = ({
         livesData,
         gameOverData,
         loading,
-        setIsNextButtonCalled
+        setIsNextButtonCalled,
       }}
     >
       <CardContent
@@ -210,7 +210,7 @@ const WordsOrImage = ({
                   mb: 4,
                   color: "#333F61",
                   textAlign: "center",
-                  fontSize: "40px",
+                  fontSize: "clamp(1.6rem, 2.5vw, 3.8rem)",
                   // lineHeight: "normal",
                   fontWeight: 700,
                   fontFamily: "Quicksand",
@@ -222,18 +222,18 @@ const WordsOrImage = ({
             )}
             {matchedChar && (
               <Box
-              display={"flex"}
-              mb={4}
-              sx={{
-                width: "100%",
-                justifyContent: "center",
-                flexWrap: "wrap",
-              }}
-            >
+                display={"flex"}
+                mb={4}
+                sx={{
+                  width: "100%",
+                  justifyContent: "center",
+                  flexWrap: "wrap",
+                }}
+              >
                 {highlightWords(words, matchedChar)}
               </Box>
             )}
-         </Box>
+          </Box>
         )}
         <Box sx={{ display: "flex", justifyContent: "center" }}>
           <VoiceAnalyser
@@ -257,7 +257,7 @@ const WordsOrImage = ({
               setLivesData,
               setOpenMessageDialog,
               isNextButtonCalled,
-              setIsNextButtonCalled
+              setIsNextButtonCalled,
             }}
           />
         </Box>

diff --git a/src/config/awsS3.js b/src/config/awsS3.js
@@ -1,9 +1,9 @@
-// import { S3Client } from '@aws-sdk/client-s3';
+import { S3Client } from "@aws-sdk/client-s3";
 
-// export default new S3Client({
-//     region: process.env.REACT_APP_AWS_S3_REGION,
-//     credentials: {
-//         accessKeyId: process.env.REACT_APP_AWS_ACCESS_KEY_ID,
-//         secretAccessKey: process.env.REACT_APP_AWS_SECRET_ACCESS_KEY,
-//     },
-// });
+export default new S3Client({
+  region: process.env.REACT_APP_AWS_S3_REGION,
+  credentials: {
+    accessKeyId: process.env.REACT_APP_AWS_ACCESS_KEY_ID,
+    secretAccessKey: process.env.REACT_APP_AWS_SECRET_ACCESS_KEY,
+  },
+});