Merge pull request #3 from neonexus/master

Renamed / moved a few things for clarity. Added README for React source folder.

Author: neonexus

assets/src/Admin/AdminRouter.jsx

@@ -12,8 +12,8 @@ import Login from '../Admin/Login';
 import SidebarNav from './SidebarNav';
 import Upgrade from './Upgrade';
 
-import {APIProvider} from '../data/api';
-import {UserProvider, UserConsumer} from '../data/user';
+import {APIProvider} from '../data/apiContext';
+import {UserProvider, UserConsumer} from '../data/userContext';
 
 class AdminRouter extends React.Component {
     constructor(props) {

assets/src/Admin/Login.jsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import {APIConsumer} from '../data/api';
-import {UserConsumer} from '../data/user';
+import {APIConsumer} from '../data/apiContext';
+import {UserConsumer} from '../data/userContext';
 
 import {Row, Button, Form} from 'react-bootstrap';
 

assets/src/README.md

@@ -0,0 +1,10 @@
+# React Source Files
+
+This is where our React source files live.
+
+## Things to note
+
+* [`index.jsx`](index.jsx) is only used by Webpack dev server. Otherwise, is useless on remote servers.
+* The other 2 files in the root of this directory are Webpack entry points. These files are the starting point for our React apps.
+* The `common` folder is where shared, custom components should live.
+* The `data` folder is where React contexts live.

assets/src/common/api.js renamed to assets/src/data/api.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import api from '../common/api';
+import api from './api';
 
 const apiContext = React.createContext();
 

assets/src/data/api.jsx renamed to assets/src/data/apiContext.jsx

@@ -1,6 +1,6 @@
 {
     "name": "sails-react-bootstrap-webpack",
-    "version": "1.5.0",
+    "version": "1.5.1",
     "description": "An opinionated base configuration of Sails, with Webpack for React support, and Bootstrap for styling.",
     "keywords": [
         "sails",