Upgrade to react-router v4

.babelrc

@@ -7,9 +7,16 @@
       ]
     },
     "development": {
-      "presets": ["es2015", "stage-0", "react"],
+      "presets": ["react"],
       "plugins": [
-        ["transform-decorators-legacy"]
+        ["transform-decorators-legacy"],
+        ["transform-class-properties"],
+        ["transform-export-extensions"],
+        ["transform-object-rest-spread"],
+        ["transform-class-properties"],
+        ["transform-es2015-modules-commonjs"],
+        ["transform-es2015-destructuring"],
+        ["transform-es2015-classes"]
       ]
     },
     "test": {

.env.example

@@ -33,6 +33,8 @@ GRAPHQL_PROTOCOL=http
 #MAILGUN_DOMAIN="mail.parabol.co"
 #MAILGUN_FROM="action@mail.parabol.co"
 
+REDIS_URL="redis://localhost:6379"
+
 RETHINKDB_URL=rethinkdb://localhost:28015/actionDevelopment
 RETHINKDB_SSL=false
 
@@ -47,3 +49,9 @@ STRIPE_PUBLISHABLE_KEY="pk_test_DaMeLaLlAvE"
 ULTRAHOOK_API_KEY="sourApplesAndSweetCarrots"
 
 INTRANET_JWT_SECRET="ZG9udHlvdWxvb2thdG1leW91d2VpcmRv"
+
+#INTEGRATIONS
+GITHUB_CLIENT_ID="smellslikemeat"
+GITHUB_CLIENT_SECRET="rottenmeat"
+SLACK_CLIENT_ID="iWaNnAKiSsYoUAlLOvAh"
+SLACK_CLIENT_SECRET="aNdOvAhAnDAgAiNTiLThEnIgHTClOsEsIn"

.eslintrc

@@ -39,7 +39,7 @@
     "import/no-extraneous-dependencies": 0,
     "import/no-unresolved": 0,
     "import/no-named-as-default": 0,
-    "comma-dangle": 0,
+    "comma-dangle": ["error", "never"],
     "id-length": 0,
     "indent": [
       2,
@@ -60,7 +60,7 @@
     "no-underscore-dangle": 0,
     "max-len": [
       1,
-      140,
+      140
     ],
     "object-curly-spacing": 0,
     "react/forbid-prop-types": 0,

.gitignore

@@ -1,8 +1,10 @@
 .DS_Store
 .env
 .idea/
+build/
 coverage/
 dll/
+dump.rdb
 node_modules/
 npm-debug.log
 yarn-error.log

CHANGELOG.md

@@ -4,6 +4,23 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## v0.18.0 - 04-May-2017
+### Added
+- Tags (#archive, #private)
+- Calendar invites on first meeting Email Summary
+- Integrator Microservice (Bull Job Queue, action-integrator)
+- Slack integration (Naive meeting alerts)
+- react-githubish-mentions
+- emoji support in markdown
+
+### Fixed
+- CSS For auth0 modal on invitation route
+- sorting first agenda item bug #896
+
+### Removed
+- Actions (in favor of private projects)
+- redux-form from projects
+
 ## v0.17.6 - 25-Apr-2017
 ### Added
 - Hello lang tooltips, we'll now tell you which language is saying

circle.yml

@@ -1,8 +1,9 @@
 version: 2
 executorType: docker
 containerInfo:
-  - image: node:7.6.0
+  - image: node:7.10.0
   - image: rethinkdb:2.3.5
+  - image: redis:3.2.8
 stages:
   build:
     workDir: /home/ubuntu/action
@@ -87,7 +88,7 @@ stages:
                 echo ${BASH_REMATCH[1]})"
             git config --global user.name "Parabol CircleCI"
             git config --global user.email "admin+circleci@parabol.co"
-            git add build
+            git add build -f
             git commit -m "build $ACTION_VERSION" build
           fi
 

package.json

@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.com> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "0.17.6",
+  "version": "0.18.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/action"
@@ -68,7 +68,7 @@
     "codecov": "^1.0.1",
     "concurrently": "3.4.0",
     "dynamic-serializer": "^0.1.0",
-    "eslint": "^3.17.1",
+    "eslint": "^3.19.0",
     "eslint-config-airbnb": "^14.1.0",
     "eslint-import-resolver-webpack": "^0.8.1",
     "eslint-plugin-import": "^2.2.0",
@@ -86,7 +86,7 @@
     "react-hot-loader": "^3.0.0-beta.6",
     "react-transform-catch-errors": "1.0.2",
     "react-transform-hmr": "1.0.4",
-    "redbox-react": "1.3.4",
+    "redbox-react": "^1.3.6",
     "rimraf": "2.6.1",
     "snyk": "^1.25.2",
     "stats-webpack-plugin": "0.5.0",
@@ -110,7 +110,8 @@
     "babel-runtime": "6.23.0",
     "bcrypt": "^1.0.2",
     "body-parser": "1.17.1",
-    "cashay": "^0.22.8",
+    "bull": "^2.2.5",
+    "cashay": "^0.22.9",
     "cheerio": "^0.22.0",
     "compression": "1.6.2",
     "cors": "2.8.1",
@@ -124,33 +125,39 @@
     "graphiql": "^0.9.3",
     "graphql": "^0.9.1",
     "graphql-custom-datetype": "^0.3.0",
+    "ioredis": "^2.5.0",
     "isomorphic-fetch": "2.2.1",
     "jsonwebtoken": "^7.3.0",
     "jwt-decode": "^2.1.0",
     "mailcomposer": "^4.0.1",
     "mailgun-js": "^0.8.2",
+    "markdown-it": "^8.3.1",
+    "markdown-it-emoji": "^1.3.0",
     "migrate-rethinkdb": "^1.5.0",
     "mime-types": "^2.1.14",
     "ms": "^0.7.3",
     "node-env-flag": "0.1.0",
+    "node-fetch": "^1.6.3",
     "oy-vey": "^1.0.0-alpha",
+    "prop-types": "^15.5.8",
     "raven": "^1.1.4",
     "raven-js": "^3.12.1",
-    "react": "^15.4.2",
+    "react": "^15.5.4",
+    "react-addons-css-transition-group": "^15.4.2",
     "react-async-hoc": "0.2.0",
     "react-copy-to-clipboard": "^4.2.3",
-    "react-dnd": "^2.2.4",
+    "react-dnd": "^2.3.0",
     "react-dnd-html5-backend": "^2.2.4",
-    "react-dom": "^15.4.2",
+    "react-dom": "^15.5.4",
     "react-fontawesome": "^1.5.0",
+    "react-githubish-mentions": "^1.0.3",
     "react-helmet": "^4.0.0",
     "react-hotkey-hoc": "^0.2.1",
-    "react-markdown": "^2.4.5",
-    "react-notification-system": "^0.2.12",
-    "react-portal-hoc": "^0.3.2",
+    "react-notification-system": "^0.2.14",
+    "react-portal-hoc": "^0.4.0",
     "react-redux": "^5.0.3",
-    "react-router": "2.8.1",
-    "react-textarea-autosize": "^4.0.5",
+    "react-router": "^4.1.1",
+    "react-router-dom": "^4.1.1",
     "redux": "3.6.0",
     "redux-form": "^6.5.0",
     "redux-logger": "2.8.2",
@@ -163,10 +170,10 @@
     "rethinkdbdash": "2.3.28",
     "serve-favicon": "^2.4.1",
     "shortid": "^2.2.8",
-    "socketcluster": "^5.9.0",
+    "socketcluster": "^5.9.1",
     "socketcluster-client": "^5.3.0",
+    "string-score": "^1.0.1",
     "stripe": "^4.15.1",
-    "tap-xunit": "^1.7.0",
     "tinycolor2": "^1.4.1",
     "webpack-s3-plugin": "^0.9.2"
   },

src/client/Root.js

@@ -1,19 +1,23 @@
+import PropTypes from 'prop-types';
 import React from 'react';
-import {Router, browserHistory} from 'react-router';
+import {BrowserRouter as Router} from 'react-router-dom';
 import {Provider} from 'react-redux';
-import routesFactory from 'universal/routes/index';
+// import routesFactory from 'universal/routes/index';
+import ActionContainer from 'universal/containers/Action/ActionContainer';
 
 export default function Root({store}) {
-  const routes = routesFactory(store);
+  // const routes = routesFactory(store);
   return (
     <Provider store={store}>
       <div>
-        <Router history={browserHistory} routes={routes} />
+        <Router>
+          <ActionContainer />
+        </Router>
       </div>
     </Provider>
   );
 }
 
 Root.propTypes = {
-  store: React.PropTypes.object.isRequired
+  store: PropTypes.object.isRequired
 };

src/client/client.js

@@ -20,20 +20,12 @@ const initialState = {};
     httpTransport: new ActionHTTPTransport(persistedToken)
   });
   if (__PRODUCTION__) {
-    /*
-     * During the production client bundle build, the server will need to be
-     * stopped.
-     */
     StyleSheet.rehydrate(window.__APHRODITE__);
     render(
       <Root store={store} />,
       document.getElementById('root')
     );
   } else {
-    /*
-     * Hey! We're the server. No need to stop rethink. The server will
-     * take care of that when it wants to exit.
-     */
     // eslint-disable-next-line global-require
     const {AppContainer} = require('react-hot-loader'); // eslint-disable-line import/no-extraneous-dependencies
     // ENABLE THIS FOR EXPLORING FRONT END PERFORMANCE

src/server/Html.js

@@ -1,11 +1,11 @@
 /* eslint react/no-danger:0 */
-import React, {PropTypes} from 'react';
+import PropTypes from 'prop-types';
+import React from 'react';
 import {Provider} from 'react-redux';
-import {RouterContext} from 'react-router';
 import {renderToString} from 'react-dom/server';
 import makeSegmentSnippet from '@segment/snippet';
-import {auth0, stripeKey} from 'universal/utils/clientOptions';
 import getWebpackPublicPath from 'server/utils/getWebpackPublicPath';
+import {StaticRouter} from 'react-router';
 
 const webpackPublicPath = getWebpackPublicPath();
 const segKey = process.env.SEGMENT_WRITE_KEY;
@@ -15,16 +15,21 @@ const segmentSnippet = segKey && makeSegmentSnippet.min({
 });
 
 // Injects the server rendered state and app into a basic html template
-export default function Html({store, assets, StyleSheetServer, renderProps}) {
+export default function Html({store, assets, clientKeyLoader}) {
+  // const ActionContainer = require('../../build/prerender');
+  const {default: ActionContainer, StyleSheetServer} = require('../../build/prerender');
   const {manifest, app, vendor} = assets;
   // TURN ON WHEN WE SEND STATE TO CLIENT
   // const initialState = `window.__INITIAL_STATE__ = ${JSON.stringify(store.getState())}`;
   // <script dangerouslySetInnerHTML={{__html: initialState}}/>
+  const context = {};
   const {html, css} = StyleSheetServer.renderStatic(() => {
     try {
       return renderToString(
         <Provider store={store}>
-          <RouterContext {...renderProps} />
+          <StaticRouter location={'/'} context={context}>
+            <ActionContainer />
+          </StaticRouter>
         </Provider>
       );
     } catch (e) {
@@ -34,14 +39,6 @@ export default function Html({store, assets, StyleSheetServer, renderProps}) {
     }
   });
   const dehydratedStyles = `window.__APHRODITE__ = ${JSON.stringify(css.renderedClassNames)}`;
-  const clientOptions = `
-    window.__ACTION__ = {
-      auth0: ${JSON.stringify(auth0)},
-      cdn: ${JSON.stringify(webpackPublicPath)},
-      sentry: ${JSON.stringify(process.env.SENTRY_DSN_PUBLIC)},
-      stripe: ${JSON.stringify(stripeKey)}
-    };
-`;
   const fontAwesomeUrl = 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css';
   return (
     <html>
@@ -53,7 +50,7 @@ export default function Html({store, assets, StyleSheetServer, renderProps}) {
       </head>
       <body>
         <script dangerouslySetInnerHTML={{__html: dehydratedStyles}} />
-        <script dangerouslySetInnerHTML={{__html: clientOptions}} />
+        <script dangerouslySetInnerHTML={{__html: clientKeyLoader}} />
         <div id="root" dangerouslySetInnerHTML={{__html: html}} />
         <script dangerouslySetInnerHTML={{__html: manifest.text}} />
         <script src={`${webpackPublicPath}${vendor.js}`} />
@@ -64,8 +61,7 @@ export default function Html({store, assets, StyleSheetServer, renderProps}) {
 }
 
 Html.propTypes = {
-  StyleSheetServer: PropTypes.object,
+  clientKeyLoader: PropTypes.string.isRequired,
   store: PropTypes.object.isRequired,
-  assets: PropTypes.object,
-  renderProps: PropTypes.object
+  assets: PropTypes.object
 };

src/server/__tests__/Organization/data/org1.js

@@ -31,7 +31,7 @@ export const ORG1_OTHER_TEAM_MEMBERS = [
     id: 'test|bruceBanner',
     email: 'bruce.banner@avengers.org',
     name: 'Bruce Banner',
-    nickname: 'Hulk',
+    nickname: 'Hulk'
   }),
   testOrgMember({
     id: 'test|natashaRomanova',
@@ -43,13 +43,13 @@ export const ORG1_OTHER_TEAM_MEMBERS = [
     id: 'test|kyleRichmond',
     email: 'kyle.richmond@avengers.org',
     name: 'Kyle Richmond',
-    nickname: 'Nighthawk',
+    nickname: 'Nighthawk'
   }),
   testOrgMember({
     id: 'test|thorOdinson',
     email: 'thor@avengers.org',
     name: 'Thor Odinson',
-    nickname: 'Thor',
+    nickname: 'Thor'
   })
 ];
 

src/server/__tests__/Organization/data/testOrgMember.js

@@ -4,7 +4,7 @@ export default function ({
   email,
   name,
   nickname,
-  picture = null,
+  picture = null
 } = {}) {
   const now = new Date();