Merge pull request #92 from CalPolyDnD/final

Final
CalPolyDnD · Jun 4, 2019 · 695eb0c · 695eb0c
2 parents f9303b4 + 01c3fe6
commit 695eb0c
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 10 deletions.
diff --git a/Documents/Sprint9Issues.pdf b/Documents/Sprint9Issues.pdf
diff --git a/Documents/Sprint9Report.pdf b/Documents/Sprint9Report.pdf
diff --git a/dmsite/backend/dmsite/db_manager/db_manager.py b/dmsite/backend/dmsite/db_manager/db_manager.py
@@ -4,7 +4,6 @@
 from decimal import Decimal
 import pandas as pd
 
-
 dynamo_client = boto3.client('dynamodb', region_name='us-east-1', endpoint_url="http://dynamodb.us-east-1.amazonaws.com")
 dynamodb = boto3.resource('dynamodb', region_name='us-east-1', endpoint_url="http://dynamodb.us-east-1.amazonaws.com")
 ERR_STR = "There was an error trying to access the AWS database. See 'errorStr' for details."

diff --git a/dmsite/backend/dmsite/post_requests/files.py b/dmsite/backend/dmsite/post_requests/files.py
@@ -24,11 +24,10 @@ def find_files(data):
 
 @csrf_exempt
 def download_file(request):
-    print('top of download_file')
     if request.method == 'POST':
         try:
             requestBody = json.loads(str(request.body, encoding='utf8'))
-            data = db.scan('classifications', 'campaign', request['campaign_name'])
+            data = db.scan('classifications', 'campaign', requestBody['campaign_name'])
             if 'Items' not in data:
                 return JsonResponse({"error": data['errorStr']}, status=400)
             formattedResponse = formatClassificationJson(data['Items'])

diff --git a/dmsite/frontend/src/Authentication/NewAccountTextField.jsx b/dmsite/frontend/src/Authentication/NewAccountTextField.jsx
@@ -56,7 +56,7 @@ class NewAccountTextField extends React.Component {
     compareToFirstPassword = (rule, value, callback) => {
       const { form } = this.props;
       if (value && value !== form.getFieldValue('password')) {
-        callback('The two passwords you entered are inconsistent');
+        callback('The two passwords you entered don\'t match!');
       } else {
         callback();
       }

diff --git a/dmsite/frontend/src/ClassificationPage/ClassificationTable.jsx b/dmsite/frontend/src/ClassificationPage/ClassificationTable.jsx
@@ -39,7 +39,7 @@ class ClassificationTable extends React.Component {
       columnStr += columns[columns.length - 1];
 
       return (
-        <p style={{ margin: '5px', paddingLeft: '30px',  color: '#898989' }}>
+        <p style={{ margin: '5px', paddingLeft: '30px',  color: '#d6d7d8' }}>
           Column: {columnStr}
         </p>
       );
@@ -48,7 +48,7 @@ class ClassificationTable extends React.Component {
   renderClassificationExamples(examples) {
     return examples.map(example => (
       <div style={{ height: '100%', justifyContent: 'center', alignItems: 'center'}}>
-        <p style={{ margin: '5px', paddingLeft: '30px',  color: '#898989' }}>
+        <p style={{ margin: '5px', paddingLeft: '30px',  color: '#d6d7d8' }}>
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{`${example}`}
         </p>
       </div>

diff --git a/dmsite/frontend/src/ClassificationPage/ClassificationUnknown.jsx b/dmsite/frontend/src/ClassificationPage/ClassificationUnknown.jsx
@@ -40,7 +40,7 @@ class Unknown extends React.Component {
     renderExamples(classification) {    
         return classification.examples.map(example => (
           <div style={{ height: '100%', justifyContent: 'center', alignItems: 'center'}}>
-            <p style={{ margin: '5px', paddingLeft: '30px',  color: '#898989' }}>
+            <p style={{ margin: '5px', paddingLeft: '30px',  color: '#d6d7d8' }}>
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{`${example}`}
             </p>
           </div>
@@ -78,7 +78,7 @@ class Unknown extends React.Component {
                         isOpen={cell === index}
                         style={{backgroundColor: '#3d3d3d' }}
                     >
-                    <p style={{ margin: '5px', paddingLeft: '30px',  color: '#898989' }}>
+                    <p style={{ margin: '5px', paddingLeft: '30px',  color: '#d6d7d8' }}>
                       Examples:
                     </p>
                     {this.renderExamples(classification)}

diff --git a/dmsite/frontend/src/EditClassifications/EditPage.jsx b/dmsite/frontend/src/EditClassifications/EditPage.jsx
@@ -59,7 +59,7 @@ class EditClassifications extends React.Component {
     renderExamples(classification) {
         return classification.examples.map(example => (
           <div style={{ height: '100%', justifyContent: 'center', alignItems: 'center'}}>
-            <p style={{ margin: '5px', paddingLeft: '30px',  color: '#898989' }}>
+            <p style={{ margin: '5px', paddingLeft: '30px',  color: '#d6d7d8' }}>
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{`${example}`}
             </p>
           </div>
@@ -84,7 +84,7 @@ class EditClassifications extends React.Component {
                         isOpen={cell === index}
                         style={{backgroundColor: '#3d3d3d' }}
                     >
-                    <p style={{ margin: '5px', paddingLeft: '30px',  color: '#898989' }}>
+                    <p style={{ margin: '5px', paddingLeft: '30px',  color: '#d6d7d8' }}>
                       Examples:
                     </p>
                     {this.renderExamples(classification)}