incorporated spee.ch-components

package.json

@@ -64,7 +64,8 @@
     "webpack-node-externals": "^1.6.0",
     "whatwg-fetch": "^2.0.3",
     "winston": "^2.3.1",
-    "winston-slack-webhook": "billbitt/winston-slack-webhook"
+    "winston-slack-webhook": "billbitt/winston-slack-webhook",
+    "spee.ch-components": "git://github.com/billbitt/spee.ch-components.git"
   },
   "devDependencies": {
     "babel-core": "^6.26.0",

server/helpers/handlePageRender.jsx

@@ -1,11 +1,9 @@
 import React from 'react';
 import { renderToString } from 'react-dom/server';
 import { createStore } from 'redux';
-import Reducer from 'client/reducers';
 import { Provider } from 'react-redux';
 import { StaticRouter } from 'react-router-dom';
-import GAListener from 'client/components/GAListener/';
-import App from 'client/app';
+import { Reducers, GAListener, App } from 'spee.ch-components';
 import renderFullPage from './renderFullPage.js';
 import Helmet from 'react-helmet';
 
@@ -13,7 +11,7 @@ module.exports = (req, res) => {
   let context = {};
 
   // create a new Redux store instance
-  const store = createStore(Reducer);
+  const store = createStore(Reducers);
 
   // render component to a string
   const html = renderToString(

server/helpers/handleShowRender.jsx

@@ -1,16 +1,12 @@
 import React from 'react';
 import { renderToString } from 'react-dom/server';
 import { createStore, applyMiddleware } from 'redux';
-import Reducer from '../../client/reducers/index';
 import { Provider } from 'react-redux';
 import { StaticRouter } from 'react-router-dom';
-import GAListener from '../../client/components/GAListener/index';
-import App from '../../client/app';
 import renderFullPage from './renderFullPage';
 import createSagaMiddleware from 'redux-saga';
 import { call } from 'redux-saga/effects';
-import { handleShowPageUri } from '../../client/sagas/show_uri';
-import { onHandleShowPageUri } from '../../client/actions/show';
+import { Reducers, GAListener, App, Sagas, Actions } from 'spee.ch-components';
 
 import Helmet from 'react-helmet';
 
@@ -28,11 +24,11 @@ module.exports = (req, res) => {
   const middleware = applyMiddleware(sagaMiddleware);
 
   // create a new Redux store instance
-  const store = createStore(Reducer, middleware);
+  const store = createStore(Reducers, middleware);
 
   // create saga
-  const action = onHandleShowPageUri(req.params);
-  const saga = returnSagaWithParams(handleShowPageUri, action);
+  const action = Actions.onHandleShowPageUri(req.params);
+  const saga = returnSagaWithParams(Sagas.handleShowPageUri, action);
 
   // run the saga middleware
   sagaMiddleware

speech.js

@@ -1,21 +1,7 @@
-import Reducer from './client/reducers';
-import rootSaga  from './client/sagas';
-import GAListener from './client/components/GAListener';
-const App = require('./client/app.js');
 const Server = require('./server');
-const Pages = require('./client/pages');
-const Components = require('./client/components');
-const Containers = require('./client/containers');
 
 const exports = {
-  App,
-  Reducer,
-  rootSaga,
-  GAListener,
   Server,
-  Pages,
-  Components,
-  Containers,
 };
 
 module.exports = exports;

webpack.client.common.js

@@ -1,34 +0,0 @@
-const Path = require('path');
-const CLIENT_ROOT = Path.resolve(__dirname, 'client/');
-const CONFIG_ROOT = Path.resolve(__dirname, 'config/');
-
-module.exports = {
-  target: 'web',
-  entry : ['babel-polyfill', 'whatwg-fetch', './client/client.js'],
-  output: {
-    path      : Path.join(__dirname, 'exports/'),
-    publicPath: 'exports/',
-    filename  : 'clientBundle.js',
-  },
-  module: {
-    loaders: [
-      {
-        test   : /.jsx?$/,
-        loader : 'babel-loader',
-        exclude: /node_modules/,
-        query  : {
-          presets: ['es2015', 'react', 'stage-2'],
-        },
-      },
-    ],
-  },
-  resolve: {
-    modules: [
-      CLIENT_ROOT,
-      CONFIG_ROOT,
-      'node_modules',
-      __dirname,
-    ],
-    extensions: ['.js', '.jsx', '.scss'],
-  },
-};

webpack.config.js

@@ -1,7 +1,5 @@
 const packageBaseConfig = require('./webpack.speech.common.js');
-const clientBaseConfig = require('./webpack.client.common.js');
 
 module.exports = [
-  clientBaseConfig,
   packageBaseConfig,
 ];

webpack.dev.js

@@ -1,5 +1,4 @@
 const packageBaseConfig = require('./webpack.speech.common.js');
-const clientBaseConfig = require('./webpack.client.common.js');
 const merge = require('webpack-merge');
 
 const devBuildConfig = {
@@ -9,5 +8,4 @@ const devBuildConfig = {
 
 module.exports = [
   merge(packageBaseConfig, devBuildConfig),
-  merge(clientBaseConfig, devBuildConfig),
 ];

webpack.prod.js

@@ -2,7 +2,6 @@ const webpack = require('webpack');
 const merge = require('webpack-merge');
 const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
 const packageBaseConfig = require('./webpack.speech.common.js');
-// const clientBaseConfig = require('./webpack.client.common.js');
 
 const productionBuildConfig = {
   devtool: 'source-map',
@@ -18,5 +17,4 @@ const productionBuildConfig = {
 
 module.exports = [
   merge(packageBaseConfig, productionBuildConfig),
-  // merge(clientBaseConfig, productionBuildConfig),
 ];

webpack.speech.common.js

@@ -1,6 +1,5 @@
 const Path = require('path');
 const nodeExternals = require('webpack-node-externals');
-const CLIENT_ROOT = Path.resolve(__dirname, 'client/');
 const CONFIG_ROOT = Path.resolve(__dirname, 'config/');
 const SERVER_ROOT = Path.resolve(__dirname, 'server/');
 
@@ -36,7 +35,6 @@ module.exports = {
   },
   resolve: {
     modules: [
-      CLIENT_ROOT,
       CONFIG_ROOT,
       SERVER_ROOT,
       'node_modules',