Refactor fetching

spaceappsnyc · Jan 21, 2019 · 3f2b3b0 · 3f2b3b0
1 parent 935d9d4
commit 3f2b3b0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 28 deletions.
diff --git a/src/store/auth.js b/src/store/auth.js
@@ -3,26 +3,8 @@ import { all, takeLatest, put } from "redux-saga/effects";
 import { parse } from "query-string";
 import { LOCATION_CHANGE, push } from "connected-react-router";
 
-// import store from "./index";
 import { getToken, setToken, clearToken } from "../api";
 
-// export const checkAuth = (nextState, replace) => {
-//   const token = nextState.location.query["access_token"];
-//   if (token) {
-//     setToken(token);
-//     setHeaderToken(token);
-//     store.dispatch(saveAuthToken(token));
-//     replace(nextState.location.pathname);
-//   }
-// };
-
-// export const logout = (nextState, replace) => {
-//   clearToken();
-//   setHeaderToken("");
-//   store.dispatch(clearAuthToken());
-//   replace("/");
-// };
-
 export const SAVE_AUTH_TOKEN = "SAVE_AUTH_TOKEN";
 export const CLEAR_AUTH_TOKEN = "CLEAR_AUTH_TOKEN";
 

diff --git a/src/store/members.js b/src/store/members.js
@@ -9,14 +9,13 @@ export const requestMembers = () => ({ type: REQUEST_MEMBERS });
 export const receiveMembers = members => ({ type: RECEIVE_MEMBERS, members });
 export const rejectMembers = error => ({ type: REJECT_MEMBERS, error });
 
-export const fetchMembers = () =>
-  fetch(
-    `${process.env.REACT_APP_GITHUB_URL}/orgs/spaceappsnyc/members?per_page=100`
-  );
+const MEMBERS_URL = `${
+  process.env.REACT_APP_GITHUB_URL
+}/orgs/spaceappsnyc/members?per_page=100`;
 
 export function* getMembers(action) {
   try {
-    const members = yield call(fetchMembers, action);
+    const members = yield call(fetch, MEMBERS_URL);
     yield put(receiveMembers(members));
   } catch (error) {
     yield put(rejectMembers(error.message));

diff --git a/src/store/repos.js b/src/store/repos.js
@@ -9,14 +9,13 @@ export const requestRepos = () => ({ type: REQUEST_REPOS });
 export const receiveRepos = repos => ({ type: RECEIVE_REPOS, repos });
 export const rejectRepos = error => ({ type: REJECT_REPOS, error });
 
-export const fetchRepos = () =>
-  fetch(
-    `${process.env.REACT_APP_GITHUB_URL}/orgs/spaceappsnyc/repos?type=member`
-  );
+const REPOS_URL = `${
+  process.env.REACT_APP_GITHUB_URL
+}/orgs/spaceappsnyc/repos?type=member`;
 
 export function* getRepos(action) {
   try {
-    const repos = yield call(fetchRepos, action);
+    const repos = yield call(fetch, REPOS_URL);
     yield put(receiveRepos(repos));
   } catch (error) {
     yield put(rejectRepos(error.message));