Skip to content
This repository was archived by the owner on Apr 11, 2019. It is now read-only.

Commit 9ab2a93

Browse files
RyanCCollinsRyanCCollins
committed
Feat: test server rendering and finish implementation
1 parent 9277e7b commit 9ab2a93

File tree

10 files changed

+9099
-5
lines changed

10 files changed

+9099
-5
lines changed

‎app/src/store.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { createStore, compose, applyMiddleware } from 'redux';
22
import { syncHistoryWithStore, routerActions, routerMiddleware } from 'react-router-redux';
33
import thunk from 'redux-thunk';
44
import { browserHistory } from 'react-router';
5-
import createLogger from 'redux-logger';
65
import rootReducer from './reducers';
76
import { UserAuthWrapper as userAuthWrapper } from 'redux-auth-wrapper';
87
import client from './apolloClient';
@@ -21,11 +20,13 @@ const initialState = {
2120

2221
/* Commonly used middlewares and enhancers */
2322
/* See: http://redux.js.org/docs/advanced/Middleware.html*/
24-
const loggerMiddleware = createLogger();
23+
2524
const routingMiddleware = routerMiddleware(browserHistory);
2625
const middlewares = [thunk, routingMiddleware, client.middleware()];
2726

28-
if (isDeveloping) {
27+
if (isDeveloping && isClient) {
28+
const createLogger = require('redux-logger');
29+
const loggerMiddleware = createLogger();
2930
middlewares.push(loggerMiddleware);
3031
}
3132

‎package.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
"es2015",
99
"react",
1010
"stage-0"
11+
],
12+
"plugins": [
13+
"babel-plugin-webpack-alias"
1114
]
1215
},
1316
"env": {
@@ -84,6 +87,7 @@
8487
"autoprefixer": "^6.5.1",
8588
"babel-core": "^6.3.15",
8689
"babel-loader": "^6.2.0",
90+
"babel-plugin-webpack-alias": "^2.1.1",
8791
"babel-polyfill": "latest",
8892
"babel-preset-es2015": "^6.9.0",
8993
"babel-preset-react": "^6.3.13",
@@ -106,6 +110,7 @@
106110
"jest-cli": "^15.1.1",
107111
"json-loader": "^0.5.4",
108112
"minimist": "^1.2.0",
113+
"morgan": "^1.7.0",
109114
"node-ensure": "0.0.0",
110115
"node-sass": "^3.4.2",
111116
"offline-plugin": "^3.4.2",

‎server/app.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ app.use((req, res) => {
5656
const html = (
5757
<Html
5858
content={content}
59-
scriptHash="f5a35ab068d111293b63"
60-
cssHash="6cf439ec56ba2b8700ce1665ebe17a68"
59+
scriptHash="4a7d3f5b5c5521487ccc"
60+
cssHash="36fd22421c0879f1c0a943f9441c8ed5"
6161
state={{ data: context.store.getState().apollo.data }}
6262
/>
6363
);

‎server/public/0.5798bf9b1ecb1c3ee965.chunk.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/public/1.f9ea4135a88b2779b1d0.chunk.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎server/public/app/src/components/Navbar/logo.00e7c4cf372ade679404a6cf8f80704f.png‎

11 KB
Loading

‎server/public/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Scalable React Boilerplate</title><link href="https://fonts.googleapis.com/css?family=Open+Sans:400,300,700|Raleway:400,300,700|Lato:400,300,700" rel="stylesheet"><link href="/main.36fd22421c0879f1c0a943f9441c8ed5.css" rel="stylesheet"></head><body><div id="app"></div><script type="text/javascript" src="/main.4a7d3f5b5c5521487ccc.js"></script></body></html>

0 commit comments

Comments
 (0)