Merge branch 'release/0.18.1'

app/js/App.js

@@ -5,6 +5,7 @@ import { connect } from 'react-redux'
 import { AccountActions } from './account/store/account'
 import { IdentityActions } from './profiles/store/identity'
 import { SettingsActions } from './account/store/settings'
+import { AuthActions } from './auth/store/auth'
 import WelcomeModal from './welcome/WelcomeModal'
 import TrustLevelFooter from './components/TrustLevelFooter'
 import { getCoreAPIPasswordFromURL, getLogServerPortFromURL } from './utils/api-utils'
@@ -29,7 +30,8 @@ function mapStateToProps(state) {
     coreApiRunning: state.sanity.coreApiRunning,
     coreApiPasswordValid: state.sanity.coreApiPasswordValid,
     walletPaymentAddressUrl: state.settings.api.walletPaymentAddressUrl,
-    coreAPIPassword: state.settings.api.coreAPIPassword
+    coreAPIPassword: state.settings.api.coreAPIPassword,
+    instanceIdentifier: state.auth.instanceIdentifier
   }
 }
 
@@ -38,7 +40,8 @@ function mapDispatchToProps(dispatch) {
     AccountActions,
     SanityActions,
     SettingsActions,
-    IdentityActions
+    IdentityActions,
+    AuthActions,
   ), dispatch)
 }
 
@@ -55,10 +58,12 @@ class App extends Component {
     coreApiPasswordValid: PropTypes.bool.isRequired,
     isCoreRunning: PropTypes.func.isRequired,
     isCoreApiPasswordValid: PropTypes.func.isRequired,
+    generateInstanceIdentifier: PropTypes.func.isRequired,
     walletPaymentAddressUrl: PropTypes.string.isRequired,
     coreAPIPassword: PropTypes.string,
     stateVersion: PropTypes.number,
-    router: PropTypes.object.isRequired
+    router: PropTypes.object.isRequired,
+    instanceIdentifier: PropTypes.string
   }
 
   constructor(props) {
@@ -109,6 +114,10 @@ class App extends Component {
       api = Object.assign({}, api, { logServerPort })
       this.props.updateApi(api)
     }
+
+    if (!this.props.instanceIdentifier) {
+      this.props.generateInstanceIdentifier()
+    }
   }
 
   componentWillReceiveProps(nextProps) {

app/js/HomeScreenPage.js

@@ -1,167 +1,93 @@
-// @flow
-import React from 'react'
+import React, { Component, PropTypes } from 'react'
+import { bindActionCreators } from 'redux'
+import { connect } from 'react-redux'
 import Navbar from './components/Navbar'
+import { AppsActions } from './store/apps'
+import appList from './data/apps'
 
-const HomeScreenPage = () =>
-(
-  <div>
-    <Navbar
-      hideBackToHomeLink
-      activeTab="home"
-    />
-    <div className="home-screen">
-      <div className="container-fluid app-center">
-        <div className="container app-wrap">
-          <div className="app-container no-padding">
-            <div className="container-fluid app-box-wrap">
-              <a
-                href="http://blockstack-todos.appartisan.com/"
-                className="app-box-container"
-              >
-                <div className="app-box">
-                  <img
-                    src="/images/[email protected]"
-                    alt="To Do List"
-                  />
-                </div>
-              </a>
-              <div className="app-text-container">
-                <h3>To Do List</h3>
-              </div>
-            </div>
-            <div className="container-fluid app-box-wrap">
-              <a
-                href="http://www.guildblog.com/"
-                className="app-box-container"
-              >
-                <div className="app-box">
-                  <img
-                    src="/images/[email protected]"
-                    alt="Guild"
-                  />
-                </div>
-              </a>
-              <div className="app-text-container">
-                <h3>Guild</h3>
-              </div>
-            </div>
-            <div className="container-fluid app-box-wrap">
-              <a
-                href="http://ongakuryoho.com"
-                className="app-box-container"
-              >
-                <div className="app-box">
-                  <img
-                    src="/images/[email protected]"
-                    alt="Ongaku Ryoho"
-                  />
-                </div>
-              </a>
-              <div className="app-text-container">
-                <h3>Ongaku Ryoho</h3>
-              </div>
-            </div>
-            <div className="container-fluid app-box-wrap">
-              <a
-                href="https://helloblockstack.com"
-                className="app-box-container"
-              >
-                <div className="app-box">
-                  <img
-                    src="/images/[email protected]"
-                    alt="Hello, Blockstack"
-                  />
-                </div>
-              </a>
-              <div className="app-text-container">
-                <h3>Hello, Blockstack</h3>
-              </div>
-            </div>
-            <div className="container-fluid app-box-wrap">
-              <a
-                href="https://forum.blockstack.org"
-                className="app-box-container"
-              >
-                <div className="app-box">
-                  <img
-                    src="/images/[email protected]"
-                    alt="Forum"
-                  />
-                </div>
-              </a>
-              <div className="app-text-container">
-                <h3>Forum</h3>
-              </div>
-            </div>
-            <div className="container-fluid app-box-wrap">
-              <a
-                href="https://casa.cash"
-                className="app-box-container"
-              >
-                <div className="app-box">
-                  <img
-                    src="/images/[email protected]"
-                    alt="Casa"
-                  />
-                </div>
-              </a>
-              <div className="app-text-container">
-                <h3>Casa</h3>
-              </div>
-            </div>
-            <div className="container-fluid app-box-wrap">
-              <a
-                href="https://www.openbazaar.org"
-                className="app-box-container"
-              >
-                <div className="app-box">
-                  <img
-                    src="/images/[email protected]"
-                    alt="OpenBazaar"
-                  />
-                </div>
-              </a>
-              <div className="app-text-container">
-                <h3>OpenBazaar</h3>
-              </div>
-            </div>
-            <div className="container-fluid app-box-wrap">
-              <a
-                href="https://ntzwrk.org/projects/beacon/"
-                className="app-box-container"
-              >
-                <div className="app-box">
-                  <img
-                    src="/images/[email protected]"
-                    alt="Beacon"
-                  />
-                </div>
-              </a>
-              <div className="app-text-container">
-                <h3>Beacon</h3>
-              </div>
-            </div>
-            <div className="container-fluid app-box-wrap">
-              <a
-                href="http://www.afiabeta.com/"
-                className="app-box-container"
-              >
-                <div className="app-box">
-                  <img
-                    src="/images/[email protected]"
-                    alt="Afia"
+function mapStateToProps(state) {
+  return {
+    apps: state.apps,
+    appListLastUpdated: state.apps.lastUpdated,
+    api: state.settings.api,
+    instanceIdentifier: state.auth.instanceIdentifier
+  }
+}
+
+function mapDispatchToProps(dispatch) {
+  return bindActionCreators(Object.assign({}, AppsActions), dispatch)
+}
+
+const AppIcon = (props) => (
+  <div className="container-fluid app-box-wrap">
+    <a
+      href={props.launchLink}
+      className="app-box-container"
+    >
+      <div className="app-box">
+        <img
+          src={`/images/${props.iconImage}`}
+          alt={props.displayName}
+        />
+      </div>
+    </a>
+    <div className="app-text-container">
+      <h3>{props.displayName}</h3>
+    </div>
+  </div>
+)
+
+AppIcon.propTypes = {
+  launchLink: PropTypes.string.isRequired,
+  iconImage: PropTypes.string.isRequired,
+  displayName: PropTypes.string.isRequired
+}
+
+class HomeScreenPage extends Component {
+
+  static propTypes = {
+    apps: PropTypes.object.isRequired,
+    refreshAppList: PropTypes.func.isRequired,
+    appListLastUpdated: PropTypes.number,
+    api: PropTypes.object.isRequired,
+    instanceIdentifier: PropTypes.string
+  }
+
+  componentWillMount() {
+    // Refresh apps list every 12 hours
+    if (this.props.appListLastUpdated < (Date.now() - 43200000)) {
+      this.props.refreshAppList(this.props.api.browserServerUrl, this.props.instanceIdentifier)
+    }
+  }
+
+  render() {
+    return (
+      <div>
+        <Navbar
+          hideBackToHomeLink
+          activeTab="home"
+        />
+        <div className="home-screen">
+          <div className="container-fluid app-center">
+            <div className="container app-wrap">
+              <div className="app-container no-padding">
+
+                {appList.apps.map((app) => (
+                  <AppIcon 
+                    key={app.name}
+                    iconImage={app.appIcon.small} 
+                    displayName={app.displayName} 
+                    launchLink={app.launchLink} 
                   />
-                </div>
-              </a>
-              <div className="app-text-container">
-                <h3>Afia</h3>
+                ))}
+
               </div>
             </div>
           </div>
         </div>
       </div>
-    </div>
-  </div>
-)
+    )
+  }
+}
 
-export default HomeScreenPage
+export default connect(mapStateToProps, mapDispatchToProps)(HomeScreenPage)

app/js/account/store/settings/default.js

@@ -34,6 +34,7 @@ const DEFAULT_API = {
       registerUrl: 'http://localhost:7103/register'
     }
   },
+  browserServerUrl: 'https://blockstack-browser-server.appartisan.com',
   hostedDataLocation: DROPBOX,
   coreHost: 'localhost',
   corePort: 6270,

app/js/auth/components/AuthModal.js

@@ -82,11 +82,8 @@ class AuthModal extends Component {
       authRequest,
       decodedToken
     })
-    const localIdentities = this.props.localIdentities
-    const identityIndex = this.state.currentIdentityIndex
-    const identity = localIdentities[identityIndex]
 
-    this.props.loadAppManifest(authRequest, identity.ownerAddress)
+    this.props.loadAppManifest(authRequest)
   }
 
   componentWillReceiveProps(nextProps) {
@@ -157,7 +154,7 @@ class AuthModal extends Component {
     // https://github.com/blockstack/blockstack-browser/issues/864#issuecomment-335035037
 
 
-    const lookupValue = hasUsername ? identity.useranme : ''
+    const lookupValue = hasUsername ? identity.username : ''
 
 
     // if profile has no name, lookupUrl will be