Feat grade report

gulpfile.js

@@ -46,7 +46,7 @@ const compileReact = (rootFile, outputName, watch) => {
                 })
                 .pipe(source(`${outputName}.js`))
                 .pipe(buffer())
-                .pipe(uglifyes()) //Working but disabled for useful testing info
+                //.pipe(uglifyes()) //Working but disabled for useful testing info
                 .pipe(gulp.dest('./.build/static'))
                 .on('end', function(){
                     console.log('-> Done rebundling React. Ready to go.');

package.json

@@ -5,7 +5,7 @@
   "main": "server.js",
   "engine": "node 5.6.0",
   "scripts": {
-    "start": "gulp",
+    "start": "gulp --host 0.0.0.0",
     "create-route": "gulp create-route",
     "lint": "eslint . --fix",
     "babel-node": "babel-node --plugins transform-flow-strip-types",
@@ -17,9 +17,10 @@
     "@tinymce/tinymce-react": "^2.2.5",
     "async": "^2.6.1",
     "axios": "^0.18.0",
+    "babel-code-frame": "^6.26.0",
     "bleach": "^0.3.0",
     "body-parser": "^1.18.3",
-    "connect-redis": "^3.3.3",
+    "connect-redis": "^3.4.2",
     "cookie-parser": "^1.4.3",
     "crypto-js": "^3.1.8",
     "csv-parse": "^2.5.0",
@@ -30,18 +31,20 @@
     "express-session": "^1.15.6",
     "flat-to-nested": "^1.1.0",
     "form-data": "^2.3.2",
-    "generate-password": "^1.4.0",
+    "generate-password": "^1.4.1",
     "handlebars-dateformat": "^1.1.1",
     "http": "^0.0.0",
     "https": "^1.0.0",
     "i18n": "^0.8.3",
     "interweave": "^8.1.0",
-    "lodash": "^4.17.10",
+    "lodash": "^4.17.11",
     "moment": "^2.22.2",
     "multer": "^1.3.0",
     "mv": "^2.1.1",
-    "npm": "^6.1.0",
+    "natives": "^1.1.6",
+    "npm": "^6.8.0",
     "prop-types": "^15.6.2",
+    "psl": "^1.1.31",
     "rc-tooltip": "^3.7.2",
     "react": "^16.4.1",
     "react-addons-shallow-compare": "^15.6.2",
@@ -52,6 +55,7 @@
     "react-confirm": "^0.1.17",
     "react-confirm-bootstrap": "^5.3.0",
     "react-confirm-dialog": "^1.0.5",
+    "react-contextmenu": "^2.9.3",
     "react-date": "^2.0.0",
     "react-datepicker": "^1.5.0",
     "react-dates": "^17.0.0",
@@ -68,6 +72,7 @@
     "react-quill": "^1.3.0",
     "react-radio-group": "^3.0.3",
     "react-rater": "^5.0.1",
+    "react-responsive-modal": "^3.5.1",
     "react-router": "^4.3.1",
     "react-scroll-to-component": "^1.0.2",
     "react-select": "^1.2.1",
@@ -79,13 +84,15 @@
     "react-transition-group": "^2.3.1",
     "react-ux-password-field": "git+https://github.com/alanRom/react-ux-password-field.git",
     "reactable": "^1.0.2",
+    "reactjs-popup": "^1.3.2",
     "redis": "^2.8.0",
     "redux": "^4.0.0",
     "request": "^2.87.0",
     "run-sequence": "^2.2.1",
     "serialize-javascript": "^1.5.0",
     "tinymce": "^4.7.13",
-    "tree-model": "^1.0.7"
+    "tree-model": "^1.0.7",
+    "upath": "^1.1.0"
   },
   "devDependencies": {
     "autoprefixer": "^8.6.3",
@@ -114,11 +121,11 @@
     "babel-preset-stage-0": "^6.24.1",
     "babel-preset-stage-1": "^6.24.1",
     "babelify": "^8.0.0",
-    "browserify": "^16.2.2",
+    "browserify": "^16.2.3",
     "del": "^3.0.0",
-    "eslint": "^5.0.0",
+    "eslint": "^5.14.1",
     "eslint-config-airbnb": "^17.0.0",
-    "eslint-plugin-import": "^2.12.0",
+    "eslint-plugin-import": "^2.16.0",
     "eslint-plugin-jsx-a11y": "^6.0.3",
     "eslint-plugin-react": "^7.9.1",
     "flow-bin": "^0.75.0",
@@ -129,21 +136,22 @@
     "gulp-file": "^0.4.0",
     "gulp-flowtype": "^1.0.0",
     "gulp-install": "^1.1.0",
-    "gulp-nodemon": "^2.2.1",
+    "gulp-nodemon": "^2.4.2",
     "gulp-postcss": "^7.0.1",
     "gulp-replace": "^1.0.0",
     "gulp-sass": "^4.0.1",
     "gulp-uglify": "^3.0.0",
     "gulp-uglify-es": "^1.0.4",
     "inquirer": "^6.0.0",
-    "node-sass": "^4.9.0",
-    "nodemon": "^1.17.5",
+    "node-sass": "^4.13.1",
+    "nodemon": "^1.18.10",
     "pre-commit": "^1.2.2",
     "react-treeview": "^0.4.7",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0",
     "watch-lessc": "^0.0.3",
-    "watchify": "^3.11.0",
+    "watchify": "^3.11.1",
+    "webpack": "^4.29.5",
     "yargs": "^11.0.0"
   }
 }

react/about/about-container.js

@@ -1,5 +1,6 @@
 import React, { Component } from 'react'; //import the React library and the Component class from the react package
 import OrganizationSelector from './organization-selector';
+import strings from "./strings"
 
 class AboutContainer extends Component { //create a class for the component
     //it will be called in the main.js file under /react
@@ -11,36 +12,21 @@ class AboutContainer extends Component { //create a class for the component
     }
 
     render(){
-        let strings = {      // define all your strings in an object like this one (the name of the keys can be anything)
-            // we use this for translation
-            TitleString: 'Participatory Learning',
-            Sentence0: 'Traditionally, students only solve problems. In the Participatory Learning system, students learn so much more by engaging with more stages of an assignment.',
-            Sentence1: 'Here\'s the default process you\'ll follow, though this may vary among assignments. Everything shows as anonymous:',
-            Step0: 'Each student creates a problem according to the instructions',
-            Step1: 'The instructor optionally edits the problem to ensure quality',
-            Step2: 'Another student solves the problem',
-            Step3: 'Two students grade the solution, including the problem creator',
-            Step4: 'If the graders disagree, another student resolves the grade',
-            Step5: 'Optionally, the problem solver can dispute the grade',
-            Step6: 'The instructor resolves any disputes',
-            Step7: 'Students can see everything their peers have done anonymously',
-            SectionTitle0: 'Developers',
-            SectionTitle1: 'Contact',
-            SubTitle0: 'Version 1 - 2014 (CLASS System)',
-            SubTitle1: 'Spring Capstone 2016',
-            SubTitle2: 'Summer 2016',
-            SubTitle3: 'Fall Capstone 2016',
-            SubTitle4: 'Spring Capstone 2017',
-            SubTitle5: 'Summer 2017',
-            SubTitle8: 'Fall 2017',
-            SubTitle9: 'Spring 2018',
-            SubTitle6: 'For technical assistance please contact:',
-            SubTitle7: 'For information about Participatory Learning Research or using this for your own courses, please contact:'
-
-        };
+
 
 
         let studentData = [
+            {
+                semesterTitle: strings.SubTitle10,
+                topPerformers: ["Brandon Caton (2017-2019)", "Jimmy Lu (2016-2019)",
+                 "Alan Romano (2016-2018)", "Michael Raman (2017-2019)", "Erick Sanchez Suasnabar (2013-)"],
+                contributors: [],
+            },
+            {
+                semesterTitle: strings.SubTitle11,
+                topPerformers: ["Zelin Chen (2018-)", "Joseph Chiou (2017-)", "Jinghui Jiang (2017-2018)", "Shyam Mehta (2018-)"],
+                contributors: []
+            },
             {
                 semesterTitle: strings.SubTitle0,
                 topPerformers: [],
@@ -53,13 +39,13 @@ class AboutContainer extends Component { //create a class for the component
             },
             {
                 semesterTitle: strings.SubTitle2,
-                topPerformers: ['Jimmy Lu','Alan Romano'],
+                topPerformers: [],
                 contributors: ['Krzysztof Andres','Maia Iyer','Jason Gong']
             },
             {
                 semesterTitle: strings.SubTitle3,
-                topPerformers: ['Jonathan Vidal','Angelica Llerena'],
-                contributors: []
+                topPerformers: ['Jonathan Vidal'],
+                contributors: ['Angelica Llerena']
             },
             {
                 semesterTitle: strings.SubTitle4,
@@ -68,19 +54,19 @@ class AboutContainer extends Component { //create a class for the component
             },
             {
                 semesterTitle: strings.SubTitle5,
-                topPerformers: ['Michael Raman', 'Allen Jiang', 'Amadou Barry'],
-                contributors: ['Roshni Dhanasekar','Sean Leary', 'Joseph Chiou', 'Sohail Mansuri', 'Jinghui Jiang', 'Anuradha Naik']
+                topPerformers: ['Allen Jiang', 'Amadou Barry', 'Roshni Dhanasekar', 'Sean Leary'],
+                contributors: ['Sohail Mansuri',  'Anuradha Naik']
             },
             {
                 semesterTitle: strings.SubTitle8,
-                topPerformers: ['Brandon Caton'],
-                contributors: ['Jonpierre Grajales']
+                topPerformers: [],
+                contributors: ['Jonpierre Grajales (evaluator)']
             },
             {
                 semesterTitle: strings.SubTitle9,
                 topPerformers: ['Jerrod Ransom', 'Mateusz Stolarz','Shantanu Sharma', 'Aravind Narayan'],
-                contributors: ['Vaishnavi Reddy Adapala', 'Arun Somasundaram','Zelin Chen']
-            }
+                contributors: ['Vaishnavi Reddy Adapala', 'Arun Somasundaram']
+            },        
         ];
 
         return (
@@ -94,31 +80,37 @@ class AboutContainer extends Component { //create a class for the component
                             <p>{strings.Sentence1}</p>
 
                             <ul>
-                                <li><i className="fa fa-check icon" style={{paddingRight: 5}}></i><p>{strings.Step0}</p></li>
-                                <li><i className="fa fa-check icon" style={{paddingRight: 5}}></i><p>{strings.Step1}</p></li>
-                                <li><i className="fa fa-check icon" style={{paddingRight: 5}}></i><p>{strings.Step2}</p></li>
-                                <li><i className="fa fa-check icon" style={{paddingRight: 5}}></i><p>{strings.Step3}</p></li>
-                                <li><i className="fa fa-check icon" style={{paddingRight: 5}}></i><p>{strings.Step4}</p></li>
-                                <li><i className="fa fa-check icon" style={{paddingRight: 5}}></i><p>{strings.Step5}</p></li>
-                                <li><i className="fa fa-check icon" style={{paddingRight: 5}}></i><p>{strings.Step6}</p></li>
-                                <li><i className="fa fa-check icon" style={{paddingRight: 5}}></i><p>{strings.Step7}</p></li>
+                                <li><span ><i className="fa fa-check icon"></i></span>{strings.Step0}</li>
+                                <li><span ><i className="fa fa-check icon"></i></span>{strings.Step1}</li>
+                                <li><span ><i className="fa fa-check icon"></i></span>{strings.Step2}</li>
+                                <li><span ><i className="fa fa-check icon"></i></span>{strings.Step3}</li>
+                                <li><span ><i className="fa fa-check icon"></i></span>{strings.Step4}</li>
+                                <li><span ><i className="fa fa-check icon"></i></span>{strings.Step5}</li>
+                                <li><span ><i className="fa fa-check icon"></i></span>{strings.Step6}</li>
+                                <li><span ><i className="fa fa-check icon"></i></span>{strings.Step7}</li>
                             </ul>
                             <img src={'../../static/images/process-figure.png'} style={{width: '100%'}} />
                         </div>
                     </div>
                 </div>
                 <div className="developers-section">
-                    <h2>{strings.SectionTitle0}</h2>
+                    <div className="section" style={{minWidth: "95%"}}>
+                        <h2 className="title">{strings.SectionTitle0}</h2>
+                    </div>
                     {
                         studentData.map( semesterData => {
                             const topPerformerList = semesterData.topPerformers.map(
-                                student => <li><b style={{fontWeight: '600'}}>{student}</b></li>
+                                student => <li key={student}><b 
+                                    style={{fontWeight: '600'}}
+                                    >
+                                        {student}
+                                    </b></li>
                             );
 
                             const contributorList = semesterData.contributors.map(
-                                student => <li>{student}</li>
+                                student => <li key={student}>{student}</li>
                             );
-                            return <div className="section">
+                            return <div className="section" key={semesterData.semesterTitle}>
                                 <h2 className="title" style={{width: '75%'}}>{semesterData.semesterTitle}</h2>
                                 <div className="section-content" >
                                     <ul>
@@ -132,8 +124,11 @@ class AboutContainer extends Component { //create a class for the component
                 </div>
 
                 <div className="contact-section">
-                    <h2>{strings.SectionTitle1}</h2>
-                    <div className="section">
+                    <div className="section" style={{minWidth: "95%"}}>
+                        <h2 className="title">{strings.SectionTitle1}</h2>
+                    </div>
+
+                    {/* <div className="section">
                         <h2 className="title" style={{width: '80%'}}>{strings.SubTitle6}</h2>
                         <div className="section-content">
 
@@ -142,7 +137,7 @@ class AboutContainer extends Component { //create a class for the component
                 			/>
 
                         </div>
-                    </div>
+                    </div> */}
 
                     <div className="section">
                         <h2 className="title" style={{width: '80%'}}>{strings.SubTitle7}</h2>

react/about/strings.js

@@ -0,0 +1,30 @@
+export default {      // define all your strings in an object like this one (the name of the keys can be anything)
+    // we use this for translation
+    TitleString: 'Participatory Learning',
+    Sentence0: 'Traditionally, students only solve problems. In the Participatory Learning system, students learn so much more by engaging with more stages of an assignment.',
+    Sentence1: 'Here\'s the default process you\'ll follow, though this may vary among assignments. Everything shows as anonymous:',
+    Step0: 'Each student creates a problem according to the instructions',
+    Step1: 'The instructor optionally edits the problem to ensure quality',
+    Step2: 'Another student solves the problem',
+    Step3: 'Two students grade the solution, including the problem creator',
+    Step4: 'If the graders disagree, another student resolves the grade',
+    Step5: 'Optionally, the problem solver can dispute the grade',
+    Step6: 'The instructor resolves any disputes',
+    Step7: 'Students can see everything their peers have done anonymously',
+    SectionTitle0: 'Developers (key contributors shown in boldface)',
+    SectionTitle1: 'Contact',
+    SubTitle0: 'Version 1 - 2014 (CLASS System)',
+    SubTitle1: 'Spring Capstone 2016',
+    SubTitle2: 'Summer 2016',
+    SubTitle3: 'Fall Capstone 2016',
+    SubTitle4: 'Spring Capstone 2017',
+    SubTitle5: 'Summer 2017',
+    SubTitle8: 'Fall 2017',
+    SubTitle9: 'Spring 2018',
+    SubTitle6: 'For technical assistance please contact:',
+    // For information about Participatory Learning Research or using this for your own courses, please contact:
+    SubTitle7: 'For technical assistance, and information about…',
+    SubTitle10: "Core Devolopment Team",
+    SubTitle11: "Evaluation Team"
+
+};