From e4c7f9e071cf876d99b5823f8f2a1d8e74a876b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Tue, 13 Oct 2015 11:23:21 +0200 Subject: [PATCH 1/2] Rename whitelabel component director to cyland specific prefix --- .../cyland_accordion_list_item.js | 2 +- .../cyland_submit_button.js | 1 + .../cyland_piece_container.js | 4 ++-- .../cyland_additional_data_form.js | 0 .../whitelabel/wallet/components/cyland/cyland_hero.js | 4 ++-- .../whitelabel/wallet/components/cyland/cyland_landing.js | 1 - .../whitelabel/wallet/components/cyland/cyland_piece_list.js | 2 +- .../wallet/components/cyland/cyland_register_piece.js | 2 +- js/components/whitelabel/wallet/wallet_routes.js | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) rename js/components/whitelabel/wallet/components/cyland/{ascribe_accordion_list => cyland_accordion_list}/cyland_accordion_list_item.js (98%) rename js/components/whitelabel/wallet/components/cyland/{ascribe_buttons => cyland_buttons}/cyland_submit_button.js (99%) rename js/components/whitelabel/wallet/components/cyland/{ascribe_detail => cyland_detail}/cyland_piece_container.js (94%) rename js/components/whitelabel/wallet/components/cyland/{ascribe_forms => cyland_forms}/cyland_additional_data_form.js (100%) diff --git a/js/components/whitelabel/wallet/components/cyland/ascribe_accordion_list/cyland_accordion_list_item.js b/js/components/whitelabel/wallet/components/cyland/cyland_accordion_list/cyland_accordion_list_item.js similarity index 98% rename from js/components/whitelabel/wallet/components/cyland/ascribe_accordion_list/cyland_accordion_list_item.js rename to js/components/whitelabel/wallet/components/cyland/cyland_accordion_list/cyland_accordion_list_item.js index 3e3676bc..ae96db98 100644 --- a/js/components/whitelabel/wallet/components/cyland/ascribe_accordion_list/cyland_accordion_list_item.js +++ b/js/components/whitelabel/wallet/components/cyland/cyland_accordion_list/cyland_accordion_list_item.js @@ -12,7 +12,7 @@ import UserStore from '../../../../../../stores/user_store'; import GlobalNotificationModel from '../../../../../../models/global_notification_model'; 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 { getLangText } from '../../../../../../utils/lang_utils'; diff --git a/js/components/whitelabel/wallet/components/cyland/ascribe_buttons/cyland_submit_button.js b/js/components/whitelabel/wallet/components/cyland/cyland_buttons/cyland_submit_button.js similarity index 99% rename from js/components/whitelabel/wallet/components/cyland/ascribe_buttons/cyland_submit_button.js rename to js/components/whitelabel/wallet/components/cyland/cyland_buttons/cyland_submit_button.js index 72ff595b..d8a039a3 100644 --- a/js/components/whitelabel/wallet/components/cyland/ascribe_buttons/cyland_submit_button.js +++ b/js/components/whitelabel/wallet/components/cyland/cyland_buttons/cyland_submit_button.js @@ -10,6 +10,7 @@ import WhitelabelStore from '../../../../../../stores/whitelabel_store'; import { getLangText } from '../../../../../../utils/lang_utils'; + let CylandSubmitButton = React.createClass({ propTypes: { className: React.PropTypes.string, diff --git a/js/components/whitelabel/wallet/components/cyland/ascribe_detail/cyland_piece_container.js b/js/components/whitelabel/wallet/components/cyland/cyland_detail/cyland_piece_container.js similarity index 94% rename from js/components/whitelabel/wallet/components/cyland/ascribe_detail/cyland_piece_container.js rename to js/components/whitelabel/wallet/components/cyland/cyland_detail/cyland_piece_container.js index 047e8cb1..17d06d19 100644 --- a/js/components/whitelabel/wallet/components/cyland/ascribe_detail/cyland_piece_container.js +++ b/js/components/whitelabel/wallet/components/cyland/cyland_detail/cyland_piece_container.js @@ -7,11 +7,11 @@ import PieceStore from '../../../../../../stores/piece_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 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'; diff --git a/js/components/whitelabel/wallet/components/cyland/ascribe_forms/cyland_additional_data_form.js b/js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js similarity index 100% rename from js/components/whitelabel/wallet/components/cyland/ascribe_forms/cyland_additional_data_form.js rename to js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_hero.js b/js/components/whitelabel/wallet/components/cyland/cyland_hero.js index b98f407e..a0e617c8 100644 --- a/js/components/whitelabel/wallet/components/cyland/cyland_hero.js +++ b/js/components/whitelabel/wallet/components/cyland/cyland_hero.js @@ -1,7 +1,7 @@ 'use strict'; import React from 'react'; -import constants from '../../../../constants/application_constants'; +import AppConstants from '../../../../constants/application_constants'; let Hero = React.createClass({ @@ -9,7 +9,7 @@ let Hero = React.createClass({ return (
Sluice Art Prize
diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_landing.js b/js/components/whitelabel/wallet/components/cyland/cyland_landing.js index 9924f550..29d966cc 100644 --- a/js/components/whitelabel/wallet/components/cyland/cyland_landing.js +++ b/js/components/whitelabel/wallet/components/cyland/cyland_landing.js @@ -3,7 +3,6 @@ import React from 'react'; import Router from 'react-router'; - import WhitelabelActions from '../../../../../actions/whitelabel_actions'; import WhitelabelStore from '../../../../../stores/whitelabel_store'; diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_piece_list.js b/js/components/whitelabel/wallet/components/cyland/cyland_piece_list.js index 3b1c70c0..f5270bcf 100644 --- a/js/components/whitelabel/wallet/components/cyland/cyland_piece_list.js +++ b/js/components/whitelabel/wallet/components/cyland/cyland_piece_list.js @@ -6,7 +6,7 @@ import PieceList from '../../../../piece_list'; import UserActions from '../../../../../actions/user_actions'; 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'; diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js b/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js index 84713bd9..710bef3e 100644 --- a/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js +++ b/js/components/whitelabel/wallet/components/cyland/cyland_register_piece.js @@ -25,7 +25,7 @@ import PieceActions from '../../../../../actions/piece_actions'; import GlobalNotificationModel from '../../../../../models/global_notification_model'; 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'; diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js index 7097a88b..053a7cdf 100644 --- a/js/components/whitelabel/wallet/wallet_routes.js +++ b/js/components/whitelabel/wallet/wallet_routes.js @@ -17,7 +17,7 @@ import ContractSettings from '../../../components/ascribe_settings/contract_sett import ErrorNotFoundPage from '../../../components/error_not_found_page'; 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 CylandPieceList from './components/cyland/cyland_piece_list'; From 2121c6af3df0371205cc64595c4155ce23883d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Tue, 13 Oct 2015 11:39:33 +0200 Subject: [PATCH 2/2] Rename whitelabel component director to ikonotv specific prefix --- .../ikonotv_accordion_list_item.js | 2 +- .../ikonotv_submit_button.js | 0 .../ikonotv_piece_container.js | 7 +++---- .../ikonotv_artist_details_form.js | 0 .../ikonotv_artwork_details_form.js | 0 .../wallet/components/ikonotv/ikonotv_piece_list.js | 2 +- .../wallet/components/ikonotv/ikonotv_register_piece.js | 4 ++-- js/components/whitelabel/wallet/wallet_routes.js | 2 +- 8 files changed, 8 insertions(+), 9 deletions(-) rename js/components/whitelabel/wallet/components/ikonotv/{ascribe_accordion_list => ikonotv_accordion_list}/ikonotv_accordion_list_item.js (98%) rename js/components/whitelabel/wallet/components/ikonotv/{ascribe_buttons => ikonotv_buttons}/ikonotv_submit_button.js (100%) rename js/components/whitelabel/wallet/components/ikonotv/{ascribe_detail => ikonotv_detail}/ikonotv_piece_container.js (95%) rename js/components/whitelabel/wallet/components/ikonotv/{ascribe_forms => ikonotv_forms}/ikonotv_artist_details_form.js (100%) rename js/components/whitelabel/wallet/components/ikonotv/{ascribe_forms => ikonotv_forms}/ikonotv_artwork_details_form.js (100%) diff --git a/js/components/whitelabel/wallet/components/ikonotv/ascribe_accordion_list/ikonotv_accordion_list_item.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_accordion_list/ikonotv_accordion_list_item.js similarity index 98% rename from js/components/whitelabel/wallet/components/ikonotv/ascribe_accordion_list/ikonotv_accordion_list_item.js rename to js/components/whitelabel/wallet/components/ikonotv/ikonotv_accordion_list/ikonotv_accordion_list_item.js index 8561cfae..00e7f318 100644 --- a/js/components/whitelabel/wallet/components/ikonotv/ascribe_accordion_list/ikonotv_accordion_list_item.js +++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_accordion_list/ikonotv_accordion_list_item.js @@ -12,7 +12,7 @@ import UserStore from '../../../../../../stores/user_store'; import GlobalNotificationModel from '../../../../../../models/global_notification_model'; 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'; diff --git a/js/components/whitelabel/wallet/components/ikonotv/ascribe_buttons/ikonotv_submit_button.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_buttons/ikonotv_submit_button.js similarity index 100% rename from js/components/whitelabel/wallet/components/ikonotv/ascribe_buttons/ikonotv_submit_button.js rename to js/components/whitelabel/wallet/components/ikonotv/ikonotv_buttons/ikonotv_submit_button.js diff --git a/js/components/whitelabel/wallet/components/ikonotv/ascribe_detail/ikonotv_piece_container.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_detail/ikonotv_piece_container.js similarity index 95% rename from js/components/whitelabel/wallet/components/ikonotv/ascribe_detail/ikonotv_piece_container.js rename to js/components/whitelabel/wallet/components/ikonotv/ikonotv_detail/ikonotv_piece_container.js index cc457ea0..51714e2d 100644 --- a/js/components/whitelabel/wallet/components/ikonotv/ascribe_detail/ikonotv_piece_container.js +++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_detail/ikonotv_piece_container.js @@ -7,13 +7,12 @@ import PieceStore from '../../../../../../stores/piece_store'; import UserStore from '../../../../../../stores/user_store'; - -import IkonotvSubmitButton from '../ascribe_buttons/ikonotv_submit_button'; +import IkonotvSubmitButton from '../ikonotv_buttons/ikonotv_submit_button'; import CollapsibleParagraph from '../../../../../../components/ascribe_collapsible/collapsible_paragraph'; -import IkonotvArtistDetailsForm from '../ascribe_forms/ikonotv_artist_details_form'; -import IkonotvArtworkDetailsForm from '../ascribe_forms/ikonotv_artwork_details_form'; +import IkonotvArtistDetailsForm from '../ikonotv_forms/ikonotv_artist_details_form'; +import IkonotvArtworkDetailsForm from '../ikonotv_forms/ikonotv_artwork_details_form'; import WalletPieceContainer from '../../ascribe_detail/wallet_piece_container'; diff --git a/js/components/whitelabel/wallet/components/ikonotv/ascribe_forms/ikonotv_artist_details_form.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js similarity index 100% rename from js/components/whitelabel/wallet/components/ikonotv/ascribe_forms/ikonotv_artist_details_form.js rename to js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js diff --git a/js/components/whitelabel/wallet/components/ikonotv/ascribe_forms/ikonotv_artwork_details_form.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js similarity index 100% rename from js/components/whitelabel/wallet/components/ikonotv/ascribe_forms/ikonotv_artwork_details_form.js rename to js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js index 053d21b3..36869fef 100644 --- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js +++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js @@ -6,7 +6,7 @@ import PieceList from '../../../../piece_list'; import UserActions from '../../../../../actions/user_actions'; 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'; diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js index 38078747..4cf1ccfb 100644 --- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js +++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_register_piece.js @@ -22,8 +22,8 @@ import GlobalNotificationActions from '../../../../../actions/global_notificatio import RegisterPieceForm from '../../../../ascribe_forms/form_register_piece'; import LoanForm from '../../../../ascribe_forms/form_loan'; -import IkonotvArtistDetailsForm from './ascribe_forms/ikonotv_artist_details_form'; -import IkonotvArtworkDetailsForm from './ascribe_forms/ikonotv_artwork_details_form'; +import IkonotvArtistDetailsForm from './ikonotv_forms/ikonotv_artist_details_form'; +import IkonotvArtworkDetailsForm from './ikonotv_forms/ikonotv_artwork_details_form'; import SlidesContainer from '../../../../ascribe_slides_container/slides_container'; diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js index 053a7cdf..44bad476 100644 --- a/js/components/whitelabel/wallet/wallet_routes.js +++ b/js/components/whitelabel/wallet/wallet_routes.js @@ -25,7 +25,7 @@ import IkonotvLanding from './components/ikonotv/ikonotv_landing'; import IkonotvPieceList from './components/ikonotv/ikonotv_piece_list'; import IkonotvRequestLoan from './components/ikonotv/ikonotv_request_loan'; 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 CCRegisterPiece from './components/cc/cc_register_piece';