Update examples to reflect new file structure and to use external soc…

…ket IO and localDB libraries
eitak · Jun 5, 2016 · c50f94e · c50f94e
1 parent acd9d2d
commit c50f94e
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 31 deletions.
diff --git a/examples/counter/package.json b/examples/counter/package.json
@@ -1,13 +1,13 @@
 {
   "name": "redux-live-counter-example",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Redux Live counter example",
   "scripts": {
     "clean": "rm -rf build",
-    "compile": "npm run compile:server && npm run compile:shared && npm run compile:client",
-    "compile:server": "babel src/server -d build/server",
-    "compile:shared": "babel src/shared -d build/shared",
-    "compile:client": "mkdir -p build/client && browserify src/client/index.js -t babelify -o build/client/bundle.js",
+    "build": "npm run build:server && npm run build:shared && npm run build:client",
+    "build:server": "babel src/server -d build/server",
+    "build:shared": "babel src/shared -d build/shared",
+    "build:client": "mkdir -p build/client && browserify src/client/index.js -t babelify -o build/client/bundle.js",
     "start": "node build/server/index"
   },
   "repository": {
@@ -27,7 +27,9 @@
     "react-dom": "^15.1.0",
     "react-redux": "^4.4.5",
     "redux": "^3.5.2",
-    "redux-live": "0.0.3"
+    "redux-live": "0.0.5",
+    "redux-live-socketio": "0.0.1",
+    "redux-live-localdb": "0.0.1"
   },
   "devDependencies": {
     "babel-cli": "^6.9.0",

diff --git a/examples/counter/src/client/index.js b/examples/counter/src/client/index.js
@@ -3,15 +3,15 @@ import {render} from 'react-dom'
 import {Provider} from 'react-redux'
 import {createStore, applyMiddleware, combineReducers} from 'redux'
 
-import SocketIoServerCommunicator from 'redux-live/lib/client/server-communicator/SocketIoServerCommunicator'
-import {createReduxLiveMiddleware, reduxLiveReducer} from 'redux-live/lib/client'
+import ServerCommunicator from 'redux-live-socketio/ServerCommunicator'
+import {createReduxLiveMiddleware, reduxLiveReducer} from 'redux-live/client'
 
 import Counter from './components/Counter'
 import counter from '../shared/reducers/index'
 
 require("babel-polyfill");
 
-const serverCommunicator = new SocketIoServerCommunicator();
+const serverCommunicator = new ServerCommunicator();
 const reduxLiveMiddleware = createReduxLiveMiddleware(serverCommunicator);
 
 const initialState = {

diff --git a/examples/counter/src/server/index.js b/examples/counter/src/server/index.js
@@ -3,9 +3,9 @@ import http from 'http'
 import path from 'path'
 import {createStore, applyMiddleware} from 'redux'
 
-import LocalDb from 'redux-live/lib/server/db/LocalDb'
-import SocketIoClientCommunicator from 'redux-live/lib/server/client-communicator/SocketIoClientCommunicator'
-import ReduxLiveServer from 'redux-live/lib/server'
+import LocalDb from 'redux-live-localdb'
+import ClientCommunicator from 'redux-live-socketio/ClientCommunicator'
+import {ReduxLiveServer} from 'redux-live/server'
 
 import counter from '../shared/reducers/index'
 
@@ -44,7 +44,7 @@ app.get('/', (req, res) => {
  */
 const db = new LocalDb();
 db.createStream('counter', {value: 0});
-const clientCommunicator = new SocketIoClientCommunicator(server);
+const clientCommunicator = new ClientCommunicator(server);
 
 const reduxLiveServer = new ReduxLiveServer({reducer: counter, db, clientCommunicator});
 

diff --git a/examples/shopping-cart/package.json b/examples/shopping-cart/package.json
@@ -1,12 +1,12 @@
 {
   "name": "redux-live-shopping-cart-example",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Redux Live shopping cart example",
   "scripts": {
-    "compile": "npm run compile:server && npm run compile:shared && npm run compile:client",
-    "compile:server": "babel src/server -d build/server",
-    "compile:shared": "babel src/shared -d build/shared",
-    "compile:client": "mkdir -p build/client && browserify src/client/index.js -t babelify -o build/client/bundle.js",
+    "build": "npm run build:server && npm run build:shared && npm run build:client",
+    "build:server": "babel src/server -d build/server",
+    "build:shared": "babel src/shared -d build/shared",
+    "build:client": "mkdir -p build/client && browserify src/client/index.js -t babelify -o build/client/bundle.js",
     "start": "node build/server/index"
   },
   "repository": {
@@ -27,7 +27,9 @@
     "react-dom": "^15.1.0",
     "react-redux": "^4.4.5",
     "redux": "^3.5.2",
-    "redux-live": "0.0.3"
+    "redux-live": "0.0.5",
+    "redux-live-socketio": "0.0.1",
+    "redux-live-localdb": "0.0.1"
   },
   "devDependencies": {
     "babel-cli": "^6.9.0",

diff --git a/examples/shopping-cart/src/client/containers/ProductsContainer.js b/examples/shopping-cart/src/client/containers/ProductsContainer.js
@@ -1,5 +1,6 @@
 import React, {Component, PropTypes} from 'react'
 import {connect} from 'react-redux'
+
 import {addToCart} from '../actions'
 import ProductItem from '../components/ProductItem'
 import ProductsList from '../components/ProductsList'

diff --git a/examples/shopping-cart/src/client/index.js b/examples/shopping-cart/src/client/index.js
@@ -3,16 +3,16 @@ import {render} from 'react-dom'
 import {createStore, applyMiddleware, combineReducers} from 'redux'
 import {Provider} from 'react-redux'
 
-import SocketIoServerCommunicator from 'redux-live/lib/client/server-communicator/SocketIoServerCommunicator'
-import {createReduxLiveMiddleware, reduxLiveReducer} from 'redux-live/lib/client'
+import ServerCommunicator from 'redux-live-socketio/ServerCommunicator'
+import {createReduxLiveMiddleware, reduxLiveReducer} from 'redux-live/client'
 
 import App from './containers/App'
 import {cart, products} from '../shared/reducers'
 import subscribeProductsMiddleware from './middleware/subscribeProductsMiddleware'
 
 require("babel-polyfill");
 
-const serverCommunicator = new SocketIoServerCommunicator();
+const serverCommunicator = new ServerCommunicator();
 const reduxLiveMiddleware = createReduxLiveMiddleware(serverCommunicator);
 
 const initialState = {

diff --git a/examples/shopping-cart/src/client/middleware/SubscribeProductsMiddleware.js b/examples/shopping-cart/src/client/middleware/SubscribeProductsMiddleware.js
@@ -1,11 +1,14 @@
-import {SET_STREAM_INITIAL_STATE, SUBSCRIBE_TO_STREAM} from 'redux-live/lib/shared/constants/ActionTypes'
+import {ReduxLiveActionTypes} from 'redux-live/shared'
 
 const subscribeProductsMiddleware = store => next => action => {
-    const containsProducts = action.type === SET_STREAM_INITIAL_STATE
+    const containsProducts = action.type === ReduxLiveActionTypes.SET_STREAM_INITIAL_STATE
         && action.reduxLive.streamId.topic === 'all-products';
     if (containsProducts) {
         action.state.productIds.forEach(productId => {
-            const subscribeToProductAction = {type: SUBSCRIBE_TO_STREAM, streamId: {topic: 'products', id: productId}};
+            const subscribeToProductAction = {
+                type: ReduxLiveActionTypes.SUBSCRIBE_TO_STREAM,
+                streamId: {topic: 'products', id: productId}
+            };
             store.dispatch(subscribeToProductAction)
         })
     }

diff --git a/examples/shopping-cart/src/server/index.js b/examples/shopping-cart/src/server/index.js
@@ -5,10 +5,10 @@ import _ from 'lodash'
 import {createStore, applyMiddleware} from 'redux'
 import uuid from 'node-uuid'
 
-import LocalDb from 'redux-live/lib/server/db/LocalDb'
-import SocketIoClientCommunicator from 'redux-live/lib/server/client-communicator/SocketIoClientCommunicator'
-import ReduxLiveServer from 'redux-live/lib/server'
-import {SUBSCRIBE_TO_STREAM} from 'redux-live/lib/shared/constants/ActionTypes'
+import LocalDb from 'redux-live-localdb'
+import ClientCommunicator from 'redux-live-socketio/ClientCommunicator'
+import {ReduxLiveServer} from 'redux-live/server'
+import {ReduxLiveActionTypes} from 'redux-live/shared'
 
 import {cart, product} from '../shared/reducers/index'
 import createCart from './createCart'
@@ -58,7 +58,7 @@ db.createStream({topic: 'products', id: 'product-3'}, {
     "inventory": 5
 });
 
-const clientCommunicator = new SocketIoClientCommunicator(server, streamId => streamId.topic + '/' + streamId.id);
+const clientCommunicator = new ClientCommunicator(server, streamId => streamId.topic + '/' + streamId.id);
 
 const reduxLiveServer = new ReduxLiveServer({
     getReducer: streamId => {
@@ -72,7 +72,7 @@ clientCommunicator.onNewClient(clientId => {
     const cartId = uuid.v4();
     createCart(reduxLiveServer, cartId);
     clientCommunicator.sendActionToClient(clientId, {
-        type: SUBSCRIBE_TO_STREAM,
+        type: ReduxLiveActionTypes.SUBSCRIBE_TO_STREAM,
         streamId: {
             topic: 'carts',
             id: cartId