Merge pull request #118 from usdevs/cheryl/add-ctph-calendar-alert

Add CTPH calendar change alert
usdevs · Jan 6, 2020 · 45d1469 · 45d1469
2 parents 469b801 + ed30b08
commit 45d1469
Show file tree

Hide file tree

Showing 38 changed files with 82 additions and 153 deletions.
diff --git a/package.json b/package.json
@@ -65,6 +65,7 @@
     "redux-firestore": "^0.8.0",
     "styled-components": "^3.3.3",
     "typography": "^0.16.17",
+    "yarn": "^1.21.1",
     "yup": "^0.27.0"
   },
   "scripts": {

diff --git a/src/components/Events/Calendar/EventCalendar.js b/src/components/Events/Calendar/EventCalendar.js
@@ -206,10 +206,5 @@ const mapStateToProps = state => {
 
 export default compose(
   firebaseConnect(),
-  connect(
-    mapStateToProps,
-    null,
-    null,
-    areStatesEqual
-  )
+  connect(mapStateToProps, null, null, areStatesEqual)
 )(EventCalendar)
diff --git a/src/components/Events/CreateEvent.js b/src/components/Events/CreateEvent.js
@@ -63,8 +63,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(CreateEvent)
+  compose(firebaseConnect(), connect(mapStateToProps))(CreateEvent)
 )
diff --git a/src/components/Events/CtphAlert.js b/src/components/Events/CtphAlert.js
@@ -0,0 +1,22 @@
+import React, { useState } from 'react'
+import { Alert } from 'reactstrap'
+
+const CtphAlert = props => {
+  const [visible, setVisible] = useState(true)
+
+  const onDismiss = () => setVisible(false)
+
+  return (
+    <Alert color="primary" isOpen={visible} toggle={onDismiss}>
+      <div className="text-center">
+        Looking for CTPH bookings? They have been temporarily moved.{' '}
+        <a href="https://bit.ly/ctphbookings" className="alert-link">
+          Click here for the latest CTPH bookings!
+        </a>
+        !
+      </div>
+    </Alert>
+  )
+}
+
+export default CtphAlert
diff --git a/src/components/Events/EditEvent.js b/src/components/Events/EditEvent.js
@@ -152,8 +152,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(EditEvent)
+  compose(firebaseConnect(), connect(mapStateToProps))(EditEvent)
 )
diff --git a/src/components/Events/EventForm.js b/src/components/Events/EventForm.js
@@ -426,7 +426,4 @@ const mapStateToProps = state => {
   }
 }
 
-export default compose(
-  firebaseConnect(),
-  connect(mapStateToProps)
-)(EventForm)
+export default compose(firebaseConnect(), connect(mapStateToProps))(EventForm)
diff --git a/src/components/Events/Events.js b/src/components/Events/Events.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react'
 import { Container, Row, Col, Button } from 'reactstrap'
 import { headerEvent as header } from '../../resources/images.js'
+import CtphAlert from './CtphAlert'
 import EventCalendar from './Calendar/EventCalendar'
 import FontAwesomeIcon from '@fortawesome/react-fontawesome'
 import CreateEventButton from '../reusable/CreateEventButton.js'
@@ -23,6 +24,11 @@ class Events extends Component {
             <img src={header} className="img-fluid" alt="header" />
           </Col>
         </Row>
+        <Row>
+          <Col sm="12">
+            <CtphAlert />
+          </Col>
+        </Row>
         <Row>
           <Col>
             <div className="d-flex">

diff --git a/src/components/Events/ManageEvents.js b/src/components/Events/ManageEvents.js
@@ -279,8 +279,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(ManageEvents)
+  compose(firebaseConnect(), connect(mapStateToProps))(ManageEvents)
 )
diff --git a/src/components/Events/Spaces.js b/src/components/Events/Spaces.js
@@ -3,6 +3,7 @@ import { Container, Row, Col } from 'reactstrap'
 import { headerSpaces as header } from '../../resources/images.js'
 import EventCalendar from './Calendar/EventCalendar'
 import CreateEventButton from '../reusable/CreateEventButton.js'
+import CtphAlert from './CtphAlert'
 
 class Spaces extends Component {
   render() {
@@ -13,6 +14,11 @@ class Spaces extends Component {
             <img src={header} className="img-fluid" alt="header" />
           </Col>
         </Row>
+        <Row>
+          <Col sm="12">
+            <CtphAlert />
+          </Col>
+        </Row>
         <Row>
           <Col>
             <div className="d-flex">

diff --git a/src/components/General/Dashboard.js b/src/components/General/Dashboard.js
@@ -367,8 +367,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(Dashboard)
+  compose(firebaseConnect(), connect(mapStateToProps))(Dashboard)
 )
diff --git a/src/components/General/Feedback.js b/src/components/General/Feedback.js
@@ -61,8 +61,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(Feedback)
+  compose(firebaseConnect(), connect(mapStateToProps))(Feedback)
 )
diff --git a/src/components/General/Home.js b/src/components/General/Home.js
@@ -153,8 +153,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(Home)
+  compose(firebaseConnect(), connect(mapStateToProps))(Home)
 )
diff --git a/src/components/Groups/CircleForm.js b/src/components/Groups/CircleForm.js
@@ -244,7 +244,4 @@ const mapStateToProps = state => {
   }
 }
 
-export default compose(
-  firebaseConnect(),
-  connect(mapStateToProps)
-)(CircleForm)
+export default compose(firebaseConnect(), connect(mapStateToProps))(CircleForm)
diff --git a/src/components/Groups/EditGroup.js b/src/components/Groups/EditGroup.js
@@ -160,8 +160,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(EditGroup)
+  compose(firebaseConnect(), connect(mapStateToProps))(EditGroup)
 )
diff --git a/src/components/Groups/Group.js b/src/components/Groups/Group.js
@@ -240,8 +240,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(Group)
+  compose(firebaseConnect(), connect(mapStateToProps))(Group)
 )
diff --git a/src/components/Groups/GroupAdmin.js b/src/components/Groups/GroupAdmin.js
@@ -53,8 +53,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(GroupAdmin)
+  compose(firebaseConnect(), connect(mapStateToProps))(GroupAdmin)
 )
diff --git a/src/components/Groups/GroupGrid.js b/src/components/Groups/GroupGrid.js
@@ -59,7 +59,4 @@ const mapStateToProps = state => {
   }
 }
 
-export default compose(
-  firebaseConnect(),
-  connect(mapStateToProps)
-)(GroupGrid)
+export default compose(firebaseConnect(), connect(mapStateToProps))(GroupGrid)
diff --git a/src/components/Groups/Groups.js b/src/components/Groups/Groups.js
@@ -151,8 +151,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(Groups)
+  compose(firebaseConnect(), connect(mapStateToProps))(Groups)
 )
diff --git a/src/components/Groups/ManageGroups.js b/src/components/Groups/ManageGroups.js
@@ -69,8 +69,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(ManageGroups)
+  compose(firebaseConnect(), connect(mapStateToProps))(ManageGroups)
 )
diff --git a/src/components/InterestGroups/ManageInterestGroups.js b/src/components/InterestGroups/ManageInterestGroups.js
@@ -68,8 +68,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(ManageGroups)
+  compose(firebaseConnect(), connect(mapStateToProps))(ManageGroups)
 )
diff --git a/src/components/IntlProgs/CreateIntlProg.js b/src/components/IntlProgs/CreateIntlProg.js
@@ -61,8 +61,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(CreateIntlProg)
+  compose(firebaseConnect(), connect(mapStateToProps))(CreateIntlProg)
 )
diff --git a/src/components/IntlProgs/CreateIntlProgReview.js b/src/components/IntlProgs/CreateIntlProgReview.js
@@ -61,8 +61,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(CreateIntlProgReview)
+  compose(firebaseConnect(), connect(mapStateToProps))(CreateIntlProgReview)
 )
diff --git a/src/components/IntlProgs/IntlProg.js b/src/components/IntlProgs/IntlProg.js
@@ -224,8 +224,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(IntlProg)
+  compose(firebaseConnect(), connect(mapStateToProps))(IntlProg)
 )
diff --git a/src/components/IntlProgs/IntlProgs.js b/src/components/IntlProgs/IntlProgs.js
@@ -51,8 +51,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(IntlProgs)
+  compose(firebaseConnect(), connect(mapStateToProps))(IntlProgs)
 )
diff --git a/src/components/Modules/AddReview.js b/src/components/Modules/AddReview.js
@@ -126,8 +126,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(AddReview)
+  compose(firebaseConnect(), connect(mapStateToProps))(AddReview)
 )
diff --git a/src/components/Modules/EditReview.js b/src/components/Modules/EditReview.js
@@ -209,8 +209,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(EditReview)
+  compose(firebaseConnect(), connect(mapStateToProps))(EditReview)
 )
diff --git a/src/components/Modules/ManageReviews.js b/src/components/Modules/ManageReviews.js
@@ -75,8 +75,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(ManageReviews)
+  compose(firebaseConnect(), connect(mapStateToProps))(ManageReviews)
 )
diff --git a/src/components/Modules/Module.js b/src/components/Modules/Module.js
@@ -88,8 +88,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(Module)
+  compose(firebaseConnect(), connect(mapStateToProps))(Module)
 )
diff --git a/src/components/Modules/ModuleAdmin.js b/src/components/Modules/ModuleAdmin.js
@@ -92,7 +92,4 @@ const mapStateToProps = state => {
   }
 }
 
-export default compose(
-  firebaseConnect(),
-  connect(mapStateToProps)
-)(ModuleAdmin)
+export default compose(firebaseConnect(), connect(mapStateToProps))(ModuleAdmin)
diff --git a/src/components/Modules/Modules.js b/src/components/Modules/Modules.js
@@ -190,8 +190,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(Modules)
+  compose(firebaseConnect(), connect(mapStateToProps))(Modules)
 )
diff --git a/src/components/Users/ProfileForm.js b/src/components/Users/ProfileForm.js
@@ -177,7 +177,4 @@ const mapStateToProps = state => {
   }
 }
 
-export default compose(
-  firebaseConnect(),
-  connect(mapStateToProps)
-)(ProfileForm)
+export default compose(firebaseConnect(), connect(mapStateToProps))(ProfileForm)
diff --git a/src/components/Users/Settings.js b/src/components/Users/Settings.js
@@ -109,8 +109,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(Settings)
+  compose(firebaseConnect(), connect(mapStateToProps))(Settings)
 )
diff --git a/src/components/reusable/CreateEventButton.js b/src/components/reusable/CreateEventButton.js
@@ -34,8 +34,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(CreateEventButton)
+  compose(firebaseConnect(), connect(mapStateToProps))(CreateEventButton)
 )
diff --git a/src/components/reusable/GroupAutocomplete.js b/src/components/reusable/GroupAutocomplete.js
@@ -222,8 +222,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(GroupAutocomplete)
+  compose(firebaseConnect(), connect(mapStateToProps))(GroupAutocomplete)
 )
diff --git a/src/components/reusable/IntlProgAutocomplete.js b/src/components/reusable/IntlProgAutocomplete.js
@@ -216,8 +216,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(GroupAutocomplete)
+  compose(firebaseConnect(), connect(mapStateToProps))(GroupAutocomplete)
 )
diff --git a/src/components/reusable/UserForm.js b/src/components/reusable/UserForm.js
@@ -190,8 +190,5 @@ const mapStateToProps = state => {
 }
 
 export default withRouter(
-  compose(
-    firebaseConnect(),
-    connect(mapStateToProps)
-  )(UserForm)
+  compose(firebaseConnect(), connect(mapStateToProps))(UserForm)
 )
diff --git a/src/firestore/EventsClient.js b/src/firestore/EventsClient.js
@@ -146,7 +146,10 @@ export function getEventVenueBookingsAfter(
   firestore
     .get({
       collection: 'events',
-      where: [['endDate', '>=', date.toDate()], ['venue', '==', venueID]],
+      where: [
+        ['endDate', '>=', date.toDate()],
+        ['venue', '==', venueID]
+      ],
       orderBy: ['endDate'],
       storeAs: alias
     })