Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.0.0 #1

Merged
merged 864 commits into from
Aug 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
864 commits
Select commit Hold shift + click to select a range
c14b112
Merge pull request #84 from Rushikesh-Sonawane99/release-1.0.0
itsvick Aug 2, 2024
1918c21
Issue #PS-1451 feat: API integration for re-assign Facilitators
Aar-if Aug 2, 2024
44a2f00
Issue #PS-1534 feat: Foundation Course detail view UI implementation
shreyas1434shinde Aug 2, 2024
55503d9
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into co…
shreyas1434shinde Aug 2, 2024
c2b8a0a
Merge pull request #86 from shreyas1434shinde/coursePlaner
itsvick Aug 3, 2024
93ebd91
Issue #PS-1275 chore: Modifed form field mapping and validations
Rushikesh-Sonawane99 Aug 3, 2024
5d1e05b
Merge pull request #87 from Rushikesh-Sonawane99/release-1.0.0
itsvick Aug 3, 2024
85f1026
Issue #PS-1451 feat: API integration for re-assign Facilitators
Aar-if Aug 4, 2024
b88d7f4
Merge pull request #85 from Aar-if/reassignFix
itsvick Aug 4, 2024
d4c908a
Issue #PS-771 feat: zustand store added and fetcg state, district, st…
suvarnakale Aug 4, 2024
c60191a
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into re…
suvarnakale Aug 4, 2024
a953d99
Issue #PS-1270 chore: Optimised code
Rushikesh-Sonawane99 Aug 4, 2024
b14bfdf
Issue #PS-000 chore: Optimised code and removed duplications
Rushikesh-Sonawane99 Aug 4, 2024
df6bfa9
Merge pull request #88 from suvarnakale/release-1.0.0
itsvick Aug 4, 2024
5019325
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into re…
Rushikesh-Sonawane99 Aug 4, 2024
5714902
Merge pull request #89 from Rushikesh-Sonawane99/release-1.0.0
itsvick Aug 4, 2024
70525ef
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into re…
Rushikesh-Sonawane99 Aug 4, 2024
950c14d
Issue #PS-771 Chore: sendcredential modal changes and cohort list cal…
suvarnakale Aug 4, 2024
5c1da9f
Issue #PS-771 Chore: user email stored to send credentials
suvarnakale Aug 4, 2024
ef91201
Issue #000 chore: Optimised code
Rushikesh-Sonawane99 Aug 4, 2024
c85577c
Merge pull request #91 from Rushikesh-Sonawane99/release-1.0.0
itsvick Aug 4, 2024
3980191
Merge pull request #90 from suvarnakale/release-1.0.0
itsvick Aug 4, 2024
1e6e7d9
Issue #PS-1462 chore: Resolved attendance list view issue due to time…
Rushikesh-Sonawane99 Aug 4, 2024
2f5e272
Issue #000 chore: Optimised code
Rushikesh-Sonawane99 Aug 4, 2024
6462fee
Issue #000 chore: Commented unwanted code
Rushikesh-Sonawane99 Aug 4, 2024
9041205
Issue #PS-1534 feat: Foundation Course detail view UI implementation
shreyas1434shinde Aug 5, 2024
0bd1731
Issue #PS-1534 feat: Foundation Course detail view UI implementation
shreyas1434shinde Aug 5, 2024
e3daf66
Issue #PS-1534 feat: Foundation Course detail view UI implementation
shreyas1434shinde Aug 5, 2024
14afd7d
Merge pull request #92 from Rushikesh-Sonawane99/release-1.0.0
itsvick Aug 5, 2024
5fd0781
Merge pull request #93 from shreyas1434shinde/coursePlaner
itsvick Aug 5, 2024
3d3f5da
Issue #PS-1275 chore: Resolved runtime error and optimised code
Rushikesh-Sonawane99 Aug 5, 2024
6313686
Merge pull request #94 from Rushikesh-Sonawane99/release-1.0.0
itsvick Aug 5, 2024
d831347
Issue #PS-771 feat: custom buttons introduced in rjsf forms
suvarnakale Aug 5, 2024
d99617f
Merge pull request #95 from suvarnakale/release-1.0.0
itsvick Aug 5, 2024
6c05fee
Issue #PS-1389 feat: UI for displaying center wise attendance report …
Aar-if Aug 5, 2024
bcba430
Merge pull request #96 from Aar-if/graph
itsvick Aug 5, 2024
623b002
Issue #PS-1534 feat: Foundation Course detail view UI implementation
shreyas1434shinde Aug 6, 2024
c12fe2d
Issue #PS-1389 feat: UI for displaying center wise attendance report …
Aar-if Aug 6, 2024
dd34f93
UI fixes
Aar-if Aug 6, 2024
eca0785
translations added
Aar-if Aug 6, 2024
95beb76
fixes
Aar-if Aug 6, 2024
31eb64a
Issue #PS-1629 chore: Modified data mapping to display learner's mini…
Rushikesh-Sonawane99 Aug 6, 2024
ec6f203
Issue PS-1626 chore: Updated PR with optimised code
Rushikesh-Sonawane99 Aug 6, 2024
5f63868
Updated PR
Rushikesh-Sonawane99 Aug 6, 2024
00f600b
Issue #PS-000 chore: Optimised code
Rushikesh-Sonawane99 Aug 6, 2024
4a17c45
Issue PS-1627 feat: credential send to email of creater
suvarnakale Aug 6, 2024
aba8cbc
Issue PS-1627 chore: comments resolved
suvarnakale Aug 7, 2024
1887b3c
Issue #PS-1629 chore: Optimised code by resolving comments on PR
Rushikesh-Sonawane99 Aug 7, 2024
5c885fb
Issue PS-1627 chore: UI changes
suvarnakale Aug 7, 2024
e289f5a
Issue #PS-1276 chore: Added custom button to save edit changes for pr…
Rushikesh-Sonawane99 Aug 7, 2024
d16e629
Issue #PS-1534 feat: Foundation Course detail view UI implementation
shreyas1434shinde Aug 7, 2024
fe0859c
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into As…
shreyas1434shinde Aug 7, 2024
b491bca
Issue #PS-1534 feat: Foundation Course detail view UI implementation
shreyas1434shinde Aug 7, 2024
bb2f543
Issue #PS-1629 chore: Updated PR by resolving comments
Rushikesh-Sonawane99 Aug 7, 2024
43ec2e0
Issue PS-1627 chore: resolved
suvarnakale Aug 7, 2024
89bccda
Merge pull request #99 from suvarnakale/release-1.0.0
itsvick Aug 7, 2024
849a31b
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into re…
Rushikesh-Sonawane99 Aug 7, 2024
c388eb1
Issue #PS-1600 feat: API integration to show the list of events sched…
suvarnakale Aug 7, 2024
643732c
Issue #PS-000 chore: Optimised code and added missing checks
Rushikesh-Sonawane99 Aug 8, 2024
c9d489c
Issue #PS-1600 feat: optimized the code and removed duplications
suvarnakale Aug 8, 2024
8998e16
Issue #PS-1534 feat: Foundation Course detail view UI implementation
shreyas1434shinde Aug 8, 2024
dc704ab
Merge pull request #97 from Aar-if/graph
itsvick Aug 8, 2024
759663b
Issue #PS-1534 feat: Foundation Course detail view UI implementation
shreyas1434shinde Aug 8, 2024
aed5dea
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into re…
Rushikesh-Sonawane99 Aug 8, 2024
7d93d32
Issue #PS-1600 chore: comments resolved
suvarnakale Aug 8, 2024
09ab206
Merge pull request #100 from suvarnakale/release-1.0.0
itsvick Aug 8, 2024
04c8f56
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into re…
Rushikesh-Sonawane99 Aug 8, 2024
b0f4b69
Issue #PS-000 chore: Updated PR by resolving comments
Rushikesh-Sonawane99 Aug 8, 2024
99f6a0c
Issue #PS-1534 feat: Foundation Course detail view UI implementation
shreyas1434shinde Aug 8, 2024
6e760c2
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into As…
shreyas1434shinde Aug 8, 2024
2fa94ea
Issue #PS-000 chore: Optimised code
Rushikesh-Sonawane99 Aug 8, 2024
69b366c
updated env file
Rushikesh-Sonawane99 Aug 8, 2024
7146a27
Merge pull request #98 from Rushikesh-Sonawane99/release-1.0.0
itsvick Aug 8, 2024
2b29f7b
Issue #PS-1662 feat: functionality changes for credential modal done
suvarnakale Aug 8, 2024
72f5034
Issue #PS-1451 feat: API integration for re-assign Facilitators
Aar-if Aug 8, 2024
7a312f5
Merge branch 'release-1.0.0' into graph
Aar-if Aug 8, 2024
c0a2825
Merge pull request #103 from Aar-if/graph
itsvick Aug 8, 2024
742dd0a
Issue #PS-1662 chore: comments resolved
suvarnakale Aug 8, 2024
f6232db
build issue fix
Aar-if Aug 8, 2024
e8b3f6f
Merge pull request #104 from Aar-if/improvements
itsvick Aug 8, 2024
7f30b7e
Issue #PS-1451 feat: API integration for re-assign Facilitators
Aar-if Aug 8, 2024
464ed87
Issue #PS-1662 chore: comments resolved
suvarnakale Aug 8, 2024
dfe4ae5
Issue #PS-1662 chore: comments resolved
suvarnakale Aug 8, 2024
0f8e395
Issue #PS-1534 feat: Foundation Course detail view UI implementation
shreyas1434shinde Aug 8, 2024
04d6e03
Merge pull request #105 from Aar-if/improvements
itsvick Aug 8, 2024
4a35b16
Issue #PS-1534 feat: Foundation Course detail view UI implementation
shreyas1434shinde Aug 8, 2024
57de73f
Issue #PS-1662 chore: comments resolved
suvarnakale Aug 8, 2024
dee8898
Merge pull request #102 from suvarnakale/release-1.0.0
itsvick Aug 8, 2024
31afc72
Issue #PS-1673 chore: Attendance tracking of newly added learner on d…
Rushikesh-Sonawane99 Aug 8, 2024
442f71f
Issue #PS-1674 chore: Attendance tracking of newly added learner in p…
Rushikesh-Sonawane99 Aug 8, 2024
d59b37a
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into re…
Rushikesh-Sonawane99 Aug 8, 2024
da1a2d4
Issue #PS-1534 feat: Foundation Course detail view UI implementation
shreyas1434shinde Aug 8, 2024
d0f028f
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into As…
shreyas1434shinde Aug 8, 2024
275194b
Merge pull request #106 from Rushikesh-Sonawane99/release-1.0.0
itsvick Aug 8, 2024
8412749
Issue #PS-1534 feat: Foundation Course detail view UI implementation
shreyas1434shinde Aug 8, 2024
69f9272
Merge pull request #101 from shreyas1434shinde/Assessments
itsvick Aug 8, 2024
f59e227
Issue #PS-1389 feat: UI for displaying center wise attendance report …
Aar-if Aug 8, 2024
aaf6bae
Issue #PS-1626 feat: event list for month view
suvarnakale Aug 8, 2024
e66688a
Issue #PS-1626 feat: event list for month view
suvarnakale Aug 8, 2024
b186450
Merge pull request #107 from Aar-if/improvements
itsvick Aug 8, 2024
3e778b5
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into re…
suvarnakale Aug 8, 2024
704a709
Merge pull request #108 from suvarnakale/release-1.0.0
itsvick Aug 8, 2024
5dda9b1
Issue #PS-1676 feat: Dashboard Page Inconsistencies
Aar-if Aug 8, 2024
f5a4a96
Issue #PS-1641 feat: Subject detail page pagination functionality
shreyas1434shinde Aug 8, 2024
f5c5dba
Merge pull request #109 from Aar-if/improvements
itsvick Aug 8, 2024
761e279
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into re…
suvarnakale Aug 8, 2024
499e3fc
Issue #PS-1641 feat: Subject detail page pagination functionality
shreyas1434shinde Aug 8, 2024
1d4fa5e
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into As…
shreyas1434shinde Aug 8, 2024
b1d9f53
Issue #PS-1626 feat: pathname changes
suvarnakale Aug 8, 2024
bd71b1a
Issue #PS-1641 feat: Subject detail page pagination functionality
shreyas1434shinde Aug 8, 2024
97c1989
Merge pull request #110 from shreyas1434shinde/Assessments
itsvick Aug 8, 2024
f1b250f
Merge pull request #111 from suvarnakale/release-1.0.0
itsvick Aug 8, 2024
37d85c8
Issue #PS-000 chore: Resolved issue for present and absent count on m…
Rushikesh-Sonawane99 Aug 8, 2024
2170b82
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into re…
Rushikesh-Sonawane99 Aug 8, 2024
39932fa
Issue #PS-1277 chore: Added check for check box
Rushikesh-Sonawane99 Aug 8, 2024
f6dff73
Issue #PS-1619 chore:Modified UI and did api integration to mark lear…
Rushikesh-Sonawane99 Aug 8, 2024
3af89e5
Issue #000 chore: modal role change
suvarnakale Aug 9, 2024
953d00f
Issue #000 chore: modal role change
suvarnakale Aug 9, 2024
88da984
Merge pull request #113 from suvarnakale/release-1.0.0
itsvick Aug 9, 2024
8474d28
Merge pull request #112 from Rushikesh-Sonawane99/release-1.0.0
itsvick Aug 9, 2024
046c18e
Issue #PS-1633 chore: Created Assessment UI on learner profile
Rushikesh-Sonawane99 Aug 9, 2024
831a345
Issue #PS-1271 chore: Resolved checkbox form fiedl submit issue durin…
Rushikesh-Sonawane99 Aug 9, 2024
38a5ad5
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into re…
Rushikesh-Sonawane99 Aug 9, 2024
71122a0
Merge pull request #114 from Rushikesh-Sonawane99/release-1.0.0
itsvick Aug 9, 2024
c9c2c53
Issue #PS-1677 feat: Teaching Centers Page Inconsistencies
Aar-if Aug 9, 2024
6dbc617
Merge pull request #115 from Aar-if/centers
itsvick Aug 9, 2024
9932877
Issue #PS-1549 feat: Duplicating the form on add session button - done
suvarnakale Aug 9, 2024
d0e6251
Issue #PS-1549 chore: order of fields corrected
suvarnakale Aug 9, 2024
1dbba18
Merge pull request #116 from suvarnakale/release-1.0.0
itsvick Aug 9, 2024
6979441
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 9, 2024
4a69366
Issue #PS-1549 chore: weekday selection corrected
suvarnakale Aug 9, 2024
394e32a
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 9, 2024
0a6f57b
Merge pull request #117 from suvarnakale/release-1.0.0
itsvick Aug 9, 2024
b646fec
Issue #PS-1677 feat: Teaching Centers Page Inconsistencies
Aar-if Aug 9, 2024
2ca8285
Merge pull request #119 from Aar-if/centersFIX
itsvick Aug 9, 2024
400a2ad
Merge pull request #118 from shreyas1434shinde/BugFixes
itsvick Aug 9, 2024
0b70014
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 9, 2024
02a6d77
Merge pull request #120 from shreyas1434shinde/BugFixes
itsvick Aug 10, 2024
97fc032
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 10, 2024
0cf65f2
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 10, 2024
353a406
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 10, 2024
a5557d9
Issue #PS-1550 feat: data mapping of fields of event create
suvarnakale Aug 10, 2024
e51be60
Merge pull request #121 from shreyas1434shinde/BugFixes
itsvick Aug 10, 2024
60e30c2
Merge pull request #122 from suvarnakale/release-1.0.0
itsvick Aug 10, 2024
1e95c44
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 10, 2024
034a5ff
Merge remote-tracking branch 'upstream/release-1.0.0' into BugFixes
shreyas1434shinde Aug 10, 2024
8ea1041
Merge pull request #123 from shreyas1434shinde/BugFixes
itsvick Aug 10, 2024
184d559
PS-1621 fix PS-1527 UI Enhancements
Aar-if Aug 10, 2024
3c93c6c
Issue #PS-1550 feat: API integration to schedule offline events
suvarnakale Aug 11, 2024
018f4f3
Issue #PS-1550 feat: API integration to schedule offline events
suvarnakale Aug 11, 2024
9ac03e2
Issue #PS-1550 feat: API integration to schedule online events
suvarnakale Aug 11, 2024
4dd7775
Issue #PS-1647 feat: Added re-assign cohort/block and delete user fun…
Rushikesh-Sonawane99 Aug 11, 2024
ea41f90
Issue #PS-1550 feat: mode change for add session - issue fixed
suvarnakale Aug 11, 2024
fe952ad
Issue #000 chore: Optimised code
Rushikesh-Sonawane99 Aug 11, 2024
c29bdc7
Issue #000 chore: Optimised code
Rushikesh-Sonawane99 Aug 11, 2024
bf8de82
Issue #PS-1633 chore: Modified FL and TL profile as per updated figma
Rushikesh-Sonawane99 Aug 11, 2024
a030f75
Merge pull request #124 from Aar-if/bugs
itsvick Aug 12, 2024
e8c9c22
Issue #PS-000 feat: Fixed lint issues
itsvick Aug 12, 2024
75a999a
Issue #PS-1550 chore: resolved comments and PR updated
suvarnakale Aug 12, 2024
3656f1a
Merge pull request #125 from suvarnakale/release-1.0.0
itsvick Aug 12, 2024
57ca08c
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into re…
Rushikesh-Sonawane99 Aug 12, 2024
1bc9d66
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into re…
Rushikesh-Sonawane99 Aug 12, 2024
5803012
Merge pull request #126 from Rushikesh-Sonawane99/release-1.0.0
itsvick Aug 12, 2024
8917f3d
Issue #PS-000 feat: Fixed lint issues
itsvick Aug 12, 2024
1ab467a
PS-1621 fix PS-1527 UI Enhancements
Aar-if Aug 12, 2024
4d15d85
Issue #PS-1550 feat: API integration for extra sessions - online, off…
suvarnakale Aug 12, 2024
d962760
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 12, 2024
d279df0
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 12, 2024
49242cd
Merge pull request #128 from Aar-if/inconsistencies
itsvick Aug 12, 2024
31f0ef2
Merge pull request #129 from suvarnakale/release-1.0.0
itsvick Aug 12, 2024
04188ff
Merge pull request #130 from shreyas1434shinde/BugFixes
itsvick Aug 12, 2024
926d385
Issue #PS-1550 feat: issues in duplicating the events resolved
suvarnakale Aug 12, 2024
819f504
Issue #PS-000 feat: Fixed lint issues
itsvick Aug 12, 2024
eba466d
Merge pull request #131 from suvarnakale/release-1.0.0
itsvick Aug 12, 2024
f149f38
Issue #PS-000 feat: Fixed lint issues
itsvick Aug 12, 2024
e6065da
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into re…
itsvick Aug 12, 2024
2462cc4
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 12, 2024
3c0f1d9
Issue #PS-000 feat: Fixed lint issues
itsvick Aug 12, 2024
8177d39
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 12, 2024
52f9feb
Issue #PS-1677 feat: Teaching Centers Page Inconsistencies
Aar-if Aug 12, 2024
0f2c82b
Merge pull request #132 from Aar-if/newFixes
itsvick Aug 12, 2024
41a2649
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 12, 2024
de8a317
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 12, 2024
96dd8ed
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 12, 2024
8cd9c39
Merge pull request #133 from shreyas1434shinde/BugFixes
itsvick Aug 13, 2024
37151a7
PS-1621 fix PS-1527 UI Enhancements
Aar-if Aug 13, 2024
6944d84
Merge pull request #134 from Aar-if/latestFixes
itsvick Aug 13, 2024
32d0455
Issue #PS-000 feat: Fixed env issues
itsvick Aug 13, 2024
9608812
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 13, 2024
4cf493e
Merge remote-tracking branch 'upstream/release-1.0.0' into BugFixes
shreyas1434shinde Aug 13, 2024
93e4d21
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 13, 2024
fe069c4
Issue #PS-1550 feat: issues in duplicating the events resolved
suvarnakale Aug 13, 2024
8aa9d19
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into re…
suvarnakale Aug 13, 2024
167bc13
Merge pull request #135 from suvarnakale/release-1.0.0
itsvick Aug 13, 2024
f9539b8
git commit -m "Issue #PS-1632 chore: Added GA events on login, mark a…
Rushikesh-Sonawane99 Aug 13, 2024
e2ada2a
Merge pull request #136 from Rushikesh-Sonawane99/release-1.0.0
itsvick Aug 13, 2024
a95ea80
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 13, 2024
6866a50
Merge remote-tracking branch 'upstream/release-1.0.0' into BugFixes
shreyas1434shinde Aug 13, 2024
a183c3f
PS-1621 fix PS-1527 UI Enhancements
Aar-if Aug 13, 2024
e1b88f6
Merge pull request #138 from Aar-if/latestFixes
itsvick Aug 13, 2024
f1eb279
Issue #PS-1636 chore: Added GA events for tracking create session suc…
Rushikesh-Sonawane99 Aug 13, 2024
f89ef9d
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into re…
Rushikesh-Sonawane99 Aug 13, 2024
5d1252d
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 13, 2024
7a372b1
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 13, 2024
8f83bcd
Merge pull request #139 from Rushikesh-Sonawane99/release-1.0.0
itsvick Aug 13, 2024
02efd37
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 13, 2024
2c19f0f
Issue #PS-1704 bug: credentials correcte for facilitator
suvarnakale Aug 13, 2024
5b88fbb
Merge pull request #137 from shreyas1434shinde/BugFixes
itsvick Aug 13, 2024
9c81d41
Merge pull request #140 from suvarnakale/release-1.0.0
itsvick Aug 13, 2024
fd41554
Issue #PS-1702 bug: email id exception pattern validation addded
suvarnakale Aug 13, 2024
e1268bc
PS-1621 fix PS-1527 UI Enhancements
Aar-if Aug 13, 2024
c2cd485
update
Aar-if Aug 13, 2024
520cda1
Merge branch 'release-1.0.0' into latestFixes
Aar-if Aug 13, 2024
40f749d
Merge pull request #141 from suvarnakale/release-1.0.0
itsvick Aug 13, 2024
96f573f
Merge pull request #142 from Aar-if/latestFixes
itsvick Aug 13, 2024
7072544
Issue #PS-0000 chore: modal overlap issue fixed
suvarnakale Aug 13, 2024
8fb28cf
Merge pull request #143 from suvarnakale/release-1.0.0
itsvick Aug 13, 2024
e6447be
Issue #PS-000 feat: Fixed env issues
itsvick Aug 13, 2024
610fdf0
Issue #PS-000 feat: Fixed env issues
itsvick Aug 13, 2024
ef8e968
Issue #PS-1650 feat: Implemented tour guide for entire app
Rushikesh-Sonawane99 Aug 13, 2024
c4efbf1
Issue #1650 chore: Added translations
Rushikesh-Sonawane99 Aug 13, 2024
c434098
Issue #PS-000 chore: Optimised code
Rushikesh-Sonawane99 Aug 13, 2024
6517352
Updated PR by resolving conflicts
Rushikesh-Sonawane99 Aug 13, 2024
8632f45
Issue #PS-1650 chore: Added learn how to use button
Rushikesh-Sonawane99 Aug 13, 2024
0ab6e78
Issue #PS-000 chore: Updated PR by resolving drawer close issue
Rushikesh-Sonawane99 Aug 13, 2024
a9c27d9
Issue #PS-1650 chore: Added option to retake tour
Rushikesh-Sonawane99 Aug 13, 2024
03b1851
Issue #PS-1650 chore: Modified font size of Error Icon
Rushikesh-Sonawane99 Aug 14, 2024
3a213b9
Merge pull request #144 from Rushikesh-Sonawane99/release-1.0.0
itsvick Aug 14, 2024
3a19ecd
Issue #PS-000 chore: Added language constant
Rushikesh-Sonawane99 Aug 14, 2024
2e5fbef
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 14, 2024
336f102
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 14, 2024
ab141b7
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 14, 2024
cffbb52
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 14, 2024
3c962a8
Merge pull request #145 from shreyas1434shinde/BugFixes
itsvick Aug 14, 2024
7cfb534
PS-1621 fix PS-1527 UI Enhancements
Aar-if Aug 14, 2024
31e65f2
update
Aar-if Aug 14, 2024
009719a
Merge pull request #146 from Aar-if/latestFixes
itsvick Aug 14, 2024
d9b24a5
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into re…
Rushikesh-Sonawane99 Aug 14, 2024
6e407d0
Issue #PS-1633 chore: Fixed language constant issue on learner form
Rushikesh-Sonawane99 Aug 14, 2024
367ae72
Issue #0000 chore: resolved build issue
Aar-if Aug 14, 2024
4089f69
Merge pull request #147 from Aar-if/latestFixes
itsvick Aug 14, 2024
5d1441e
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 14, 2024
da9c527
Issue #000 chore: Added translations on dashboard
Rushikesh-Sonawane99 Aug 14, 2024
58379aa
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into re…
Rushikesh-Sonawane99 Aug 14, 2024
6fad6ea
Merge pull request #148 from Rushikesh-Sonawane99/release-1.0.0
itsvick Aug 14, 2024
47924e0
#PS-1317 fixPS-1527 UI Improvement
shreyas1434shinde Aug 14, 2024
53636fa
Merge pull request #149 from shreyas1434shinde/BugFixes
itsvick Aug 14, 2024
a0dc491
Issue #PS-1650 chore: Resolved tour guide issue for desktop view
Rushikesh-Sonawane99 Aug 14, 2024
6d21bd6
Merge branch 'release-1.0.0' of github.com:tekdi/teachers-app into re…
Rushikesh-Sonawane99 Aug 14, 2024
616c63a
Merge pull request #150 from Rushikesh-Sonawane99/release-1.0.0
itsvick Aug 14, 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
5 changes: 4 additions & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
NEXT_PUBLIC_BASE_URL=https://qa.prathamteacherapp.tekdinext.com/user/v1
# NEXT_PUBLIC_BASE_URL=https://backend.prathamdigital.org/user/v1
NEXT_PUBLIC_EVENT_BASE_URL=https://qa.prathamteacherapp.tekdinext.com/event-service/event/v1
NEXT_PUBLIC_NOTIFICATION_BASE_URL=https://qa.prathamteacherapp.tekdinext.com/notification-service
NEXT_PUBLIC_TELEMETRY_URL=https://qa.prathamteacherapp.tekdinext.com
NEXT_PUBLIC_MEASUREMENT_ID= G-GNMQZ8Z65Z

NEXT_PUBLIC_TRACKING_API_URL=https://tracking-pratham.tekdinext.com
4 changes: 4 additions & 0 deletions .env-sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
NEXT_PUBLIC_BASE_URL=https://qa.prathamteacherapp.tekdinext.com/user/v1
NEXT_PUBLIC_TELEMETRY_URL=https://qa.prathamteacherapp.tekdinext.com
NEXT_PUBLIC_MEASUREMENT_ID= G-GNMQZ8Z65Z

9 changes: 7 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"extends": ["next", "next/core-web-vitals", "eslint:recommended"],
"extends": [
"next",
"next/core-web-vitals",
"eslint:recommended",
"plugin:testing-library/react"
],
"globals": {
"React": "readonly"
},
Expand All @@ -14,6 +19,6 @@
}
],
"prefer-const": "error",
"react-hooks/exhaustive-deps": "error"
"react-hooks/exhaustive-deps": "off"
}
}
20 changes: 0 additions & 20 deletions .github/workflows/pratham-aws-deployment.yaml

This file was deleted.

23 changes: 23 additions & 0 deletions .github/workflows/pratham-dev-server-deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Deploy to dev-scp on Tekdi
on:
workflow_dispatch:
jobs:
deploy:
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
- name: Deploy Stack
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.HOST_NAME_PRATHAM_DEV }}
username: ${{ secrets.USERNAME_PRATHAM_DEV }}
key: ${{ secrets.EC2_SSH_KEY_PRATHAM_DEV }}
port: ${{ secrets.PORT_PRATHAM_DEV }}
script: |
cd ${{ secrets.TARGET_DIR_PRATHAM_DEV }}
if [ -f .env ]; then
rm .env
fi
echo "${{ secrets.DEV_ENV }}" > .env
ls -ltra
./deploy.sh
20 changes: 0 additions & 20 deletions .github/workflows/prathamscp-dev.yml

This file was deleted.

26 changes: 26 additions & 0 deletions .github/workflows/tekdi-qa-deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Deploy to Tekdi-QA Server
on:
push:
branches:
- release-1.0.0
jobs:
deploy:
#if: github.event.pull_request.merged == true
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
- name: Deploy Stack
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.HOST_NAME_TEKDI_QA }}
username: ${{ secrets.USERNAME_TEKDI_QA }}
key: ${{ secrets.EC2_SSH_KEY_TEKDI_QA }}
port: ${{ secrets.PORT_TEKDI_QA }}
script: |
cd ${{ secrets.TARGET_DIR_TEKDI_QA }}
if [ -f .env ]; then
rm .env
fi
echo "${{ secrets.QA_ENV }}" > .env
ls -ltra
./deploy.sh
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,13 @@ yarn-error.log*
# typescript
*.tsbuildinfo
next-env.d.ts



# Auto Generated PWA files
**/public/sw.js
**/public/workbox-*.js
**/public/worker-*.js
**/public/sw.js.map
**/public/workbox-*.js.map
**/public/worker-*.js.map
4 changes: 4 additions & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": ["stylelint-config-standard", "stylelint-config-rational-order"],
"ignoreFiles": ["**/*.min.css", "**/*.min.js"]
}
76 changes: 52 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,40 +1,68 @@
This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app).
# Shiksha: Teachers-application

## What is Shiksha?

Shiksha is a next-generation scalable open-source learning solution for teachers.

## Getting Started

First, run the development server:
This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app).

## new changes

```bash
npm run dev
# or
yarn dev
# or
pnpm dev
# or
bun dev
```
### Prerequisites

Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
<table>
<tr>
<td colspan="2"><b>System Requirements</b></td>
</tr>
<tr>
<td><b>Operating System</b></td>
<td>Windows 7 and above/4.2 Mac OS X 10.0 and above/Linux</td>
</tr>
<tr>
<td><b>RAM</b></td>
<td>> >= 8 Gb</td>
</tr>
<tr>
<td><b>CPU</b></td>
<td>2 cores, > 2 GHz</td>
</tr>
</table>

You can start editing the page by modifying `pages/index.tsx`. The page auto-updates as you edit the file.
| Software dependencies | |
| :------------------------------------------------------------------------------------------------ | -------------------------------------------------------- |
| **[Node](https://nodejs.org/en/download/)** | > 18.19.0 (or Install the latest release of LTS version) |
| **[npm](https://nodejs.org/en/learn/getting-started/an-introduction-to-the-npm-package-manager)** | 10.2.3 |

[API routes](https://nextjs.org/docs/api-routes/introduction) can be accessed on [http://localhost:3000/api/hello](http://localhost:3000/api/hello). This endpoint can be edited in `pages/api/hello.ts`.
### Project Setup

The `pages/api` directory is mapped to `/api/*`. Files in this directory are treated as [API routes](https://nextjs.org/docs/api-routes/introduction) instead of React pages.
1. Clone project

This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font.
```console
git clone https://github.com/tekdi/shiksha-frontend/tree/shiksha-2.0
```

## Learn More
> **_Note_**: Stable versions of the sunbird portal are available via tags for each release, and the master branch contains latest stable release. For latest stable release [refer](https://github.com/Sunbird-Ed/SunbirdEd-portal/branches)

To learn more about Next.js, take a look at the following resources:
2. Install required dependencies
```console
npm install
```
3. Configuring the Environment
Refer the sample environment file: https://github.com/tekdi/shiksha-frontend/blob/shiksha-2.0/.env-sample

- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
### Running Application

You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!
1. Run the application in development mode

## Deploy on Vercel
```console
npm run dev
```

The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.
2. To build the application use
```console
npm run build
```
Loading