From 0c1335389fced6834dd70ab01db2c87345ccc60f Mon Sep 17 00:00:00 2001
From: Jeremia Kimelman <jeremia.kimelman@gsa.gov>
Date: Wed, 14 Jun 2017 14:18:02 -0400
Subject: [PATCH] Remove modal from the project

Closes #903
---
 src/actions/modal.js        |  4 --
 src/components/App.js       | 10 +---
 src/components/BetaModal.js | 92 -------------------------------------
 src/reducers/index.js       |  2 -
 src/reducers/modal.js       | 14 ------
 5 files changed, 1 insertion(+), 121 deletions(-)
 delete mode 100644 src/actions/modal.js
 delete mode 100644 src/components/BetaModal.js
 delete mode 100644 src/reducers/modal.js

diff --git a/src/actions/modal.js b/src/actions/modal.js
deleted file mode 100644
index 0d9234e1..00000000
--- a/src/actions/modal.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import { MODAL_HIDE, MODAL_SHOW } from './constants'
-
-export const hideModal = () => ({ type: MODAL_HIDE })
-export const showModal = () => ({ type: MODAL_SHOW })
diff --git a/src/components/App.js b/src/components/App.js
index 4581ae38..7fb82840 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -4,7 +4,6 @@ import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 
 import BetaBanner from './BetaBanner'
-import BetaModal from './BetaModal'
 import ClearCacheBtn from './ClearCacheBtn'
 import Disclaimer from './Disclaimer'
 import Feedback from './Feedback'
@@ -13,7 +12,6 @@ import Glossary from './Glossary'
 import Header from './Header'
 import * as feedbackActions from '../actions/feedback'
 import * as glossaryActions from '../actions/glossary'
-import * as modalActions from '../actions/modal'
 
 const isProd = process.env.NODE_ENV === 'production'
 
@@ -28,12 +26,6 @@ const App = ({ actions, appState, children, dispatch, location }) => (
     <Glossary actions={actions} {...appState.glossary} />
     <Footer actions={actions} />
     {!isProd && <ClearCacheBtn />}
-    {isProd &&
-      appState.modal.isShown &&
-      <BetaModal
-        onClose={actions.hideModal}
-        onFeedbackClick={actions.showFeedback}
-      />}
     <Feedback
       isOpen={appState.feedback.isOpen}
       onClose={actions.hideFeedback}
@@ -50,7 +42,7 @@ const mapStateToProps = state => ({ appState: state })
 const mapDispatchToProps = dispatch => ({
   dispatch,
   actions: bindActionCreators(
-    { ...feedbackActions, ...glossaryActions, ...modalActions },
+    { ...feedbackActions, ...glossaryActions },
     dispatch,
   ),
 })
diff --git a/src/components/BetaModal.js b/src/components/BetaModal.js
deleted file mode 100644
index 42bcfb92..00000000
--- a/src/components/BetaModal.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import PropTypes from 'prop-types'
-import React from 'react'
-
-import OnEscape from './OnEscape'
-import FocusTrap from './FocusTrap'
-
-class BetaModal extends React.Component {
-  componentDidMount() {
-    this.triggerElement = document.activeElement || document.body
-    this.firstEl.focus()
-  }
-
-  close = () => {
-    this.triggerElement.focus()
-    this.props.onClose()
-  }
-
-  handleSubmitFeedback = () => {
-    this.close()
-    this.props.onFeedbackClick()
-  }
-
-  render() {
-    return (
-      <OnEscape handler={this.close}>
-        <FocusTrap
-          setFirstFocus={() => this.firstEl.focus()}
-          setLastFocus={() => this.lastEl.focus()}
-        >
-          <div
-            className="fixed top-0 bottom-0 left-0 right-0 flex flex-column items-center justify-center z4"
-            aria-labelledby="beta-modal-title"
-            aria-describedby="beta-modal-description"
-            role="alertdialog"
-          >
-            <div className="fixed top-0 bottom-0 left-0 right-0 bg-black-translucent" />
-            <div
-              className="m2 p3 sm-px7 sm-py5 relative bg-red white border-box overflow-scroll rounded"
-              style={{ maxWidth: 600 }}
-            >
-              <div className="center">
-                <img
-                  className="align-middle"
-                  alt="info"
-                  src="/img/info-circle.svg"
-                  width="60"
-                  height="60"
-                />
-              </div>
-              <h1
-                className="fs-24 sm-fs-32 my3 sm-mt5 sans-serif"
-                id="beta-modal-title"
-              >
-                The Crime Data Explorer site is in beta.
-              </h1>
-              <p className="m0 fs-16 sm-fs-20" id="beta-modal-description">
-                This site is a work in progress. Crime data visualizations and data
-                downloads are not meant for statisical purposes or analysis at this
-                time.
-              </p>
-              <button
-                className="btn btn-primary my4 sm-my6 mx-auto block bg-white blue btn col-10 sm-col-7"
-                onClick={this.close}
-                ref={el => (this.firstEl = el)}
-              >
-                Take me to the beta site
-              </button>
-              <div className="fs-16 sm-fs-18 center">
-                Help us make it better:{' '}
-                <br className="sm-hide md-hide lg-hide" />
-                <button
-                  className="btn p0 align-baseline"
-                  onClick={this.handleSubmitFeedback}
-                  ref={el => (this.lastEl = el)}
-                >
-                  Submit feedback
-                </button>
-              </div>
-            </div>
-          </div>
-        </FocusTrap>
-      </OnEscape>
-    )
-  }
-}
-
-BetaModal.propTypes = {
-  onClose: PropTypes.func.isRequired,
-  onFeedbackClick: PropTypes.func.isRequired,
-}
-
-export default BetaModal
diff --git a/src/reducers/index.js b/src/reducers/index.js
index dc4aaa22..5a1bc599 100644
--- a/src/reducers/index.js
+++ b/src/reducers/index.js
@@ -5,7 +5,6 @@ import agencies from './agencies'
 import feedback from './feedback'
 import filters from './filters'
 import glossary from './glossary'
-import modal from './modal'
 import nibrs from './nibrs'
 import sidebar from './sidebar'
 import summaries from './summary'
@@ -16,7 +15,6 @@ export default combineReducers({
   feedback,
   filters,
   glossary,
-  modal,
   nibrs,
   sidebar,
   summaries,
diff --git a/src/reducers/modal.js b/src/reducers/modal.js
deleted file mode 100644
index a331bf67..00000000
--- a/src/reducers/modal.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { MODAL_HIDE, MODAL_SHOW } from '../actions/constants'
-
-const initialState = { isShown: true }
-
-export default (state = initialState, action) => {
-  switch (action.type) {
-    case MODAL_HIDE:
-      return { ...state, isShown: false }
-    case MODAL_SHOW:
-      return { ...state, isShown: true }
-    default:
-      return state
-  }
-}