Skip to content

Merging E2552 after making changes #133

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

Open
21Tulasi wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Merging E2552 after making changes #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
582a4eb
Merge E2552
tulasi210900-cpu Dec 1, 2025
3ff276c
Merge E2552
tulasi210900-cpu Dec 1, 2025
49e8a32
changed the nav bar
tulasi210900-cpu Dec 8, 2025
0ab8575
Questionnaire CRUD Frontend
tulasi210900-cpu Dec 9, 2025
8276b58
Made changes to fix update questionnaire
tulasi210900-cpu Jan 1, 2026
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
92 changes: 92 additions & 0 deletions package-lock.json
View file
Open in desktop

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

4 changes: 3 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"@tanstack/react-table": "^8.9.1",
"@types/node": "^20.19.0",
"@types/react": "^18.2.6",
"@types/react-beautiful-dnd": "^13.1.8",
"@types/react-dom": "^18.2.4",
"@types/react-redux": "^7.1.25",
"@types/react-router-dom": "^5.3.3",
Expand All @@ -21,6 +22,7 @@
"jquery": "^3.7.1",
"jwt-decode": "^3.1.2",
"react": "^18.2.0",
"react-beautiful-dnd": "^13.1.1",
"react-bootstrap": "^2.7.4",
"react-chartjs-2": "^5.2.0",
"react-datepicker": "^4.11.0",
Expand Down Expand Up @@ -71,4 +73,4 @@
"vite": "^7.1.10",
"vitest": "^1.0.0"
}
}
}
83 changes: 65 additions & 18 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ import Logout from "./pages/Authentication/Logout";
import Courses from "./pages/Courses/Course";
import CourseEditor from "./pages/Courses/CourseEditor";
import { loadCourseInstructorDataAndInstitutions } from "./pages/Courses/CourseUtil";
import Questionnaire from "./pages/EditQuestionnaire/Questionnaire";
import Questionnaire from "./pages/Questionnaires/Questionnaire";
import QuestionnaireEditor from "./pages/Questionnaires/QuestionnaireEditor";
import { loadQuestionnaire } from "./pages/Questionnaires/QuestionnaireUtils";
import Email_the_author from "./pages/Email_the_author/email_the_author";
import Home from "./pages/Home";
import InstitutionEditor, { loadInstitution } from "./pages/Institutions/InstitutionEditor";
Expand Down Expand Up @@ -51,7 +53,9 @@ import NewTeammateAdvertisement from './pages/Student Teams/NewTeammateAdvertise
import TeammateReview from './pages/Student Teams/TeammateReview';
import SignupSheet from 'components/SignupSheet/SignupSheet';
import PartnerAdvertisements from 'components/SignupSheet/PartnerAdvertisements';

import AssignmentEditPage from "./pages/Assignments/AssignmentEditPage";
import StudentTasks from "pages/StudentTasks/StudentTasks";
// import AssignReviewer from "pages/Assignments/AssignReviewer";
function App() {
const router = createBrowserRouter([
{
Expand All @@ -71,12 +75,6 @@ function App() {
path: "edit-questionnaire",
element: <ProtectedRoute element={<Questionnaire />} />,
},

{
path: "assignments/edit/:id",
element: <AssignmentEditor mode="update" />,
loader: loadAssignment,
},
{
path: "assignments/edit/:id/createteams",
element: <CreateTeams />,
Expand All @@ -85,8 +83,9 @@ function App() {

// Assign Reviewer: no route loader (component handles localStorage/URL id)
{
path: "assignments/edit/:id/responsemappings",
element: <ResponseMappings />,
path: "assignments/edit/:id/assignreviewer",
element: <AssignReviewer />,
loader: loadAssignment,
},

{
Expand Down Expand Up @@ -127,6 +126,10 @@ function App() {
loader: loadAssignment,
},

{
path: "assignments/edit/:id",
element: <ProtectedRoute element={<AssignmentEditPage />} leastPrivilegeRole={ROLE.TA} />,
},
{
path: "assignments/:assignmentId/signup_sheet",
element: <ProtectedRoute element={<SignupSheet />} />,
Expand All @@ -146,7 +149,11 @@ function App() {
// },
// ],
},


{
path: "assignments/edit/:id",
element: <ProtectedRoute element={<AssignmentEditPage />} leastPrivilegeRole={ROLE.TA} />,
},
{
path: "student_teams/view",
element: <ProtectedRoute element={<StudentTeamView />} />,
Expand Down Expand Up @@ -268,6 +275,14 @@ function App() {
path: "email_the_author",
element: <Email_the_author />,
},
{
path: "student_tasks",
element: <ProtectedRoute element={<StudentTasks />} />,
},
{
path: "student_tasks/:assignmentId",
element: <ProtectedRoute element={<StudentTasks />} />,
},
// Fixed the missing comma and added an opening curly brace
{
path: "courses",
Expand Down Expand Up @@ -309,7 +324,10 @@ function App() {
element: <Roles />,
loader: loadRoles,
children: [
{ path: "new", element: <RoleEditor mode="create" /> },
{
path: "new",
element: <RoleEditor mode="create" />,
},
{
id: "edit-role",
path: "edit/:id",
Expand All @@ -323,7 +341,10 @@ function App() {
element: <Institutions />,
loader: loadInstitutions,
children: [
{ path: "new", element: <InstitutionEditor mode="create" /> },
{
path: "new",
element: <InstitutionEditor mode="create" />,
},
{
path: "edit/:id",
element: <InstitutionEditor mode="update" />,
Expand All @@ -336,21 +357,47 @@ function App() {
element: <ManageUserTypes />,
loader: loadUsers,
children: [
{ path: "new", element: <Navigate to="/users/new" /> },
{ path: "edit/:id", element: <Navigate to="/users/edit/:id" /> },
{
path: "new",
element: <Navigate to="/users/new" />,
},

{
path: "edit/:id",
element: <Navigate to="/users/edit/:id" />,
},
],
},
{ path: "questionnaire", element: <Questionnaire /> },
{
path: "questionnaire",
element: <Questionnaire />,
loader: loadQuestionnaire, },
],
},

{ path: "*", element: <NotFound /> },
{ path: "questionnaire", element: <Questionnaire /> },
{ path: "questionnaire", element: <Questionnaire />, loader: loadQuestionnaire },

{
path: "questionnaires",
element: <ProtectedRoute element={<Questionnaire />} leastPrivilegeRole={ROLE.INSTRUCTOR} />,
loader: loadQuestionnaire,
},
{
path: "questionnaires/new",
element: <ProtectedRoute element={<QuestionnaireEditor mode="create" />} leastPrivilegeRole={ROLE.INSTRUCTOR} />,
loader: loadQuestionnaire,
},
{
path: "questionnaires/edit/:id",
element: <ProtectedRoute element={<QuestionnaireEditor mode="update" />} leastPrivilegeRole={ROLE.INSTRUCTOR} />,
loader: loadQuestionnaire,
},
],
},
]);

return <RouterProvider router={router} />;
}

export default App;
export default App;
Loading