Merge branch 'dev' into staging

Author: tibetsprague

src/components/Home/HomeContainer.tsx

@@ -46,7 +46,7 @@ class HomeContainer extends React.Component<IProps, null> {
           <h2>Budgeting and resource allocation for decentralized organizations</h2>
           <div className={css.topCta}>
             { process.env.NODE_ENV == 'production'
-                ? <a href='https://alchemy.daostack.io/#/dao/0xa3f5411cfc9eee0dd108bf0d07433b6dd99037f1'>View Alchemy</a>
+                ? <a href='https://alchemy.daostack.io/dao/0xa3f5411cfc9eee0dd108bf0d07433b6dd99037f1'>View Alchemy</a>
                 : <Link to='/daos'>View Alchemy</Link>
             }
           </div>
@@ -71,7 +71,7 @@ class HomeContainer extends React.Component<IProps, null> {
           </div>
         </div>
         <div className={css.footer}>
-          <a href='https://alchemy.daostack.io/#/dao/0xa3f5411cfc9eee0dd108bf0d07433b6dd99037f1'>Genesis Alpha</a>
+          <a href='https://alchemy.daostack.io/dao/0xa3f5411cfc9eee0dd108bf0d07433b6dd99037f1'>Genesis Alpha</a>
           <a href="https://docs.google.com/document/d/1M1erC1TVPPul3V_RmhKbyuFrpFikyOX0LnDfWOqO20Q/" target='_blank'>FAQ</a>
           <a href="https://medium.com/daostack/new-introducing-alchemy-budgeting-for-decentralized-organizations-b81ba8501b23" target='_blank'>Alchemy 101</a>
           <a href="https://www.daostack.io/" target='_blank'>About DAOstack</a>

src/components/Proposal/ProposalContainer.tsx

@@ -291,7 +291,7 @@ class ProposalContainer extends React.Component<IProps, IState> {
       };
 
       const disqusConfig = {
-        url: process.env.BASE_URL + "/#/dao/" + dao.avatarAddress + "/proposal/" + proposal.proposalId,
+        url: process.env.BASE_URL + "/dao/" + dao.avatarAddress + "/proposal/" + proposal.proposalId,
         identifier: proposal.proposalId
       };
 

src/components/Proposal/ViewProposalContainer.tsx

@@ -44,7 +44,7 @@ class ViewProposalContainer extends React.Component<IProps, null> {
     const { proposal } = this.props;
 
     const disqusConfig = {
-      url: process.env.BASE_URL + "/#" + this.props.location.pathname,
+      url: process.env.BASE_URL + this.props.location.pathname,
       identifier: proposal.proposalId,
       title: proposal.title
     };

src/configureStore.ts

@@ -1,4 +1,4 @@
-import createHistory from "history/createHashHistory";
+import createHistory from "history/createBrowserHistory";
 import { routerMiddleware } from "react-router-redux";
 import { applyMiddleware, compose, createStore } from "redux";
 import { composeWithDevTools } from "redux-devtools-extension";

src/layouts/HeaderContainer.tsx

@@ -222,7 +222,7 @@ class HeaderContainer extends React.Component<IProps, null> {
               <ul>
                 <li><Link to='/'>Home</Link></li>
                 { process.env.NODE_ENV == 'production'
-                  ? <li><a href='https://alchemy.daostack.io/#/dao/0xa3f5411cfc9eee0dd108bf0d07433b6dd99037f1'>Genesis Alpha</a></li>
+                  ? <li><a href='https://alchemy.daostack.io/dao/0xa3f5411cfc9eee0dd108bf0d07433b6dd99037f1'>Genesis Alpha</a></li>
                   : <li><Link to='/daos'>View DAOs</Link></li>
                 }
                 <li><a href="https://docs.google.com/document/d/1M1erC1TVPPul3V_RmhKbyuFrpFikyOX0LnDfWOqO20Q/" target='_blank'>FAQ</a></li>