Merge pull request #19 from jmeas/update-lib-versions

Update lib versions

Author: jamesplease

package.json

@@ -3,18 +3,16 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "history": "^4.6.3",
     "lodash": "^4.17.4",
     "react": "^16.0.0",
     "react-dom": "^16.0.0",
     "react-redux": "^5.0.5",
-    "react-router": "^4.1.1",
     "react-router-dom": "^4.1.1",
     "react-scripts": "1.0.10",
     "redux": "^3.7.1",
-    "redux-resource": "^2.2.0",
-    "redux-resource-plugins": "^2.0.0",
-    "redux-resource-xhr": "^2.0.0",
+    "redux-resource": "^2.4.0",
+    "redux-resource-plugins": "^2.1.0",
+    "redux-resource-xhr": "^2.2.0",
     "redux-thunk": "^2.2.0",
     "xhr": "^2.4.0"
   },

src/components/App.test.js

@@ -1,22 +1,17 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
-import { Router } from 'react-router';
-import createBrowserHistory from 'history/createBrowserHistory';
-import { Route, Switch } from 'react-router-dom';
+import { BrowserRouter, Route, Switch } from 'react-router-dom';
 import './index.css';
 import App from './components/App';
 import Gists from './components/Gists';
 import Gist from './components/Gist';
 import CreateGist from './components/CreateGist';
-import registerServiceWorker from './registerServiceWorker';
 import store from './state/store';
 
-const history = createBrowserHistory();
-
 ReactDOM.render((
   <Provider store={store}>
-    <Router history={history}>
+    <BrowserRouter>
       <Route path="/" render={({ location }) => (
         <App location={location}>
           <Switch>
@@ -26,7 +21,6 @@ ReactDOM.render((
           </Switch>
         </App>
       )}/>
-    </Router>
+    </BrowserRouter>
   </Provider>
 ), document.getElementById('root'));
-registerServiceWorker();

src/index.js

@@ -1,28 +1,33 @@
 import { actionTypes } from 'redux-resource';
-import {
-  createResources, readResources, updateResources, deleteResources
-} from 'redux-resource-xhr';
+import { crudRequest } from 'redux-resource-xhr';
 import headers from '../../utils/headers';
 
+// This file heavily leverages the Redux Resource XHR library. To learn
+// more about its API, refer to the documentation:
+// https://redux-resource.js.org/docs/extras/redux-resource-xhr.html
+
 // The Redux Resource XHR library only exports bulk actions, so we use this
 // function to turn single-resource responses from the server into arrays.
-function transformSingular(body) {
+function singleResourceToArray(body) {
   return [body];
 }
 
 export function createGist(gist) {
   const xhrOptions = {
+    method: 'POST',
     url: 'https://api.github.com/gists',
     json: true,
     body: gist,
     headers
   };
 
-  return dispatch => createResources({
-    resourceName: 'gists',
-    request: 'createGist',
-    list: 'createdGists',
-    transformData: transformSingular,
+  return dispatch => crudRequest('create', {
+    actionDefaults: {
+      resourceName: 'gists',
+      request: 'createGist',
+      list: 'createdGists',
+    },
+    transformData: singleResourceToArray,
     xhrOptions,
     dispatch
   });
@@ -38,49 +43,58 @@ export function resetCreateGistStatus() {
 
 export function readGist(gistId) {
   const xhrOptions = {
+    method: 'GET',
     url: `https://api.github.com/gists/${gistId}`,
     json: true,
     headers
   };
 
-  return dispatch => readResources({
-    resourceName: 'gists',
-    resources: [gistId],
-    transformData: transformSingular,
+  return dispatch => crudRequest('read', {
+    actionDefaults: {
+      resourceName: 'gists',
+      resources: [gistId],
+    },
+    transformData: singleResourceToArray,
     xhrOptions,
     dispatch
   });
 }
 
 export function readManyUsersGists(username) {
   const xhrOptions = {
+    method: 'GET',
     url: `https://api.github.com/users/${username}/gists`,
     json: true,
     headers
   };
 
-  return dispatch => readResources({
-    resourceName: 'gists',
-    request: 'getUsersGists',
-    list: 'usersGists',
-    mergeListIds: false,
+  return dispatch => crudRequest('read', {
+    actionDefaults: {
+      resourceName: 'gists',
+      request: 'getUsersGists',
+      list: 'usersGists',
+      mergeListIds: false,
+    },
     xhrOptions,
     dispatch
   });
 }
 
 export function updateGist(gistId, gist) {
   const xhrOptions = {
+    method: 'PATCH',
     url: `https://api.github.com/gists/${gistId}`,
     json: true,
     body: gist,
     headers
   };
 
-  return dispatch => updateResources({
-    resourceName: 'gists',
-    resources: [gistId],
-    transformData: transformSingular,
+  return dispatch => crudRequest('update', {
+    actionDefaults: {
+      resourceName: 'gists',
+      resources: [gistId],
+    },
+    transformData: singleResourceToArray,
     xhrOptions,
     dispatch
   });
@@ -96,13 +110,16 @@ export function resetUpdateGistStatus(gistId) {
 
 export function deleteGist(gistId) {
   const xhrOptions = {
+    method: 'DELETE',
     url: `https://api.github.com/gists/${gistId}`,
     headers
   };
 
-  return dispatch => deleteResources({
-    resourceName: 'gists',
-    resources: [gistId],
+  return dispatch => crudRequest('delete', {
+    actionDefaults: {
+      resourceName: 'gists',
+      resources: [gistId],
+    },
     xhrOptions,
     dispatch
   });