From 06f86b2a0e183136366a32b68a271146a1c42d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Thu, 6 Aug 2015 18:03:13 +0200 Subject: [PATCH 001/130] first cut: test queue inheritance --- js/actions/piece_list_actions.js | 6 +++++- js/utils/action_queue_utils.js | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 js/utils/action_queue_utils.js diff --git a/js/actions/piece_list_actions.js b/js/actions/piece_list_actions.js index 1ebe7f42..56e42952 100644 --- a/js/actions/piece_list_actions.js +++ b/js/actions/piece_list_actions.js @@ -3,10 +3,14 @@ import alt from '../alt'; import Q from 'q'; +import ActionQueue from '../utils/action_queue_utils'; + import PieceListFetcher from '../fetchers/piece_list_fetcher'; -class PieceListActions { +class PieceListActions extends ActionQueue { constructor() { + super(); + this.generateActions( 'updatePieceList', 'updatePieceListRequestActions', diff --git a/js/utils/action_queue_utils.js b/js/utils/action_queue_utils.js new file mode 100644 index 00000000..6009198a --- /dev/null +++ b/js/utils/action_queue_utils.js @@ -0,0 +1,18 @@ +'use strict'; + + +class ActionQueue { + constructor() { + let actionClass = this.constructor.prototype; + let actionClassPropertyNames = Object.getOwnPropertyNames(actionClass); + + this.constructor = actionClass.constructor; + + for(let i = 1; i < actionClassPropertyNames.length; i++) { + let methodName = actionClassPropertyNames[i]; + actionClass[methodName] = () => console.log('hello'); + } + } +} + +export default ActionQueue; \ No newline at end of file From a3656410b133d87be50447de175eff6ecd03ee68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Tue, 29 Sep 2015 14:25:30 +0200 Subject: [PATCH 002/130] Update component no PieceListStore changes --- .../piece_list_bulk_modal.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js b/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js index 452a9bd8..06fd98a0 100644 --- a/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js +++ b/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js @@ -33,21 +33,25 @@ let PieceListBulkModal = React.createClass({ ); }, - onChange(state) { - this.setState(state); - }, + componentDidMount() { EditionListStore.listen(this.onChange); UserStore.listen(this.onChange); + PieceListStore.listen(this.onChange); UserActions.fetchCurrentUser(); }, componentWillUnmount() { EditionListStore.unlisten(this.onChange); + PieceListStore.unlisten(this.onChange); UserStore.unlisten(this.onChange); }, + onChange(state) { + this.setState(state); + }, + fetchSelectedPieceEditionList() { let filteredPieceIdList = Object.keys(this.state.editionList) .filter((pieceId) => { From d50d0faabe655799e09699a0e3519e34ede118c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Tue, 29 Sep 2015 14:58:56 +0200 Subject: [PATCH 003/130] Write generic function for extracting subdomain and implement troughout whole app --- js/app.js | 10 ++++++---- js/components/whitelabel/prize/prize_app.js | 5 ++++- js/components/whitelabel/wallet/wallet_app.js | 4 +++- js/fetchers/license_fetcher.js | 5 ++++- js/fetchers/whitelabel_fetcher.js | 5 ++++- js/third_party/intercom.js | 4 +++- js/third_party/notifications.js | 6 ++++-- js/utils/general_utils.js | 11 +++++++++++ 8 files changed, 39 insertions(+), 11 deletions(-) diff --git a/js/app.js b/js/app.js index 30a57d2b..bd1b839a 100644 --- a/js/app.js +++ b/js/app.js @@ -10,13 +10,15 @@ import fetch from 'isomorphic-fetch'; /* eslint-enable */ import ApiUrls from './constants/api_urls'; -import { updateApiUrls } from './constants/api_urls'; -import appConstants from './constants/application_constants'; + +import AppConstants from './constants/application_constants'; import getRoutes from './routes'; import requests from './utils/requests'; +import { updateApiUrls } from './constants/api_urls'; import { getSubdomainSettings } from './utils/constants_utils'; import { initLogging } from './utils/error_utils'; +import { getSubdomain } from './utils/general_utils'; import EventActions from './actions/event_actions'; @@ -48,11 +50,11 @@ requests.defaults({ class AppGateway { start() { let settings; - let subdomain = window.location.host.split('.')[0]; + let subdomain = getSubdomain(); try { settings = getSubdomainSettings(subdomain); - appConstants.whitelabel = settings; + AppConstants.whitelabel = settings; updateApiUrls(settings.type, subdomain); this.load(settings); } catch(err) { diff --git a/js/components/whitelabel/prize/prize_app.js b/js/components/whitelabel/prize/prize_app.js index f187dd1c..e0be7707 100644 --- a/js/components/whitelabel/prize/prize_app.js +++ b/js/components/whitelabel/prize/prize_app.js @@ -9,6 +9,9 @@ import GlobalNotification from '../../global_notification'; import getRoutes from './prize_routes'; +import { getSubdomain } from '../../../utils/general_utils'; + + let RouteHandler = Router.RouteHandler; let PrizeApp = React.createClass({ @@ -16,7 +19,7 @@ let PrizeApp = React.createClass({ render() { let header = null; - let subdomain = window.location.host.split('.')[0]; + let subdomain = getSubdomain(); let ROUTES = getRoutes(null, subdomain); diff --git a/js/components/whitelabel/wallet/wallet_app.js b/js/components/whitelabel/wallet/wallet_app.js index 2a235cef..bbc58689 100644 --- a/js/components/whitelabel/wallet/wallet_app.js +++ b/js/components/whitelabel/wallet/wallet_app.js @@ -10,6 +10,8 @@ import GlobalNotification from '../../global_notification'; import getRoutes from './wallet_routes'; import classNames from 'classnames'; +import { getSubdomain } from '../../../utils/general_utils'; + let RouteHandler = Router.RouteHandler; @@ -18,7 +20,7 @@ let WalletApp = React.createClass({ mixins: [Router.State], render() { - let subdomain = window.location.host.split('.')[0]; + let subdomain = getSubdomain(); let ROUTES = getRoutes(null, subdomain); let activeRoutes = this.getRoutes().map(elem => 'route--' + elem.name); diff --git a/js/fetchers/license_fetcher.js b/js/fetchers/license_fetcher.js index 6b0cada0..d5b296be 100644 --- a/js/fetchers/license_fetcher.js +++ b/js/fetchers/license_fetcher.js @@ -2,12 +2,15 @@ import requests from '../utils/requests'; +import { getSubdomain } from '../utils/general_utils'; + + let LicenseFetcher = { /** * Fetch the available licenses from the API (might be bound to the subdomain e.g. cc.ascribe.io). */ fetch() { - return requests.get('licenses', {'subdomain': window.location.host.split('.')[0]}); + return requests.get('licenses', {'subdomain': getSubdomain()}); } }; diff --git a/js/fetchers/whitelabel_fetcher.js b/js/fetchers/whitelabel_fetcher.js index 51f4ed0f..7a39f676 100644 --- a/js/fetchers/whitelabel_fetcher.js +++ b/js/fetchers/whitelabel_fetcher.js @@ -2,12 +2,15 @@ import requests from '../utils/requests'; +import { getSubdomain } from '../utils/general_utils'; + + let WhitelabelFetcher = { /** * Fetch the custom whitelabel data from the API. */ fetch() { - return requests.get('whitelabel_settings', {'subdomain': window.location.host.split('.')[0]}); + return requests.get('whitelabel_settings', {'subdomain': getSubdomain()}); } }; diff --git a/js/third_party/intercom.js b/js/third_party/intercom.js index ef284d7b..42ecccf7 100644 --- a/js/third_party/intercom.js +++ b/js/third_party/intercom.js @@ -3,6 +3,8 @@ import alt from '../alt'; import EventActions from '../actions/event_actions'; +import { getSubdomain } from '../utils/general_utils'; + class IntercomHandler { constructor() { @@ -20,7 +22,7 @@ class IntercomHandler { /* eslint-enable */ app_id: 'oboxh5w1', email: profile.email, - subdomain: window.location.host.split('.')[0], + subdomain: getSubdomain(), widget: { activator: '#IntercomDefaultWidget' } diff --git a/js/third_party/notifications.js b/js/third_party/notifications.js index 8887bbe2..eeac1bff 100644 --- a/js/third_party/notifications.js +++ b/js/third_party/notifications.js @@ -5,6 +5,8 @@ import EventActions from '../actions/event_actions'; import NotificationActions from '../actions/notification_actions'; +import { getSubdomain } from '../utils/general_utils'; + class NotificationsHandler { @@ -13,11 +15,11 @@ class NotificationsHandler { this.loaded = false; } - onProfileDidLoad(profile) { + onProfileDidLoad() { if (this.loaded) { return; } - let subdomain = window.location.host.split('.')[0]; + let subdomain = getSubdomain(); if (subdomain === 'ikonotv') { NotificationActions.fetchContractAgreementListNotifications().then( (res) => { diff --git a/js/utils/general_utils.js b/js/utils/general_utils.js index ba2b7752..8f4aebbc 100644 --- a/js/utils/general_utils.js +++ b/js/utils/general_utils.js @@ -221,4 +221,15 @@ export function truncateTextAtCharIndex(text, charIndex, replacement = '...') { truncatedText += text.length > charIndex ? replacement : ''; return truncatedText; +} + +/** + * Extracts the user's subdomain from the browser's window. + * If no subdomain is found (for example on a naked domain), the default "www" is just assumed. + * @return {string} subdomain as a string + */ +export function getSubdomain() { + let { host } = window.location; + let matchedHost = host.match(/(([^.]+)\.)?(.*)\.(.*)/); + return matchedHost[2] || 'www'; } \ No newline at end of file From 550eb2dc0bfafd39e6be1fabd4fa5d3303f10e3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Tue, 29 Sep 2015 15:23:57 +0200 Subject: [PATCH 004/130] Add fetchPieceList to PieceListBulkModal --- .../ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js b/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js index 06fd98a0..3e5b6495 100644 --- a/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js +++ b/js/components/ascribe_piece_list_bulk_modal/piece_list_bulk_modal.js @@ -39,7 +39,10 @@ let PieceListBulkModal = React.createClass({ EditionListStore.listen(this.onChange); UserStore.listen(this.onChange); PieceListStore.listen(this.onChange); + UserActions.fetchCurrentUser(); + PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search, + this.state.orderBy, this.state.orderAsc, this.state.filterBy); }, componentWillUnmount() { From 40095f7fbf06c388b571bf246cc9eec687b2dfc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Tue, 29 Sep 2015 15:38:06 +0200 Subject: [PATCH 005/130] throw javascript errors on >= 400 HTTP errors --- js/stores/edition_list_store.js | 1 - js/utils/requests.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/js/stores/edition_list_store.js b/js/stores/edition_list_store.js index 87b4df76..b3b152d3 100644 --- a/js/stores/edition_list_store.js +++ b/js/stores/edition_list_store.js @@ -13,7 +13,6 @@ class EditionListStore { } onUpdateEditionList({pieceId, editionListOfPiece, page, pageSize, orderBy, orderAsc, count, filterBy}) { - /* Basically there are two modes an edition list can be updated. diff --git a/js/utils/requests.js b/js/utils/requests.js index fd676896..3761a7a0 100644 --- a/js/utils/requests.js +++ b/js/utils/requests.js @@ -21,7 +21,7 @@ class Requests { } unpackResponse(response) { - if (response.status >= 500) { + if (response.status >= 400) { throw new Error(response.status + ' - ' + response.statusText + ' - on URL:' + response.url); } From 90cf137c2c6adc1f99e4d0320a37e7a8a76464c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Tue, 29 Sep 2015 16:00:58 +0200 Subject: [PATCH 006/130] Integrate error page in app + whitelabel pages --- js/components/error_not_found_page.js | 14 ++++++++++++++ js/components/whitelabel/prize/prize_routes.js | 3 +++ js/components/whitelabel/wallet/wallet_routes.js | 5 +++++ js/routes.js | 4 ++++ 4 files changed, 26 insertions(+) create mode 100644 js/components/error_not_found_page.js diff --git a/js/components/error_not_found_page.js b/js/components/error_not_found_page.js new file mode 100644 index 00000000..6de7c1f0 --- /dev/null +++ b/js/components/error_not_found_page.js @@ -0,0 +1,14 @@ +'use strict'; + +import React from 'react'; + + +let ErrorNotFoundPage = React.createClass({ + render() { + return ( + Hello + ); + } +}); + +export default ErrorNotFoundPage; \ No newline at end of file diff --git a/js/components/whitelabel/prize/prize_routes.js b/js/components/whitelabel/prize/prize_routes.js index d3031774..7ca132e2 100644 --- a/js/components/whitelabel/prize/prize_routes.js +++ b/js/components/whitelabel/prize/prize_routes.js @@ -14,11 +14,13 @@ import PrizePieceContainer from './components/ascribe_detail/prize_piece_contain import EditionContainer from '../../ascribe_detail/edition_container'; import SettingsContainer from './components/prize_settings_container'; import CoaVerifyContainer from '../../../components/coa_verify_container'; +import ErrorNotFoundPage from '../../../components/error_not_found_page'; import App from './prize_app'; import AppConstants from '../../../constants/application_constants'; let Route = Router.Route; +let NotFoundRoute = Router.NotFoundRoute; let baseUrl = AppConstants.baseUrl; @@ -36,6 +38,7 @@ function getRoutes() { + ); } diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js index 4aad0ae0..7097a88b 100644 --- a/js/components/whitelabel/wallet/wallet_routes.js +++ b/js/components/whitelabel/wallet/wallet_routes.js @@ -14,6 +14,7 @@ import PieceContainer from '../../../components/ascribe_detail/piece_container'; import EditionContainer from '../../../components/ascribe_detail/edition_container'; import SettingsContainer from '../../../components/ascribe_settings/settings_container'; import ContractSettings from '../../../components/ascribe_settings/contract_settings'; +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'; @@ -33,6 +34,7 @@ import WalletApp from './wallet_app'; import AppConstants from '../../../constants/application_constants'; let Route = Router.Route; +let NotFoundRoute = Router.NotFoundRoute; let Redirect = Router.Redirect; let baseUrl = AppConstants.baseUrl; @@ -52,6 +54,7 @@ let ROUTES = { + ), 'cc': ( @@ -68,6 +71,7 @@ let ROUTES = { + ), 'ikonotv': ( @@ -86,6 +90,7 @@ let ROUTES = { + ) }; diff --git a/js/routes.js b/js/routes.js index 1366f205..a8b024d4 100644 --- a/js/routes.js +++ b/js/routes.js @@ -21,11 +21,14 @@ import ContractSettings from './components/ascribe_settings/contract_settings'; import SettingsContainer from './components/ascribe_settings/settings_container'; import CoaVerifyContainer from './components/coa_verify_container'; +import ErrorNotFoundPage from './components/error_not_found_page'; + import RegisterPiece from './components/register_piece'; import AppConstants from './constants/application_constants'; let Route = Router.Route; +let NotFoundRoute = Router.NotFoundRoute; let Redirect = Router.Redirect; let baseUrl = AppConstants.baseUrl; @@ -45,6 +48,7 @@ const COMMON_ROUTES = ( + ); From cda81b6f5bd73abb9832fb7b31c91c7fe4534baf Mon Sep 17 00:00:00 2001 From: diminator Date: Tue, 29 Sep 2015 18:09:34 +0200 Subject: [PATCH 007/130] withdraw consign and acl buttonlist in detail refactor --- js/components/ascribe_detail/edition.js | 68 ++++++++++++++----------- js/constants/api_urls.js | 1 + 2 files changed, 39 insertions(+), 30 deletions(-) diff --git a/js/components/ascribe_detail/edition.js b/js/components/ascribe_detail/edition.js index 51884751..832ad386 100644 --- a/js/components/ascribe_detail/edition.js +++ b/js/components/ascribe_detail/edition.js @@ -38,6 +38,8 @@ import GlobalNotificationActions from '../../actions/global_notification_actions import Note from './note'; +import AclProxy from '../acl_proxy'; + import ApiUrls from '../../constants/api_urls'; import AppConstants from '../../constants/application_constants'; @@ -216,10 +218,6 @@ let EditionSummary = React.createClass({ refreshCollection: React.PropTypes.func }, - getTransferWithdrawData(){ - return {'bitcoin_id': this.props.edition.bitcoin_id}; - }, - handleSuccess() { this.props.refreshCollection(); this.props.handleSuccess(); @@ -261,30 +259,6 @@ let EditionSummary = React.createClass({ } else { - let withdrawButton = null; - if (this.props.edition.status.length > 0 && this.props.edition.pending_new_owner && this.props.edition.acl.acl_withdraw_transfer) { - withdrawButton = ( -
- -
- ); - } - let unconsignRequestButton = null; - if (this.props.edition.acl.acl_request_unconsign) { - unconsignRequestButton = ( - - ); - } actions = ( @@ -293,11 +267,45 @@ let EditionSummary = React.createClass({ availableAcls={this.props.edition.acl} editions={[this.props.edition]} handleSuccess={this.handleSuccess}> - {withdrawButton} + +
{return {'bitcoin_id': this.props.edition.bitcoin_id}; }} + handleSuccess={this.showNotification} + className='inline' + isInline={true}> + +
+ + +
{return {'bitcoin_id': this.props.edition.bitcoin_id}; }} + handleSuccess={this.showNotification} + className='inline' + isInline={true}> + +
+ + + + - {unconsignRequestButton} ); diff --git a/js/constants/api_urls.js b/js/constants/api_urls.js index b8d6713d..2ff689fe 100644 --- a/js/constants/api_urls.js +++ b/js/constants/api_urls.js @@ -38,6 +38,7 @@ let ApiUrls = { 'ownership_consigns': AppConstants.apiEndpoint + 'ownership/consigns/', 'ownership_consigns_confirm': AppConstants.apiEndpoint + 'ownership/consigns/confirm/', 'ownership_consigns_deny': AppConstants.apiEndpoint + 'ownership/consigns/deny/', + 'ownership_consigns_withdraw': AppConstants.apiEndpoint + 'ownership/consigns/withdraw/', 'ownership_loans_pieces': AppConstants.apiEndpoint + 'ownership/loans/pieces/', 'ownership_loans_pieces_confirm': AppConstants.apiEndpoint + 'ownership/loans/pieces/confirm/', 'ownership_loans_pieces_deny': AppConstants.apiEndpoint + 'ownership/loans/pieces/deny/', From ea4805caa0ae67eab853775aac914e8170753b02 Mon Sep 17 00:00:00 2001 From: diminator Date: Wed, 30 Sep 2015 09:14:57 +0200 Subject: [PATCH 008/130] create CoA when not found --- js/actions/coa_actions.js | 46 +++++++++++++++++-------- js/components/ascribe_detail/edition.js | 7 +++- 2 files changed, 38 insertions(+), 15 deletions(-) diff --git a/js/actions/coa_actions.js b/js/actions/coa_actions.js index 7c6f5118..8249f730 100644 --- a/js/actions/coa_actions.js +++ b/js/actions/coa_actions.js @@ -3,6 +3,7 @@ import alt from '../alt'; import CoaFetcher from '../fetchers/coa_fetcher'; +import Q from 'q'; class CoaActions { constructor() { @@ -13,22 +14,39 @@ class CoaActions { } fetchOne(id) { - CoaFetcher.fetchOne(id) - .then((res) => { - this.actions.updateCoa(res.coa); - }) - .catch((err) => { - console.logGlobal(err); - }); + return Q.Promise((resolve, reject) => { + CoaFetcher.fetchOne(id) + .then((res) => { + if (res.coa) { + this.actions.updateCoa(res.coa); + resolve(res.coa); + } + else { + this.actions.updateCoa(null); + resolve(null); + } + + }) + .catch((err) => { + console.logGlobal(err); + this.actions.updateCoa(null); + reject(err); + }); + }); } + create(edition) { - CoaFetcher.create(edition.bitcoin_id) - .then((res) => { - this.actions.updateCoa(res.coa); - }) - .catch((err) => { - console.logGlobal(err); - }); + return Q.Promise((resolve, reject) => { + CoaFetcher.create(edition.bitcoin_id) + .then((res) => { + this.actions.updateCoa(res.coa); + }) + .catch((err) => { + console.logGlobal(err); + this.actions.updateCoa(null); + reject(err); + }); + }); } } diff --git a/js/components/ascribe_detail/edition.js b/js/components/ascribe_detail/edition.js index 97f9fb3d..aa82beb6 100644 --- a/js/components/ascribe_detail/edition.js +++ b/js/components/ascribe_detail/edition.js @@ -338,7 +338,12 @@ let CoaDetails = React.createClass({ componentDidMount() { CoaStore.listen(this.onChange); if(this.props.edition.coa) { - CoaActions.fetchOne(this.props.edition.coa); + CoaActions.fetchOne(this.props.edition.coa) + .then((res) => { + if (res === null){ + CoaActions.create(this.props.edition); + } + }); } else { CoaActions.create(this.props.edition); From 4f6e39699f23fd05d51456f055b0ea6c07bd480e Mon Sep 17 00:00:00 2001 From: diminator Date: Wed, 30 Sep 2015 09:46:11 +0200 Subject: [PATCH 009/130] PR getlangtext --- js/components/ascribe_detail/edition.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/components/ascribe_detail/edition.js b/js/components/ascribe_detail/edition.js index 832ad386..e0ce16a5 100644 --- a/js/components/ascribe_detail/edition.js +++ b/js/components/ascribe_detail/edition.js @@ -277,7 +277,7 @@ let EditionSummary = React.createClass({ className='inline' isInline={true}> @@ -291,7 +291,7 @@ let EditionSummary = React.createClass({ className='inline' isInline={true}> From 99d29449a3482b78a4611757e13fc0de35dbe70a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Wed, 30 Sep 2015 10:44:38 +0200 Subject: [PATCH 010/130] style 404 page --- js/components/error_not_found_page.js | 11 ++++++++++- sass/main.scss | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/js/components/error_not_found_page.js b/js/components/error_not_found_page.js index 6de7c1f0..32787cb4 100644 --- a/js/components/error_not_found_page.js +++ b/js/components/error_not_found_page.js @@ -6,7 +6,16 @@ import React from 'react'; let ErrorNotFoundPage = React.createClass({ render() { return ( - Hello +
+
+
+

404

+

+ Ups, the page you are looking for does not exist. +

+
+
+
); } }); diff --git a/sass/main.scss b/sass/main.scss index 1e56c7ed..d5fef084 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -480,3 +480,20 @@ hr { border-color: #ccc; } } + +.error-wrapper { + width: 100%; + text-align: center; + + padding: 5% 20% 5% 20%; + + > h1 { + font-size: 10em; + font-weight: 600; + margin-bottom: .25em; + } + + > p { + font-size: 2em; + } +} \ No newline at end of file From dc753caf87808c94c46e4111e0d23ef4e1294137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Wed, 30 Sep 2015 11:06:42 +0200 Subject: [PATCH 011/130] Add getLangText to ErrorNotFoundPage --- js/components/error_not_found_page.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/components/error_not_found_page.js b/js/components/error_not_found_page.js index 32787cb4..61f83196 100644 --- a/js/components/error_not_found_page.js +++ b/js/components/error_not_found_page.js @@ -2,6 +2,8 @@ import React from 'react'; +import { getLangText } from '../utils/lang_utils'; + let ErrorNotFoundPage = React.createClass({ render() { @@ -11,7 +13,7 @@ let ErrorNotFoundPage = React.createClass({

404

- Ups, the page you are looking for does not exist. + {getLangText('Ups, the page you are looking for does not exist.')}

From aa908a1c57444f8c52c7f729fb7a515e57335089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Wed, 30 Sep 2015 11:09:04 +0200 Subject: [PATCH 012/130] PR Feedback: Simplify subdomain extraction --- js/utils/general_utils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/utils/general_utils.js b/js/utils/general_utils.js index 8f4aebbc..2cba98b9 100644 --- a/js/utils/general_utils.js +++ b/js/utils/general_utils.js @@ -230,6 +230,6 @@ export function truncateTextAtCharIndex(text, charIndex, replacement = '...') { */ export function getSubdomain() { let { host } = window.location; - let matchedHost = host.match(/(([^.]+)\.)?(.*)\.(.*)/); - return matchedHost[2] || 'www'; + let tokens = host.split('.'); + return tokens.length > 2 ? tokens[0] : 'www'; } \ No newline at end of file From 7283ae7574ce94cd5c1c904e1226c86a46656c60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Wed, 30 Sep 2015 11:22:20 +0200 Subject: [PATCH 013/130] PR Feedback: Change API error handling to saver approach --- js/actions/edition_list_actions.js | 5 +++++ js/utils/requests.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/js/actions/edition_list_actions.js b/js/actions/edition_list_actions.js index d13882cd..fb0a2249 100644 --- a/js/actions/edition_list_actions.js +++ b/js/actions/edition_list_actions.js @@ -33,6 +33,10 @@ class EditionListActions { EditionListFetcher .fetch(pieceId, page, pageSize, orderBy, orderAsc, filterBy) .then((res) => { + if(res && !res.editions) { + throw new Error('Piece has no editions to fetch.'); + } + this.actions.updateEditionList({ pieceId, page, @@ -46,6 +50,7 @@ class EditionListActions { resolve(res); }) .catch((err) => { + console.logGlobal(err); reject(err); }); }); diff --git a/js/utils/requests.js b/js/utils/requests.js index 3761a7a0..fd676896 100644 --- a/js/utils/requests.js +++ b/js/utils/requests.js @@ -21,7 +21,7 @@ class Requests { } unpackResponse(response) { - if (response.status >= 400) { + if (response.status >= 500) { throw new Error(response.status + ' - ' + response.statusText + ' - on URL:' + response.url); } From 55f5d959fff8ee20e43861e899449f83e4c2b32b Mon Sep 17 00:00:00 2001 From: diminator Date: Wed, 30 Sep 2015 11:26:31 +0200 Subject: [PATCH 014/130] PR fixes --- js/actions/coa_actions.js | 10 ++++------ js/components/ascribe_detail/edition.js | 12 ++++-------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/js/actions/coa_actions.js b/js/actions/coa_actions.js index 8249f730..da279bc6 100644 --- a/js/actions/coa_actions.js +++ b/js/actions/coa_actions.js @@ -13,7 +13,7 @@ class CoaActions { ); } - fetchOne(id) { + fetchOrCreate(id, bitcoinId) { return Q.Promise((resolve, reject) => { CoaFetcher.fetchOne(id) .then((res) => { @@ -22,10 +22,8 @@ class CoaActions { resolve(res.coa); } else { - this.actions.updateCoa(null); - resolve(null); + this.actions.create(bitcoinId); } - }) .catch((err) => { console.logGlobal(err); @@ -35,9 +33,9 @@ class CoaActions { }); } - create(edition) { + create(bitcoinId) { return Q.Promise((resolve, reject) => { - CoaFetcher.create(edition.bitcoin_id) + CoaFetcher.create(bitcoinId) .then((res) => { this.actions.updateCoa(res.coa); }) diff --git a/js/components/ascribe_detail/edition.js b/js/components/ascribe_detail/edition.js index aa82beb6..7f700c42 100644 --- a/js/components/ascribe_detail/edition.js +++ b/js/components/ascribe_detail/edition.js @@ -336,17 +336,13 @@ let CoaDetails = React.createClass({ }, componentDidMount() { + let { edition } = this.props; CoaStore.listen(this.onChange); - if(this.props.edition.coa) { - CoaActions.fetchOne(this.props.edition.coa) - .then((res) => { - if (res === null){ - CoaActions.create(this.props.edition); - } - }); + if(edition.coa) { + CoaActions.fetchOrCreate(edition.coa, edition.bitcoin_id); } else { - CoaActions.create(this.props.edition); + CoaActions.create(edition.bitcoin_id); } }, From 44cf707e3472ea1305b08e6f7f3b86306ae9ebed Mon Sep 17 00:00:00 2001 From: diminator Date: Wed, 30 Sep 2015 12:12:14 +0200 Subject: [PATCH 015/130] refactoring out edition_actions --- js/components/ascribe_detail/edition.js | 141 ++------------- .../ascribe_detail/edition_actions.js | 170 ++++++++++++++++++ 2 files changed, 184 insertions(+), 127 deletions(-) create mode 100644 js/components/ascribe_detail/edition_actions.js diff --git a/js/components/ascribe_detail/edition.js b/js/components/ascribe_detail/edition.js index 8c718cc9..5a5df656 100644 --- a/js/components/ascribe_detail/edition.js +++ b/js/components/ascribe_detail/edition.js @@ -6,15 +6,11 @@ import Router from 'react-router'; import Row from 'react-bootstrap/lib/Row'; import Col from 'react-bootstrap/lib/Col'; import Glyphicon from 'react-bootstrap/lib/Glyphicon'; -import Button from 'react-bootstrap/lib/Button'; import UserActions from '../../actions/user_actions'; import UserStore from '../../stores/user_store'; import CoaActions from '../../actions/coa_actions'; import CoaStore from '../../stores/coa_store'; -import PieceListActions from '../../actions/piece_list_actions'; -import PieceListStore from '../../stores/piece_list_store'; -import EditionListActions from '../../actions/edition_list_actions'; import HistoryIterator from './history_iterator'; @@ -28,23 +24,14 @@ import EditionDetailProperty from './detail_property'; import LicenseDetail from './license_detail'; import EditionFurtherDetails from './further_details'; -import ListRequestActions from './../ascribe_forms/list_form_request_actions'; -import AclButtonList from './../ascribe_buttons/acl_button_list'; -import UnConsignRequestButton from './../ascribe_buttons/unconsign_request_button'; -import DeleteButton from '../ascribe_buttons/delete_button'; - -import GlobalNotificationModel from '../../models/global_notification_model'; -import GlobalNotificationActions from '../../actions/global_notification_actions'; +import EditionActions from './edition_actions'; import Note from './note'; -import AclProxy from '../acl_proxy'; - import ApiUrls from '../../constants/api_urls'; import AppConstants from '../../constants/application_constants'; import { getLangText } from '../../utils/lang_utils'; -import { mergeOptions } from '../../utils/general_utils'; let Link = Router.Link; /** @@ -59,15 +46,11 @@ let Edition = React.createClass({ mixins: [Router.Navigation], getInitialState() { - return mergeOptions( - UserStore.getState(), - PieceListStore.getState() - ); + return UserStore.getState(); }, componentDidMount() { UserStore.listen(this.onChange); - PieceListStore.listen(this.onChange); UserActions.fetchCurrentUser(); }, @@ -82,31 +65,12 @@ let Edition = React.createClass({ CoaActions.flushCoa(); UserStore.unlisten(this.onChange); - PieceListStore.unlisten(this.onChange); }, onChange(state) { this.setState(state); }, - handleDeleteSuccess(response) { - this.refreshCollection(); - - EditionListActions.closeAllEditionLists(); - EditionListActions.clearAllEditionSelections(); - - let notification = new GlobalNotificationModel(response.notification, 'success'); - GlobalNotificationActions.appendGlobalNotification(notification); - - this.transitionTo('pieces'); - }, - - refreshCollection() { - PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search, - this.state.orderBy, this.state.orderAsc, this.state.filterBy); - EditionListActions.refreshEditionList({pieceId: this.props.edition.parent}); - }, - render() { return ( @@ -123,12 +87,9 @@ let Edition = React.createClass({
- + currentUser={this.state.currentUser} + handleSuccess={this.props.loadEdition}/> @@ -211,25 +172,14 @@ let Edition = React.createClass({ let EditionSummary = React.createClass({ propTypes: { edition: React.PropTypes.object, - handleSuccess: React.PropTypes.func, currentUser: React.PropTypes.object, - handleDeleteSuccess: React.PropTypes.func, - refreshCollection: React.PropTypes.func + handleSuccess: React.PropTypes.func }, handleSuccess() { - this.props.refreshCollection(); this.props.handleSuccess(); }, - showNotification(response){ - this.props.handleSuccess(); - - if (response){ - let notification = new GlobalNotificationModel(response.notification, 'success'); - GlobalNotificationActions.appendGlobalNotification(notification); - } - }, getStatus(){ let status = null; if (this.props.edition.status.length > 0){ @@ -244,89 +194,26 @@ let EditionSummary = React.createClass({ return status; }, - getActions(){ - let actions = null; - if (this.props.edition && - this.props.edition.notifications && - this.props.edition.notifications.length > 0){ - actions = ( - ); - } - - else { - actions = ( - - - - -
{return {'bitcoin_id': this.props.edition.bitcoin_id}; }} - handleSuccess={this.showNotification} - className='inline' - isInline={true}> - -
- - -
{return {'bitcoin_id': this.props.edition.bitcoin_id}; }} - handleSuccess={this.showNotification} - className='inline' - isInline={true}> - -
- - - - - - - - ); - } - return actions; - }, render() { + let { edition } = this.props; return (
+ value={ edition.edition_number + ' ' + getLangText('of') + ' ' + this.props.edition.num_editions} /> - + value={ edition.owner } /> + {this.getStatus()} - {this.getActions()} +
); diff --git a/js/components/ascribe_detail/edition_actions.js b/js/components/ascribe_detail/edition_actions.js new file mode 100644 index 00000000..c1d73dd2 --- /dev/null +++ b/js/components/ascribe_detail/edition_actions.js @@ -0,0 +1,170 @@ +'use strict'; + +import React from 'react'; +import Router from 'react-router'; + +import Row from 'react-bootstrap/lib/Row'; +import Col from 'react-bootstrap/lib/Col'; +import Button from 'react-bootstrap/lib/Button'; + +import EditionListActions from '../../actions/edition_list_actions'; +import PieceListActions from '../../actions/piece_list_actions'; +import PieceListStore from '../../stores/piece_list_store'; + +import Form from './../ascribe_forms/form'; +import Property from './../ascribe_forms/property'; + +import ListRequestActions from './../ascribe_forms/list_form_request_actions'; +import AclButtonList from './../ascribe_buttons/acl_button_list'; +import UnConsignRequestButton from './../ascribe_buttons/unconsign_request_button'; +import DeleteButton from '../ascribe_buttons/delete_button'; + +import GlobalNotificationModel from '../../models/global_notification_model'; +import GlobalNotificationActions from '../../actions/global_notification_actions'; + +import AclProxy from '../acl_proxy'; + +import ApiUrls from '../../constants/api_urls'; + +import { getLangText } from '../../utils/lang_utils'; + +/* + A component that handles all the actions inside of the edition detail + handleSuccess requires a loadEdition action (could be refactored) + */ +let EditionActions = React.createClass({ + propTypes: { + edition: React.PropTypes.object, + currentUser: React.PropTypes.object, + handleSuccess: React.PropTypes.func + }, + + mixins: [Router.Navigation], + + getInitialState() { + return PieceListStore.getState(); + }, + + componentDidMount() { + PieceListStore.listen(this.onChange); + }, + + componentWillUnmount() { + PieceListStore.unlisten(this.onChange); + }, + + onChange(state) { + this.setState(state); + }, + + + handleDeleteSuccess(response) { + this.refreshCollection(); + + EditionListActions.closeAllEditionLists(); + EditionListActions.clearAllEditionSelections(); + + let notification = new GlobalNotificationModel(response.notification, 'success'); + GlobalNotificationActions.appendGlobalNotification(notification); + + this.transitionTo('pieces'); + }, + + refreshCollection() { + PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search, + this.state.orderBy, this.state.orderAsc, this.state.filterBy); + EditionListActions.refreshEditionList({pieceId: this.props.edition.parent}); + }, + + handleSuccess(response){ + this.refreshCollection(); + this.props.handleSuccess(); + if (response){ + let notification = new GlobalNotificationModel(response.notification, 'success'); + GlobalNotificationActions.appendGlobalNotification(notification); + } + }, + + render(){ + let {edition, currentUser} = this.props; + + if (edition && + edition.notifications && + edition.notifications.length > 0){ + return ( + ); + } + + else { + return ( + + + + +
+ + +
+ + +
+ + +
+ + + + + + + + + ); + } + } +}); + +export default EditionActions; \ No newline at end of file From 5ded1e0760c58d3886fe39e1e45afdc3ca86f6dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Wed, 30 Sep 2015 15:05:27 +0200 Subject: [PATCH 016/130] Update browserify-shim and react-router --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0e41d714..951682e8 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "bootstrap-sass": "^3.3.4", "browser-sync": "^2.7.5", "browserify": "^9.0.8", - "browserify-shim": "^3.8.9", + "browserify-shim": "^3.8.10", "classnames": "^1.2.2", "compression": "^1.4.4", "envify": "^3.4.0", @@ -75,7 +75,7 @@ "react": "^0.13.2", "react-bootstrap": "^0.25.1", "react-datepicker": "^0.12.0", - "react-router": "^0.13.3", + "react-router": "^1.0.0-rc1", "react-router-bootstrap": "~0.16.0", "react-star-rating": "~1.3.2", "react-textarea-autosize": "^2.5.2", From 0d6e82a45d3db0c496c6d4cd7d6bb0459f97cead Mon Sep 17 00:00:00 2001 From: diminator Date: Wed, 30 Sep 2015 15:08:45 +0200 Subject: [PATCH 017/130] WIP signup/login redirect and redirectAuthenticated --- js/components/ascribe_forms/form_login.js | 21 ++++++++++++++++++++- js/components/ascribe_forms/form_signup.js | 4 ++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/js/components/ascribe_forms/form_login.js b/js/components/ascribe_forms/form_login.js index 79bced6c..dacad32c 100644 --- a/js/components/ascribe_forms/form_login.js +++ b/js/components/ascribe_forms/form_login.js @@ -44,6 +44,10 @@ let LoginForm = React.createClass({ componentDidMount() { UserStore.listen(this.onChange); + let { redirect } = this.getQuery(); + if (redirect !== 'login'){ + this.transitionTo(redirect, null, this.getQuery()); + } }, componentWillUnmount() { @@ -56,6 +60,15 @@ let LoginForm = React.createClass({ // if user is already logged in, redirect him to piece list if(this.state.currentUser && this.state.currentUser.email && this.props.redirectOnLoggedIn) { // FIXME: hack to redirect out of the dispatch cycle + let { redirectAuthenticated } = this.getQuery(); + if ( redirectAuthenticated) { + /* + * redirectAuthenticated contains an arbirary path + * eg pieces/, editions/, collection, settings, ... + * hence transitionTo cannot be used directly + */ + window.location = AppConstants.baseUrl + redirectAuthenticated; + } window.setTimeout(() => this.transitionTo('pieces'), 0); } }, @@ -79,7 +92,13 @@ let LoginForm = React.createClass({ Users on Stack Overflow claim this is a bug in chrome and should be fixed in the future. Until then, we redirect the HARD way, but reloading the whole page using window.location */ - window.location = AppConstants.baseUrl + 'collection'; + let { redirectAuthenticated } = this.getQuery(); + if ( redirectAuthenticated) { + window.location = AppConstants.baseUrl + redirectAuthenticated; + } + else { + window.location = AppConstants.baseUrl + 'collection'; + } } else if(this.props.onLogin) { // In some instances we want to give a callback to an outer container, // to show that the one login action the user triggered actually went through. diff --git a/js/components/ascribe_forms/form_signup.js b/js/components/ascribe_forms/form_signup.js index 790e8e2f..bfcabf1a 100644 --- a/js/components/ascribe_forms/form_signup.js +++ b/js/components/ascribe_forms/form_signup.js @@ -40,6 +40,10 @@ let SignupForm = React.createClass({ componentDidMount() { UserStore.listen(this.onChange); + let { redirect } = this.getQuery(); + if (redirect !== 'signup'){ + this.transitionTo(redirect, null, this.getQuery()); + } }, componentWillUnmount() { From bbae33a40f9b9022cfd5624bf43592ef2301b808 Mon Sep 17 00:00:00 2001 From: diminator Date: Wed, 30 Sep 2015 17:07:18 +0200 Subject: [PATCH 018/130] avoid dispatcherror when switching to signup --- js/components/ascribe_forms/form_signup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/components/ascribe_forms/form_signup.js b/js/components/ascribe_forms/form_signup.js index bfcabf1a..344787ab 100644 --- a/js/components/ascribe_forms/form_signup.js +++ b/js/components/ascribe_forms/form_signup.js @@ -55,7 +55,7 @@ let SignupForm = React.createClass({ // if user is already logged in, redirect him to piece list if(this.state.currentUser && this.state.currentUser.email) { - this.transitionTo('pieces'); + window.setTimeout(() => this.transitionTo('pieces')); } }, From eebe936023152206353b89a72114db0fc7772d43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Wed, 30 Sep 2015 17:09:46 +0200 Subject: [PATCH 019/130] Change: router rendering, router location, route configs, notFound routes, redirect routes, --- js/app.js | 22 +++-- js/components/ascribe_app.js | 15 ++- .../whitelabel/prize/prize_routes.js | 32 +++---- .../whitelabel/wallet/wallet_routes.js | 91 +++++++++---------- js/routes.js | 37 ++++---- package.json | 1 + 6 files changed, 102 insertions(+), 96 deletions(-) diff --git a/js/app.js b/js/app.js index bd1b839a..26129893 100644 --- a/js/app.js +++ b/js/app.js @@ -3,7 +3,9 @@ require('babel/polyfill'); import React from 'react'; -import Router from 'react-router'; +import { Router } from 'react-router'; +import createBrowserHistory from 'history/lib/createBrowserHistory'; + /* eslint-disable */ import fetch from 'isomorphic-fetch'; @@ -74,16 +76,20 @@ class AppGateway { subdomain = settings.subdomain; } + // Adds a client specific class to the body for whitelabel styling window.document.body.classList.add('client--' + subdomain); + // Send the applicationWillBoot event to the third-party stores EventActions.applicationWillBoot(settings); - window.appRouter = Router.run(getRoutes(type, subdomain), Router.HistoryLocation, (App) => { - React.render( - , - document.getElementById('main') - ); - EventActions.routeDidChange(); - }); + + let history = createBrowserHistory(); + React.render(( + + {getRoutes(type, subdomain)} + + ), document.getElementById('main')); + + // Send the applicationDidBoot event to the third-party stores EventActions.applicationDidBoot(settings); } } diff --git a/js/components/ascribe_app.js b/js/components/ascribe_app.js index 789399b0..394401be 100644 --- a/js/components/ascribe_app.js +++ b/js/components/ascribe_app.js @@ -1,7 +1,6 @@ 'use strict'; import React from 'react'; -import Router from 'react-router'; import Header from '../components/header'; import Footer from '../components/footer'; import GlobalNotification from './global_notification'; @@ -9,14 +8,22 @@ import GlobalNotification from './global_notification'; import getRoutes from '../routes'; -let RouteHandler = Router.RouteHandler; - let AscribeApp = React.createClass({ + propTypes: { + children: React.PropTypes.oneOfType([ + React.PropTypes.arrayOf(React.PropTypes.element), + React.PropTypes.element + ]) + }, + render() { + let { children } = this.props; + return (
- + {/* Routes are injected here */} + {children}