Merge branch 'develop' of github.com:gnosis/dex-react into develop

gnosis · Dec 23, 2019 · 824211e · 824211e
2 parents 8651ab3 + 6348e8d
commit 824211e
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 5 deletions.
diff --git a/src/components/Layout/Footer.tsx b/src/components/Layout/Footer.tsx
@@ -34,6 +34,9 @@ const Wrapper = styled.footer`
 
   .version {
     font-size: 0.85em;
+    a {
+      text-decoration: none;
+    }
   }
 `
 
@@ -47,7 +50,20 @@ const Footer: React.FC = () => (
         <Link to="/source-code">Source code</Link>
       </li>
     </ul>
-    <div className="version">dFusion PoC v{VERSION}</div>
+    <div className="version">
+      Web{' '}
+      <a target="_blank" rel="noopener noreferrer" href={'https://github.com/gnosis/dex-react/tree/v' + VERSION}>
+        v{VERSION}
+      </a>{' '}
+      - contracts{' '}
+      <a
+        target="_blank"
+        rel="noopener noreferrer"
+        href={'https://github.com/gnosis/dex-contracts/tree/v' + CONTRACT_VERSION}
+      >
+        v{CONTRACT_VERSION}
+      </a>
+    </div>
   </Wrapper>
 )
 

diff --git a/src/pages/About.tsx b/src/pages/About.tsx
@@ -5,11 +5,42 @@ const About: React.FC = () => (
   <PageWrapper>
     <h1>About dFusion</h1>
     <p>
-      Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore
-      magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
-      Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum
+      The dFusion PoC protocol (working title) introduces a new, fully decentralized exchange mechanism for ERC20
+      tokens: batch-auctions with multidimensional order books (in the form of ring trades) with uniform clearing prices
+      in every batch. <br />
+      <a
+        target="_blank"
+        rel="noopener noreferrer"
+        href="https://docs.google.com/document/d/1GjDX1_2RsCCxtwnjBgXaV6yXJ2AXYL4-EEYv7HjptaM/edit"
+      >
+        Read more here
+      </a>
     </p>
+    <p>Versions used in this web:</p>
+    <ul>
+      <li>
+        Web:&nbsp;
+        <a target="_blank" rel="noopener noreferrer" href={'https://github.com/gnosis/dex-react/tree/v' + VERSION}>
+          v{VERSION}
+        </a>{' '}
+      </li>
+      <li>
+        Smart Contract:&nbsp;
+        <a
+          target="_blank"
+          rel="noopener noreferrer"
+          href={'https://github.com/gnosis/dex-contracts/tree/v' + CONTRACT_VERSION}
+        >
+          v{CONTRACT_VERSION}
+        </a>
+      </li>
+      <li>
+        dex-js library:&nbsp;
+        <a target="_blank" rel="noopener noreferrer" href={'https://github.com/gnosis/dex-js/tree/v' + DEX_JS_VERSION}>
+          v{DEX_JS_VERSION}
+        </a>
+      </li>
+    </ul>
   </PageWrapper>
 )
 

diff --git a/src/types/global.d.ts b/src/types/global.d.ts
@@ -1,4 +1,6 @@
 declare let VERSION: string
+declare let DEX_JS_VERSION: string
+declare let CONTRACT_VERSION: string
 
 declare module '*.svg' {
   /* eslint-disable-next-line @typescript-eslint/no-explicit-any */

diff --git a/webpack.config.babel.js b/webpack.config.babel.js
@@ -90,6 +90,8 @@ module.exports = ({ stats = false } = {}) => ({
     // define inside one plugin instance
     new webpack.DefinePlugin({
       VERSION: JSON.stringify(require('./package.json').version),
+      DEX_JS_VERSION: JSON.stringify(require('@gnosis.pm/dex-js/package.json').version),
+      CONTRACT_VERSION: JSON.stringify(require('@gnosis.pm/dex-contracts/package.json').version),
 
       // MOCK: Use mock or real API implementation
       'process.env.MOCK': JSON.stringify(process.env.MOCK || 'false'),