Skip to content

Group e development #143

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.

Sign up for GitHub

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

Merged
MRPHFitch merged 79 commits into from
Apr 23, 2025
Merged

Group e development #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
68b0066
big things happened on main after our sprint 2
dorukayhan Apr 16, 2025
186ca80
InternshipRequest.student is now sooner id instead of User reference
dorukayhan Apr 16, 2025
16d2116
tokenExpiryChecks and reminder emails implemented
TheJob21 Apr 17, 2025
a7a64cd
Fixed some bugs, Tested functionality
TheJob21 Apr 18, 2025
be80fff
Token Renewal API with secure validation and expiry extension
Apr 18, 2025
3fa4ce5
saving changes
nethra4321 Apr 18, 2025
0c0e5ab
Merge remote-tracking branch 'origin/main' into GroupC/APIendpoints
nethra4321 Apr 18, 2025
22902b7
Implemented student dashboard with conditional UI and navigation
Apr 18, 2025
fbd3186
Add page for redirection after successful token renewal
kushi-3 Apr 18, 2025
05a2bd3
Remove unused variable
kushi-3 Apr 18, 2025
ed1458e
auto-deactivation changes
Apr 19, 2025
9bb35d9
Sorted Submissions
MRPHFitch Apr 19, 2025
7649a53
Implemented Auto-Deactivation after token expiry
Apr 19, 2025
a80cb01
Correct email sent to student after approve/reject
HozenDev Apr 19, 2025
573299d
Merge modifications
HozenDev Apr 19, 2025
1e408f6
Merge pull request #123 from IPMS-Project/GroupF/token-expiry-monitor…
kushi-3 Apr 19, 2025
d7abafa
Revert "Remove unused variable"
kushi-3 Apr 19, 2025
86868e6
Revert "Add page for redirection after successful token renewal"
kushi-3 Apr 19, 2025
a039d99
Implemented Auto deactivation after token expiry with 24-hour window
Apr 19, 2025
47b3407
Implemented Auto deactivation after token expiry with 24-hour window …
Apr 19, 2025
cc2672f
Implemented Auto deactivation after token expiry with 24-hour window …
Apr 19, 2025
311d40a
Resolved conflicts
Apr 19, 2025
24fea5b
Merge branch 'GroupF/development' of https://github.com/IPMS-Project/…
kushi-3 Apr 19, 2025
e4a74d4
Merge pull request #125 from IPMS-Project/GroupF/studentDashboard
kushi-3 Apr 19, 2025
ab52519
Merge branch 'GroupF/development' of https://github.com/IPMS-Project/…
kushi-3 Apr 19, 2025
9205dc3
Update code to search for given token
kushi-3 Apr 19, 2025
72e6c5f
Add sooner id to the sign up
kushi-3 Apr 19, 2025
8c1dca6
Merge pull request #129 from IPMS-Project/GroupF/tokenrenewal
kushi-3 Apr 19, 2025
2ef7e3c
updated the tasks to auto-populate the outcomes
sanjay347 Apr 19, 2025
8fb9809
Merge branch 'GroupC/APIendpoints' of https://github.com/IPMS-Project…
nethra4321 Apr 20, 2025
f242362
a1form scheme reference changed
Apr 20, 2025
2f89f4f
finished supervisor/coordinator flow
nethra4321 Apr 20, 2025
c66f4a3
Update A3 modal and dashboard: ViewFormModal & SupervisorDashboard en…
Apr 20, 2025
78aad85
Add A3 backend routes and model fields
Apr 20, 2025
479011d
fixed bugs in validation
nethra4321 Apr 20, 2025
d52df8a
Update to make sooner id field mandatory only to studnets
kushi-3 Apr 20, 2025
df706ca
Merge branch 'GroupF/development' of https://github.com/IPMS-Project/…
kushi-3 Apr 20, 2025
15f6fa3
Student Dashboard logic updated
Apr 20, 2025
f3b6bc4
Show renewal link for deactivated accounts on login page
kushi-3 Apr 20, 2025
4ef0dea
Merge branch 'GroupF/development' of https://github.com/IPMS-Project/…
kushi-3 Apr 20, 2025
2263a43
Sprint 3: Evaluation Submission Flow implemented (Form A.3)
ttabirami12062 Apr 20, 2025
1f3db3a
Add FormMetadata.js from backend branch
Apr 20, 2025
fbda6d1
Revert "Sprint 3: Evaluation Submission Flow implemented (Form A.3)"
Charan-Nimmagadda Apr 21, 2025
29cb7a7
Merge branch 'main' of https://github.com/IPMS-Project/IPMS into Grou…
kushi-3 Apr 21, 2025
714160a
Resolve bad get evaluation (form_type -> supervisor_status)
HozenDev Apr 21, 2025
afa2f21
Resolve missing dependency issue
kushi-3 Apr 21, 2025
64be588
finished with sprint 3 changes
sanjay347 Apr 21, 2025
01c64cd
updated supervisor/coordinator flow
nethra4321 Apr 21, 2025
0fc9baf
fixed task errors
nethra4321 Apr 21, 2025
309ff07
updated A3
Apr 21, 2025
d8c58cc
Resolve conflict: delete evaluationRoutes.js after rebase
Apr 21, 2025
0659888
Remove unnecessary package.json
kushi-3 Apr 21, 2025
cc3ba86
resolved package.json
nethra4321 Apr 21, 2025
bad4057
Role based navigation added
Apr 21, 2025
053b5c3
Merge pull request #134 from IPMS-Project/GroupF/development
Charan-Nimmagadda Apr 21, 2025
022971f
Merge branch 'GroupE-development' into GroupE/Frontend/a3
MRPHFitch Apr 21, 2025
25eae1f
Merge pull request #133 from IPMS-Project/GroupE/Frontend/a3
MRPHFitch Apr 21, 2025
6e4ac28
fix A3
HozenDev Apr 21, 2025
ca10b3b
Fix A3 with current other files
HozenDev Apr 21, 2025
483d5a1
Fixing A1
MRPHFitch Apr 21, 2025
880bd19
Merge
HozenDev Apr 21, 2025
fbab1b5
fix
HozenDev Apr 21, 2025
8e34907
Merge pull request #138 from IPMS-Project/GroupC/APIendpoints
Charan-Nimmagadda Apr 21, 2025
2fea087
fix form routes and insert data
HozenDev Apr 21, 2025
25ed6d2
Update with main modification
HozenDev Apr 21, 2025
e7c8168
Update A1 Render
HozenDev Apr 21, 2025
271e665
Fixing display
MRPHFitch Apr 21, 2025
c8024e2
Correct A1 style
HozenDev Apr 21, 2025
ba25367
Merge branch 'GroupE-development' of github.com:IPMS-Project/IPMS int…
HozenDev Apr 21, 2025
2d7b45f
Updated aesthetics
MRPHFitch Apr 21, 2025
f9544f7
Fix form style
HozenDev Apr 21, 2025
7b3b188
Restore good A1 render
HozenDev Apr 21, 2025
249080d
Update ViewFormModal.js
MRPHFitch Apr 21, 2025
597376f
Getting Sooner ID back
MRPHFitch Apr 21, 2025
a147b9c
Fixed build error
MRPHFitch Apr 21, 2025
77a142e
6 Column update
MRPHFitch Apr 21, 2025
1b0e18f
Adjustments to reflect new DB
MRPHFitch Apr 21, 2025
df90b23
Removed SoonerID
MRPHFitch Apr 23, 2025
b38d274
Merge branch 'GroupE-frontend' into GroupE-development
MRPHFitch Apr 23, 2025
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
7 changes: 5 additions & 2 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"@testing-library/user-event": "^13.5.0",
"axios": "^1.8.2",
"bootstrap": "^5.3.5",
"client": "file:",
"react": "^19.0.0",
"react-bootstrap": "^2.10.9",
"react-dom": "^19.0.0",
Expand All @@ -18,7 +19,9 @@
"react-signature-canvas": "^1.1.0-alpha.2",
"react-toastify": "^11.0.5",
"sweetalert2": "^11.17.2",
"web-vitals": "^2.1.4"
"web-vitals": "^2.1.4",
"date-fns": "^4.1.0",
"react-datepicker": "^8.3.0"
},
"scripts": {
"start": "react-scripts start",
Expand All @@ -42,6 +45,6 @@
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
]
}
}
Loading