diff --git a/api/schema.js b/api/schema.js index fcd1c1189f..0adb29cdb0 100644 --- a/api/schema.js +++ b/api/schema.js @@ -153,13 +153,4 @@ const schema = makeExecutableSchema({ resolvers, }); -if (process.env.REACT_APP_MAINTENANCE_MODE === 'enabled') { - console.error('\n\n⚠️ ----MAINTENANCE MODE ENABLED----⚠️\n\n'); - addSchemaLevelResolveFunction(schema, () => { - throw new UserError( - "We're currently undergoing planned maintenance. We'll be back by 3pm UTC, please check https://twitter.com/withspectrum for ongoing updates!" - ); - }); -} - module.exports = schema; diff --git a/hyperion/renderer/index.js b/hyperion/renderer/index.js index a2c951943f..6d0dd3f360 100644 --- a/hyperion/renderer/index.js +++ b/hyperion/renderer/index.js @@ -34,12 +34,10 @@ import './browser-shim'; const Routes = require('../../src/routes').default; import { initStore } from '../../src/store'; -const IN_MAINTENANCE_MODE = - process.env.REACT_APP_MAINTENANCE_MODE === 'enabled'; const IS_PROD = process.env.NODE_ENV === 'production'; const FORCE_DEV = process.env.FORCE_DEV; -if (!IS_PROD || FORCE_DEV) console.log('Querying API at localhost:3001/api'); +if (!IS_PROD || FORCE_DEV) debug('Querying API at localhost:3001/api'); const renderer = (req: express$Request, res: express$Response) => { res.setHeader('Content-Type', 'text/html; charset=utf-8'); @@ -93,7 +91,7 @@ const renderer = (req: express$Request, res: express$Response) => { - + @@ -111,14 +109,9 @@ const renderer = (req: express$Request, res: express$Response) => { res.redirect(301, routerContext.url); return; } - // maintainance mode - if (IN_MAINTENANCE_MODE) { - debug('maintainance mode enabled, sending 503'); - res.status(503); - res.set('Retry-After', '3600'); - } else { - res.status(200); - } + + res.status(200); + const state = store.getState(); const data = client.extract(); const { helmet } = helmetContext; diff --git a/src/components/emailInvitationForm/index.js b/src/components/emailInvitationForm/index.js index fefa35681b..719bab86d6 100644 --- a/src/components/emailInvitationForm/index.js +++ b/src/components/emailInvitationForm/index.js @@ -7,7 +7,6 @@ import { addToastWithTimeout } from '../../actions/toasts'; import Icon from '../icons'; import isEmail from 'validator/lib/isEmail'; import sendCommunityEmailInvitations from 'shared/graphql/mutations/community/sendCommunityEmailInvites'; -// import sendChannelEmailInvitations from 'shared/graphql/mutations/community/sendCommunityEmailInvites'; import { Button } from '../buttons'; import { Error } from '../formElements'; import { SectionCardFooter } from '../settingsViews/style'; diff --git a/src/components/maintenance/index.js b/src/components/maintenance/index.js deleted file mode 100644 index 8277e5f5bf..0000000000 --- a/src/components/maintenance/index.js +++ /dev/null @@ -1,60 +0,0 @@ -// @flow -import React from 'react'; -import styled from 'styled-components'; -import { FlexCol } from '../globals'; -import { Tagline, Copy } from 'src/views/pages/style'; -import ViewSegment from '../../components/themedSection'; - -const Emoji = styled.div` - font-size: 3em; - text-align: center; - line-height: 1.5em; - margin-bottom: 0.25em; -`; - -const Wrapper = styled(FlexCol)` - margin: 0 auto; - text-align: center; -`; -const Text = styled(Copy)` - font-size: 20px; - line-height: 1.3; - font-weight: 500; - opacity: 0.95; - margin: 0 auto; - max-width: none; - - a { - text-decoration: underline; - } - - @media (max-width: 768px) { - font-size: 20px; - text-align: center; - } -`; - -const MaintenanceDowntime = () => { - const timeInUTC = 'September 25, 2017 15:00:00 UTC'; - return ( - - - 🛠 - Spectrum is currently undergoing maintenance - - We'll be back by 3pm UTC ({new Date(timeInUTC) - .toLocaleTimeString() - .replace(/:\d\d:\d\d\s/, '') - .toLowerCase()}{' '} - your time), check{' '} - - @withspectrum on Twitter - {' '} - for updates. - - - - ); -}; - -export default MaintenanceDowntime; diff --git a/src/index.js b/src/index.js index 2d0c7a2655..c761d4ab8e 100644 --- a/src/index.js +++ b/src/index.js @@ -72,11 +72,7 @@ function render() { - + diff --git a/src/routes.js b/src/routes.js index ca7bd08255..35af6d58ff 100644 --- a/src/routes.js +++ b/src/routes.js @@ -14,7 +14,6 @@ import Head from './components/head'; import ModalRoot from './components/modals/modalRoot'; import Gallery from './components/gallery'; import Toasts from './components/toasts'; -import Maintenance from './components/maintenance'; import { Loading, LoadingScreen } from './components/loading'; import LoadingDashboard from './views/dashboard/components/dashboardLoading'; import Composer from './components/composer'; @@ -146,11 +145,7 @@ const ComposerFallback = signedOutFallback(Composer, () => ( )); -type Props = { - maintenanceMode?: boolean, -}; - -class Routes extends React.Component { +class Routes extends React.Component<{||}> { componentDidMount() { const AMPLITUDE_API_KEY = process.env.NODE_ENV === 'production' @@ -171,22 +166,6 @@ class Routes extends React.Component { render() { const { title, description } = generateMetaInfo(); - if (this.props.maintenanceMode) { - return ( - - - - - - - - - ); - } - return (