1
0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 01:25:17 +01:00

Merge remote-tracking branch 'remotes/origin/AD-699-rename-prize-endpoint-to-prizes' into AD-686-in-sluice-art-prize-i-can-submit-

Conflicts:
	.gitignore
	js/components/whitelabel/prize/constants/api_urls.js
This commit is contained in:
diminator 2015-08-05 14:50:17 +02:00
commit bd52bc8136
3 changed files with 19 additions and 11 deletions

View File

@ -1,18 +1,17 @@
'use strict';
import AppConstants from '../../../../constants/application_constants';
import AppPrizeConstants from './application_prize_constants';
function getApiUrls(subdomain) {
return {
'pieces_list': AppConstants.apiEndpoint + 'prize/' + subdomain + '/pieces/',
'users_login': AppConstants.apiEndpoint + 'prize/' + subdomain + '/users/login/',
'users_signup': AppConstants.apiEndpoint + 'prize/' + subdomain + '/users/',
'user': AppConstants.apiEndpoint + 'prize/' + subdomain + '/users/',
'piece_submit_to_prize': AppConstants.apiEndpoint + 'prize/' + subdomain + '/pieces/${piece_id}/submit/',
'piece': AppConstants.apiEndpoint + 'prize/' + subdomain + '/pieces/${piece_id}/',
'prize': AppConstants.apiEndpoint + 'prize/' + subdomain + '/',
'jury': AppConstants.apiEndpoint + 'prize/' + subdomain + '/jury/'
};
'pieces_list': AppPrizeConstants.prizeApiEndpoint + subdomain + '/pieces/',
'users_login': AppPrizeConstants.prizeApiEndpoint + subdomain + '/users/login/',
'users_signup': AppPrizeConstants.prizeApiEndpoint + subdomain + '/users/',
'user': AppPrizeConstants.prizeApiEndpoint + subdomain + '/users/',
'piece_submit_to_prize': AppPrizeConstants.prizeApiEndpoint + subdomain + '/pieces/${piece_id}/submit/',
'piece': AppPrizeConstants.prizeApiEndpoint + subdomain + '/pieces/${piece_id}/',
'prize': AppPrizeConstants.prizeApiEndpoint + 'prize/' + subdomain + '/',
'jury': AppPrizeConstants.prizeApiEndpoint + 'prize/' + subdomain + '/jury/'
}
export default getApiUrls;

View File

@ -0,0 +1,9 @@
'use strict';
import AppConstants from '../../../../constants/application_constants';
let constants = {
prizeApiEndpoint: AppConstants.apiEndpoint + 'prizes/'
};
export default constants;

View File

@ -21,7 +21,7 @@ let Route = Router.Route;
let baseUrl = AppConstants.baseUrl;
function getRoutes(commonRoutes) {
function getRoutes() {
return (
<Route name="app" path={baseUrl} handler={App}>
<Route name="landing" path={baseUrl} handler={Landing} />