Skip to content

Commit

Permalink
Merge pull request #176 from gouravmore/all-rig-0.1-lesson-progress
Browse files Browse the repository at this point in the history
Issue #211864: Env variables changes for react build
  • Loading branch information
gouravmore authored Jan 16, 2024
2 parents 9e67e67 + 5c36845 commit d382794
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 33 deletions.
14 changes: 7 additions & 7 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/components/AppDrawer/AppDrawer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Login.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)=>{
Expand Down
6 changes: 3 additions & 3 deletions src/pages/Results.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
)}`
)
Expand All @@ -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'
)}`
)
Expand Down Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions src/pages/Story/Discover.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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`,{
Expand Down Expand Up @@ -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'),
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Story/DiscoveryList.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
})
Expand Down
8 changes: 4 additions & 4 deletions src/pages/Story/Showcase.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})
Expand Down Expand Up @@ -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'),
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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`,{
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Story/Story.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
6 changes: 3 additions & 3 deletions src/pages/Test-Rig-Two/Result/Validate.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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,
Expand All @@ -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`,{
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Test-Rig-Two/Story/Story.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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}`
)
Expand Down Expand Up @@ -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',
Expand Down
10 changes: 5 additions & 5 deletions src/services/telementryService.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/utils/api/PointerApi.js
Original file line number Diff line number Diff line change
@@ -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')}`;
Expand Down

0 comments on commit d382794

Please sign in to comment.