Merge pull request #1400 from withspectrum/splash-page-v2

Splash page marketing update

Author: brianlovin

iris/index.js

@@ -25,10 +25,6 @@ const PORT = 3001;
 initPassport();
 // API server
 const app = express();
-// $FlowFixMe
-if (IS_PROD) {
-  require('newrelic');
-}
 
 import middlewares from './routes/middlewares';
 app.use(middlewares);

iris/newrelic.js

@@ -1,30 +1,26 @@
 // @flow
 import { Router } from 'express';
+const debug = require('debug')('iris:routes:auth:logout');
 import { destroySession } from '../../models/session';
 
 const IS_PROD = process.env.NODE_ENV === 'production';
 const HOME = IS_PROD ? '/' : 'http://localhost:3000/';
 const logoutRouter = Router();
 
 logoutRouter.get('/', (req, res) => {
+  debug('started');
   const sessionCookie = req.cookies['connect.sid'];
   if (req.isUnauthenticated() || !sessionCookie) {
+    debug('is unauthenticated, aborting logout');
     return res.redirect(HOME);
   }
-  const sessionId = sessionCookie.split('.')[0].replace('s:', '');
-  return destroySession(sessionId)
-    .then(() => {
-      // I should not have to do this manually
-      // but it doesn't work otherwise ¯\_(ツ)_/¯
-      res.clearCookie('connect.sid');
-      req.logout();
-      res.redirect(HOME);
-    })
-    .catch(err => {
-      res.clearCookie('connect.sid');
-      console.log(err);
-      res.redirect(HOME);
-    });
+  debug('logging out');
+  req.logout();
+  req.session.destroy(err => {
+    if (err) console.log(err);
+    debug(`destroyed session, redirecting`);
+    res.redirect(HOME);
+  });
 });
 
 export default logoutRouter;

iris/routes/auth/logout.js

@@ -3,6 +3,11 @@ import { Router } from 'express';
 
 const middlewares = Router();
 
+if (process.env.NODE_ENV === 'development') {
+  const logging = require('./logging');
+  middlewares.use(logging);
+}
+
 if (process.env.NODE_ENV === 'production' && !process.env.FORCE_DEV) {
   // Raven (Sentry client) needs to come before everything else
   const raven = require('./raven').default;

iris/routes/middlewares/index.js

@@ -0,0 +1,8 @@
+// @flow
+// Log requests with debug
+const debug = require('debug')('iris:web');
+
+module.exports = (req: Request, res: Response, next: Function) => {
+  debug(`requesting ${req.url}`);
+  next();
+};

iris/routes/middlewares/logging.js

@@ -14,7 +14,7 @@ export default session({
   // Forces a session that is "uninitialized" to be saved to the store
   // NOTE(@mxstbr): This might not be necessary or even useful, but the default example of
   // session-rethinkdb uses it. Ref: llambda/session-rethinkdb#12
-  saveUninitialized: true,
+  saveUninitialized: false,
   // Force a session identifier cookie to be set on every response, resets the expire date of the
   // cookie to one year from the time of the response, meaning you'll only get logged out after a
   // year of inactivity.

iris/routes/middlewares/session.js

@@ -8,6 +8,7 @@
     "flow-bin": "^0.43.0",
     "lint-staged": "^3.3.0",
     "micromatch": "^3.0.4",
+    "newrelic": "^2.2.0",
     "nodemon": "^1.11.0",
     "prettier": "^1.0.0",
     "raw-loader": "^0.5.1",

package.json

@@ -4,7 +4,7 @@ import { clearApolloStore } from '../api';
 import { removeItemFromStorage, storeItem } from '../helpers/localStorage';
 import Raven from 'raven-js';
 
-export const logout = () => {
+export const logout = dispatch => {
   track(`user`, `sign out`, null);
   // clear localStorage
   removeItemFromStorage('spectrum');
@@ -15,6 +15,10 @@ export const logout = () => {
     process.env.NODE_ENV === 'production'
       ? '/auth/logout'
       : 'http://localhost:3001/auth/logout';
+
+  dispatch({
+    type: 'CLEAR_USER',
+  });
 };
 
 export const saveUserDataToLocalStorage = (user: Object) => dispatch => {

public/img/conversation.svg

@@ -101,6 +101,11 @@ export const SERVER_URL =
     ? `${window.location.protocol}//${window.location.host}`
     : 'http://localhost:3001';
 
+export const CLIENT_URL =
+  process.env.NODE_ENV === 'production'
+    ? `${window.location.protocol}//${window.location.host}`
+    : 'http://localhost:3000';
+
 export const PUBLIC_STRIPE_KEY =
   process.env.NODE_ENV === 'production'
     ? 'pk_live_viV7X5XXD1sw8aN2NgQjiff6'

public/img/discover.png

@@ -20,7 +20,7 @@ const baseButton = css`
   line-height: 1;
   position: relative;
   text-align: center;
-  padding: ${props => (props.icon ? '4px 8px 4px 4px' : '12px 16px')};
+  padding: ${props => (props.icon ? '4px 8px' : '12px 16px')};
 
   &:hover {
     transition: ${Transition.hover.on};

public/img/goopy-2.svg

@@ -5,7 +5,7 @@ import {
   ClusterTwo,
   ClusterThree,
   ClusterFour,
-} from '../../views/homepage/style';
+} from '../../views/splash/components/illustrations';
 import Icon from '../../components/icons';
 import { FullscreenViewContainer, Illustrations, Close } from './style';