Improved folder structure (#7) + Dependencies update

Author: WRidder

.jshintrc

@@ -7,6 +7,5 @@ Accessibility
 
 Small:
 - Use superagent for requests
-- Use 'aug' instead of $.extend
 - Get rid of jquery (thus replace foundation menu),
   check http://medialoot.com/blog/how-to-create-a-responsive-navigation-menu-using-only-css/

TODO.txt

@@ -6,7 +6,7 @@
     "Wilbert van de Ridder <wilbert.ridder@gmail.com>"
   ],
   "description": "Community site SPA Proof of Concept based on ReactJS",
-  "main": "src/app.js",
+  "main": "client/src/app.js",
   "moduleType": [
     "amd"
   ],

bower.json

@@ -1,6 +1,6 @@
 "use strict";
 var reflux = require("reflux");
-var dataInterface = require("client/core/dataInterface");
+var dataInterface = require("local/core/dataInterface");
 
 // Create actions
 var actions = reflux.createActions([
@@ -27,7 +27,7 @@ var actions = reflux.createActions([
 
 // Action handlers
 actions.loadResource.listen(function(type, id, childrenType) {
-  dataInterface.get("/api/" + [type, id, childrenType].filter(function(e){return e;}).join("/"))
+  dataInterface.get("/api/" + [type, id, childrenType].filter(function(e){ return e; }).join("/"))
     .then(function(data) {
       actions.loadResourceSuccess(type, id, childrenType, data);
     })
@@ -37,14 +37,14 @@ actions.loadResource.listen(function(type, id, childrenType) {
 });
 
 actions.createResource.listen(function(type, data, navigateTo) {
-  dataInterface.post("/api/" + [type].filter(function(e){return e;}).join("/"), data)
+  dataInterface.post("/api/" + [type].filter(function(e){ return e; }).join("/"), data)
     .then(function(resultData) {
       actions.createResourceSuccess(type, resultData);
 
       // Navigate to resource
       if (navigateTo) {
-        var router = require("client/core/router").router;
-        var urlCreator = require("client/helper/resourceUrlCreator");
+        var router = require("local/core/router").router;
+        var urlCreator = require("local/helper/resourceUrlCreator");
         var url = urlCreator(type, resultData);
         router.transitionTo(url);
       }

src/assets/browserconfig.xml client/assets/browserconfig.xml

@@ -1,6 +1,6 @@
 "use strict";
 var reflux = require("reflux");
-var dataInterface = require("client/core/dataInterface");
+var dataInterface = require("local/core/dataInterface");
 
 // Create actions
 var actions = reflux.createActions([

src/assets/crossdomain.xml client/assets/crossdomain.xml

@@ -9,7 +9,7 @@ Reflux.nextTick(require("setimmediate2"));
 Reflux.PublisherMethods.triggerAsync = Reflux.PublisherMethods.trigger;
 
 // Data interface
-var DI = require("client/core/dataInterface");
+var DI = require("local/core/dataInterface");
 
 module.exports = {
   init: function() {
@@ -18,19 +18,19 @@ module.exports = {
   renderToDom: function(water) {
     // Check if initial data is available
     if (water) {
-      require("client/core/syncDataProvider").hydrate(water);
+      require("local/core/syncDataProvider").hydrate(water);
     }
 
     // React tap event plugin
     require("react-tap-event-plugin")();
 
     // Init routes
-    var router = require("client/core/router");
+    var router = require("local/core/router");
 
     // Init stores
-    require("client/stores/session");
-    require("client/stores/question");
-    require("client/stores/questions");
+    require("local/stores/session");
+    require("local/stores/question");
+    require("local/stores/questions");
 
     // Temporary tap event plugin
     var injectTapEventPlugin = require("react-tap-event-plugin");
@@ -40,22 +40,22 @@ module.exports = {
     router.renderToDom();
 
     // Clear initial data
-    require("client/core/syncDataProvider").dry();
+    require("local/core/syncDataProvider").dry();
   },
   renderToString: function(path, water, profile) {
     // Init data interface profiler
     DI.enableProfiling(profile);
 
     // Hydrate data
-    require("client/core/syncDataProvider").hydrate(water || {});
+    require("local/core/syncDataProvider").hydrate(water || {});
 
     // Init stores
-    require("client/stores/session");
-    require("client/stores/question");
-    require("client/stores/questions");
+    require("local/stores/session");
+    require("local/stores/question");
+    require("local/stores/questions");
 
     // Init routes
-    var router = require("client/core/router");
+    var router = require("local/core/router");
 
     // Render html body
     var htmlBody = router.renderToString(path || "/");

src/assets/favicon.ico client/assets/favicon.ico

@@ -3,9 +3,9 @@ var React = require("react");
 var Router = require("react-router");
 var Link = Router.Link;
 var mui = require("material-ui");
-var NavigationStore = require("client/stores/navigation");
+var NavigationStore = require("local/stores/navigation");
 var ImmutableRenderMixin = require("react-immutable-render-mixin");
-var connect= require("client/libraries/tmp_connect");
+var connect = require("local/libraries/tmp_connect");
 
 var Breadcrumbs = React.createClass({
   mixins: [connect(NavigationStore), ImmutableRenderMixin],

src/assets/humans.txt client/assets/humans.txt

@@ -1,7 +1,7 @@
 "use strict";
 var React = require("react");
 var DocTitle = require("react-document-title");
-var navigationActions = require("client/actions/navigationActions");
+var navigationActions = require("local/actions/navigationActions");
 
 var DocumentTitle = React.createClass({
   propTypes: {

src/assets/logo.png client/assets/logo.png

@@ -3,7 +3,7 @@ var React = require("react");
 var Router = require("react-router");
 var Navigation = require("./navigation.jsx");
 var Breadcrumbs = require("./breadcrumbs.jsx");
-var HeaderSession = require("client/components/user/headerSession.jsx");
+var HeaderSession = require("local/components/user/headerSession.jsx");
 var Link = Router.Link;
 
 var Header = React.createClass({

src/assets/robots.txt client/assets/robots.txt

@@ -2,10 +2,10 @@
 var React = require("react");
 var Router = require("react-router");
 var classSet = require("react/lib/cx");
-var NavigationStore = require("client/stores/navigation");
+var NavigationStore = require("local/stores/navigation");
 var State = Router.State;
 var Link = Router.Link;
-var connect= require("client/libraries/tmp_connect");
+var connect = require("local/libraries/tmp_connect");
 
 var NavigationLink = React.createClass({
   mixins: [State, connect(NavigationStore)],

src/__tests__/jest-test.js client/src/__tests__/jest-test.js

@@ -2,11 +2,11 @@
 var React = require("react");
 var Mui = require("material-ui");
 var NavLink = require("./navLink.jsx");
-var connect= require("client/libraries/tmp_connect");
-var sessionStore = require("client/stores/session");
+var connect = require("local/libraries/tmp_connect");
+var sessionStore = require("local/stores/session");
 var ImmutableRenderMixin = require("react-immutable-render-mixin");
-var LogoutLink = require("client/components/user/logoutLink.jsx");
-var devSettings = require("client/helper/devSettings");
+var LogoutLink = require("local/components/user/logoutLink.jsx");
+var devSettings = require("local/helper/devSettings");
 
 
 var Navigation = React.createClass({

src/actions/navigationActions.js client/src/actions/navigationActions.js

@@ -1,6 +1,6 @@
 "use strict";
 var React = require("react");
-var DocumentTitle = require("client/components/core/documentTitle");
+var DocumentTitle = require("local/components/core/documentTitle");
 
 var NotFound = React.createClass({
   render: function() {

src/actions/resourceActions.js client/src/actions/resourceActions.js

@@ -1,7 +1,7 @@
 "use strict";
 var React = require("react");
 var mui = require("material-ui");
-var DocumentTitle = require("client/components/core/documentTitle.jsx");
+var DocumentTitle = require("local/components/core/documentTitle.jsx");
 
 var Discussions = React.createClass({
   render: function() {

src/actions/sessionActions.js client/src/actions/sessionActions.js

@@ -1,7 +1,7 @@
 "use strict";
 var React = require("react");
 var mui = require("material-ui");
-var MarkdownViewer = require("client/components/markdown/viewer.jsx");
+var MarkdownViewer = require("local/components/markdown/viewer.jsx");
 var Spinner = require("react-spinner");
 
 var MaterialUiMarkdownEditor = React.createClass({

src/app.js client/src/app.js

@@ -1,6 +1,6 @@
 "use strict";
 var React = require("react");
-var Markdown = require("../markdown/custom-md.jsx");
+var Markdown = require("./custom-md.jsx");
 var mdParser = Markdown.parse;
 var mdOutput = Markdown.output;
 

src/components/app.jsx client/src/components/app.jsx

@@ -1,7 +1,7 @@
 "use strict";
 var React = require("react");
-var DocumentTitle = require("client/components/core/documentTitle.jsx");
-var MarkdownViewer = require("client/components/markdown/viewer.jsx");
+var DocumentTitle = require("local/components/core/documentTitle.jsx");
+var MarkdownViewer = require("local/components/markdown/viewer.jsx");
 
 var aboutMarkdown = "[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/WRidder/react-spa?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)\n[![Build Status](https://travis-ci.org/WRidder/react-spa.svg?branch=master)](https://travis-ci.org/WRidder/react-spa)\n\nA Proof of Concept real-time single page application based on React and (Re)flux to discover best practices regarding a multitude of use cases. Contains a simple server with in-memory database in `./server`.\n\n[**Demo on Heroku**](http://react-spa.herokuapp.com/)  \n(Automatically deployed from this repository on travis build)\n\n### Installation\n#### Just running the demo\n1. Run `$ npm install` in the ./server directory\n2. Start the server in ./server using `$ node src/server.js`. Should open a port on 8080.\n3. Navigate your browser to http://localhost:8080.\n\n#### For developers\n1. Run `$ npm install` in the base and in the ./server directory\n2. Run `$ bower install` in the base directory\n3. Start the server in ./server using `$ node src/server.js`. Should open a port on 8080.\n4. **[optional]** Install gulp globally using `npm install -g gulp`\n5. Run `$ gulp` in the base directory. This will watch for file changes and build when necessary.\n6. Navigate your browser to http://localhost:8080; will reload on client changes.\n\nTested using npm 2.1.0 and node 0.10.33\n\n### Current state\n* Discovery\n* **Proof of concept**\n* Refactoring\n* Stabilizing\n\n### Goal\nCreate a more advanced example (w.r.t. your average TODO app) of creating a SPA using ReactJS. Initially as a personal exercise to go *through the mud* once while hoping to share new insights gained during the process and discuss various approaches. \n\nThis will be by no means a production ready application. Objectives and goals are subject to change.\n\n#### Primary objectives\n* Find sensible approaches to using reactjs with (re)flux\n* Scalable solutions (both in size and regarding developers)\n* Isomorphic application\n* Tests (unit, integration and functional) for all essential components\n* Build methods\n* Realtime connections\n* File/folder layout\n\n#### Secondary objectives\n* Load modules on demand\n* SEO \n* Accessibility\n\n### Application design\n#### Features\n* User login and registration\n* Forum-like discussions\n* Realtime connections\n* Stackoverflow-like questions\n* Chat\n* Updates\n\n#### Roles\n* Guest\n  * Can view public pages\n  * Can login\n  * Can create account\n* User\n  * Can view restricted pages\n  * Can create questions, discussions and comments. \n  * Can delete own comments\n* Moderator\n  * Can edit/delete questions, discussions and comments from other users\n* Administrator\n  * Can access adminstrative area\n  * Can list/disable/remove users\n\n#### Layout\n**Home page**\n```\n\n+---------------------------------------------------------------------------+\n| Logo                                                 Account   Updates(5) |\n| +----------+ +-----------+ +-------------+  +-------------+ +-----------+ |\n| | Home     | | Questions | | Discussions |  | About       | | Chat      | |\n| +----------+ +-----------+ +-------------+  +-------------+ +-----------+ |\n|                                                                           |\n+---------------------------------------------------------------------------+\n|  Homepage                                                                 |\n|                                                                           |\n|                            List of updates                                |\n|                                                                           |\n+---------------------------------------------------------------------------+\n|(c) notice                                                                 |\n+---------------------------------------------------------------------------+\n```\n\n### Libraries\n* [ReactJS](https://facebook.github.io/react/)\n* [Reflux](https://github.com/spoike/refluxjs)\n* [React-router](https://github.com/rackt/react-router/)\n* [ImmutableJS](https://github.com/facebook/immutable-js)\n* [Material-ui](https://github.com/callemall/material-ui)\n* [SocketIO](http://socket.io/)\n\n### Foundations\n* [React starter kit](https://github.com/kriasoft/react-starter-kit)\n\n### Resources\n#### Blogs\n* [krawaller.se](http://blog.krawaller.se/)\n* [spoike.ghost.io](http://spoike.ghost.io/)\n\n#### Discussions\n* [Google ReactJS group](https://groups.google.com/forum/#!forum/reactjs)\n* [ReactJS subreddit](https://www.reddit.com/r/reactjs/search?q=reactjs&sort=relevance&restrict_sr=on&t=all)\n\n#### Books\n* [Developing a React.js Edge](http://shop.oreilly.com/product/9781939902122.do)\n\n### Changelog\n**[06-jan-14]** Added demo app to heroku    \n**[01-dec-14]** Improving isomorphic rendering  \n**[30-nov-14]** Isomorphic app support  \n**[24-nov-14]** Sessions (login/logout/profile); html5 puhsState; single server  \n**[22-nov-14]** Initial version\n";
 

src/components/core/breadcrumbs.jsx client/src/components/core/breadcrumbs.jsx

@@ -1,7 +1,7 @@
 "use strict";
 var React = require("react");
-var DocumentTitle = require("client/components/core/documentTitle.jsx");
-var MarkdownViewer = require("client/components/markdown/viewer.jsx");
+var DocumentTitle = require("local/components/core/documentTitle.jsx");
+var MarkdownViewer = require("local/components/markdown/viewer.jsx");
 
 var homeMarkedown = "[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/WRidder/react-spa?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)\n[![Build Status](https://travis-ci.org/WRidder/react-spa.svg?branch=master)](https://travis-ci.org/WRidder/react-spa)\n\nA Proof of Concept real-time single page application based on React and (Re)flux to discover best practices regarding a multitude of use cases. Contains a simple server with in-memory database in `./server`.\n\n[**Demo on Heroku**](http://react-spa.herokuapp.com/)  \n(Automatically deployed from this repository on travis build)\n\n### Installation\n#### Just running the demo\n1. Run `$ npm install` in the ./server directory\n2. Start the server in ./server using `$ node src/server.js`. Should open a port on 8080.\n3. Navigate your browser to http://localhost:8080.\n\n#### For developers\n1. Run `$ npm install` in the base and in the ./server directory\n2. Run `$ bower install` in the base directory\n3. Start the server in ./server using `$ node src/server.js`. Should open a port on 8080.\n4. **[optional]** Install gulp globally using `npm install -g gulp`\n5. Run `$ gulp` in the base directory. This will watch for file changes and build when necessary.\n6. Navigate your browser to http://localhost:8080; will reload on client changes.\n\nTested using npm 2.1.0 and node 0.10.33\n\n### Current state\n* Discovery\n* **Proof of concept**\n* Refactoring\n* Stabilizing\n\n### Goal\nCreate a more advanced example (w.r.t. your average TODO app) of creating a SPA using ReactJS. Initially as a personal exercise to go *through the mud* once while hoping to share new insights gained during the process and discuss various approaches. \n\nThis will be by no means a production ready application. Objectives and goals are subject to change.\n\n#### Primary objectives\n* Find sensible approaches to using reactjs with (re)flux\n* Scalable solutions (both in size and regarding developers)\n* Isomorphic application\n* Tests (unit, integration and functional) for all essential components\n* Build methods\n* Realtime connections\n* File/folder layout\n\n#### Secondary objectives\n* Load modules on demand\n* SEO \n* Accessibility\n\n### Application design\n#### Features\n* User login and registration\n* Forum-like discussions\n* Realtime connections\n* Stackoverflow-like questions\n* Chat\n* Updates\n\n#### Roles\n* Guest\n  * Can view public pages\n  * Can login\n  * Can create account\n* User\n  * Can view restricted pages\n  * Can create questions, discussions and comments. \n  * Can delete own comments\n* Moderator\n  * Can edit/delete questions, discussions and comments from other users\n* Administrator\n  * Can access adminstrative area\n  * Can list/disable/remove users\n\n#### Layout\n**Home page**\n\n```\n+---------------------------------------------------------------------------+\n| Logo                                                 Account   Updates(5) |\n| +----------+ +-----------+ +-------------+  +-------------+ +-----------+ |\n| | Home     | | Questions | | Discussions |  | About       | | Chat      | |\n| +----------+ +-----------+ +-------------+  +-------------+ +-----------+ |\n|                                                                           |\n+---------------------------------------------------------------------------+\n|  Homepage                                                                 |\n|                                                                           |\n|                            List of updates                                |\n|                                                                           |\n+---------------------------------------------------------------------------+\n|(c) notice                                                                 |\n+---------------------------------------------------------------------------+\n```\n\n### Libraries\n* [ReactJS](https://facebook.github.io/react/)\n* [Reflux](https://github.com/spoike/refluxjs)\n* [React-router](https://github.com/rackt/react-router/)\n* [ImmutableJS](https://github.com/facebook/immutable-js)\n* [Material-ui](https://github.com/callemall/material-ui)\n* [SocketIO](http://socket.io/)\n\n### Foundations\n* [React starter kit](https://github.com/kriasoft/react-starter-kit)\n\n### Resources\n#### Blogs\n* [krawaller.se](http://blog.krawaller.se/)\n* [spoike.ghost.io](http://spoike.ghost.io/)\n\n#### Discussions\n* [Google ReactJS group](https://groups.google.com/forum/#!forum/reactjs)\n* [ReactJS subreddit](https://www.reddit.com/r/reactjs/search?q=reactjs&sort=relevance&restrict_sr=on&t=all)\n\n#### Books\n* [Developing a React.js Edge](http://shop.oreilly.com/product/9781939902122.do)\n\n### Changelog\n**[06-jan-14]** Added demo app to heroku    \n**[01-dec-14]** Improving isomorphic rendering  \n**[30-nov-14]** Isomorphic app support  \n**[24-nov-14]** Sessions (login/logout/profile); html5 puhsState; single server  \n**[22-nov-14]** Initial version\n";
 

src/components/core/documentTitle.jsx client/src/components/core/documentTitle.jsx

@@ -1,13 +1,13 @@
 "use strict";
 var React = require("react");
-var MarkdownViewer = require("client/components/markdown/viewer.jsx");
+var MarkdownViewer = require("local/components/markdown/viewer.jsx");
 var ReactSpinner = require("react-spinner");
 
-var connect= require("client/libraries/tmp_connect");
-var DocumentTitle = require("client/components/core/documentTitle.jsx");
-var questionStore = require("client/stores/question");
+var connect = require("local/libraries/tmp_connect");
+var DocumentTitle = require("local/components/core/documentTitle.jsx");
+var questionStore = require("local/stores/question");
 var ImmutableRenderMixin = require("react-immutable-render-mixin");
-var componentTransitionMixin = require("client/mixins/componentTransition");
+var componentTransitionMixin = require("local/mixins/componentTransition");
 
 var Question = React.createClass({
   mixins: [