diff --git a/docu/community-server.api.md b/docu/community-server.api.md index fa34ded0d..ce4310c0e 100644 --- a/docu/community-server.api.md +++ b/docu/community-server.api.md @@ -35,7 +35,7 @@ Additional session can be provided as GET-Parameter List all transactions for logged in user ### Request -`GET http://localhost/api/ajaxListTransactions/[1]/[25]/[DESC]/[session_id]` +`GET http://localhost/api/listTransactions/[1]/[25]/[DESC]/[session_id]` Parts symbolized by [] are optional - first parameter (1) is page for paging - second parameter (25) is count for paging diff --git a/frontend/.env.dist b/frontend/.env.dist index 8eb386b54..b616c8dc0 100644 --- a/frontend/.env.dist +++ b/frontend/.env.dist @@ -1,6 +1,5 @@ LOGIN_API_URL=http://localhost/login_api/ -COMMUNITY_API_STATE_BALANCE_URL=http://localhost/state-balances/ -COMMUNITY_API_TRANSACTION_CREATION_URL=http://localhost/transaction-creations/ -COMMUNITY_API_TRANSACTION_SEND_COINS=http://localhost/api -VUE_PATH=/vue -APP_VERSION=0 \ No newline at end of file +COMMUNITY_API_STATE_BALANCE_URL=http://localhost/api/ +COMMUNITY_API_TRANSACTION_CREATION_URL=http://localhost/api/ +COMMUNITY_API_TRANSACTION_SEND_COINS=http://localhost/api/ +VUE_PATH=/vue \ No newline at end of file diff --git a/frontend/src/apis/communityAPI.js b/frontend/src/apis/communityAPI.js index e1d148e2f..1c90163d3 100644 --- a/frontend/src/apis/communityAPI.js +++ b/frontend/src/apis/communityAPI.js @@ -33,10 +33,10 @@ const apiPost = async (url, payload) => { const communityAPI = { balance: async (session_id) => { - return apiGet(CONFIG.COMMUNITY_API_STATE_BALANCE_URL + 'ajaxGetBalance/' + session_id) + return apiGet(CONFIG.COMMUNITY_API_STATE_BALANCE_URL + 'getBalance/' + session_id) }, transactions: async (session_id) => { - return apiGet(CONFIG.COMMUNITY_API_STATE_BALANCE_URL + 'ajaxListTransactions/' + session_id) + return apiGet(CONFIG.COMMUNITY_API_STATE_BALANCE_URL + 'listTransactions/1/25/ASC/' + session_id) }, /*create: async (session_id, email, amount, memo, target_date = new Date() ) => { const payload = { diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js index 65b25795d..d74fb49d4 100644 --- a/frontend/src/config/index.js +++ b/frontend/src/config/index.js @@ -7,13 +7,12 @@ const environment = { NODE_ENV: process.env.NODE_ENV, DEBUG: process.env.NODE_ENV !== 'production' || false, PRODUCTION: process.env.NODE_ENV === 'production' || false, - APP_VERSION: process.env.APP_VERSION || require('../../package.json').version, } const server = { LOGIN_API_URL: process.env.LOGIN_API_URL || 'http://localhost/login_api/', COMMUNITY_API_STATE_BALANCE_URL: - process.env.COMMUNITY_API_STATE_BALANCE_URL || 'http://localhost/state-balances/', + process.env.COMMUNITY_API_STATE_BALANCE_URL || 'http://localhost/api/', // Schöpfung // COMMUNITY_API_TRANSACTION_CREATION_URL: process.env.COMMUNITY_API_TRANSACTION_CREATION_URL || 'http://localhost/transaction-creations/', COMMUNITY_API_TRANSACTION_SEND_COINS: