diff --git a/public/index.html b/public/index.html index ab215bb0..c2f5bfa7 100644 --- a/public/index.html +++ b/public/index.html @@ -12,7 +12,7 @@ name="description" content="Base React App structure for Devigital Systems Projects" /> - + @@ -23,24 +23,26 @@ /> - EkStep - + + diff --git a/src/components/Layouts.jsx/MainLayout.jsx b/src/components/Layouts.jsx/MainLayout.jsx index 661ccf18..3296e355 100644 --- a/src/components/Layouts.jsx/MainLayout.jsx +++ b/src/components/Layouts.jsx/MainLayout.jsx @@ -795,7 +795,7 @@ const MainLayout = (props) => { > gameLost @@ -923,13 +923,10 @@ const MainLayout = (props) => { {elem?.correctAnswer === false ? ( - wrongImage + wrongImage ) : ( correctImage )} @@ -944,7 +941,9 @@ const MainLayout = (props) => { minWidth: "100px", }} > - {elem.selectedAnswer || "Binocular"} + {elem?.correctOption?.length > 0 + ? elem.correctOption + : elem.selectedAnswer || "Binocular"} ))} @@ -962,10 +961,7 @@ const MainLayout = (props) => { justifyContent={"center"} alignItems={"center"} > - turtleImage + turtleImage { return { headers: { Authorization: `Bearer ${token}`, - "Content-Type": "application/json" + "Content-Type": "application/json", }, }; }; @@ -66,7 +66,6 @@ export const fetchGetSetResult = async ( collectionId: currentCollectionId, totalSyllableCount: totalSyllableCount, language: lang, - user_id: getVirtualId(), }, getHeaders() ); @@ -91,7 +90,6 @@ export const getSetResultPractice = async ({ sub_session_id: subSessionId, contentType: currentContentType, session_id: sessionId, - user_id: getVirtualId(), totalSyllableCount: totalSyllableCount, language: localStorage.getItem("lang"), is_mechanics: mechanism && mechanism?.id ? true : false, @@ -107,7 +105,6 @@ export const getSetResultPractice = async ({ export const updateLearnerProfile = async (lang, requestBody) => { try { - requestBody.user_id = getVirtualId(); const response = await axios.post( `${API_LEARNER_AI_APP_HOST}/${config.URLS.UPDATE_LEARNER_PROFILE}/${lang}`, requestBody, diff --git a/src/services/orchestration/orchestrationService.js b/src/services/orchestration/orchestrationService.js index 96aa3469..618b4c88 100644 --- a/src/services/orchestration/orchestrationService.js +++ b/src/services/orchestration/orchestrationService.js @@ -11,7 +11,7 @@ const getHeaders = () => { return { headers: { Authorization: `Bearer ${token}`, - "Content-Type": "application/json" + "Content-Type": "application/json", }, }; }; @@ -53,7 +53,6 @@ export const addPointer = async (points, milestone) => { const response = await axios.post( `${API_BASE_URL_ORCHESTRATION}/${config.URLS.ADD_POINTER}`, { - userId: getVirtualId(), sessionId: sessionId, points: points, language: lang, @@ -78,7 +77,6 @@ export const createLearnerProgress = async ( try { const requestBody = { - userId: getVirtualId(), sessionId: sessionId, subSessionId: subSessionId, milestoneLevel: milestoneLevel, @@ -111,7 +109,6 @@ export const addLesson = async ({ const response = await axios.post( `${API_BASE_URL_ORCHESTRATION}/${config.URLS.ADD_LESSON}`, { - userId: getVirtualId(), sessionId: sessionId, milestone: milestone, lesson: lesson, diff --git a/src/views/Practice/Practice.jsx b/src/views/Practice/Practice.jsx index 5da7545d..d4bfeb32 100644 --- a/src/views/Practice/Practice.jsx +++ b/src/views/Practice/Practice.jsx @@ -137,7 +137,8 @@ const Practice = () => { { score: score, message: "all-test-rig-score", - }, window?.location?.ancestorOrigins?.[0] || window.parent.location.origin + }, + window?.location?.ancestorOrigins?.[0] || window.parent.location.origin ); } }; @@ -419,10 +420,8 @@ const Practice = () => { }); } - let userState = Number.isInteger( - Number(resLessons?.result?.result?.lesson) - ) - ? Number(resLessons.result?.result?.lesson) + let userState = Number.isInteger(Number(resLessons?.result?.lesson)) + ? Number(resLessons.result?.lesson) : 0; // TODO: revisit this - looks like not required @@ -713,7 +712,11 @@ const Practice = () => { "mechanic_1") ? 500 : stringLengths[0]; - window.parent.postMessage({ type: "stringLengths", length }, window?.location?.ancestorOrigins?.[0] || window.parent.location.origin); + window.parent.postMessage( + { type: "stringLengths", length }, + window?.location?.ancestorOrigins?.[0] || + window.parent.location.origin + ); } } }, [questions[currentQuestion]]);