mirror of
https://github.com/ascribe/onion.git
synced 2024-11-15 01:25:17 +01:00
Merge remote-tracking branch 'remotes/origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
Conflicts: js/components/whitelabel/wallet/components/cyland/cyland_hero.js
This commit is contained in:
commit
c24021302f
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import ApplicationFetcher from '../fetchers/application_fetcher';
|
import ApplicationFetcher from '../fetchers/application_fetcher';
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import CoaFetcher from '../fetchers/coa_fetcher';
|
import CoaFetcher from '../fetchers/coa_fetcher';
|
||||||
|
|
||||||
import Q from 'q';
|
import Q from 'q';
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import Q from 'q';
|
import Q from 'q';
|
||||||
|
|
||||||
import OwnershipFetcher from '../fetchers/ownership_fetcher';
|
import OwnershipFetcher from '../fetchers/ownership_fetcher';
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import OwnershipFetcher from '../fetchers/ownership_fetcher';
|
import OwnershipFetcher from '../fetchers/ownership_fetcher';
|
||||||
import Q from 'q';
|
import Q from 'q';
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import EditionFetcher from '../fetchers/edition_fetcher';
|
import EditionFetcher from '../fetchers/edition_fetcher';
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import Q from 'q';
|
import Q from 'q';
|
||||||
|
|
||||||
import EditionListFetcher from '../fetchers/edition_list_fetcher.js';
|
import EditionListFetcher from '../fetchers/edition_list_fetcher.js';
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { altThirdParty } from '../alt';
|
||||||
|
|
||||||
|
|
||||||
class EventActions {
|
class EventActions {
|
||||||
@ -16,4 +16,4 @@ class EventActions {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default alt.createActions(EventActions);
|
export default altThirdParty.createActions(EventActions);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
|
|
||||||
|
|
||||||
class GlobalNotificationActions {
|
class GlobalNotificationActions {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import LicenseFetcher from '../fetchers/license_fetcher';
|
import LicenseFetcher from '../fetchers/license_fetcher';
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import Q from 'q';
|
import Q from 'q';
|
||||||
|
|
||||||
import NotificationFetcher from '../fetchers/notification_fetcher';
|
import NotificationFetcher from '../fetchers/notification_fetcher';
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import OwnershipFetcher from '../fetchers/ownership_fetcher';
|
import OwnershipFetcher from '../fetchers/ownership_fetcher';
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import PieceFetcher from '../fetchers/piece_fetcher';
|
import PieceFetcher from '../fetchers/piece_fetcher';
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import Q from 'q';
|
import Q from 'q';
|
||||||
|
|
||||||
import PieceListFetcher from '../fetchers/piece_list_fetcher';
|
import PieceListFetcher from '../fetchers/piece_list_fetcher';
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import Q from 'q';
|
import Q from 'q';
|
||||||
|
|
||||||
import PrizeListFetcher from '../fetchers/prize_list_fetcher';
|
import PrizeListFetcher from '../fetchers/prize_list_fetcher';
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { altUser } from '../alt';
|
||||||
import UserFetcher from '../fetchers/user_fetcher';
|
import UserFetcher from '../fetchers/user_fetcher';
|
||||||
|
|
||||||
|
|
||||||
@ -34,4 +34,4 @@ class UserActions {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default alt.createActions(UserActions);
|
export default altUser.createActions(UserActions);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import WalletSettingsFetcher from '../fetchers/wallet_settings_fetcher';
|
import WalletSettingsFetcher from '../fetchers/wallet_settings_fetcher';
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { altWhitelabel } from '../alt';
|
||||||
import WhitelabelFetcher from '../fetchers/whitelabel_fetcher';
|
import WhitelabelFetcher from '../fetchers/whitelabel_fetcher';
|
||||||
|
|
||||||
|
|
||||||
@ -26,4 +26,4 @@ class WhitelabelActions {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default alt.createActions(WhitelabelActions);
|
export default altWhitelabel.createActions(WhitelabelActions);
|
||||||
|
@ -2,4 +2,7 @@
|
|||||||
|
|
||||||
import Alt from 'alt';
|
import Alt from 'alt';
|
||||||
|
|
||||||
export default new Alt();
|
export let alt = new Alt();
|
||||||
|
export let altThirdParty = new Alt();
|
||||||
|
export let altUser = new Alt();
|
||||||
|
export let altWhitelabel = new Alt();
|
||||||
|
@ -43,7 +43,7 @@ let FurtherDetailsFileuploader = React.createClass({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Property
|
<Property
|
||||||
label="Additional files (max. 50MB per file)">
|
label="Additional files">
|
||||||
<ReactS3FineUploader
|
<ReactS3FineUploader
|
||||||
uploadStarted={this.props.uploadStarted}
|
uploadStarted={this.props.uploadStarted}
|
||||||
keyRoutine={{
|
keyRoutine={{
|
||||||
|
@ -22,6 +22,7 @@ let InputCheckbox = React.createClass({
|
|||||||
React.PropTypes.arrayOf(React.PropTypes.element),
|
React.PropTypes.arrayOf(React.PropTypes.element),
|
||||||
React.PropTypes.element
|
React.PropTypes.element
|
||||||
]),
|
]),
|
||||||
|
name: React.PropTypes.string,
|
||||||
|
|
||||||
// provided by Property
|
// provided by Property
|
||||||
disabled: React.PropTypes.bool,
|
disabled: React.PropTypes.bool,
|
||||||
@ -50,7 +51,7 @@ let InputCheckbox = React.createClass({
|
|||||||
|
|
||||||
// Developer's are used to define defaultValues for inputs via defaultValue, but since this is a
|
// Developer's are used to define defaultValues for inputs via defaultValue, but since this is a
|
||||||
// input of type checkbox we warn the dev to not do that.
|
// input of type checkbox we warn the dev to not do that.
|
||||||
if(this.props.defaultValue) {
|
if(this.props.defaultValue) { //eslint-disable-line react/prop-types
|
||||||
console.warn('InputCheckbox is of type checkbox. Therefore its value is represented by checked and defaultChecked. defaultValue will do nothing!');
|
console.warn('InputCheckbox is of type checkbox. Therefore its value is represented by checked and defaultChecked. defaultValue will do nothing!');
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -102,8 +103,10 @@ let InputCheckbox = React.createClass({
|
|||||||
return (
|
return (
|
||||||
<span
|
<span
|
||||||
style={this.props.style}
|
style={this.props.style}
|
||||||
onClick={this.onChange}>
|
onClick={this.onChange}
|
||||||
|
name={this.props.name}>
|
||||||
<input
|
<input
|
||||||
|
name={this.props.name}
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
ref="checkbox"
|
ref="checkbox"
|
||||||
onChange={this.onChange}
|
onChange={this.onChange}
|
||||||
@ -119,4 +122,4 @@ let InputCheckbox = React.createClass({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
export default InputCheckbox;
|
export default InputCheckbox;
|
||||||
|
@ -31,6 +31,7 @@ let Property = React.createClass({
|
|||||||
footer: React.PropTypes.element,
|
footer: React.PropTypes.element,
|
||||||
handleChange: React.PropTypes.func,
|
handleChange: React.PropTypes.func,
|
||||||
ignoreFocus: React.PropTypes.bool,
|
ignoreFocus: React.PropTypes.bool,
|
||||||
|
name: React.PropTypes.string.isRequired,
|
||||||
className: React.PropTypes.string,
|
className: React.PropTypes.string,
|
||||||
|
|
||||||
onClick: React.PropTypes.func,
|
onClick: React.PropTypes.func,
|
||||||
@ -215,7 +216,8 @@ let Property = React.createClass({
|
|||||||
onFocus: this.handleFocus,
|
onFocus: this.handleFocus,
|
||||||
onBlur: this.handleBlur,
|
onBlur: this.handleBlur,
|
||||||
disabled: !this.props.editable,
|
disabled: !this.props.editable,
|
||||||
ref: 'input'
|
ref: 'input',
|
||||||
|
name: this.props.name
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@ -264,4 +266,4 @@ let Property = React.createClass({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
export default Property;
|
export default Property;
|
||||||
|
@ -4,7 +4,7 @@ import React from 'react';
|
|||||||
import Router from 'react-router';
|
import Router from 'react-router';
|
||||||
|
|
||||||
import UserActions from '../actions/user_actions';
|
import UserActions from '../actions/user_actions';
|
||||||
import Alt from '../alt';
|
import { alt, altWhitelabel, altUser, altThirdParty } from '../alt';
|
||||||
|
|
||||||
import AppConstants from '../constants/application_constants';
|
import AppConstants from '../constants/application_constants';
|
||||||
let baseUrl = AppConstants.baseUrl;
|
let baseUrl = AppConstants.baseUrl;
|
||||||
@ -16,7 +16,10 @@ let LogoutContainer = React.createClass({
|
|||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
UserActions.logoutCurrentUser()
|
UserActions.logoutCurrentUser()
|
||||||
.then(() => {
|
.then(() => {
|
||||||
Alt.flush();
|
alt.flush();
|
||||||
|
altWhitelabel.flush();
|
||||||
|
altUser.flush();
|
||||||
|
altThirdParty.flush();
|
||||||
// kill intercom (with fire)
|
// kill intercom (with fire)
|
||||||
window.Intercom('shutdown');
|
window.Intercom('shutdown');
|
||||||
this.replaceWith(baseUrl);
|
this.replaceWith(baseUrl);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../../../../alt';
|
import { alt } from '../../../../alt';
|
||||||
import Q from 'q';
|
import Q from 'q';
|
||||||
|
|
||||||
import PrizeFetcher from '../fetchers/prize_fetcher';
|
import PrizeFetcher from '../fetchers/prize_fetcher';
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../../../../alt';
|
import { alt } from '../../../../alt';
|
||||||
import Q from 'q';
|
import Q from 'q';
|
||||||
|
|
||||||
import PrizeJuryFetcher from '../fetchers/prize_jury_fetcher';
|
import PrizeJuryFetcher from '../fetchers/prize_jury_fetcher';
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../../../../alt';
|
import { alt } from '../../../../alt';
|
||||||
import Q from 'q';
|
import Q from 'q';
|
||||||
|
|
||||||
import PrizeRatingFetcher from '../fetchers/prize_rating_fetcher';
|
import PrizeRatingFetcher from '../fetchers/prize_rating_fetcher';
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../../../../alt';
|
import { alt } from '../../../../alt';
|
||||||
|
|
||||||
import PrizeJuryActions from '../actions/prize_jury_actions';
|
import PrizeJuryActions from '../actions/prize_jury_actions';
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../../../../alt';
|
import { alt } from '../../../../alt';
|
||||||
|
|
||||||
import PrizeRatingActions from '../actions/prize_rating_actions';
|
import PrizeRatingActions from '../actions/prize_rating_actions';
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../../../../alt';
|
import { alt } from '../../../../alt';
|
||||||
|
|
||||||
import PrizeActions from '../actions/prize_actions';
|
import PrizeActions from '../actions/prize_actions';
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ let WalletActionPanel = React.createClass({
|
|||||||
className="text-center ascribe-button-list"
|
className="text-center ascribe-button-list"
|
||||||
availableAcls={availableAcls}
|
availableAcls={availableAcls}
|
||||||
editions={this.props.piece}
|
editions={this.props.piece}
|
||||||
handleSuccess={this.loadPiece}>
|
handleSuccess={this.props.loadPiece}>
|
||||||
<AclProxy
|
<AclProxy
|
||||||
aclObject={this.props.currentUser.acl}
|
aclObject={this.props.currentUser.acl}
|
||||||
aclName="acl_wallet_submit">
|
aclName="acl_wallet_submit">
|
||||||
@ -58,7 +58,6 @@ let WalletActionPanel = React.createClass({
|
|||||||
aclName="acl_wallet_submit">
|
aclName="acl_wallet_submit">
|
||||||
<SubmitButtonType
|
<SubmitButtonType
|
||||||
className="btn-sm"
|
className="btn-sm"
|
||||||
handleSuccess={this.handleSubmitSuccess}
|
|
||||||
piece={this.props.piece}/>
|
piece={this.props.piece}/>
|
||||||
</AclProxy>
|
</AclProxy>
|
||||||
</AclProxy>
|
</AclProxy>
|
||||||
|
@ -12,7 +12,7 @@ import UserStore from '../../../../../../stores/user_store';
|
|||||||
import GlobalNotificationModel from '../../../../../../models/global_notification_model';
|
import GlobalNotificationModel from '../../../../../../models/global_notification_model';
|
||||||
import GlobalNotificationActions from '../../../../../../actions/global_notification_actions';
|
import GlobalNotificationActions from '../../../../../../actions/global_notification_actions';
|
||||||
|
|
||||||
import CylandSubmitButton from '../ascribe_buttons/cyland_submit_button';
|
import CylandSubmitButton from '../cyland_buttons/cyland_submit_button';
|
||||||
import AclProxy from '../../../../../acl_proxy';
|
import AclProxy from '../../../../../acl_proxy';
|
||||||
|
|
||||||
import { getLangText } from '../../../../../../utils/lang_utils';
|
import { getLangText } from '../../../../../../utils/lang_utils';
|
@ -10,6 +10,7 @@ import WhitelabelStore from '../../../../../../stores/whitelabel_store';
|
|||||||
|
|
||||||
import { getLangText } from '../../../../../../utils/lang_utils';
|
import { getLangText } from '../../../../../../utils/lang_utils';
|
||||||
|
|
||||||
|
|
||||||
let CylandSubmitButton = React.createClass({
|
let CylandSubmitButton = React.createClass({
|
||||||
propTypes: {
|
propTypes: {
|
||||||
className: React.PropTypes.string,
|
className: React.PropTypes.string,
|
@ -7,11 +7,11 @@ import PieceStore from '../../../../../../stores/piece_store';
|
|||||||
|
|
||||||
import UserStore from '../../../../../../stores/user_store';
|
import UserStore from '../../../../../../stores/user_store';
|
||||||
|
|
||||||
import CylandSubmitButton from '../ascribe_buttons/cyland_submit_button';
|
import CylandSubmitButton from '../cyland_buttons/cyland_submit_button';
|
||||||
|
|
||||||
import CollapsibleParagraph from '../../../../../../components/ascribe_collapsible/collapsible_paragraph';
|
import CollapsibleParagraph from '../../../../../../components/ascribe_collapsible/collapsible_paragraph';
|
||||||
|
|
||||||
import CylandAdditionalDataForm from '../ascribe_forms/cyland_additional_data_form';
|
import CylandAdditionalDataForm from '../cyland_forms/cyland_additional_data_form';
|
||||||
|
|
||||||
import WalletPieceContainer from '../../ascribe_detail/wallet_piece_container';
|
import WalletPieceContainer from '../../ascribe_detail/wallet_piece_container';
|
||||||
|
|
||||||
@ -21,6 +21,10 @@ import { getLangText } from '../../../../../../utils/lang_utils';
|
|||||||
import { mergeOptions } from '../../../../../../utils/general_utils';
|
import { mergeOptions } from '../../../../../../utils/general_utils';
|
||||||
|
|
||||||
let CylandPieceContainer = React.createClass({
|
let CylandPieceContainer = React.createClass({
|
||||||
|
propTypes: {
|
||||||
|
params: React.PropTypes.object
|
||||||
|
},
|
||||||
|
|
||||||
getInitialState() {
|
getInitialState() {
|
||||||
return mergeOptions(
|
return mergeOptions(
|
||||||
PieceStore.getState(),
|
PieceStore.getState(),
|
@ -35,17 +35,17 @@ let CylandAdditionalDataForm = React.createClass({
|
|||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
handleSuccess() {
|
|
||||||
let notification = new GlobalNotificationModel('Further details successfully updated', 'success', 10000);
|
|
||||||
GlobalNotificationActions.appendGlobalNotification(notification);
|
|
||||||
},
|
|
||||||
|
|
||||||
getInitialState() {
|
getInitialState() {
|
||||||
return {
|
return {
|
||||||
isUploadReady: true
|
isUploadReady: true
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
|
handleSuccess() {
|
||||||
|
let notification = new GlobalNotificationModel(getLangText('Further details successfully updated'), 'success', 10000);
|
||||||
|
GlobalNotificationActions.appendGlobalNotification(notification);
|
||||||
|
},
|
||||||
|
|
||||||
getFormData() {
|
getFormData() {
|
||||||
let extradata = {};
|
let extradata = {};
|
||||||
let formRefs = this.refs.form.refs;
|
let formRefs = this.refs.form.refs;
|
@ -1,7 +1,7 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import constants from '../../../../constants/application_constants';
|
import AppConstants from '../../../../constants/application_constants';
|
||||||
|
|
||||||
|
|
||||||
let Hero = React.createClass({
|
let Hero = React.createClass({
|
||||||
@ -9,7 +9,7 @@ let Hero = React.createClass({
|
|||||||
return (
|
return (
|
||||||
<div className="hero">
|
<div className="hero">
|
||||||
<img
|
<img
|
||||||
className="logo" src={constants.whitelabel.logo}
|
className="logo" src={AppConstants.whitelabel.logo}
|
||||||
alt="Cyland Video Archive"
|
alt="Cyland Video Archive"
|
||||||
height="200px"/>
|
height="200px"/>
|
||||||
</div>
|
</div>
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import Router from 'react-router';
|
import Router from 'react-router';
|
||||||
|
|
||||||
|
|
||||||
import WhitelabelActions from '../../../../../actions/whitelabel_actions';
|
import WhitelabelActions from '../../../../../actions/whitelabel_actions';
|
||||||
import WhitelabelStore from '../../../../../stores/whitelabel_store';
|
import WhitelabelStore from '../../../../../stores/whitelabel_store';
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ import PieceList from '../../../../piece_list';
|
|||||||
import UserActions from '../../../../../actions/user_actions';
|
import UserActions from '../../../../../actions/user_actions';
|
||||||
import UserStore from '../../../../../stores/user_store';
|
import UserStore from '../../../../../stores/user_store';
|
||||||
|
|
||||||
import CylandAccordionListItem from './ascribe_accordion_list/cyland_accordion_list_item';
|
import CylandAccordionListItem from './cyland_accordion_list/cyland_accordion_list_item';
|
||||||
|
|
||||||
import { getLangText } from '../../../../../utils/lang_utils';
|
import { getLangText } from '../../../../../utils/lang_utils';
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ import PieceActions from '../../../../../actions/piece_actions';
|
|||||||
import GlobalNotificationModel from '../../../../../models/global_notification_model';
|
import GlobalNotificationModel from '../../../../../models/global_notification_model';
|
||||||
import GlobalNotificationActions from '../../../../../actions/global_notification_actions';
|
import GlobalNotificationActions from '../../../../../actions/global_notification_actions';
|
||||||
|
|
||||||
import CylandAdditionalDataForm from './ascribe_forms/cyland_additional_data_form';
|
import CylandAdditionalDataForm from './cyland_forms/cyland_additional_data_form';
|
||||||
|
|
||||||
import LoanForm from '../../../../ascribe_forms/form_loan';
|
import LoanForm from '../../../../ascribe_forms/form_loan';
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ import UserStore from '../../../../../../stores/user_store';
|
|||||||
import GlobalNotificationModel from '../../../../../../models/global_notification_model';
|
import GlobalNotificationModel from '../../../../../../models/global_notification_model';
|
||||||
import GlobalNotificationActions from '../../../../../../actions/global_notification_actions';
|
import GlobalNotificationActions from '../../../../../../actions/global_notification_actions';
|
||||||
|
|
||||||
import IkonotvSubmitButton from '../ascribe_buttons/ikonotv_submit_button';
|
import IkonotvSubmitButton from '../ikonotv_buttons/ikonotv_submit_button';
|
||||||
|
|
||||||
import AclProxy from '../../../../../acl_proxy';
|
import AclProxy from '../../../../../acl_proxy';
|
||||||
|
|
@ -9,7 +9,6 @@ import { getLangText } from '../../../../../../utils/lang_utils';
|
|||||||
let IkonotvSubmitButton = React.createClass({
|
let IkonotvSubmitButton = React.createClass({
|
||||||
propTypes: {
|
propTypes: {
|
||||||
className: React.PropTypes.string,
|
className: React.PropTypes.string,
|
||||||
handleSuccess: React.PropTypes.func,
|
|
||||||
piece: React.PropTypes.object.isRequired
|
piece: React.PropTypes.object.isRequired
|
||||||
},
|
},
|
||||||
|
|
@ -7,13 +7,12 @@ import PieceStore from '../../../../../../stores/piece_store';
|
|||||||
|
|
||||||
import UserStore from '../../../../../../stores/user_store';
|
import UserStore from '../../../../../../stores/user_store';
|
||||||
|
|
||||||
|
import IkonotvSubmitButton from '../ikonotv_buttons/ikonotv_submit_button';
|
||||||
import IkonotvSubmitButton from '../ascribe_buttons/ikonotv_submit_button';
|
|
||||||
|
|
||||||
import CollapsibleParagraph from '../../../../../../components/ascribe_collapsible/collapsible_paragraph';
|
import CollapsibleParagraph from '../../../../../../components/ascribe_collapsible/collapsible_paragraph';
|
||||||
|
|
||||||
import IkonotvArtistDetailsForm from '../ascribe_forms/ikonotv_artist_details_form';
|
import IkonotvArtistDetailsForm from '../ikonotv_forms/ikonotv_artist_details_form';
|
||||||
import IkonotvArtworkDetailsForm from '../ascribe_forms/ikonotv_artwork_details_form';
|
import IkonotvArtworkDetailsForm from '../ikonotv_forms/ikonotv_artwork_details_form';
|
||||||
|
|
||||||
import WalletPieceContainer from '../../ascribe_detail/wallet_piece_container';
|
import WalletPieceContainer from '../../ascribe_detail/wallet_piece_container';
|
||||||
|
|
||||||
@ -22,7 +21,12 @@ import AscribeSpinner from '../../../../../ascribe_spinner';
|
|||||||
import { getLangText } from '../../../../../../utils/lang_utils';
|
import { getLangText } from '../../../../../../utils/lang_utils';
|
||||||
import { mergeOptions } from '../../../../../../utils/general_utils';
|
import { mergeOptions } from '../../../../../../utils/general_utils';
|
||||||
|
|
||||||
|
|
||||||
let IkonotvPieceContainer = React.createClass({
|
let IkonotvPieceContainer = React.createClass({
|
||||||
|
propTypes: {
|
||||||
|
params: React.PropTypes.object
|
||||||
|
},
|
||||||
|
|
||||||
getInitialState() {
|
getInitialState() {
|
||||||
return mergeOptions(
|
return mergeOptions(
|
||||||
PieceStore.getState(),
|
PieceStore.getState(),
|
@ -6,7 +6,7 @@ import PieceList from '../../../../piece_list';
|
|||||||
import UserActions from '../../../../../actions/user_actions';
|
import UserActions from '../../../../../actions/user_actions';
|
||||||
import UserStore from '../../../../../stores/user_store';
|
import UserStore from '../../../../../stores/user_store';
|
||||||
|
|
||||||
import IkonotvAccordionListItem from './ascribe_accordion_list/ikonotv_accordion_list_item';
|
import IkonotvAccordionListItem from './ikonotv_accordion_list/ikonotv_accordion_list_item';
|
||||||
|
|
||||||
import { getLangText } from '../../../../../utils/lang_utils';
|
import { getLangText } from '../../../../../utils/lang_utils';
|
||||||
|
|
||||||
|
@ -22,8 +22,8 @@ import GlobalNotificationActions from '../../../../../actions/global_notificatio
|
|||||||
import RegisterPieceForm from '../../../../ascribe_forms/form_register_piece';
|
import RegisterPieceForm from '../../../../ascribe_forms/form_register_piece';
|
||||||
import LoanForm from '../../../../ascribe_forms/form_loan';
|
import LoanForm from '../../../../ascribe_forms/form_loan';
|
||||||
|
|
||||||
import IkonotvArtistDetailsForm from './ascribe_forms/ikonotv_artist_details_form';
|
import IkonotvArtistDetailsForm from './ikonotv_forms/ikonotv_artist_details_form';
|
||||||
import IkonotvArtworkDetailsForm from './ascribe_forms/ikonotv_artwork_details_form';
|
import IkonotvArtworkDetailsForm from './ikonotv_forms/ikonotv_artwork_details_form';
|
||||||
|
|
||||||
import SlidesContainer from '../../../../ascribe_slides_container/slides_container';
|
import SlidesContainer from '../../../../ascribe_slides_container/slides_container';
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ import ContractSettings from '../../../components/ascribe_settings/contract_sett
|
|||||||
import ErrorNotFoundPage from '../../../components/error_not_found_page';
|
import ErrorNotFoundPage from '../../../components/error_not_found_page';
|
||||||
|
|
||||||
import CylandLanding from './components/cyland/cyland_landing';
|
import CylandLanding from './components/cyland/cyland_landing';
|
||||||
import CylandPieceContainer from './components/cyland/ascribe_detail/cyland_piece_container';
|
import CylandPieceContainer from './components/cyland/cyland_detail/cyland_piece_container';
|
||||||
import CylandRegisterPiece from './components/cyland/cyland_register_piece';
|
import CylandRegisterPiece from './components/cyland/cyland_register_piece';
|
||||||
import CylandPieceList from './components/cyland/cyland_piece_list';
|
import CylandPieceList from './components/cyland/cyland_piece_list';
|
||||||
|
|
||||||
@ -25,7 +25,7 @@ import IkonotvLanding from './components/ikonotv/ikonotv_landing';
|
|||||||
import IkonotvPieceList from './components/ikonotv/ikonotv_piece_list';
|
import IkonotvPieceList from './components/ikonotv/ikonotv_piece_list';
|
||||||
import IkonotvRequestLoan from './components/ikonotv/ikonotv_request_loan';
|
import IkonotvRequestLoan from './components/ikonotv/ikonotv_request_loan';
|
||||||
import IkonotvRegisterPiece from './components/ikonotv/ikonotv_register_piece';
|
import IkonotvRegisterPiece from './components/ikonotv/ikonotv_register_piece';
|
||||||
import IkonotvPieceContainer from './components/ikonotv/ascribe_detail/ikonotv_piece_container';
|
import IkonotvPieceContainer from './components/ikonotv/ikonotv_detail/ikonotv_piece_container';
|
||||||
import IkonotvContractNotifications from './components/ikonotv/ikonotv_contract_notifications';
|
import IkonotvContractNotifications from './components/ikonotv/ikonotv_contract_notifications';
|
||||||
|
|
||||||
import CCRegisterPiece from './components/cc/cc_register_piece';
|
import CCRegisterPiece from './components/cc/cc_register_piece';
|
||||||
|
@ -61,7 +61,7 @@ let constants = {
|
|||||||
'validation': {
|
'validation': {
|
||||||
'additionalData': {
|
'additionalData': {
|
||||||
'itemLimit': 100,
|
'itemLimit': 100,
|
||||||
'sizeLimit': '50000000'
|
'sizeLimit': '25000000000'
|
||||||
},
|
},
|
||||||
'registerWork': {
|
'registerWork': {
|
||||||
'itemLimit': 1,
|
'itemLimit': 1,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import ApplicationActions from '../actions/application_actions';
|
import ApplicationActions from '../actions/application_actions';
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import CoaActions from '../actions/coa_actions';
|
import CoaActions from '../actions/coa_actions';
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import ContractAgreementListActions from '../actions/contract_agreement_list_actions';
|
import ContractAgreementListActions from '../actions/contract_agreement_list_actions';
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import ContractListActions from '../actions/contract_list_actions';
|
import ContractListActions from '../actions/contract_list_actions';
|
||||||
|
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import EditionsListActions from '../actions/edition_list_actions';
|
import EditionsListActions from '../actions/edition_list_actions';
|
||||||
|
|
||||||
class EditionListStore {
|
class EditionListStore {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import EditionActions from '../actions/edition_actions';
|
import EditionActions from '../actions/edition_actions';
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
|
|
||||||
import GlobalNotificationActions from '../actions/global_notification_actions';
|
import GlobalNotificationActions from '../actions/global_notification_actions';
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import LicenseActions from '../actions/license_actions';
|
import LicenseActions from '../actions/license_actions';
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
|
|
||||||
import NotificationActions from '../actions/notification_actions';
|
import NotificationActions from '../actions/notification_actions';
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import OwnershipActions from '../actions/ownership_actions';
|
import OwnershipActions from '../actions/ownership_actions';
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
|
|
||||||
import PieceListActions from '../actions/piece_list_actions';
|
import PieceListActions from '../actions/piece_list_actions';
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import PieceActions from '../actions/piece_actions';
|
import PieceActions from '../actions/piece_actions';
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
|
|
||||||
import PrizeListActions from '../actions/prize_list_actions';
|
import PrizeListActions from '../actions/prize_list_actions';
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { altUser } from '../alt';
|
||||||
import UserActions from '../actions/user_actions';
|
import UserActions from '../actions/user_actions';
|
||||||
|
|
||||||
|
|
||||||
@ -18,4 +18,4 @@ class UserStore {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default alt.createStore(UserStore, 'UserStore');
|
export default altUser.createStore(UserStore, 'UserStore');
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { alt } from '../alt';
|
||||||
import WalletSettingsActions from '../actions/wallet_settings_actions';
|
import WalletSettingsActions from '../actions/wallet_settings_actions';
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { altWhitelabel } from '../alt';
|
||||||
import WhitelabelActions from '../actions/whitelabel_actions';
|
import WhitelabelActions from '../actions/whitelabel_actions';
|
||||||
|
|
||||||
|
|
||||||
@ -15,4 +15,4 @@ class WhitelabelStore {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default alt.createStore(WhitelabelStore, 'WhitelabelStore');
|
export default altWhitelabel.createStore(WhitelabelStore, 'WhitelabelStore');
|
||||||
|
4
js/third_party/debug.js
vendored
4
js/third_party/debug.js
vendored
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { altThirdParty } from '../alt';
|
||||||
import EventActions from '../actions/event_actions';
|
import EventActions from '../actions/event_actions';
|
||||||
|
|
||||||
|
|
||||||
@ -27,4 +27,4 @@ class DebugHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default alt.createStore(DebugHandler, 'DebugHandler');
|
export default altThirdParty.createStore(DebugHandler, 'DebugHandler');
|
||||||
|
4
js/third_party/ga.js
vendored
4
js/third_party/ga.js
vendored
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { altThirdParty } from '../alt';
|
||||||
import EventActions from '../actions/event_actions';
|
import EventActions from '../actions/event_actions';
|
||||||
|
|
||||||
class GoogleAnalyticsHandler {
|
class GoogleAnalyticsHandler {
|
||||||
@ -23,4 +23,4 @@ class GoogleAnalyticsHandler {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default alt.createStore(GoogleAnalyticsHandler, 'GoogleAnalyticsHandler');
|
export default altThirdParty.createStore(GoogleAnalyticsHandler, 'GoogleAnalyticsHandler');
|
||||||
|
4
js/third_party/intercom.js
vendored
4
js/third_party/intercom.js
vendored
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { altThirdParty } from '../alt';
|
||||||
import EventActions from '../actions/event_actions';
|
import EventActions from '../actions/event_actions';
|
||||||
|
|
||||||
import { getSubdomain } from '../utils/general_utils';
|
import { getSubdomain } from '../utils/general_utils';
|
||||||
@ -33,4 +33,4 @@ class IntercomHandler {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default alt.createStore(IntercomHandler, 'IntercomHandler');
|
export default altThirdParty.createStore(IntercomHandler, 'IntercomHandler');
|
||||||
|
4
js/third_party/notifications.js
vendored
4
js/third_party/notifications.js
vendored
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { altThirdParty } from '../alt';
|
||||||
import EventActions from '../actions/event_actions';
|
import EventActions from '../actions/event_actions';
|
||||||
|
|
||||||
import NotificationActions from '../actions/notification_actions';
|
import NotificationActions from '../actions/notification_actions';
|
||||||
@ -35,4 +35,4 @@ class NotificationsHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default alt.createStore(NotificationsHandler, 'NotificationsHandler');
|
export default altThirdParty.createStore(NotificationsHandler, 'NotificationsHandler');
|
||||||
|
4
js/third_party/raven.js
vendored
4
js/third_party/raven.js
vendored
@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
import alt from '../alt';
|
import { altThirdParty } from '../alt';
|
||||||
import EventActions from '../actions/event_actions';
|
import EventActions from '../actions/event_actions';
|
||||||
|
|
||||||
import Raven from 'raven-js';
|
import Raven from 'raven-js';
|
||||||
@ -25,4 +25,4 @@ class RavenHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default alt.createStore(RavenHandler, 'RavenHandler');
|
export default altThirdParty.createStore(RavenHandler, 'RavenHandler');
|
||||||
|
Loading…
Reference in New Issue
Block a user