From 5c368454877b2a3beab0be2e14b77faf3d033c46 Mon Sep 17 00:00:00 2001 From: Gourav More Date: Wed, 17 Jan 2024 00:05:44 +0530 Subject: [PATCH] Issue #211864: Env variables changes for react build --- src/App.js | 14 +++++++------- src/components/AppDrawer/AppDrawer.js | 4 ++-- src/pages/Login.js | 2 +- src/pages/Results.js | 6 +++--- src/pages/Story/Discover.jsx | 6 +++--- src/pages/Story/DiscoveryList.js | 2 +- src/pages/Story/Showcase.jsx | 8 ++++---- src/pages/Story/Story.jsx | 2 +- src/pages/Test-Rig-Two/Result/Validate.jsx | 6 +++--- src/pages/Test-Rig-Two/Story/Story.jsx | 4 ++-- src/services/telementryService.js | 10 +++++----- src/utils/api/PointerApi.js | 2 +- 12 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/App.js b/src/App.js index d2c15c77..9df4a181 100644 --- a/src/App.js +++ b/src/App.js @@ -68,22 +68,22 @@ did: did, // Unique id to identify the device or browser uid: 'anonymous', channel: process.env.REACT_APP_CHANNEL, // Unique id of the channel(Channel ID) - env: process.env.REACT_APP_env, + env: process.env.REACT_APP_ENV, pdata: { // optional - id: process.env.REACT_APP_id, // Producer ID. For ex: For sunbird it would be "portal" or "genie" - ver: process.env.REACT_APP_ver, // Version of the App - pid: process.env.REACT_APP_pid, // Optional. In case the component is distributed, then which instance of that component + id: process.env.REACT_APP_ID, // Producer ID. For ex: For sunbird it would be "portal" or "genie" + ver: process.env.REACT_APP_VER, // Version of the App + pid: process.env.REACT_APP_PID, // Optional. In case the component is distributed, then which instance of that component }, tags: [ // Defines the tags data '', ], timeDiff: 0, // Defines the time difference// Defines the object roll up data - host: process.env.REACT_APP_host, // Defines the from which domain content should be load - endpoint: process.env.REACT_APP_endpoint, - apislug: process.env.REACT_APP_apislug, + host: process.env.REACT_APP_HOST, // Defines the from which domain content should be load + endpoint: process.env.REACT_APP_ENDPOINT, + apislug: process.env.REACT_APP_APISLUG, }, config: {}, // tslint:disable-next-line:max-line-length diff --git a/src/components/AppDrawer/AppDrawer.js b/src/components/AppDrawer/AppDrawer.js index 07d7ca42..682bdfd9 100644 --- a/src/components/AppDrawer/AppDrawer.js +++ b/src/components/AppDrawer/AppDrawer.js @@ -96,7 +96,7 @@ function AppDrawer({forceRerender, setForceRerender}) { const fetchApi = async () => { try { const response = await fetch( - `${process.env.REACT_APP_learner_ai_app_host}/lais/scores/getMilestoneProgress/user/${localStorage.getItem('virtualID')}` + `${process.env.REACT_APP_LEARNER_AI_APP_HOST}/lais/scores/getMilestoneProgress/user/${localStorage.getItem('virtualID')}` ) .then(res => { return res.json(); @@ -111,7 +111,7 @@ function AppDrawer({forceRerender, setForceRerender}) { try { const response = await fetch( - `${process.env.REACT_APP_learner_ai_app_host}/lais/scores/GetSessionIds/${localStorage.getItem('virtualID')}` + `${process.env.REACT_APP_LEARNER_AI_APP_HOST}/lais/scores/GetSessionIds/${localStorage.getItem('virtualID')}` ) .then(res => { return res.json(); diff --git a/src/pages/Login.js b/src/pages/Login.js index 6f230aa1..b9846a77 100644 --- a/src/pages/Login.js +++ b/src/pages/Login.js @@ -84,7 +84,7 @@ export default function Login({setIsLoggedIn = false}) { }; const handleGetLesson = (virtualID)=>{ - fetch(`${process.env.REACT_APP_learner_ai_app_host}/lp-tracker/api/lesson/getLessonProgressByUserId/${virtualID}`) + fetch(`${process.env.REACT_APP_LEARNER_AI_APP_HOST}/lp-tracker/api/lesson/getLessonProgressByUserId/${virtualID}`) .then((res)=>{ return res.json(); }).then((data)=>{ diff --git a/src/pages/Results.js b/src/pages/Results.js index 7908c164..cb475636 100644 --- a/src/pages/Results.js +++ b/src/pages/Results.js @@ -33,7 +33,7 @@ export default function Results() { useEffect(() => { fetch( - `${process.env.REACT_APP_learner_ai_app_host}/lais/scores/GetTargets/session/${localStorage.getItem( + `${process.env.REACT_APP_LEARNER_AI_APP_HOST}/lais/scores/GetTargets/session/${localStorage.getItem( 'virtualStorySessionID' )}` ) @@ -54,7 +54,7 @@ export default function Results() { // console.log(splitSentence.length); fetch( - `${process.env.REACT_APP_learner_ai_app_host}/lais/scores/GetFamiliarity/session/${localStorage.getItem( + `${process.env.REACT_APP_LEARNER_AI_APP_HOST}/lais/scores/GetFamiliarity/session/${localStorage.getItem( 'virtualStorySessionID' )}` ) @@ -164,7 +164,7 @@ else{ } setIsModalOpen(true); axios - .post(`${process.env.REACT_APP_learner_ai_app_host}/lais/scores/addAssessmentInput`, { + .post(`${process.env.REACT_APP_LEARNER_AI_APP_HOST}/lais/scores/addAssessmentInput`, { user_id: localStorage.getItem('virtualID'), session_id: localStorage.getItem('virtualStorySessionID'), token: myCurrectChar, diff --git a/src/pages/Story/Discover.jsx b/src/pages/Story/Discover.jsx index e1711e6c..60b0acde 100644 --- a/src/pages/Story/Discover.jsx +++ b/src/pages/Story/Discover.jsx @@ -59,7 +59,7 @@ const Discovery = ( {forceRerender, setForceRerender}) => { setLoading(true); try { const response = await fetch( - `${process.env.REACT_APP_learner_ai_app_host}/content-service/v1/content/pagination?page=1&limit=${localStorage.getItem('discoveryLimit') || 5}&collectionId=${slug}` + `${process.env.REACT_APP_LEARNER_AI_APP_HOST}/content-service/v1/content/pagination?page=1&limit=${localStorage.getItem('discoveryLimit') || 5}&collectionId=${slug}` ) .then(res => { return res.json(); @@ -82,7 +82,7 @@ const Discovery = ( {forceRerender, setForceRerender}) => { const location = useLocation(); const addLessonApi = ()=>{ - const base64url = `${process.env.REACT_APP_learner_ai_app_host}/lp-tracker/api`; + const base64url = `${process.env.REACT_APP_LEARNER_AI_APP_HOST}/lp-tracker/api`; const pathnameWithoutSlash = location.pathname.slice(1); const percentage = ((currentLine+1) / posts?.data?.length) * 100; fetch(`${base64url}/lesson/addLesson`,{ @@ -172,7 +172,7 @@ const Discovery = ( {forceRerender, setForceRerender}) => { const utcDate = new Date().toISOString().split('T')[0]; const responseStartTime = new Date().getTime(); axios - .post(`${process.env.REACT_APP_learner_ai_app_host}/lais/scores/updateLearnerProfile/${lang}`, { + .post(`${process.env.REACT_APP_LEARNER_AI_APP_HOST}/lais/scores/updateLearnerProfile/${lang}`, { audio: base64Data, user_id: localStorage.getItem('virtualID'), session_id: localStorage.getItem('virtualStorySessionID'), diff --git a/src/pages/Story/DiscoveryList.js b/src/pages/Story/DiscoveryList.js index f16f2f55..f0a4c68c 100644 --- a/src/pages/Story/DiscoveryList.js +++ b/src/pages/Story/DiscoveryList.js @@ -20,7 +20,7 @@ const DiscoveryList = ({forceRerender, setForceRerender}) => { const fetchApi = async () => { setLoading(true) axios - .post(`${process.env.REACT_APP_learner_ai_app_host}/content-service/v1/content/getAssessment`, { + .post(`${process.env.REACT_APP_LEARNER_AI_APP_HOST}/content-service/v1/content/getAssessment`, { "tags": ["ASER"], "language": localStorage.getItem('apphomelang') || 'ta' }) diff --git a/src/pages/Story/Showcase.jsx b/src/pages/Story/Showcase.jsx index 64a0f3ea..4a572f7e 100644 --- a/src/pages/Story/Showcase.jsx +++ b/src/pages/Story/Showcase.jsx @@ -59,7 +59,7 @@ const Showcase = ({forceRerender, setForceRerender}) => { setLoading(true); try { axios - .post(`${process.env.REACT_APP_learner_ai_app_host}/content-service/v1/content/getAssessment`, { + .post(`${process.env.REACT_APP_LEARNER_AI_APP_HOST}/content-service/v1/content/getAssessment`, { "tags": ["ASER", localStorage.getItem('userCurrentLevel')], "language": localStorage.getItem('apphomelang') }) @@ -158,7 +158,7 @@ const Showcase = ({forceRerender, setForceRerender}) => { const utcDate = new Date().toISOString().split('T')[0]; const responseStartTime = new Date().getTime(); axios - .post(`${process.env.REACT_APP_learner_ai_app_host}/lais/scores/updateLearnerProfile/${lang}`, { + .post(`${process.env.REACT_APP_LEARNER_AI_APP_HOST}/lais/scores/updateLearnerProfile/${lang}`, { audio: base64Data, user_id: localStorage.getItem('virtualID'), session_id: localStorage.getItem('virtualStorySessionID'), @@ -305,7 +305,7 @@ const Showcase = ({forceRerender, setForceRerender}) => { setLoading(true); try { const response = await fetch( - `${process.env.REACT_APP_learner_ai_app_host}/lais/scores/getMilestoneProgress/user/${localStorage.getItem('virtualID')}` + `${process.env.REACT_APP_LEARNER_AI_APP_HOST}/lais/scores/getMilestoneProgress/user/${localStorage.getItem('virtualID')}` ) .then(res => { return res.json(); @@ -360,7 +360,7 @@ const Showcase = ({forceRerender, setForceRerender}) => { const location = useLocation(); const addLessonApi = ()=>{ - const base64url = `${process.env.REACT_APP_learner_ai_app_host}/lp-tracker/api`; + const base64url = `${process.env.REACT_APP_LEARNER_AI_APP_HOST}/lp-tracker/api`; const pathnameWithoutSlash = location.pathname.slice(1); const percentage = ((currentLine+1) / posts?.length) * 100; fetch(`${base64url}/lesson/addLesson`,{ diff --git a/src/pages/Story/Story.jsx b/src/pages/Story/Story.jsx index 0eb42331..1349aec1 100644 --- a/src/pages/Story/Story.jsx +++ b/src/pages/Story/Story.jsx @@ -134,7 +134,7 @@ const Story = () => { const responseStartTime = new Date().getTime(); // console.log(posts?.data[currentLine]?.data[0]?.[lang]?.text); axios - .post(`${process.env.REACT_APP_learner_ai_app_host}/lais/scores/updateLearnerProfile/${lang}`, { + .post(`${process.env.REACT_APP_LEARNER_AI_APP_HOST}/lais/scores/updateLearnerProfile/${lang}`, { audio: base64Data, user_id: localStorage.getItem('virtualID'), session_id: localStorage.getItem('virtualStorySessionID'), diff --git a/src/pages/Test-Rig-Two/Result/Validate.jsx b/src/pages/Test-Rig-Two/Result/Validate.jsx index 84f6aefe..2df985dc 100644 --- a/src/pages/Test-Rig-Two/Result/Validate.jsx +++ b/src/pages/Test-Rig-Two/Result/Validate.jsx @@ -53,7 +53,7 @@ export default function Validate({forceRerender, setForceRerender}) { setLoading(true); axios .get( - `${process.env.REACT_APP_learner_ai_app_host}/lais/scores/GetContent/word/session/${localStorage.getItem('validationSession') || localStorage.getItem('virtualStorySessionID')}?language=${localStorage.getItem('apphomelang')}&contentlimit=${localStorage.getItem('validateLimit')}&gettargetlimit=${localStorage.getItem('validateLimit')}`, + `${process.env.REACT_APP_LEARNER_AI_APP_HOST}/lais/scores/GetContent/word/session/${localStorage.getItem('validationSession') || localStorage.getItem('virtualStorySessionID')}?language=${localStorage.getItem('apphomelang')}&contentlimit=${localStorage.getItem('validateLimit')}&gettargetlimit=${localStorage.getItem('validateLimit')}`, ) .then(res => { setLoading(false); @@ -129,7 +129,7 @@ export default function Validate({forceRerender, setForceRerender}) { setIsModalOpen(true); axios - .post(`${process.env.REACT_APP_learner_ai_app_host}/lais/scores/addAssessmentInput`, { + .post(`${process.env.REACT_APP_LEARNER_AI_APP_HOST}/lais/scores/addAssessmentInput`, { user_id: localStorage.getItem('virtualID'), session_id: localStorage.getItem('virtualStorySessionID'), token: myCurrectChar, @@ -152,7 +152,7 @@ export default function Validate({forceRerender, setForceRerender}) { const addLessonApi = ()=>{ - const base64url = `${process.env.REACT_APP_learner_ai_app_host}/lp-tracker/api`; + const base64url = `${process.env.REACT_APP_LEARNER_AI_APP_HOST}/lp-tracker/api`; const pathnameWithoutSlash = location.pathname.slice(1); const percentage = ((currentCharIndex+1) / chars.length) * 100; fetch(`${base64url}/lesson/addLesson`,{ diff --git a/src/pages/Test-Rig-Two/Story/Story.jsx b/src/pages/Test-Rig-Two/Story/Story.jsx index a16b3d66..6b25b3a2 100644 --- a/src/pages/Test-Rig-Two/Story/Story.jsx +++ b/src/pages/Test-Rig-Two/Story/Story.jsx @@ -162,7 +162,7 @@ const Story = ({forceRerender, setForceRerender}) => { localStorage.setItem('apphomelevel', type); try { const response = await fetch( - `${process.env.REACT_APP_learner_ai_app_host}/lais/scores/GetContent/${type}/${localStorage.getItem('virtualID')}?language=${localStorage.getItem( + `${process.env.REACT_APP_LEARNER_AI_APP_HOST}/lais/scores/GetContent/${type}/${localStorage.getItem('virtualID')}?language=${localStorage.getItem( 'apphomelang' )}&contentlimit=${localStorage.getItem('contentPracticeLimit') || 5}&gettargetlimit=${localStorage.getItem('contentTargetLimit') || 5}` ) @@ -267,7 +267,7 @@ const Story = ({forceRerender, setForceRerender}) => { }; const addLessonApi = (percentage) => { - const base64url = `${process.env.REACT_APP_learner_ai_app_host}/lp-tracker/api`; + const base64url = `${process.env.REACT_APP_LEARNER_AI_APP_HOST}/lp-tracker/api`; const pathnameWithoutSlash = location.pathname.slice(1); fetch(`${base64url}/lesson/addLesson`, { method: 'POST', diff --git a/src/services/telementryService.js b/src/services/telementryService.js index 46d6cba0..eadb5fdd 100644 --- a/src/services/telementryService.js +++ b/src/services/telementryService.js @@ -47,7 +47,7 @@ export const initialize = ({ context, config, metadata }) => { authtoken: context.authToken || '', uid: 'anonymous', sid: context.sid, - batchsize: process.env.REACT_APP_batchsize, + batchsize: process.env.REACT_APP_BATCHSIZE, mode: context.mode, host: context.host, apislug: context.apislug, @@ -193,11 +193,11 @@ export const getEventOptions = () => { context: { pdata: { // optional - id: process.env.REACT_APP_id, // Producer ID. For ex: For sunbird it would be "portal" or "genie" - ver: process.env.REACT_APP_ver, // Version of the App - pid: process.env.REACT_APP_pid, // Optional. In case the component is distributed, then which instance of that component + id: process.env.REACT_APP_ID, // Producer ID. For ex: For sunbird it would be "portal" or "genie" + ver: process.env.REACT_APP_VER, // Version of the App + pid: process.env.REACT_APP_PID, // Optional. In case the component is distributed, then which instance of that component }, - env: process.env.REACT_APP_env, + env: process.env.REACT_APP_ENV, uid: `${ isBuddyLogin ? emis_username + '/' + buddyUserId diff --git a/src/utils/api/PointerApi.js b/src/utils/api/PointerApi.js index fb967d57..e2b51166 100644 --- a/src/utils/api/PointerApi.js +++ b/src/utils/api/PointerApi.js @@ -1,5 +1,5 @@ -const baseURL = `${process.env.REACT_APP_learner_ai_app_host}/lp-tracker/api/pointer`; +const baseURL = `${process.env.REACT_APP_LEARNER_AI_APP_HOST}/lp-tracker/api/pointer`; export const fetchPointerApi = () => { const url = `${baseURL}/getPointers/${localStorage.getItem('virtualID')}/${localStorage.getItem('virtualStorySessionID')}`;