Merge remote-tracking branch 'remotes/origin/master' into AD-435-hash-locally-for-when-a-artist-do

index.html

@@ -51,8 +51,6 @@
             (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
             m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
             })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-            ga('create', 'UA-60614729-2', 'auto');
         </script>
 
         <!-- Intercom library -->

js/actions/coa_actions.js

@@ -7,7 +7,8 @@ import CoaFetcher from '../fetchers/coa_fetcher';
 class CoaActions {
     constructor() {
         this.generateActions(
-            'updateCoa'
+            'updateCoa',
+            'flushCoa'
         );
     }
 
@@ -26,9 +27,7 @@ class CoaActions {
                 this.actions.updateCoa(res.coa);
             })
             .catch((err) => {
-                console.log(err)
                 console.logGlobal(err);
-                this.actions.updateCoa('Something went wrong, please try again later.');
             });
     }
 }

js/actions/event_actions.js

@@ -0,0 +1,19 @@
+'use strict';
+
+import alt from '../alt';
+
+
+class EventActions {
+    constructor() {
+        this.generateActions(
+            'applicationWillBoot',
+            'applicationDidBoot',
+            'profileDidLoad',
+            //'userDidLogin',
+            //'userDidLogout',
+            'routeDidChange'
+        );
+    }
+}
+
+export default alt.createActions(EventActions);

js/app.js

@@ -5,7 +5,9 @@ require('babel/polyfill');
 import React from 'react';
 import Router from 'react-router';
 
+/* eslint-disable */
 import fetch from 'isomorphic-fetch';
+/* eslint-enable */
 
 import ApiUrls from './constants/api_urls';
 import { updateApiUrls } from './constants/api_urls';
@@ -16,6 +18,16 @@ import requests from './utils/requests';
 import { getSubdomainSettings } from './utils/constants_utils';
 import { initLogging } from './utils/error_utils';
 
+import EventActions from './actions/event_actions';
+
+/* eslint-disable */
+// You can comment out the modules you don't need
+// import DebugHandler from './third_party/debug';
+import GoogleAnalyticsHandler from './third_party/ga';
+import RavenHandler from './third_party/raven';
+import IntercomHandler from './third_party/intercom';
+/* eslint-enable */
+
 initLogging();
 
 let headers = {
@@ -43,25 +55,30 @@ class AppGateway {
             settings = getSubdomainSettings(subdomain);
             appConstants.whitelabel = settings;
             updateApiUrls(settings.type, subdomain);
-            this.load(settings.type);
+            this.load(settings);
         } catch(err) {
             // if there are no matching subdomains, we're routing
             // to the default frontend
             console.logGlobal(err);
-            this.load('default');
+            this.load();
         }
     }
 
-    load(type) {
+    load(settings) {
+        let type = 'default';
+        if (settings) {
+            type = settings.type;
+        }
+
+        EventActions.applicationWillBoot(settings);
         Router.run(getRoutes(type), Router.HistoryLocation, (App) => {
-            if (window.ga) {
-                window.ga('send', 'pageview');
-            }
             React.render(
                 <App />,
                 document.getElementById('main')
             );
+            EventActions.routeDidChange();
         });
+        EventActions.applicationDidBoot(settings);
     }
 }
 

js/components/ascribe_detail/edition.js

@@ -68,6 +68,15 @@ let Edition = React.createClass({
     },
 
     componentWillUnmount() {
+        // Flushing the coa state is essential to not displaying the same
+        // data to the user while he's on another edition
+        //
+        // BUGFIX: Previously we had this line in the componentWillUnmount of
+        // CoaDetails, but since we're reloading the edition after performing an ACL action
+        // on it, this resulted in multiple events occupying the dispatcher, which eventually
+        // resulted in crashing the app.
+        CoaActions.flushCoa();
+
         UserStore.unlisten(this.onChange);
         PieceListStore.unlisten(this.onChange);
     },
@@ -391,7 +400,7 @@ let CoaDetails = React.createClass({
 
     componentDidMount() {
         CoaStore.listen(this.onChange);
-        if (this.props.edition.coa) {
+        if(this.props.edition.coa) {
             CoaActions.fetchOne(this.props.edition.coa);
         }
         else {
@@ -408,7 +417,7 @@ let CoaDetails = React.createClass({
     },
 
     render() {
-        if (this.state.coa && this.state.coa.url_safe) {
+        if(this.state.coa && this.state.coa.url_safe) {
             return (
                 <div>
                     <p className="text-center ascribe-button-list">
@@ -426,8 +435,7 @@ let CoaDetails = React.createClass({
                     </p>
                 </div>
             );
-        }
-        else if (typeof this.state.coa === 'string'){
+        } else if(typeof this.state.coa === 'string'){
             return (
                 <div className="text-center">
                     {this.state.coa}

js/components/ascribe_detail/media_container.js

@@ -12,6 +12,11 @@ import CollapsibleButton from './../ascribe_collapsible/collapsible_button';
 import AclProxy from '../acl_proxy';
 
 
+const EMBED_IFRAME_HEIGHT = {
+    video: 315,
+    audio: 62
+};
+
 let MediaContainer = React.createClass({
     propTypes: {
         content: React.PropTypes.object
@@ -29,7 +34,9 @@ let MediaContainer = React.createClass({
             extraData = this.props.content.digital_work.encoding_urls.map(e => { return { url: e.url, type: e.label }; });
         }
 
-        if (['video', 'audio'].indexOf(mimetype) > -1){
+        if (['video', 'audio'].indexOf(mimetype) > -1) {
+            let height = EMBED_IFRAME_HEIGHT[mimetype];
+
             embed = (
                 <CollapsibleButton
                     button={
@@ -39,7 +46,7 @@ let MediaContainer = React.createClass({
                     }
                     panel={
                         <pre className="">
-                            {'<iframe width="560" height="315" src="http://embed.ascribe.io/content/'
+                            {'<iframe width="560" height="' + height + '" src="http://embed.ascribe.io/content/'
                                 + this.props.content.bitcoin_id + '" frameborder="0" allowfullscreen></iframe>'}
                         </pre>
                     }/>
@@ -55,6 +62,7 @@ let MediaContainer = React.createClass({
                     encodingStatus={this.props.content.digital_work.isEncoding} />
                 <p className="text-center">
                     <AclProxy
+                        show={['video', 'audio', 'image'].indexOf(mimetype) === -1 || this.props.content.acl.acl_download}
                         aclObject={this.props.content.acl}
                         aclName="acl_download">
                         <Button bsSize="xsmall" className="ascribe-margin-1px" href={this.props.content.digital_work.url} target="_blank">

js/components/ascribe_uploader/react_s3_fine_uploader.js

@@ -137,7 +137,10 @@ var ReactS3FineUploader = React.createClass({
                 sendCredentials: true
             },
             chunking: {
-                enabled: true
+                enabled: true,
+                concurrent: {
+                    enabled: true
+                }
             },
             resume: {
                 enabled: true

js/components/header.js

@@ -2,13 +2,13 @@
 
 import React from 'react';
 import Router from 'react-router';
-import Raven from 'raven-js';
 
 import UserActions from '../actions/user_actions';
 import UserStore from '../stores/user_store';
 
 import WhitelabelActions from '../actions/whitelabel_actions';
 import WhitelabelStore from '../stores/whitelabel_store';
+import EventActions from '../actions/event_actions';
 
 import Nav from 'react-bootstrap/lib/Nav';
 import Navbar from 'react-bootstrap/lib/Navbar';
@@ -84,19 +84,7 @@ let Header = React.createClass({
         this.setState(state);
 
         if(this.state.currentUser && this.state.currentUser.email) {
-            // bootup intercom if the user is logged in
-            window.Intercom('boot', {
-               app_id: 'oboxh5w1',
-               email: this.state.currentUser.email,
-               subdomain: window.location.host.split('.')[0],
-               widget: {
-                  activator: '#IntercomDefaultWidget'
-               }  
-            });
-
-            Raven.setUserContext({
-                email: this.state.currentUser.email
-            });
+            EventActions.profileDidLoad.defer(this.state.currentUser);
         }
     },
 

js/constants/application_constants.js

@@ -22,7 +22,8 @@ let constants = {
             'name': 'Creative Commons France',
             'logo': 'https://s3-us-west-2.amazonaws.com/ascribe0/public/creativecommons/cc.logo.sm.png',
             'permissions': ['register', 'edit', 'share', 'del_from_collection'],
-            'type': 'wallet'
+            'type': 'wallet',
+            'ga': 'UA-60614729-4'
         },
         {
             'subdomain': 'cc-staging',
@@ -36,7 +37,8 @@ let constants = {
             'name': 'Sluice Art Fair',
             'logo': 'http://sluice.info/images/logo.gif',
             'permissions': ['register', 'edit', 'share', 'del_from_collection'],
-            'type': 'prize'
+            'type': 'prize',
+            'ga': 'UA-60614729-5'
         },
         {
             'subdomain': 'sluice-staging',
@@ -46,6 +48,10 @@ let constants = {
             'type': 'prize'
         }
     ],
+    'defaultDomain': {
+        'type': 'default',
+        'ga': 'UA-60614729-2'
+    },
 
     // in case of whitelabel customization, we store stuff here
     'whitelabel': {},

js/stores/coa_store.js

@@ -13,9 +13,9 @@ class CoaStore {
     onUpdateCoa(coa) {
         this.coa = coa;
     }
-    onErrorCoa(err) {
+
+    onFlushCoa() {
         this.coa = {};
-        //this.coa = err
     }
 }
 

js/third_party/debug.js

@@ -0,0 +1,30 @@
+'use strict';
+
+import alt from '../alt';
+import EventActions from '../actions/event_actions';
+
+
+
+class DebugHandler {
+    constructor() {
+        let symbols = [];
+
+        for (let k in EventActions) {
+            if (typeof EventActions[k] === 'symbol') {
+                symbols.push(EventActions[k]);
+            }
+        }
+
+        this.bindListeners({
+            onWhateverEvent: symbols
+        });
+    }
+
+    onWhateverEvent() {
+        let args = arguments[0];
+        let symbol = arguments[1];
+        console.debug(symbol, args);
+    }
+}
+
+export default alt.createStore(DebugHandler, 'DebugHandler');

js/third_party/ga.js

@@ -0,0 +1,27 @@
+'use strict';
+
+import alt from '../alt';
+import EventActions from '../actions/event_actions';
+
+
+class GoogleAnalyticsHandler {
+    constructor() {
+        this.bindActions(EventActions);
+    }
+
+    onRouteDidChange() {
+        window.ga('send', 'pageview');
+    }
+
+    onApplicationWillBoot(settings) {
+        if (settings.ga) {
+            window.ga('create', settings.ga, 'auto');
+            console.log('Google Analytics loaded');
+        } else {
+            console.log('Cannot load Google Analytics: no tracking code provided');
+        }
+    }
+
+}
+
+export default alt.createStore(GoogleAnalyticsHandler, 'GoogleAnalyticsHandler');

js/third_party/intercom.js

@@ -0,0 +1,34 @@
+'use strict';
+
+import alt from '../alt';
+import EventActions from '../actions/event_actions';
+
+
+class IntercomHandler {
+    constructor() {
+        this.bindActions(EventActions);
+        this.loaded = false;
+    }
+
+    onProfileDidLoad(profile) {
+        if (this.loaded) {
+            return;
+        }
+
+        /* eslint-disable */
+        Intercom('boot', {
+            /* eslint-enable */
+            app_id: 'oboxh5w1',
+            email: profile.email,
+            subdomain: window.location.host.split('.')[0],
+            widget: {
+                activator: '#IntercomDefaultWidget'
+            }  
+        });
+        console.log('Intercom loaded');
+        this.loaded = true;
+    }
+
+}
+
+export default alt.createStore(IntercomHandler, 'IntercomHandler');

js/third_party/raven.js

@@ -0,0 +1,28 @@
+'use strict';
+
+import alt from '../alt';
+import EventActions from '../actions/event_actions';
+
+import Raven from 'raven-js';
+
+
+class RavenHandler {
+    constructor() {
+        this.bindActions(EventActions);
+        this.loaded = false;
+    }
+
+    onProfileDidLoad(profile) {
+        if (this.loaded) {
+            return;
+        }
+
+        Raven.setUserContext({
+            email: profile.email
+        });
+        console.log('Raven loaded');
+        this.loaded = true;
+    }
+}
+
+export default alt.createStore(RavenHandler, 'RavenHandler');

js/utils/constants_utils.js

@@ -8,8 +8,9 @@ export function getSubdomainSettings(subdomain) {
     if(settings.length === 1) {
         return settings[0];
     } else if(settings.length === 0) {
-        throw new Error('There are no subdomain settings for the subdomain: ' + subdomain);
+        return appConstants.defaultDomain;
+        // throw new Error('There are no subdomain settings for the subdomain: ' + subdomain);
     } else {
         throw new Error('Matched multiple subdomains. Adjust constants file.');
     }
-}
+}