From 8880f0bbb21d840a3d7fc3086cd939659776480e Mon Sep 17 00:00:00 2001 From: ayoitshasya Date: Thu, 3 Apr 2025 23:24:25 +0530 Subject: [PATCH] footer fixed and other css fixed --- client/public/index.html | 6 + client/src/Pages/AdminCoursePage.jsx | 144 +++++++++------- client/src/Pages/AdminFacultyPage.jsx | 176 +++++++++++--------- client/src/Pages/ConsolidatedTable.jsx | 9 +- client/src/Pages/CourseForm.jsx | 2 +- client/src/Pages/CourseTable.jsx | 58 ++++--- client/src/Pages/DepartmentConsolidated.jsx | 13 +- client/src/Pages/Footer.jsx | 7 +- client/src/Pages/PanelConsolidated.jsx | 10 +- client/src/Pages/courseConsolidated.jsx | 10 +- package-lock.json | 6 + server/package-lock.json | 61 ++++++- server/package.json | 1 + 13 files changed, 317 insertions(+), 186 deletions(-) create mode 100644 package-lock.json diff --git a/client/public/index.html b/client/public/index.html index 58d4f61..47ddb2a 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -8,6 +8,12 @@ + + appointment_to_examiner diff --git a/client/src/Pages/AdminCoursePage.jsx b/client/src/Pages/AdminCoursePage.jsx index 917b3ff..4791328 100644 --- a/client/src/Pages/AdminCoursePage.jsx +++ b/client/src/Pages/AdminCoursePage.jsx @@ -168,66 +168,92 @@ export const AdminCoursePage = () => { {showForm && ( -
-

{isEditMode ? 'Edit Course' : 'Add New Course'}

-
- setCurrentCourse({ ...currentCourse, courseId: e.target.value })} - style={inputStyle} - /> - setCurrentCourse({ ...currentCourse, name: e.target.value })} - style={inputStyle} - /> - setCurrentCourse({ ...currentCourse, department: e.target.value })} - style={inputStyle} - /> - setCurrentCourse({ ...currentCourse, program: e.target.value })} - style={inputStyle} - /> - setCurrentCourse({ ...currentCourse, scheme: e.target.value })} - style={inputStyle} - /> - setCurrentCourse({ ...currentCourse, semester: e.target.value })} - style={inputStyle} - /> - +
+
+

{isEditMode ? 'Edit Course' : 'Add New Course'}

+ + + setCurrentCourse({ ...currentCourse, courseId: e.target.value })} + style={inputStyle} + /> + setCurrentCourse({ ...currentCourse, name: e.target.value })} + style={inputStyle} + /> + setCurrentCourse({ ...currentCourse, department: e.target.value })} + style={inputStyle} + /> + setCurrentCourse({ ...currentCourse, program: e.target.value })} + style={inputStyle} + /> + setCurrentCourse({ ...currentCourse, scheme: e.target.value })} + style={inputStyle} + /> + setCurrentCourse({ ...currentCourse, semester: e.target.value })} + style={inputStyle} + /> + + +
+ + +
+ +
+
+)} -
- - -
- -
- )} {/* TABLE DATA */} diff --git a/client/src/Pages/AdminFacultyPage.jsx b/client/src/Pages/AdminFacultyPage.jsx index 31cef4d..c80225a 100644 --- a/client/src/Pages/AdminFacultyPage.jsx +++ b/client/src/Pages/AdminFacultyPage.jsx @@ -207,86 +207,104 @@ export const AdminFacultyPage = () => { {showForm && ( -
-

{isEditMode ? 'Edit Faculty' : 'Add New Faculty'}

-
-
- setCurrentFaculty({ ...currentFaculty, facultyId: e.target.value })} - style={inputStyle} - /> - setCurrentFaculty({ ...currentFaculty, name: e.target.value })} - style={inputStyle} - /> -
- -
- setCurrentFaculty({ ...currentFaculty, email: e.target.value })} - style={inputStyle} - /> - setCurrentFaculty({ ...currentFaculty, department: e.target.value })} - style={inputStyle} - /> -
- -
- setCurrentFaculty({ ...currentFaculty, program: e.target.value })} - style={inputStyle} - /> -
- - - {currentFaculty.courses.map((course, index) => ( -
- - - - -
- ))} - - -
- - -
- +
+
+

{isEditMode ? 'Edit Faculty' : 'Add New Faculty'}

+ +
+
+ setCurrentFaculty({ ...currentFaculty, facultyId: e.target.value })} + style={inputStyle} + /> + setCurrentFaculty({ ...currentFaculty, name: e.target.value })} + style={inputStyle} + />
- )} + +
+ setCurrentFaculty({ ...currentFaculty, email: e.target.value })} + style={inputStyle} + /> + setCurrentFaculty({ ...currentFaculty, department: e.target.value })} + style={inputStyle} + /> +
+ +
+ setCurrentFaculty({ ...currentFaculty, program: e.target.value })} + style={inputStyle} + /> +
+ + {currentFaculty.courses.map((course, index) => ( +
+ + +
+ ))} + + + +
+ + +
+ +
+
+)} + + {/* TABLE DATA */}
diff --git a/client/src/Pages/ConsolidatedTable.jsx b/client/src/Pages/ConsolidatedTable.jsx index 1aad13a..a3fdb3d 100644 --- a/client/src/Pages/ConsolidatedTable.jsx +++ b/client/src/Pages/ConsolidatedTable.jsx @@ -81,6 +81,7 @@ const styles = { }, main: { width: "100%", + flexGrow: 1 }, }; @@ -216,7 +217,11 @@ const ConsolidatedTable = () => { }; return ( - <> +
@@ -399,7 +404,7 @@ const ConsolidatedTable = () => {
- - - - - - - - - {courses.length > 0 ? ( - courses.map((course) => ( - handleRowClick(course)}> - - - +
+ +
CourseIDCourse NameStatus
{course.courseId}{course.name}{getStatus(course.courseId)}
+ + + + + - )) - ) : ( - - - - )} - -
CourseIDCourse NameStatus
No courses available
+ + + {courses.length > 0 ? ( + courses.map((course) => ( + handleRowClick(course)}> + {course.courseId} + {course.name} + {getStatus(course.courseId)} + + )) + ) : ( + + No courses available + + )} + + +