Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: combine/universal-react-redux
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.3.0
Choose a base ref
...
head repository: combine/universal-react-redux
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 20,790 additions and 1,268 deletions.
  1. +19 −4 .babelrc
  2. +18 −0 .env.example
  3. +2 −0 .eslintignore
  4. +22 −11 .eslintrc
  5. +6 −13 .gitignore
  6. +0 −1 .npmrc
  7. +0 −1 .nvmrc
  8. +171 −138 README.md
  9. +21 −39 client/index.js
  10. +19 −0 client/styles.js
  11. +0 −12 common/assets/stylesheets/base/_base.scss
  12. +0 −4 common/assets/stylesheets/base/_typography.scss
  13. +0 −12 common/assets/stylesheets/components/_header.scss
  14. +0 −4 common/assets/stylesheets/layout/_footer.scss
  15. +0 −3 common/assets/stylesheets/layout/_header.scss
  16. +0 −27 common/assets/stylesheets/main.scss
  17. +0 −4 common/assets/stylesheets/pages/_home.scss
  18. +0 −9 common/assets/stylesheets/shame/_shame.scss
  19. +0 −1 common/assets/stylesheets/utils/_colors.scss
  20. +0 −1 common/assets/stylesheets/utils/_functions.scss
  21. +0 −1 common/assets/stylesheets/utils/_variables.scss
  22. +0 −2 common/assets/stylesheets/vendors/_bootstrap.scss
  23. +0 −36 common/config/history.js
  24. +0 −57 common/config/store.dev.js
  25. +0 −5 common/config/store.js
  26. +0 −46 common/config/store.prod.js
  27. +2 −0 common/css/base/_fonts.scss
  28. 0 common/{assets/fonts/.gitkeep → css/base/_overrides.scss}
  29. +19 −0 common/css/base/_styles.scss
  30. +8 −0 common/css/base/index.scss
  31. +2 −0 common/css/resources/_colors.scss
  32. 0 common/css/resources/_mixins.scss
  33. 0 common/css/resources/_variables.scss
  34. +3 −0 common/css/resources/_vendors.scss
  35. 0 common/fonts/.gitkeep
  36. BIN common/{assets → }/images/favicon.png
  37. +43 −0 common/js/actions/todos.js
  38. 0 common/{routes/app/components/Footer.js → js/components/common/Footer/index.js}
  39. +26 −0 common/js/components/common/Header/index.js
  40. +33 −0 common/js/components/common/Loading/index.js
  41. +31 −0 common/js/components/common/RouteWithSubRoutes/index.js
  42. +4 −0 common/js/components/common/index.js
  43. +54 −0 common/js/components/todos/TodoForm/index.js
  44. 0 common/js/components/todos/TodoForm/index.scss
  45. +23 −0 common/js/components/todos/TodoForm/spec/TodoForm.test.js
  46. +102 −0 common/js/components/todos/TodoForm/spec/__snapshots__/TodoForm.test.js.snap
  47. +42 −0 common/js/components/todos/TodoItem/index.js
  48. +20 −0 common/js/components/todos/TodoItem/index.scss
  49. +10 −0 common/js/components/todos/TodoItem/spec/TodoItem.test.js
  50. +31 −0 common/js/components/todos/TodoItem/spec/__snapshots__/TodoItem.test.js.snap
  51. +32 −0 common/js/components/todos/TodoList/index.js
  52. +6 −0 common/js/components/todos/TodoList/index.scss
  53. +27 −0 common/js/components/todos/TodoList/spec/TodoList.test.js
  54. +33 −0 common/js/components/todos/TodoList/spec/__snapshots__/TodoList.test.js.snap
  55. +3 −0 common/js/components/todos/index.js
  56. +7 −0 common/js/constants/index.js
  57. +20 −0 common/js/containers/App/index.js
  58. +68 −0 common/js/containers/Todos/index.js
  59. +11 −0 common/js/containers/Todos/index.scss
  60. +12 −0 common/js/lib/api.js
  61. +18 −0 common/js/lib/generateActionCreator.js
  62. 0 common/{ → js}/middleware/.gitkeep
  63. +30 −0 common/js/pages/Error/index.js
  64. +28 −0 common/js/pages/Home/index.js
  65. +5 −0 common/js/pages/Home/index.scss
  66. +22 −0 common/js/pages/Todos/index.js
  67. +4 −4 common/{ → js}/reducers/index.js
  68. +54 −0 common/js/reducers/todos.js
  69. +9 −0 common/js/routes/index.js
  70. +43 −0 common/js/store/index.dev.js
  71. +5 −0 common/js/store/index.js
  72. +28 −0 common/js/store/index.prod.js
  73. +0 −15 common/reducers/example.js
  74. +0 −16 common/routes/app/components/Header.js
  75. +0 −18 common/routes/app/containers/App.dev.js
  76. +0 −5 common/routes/app/containers/App.js
  77. +0 −16 common/routes/app/containers/App.prod.js
  78. +0 −4 common/routes/app/index.js
  79. +0 −24 common/routes/example/components/ExampleComponent.js
  80. +0 −24 common/routes/example/containers/ExampleContainer.js
  81. +0 −6 common/routes/example/index.js
  82. +0 −11 common/routes/home/containers/HomeContainer.js
  83. +0 −5 common/routes/home/index.js
  84. +0 −14 common/routes/index.js
  85. +0 −1 common/selectors/.gitkeep
  86. +0 −1 common/shared/actions/.gitkeep
  87. +0 −1 common/shared/components/.gitkeep
  88. +0 −21 common/shared/containers/DevTools.js
  89. +0 −24 common/templates/cordova.html
  90. +0 −15 common/templates/server.html
  91. +38 −0 config/index.js
  92. +0 −50 cordova-build/build.js
  93. +0 −11 cordova-build/config/release.json.example
  94. +0 −55 cordova-build/distribute.js
  95. +0 −4 cordova-build/fabric.json.example
  96. +0 −2 cordova-build/index.js
  97. +0 −7 nodemon.json
  98. +18,355 −0 package-lock.json
  99. +198 −90 package.json
  100. +10 −0 postcss.config.js
  101. +15 −0 postinstall.js
  102. +18 −0 server/.node-dev.json
  103. +19 −0 server/api/index.js
  104. +9 −0 server/api/todos/index.js
  105. +33 −0 server/api/todos/spec/todos.controller.test.js
  106. +29 −0 server/api/todos/todos.controller.js
  107. +32 −0 server/api/todos/todos.fixture.js
  108. +0 −16 server/config.js
  109. +102 −10 server/index.js
  110. 0 server/lib/.gitkeep
  111. +12 −0 server/middleware/httpsRedirect.js
  112. +1 −0 server/middleware/index.js
  113. +18 −0 server/registerAliases.js
  114. +136 −0 server/renderer/handler.js
  115. +11 −0 server/renderer/index.js
  116. +34 −0 server/renderer/render.js
  117. +32 −92 server/server.js
  118. +24 −0 server/templates/layouts/application.html
  119. +30 −0 test/support/jest.config.js
  120. +4 −0 test/support/jest.globalSetup.js
  121. +5 −0 test/support/jest.setup.js
  122. +37 −0 webpack/babel.config.client.js
  123. +31 −0 webpack/babel.config.ssr.js
  124. +173 −0 webpack/base.js
  125. +0 −24 webpack/config.common.js
  126. +0 −53 webpack/config.cordova.js
  127. +0 −90 webpack/config.development.js
  128. +0 −16 webpack/config.isomorphic.js
  129. +0 −66 webpack/config.production.js
  130. +52 −0 webpack/development.client.babel.js
  131. +45 −0 webpack/production.client.babel.js
  132. +91 −0 webpack/production.ssr.babel.js
  133. +0 −26 webpack/server.development.js
23 changes: 19 additions & 4 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
{
"presets": [
"es2015",
"react"
[
"env",
{
"targets": {
"node": "current",
"uglify": false
}
}
]
],
"plugins": [
"transform-es2015-modules-commonjs",
"transform-class-properties",
"transform-decorators",
"transform-export-extensions",
"transform-object-rest-spread"
]
],
"env": {
"test": {
"presets": [
"react"
]
}
}
}
18 changes: 18 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Server-side application settings
# The main port to run the server on
APPLICATION_PORT=3000

# The absolute URL to the application.
APPLICATION_BASE_URL=http://localhost:3000

# The output path of server and client files built by webpack and babel.
OUTPUT_PATH=dist
PUBLIC_OUTPUT_PATH=dist/public

# Settings for webpack-dev-server.
DEV_SERVER_PORT=3001
DEV_SERVER_HOSTNAME=localhost
DEV_SERVER_HOST_URL=http://localhost:3001

# The primary asset path. Can be changed to be a CDN URL.
PUBLIC_ASSET_PATH=http://localhost:3001/assets/
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
**/node_modules/*
**/dist/*
33 changes: 22 additions & 11 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
{
"parser": "babel-eslint",
"rules": {
"max-len": [
"error",
{ "code": 80, "tabWidth": 2 }
],
"indent": [
2,
1,
2,
{ "SwitchCase": 1 }
],
@@ -11,6 +15,7 @@
"single"
],
"react/jsx-uses-react": 1,
"react/jsx-uses-vars": 1,
"linebreak-style": [
2,
"unix"
@@ -25,21 +30,27 @@
"env": {
"browser": true,
"es6": true,
"mocha": true,
"jest": true,
"node": true
},
"globals": {
"__CORDOVA__": true,
"__PRODUCTION__": true,
"__DEVELOPMENT__": true,
"__BASE_URL__": true
"expect": true,
"__non_webpack_require__": true
},
"extends": "eslint:recommended",
"ecmaFeatures": {
"jsx": true,
"experimentalObjectRestSpread": true
"extends": [
"eslint:recommended",
"plugin:react/recommended"
],
"parserOptions": {
"sourceType": "module",
"ecmaFeatures": {
"experimentalObjectRestSpread": true,
"jsx": true
},
"ecmaVersion": 6
},
"plugins": [
"react"
"babel",
"react"
]
}
19 changes: 6 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
npm-error.log
.env
node_modules
npm-debug.log*
.DS_Store

# ignore built static files
dist/
webpack-assets.json

# cordova ignores
cordova/www/*
cordova/www/**.*
!cordova/www/.gitkeep
cordova/plugins/
cordova/platforms/

# cordova build config
cordova-build/*.json
cordova-build/config/*.json
/dist
/webpack-assets.json
/webpack-stats.json
/react-loadable.json
1 change: 0 additions & 1 deletion .npmrc

This file was deleted.

1 change: 0 additions & 1 deletion .nvmrc

This file was deleted.

Loading