Merge pull request #79 from googleinterns/fix-react-bootstrap-version

Fix react-bootstrap Error for AccordianCollapseProps.
googleinterns · Jul 17, 2020 · 6714f05 · 6714f05
2 parents 7c4ba9d + 53d7a6e
commit 6714f05
Show file tree

Hide file tree

Showing 3 changed files with 689 additions and 22 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -9,7 +9,7 @@
     "bootstrap": "^4.5.0",
     "firebase": "^7.15.5",
     "react": "^16.13.1",
-    "react-bootstrap": "^1.0.1",
+    "react-bootstrap": "1.0.1",
     "react-dom": "^16.13.1",
     "react-firebaseui": "^4.1.0",
     "react-router-dom": "^5.2.0",

diff --git a/frontend/src/components/ViewActivities/activityday.js b/frontend/src/components/ViewActivities/activityday.js
@@ -4,8 +4,8 @@ import * as activityFns from './activityfns.js';
 import * as time from '../Utils/time.js'
 
 /**
- * One single day of activities. 
- * 
+ * One single day of activities.
+ *
  * @param {Object} props This component expects the following props:
  * - `activities` The list of activities for "today".
  * - `date` The date, formatted as "MM/DD/YYYY".
@@ -16,7 +16,7 @@ class ActivityDay extends React.Component {
     const sortedActivities = Array.from(this.props.activities)
           .sort(activityFns.compareActivities);
     let date = new Date(this.props.date);
-    let id = date.getTime();
+    // let id = date.getTime();
     return (
       <div className='activity-day'>
         <h4>{time.timestampToDateFormatted(date.getTime())}</h4>