Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
5a07b9f
created a new page StudentTasks under student role and added a basic …
prathyu99 Apr 17, 2024
e01eee6
Added link to navigate to new Student Task Detail page
prathyu99 Apr 19, 2024
111ba6a
added checkbox for publishing rights
prathyu99 Apr 19, 2024
2ad4e8d
added css for links
prathyu99 Apr 19, 2024
15c58c6
Adding Student Tasks Box
soubhi Apr 23, 2024
5c3de2c
Merge pull request #1 from prathyu99/apiAndLayout
soubhi Apr 23, 2024
544b071
Modifying code to fetch data from dummy data
soubhi Apr 23, 2024
8a628a4
Merge pull request #2 from prathyu99/apiAndLayout
soubhi Apr 23, 2024
80b463c
added icon i which displays text on hover
prathyu99 Apr 24, 2024
ab936ac
added css to adjust the layout
prathyu99 Apr 24, 2024
5e372f0
Modifying Revisions component and adding remaining days functionality
soubhi Apr 24, 2024
5c40ef2
Merge branch 'main' into apiAndLayout
soubhi Apr 24, 2024
ca8ac62
Merge pull request #3 from prathyu99/apiAndLayout
soubhi Apr 24, 2024
1257334
added comments to the code and resolved merge conflicts
prathyu99 Apr 24, 2024
25f8ad2
added comments to the code studenttasks
prathyu99 Apr 24, 2024
19f3409
Merge branch 'main' into main
soubhi Apr 24, 2024
7c1a434
added space in student task box, changed the hover text for publishin…
prathyu99 Apr 29, 2024
a779945
Merge remote-tracking branch 'origin/main'
prathyu99 Apr 29, 2024
e6cccb7
added space in student task box, changed the hover text for publishin…
prathyu99 Apr 29, 2024
8bf0c02
removed an unnecessary change
prathyu99 Apr 29, 2024
e6267e0
update assignment table with dummy data
masonhorne Nov 22, 2024
7cbfa44
adds functionality for course view to have a drop down of assignments
Dec 1, 2024
ac133d1
add course name to assignments table
masonhorne Dec 1, 2024
1cd8654
tests for course assignments functionality
masonhorne Dec 1, 2024
09abde4
small comment changes
Dec 2, 2024
aa7fafb
fix styling for container
masonhorne Oct 13, 2024
d0e4fcc
Merge pull request #8 from masonhorne/main2-temp
Alderheart Dec 2, 2024
c573a91
added icons and buttons
Dec 4, 2024
478acd2
Merge pull request #9 from masonhorne/mjfeng-implement-buttons
Alderheart Dec 4, 2024
66d950b
Merge branch 'expertiza:main' into main
prathyu99 Jan 28, 2025
e6652f2
Initial commit from VCL: Front end environment is set up and verified
Mar 2, 2025
f5e80f4
Resolved the merge conflict.
Mar 6, 2025
8a73b82
Removed the course name column from the Assignment table.
Mar 6, 2025
7c33753
Format dates as similar as the standard date format.
Mar 6, 2025
89a85f6
Disable the global search icon and bar within assignment table.
Mar 6, 2025
810423c
Updated README.md with project details and team information
DrYenLo Mar 7, 2025
bcd65d6
Merge pull request #13 from Jing27540/jhuang/tasks-i-ii-iii
cnayak99 Mar 8, 2025
bd26b67
Update: Change the Table fonts and line space.
cnayak99 Mar 9, 2025
906dcb1
Merge branch 'main' into pr-52
Mar 13, 2025
09bfc6a
Update the Course Assignment file
cnayak99 Mar 14, 2025
2ad4916
Roll back table.tsx
cnayak99 Mar 14, 2025
a1670dc
Merge pull request #18 from Jing27540/nchinmay
Jing27540 Mar 14, 2025
bf6e4b3
Merge pull request #19 from Jing27540/pr-76
Jing27540 Mar 14, 2025
af7256f
Merge remote-tracking branch 'origin' into pr-52
Mar 14, 2025
53383c4
Commented out the overwritten table style within StudentTasks.module.css
Mar 14, 2025
d14f465
Change the Student Task table using the Table component
cnayak99 Mar 15, 2025
4f6c0df
Change the Student Task table using the Table component
cnayak99 Mar 15, 2025
b0505b8
Start feature: Add info icon with pop-out comment placeholder
Mar 16, 2025
2871438
Update pop-out comments in Assignment table
Mar 18, 2025
f9327b7
Merge pull request #24 from Jing27540/feature/info-icon-popout
Jing27540 Mar 18, 2025
39e1593
Finished the reimplementation of Course Assignment View.
Mar 18, 2025
e7284a6
Reimplementing the Student Task view.
Mar 18, 2025
8201d5e
Finished to enable add info icon with the Heading
Mar 20, 2025
74e6f13
Merge pull request #25 from Jing27540/pr-52
Jing27540 Mar 22, 2025
4dc6882
Resolved the typo issue in stateDeadline comment in StudentTask Table.
Mar 22, 2025
fca303a
Remove README Changes from the PR to Expertiza repo.
Mar 22, 2025
38bf4cf
Reset README.md to match the original forked repository
Mar 22, 2025
4b1a66a
Refactor to show the comment info for some column headings within the…
Mar 22, 2025
b941a9c
Updated the StudentTaskDetail.tsx and Add it to the responsive naviga…
Apr 6, 2025
c472e2c
feat: update StudentTaskDetail UI to match design diagram
Apr 9, 2025
715533c
Added current implementation of StudentTaskDetail.
Apr 12, 2025
ce5a1dc
Adjusted the layout.
Apr 12, 2025
3b6306f
Adjusted the header's padding.
Apr 12, 2025
51f9324
UPDATE: made changes in the timeline UI
cnayak99 Apr 18, 2025
0256da4
Implementing the StudentTasks.
Apr 19, 2025
9099244
Integrate the backend fetched studentTaskData for StudentTask view.
Apr 19, 2025
12b4041
Reused the create Tooltip component.
Apr 19, 2025
a06bb09
Removed the console log from StudentTasks.tsx
Apr 19, 2025
12bef23
Update: Fetching backend to populate the UI
cnayak99 Apr 20, 2025
e3979bd
Removed some of the inline CSS
cnayak99 Apr 20, 2025
7a22fd4
Merge pull request #36 from Jing27540/feat/backend-integration
DrYenLo Apr 20, 2025
a0e2afd
Merge pull request #37 from Jing27540/feat/studentTaskDetails
DrYenLo Apr 20, 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
152 changes: 147 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
"axios": "^1.4.0",
"bootstrap": "^5.3.3",
"chart.js": "^4.1.1",
"recharts": "^2.0.0",
"formik": "^2.2.9",
"jquery": "^3.7.1",
"jwt-decode": "^3.1.2",
"mysql2": "^3.14.0",
"react": "^18.2.0",
"react-bootstrap": "^2.7.4",
"react-chartjs-2": "^5.2.0",
Expand All @@ -34,6 +34,7 @@
"react-redux": "^8.0.5",
"react-router-dom": "^6.11.1",
"react-scripts": "^5.0.1",
"recharts": "^2.0.0",
"redux-persist": "^6.0.0",
"sass": "^1.62.1",
"save": "^2.9.0",
Expand Down
Binary file added public/assets/icons/copy-temp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/icons/delete-temp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/icons/edit-temp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/icons/export-temp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/icons/info.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 20 additions & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ import Questionnaire from "pages/EditQuestionnaire/Questionnaire";
import Courses from "pages/Courses/Course";
import CourseEditor from "pages/Courses/CourseEditor";
import { loadCourseInstructorDataAndInstitutions } from "pages/Courses/CourseUtil";
import StudentTasks from "./pages/StudentTasks/StudentTasks";
import StudentTaskDetail from "pages/StudentTasks/StudentTaskDetail";
import TA from "pages/TA/TA";
import TAEditor from "pages/TA/TAEditor";
import { loadTAs } from "pages/TA/TAUtil";
Expand Down Expand Up @@ -59,6 +61,22 @@ function App() {
path: "edit-questionnaire",
element: <ProtectedRoute element={<Questionnaire />} />,
},
{
path: "student_tasks",
element: <ProtectedRoute element={<StudentTasks />} leastPrivilegeRole={ROLE.STUDENT} />,
// children: [
// {
// path: ":id",
// element: <StudentTaskDetail />,
// },
// ],
},
{
path: "student_task_detail/:id",
element: (
<ProtectedRoute element={<StudentTaskDetail />} leastPrivilegeRole={ROLE.STUDENT} />
),
},
{
path: "assignments/edit/:id/createteams",
element: <CreateTeams />,
Expand Down Expand Up @@ -192,11 +210,11 @@ function App() {
},
{
path: "reviews",
element: <Reviews/>,
element: <Reviews />,
},
{
path: "email_the_author",
element: <Email_the_author/>,
element: <Email_the_author />,
},
// Fixed the missing comma and added an opening curly brace
{
Expand Down
Loading