Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
ed27cc9
Task #0000 fix: changes in story lingo v2 for mozigal build
deechavhan098 Mar 14, 2024
82e9898
Merge pull request #1 from deepali-chavhan/main
gouravmore Mar 15, 2024
1ce8d3b
Task #0000 fix: added score in mozigal
deechavhan098 Mar 15, 2024
9318d63
Merge pull request #2 from deepali-chavhan/main
gouravmore Mar 15, 2024
0dcc4c4
Task #215754 fix: added all the URLs in config file
deechavhan098 Mar 19, 2024
8a38c7c
Task #215754 fix: change base api to env config
deechavhan098 Mar 19, 2024
5144242
Task #215754 fix: added slash in all the URLs
deechavhan098 Mar 19, 2024
18c63f9
Merge pull request #3 from deepali-chavhan/all-1.0
gouravmore Mar 19, 2024
fb7725c
Issue #215595 fix: ALL-1.0 interation changes
gouravmore Mar 19, 2024
3f311a9
Issue #215595 fix: ALL-1.0 interation changes
gouravmore Mar 19, 2024
5512483
Merge pull request #4 from gouravmore/all-1.0
gouravmore Mar 19, 2024
aa7f2af
Task #215850 fix: API Changes for the Orchestration Service
deechavhan098 Mar 19, 2024
cf92931
Merge pull request #5 from deepali-chavhan/all-1.0
gouravmore Mar 19, 2024
78abace
merging all-1.0 and main
ajinkyapandetekdi Mar 20, 2024
df91c06
issueId #0000 merging main and all-1.0 branches
ajinkyapandetekdi Mar 20, 2024
2c58050
Merge pull request #6 from ajinkyapandetekdi/all-1.0
gouravmore Mar 20, 2024
ae143f3
Merge pull request #7 from ajinkyapandetekdi/all-1.0
gouravmore Mar 21, 2024
3cb5ba1
Task : #0000 fix: remove collection Id from get set result
deechavhan098 Mar 21, 2024
a9d95fb
Issue #0000 fix: targetpercentage changes
gouravmore Mar 21, 2024
3a79a84
Merge pull request #8 from deepali-chavhan/all-1.0
gouravmore Mar 22, 2024
c752066
Issue #0000 fix: window reload issue fixes
gouravmore Mar 22, 2024
34884da
Issue #0000 fix: Merged with upstream
gouravmore Mar 22, 2024
c6bc368
Merge pull request #9 from gouravmore/all-1.0
gouravmore Mar 22, 2024
a8153bc
Issue #0000 fix: red lives to show updates
gouravmore Mar 22, 2024
c0b8ba4
Revert "Issue #0000 fix: targetpercentage changes"
gouravmore Mar 22, 2024
4d6ff4f
Merge pull request #10 from Sunbird-ALL/revert-9-all-1.0
gouravmore Mar 22, 2024
9080fd4
Issue #0000 fix: reverted changes
gouravmore Mar 22, 2024
8a163a2
Issue #0000 fix: reverted lives changes
gouravmore Mar 22, 2024
d26b58b
Merge pull request #11 from gouravmore/all-1.0
gouravmore Mar 22, 2024
ab6d3f7
Issue SLV2-000 fix: Updated svg files.
swayangjit Mar 23, 2024
25dfee0
Issue #0000 fix: all new changes merged with main
deechavhan098 Mar 23, 2024
d6dd02b
Issue #0000 fix: merge main changes
deechavhan098 Mar 23, 2024
2d60598
Merge pull request #12 from deepali-chavhan/new-changes
gouravmore Mar 23, 2024
fbb8aa3
long Content and reload issue fixed
rahul-chawla-24 Mar 26, 2024
1ce94e5
Merge pull request #14 from rahul-chawla-24/all-1.0
gouravmore Mar 27, 2024
16354ad
Task #216424 fix: Integrate lives mechanics
deechavhan098 Mar 28, 2024
80c273b
Merge pull request #18 from deepali-chavhan/lives-mechanics
gouravmore Mar 28, 2024
a9371e8
Loading / Replainting issue and New alert dialog
rahul-chawla-24 Mar 29, 2024
e3c2cad
Issue id 215667 fix : removed points count in practice
vishnuvinay09 Mar 29, 2024
930c09f
Merge pull request #20 from vishnuvinay09/all-1.1
gouravmore Mar 29, 2024
c64b0ea
Merge remote-tracking branch 'upstream/all-1.1' into all-1.0
rahul-chawla-24 Mar 29, 2024
26b9280
Merge pull request #19 from rahul-chawla-24/all-1.0
gouravmore Mar 29, 2024
5ca40f2
IssueId #216634 fix: While highlighting - text need not be made red, …
ajinkyapandetekdi Apr 1, 2024
50660d6
Merge pull request #21 from ajinkyapandetekdi/change-hightligh-color
gouravmore Apr 1, 2024
a42d37a
alert dialog and paragraph fixes
rahul-chawla-24 Apr 2, 2024
ae9143c
Merge remote-tracking branch 'upstream/all-1.1' into all-1.0
rahul-chawla-24 Apr 2, 2024
9b727ac
merged with all1.1
rahul-chawla-24 Apr 2, 2024
dd1e8f9
Merge pull request #22 from rahul-chawla-24/all-1.0
gouravmore Apr 2, 2024
9c935fe
eslint and coderabbit integration
gouravmore Apr 2, 2024
5c473ac
Merge pull request #23 from gouravmore/all-1.1
gouravmore Apr 2, 2024
153ae8a
eslint and coderabbit integration
gouravmore Apr 2, 2024
0374f1c
Merge pull request #24 from gouravmore/all-1.1
gouravmore Apr 2, 2024
50b9eb4
eslint ignorepatterns added
gouravmore Apr 2, 2024
51bacc1
eslint ignorepatterns added
gouravmore Apr 2, 2024
2422285
Merge pull request #25 from gouravmore/all-1.1
gouravmore Apr 2, 2024
e9ae40e
IssueId #216694 feat: Changing s3 bucket content C url in storylin…
ajinkyapandetekdi Apr 2, 2024
03b253b
Merge pull request #26 from ajinkyapandetekdi/change-content-url
gouravmore Apr 2, 2024
7a14270
Task #0000 fix: Orchestration Api Url changes
deechavhan098 Apr 3, 2024
ea4f3d8
Merge pull request #28 from deepali-chavhan/orchestratation-service
gouravmore Apr 4, 2024
8836d5a
Issue #0000 fix: Lives mechanics changes for getset result
gouravmore Apr 5, 2024
1cddff2
Merge pull request #29 from gouravmore/all-1.1
gouravmore Apr 5, 2024
f12a12a
Issue #0000 fix: Lives mechanics changes for getset result
gouravmore Apr 5, 2024
6e75b1f
Merge pull request #30 from gouravmore/all-1.1
gouravmore Apr 5, 2024
0298305
Issue #0000 fix: live mechnaics udpates for getsetresult api request …
gouravmore Apr 8, 2024
040257c
Merge pull request #31 from gouravmore/all-1.1
gouravmore Apr 8, 2024
72042b6
Issue #0000 fix: update learner profile request body updates
gouravmore Apr 8, 2024
9c58bf6
Merge pull request #32 from gouravmore/all-1.1
gouravmore Apr 8, 2024
dd48d1d
Issue #0000 fix: Voice analyser issue fixes
gouravmore Apr 8, 2024
d819a26
Issue #0000 fix: lives mechanics fixes
gouravmore Apr 8, 2024
fd54b6f
IssueId #216634 feat While highlighting - text need not be made red, …
ajinkyapandetekdi Apr 8, 2024
8c5f24a
Merge pull request #33 from ajinkyapandetekdi/forBuild
gouravmore Apr 8, 2024
710abf7
Issue #0000 fix: Merged with upstream
gouravmore Apr 8, 2024
1bcb940
Issue #0000 fix: total target percentage logic changes
gouravmore Apr 10, 2024
5403c12
Issue #0000 fix: threshold updates for lives
gouravmore Apr 10, 2024
5a5b1e0
Issue #0000 fix: threshold updates for lives
gouravmore Apr 10, 2024
fdc0cda
Issue #0000 fix: Updated the passing criteria based on the syllable c…
gouravmore Apr 11, 2024
09a6ead
Issue #0000 fix: fluecy score updates
gouravmore Apr 11, 2024
55124ce
Issue #0000 fix: fluecy score updates
gouravmore Apr 11, 2024
ea905ec
Issue #0000 fix: Fixed user pass fail issue
gouravmore Apr 11, 2024
0053754
Issue #0000 fix: fluency score changes updates
gouravmore Apr 11, 2024
6fa4ed6
Merge pull request #34 from gouravmore/all-1.1
gouravmore Apr 12, 2024
a63a2cf
Merge pull request #36 from Sunbird-ALL/all-1.1
gouravmore Apr 16, 2024
dd4b90a
Task #0000 fix : changes done for virtaul id call
deechavhan098 Apr 19, 2024
2cbda6c
Merge pull request #37 from deepali-chavhan/plugin-creation
gouravmore Apr 19, 2024
5aece95
Task #0000 fix: Added udise_code , school_name , study_Id in telemetr…
deechavhan098 Apr 19, 2024
480ad8b
Merge pull request #38 from deepali-chavhan/plugin-creation
gouravmore Apr 19, 2024
f9ba326
Task #217453 fix: score is getting mismatch for guest user
deechavhan098 Apr 24, 2024
2737deb
Task #217453 fix: resolve comments
deechavhan098 Apr 24, 2024
b54d473
Merge pull request #39 from deepali-chavhan/all-1.0
gouravmore Apr 24, 2024
c42d8a7
Issue #219068 fix: Setting same totalSyllableCount for next set of co…
gouravmore May 15, 2024
20e8f1d
Issue #219068 fix: Setting same totalSyllableCount for next set of co…
gouravmore May 15, 2024
c8b3950
Bug #217137 fix: changes merge for next-button
deechavhan098 May 15, 2024
a481696
Merge pull request #53 from deepali-chavhan/all-1.0-hotfix
gouravmore May 15, 2024
77e3815
Bug #2163599 Text not aligned properly post level 9
deechavhan098 May 16, 2024
a334eb3
Bug #218850 Profanity checks is missing in all-1.0
deechavhan098 May 16, 2024
01b2799
Bug #218850 Profanity checks is missing in all-1.0
deechavhan098 May 16, 2024
c70b4da
Merge pull request #55 from deepali-chavhan/profanity-fix
gouravmore May 16, 2024
5f85e6e
Bug #2163599 Text not aligned properly post level 9
deechavhan098 May 16, 2024
3fb5ca8
Merge branch 'all-1.0-hotfix' of github.com:Sunbird-ALL/storylingo-v2…
deechavhan098 May 16, 2024
9a4c9bb
IssueId #219221 feat Landing page should by default give English Lang…
ajinkyapandetekdi May 17, 2024
ad76212
Merge pull request #57 from ajinkyapandetekdi/all-1.0-hotfix
gouravmore May 17, 2024
f0712ea
Issue #216380 fix: Live heart enable disable changes for words
gouravmore May 17, 2024
06f887f
Merge remote-tracking branch 'origin/all-1.0-hotfix' into all-1.0-hotfix
gouravmore May 17, 2024
de2d80b
Fluency score logic updated
gouravmore May 17, 2024
752e97e
Fluency score logic updated
gouravmore May 17, 2024
031b947
Issue #Student message changes
gouravmore May 17, 2024
6a1264a
removed formthe word mechanics from level 3
gouravmore May 18, 2024
c22b5cd
Issue #219329 fix: session id null issue fixes
gouravmore May 19, 2024
142175f
Issue session id issue fixes
gouravmore May 19, 2024
fc7bafd
Merge branch 'all-1.0-hotfix' of github.com:Sunbird-ALL/storylingo-v2…
deechavhan098 May 20, 2024
20b7c8d
Bug #219339 fix: For fill in the blanks in level 3,even if selected …
deechavhan098 May 20, 2024
23e9540
Bug #219339 fix:removed old commit
deechavhan098 May 20, 2024
44b6ade
Bug #219339 fix: resolved comments
deechavhan098 May 20, 2024
9165ae8
Merge pull request #58 from deepali-chavhan/all-1.0-hotfix
gouravmore May 20, 2024
1483831
Task #218526 fix: Incorrect Black Heart Count Increase On Failure
deechavhan098 May 20, 2024
15b36be
Merge pull request #59 from deepali-chavhan/all-1.0-hotfix
gouravmore May 20, 2024
3e46159
Merge pull request #60 from Sunbird-ALL/all-1.0-hotfix
gouravmore May 23, 2024
b045345
Merge branch 'main' into all-1.0
gouravmore Jul 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions .coderabbit.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
language: "en"

early_access: false

reviews:
request_changes_workflow: true
high_level_summary: true
poem: false
review_status: true
collapse_walkthrough: false
path_filters:
- "!**/.xml"
path_instructions:
- path: "**/*.css"
instructions: |
"Review the CSS code against the google css style guide and point out any mismatches. Ensure that:
- The code adheres to best practices associated with CSS.
- The code adheres to best practices recommended by lighthouse or similar tools for performance.
- The code adheres to similar naming conventions for classes, ids."
- path: "**/*.html"
instructions: |
"Review the HTML code against the google html style guide and point out any mismatches. Ensure that:
- The code adheres to best practices recommended by lighthouse or similar tools for performance."
- path: "**/*.js,**/*.ts"
instructions: |
"Review the JAVASCRIPT code against the google javascript style guide and point out any mismatches. Ensure that:
- The code adheres to best practices associated with React.
- The code adheres to best practices associated with React PWA.
- The code adheres to best practices associated with SPA.
- The code adheres to best practices recommended by lighthouse or similar tools for performance.
- The code adheres to similar naming conventions for components, views, methods."
auto_review:
enabled: true
ignore_title_keywords:
- "WIP"
- "DO NOT MERGE"
drafts: false
base_branches:
- "master"
- "dev"
- "feat/*"
- "feat-*"
- "all-*"

chat:
auto_reply: true
3 changes: 2 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ REACT_APP_BATCHSIZE=1
REACT_APP_CONTENT_SIZE=5
REACT_APP_LANGUAGE=ta
REACT_APP_TELEMETRY_MODE=DT
REACT_APP_LEARNER_AI_APP_HOST=https://www.learnerai-dev.theall.ai
REACT_APP_LEARNER_AI_APP_HOST=https://all-learnerai-tn-dev.theall.ai
REACT_APP_LEARNER_AI_ORCHESTRATION_HOST=https://telemetry-dev.theall.ai/all-orchestration-services
REACT_APP_CAPTURE_AUDIO=true
REACT_APP_AWS_S3_BUCKET_NAME=all-dev-storage
REACT_APP_AWS_S3_BUCKET_URL=https://all-dev-storage.s3.ap-south-1.amazonaws.com
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ yarn-debug.log*
yarn-error.log*
lerna-debug.log*

#env
.env
#build
build

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

Expand Down
32 changes: 32 additions & 0 deletions eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"extends": [
"eslint:recommended",
"plugin:import/errors",
"plugin:react/recommended",
"plugin:jsx-a11y/recommended"
],
"plugins": ["react", "import", "jsx-a11y"],
"rules": {
"react/prop-types": 0,
"indent": ["error", 2],
"linebreak-style": 1,
"quotes": ["error", "double"]
},
"parserOptions": {
"ecmaVersion": 2021,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
}
},
"env": {
"es6": true,
"browser": true,
"node": true
},
"settings": {
"react": {
"version": "detect"
}
}
}
17 changes: 12 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@
"sass": "^1.44.0",
"split-graphemes": "^0.5.0",
"use-sound": "^4.0.1",
"web-vitals": "^2.1.4"
"web-vitals": "^2.1.4",
"eslint": "^8.46.0",
"eslint-plugin-import": "^2.28.0",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-react": "^7.33.1"
},
"scripts": {
"start": "react-scripts start",
Expand All @@ -55,15 +59,18 @@
"prettier:fix": "npm run prettier:cli --write",
"eslint": "eslint src -c .eslintrc.json --ext js,jsx --max-warnings=0",
"eslint:fix": "npm run eslint --fix",
"lint": "npm run eslint && npm run prettier",
"lint:fix": "npm run eslint:fix && npm run prettier:fix",
"prepare": "husky install"
"prepare": "husky install",
"format": "prettier --write .",
"format:check": "prettier --check .",
"lint": "eslint \"**/*.{js,jsx}\"",
"lint:fix": "eslint \"**/*.{js,jsx}\" --fix"
},
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
]
],
"ignorePatterns": ["build/", "public/js/jquery-3.7.0.min.js"]
},
"browserslist": {
"production": [
Expand Down
17 changes: 17 additions & 0 deletions prettierignore.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Dependency directories
node_modules/

# dependencies
package.json
package-lock.json

# testing
/coverage

# production
/build

.github/
/public
.min.js
.min.css
6 changes: 6 additions & 0 deletions prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"semi": true,
"singleQuote": false,
"tabWidth": 2,
"useTabs": false
}
7 changes: 4 additions & 3 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,14 @@ const App = () => {
const fp = await FingerprintJS.load();

const { visitorId } = await fp.get();

localStorage.setItem('did', visitorId);
if (!localStorage.getItem('did')) {
localStorage.setItem('did', visitorId);
}
initService();
};

setFp();
}, []);
}, []);

return (
<StyledEngineProvider injectFirst>
Expand Down
Loading