From 6bea32b08a6400ea2c9442a0fb875eb04b7d7bea Mon Sep 17 00:00:00 2001 From: Felix Hamme Date: Sat, 11 May 2019 20:11:13 +0200 Subject: [PATCH] Move actionType and defaultState definitions from api.js to own files --- js/api.js | 72 +++----------------------------------- js/redux/tournamentInfo.js | 25 +++++++++++++ js/redux/tournamentList.js | 9 +++++ js/redux/userInfo.js | 32 +++++++++++++++++ 4 files changed, 70 insertions(+), 68 deletions(-) create mode 100644 js/redux/tournamentInfo.js create mode 100644 js/redux/tournamentList.js create mode 100644 js/redux/userInfo.js diff --git a/js/api.js b/js/api.js index 7af1396..6798983 100644 --- a/js/api.js +++ b/js/api.js @@ -8,6 +8,10 @@ import thunkMiddleware from 'redux-thunk'; import {errorMessages} from './constants'; +import {actionTypesUserinfo, defaultStateUserinfo} from './redux/userInfo'; +import {actionTypesTournamentinfo, defaultStateTournamentinfo} from './redux/tournamentInfo'; +import {actionTypesTournamentlist, defaultStateTournamentlist} from './redux/tournamentList'; + import getConfig from 'next/config'; const {publicRuntimeConfig} = getConfig(); @@ -15,74 +19,6 @@ const apiUrl = publicRuntimeConfig.api_url; const axios = require('axios'); -const actionTypesUserinfo = { - 'REGISTER': 'REGISTER', - 'REGISTER_RESULT_SUCCESS': 'REGISTER_RESULT_SUCCESS', - 'REGISTER_RESULT_ERROR': 'REGISTER_RESULT_ERROR', - - 'LOGIN': 'LOGIN', - 'LOGIN_RESULT_SUCCESS': 'LOGIN_RESULT_SUCCESS', - 'LOGIN_RESULT_ERROR': 'LOGIN_RESULT_ERROR', - - 'LOGOUT': 'LOGOUT', - - 'VERIFY_CREDENTIALS': 'VERIFY_CREDENTIALS', - 'VERIFY_CREDENTIALS_SUCCESS': 'VERIFY_CREDENTIALS_SUCCESS', - 'VERIFY_CREDENTIALS_ERROR': 'VERIFY_CREDENTIALS_ERROR', - - 'STORE_AUTH_HEADERS': 'STORE_AUTH_HEADERS', - - 'REHYDRATE': 'USERINFO_REHYDRATE', - 'CLEAR': 'USERINFO_CLEAR' -}; - -const defaultStateUserinfo = { - isSignedIn: false, - username: null, - error: false, - errorMessages: [], - - accesstoken: null, - client: null, - expiry: null, - uid: null -}; - -const actionTypesTournamentinfo = { - 'REQUEST_TOURNAMENT': 'REQUEST_TOURNAMENT', - 'REQUEST_TOURNAMENT_SUCCESS': 'REQUEST_TOURNAMENT_SUCCESS', - - 'CREATE_TOURNAMENT': 'CREATE_TOURNAMENT', - - 'MODIFY_TOURNAMENT': 'MODIFY_TOURNAMENT', - 'MODIFY_TOURNAMENT_SUCCESS': 'MODIFY_TOURNAMENT_SUCCESS', - 'MODIFY_TOURNAMENT_ERROR': 'MODIFY_TOURNAMENT_ERROR', - - 'REHYDRATE': 'TOURNAMENTINFO_REHYDRATE', - 'CLEAR': 'TOURNAMENTINFO_CLEAR' -}; - -const defaultStateTournamentinfo = { - code: '', - description: '', - id: -1, - name: '', - ownerUsername: '', - isPublic: '', - stages: [], - teams: [] -}; - -const actionTypesTournamentlist = { - 'FETCH': 'FETCH', - 'FETCH_SUCCESS': 'FETCH_SUCCESS', - 'REHYDRATE': 'REHYDRATE' -}; - -const defaultStateTournamentlist = { - tournaments: [] -}; - export function postRequest(state, url, data) { return axios.post(apiUrl + url, data, { headers: generateHeaders(state) diff --git a/js/redux/tournamentInfo.js b/js/redux/tournamentInfo.js new file mode 100644 index 0000000..3322f04 --- /dev/null +++ b/js/redux/tournamentInfo.js @@ -0,0 +1,25 @@ +export const actionTypesTournamentinfo = { + 'REQUEST_TOURNAMENT': 'REQUEST_TOURNAMENT', + 'REQUEST_TOURNAMENT_SUCCESS': 'REQUEST_TOURNAMENT_SUCCESS', + + 'CREATE_TOURNAMENT': 'CREATE_TOURNAMENT', + + 'MODIFY_TOURNAMENT': 'MODIFY_TOURNAMENT', + 'MODIFY_TOURNAMENT_SUCCESS': 'MODIFY_TOURNAMENT_SUCCESS', + 'MODIFY_TOURNAMENT_ERROR': 'MODIFY_TOURNAMENT_ERROR', + + 'REHYDRATE': 'TOURNAMENTINFO_REHYDRATE', + 'CLEAR': 'TOURNAMENTINFO_CLEAR' +}; + +export const defaultStateTournamentinfo = { + code: '', + description: '', + id: -1, + name: '', + ownerUsername: '', + isPublic: '', + stages: [], + teams: [] +}; + diff --git a/js/redux/tournamentList.js b/js/redux/tournamentList.js new file mode 100644 index 0000000..7e86545 --- /dev/null +++ b/js/redux/tournamentList.js @@ -0,0 +1,9 @@ +export const actionTypesTournamentlist = { + 'FETCH': 'FETCH', + 'FETCH_SUCCESS': 'FETCH_SUCCESS', + 'REHYDRATE': 'REHYDRATE' +}; + +export const defaultStateTournamentlist = { + tournaments: [] +}; diff --git a/js/redux/userInfo.js b/js/redux/userInfo.js new file mode 100644 index 0000000..a8172b4 --- /dev/null +++ b/js/redux/userInfo.js @@ -0,0 +1,32 @@ +export const actionTypesUserinfo = { + 'REGISTER': 'REGISTER', + 'REGISTER_RESULT_SUCCESS': 'REGISTER_RESULT_SUCCESS', + 'REGISTER_RESULT_ERROR': 'REGISTER_RESULT_ERROR', + + 'LOGIN': 'LOGIN', + 'LOGIN_RESULT_SUCCESS': 'LOGIN_RESULT_SUCCESS', + 'LOGIN_RESULT_ERROR': 'LOGIN_RESULT_ERROR', + + 'LOGOUT': 'LOGOUT', + + 'VERIFY_CREDENTIALS': 'VERIFY_CREDENTIALS', + 'VERIFY_CREDENTIALS_SUCCESS': 'VERIFY_CREDENTIALS_SUCCESS', + 'VERIFY_CREDENTIALS_ERROR': 'VERIFY_CREDENTIALS_ERROR', + + 'STORE_AUTH_HEADERS': 'STORE_AUTH_HEADERS', + + 'REHYDRATE': 'USERINFO_REHYDRATE', + 'CLEAR': 'USERINFO_CLEAR' +}; + +export const defaultStateUserinfo = { + isSignedIn: false, + username: null, + error: false, + errorMessages: [], + + accesstoken: null, + client: null, + expiry: null, + uid: null +};