Move axios wrapper methods to new file backendApi

js/api.js

@@ -1,8 +1,4 @@
-import {
+import {applyMiddleware, combineReducers, createStore} from 'redux';
-    createStore,
-    applyMiddleware,
-    combineReducers
-} from 'redux';
 import {composeWithDevTools} from 'redux-devtools-extension';
 import thunkMiddleware from 'redux-thunk';
 
@@ -11,49 +7,8 @@ import {errorMessages} from './constants';
 import {actionTypesUserinfo, defaultStateUserinfo} from './redux/userInfo';
 import {actionTypesTournamentinfo, defaultStateTournamentinfo} from './redux/tournamentInfo';
 import {actionTypesTournamentlist, defaultStateTournamentlist} from './redux/tournamentList';
+import {deleteRequest, getRequest, patchRequest, postRequest} from './redux/backendApi';
 
-import getConfig from 'next/config';
-const {publicRuntimeConfig} = getConfig();
-
-const apiUrl = publicRuntimeConfig.api_url;
-
-const axios = require('axios');
-
-export function postRequest(state, url, data) {
-    return axios.post(apiUrl + url, data, {
-        headers: generateHeaders(state)
-    });
-}
-
-export function getRequest(state, url) {
-    return axios.get(apiUrl + url, {
-        headers: generateHeaders(state)
-    });
-}
-
-export function deleteRequest(state, url) {
-    return axios.delete(apiUrl + url, {
-        headers: generateHeaders(state)
-    });
-}
-
-export function patchRequest(state, url, data) {
-    return axios.patch(apiUrl + url, data, {
-        headers: generateHeaders(state)
-    });
-}
-
-function generateHeaders(state) {
-    if (state.userinfo.isSignedIn) {
-        return {
-            'access-token': state.userinfo.accesstoken,
-            'client': state.userinfo.client,
-            'uid': state.userinfo.uid
-        };
-    } else {
-        return {};
-    }
-}
 
 function storeOptionalToken(response) {
     if (checkForAuthenticationHeaders(response)) {

js/redux/backendApi.js

@@ -0,0 +1,42 @@
+import getConfig from 'next/config';
+const {publicRuntimeConfig} = getConfig();
+
+const apiUrl = publicRuntimeConfig.api_url;
+
+const axios = require('axios');
+
+export function postRequest(state, url, data) {
+    return axios.post(apiUrl + url, data, {
+        headers: generateHeaders(state)
+    });
+}
+
+export function getRequest(state, url) {
+    return axios.get(apiUrl + url, {
+        headers: generateHeaders(state)
+    });
+}
+
+export function deleteRequest(state, url) {
+    return axios.delete(apiUrl + url, {
+        headers: generateHeaders(state)
+    });
+}
+
+export function patchRequest(state, url, data) {
+    return axios.patch(apiUrl + url, data, {
+        headers: generateHeaders(state)
+    });
+}
+
+function generateHeaders(state) {
+    if (state.userinfo.isSignedIn) {
+        return {
+            'access-token': state.userinfo.accesstoken,
+            'client': state.userinfo.client,
+            'uid': state.userinfo.uid
+        };
+    } else {
+        return {};
+    }
+}

pages/tournament.js

@@ -24,9 +24,8 @@ import {ErrorPageComponent} from '../js/components/ErrorComponents';
 import {Footer} from '../js/components/Footer';
 import {TurniereNavigation} from '../js/components/Navigation';
 import {BigImage} from '../js/components/BigImage';
-import {
+import {getState} from '../js/api';
-    getRequest, getState
+import {getRequest} from '../js/redux/backendApi';
-} from '../js/api';
 
 import 'bootstrap/dist/css/bootstrap.min.css';