+
{this.props.uniqueID} : {this.props.name}
Description: {this.props.details}
Type: {this.props.type}
Due Date: {this.props.dueDate}
diff --git a/client/app/components/Pages/Assignments/Assignments.js b/client/app/components/Pages/Assignments/Assignments.js
index 8ac7ac2..41cdd07 100644
--- a/client/app/components/Pages/Assignments/Assignments.js
+++ b/client/app/components/Pages/Assignments/Assignments.js
@@ -5,133 +5,135 @@ import AssignmentCard from './AssignmentCard';
import ReactLoading from './../../common/Loading';
class Assignments extends Component {
- constructor(props) {
- super(props);
- this.state = {
- isLoading: true,
- courses: [],
- role: "student",
- assignments: []
- };
- }
- componentDidMount() {
- var self = this;
- var token = localStorage.getItem('token');
- var userID = localStorage.getItem('user_id');
+ constructor(props) {
+ super(props);
+ this.state = {
+ isLoading: true,
+ courses: [],
+ role: "student",
+ assignments: []
+ };
+ }
+ componentDidMount() {
+ var self = this;
+ var token = localStorage.getItem('token');
+ var userID = localStorage.getItem('user_id');
- var apiPath = '/api/account/' + userID + '/details'
- axios.get(apiPath, {
- headers: {
- 'x-access-token': token,
- 'Content-Type': 'application/json'
- }
- })
- .then(function (response) {
- if (!response.data.success) {
- // TODO: throw appropriate error and redirect
- console.log("Error1: " + response.data);
- return;
- }
- var data = response.data;
- self.setState({
- role: data.user.role
- });
- })
- .catch(function (error) {
- console.log(error);
- if (error.response) {
- if (error.response.status) {
- alert("Session timed out.");
- window.location.href = '/';
- }
- }
- });
- var apiPath = '/api/assignments/' + userID + '/courses'
- axios.get(apiPath, {
- headers: {
- 'x-access-token': token,
- 'Content-Type': 'application/json'
- }
- })
- .then(function (response) {
- if (!response.data.success) {
- // TODO: throw appropriate error and redirect
- console.log("Error1: " + response.data);
-
- }
- var data = response.data;
- // console.log(data);
- self.setState({ isLoading: false });
- self.setState({
- courses: data.courses
- });
- var courses = data.courses;
- for (var i = 0; i < courses.length; i++) {
- var apiPath = '/api/assignments/' + courses[i]._id + '/' + userID + '/new';
- axios.get(apiPath, {
- headers: {
- 'x-access-token': token,
- 'Content-Type': 'application/json'
- }
- })
- .then(function (response) {
- if (!response.data.success) {
- console.log("Error1: " + response.data);
- }
- var data = response.data;
- self.setState({
- assignments: self.state.assignments.concat(data.assignments.assignments)
- });
- console.log(response.data);
- })
- .catch(function (error) {
- console.log('Error2: ', error);
- });
- }// End of for loop
- })
- }
- render() {
- let content;
- const profContent = (
-
- {
- this.state.assignments.length < 1 &&
-
Sorry, no assignments found.
- }
- {
- this.state.assignments.map(function (each) {
- return
- })
- }
-
-
- );
- const studContent = (
-
- {
- this.state.assignments.length < 1 &&
-
Sorry, no new assignments found.
- }
- {
- this.state.assignments.map(function (each) {
- return
- })
- }
-
-
- );
- if (this.state.role == "prof") {
- content = profContent;
- }
- else {
- content = studContent;
- }
- if (this.state.isLoading)
- return
;
- else
- return (
-
{content}
- );
- }
+ var apiPath = '/api/account/' + userID + '/details'
+ axios.get(apiPath, {
+ headers: {
+ 'x-access-token': token,
+ 'Content-Type': 'application/json'
+ }
+ })
+ .then(function (response) {
+ if (!response.data.success) {
+ // TODO: throw appropriate error and redirect
+ console.log("Error1: " + response.data);
+ return;
+ }
+ var data = response.data;
+ self.setState({
+ role: data.user.role
+ });
+ })
+ .catch(function (error) {
+ console.log(error);
+ if (error.response) {
+ if (error.response.status) {
+ alert("Session timed out.");
+ window.location.href = '/';
+ }
+ }
+ });
+ var apiPath = '/api/assignments/' + userID + '/courses';
+ axios.get(apiPath, {
+ headers: {
+ 'x-access-token': token,
+ 'Content-Type': 'application/json'
+ }
+ })
+ .then(function (response) {
+ if (!response.data.success) {
+ // TODO: throw appropriate error and redirect
+ console.log("Error1: " + response.data);
+
+ }
+ var data = response.data;
+ // console.log(data);
+ self.setState({ isLoading: false });
+ self.setState({
+ courses: data.courses
+ });
+ var courses = data.courses;
+ for (var i = 0; i < courses.length; i++) {
+ var apiPath = '/api/assignments/' + courses[i]._id + '/' + userID + '/new';
+ axios.get(apiPath, {
+ headers: {
+ 'x-access-token': token,
+ 'Content-Type': 'application/json'
+ }
+ })
+ .then(function (response) {
+ if (!response.data.success) {
+ console.log("Error1: " + response.data);
+ }
+ var data = response.data;
+ self.setState({
+ assignments: self.state.assignments.concat(data.assignments.assignments)
+ });
+ console.log(response.data);
+ })
+ .catch(function (error) {
+ console.log('Error2: ', error);
+ });
+ }// End of for loop
+ })
+ }
+
+ render() {
+ let content;
+ const profContent = (
+
+ {
+ this.state.assignments.length < 1 &&
+
Sorry, no assignments found.
+ }
+ {
+ this.state.assignments.map(function (each) {
+ return
+ })
+ }
+
+
+ );
+ const studContent = (
+
+ {
+ this.state.assignments.length < 1 &&
+
Sorry, no new assignments found.
+ }
+ {
+ this.state.assignments.map(function (each) {
+ return
+ })
+ }
+
+
+ );
+ if (this.state.role == "prof") {
+ content = profContent;
+ }
+ else {
+ content = studContent;
+ }
+ if (this.state.isLoading)
+ return
;
+ else
+ return (
+
{content}
+ );
+ }
}
+
export default Assignments;
\ No newline at end of file
diff --git a/client/app/components/Pages/Courses/CourseCard.js b/client/app/components/Pages/Courses/CourseCard.js
deleted file mode 100644
index 6acf08c..0000000
--- a/client/app/components/Pages/Courses/CourseCard.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import React, { Component } from 'react';
-import { Link, Redirect } from 'react-router-dom';
-
-class CourseCard extends Component {
- constructor(props) {
- super(props);
- this.state = {
- courseID: ''
- };
- }
- componentDidMount() {
- this.setState({
- courseID: this.props.courseID
- })
- }
-
-
- render() {
- let content;
- const profContent = (
-
-
-
{this.props.code} : {this.props.name}
-
-
Credits: {this.props.credits}
-
Deparment: {this.props.department}
-
Description: {this.props.description}
-
Resource URL: {this.props.resourceUrl}
-
-
-
-
-
-
- );
- const studContent = (
-
-
-
{this.props.code} : {this.props.name}
-
-
Credits: {this.props.credits}
-
Deparment: {this.props.department}
-
Description: {this.props.description}
-
Resource URL: {this.props.resourceUrl}
-
-
-
-
- );
- if (this.props.role == "prof") {
- content = profContent;
- }
- else {
- content = studContent;
- }
- return (
-
{content}
- )
- }
-}
-
-export default CourseCard;
diff --git a/client/app/components/Pages/Courses/CourseCards/CourseCard.js b/client/app/components/Pages/Courses/CourseCards/CourseCard.js
new file mode 100644
index 0000000..73dbb14
--- /dev/null
+++ b/client/app/components/Pages/Courses/CourseCards/CourseCard.js
@@ -0,0 +1,379 @@
+import React, { Component } from 'react';
+import { Link, Redirect } from 'react-router-dom';
+import { Input, InputGroup, InputGroupAddon, Collapse, Button, CardBody, Card, Badge, Table } from 'reactstrap';
+import { ToastContainer, ToastStore } from 'react-toasts';
+import axios from 'axios';
+import {Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap';
+import {connect} from 'react-redux';
+
+class CourseCard extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ courseID: '',
+ collapse: false,
+ course:null,
+ showModal:false
+ };
+ this.toggle = this.toggle.bind(this);
+ this.handleInputChange = this.handleInputChange.bind(this);
+ this.handleDetailsChange = this.handleDetailsChange.bind(this);
+ this.handleDurationChange = this.handleDurationChange.bind(this);
+ this.toggleCreateAssignment = this.toggleCreateAssignment.bind(this);
+ this.handleCreateAssignment = this.handleCreateAssignment.bind(this);
+ }
+ // Create Assignment Handler
+ handleCreateAssignment(event){
+ event.preventDefault();
+ const self = this;
+ const createAssignmentFormElements = event.target.getElementsByTagName("input");
+ var apiPath = `/api/assignments/${this.props.auth.user_id}/createAssignment`
+ const token = this.props.auth.token;
+ const config = {
+ headers: {
+ 'x-access-token': token,
+ 'Content-Type': 'application/json'
+ }
+ }
+ const data = {};
+ data.courseID = this.state.courseID;
+ data.name = createAssignmentFormElements["assignmentName"].value;
+ data.uniqueId = createAssignmentFormElements["assignmentID"].value;
+ data.type = createAssignmentFormElements["assignmentType"].value;
+ data.details = createAssignmentFormElements["assignmentDetails"].value;
+ data.maxMarks = createAssignmentFormElements["assignmentMaxMarks"].value;
+ data.resourcesUrl = createAssignmentFormElements["assignmentResources"].value;
+ data.duration = {};
+ data.duration.startDate = createAssignmentFormElements["assignmentStartDate"].value;
+ data.duration.endDate = createAssignmentFormElements["assignmentEndDate"].value;
+ console.log(data);
+ axios.post(apiPath, data, config)
+ .then(res => {
+ console.log(res.data);
+ ToastStore.success(res.data.message);
+ setTimeout(() => {self.reload()},2000);
+ })
+ .catch(err => {
+ console.log(err.response.data.message);
+ ToastStore.error(err.response.data.message);
+ })
+
+ }
+ // Generalised input handler for form inputs
+ handleInputChange(event) {
+ const updatedCourse = this.state.course;
+ updatedCourse[event.target.name] = event.target.value;
+ this.setState({
+ course: updatedCourse
+ })
+ }
+ // Handler for start and end date inputs
+ handleDurationChange(event) {
+ const updatedCourse = this.state.course;
+ updatedCourse["duration"][event.target.name] = event.target.value;
+ this.setState({
+ course: updatedCourse
+ })
+ }
+ // Handler for course details input
+ handleDetailsChange(event) {
+ const updatedCourse = this.state.course;
+ console.log(updatedCourse);
+ updatedCourse["details"][event.target.name] = Number(event.target.value);
+ this.setState({
+ course: updatedCourse
+ })
+ }
+ reload() {
+ window.location.reload()
+ }
+ toggle() { // For reactstrap Collapse component
+ this.setState(state => ({ collapse: !state.collapse }));
+ }
+ toggleCreateAssignment() { // For create assignment modal
+ this.setState(state => ({ showModal: !state.showModal}));
+ }
+ componentWillMount() { // Add pre-defined course attributes, and other values to course object in state before mounting
+ const course = this.props.course;
+ if(!course.hasOwnProperty("duration")){
+ course["duration"]={};
+ }
+ this.setState({
+ courseID: this.props.course._id,
+ course: Object.assign({}, course)
+ })
+ }
+
+ render() {
+ const course = this.props.course;
+ const self = this;
+ var createCourseModal = null;
+ // For courses pending activation by a courseMember
+ if(this.props.course.validated === true && this.props.course.active === false){
+ var courseGlance = (
+
+
+
+
+
Course Code
+
{course.code}
+
+
+
+
+
Course Name
+
{course.name}
+
+
+
+
+
Department
+
{course.department}
+
+
+
+
Pending Activation
+
+
Expand
+
+ )
+ var courseDetails = (
+
+
+
+ this.props.handleActivateCourse(this.state.course)}>Activate {' '}
+
+
+ );
+ }
+ // For activated courses
+ else {
+ var courseGlance;
+ // If user is a course member (Add assignment available)
+ if(this.props.course.class.teachingMembers.find( teachingMember => teachingMember.teacher === self.props.userid)){
+ courseGlance = (
+
+
+
+
+
Course Code
+
{course.code}
+
+
+
+
+
Course Name
+
{course.name}
+
+
+
+
+
Department
+
{course.department}
+
+
+
+ Add Assignment
+
+
+
View more details
+
+ )
+ // Modal view to create an assignment under a course
+ createCourseModal = (
+
+ Create Assignment
+
+
+
+
+ Cancel
+
+
+ )
+ }
+ // If user is not a course member (Add assignment not available)
+ else {
+ courseGlance = (
+
+
+
+
+
Course Code
+
{course.code}
+
+
+
+
+
Course Name
+
{course.name}
+
+
+
+
+
Department
+
{course.department}
+
+
+
+
View more details
+
+ )
+ }
+
+ var courseDetails = (
+
+
+
+
+
+ );
+ }
+
+ return (
+
+ {createCourseModal}
+
+
+ {courseGlance}
+
+ {courseDetails}
+
+
+
+
+ )
+ }
+}
+
+const mapStateToProps = (state) => {
+ return {
+ auth:state.auth
+ }
+}
+export default connect(mapStateToProps)(CourseCard);
diff --git a/client/app/components/Pages/Courses/CourseCards/CourseCardAdmin.js b/client/app/components/Pages/Courses/CourseCards/CourseCardAdmin.js
new file mode 100755
index 0000000..dae72a9
--- /dev/null
+++ b/client/app/components/Pages/Courses/CourseCards/CourseCardAdmin.js
@@ -0,0 +1,371 @@
+import React, { Component } from 'react';
+import { TabContent, TabPane, Nav, NavItem, NavLink, Input, InputGroup, Collapse, Button, CardBody, Card, Badge, Table } from 'reactstrap';
+import classnames from 'classnames';
+import {connect} from 'react-redux';
+import { ToastContainer, ToastStore } from 'react-toasts';
+import {Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap';
+
+class CourseCardAdmin extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ courseID: '',
+ collapse: false,
+ course:null,
+ classes:[],
+ selectedTeachers:[],
+ selectedSections:[],
+ showModal:false,
+ activeTab: 'professors',
+ graduatingYearOfStudents: null
+ };
+ this.toggle = this.toggle.bind(this);
+ this.handleInputChange = this.handleInputChange.bind(this);
+ this.handleSectionsChange = this.handleSectionsChange.bind(this);
+ this.removeSelectedTeacher = this.removeSelectedTeacher.bind(this);
+ this.toggleAddClass = this.toggleAddClass.bind(this);
+ this.addClass = this.addClass.bind(this);
+ this.removeClass = this.removeClass.bind(this);
+ this.toggleTab = this.toggleTab.bind(this);
+ this.createTeacherButtons = this.createTeacherButtons.bind(this);
+ this.handleGraduatingYearChange = this.handleGraduatingYearChange.bind(this);
+ }
+ toggleTab(tab) { // To toggle between student and teacher tabs
+ if(this.state.activeTab !== tab)
+ this.setState({
+ activeTab:tab
+ })
+ }
+ toggleAddClass() { // For create assignment modal
+ this.setState(state => ({ showModal: !state.showModal}));
+ }
+ handleSearch(event){
+ const searchElement = event.target.value;
+ const professorListElements = document.getElementsByClassName("professorListElement");
+ for(const professorElement of professorListElements){
+ if(professorElement.getAttribute("profname").search(searchElement) != -1 || searchElement==="")
+ professorElement.style.display = "table-row";
+ else
+ professorElement.style.display = "none";
+ }
+ }
+ handleGraduatingYearChange(event){
+ this.setState({
+ graduatingYearOfStudents: event.target.value
+ })
+ }
+ handleInputChange(event) {
+ const updatedCourse = this.state.course;
+ updatedCourse[event.target.name] = event.target.value;
+ this.setState({
+ course: updatedCourse
+ })
+ }
+ handleSectionsChange(event) {
+ const sectionsInput = event.target.value;
+ const updatedSelectedSections = sectionsInput.split(",");
+ updatedSelectedSections.map(section => {
+ if(section)
+ return section.trim();
+ });
+ this.setState({
+ selectedSections: updatedSelectedSections
+ })
+ }
+ toggle() { // For reactstrap Collapse component
+ let selectedTeachers = this.state.selectedTeachers;
+ let selectedSections = this.state.selectedSections;
+ if(this.state.collapse == true){
+ selectedSections = [];
+ selectedTeachers = []
+ }
+ this.setState({
+ collapse: !this.state.collapse,
+ selectTeachers: selectedTeachers,
+ selectedSections: selectedSections
+ });
+ }
+ addClass(){
+ if(this.state.selectedSections.length && this.state.selectedTeachers.length && this.state.graduatingYearOfStudents != null) {
+ const newClass = {};
+ newClass.class = {};
+ newClass.class.teachingMembers = this.state.selectedTeachers;
+ newClass.class.sections = this.state.selectedSections;
+ newClass.graduatingYearOfStudents = this.state.graduatingYearOfStudents;
+ const classes = this.state.classes;
+ classes.push(newClass);
+ this.setState({
+ classes:classes,
+ selectedSections:[],
+ selectedTeachers:[],
+ graduatingYearOfStudents: null
+ })
+ }
+ else
+ ToastStore.error("Please add sections and corresponding teaching members, and a graduating year");
+ }
+ removeClass(index){
+ let classes = this.state.classes;
+ classes.splice(index, 1);
+ this.setState({
+ classes:classes
+ })
+ }
+ selectTeacher(professor){
+ const selectedRole = document.getElementById(professor+"Role").value;
+ if(!selectedRole){
+ ToastStore.error("Please select a role");
+ return;
+ }
+ const updatedSelectedTeachers = this.state.selectedTeachers;
+ if(updatedSelectedTeachers.findIndex(item => item.teacher === professor) <0){
+ updatedSelectedTeachers.push({teacher:professor, role:selectedRole});
+ this.setState({selectedTeachers:updatedSelectedTeachers});
+ }
+ }
+ removeSelectedTeacher(event){
+ const selectedTeachers = this.state.selectedTeachers;
+ const indexToBeRemoved = selectedTeachers.findIndex(teachingMember => teachingMember.teacher === event.target.id);
+ if(indexToBeRemoved >= 0){
+ selectedTeachers.splice(indexToBeRemoved, 1);
+ this.setState({
+ selectedTeachers
+ });
+ }
+ }
+ createTeacherButtons(teachersList, canDelete = true){ // Returns a jsx button list of teaching members
+ // canDelete flag to allow or disallow teaching member removal by clicin on the x in the button
+ const teacherButtonList = teachersList.map((teachingMember) => {
+ // Get the teacher name from my props (reduxed)
+ const teacherName = this.props.collegeMembers.professors[teachingMember.teacher] || this.props.collegeMembers.students[teachingMember.teacher];
+ if(canDelete)
+ return(
+
+ {teacherName.firstName+" "+teacherName.lastName} x
+
+ )
+ return(
+
+ {teacherName.firstName+" "+teacherName.lastName}
+
+ )
+ })
+ return teacherButtonList;
+ }
+
+ componentWillMount() {
+ this.setState({
+ courseID: this.props.course._id,
+ course: Object.assign({}, this.props.course)
+ })
+ }
+
+ render() {
+ const course = this.props.course;
+ const selectedTeachers = this.createTeacherButtons(this.state.selectedTeachers);
+ if(this.props.collegeMembers.professors){
+ const professors = this.props.collegeMembers.professors;
+ var teachersList = Object.keys(professors).map((professorId) => {
+ const profName = professors[professorId].firstName+" "+professors[professorId].lastName;
+ return(
+
+ {profName}
+
+
+ Select role
+ Anchor
+ Professor
+ Teaching Assistant
+
+
+ this.selectTeacher(professorId)}>+ {' '}
+ )
+ })
+ }
+ if(this.props.collegeMembers.students){
+ const students = this.props.collegeMembers.students;
+ var studentsList = Object.keys(students).map((studentId) => {
+ const studentName = students[studentId].firstName+" "+students[studentId].lastName;
+ return(
+
+ {studentName}
+
+
+ Select role
+ Anchor
+ Professor
+ Teaching Assistant
+
+
+ this.selectTeacher(studentId)}>+ {' '}
+ )
+ })
+ }
+ let addedClasses =
No classes added yet
+ if(this.state.classes.length){
+ addedClasses = this.state.classes.map((classObject, index) => {
+ return (
+
+ {classObject.class.sections.join(",")}
+ {this.createTeacherButtons(classObject.class.teachingMembers, false)}
+ this.removeClass(index)}>X
+ )
+ })
+ }
+ const teacherSelector = (
+
+
+
+ { this.toggleTab('professors'); }}
+ >
+ Teachers
+
+
+
+ { this.toggleTab('students'); }}
+ >
+ Students
+
+
+
+
+ {/* Search */}
+
+
+
+
+
+
+
+
+
+
+ )
+ const addClassModal = (
+
+ Add class
+
+
+
Sections* (Comma seperated)
+
+
Graduating Year*
+
+ Select Graduating Year
+ 2020
+ 2021
+ 2022
+ 2023
+
+
+ {selectedTeachers}
+ {teacherSelector}
+
+
+ Add Class
+ Cancel
+
+
+ )
+ var courseGlance = (
+
+
+
+
+
Course Code
+
{course.code}
+
+
+
+
+
Course Name
+
{course.name}
+
+
+
+
+
Department
+
{course.department}
+
+
+
+
Pending Approval
+
+
Expand
+
+ )
+ var courseDetails = (
+
+
+
+ this.props.handleApproveCourse(this.state.course, this.state.classes)}>Approve {' '}
+ this.props.handleRejectCourse(this.state.courseID)}>Delete
+
+
+ );
+ return (
+
+
+
+ {courseGlance}
+
+ {courseDetails}
+ {addClassModal}
+
+
+
+
+ )
+ }
+}
+
+const mapStateToProps = (state) => {
+ return{
+ collegeMembers:state.collegeMembers
+ }
+}
+export default connect(mapStateToProps)(CourseCardAdmin);
\ No newline at end of file
diff --git a/client/app/components/Pages/Courses/CourseView.js b/client/app/components/Pages/Courses/CourseView.js
new file mode 100644
index 0000000..96a09cc
--- /dev/null
+++ b/client/app/components/Pages/Courses/CourseView.js
@@ -0,0 +1,240 @@
+import React, { Component } from 'react';
+import axios from 'axios';
+import { Link, Redirect } from 'react-router-dom';
+import { ToastContainer, ToastStore } from 'react-toasts';
+import CourseCard from './CourseCards/CourseCard';
+import AnchorForm from './AnchorForm';
+import ReactLoading from '../../common/Loading';
+
+class CoursesView extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ isLoading:true,
+ role: '',
+ tags: [],
+ courses: [],
+ showRequestCourse: false,
+ };
+ this.handleRequestCourse = this.handleRequestCourse.bind(this);
+ this.handleActivateCourse = this.handleActivateCourse.bind(this);
+ this.toggleRequestCourse = this.toggleRequestCourse.bind(this);
+ }
+ handleActivateCourse(course){
+ const apiPath = '/api/assignments/'+ course._id + '/createValidatedCourse';
+ const token = localStorage.getItem('token');
+ const config = {
+ headers: {
+ 'x-access-token': token,
+ }
+ }
+ axios.put(apiPath, course, config)
+ .then(res=>{
+ console.log(res);
+ ToastStore.success(res.data.message);
+ })
+ .catch(err=>{
+ console.log(err);
+ ToastStore.error(err.response.data.message);
+ })
+ }
+ handleRequestCourse(event) {
+ event.preventDefault();
+ const self = this;
+ const token = localStorage.getItem('token');
+ const apiPath = 'api/assignments/requestCourse';
+ const config = {
+ headers: {
+ 'x-access-token': token,
+ 'Content-Type': 'application/json'
+ }
+ }
+ const requestCourseFormElements = event.target.getElementsByTagName("input");
+ const requestCourseRoleElement = event.target.getElementsByTagName("select");
+ const data = Object.assign({}, self.state.course);
+ data.name = requestCourseFormElements["name"].value;
+ data.code = requestCourseFormElements["code"].value;
+ data.department = requestCourseFormElements["department"].value;
+ data.role = requestCourseRoleElement["role"].value;
+ axios.post(apiPath, data, config)
+ .then(res => {
+ console.log(res.data);
+ ToastStore.success(res.data.message);
+ setTimeout(() => {self.reload()},3000);
+ })
+ .catch(err => {
+ console.log(err);
+ ToastStore.error(err.response.data.message);
+ })
+ }
+ reload() {
+ window.location.reload()
+ }
+ toggleRequestCourse() {
+ this.setState({
+ showRequestCourse: !this.state.showRequestCourse
+ })
+ }
+ componentDidMount() {
+ var self = this;
+ var userID = localStorage.getItem('user_id');
+ var token = localStorage.getItem('token')
+
+ var apiPath = '/api/account/' + userID + '/details'
+ axios.get(apiPath, {
+ headers: {
+ 'x-access-token': token,
+ }
+ })
+ .then(function (response) {
+ if (!response.data.success) {
+ // TODO: throw appropriate error and redirect
+ console.log("Error1: " + response.data);
+ return;
+ }
+ var data = response.data;
+ self.setState({
+ _id: data.user._id,
+ role: data.user.role,
+ tags: data.user.tags
+ });
+ })
+ .catch(function (error) {
+ console.log(error);
+ if (error.response) {
+ if (error.response.status) {
+ alert("Session timed out.");
+ window.location.href = '/';
+ }
+ }
+ });
+ ///api/assignments/:userID/getValidatedCourses
+ apiPath = 'api/assignments/' + userID + '/getValidatedCourses'
+ axios.get(apiPath, {
+ headers: {
+ 'x-access-token': token,
+ 'Content-Type': 'application/json'
+ }
+ })
+ .then(function (response) {
+ if (!response.data.success) {
+ console.log("Error1: " + response.data);
+ }
+ self.setState({
+ isLoading: false,
+ })
+ const courses = response.data.courses;
+ if(courses){
+ self.setState({
+ courses: self.state.courses.concat(response.data.courses)
+ });
+ }
+ console.log(response.data);
+ })
+ .catch(function (error) {
+ console.log('Error2: ', error);
+ });
+
+ apiPath = 'api/assignments/' + userID + '/courses'
+ axios.get(apiPath, {
+ headers: {
+ 'x-access-token': token,
+ 'Content-Type': 'application/json'
+ }
+ })
+ .then(function (response) {
+ if (!response.data.success) {
+ console.log("Error1: " + response.data);
+ }
+ self.setState({
+ isLoading: false,
+ })
+ const courses = response.data.courses;
+ if(courses){
+ self.setState({
+ courses: self.state.courses.concat(response.data.courses)
+ });
+ }
+ })
+ .catch(function (error) {
+ console.log('Error2: ', error);
+ });
+ }
+ render() {
+ const requestCourseForm = (
+
+ )
+ let courses = (
+
+
Sorry, no courses found.
+
+
+ )
+ if(this.state.courses.length){
+ const self = this;
+ courses = this.state.courses.map(function (course) {
+ return (
+
+
+ )
+ })
+ }
+ const content = (
+
+
+
+
+
+ {this.state.showRequestCourse ? null : Request Course }
+ {this.state.showRequestCourse ? requestCourseForm : null}
+
+
+
+
+
+ );
+
+ if (this.state.isLoading)
+ return
;
+ else
+ return
{content}
+ }
+}
+
+export default CoursesView;
diff --git a/client/app/components/Pages/Courses/Courses.js b/client/app/components/Pages/Courses/Courses.js
deleted file mode 100644
index 765b6cf..0000000
--- a/client/app/components/Pages/Courses/Courses.js
+++ /dev/null
@@ -1,329 +0,0 @@
-import React, { Component } from 'react';
-import axios from 'axios';
-import { Link, Redirect } from 'react-router-dom';
-import CourseCard from '../Courses/CourseCard';
-import AnchorForm from './AnchorForm';
-import ReactLoading from './../../common/Loading';
-
-class CoursesAdd extends Component {
- constructor(props) {
- super(props);
- this.state = {
- isLoading: true,
- role: '',
- name: '',
- code: '',
- department: '',
- description: '',
- resourcesUrl: '',
- startDate: '',
- endDate: '',
- credits: '',
- hours: '',
- isCore: '',
- courses: [],
- profRole: '',
- professorID: '',
- classes: [],
- sections: '',
- graduating: '',
- anchorDescription: '',
- show: false,
- };
- this.onAdd = this.onAdd.bind(this);
- this.showForm = this.showForm.bind(this);
- this.closeForm = this.closeForm.bind(this);
- this.chooseProfRole = this.chooseProfRole.bind(this);
- this.chooseAnchorRole = this.chooseAnchorRole.bind(this);
- this.handleInputChange = this.handleInputChange.bind(this);
- this.handleCreditsChange = this.handleCreditsChange.bind(this);
- this.handleHoursChange = this.handleHoursChange.bind(this);
- }
-
- componentDidMount() {
-
- var self = this;
- var userID = localStorage.getItem('user_id');
- var token = localStorage.getItem('token')
-
- var apiPath = '/api/account/' + userID + '/details'
- axios.get(apiPath, {
- headers: {
- 'x-access-token': token,
- }
- })
- .then(function (response) {
- if (!response.data.success) {
- // TODO: throw appropriate error and redirect
- console.log("Error1: " + response.data);
- return;
- }
- var data = response.data;
- self.setState({
- role: data.user.role
- });
- })
- .catch(function (error) {
- console.log(error);
- if (error.response) {
- if (error.response.status) {
- alert("Session timed out.");
- window.location.href = '/';
- }
- }
- });
- ///api/assignments/:userID/courses
- var apiPath = 'api/assignments/' + userID + '/courses'
- axios.get(apiPath, {
- headers: {
- 'x-access-token': token,
- 'Content-Type': 'application/json'
- }
- }).then(function (response) {
- if (!response.data.success) {
- console.log("Error1: " + response.data);
- }
- var data = response.data;
- self.setState({ isLoading: false });
- self.setState({
- courses: self.state.courses.concat(data.courses)
- });
- console.log(response.data);
- })
- .catch(function (error) {
- console.log('Error2: ', error);
- });
- }
- handleInputChange(e) {
- this.setState({
- [e.target.name]: e.target.value
- })
- }
-
- handleCreditsChange(e) {
- this.setState({
- credits: e.target.value
- })
- }
- handleHoursChange(e) {
- this.setState({
- hours: e.target.value
- })
- }
- reload() {
- window.location.reload()
- }
-
- onAdd() {
- ///api/courses/createCourse
- var self = this;
- var userID = localStorage.getItem('user_id');
- var token = localStorage.getItem('token');
- var apiPath = 'api/assignments/createCourse';
- var config = {
- headers: {
- 'x-access-token': token,
- 'Content-Type': 'application/json'
- }
- }
- var data = Object.assign({}, self.state.course);
-
- data.name = self.state.name;
- data.code = self.state.code;
- data.department = self.state.department;
- data.description = self.state.description;
- data.resourcesUrl = self.state.resourcesUrl;
- var details = { credits: self.state.credits, hours: self.state.hours, isCore: self.state.isCore }
- data.details = details;
- var duration = { startDate: self.state.startDate, endDate: self.state.endDate }
- data.duration = duration;
- data.graduating = self.state.graduating;
- if ("prof".localeCompare(self.state.profRole) == 0) {
- data.professorID = self.state.professorID;
- data.sections = self.state.sections
- data.role = 'prof';
- console.log(data);
- axios.post(apiPath, data, config)
- .then(res => {
- console.log(res.data);
- this.reload();
- })
- .catch(err => {
- console.log(err);
- alert('Course Failed to Upload!')
- })
- }
- }
- showForm() {
- this.setState({
- show: true
- })
- }
- closeForm() {
- this.setState({
- show: false,
- profRole: ''
- })
- }
- chooseProfRole() {
- this.setState({
- profRole: 'prof'
- })
- }
- chooseAnchorRole() {
- this.setState({
- profRole: 'anchor'
- })
- }
-
-
- render() {
- let content;
- const chooseRole = (
-
- Professor
- Anchor
-
- )
-
- const professorBoxes = (
-
-
Sections*
- Professor*
-
- )
-
- const anchorBoxes = (
-
- )
-
- const anchorDescription = (
-
-
Anchor Description
-
-
- )
-
- const description = (
-
-
Course Description
-
-
- )
-
- const click = (
-
-
-
- {this.state.profRole == 'anchor' ? anchorBoxes : null}
- {this.state.profRole == 'anchor' ?
Close : null}
-
- )
-
- const profContent = (
-
-
-
- {
- this.state.courses.length < 1 &&
-
Sorry, no courses found.
- }
- {
- this.state.courses.map(function (each) {
- return
- })
- }
-
-
-
-
-
-
- {this.state.profRole == '' ? this.state.show && this.state.profRole == '' ? chooseRole : Add Course : null}
- {this.state.show && this.state.profRole != '' ? click : null}
- {this.state.show && this.state.profRole != 'anchor' ?
Submit : null}
- {this.state.show && this.state.profRole != 'anchor' ? Close : null}
-
-
-
-
-
-
-
-
- );
- const studContent = (
-
- {
- this.state.courses.length < 1 &&
-
Sorry, no courses found.
- }
- {
- this.state.courses.map(function (each) {
- return
- })
- }
-
-
- );
- if (this.state.role == "prof") {
- content = profContent;
- }
- else {
- content = studContent;
- }
- if (this.state.isLoading)
- return
;
- else
- return (
-
{content}
- );
- }
-}
-
-export default CoursesAdd;
diff --git a/client/app/components/Pages/Courses/CoursesAdminView.js b/client/app/components/Pages/Courses/CoursesAdminView.js
new file mode 100755
index 0000000..e9ee4ef
--- /dev/null
+++ b/client/app/components/Pages/Courses/CoursesAdminView.js
@@ -0,0 +1,191 @@
+import React, { Component } from 'react';
+import axios from 'axios';
+import { Link, Redirect } from 'react-router-dom';
+import { ToastContainer, ToastStore } from 'react-toasts';
+import CourseCardAdmin from './CourseCards/CourseCardAdmin';
+import AnchorForm from './AnchorForm';
+import ReactLoading from '../../common/Loading';
+import { connect } from 'react-redux';
+
+class CoursesAdminView extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ isLoading: true,
+ role: '',
+ tags: [],
+ courses: []
+ };
+ this.handleApproveCourse = this.handleApproveCourse.bind(this);
+ this.handleRejectCourse = this.handleRejectCourse.bind(this);
+ }
+ reload() {
+ window.location.reload()
+ }
+ getCollegeMemberName(user_id){
+ const token = localStorage.getItem('token');
+ return new Promise((resolve, reject) => {
+ axios.get('/api/account/'+user_id+'/info', {
+ headers: {
+ 'x-access-token': token,
+ 'Content-Type': 'application/json'
+ }
+ })
+ .then(function(response) {
+ resolve({
+ name:response.data.user.name,
+ id:user_id
+ });
+ })
+ .catch(err => {
+ reject(err);
+ })
+ })
+ }
+ handleApproveCourse(course, classes){
+ const self = this;
+ const apiPath = '/api/courseAdmin/'+ course._id + '/validate';
+ const token = localStorage.getItem('token');
+ const config = {
+ headers: {
+ 'x-access-token': token,
+ }
+ }
+ course.classes = classes;
+ axios.put(apiPath, course, config)
+ .then(res=>{
+ console.log(res);
+ ToastStore.success(res.data.message);
+ setTimeout(() => {self.reload()},2000);
+ })
+ .catch(err=>{
+ console.log(err);
+ ToastStore.error(err.response.data.message);
+ })
+ }
+ handleRejectCourse(courseID){
+ const apiPath = '/api/courseAdmin/'+ courseID + '/delete';
+ const token = localStorage.getItem('token');
+ const config = {
+ headers: {
+ 'x-access-token': token
+ }
+ }
+ axios.delete(apiPath, config)
+ .then((res) => {
+ console.log(res);
+ ToastStore.success(res.data.message);
+ })
+ .catch((err)=>{
+ console.log(err);
+ ToastStore.error(err.response.data.message);
+ })
+ }
+
+ componentDidMount() {
+ var self = this;
+ var userID = localStorage.getItem('user_id');
+ var token = localStorage.getItem('token');
+
+ // /api/courseAdmin/newCourses
+ var apiPath = '/api/courseAdmin/newCourses';
+ axios.get(apiPath, { // Fetch all course requests
+ headers: {
+ 'x-access-token': token,
+ 'Content-Type': 'application/json'
+ }
+ })
+ .then(function (response) {
+ self.setState({
+ courses: response.data.courses,
+ isLoading: false
+ });
+ })
+ .catch(function (error) {
+ console.log(error);
+ });
+ var apiPath = '/api/courseAdmin/getCollegeMembers';
+ axios.get(apiPath, { // Fetch all department members (For prof suggestions during course assigning)
+ headers: {
+ 'x-access-token': token,
+ 'Content-Type': 'application/json'
+ }
+ })
+ .then(function (response) {
+ const fetchedGroups = response.data.groups;
+ let fetchedProfMembers = fetchedGroups.find(group => group.name === "prof");
+ let fetchedStudentMembers = fetchedGroups.find(group => group.name === "students");
+ if(!fetchedProfMembers)
+ fetchedProfMembers = [];
+ else
+ fetchedProfMembers = fetchedProfMembers.members;
+ if(!fetchedStudentMembers)
+ fetchedStudentMembers = [];
+ else
+ fetchedStudentMembers = fetchedStudentMembers.members;
+ Promise.all(fetchedProfMembers.map(teacherMember => self.getCollegeMemberName(teacherMember)))
+ .then( values => {
+ const professorsObj = {}; // Key - id, value - name
+ for(const prof of values)
+ professorsObj[prof.id] = prof.name;
+ self.props.dispatch({
+ type:"FETCHED_PROFS",
+ payload:professorsObj
+ })
+ })
+ .catch(err =>{
+ console.log(err);
+ })
+ Promise.all(fetchedStudentMembers.map(student => self.getCollegeMemberName(student)))
+ .then( values => {
+ const studentsObj = {}; // Key - id, value - name
+ for(const student of values)
+ studentsObj[student.id] = student.name;
+ self.props.dispatch({
+ type:"FETCHED_STUDENTS",
+ payload:studentsObj
+ })
+ })
+ .catch(err =>{
+ console.log(err);
+ })
+ })
+ .catch(function (error) {
+ console.log(error);
+ });
+
+
+ var apiPath = '/api/account/:userID/details';
+ }
+ render() {
+ let body = (
+
+
No course requests available.
+
+
+ )
+ if(this.state.courses.length){
+ body = this.state.courses.map((course) => {
+ return(
+
+ );
+ })
+ }
+ return(
+
+ {body}
+
+ );
+ }
+}
+const mapStateToProps = (state) => {
+ return{
+ collegeMembers:state.collegeMembers
+ }
+}
+export default connect(mapStateToProps)(CoursesAdminView);
diff --git a/client/app/components/Pages/Courses/CoursesContainer.js b/client/app/components/Pages/Courses/CoursesContainer.js
new file mode 100644
index 0000000..48eec79
--- /dev/null
+++ b/client/app/components/Pages/Courses/CoursesContainer.js
@@ -0,0 +1,62 @@
+import React, {Component} from 'react';
+import axios from 'axios';
+import CoursesAdminView from './CoursesAdminView';
+import CoursesView from './CourseView';
+import Loading from '../../common/Loading'
+
+class CoursesContainer extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ role: '',
+ tags: []
+ };
+ }
+
+ componentDidMount() {
+ var self = this;
+ var userID = localStorage.getItem('user_id');
+ var token = localStorage.getItem('token')
+
+ var apiPath = '/api/account/' + userID + '/details'
+ axios.get(apiPath, {
+ headers: {
+ 'x-access-token': token,
+ }
+ })
+ .then(function (response) {
+ if (!response.data.success) {
+ // TODO: throw appropriate error and redirect
+ console.log("Error1: " + response.data);
+ return;
+ }
+ var data = response.data;
+ self.setState({
+ role: data.user.role,
+ tags: data.user.tags,
+ token:token
+ });
+ })
+ .catch(function (error) {
+ console.log(error);
+ if (error.response) {
+ if (error.response.status) {
+ alert("Session timed out.");
+ window.location.href = '/';
+ }
+ }
+ });
+ }
+ render() {
+ if(this.state.role === 'courseAdmin'){
+ return
+ }
+ else if(this.state.role!=''){
+ return
+ }
+ else{
+ return
+ }
+ }
+}
+export default CoursesContainer;
\ No newline at end of file
diff --git a/client/app/components/Signup/Signup.js b/client/app/components/Signup/Signup.js
new file mode 100755
index 0000000..d1c8099
--- /dev/null
+++ b/client/app/components/Signup/Signup.js
@@ -0,0 +1,88 @@
+import React, { Component } from 'react'
+import axios from "axios";
+import { Link, Redirect } from 'react-router-dom';
+import ReactLoading from '../common/Loading';
+import { ToastContainer, ToastStore } from 'react-toasts';
+import { Button, Label } from 'reactstrap';
+
+export default class ForgotPassword extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ isLoading: false
+ };
+ this.onSignup = this.onSignup.bind(this);
+ }
+
+ renderRedirect() {
+ if (this.state.redirect) {
+ return
+ }
+ }
+
+ onSignup(event){
+ event.preventDefault();
+ const formElements = event.target.elements;
+ console.log(formElements);
+ const firstName = formElements["firstName"].value;
+ const lastName = formElements["lastName"].value;
+ const email = formElements["emailid"].value;
+ const password = formElements["password"].value;
+ const confirmPassword = formElements["confirmPassword"].value;
+ // TODO: Add signup validation with regex
+ if(confirmPassword !== password){
+ ToastStore.error("Passwords do not match");
+ return;
+ }
+ const signupData = {
+ firstName,
+ lastName,
+ email,
+ password
+ }
+ axios.post("/api/admin/signup", signupData)
+ .then((res) => {
+ console.log(res);
+ ToastStore.success(res.data.message);
+ })
+ .catch((err) => {
+ console.log(err.response);
+ ToastStore.error(err.response.data.message);
+ })
+ }
+
+ render() {
+ return (
+
+ {this.renderRedirect()}
+
Signup
+
+
+
+ )
+ }
+}
\ No newline at end of file
diff --git a/client/app/index.js b/client/app/index.js
index e7e1fb5..be5f9c4 100644
--- a/client/app/index.js
+++ b/client/app/index.js
@@ -18,7 +18,7 @@ import Profile from '../app/components/Pages/Profile';
import PublicProfile from '../app/components/Pages/Profile/PublicProfile';
import Assignments from '../app/components/Pages/Assignments';
import Contests from '../app/components/Pages/Contests';
-import Courses from '../app/components/Pages/Courses';
+import CoursesContainer from '../app/components/Pages/Courses/CoursesContainer';
import NotFound from './components/App/NotFound';
import SignupForm from '../app/components/Admin/SignupForm';
import AssignmentAdd from '../app/components/Pages/Courses/AddAssignment'
@@ -30,7 +30,8 @@ import downloadFile from './components/Pages/Assignments/downloadFile';
import zipFiles from './components/Pages/Assignments/zipFiles';
import updateHandle from './components/Pages/Profile/UpdateHandle';
import contribute from './components/Pages/Contribute';
-import ReactLoading from './components/common/Loading'
+import ReactLoading from './components/common/Loading';
+import Signup from './components/Signup/Signup'
// import 'bootstrap/dist/css/bootstrap.min.css';
@@ -57,7 +58,7 @@ render((
-
+
@@ -77,6 +78,8 @@ render((
+
+
diff --git a/client/app/reducers/collegeMembersReducer.js b/client/app/reducers/collegeMembersReducer.js
new file mode 100644
index 0000000..e6e9dcc
--- /dev/null
+++ b/client/app/reducers/collegeMembersReducer.js
@@ -0,0 +1,32 @@
+import {FETCHED_PROFS, FETCHED_STUDENTS, CLEARED_PROFS, CLEARED_STUDENTS} from '../actions/types';
+const initialState = {
+ professors:{},
+ students:{}
+};
+
+export default function(state = initialState, action) {
+ switch (action.type) {
+ case FETCHED_PROFS:
+ return {
+ ...state,
+ professors: action.payload
+ }
+ case CLEARED_PROFS:
+ return {
+ ...state,
+ professors: {}
+ }
+ case FETCHED_STUDENTS:
+ return {
+ ...state,
+ students:action.payload
+ }
+ case CLEARED_STUDENTS:
+ return {
+ ...state,
+ students:{}
+ }
+ default:
+ return state;
+ }
+}
diff --git a/client/app/reducers/index.js b/client/app/reducers/index.js
index f7aebc6..4b6cbed 100644
--- a/client/app/reducers/index.js
+++ b/client/app/reducers/index.js
@@ -1,8 +1,10 @@
import { combineReducers } from 'redux';
import authReducer from './authReducer'
import errorReducer from './errorReducer';
+import collegeMembersReducer from './collegeMembersReducer';
export default combineReducers({
auth: authReducer,
- errors: errorReducer
+ errors: errorReducer,
+ collegeMembers: collegeMembersReducer
});
diff --git a/server/models/assignments/Course.js b/server/models/assignments/Course.js
index 5fe7b64..52b9790 100644
--- a/server/models/assignments/Course.js
+++ b/server/models/assignments/Course.js
@@ -33,6 +33,10 @@ const CourseSchema = new mongoose.Schema({
type: String,
required: true,
},
+ graduatingYearOfStudents: {
+ type: Number,
+ required: true
+ },
description: {
type: String,
},
diff --git a/server/routes/api/accountManagement.js b/server/routes/api/accountManagement.js
index 5c1c3b0..643d83b 100644
--- a/server/routes/api/accountManagement.js
+++ b/server/routes/api/accountManagement.js
@@ -531,6 +531,7 @@ module.exports = (app) => {
});
}), //end of getDetails endpoint
+ // Endpoint for getting info of other users based on userID
app.get('/api/account/:userID/info', function (req, res) {
// GET http://localhost:8080/api/account/:userID/info
var user_id = req.params.userID;
@@ -574,7 +575,8 @@ module.exports = (app) => {
delete user.createdAt;
delete user.updatedAt;
delete user._id;
-
+ delete user.tags;
+
// Return a response with user data
return res.status(200).send({
success: true,
diff --git a/server/routes/api/courseAdmin.js b/server/routes/api/courseAdmin.js
index f0045a0..3f39992 100644
--- a/server/routes/api/courseAdmin.js
+++ b/server/routes/api/courseAdmin.js
@@ -133,6 +133,7 @@ module.exports = (app) => {
newCourse.code = courseRequest.code;
newCourse.name = courseRequest.name;
newCourse.department = courseRequest.department;
+ newCourse.graduatingYearOfStudents = classDetailsObject.graduatingYearOfStudents;
classDetailsObject.class.teachingMembers.forEach(teacher => {
newCourse.class.teachingMembers.push(teacher);
})