diff --git a/.gitmodules b/.gitmodules index e320456..6de11dd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,15 @@ [submodule "bigchaindb-server"] path = bigchaindb-server url = https://github.com/bigchaindb/bigchaindb/ +[submodule "plugins/bigchaindb-consensus-composition"] + path = plugins/bigchaindb-consensus-composition + url = https://github.com/ascribe/bigchaindb-consensus-composition/ +[submodule "plugins/bigchaindb-consensus-policy"] + path = plugins/bigchaindb-consensus-policy + url = https://github.com/ascribe/bigchaindb-consensus-policy/ +[submodule "examples/client/asset_composition"] + path = examples/client/asset_composition + url = git@github.com:ascribe/sicpa-client.git +[submodule "plugins/bigchaindb-smart-assets"] + path = plugins/bigchaindb-smart-assets + url = git@github.com:ascribe/bigchaindb-smart-assets.git diff --git a/bigchaindb-server b/bigchaindb-server index b441793..3e21fd8 160000 --- a/bigchaindb-server +++ b/bigchaindb-server @@ -1 +1 @@ -Subproject commit b4417935508e7d4f6914c1ac84240113d99ea001 +Subproject commit 3e21fd8b49f15b520c56ac78adee27c6f6f884fe diff --git a/compose/bdb-server-plugins/Dockerfile b/compose/bdb-server-plugins/Dockerfile new file mode 100644 index 0000000..b5c0891 --- /dev/null +++ b/compose/bdb-server-plugins/Dockerfile @@ -0,0 +1,19 @@ +FROM python:3.5 + +RUN apt-get update && apt-get install -y python3.4 vim + +RUN mkdir -p /usr/src/app +WORKDIR /usr/src/app + +RUN pip install --upgrade pip + +COPY bigchaindb-server /usr/src/app/ +COPY plugins/bigchaindb-consensus-composition /usr/src/app/plugins/bigchaindb-consensus-composition + +RUN pip install --no-cache-dir -e .[dev] +RUN bigchaindb -y configure rethinkdb + +WORKDIR /usr/src/app/plugins/bigchaindb-consensus-composition + +RUN pip install --no-cache-dir -e .[dev] + diff --git a/docker-compose.yml b/docker-compose.yml index c3801e2..89b57f0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,6 +41,30 @@ services: BIGCHAINDB_SERVER_BIND: 0.0.0.0:9984 BIGCHAINDB_KEYPAIR_PUBLIC: GW1nrdZm4mbVC8ePeiGWz6DqHexqewqy5teURVHi3RG4 BIGCHAINDB_KEYPAIR_PRIVATE: 2kQgBtQnHoauw8QchKM7xYvEBW1QDoHzhBsCL9Vi1AzB + BIGCHAINDB_CONSENSUS_PLUGIN: default + ports: + - "49984:9984" + command: bigchaindb start + + bdb-server-plugins: + build: + context: . + dockerfile: ./compose/bdb-server-plugins/Dockerfile + volumes: + - ./bigchaindb-server/bigchaindb:/usr/src/app/bigchaindb + - ./bigchaindb-server/tests:/usr/src/app/tests + - ./bigchaindb-server/docs:/usr/src/app/docs + - ./bigchaindb-server/setup.py:/usr/src/app/setup.py + - ./bigchaindb-server/setup.cfg:/usr/src/app/setup.cfg + - ./bigchaindb-server/pytest.ini:/usr/src/app/pytest.ini + - ./bigchaindb-server/tox.ini:/usr/src/app/tox.ini + - ./bigchaindb-server/Makefile:/usr/src/app/Makefile + environment: + BIGCHAINDB_DATABASE_HOST: rdb + BIGCHAINDB_SERVER_BIND: 0.0.0.0:9984 + BIGCHAINDB_KEYPAIR_PUBLIC: GW1nrdZm4mbVC8ePeiGWz6DqHexqewqy5teURVHi3RG4 + BIGCHAINDB_KEYPAIR_PRIVATE: 2kQgBtQnHoauw8QchKM7xYvEBW1QDoHzhBsCL9Vi1AzB + BIGCHAINDB_CONSENSUS_PLUGIN: consensus_asset_composition ports: - "49984:9984" command: bigchaindb start diff --git a/examples/client/asset_composition b/examples/client/asset_composition new file mode 160000 index 0000000..42cad4b --- /dev/null +++ b/examples/client/asset_composition @@ -0,0 +1 @@ +Subproject commit 42cad4b42cea463e91cf5810147800ffd2471807 diff --git a/examples/client/css/scss/bigchaindb.scss b/examples/client/css/scss/bigchaindb.scss new file mode 100644 index 0000000..2d3095f --- /dev/null +++ b/examples/client/css/scss/bigchaindb.scss @@ -0,0 +1,10 @@ +$brand-main-green: #39BA91; + +$brand-main-gray: #445261; +$brand-main-gray-light: #CAD2DA; +$brand-main-gray-lighter: #E8EBEF; + +$brand-main-blue-dark: #101A25; +$brand-main-blue: #074354; +$brand-main-blue-light: #BFE6EC; + diff --git a/examples/client/css/scss/timeline.scss b/examples/client/css/scss/timeline.scss new file mode 100644 index 0000000..496b8e4 --- /dev/null +++ b/examples/client/css/scss/timeline.scss @@ -0,0 +1,445 @@ +@import "bigchaindb"; + +.cd-container { + /* this class is used to give a max-width to the element it is applied to, and center it horizontally when it reaches that max-width */ + width: 90%; + max-width: 1000px; + margin: 0 auto; +} + +.cd-container::after { + /* clearfix */ + content: ''; + display: table; + clear: both; +} + +#cd-timeline { + position: relative; + padding: 2em 0; + margin-top: 2em; + margin-bottom: 2em; +} + +#cd-timeline::before { + /* this is the vertical line */ + content: ''; + position: absolute; + top: 2em; + left: 18px; + height: 100%; + width: 4px; + background: $brand-main-gray-lighter; +} + +@media only screen and (min-width: 1000px) { + #cd-timeline { + margin-top: 3em; + margin-bottom: 3em; + } + #cd-timeline::before { + left: 50%; + margin-left: -2px; + } +} + +.cd-timeline-block { + position: relative; + margin: 2em 0; +} + +.cd-timeline-block:after { + content: ""; + display: table; + clear: both; +} + +.cd-timeline-block:first-child { + margin-top: 0; +} + +.cd-timeline-block:last-child { + margin-bottom: 0; +} + +@media only screen and (min-width: 1000px) { + .cd-timeline-block { + margin: 4em 0; + } + .cd-timeline-block:first-child { + margin-top: 0; + } + .cd-timeline-block:last-child { + margin-bottom: 0; + } +} + +.cd-timeline-img { + position: absolute; + top: 0; + left: 0; + width: 40px; + height: 40px; + border-radius: 50%; + box-shadow: 0 0 0 4px white, inset 0 2px 0 rgba(0, 0, 0, 0.08), 0 3px 0 4px rgba(0, 0, 0, 0.05); +} + +.cd-timeline-img img { + display: block; + width: 24px; + height: 24px; + position: relative; + left: 50%; + top: 50%; + margin-left: -12px; + margin-top: -12px; +} + +.cd-timeline-img.cd-picture { + background: $brand-main-green; +} + +.cd-timeline-img.cd-movie { + background: #c03b44; +} + +.cd-timeline-img.cd-loccd-location { + background: #f0ca45; +} + +@media only screen and (min-width: 1000px) { + .cd-timeline-img { + width: 60px; + height: 60px; + left: 50%; + margin-left: -30px; + /* Force Hardware Acceleration in WebKit */ + -webkit-transform: translateZ(0); + -webkit-backface-visibility: hidden; + } + .cssanimations .cd-timeline-img.is-hidden { + visibility: hidden; + } + .cssanimations .cd-timeline-img.bounce-in { + visibility: visible; + -webkit-animation: cd-bounce-1 0.6s; + -moz-animation: cd-bounce-1 0.6s; + animation: cd-bounce-1 0.6s; + } +} + +@-webkit-keyframes cd-bounce-1 { + 0% { + opacity: 0; + -webkit-transform: scale(0.5); + } + + 60% { + opacity: 1; + -webkit-transform: scale(1.2); + } + + 100% { + -webkit-transform: scale(1); + } +} + +@-moz-keyframes cd-bounce-1 { + 0% { + opacity: 0; + -moz-transform: scale(0.5); + } + + 60% { + opacity: 1; + -moz-transform: scale(1.2); + } + + 100% { + -moz-transform: scale(1); + } +} + +@keyframes cd-bounce-1 { + 0% { + opacity: 0; + -webkit-transform: scale(0.5); + -moz-transform: scale(0.5); + -ms-transform: scale(0.5); + -o-transform: scale(0.5); + transform: scale(0.5); + } + + 60% { + opacity: 1; + -webkit-transform: scale(1.2); + -moz-transform: scale(1.2); + -ms-transform: scale(1.2); + -o-transform: scale(1.2); + transform: scale(1.2); + } + + 100% { + -webkit-transform: scale(1); + -moz-transform: scale(1); + -ms-transform: scale(1); + -o-transform: scale(1); + transform: scale(1); + } +} + +.cd-timeline-content { + position: relative; + margin-left: 60px; + background: white; + border-radius: 0.25em; + padding: 1em; + box-shadow: 0 3px 0 $brand-main-gray-lighter; +} + +.cd-timeline-content:after { + content: ""; + display: table; + clear: both; +} + +.cd-timeline-content h2 { + color: $brand-main-gray; +} + +.cd-timeline-content p, .cd-timeline-content .cd-read-more, .cd-timeline-content .cd-date { + font-size: 13px; +} + +.cd-timeline-content .cd-read-more, .cd-timeline-content .cd-date { + display: inline-block; +} + +.cd-timeline-content p { + margin: 1em 0; + line-height: 1.6; +} + +.cd-timeline-content .cd-read-more { + float: right; + padding: .8em 1em; + background: #acb7c0; + color: white; + border-radius: 0.25em; +} + +.no-touch .cd-timeline-content .cd-read-more:hover { + background-color: #bac4cb; +} + +.cd-timeline-content .cd-date { + float: left; + padding: .8em 0; + opacity: .7; +} + +.cd-date { + color: lighten($brand-main-green, 30%); +} + +.cd-timeline-content::before { + content: ''; + position: absolute; + top: 16px; + right: 100%; + height: 0; + width: 0; + border: 7px solid transparent; + border-right: 7px solid white; +} + +@media only screen and (min-width: 768px) { + .cd-timeline-content h2 { + } + .cd-timeline-content p { + font-size: 16px; + } + .cd-timeline-content .cd-read-more, .cd-timeline-content .cd-date { + font-size: 14px; + } +} + +@media only screen and (min-width: 1000px) { + .cd-timeline-content { + margin-left: 0; + padding: 1.6em; + width: 45%; + } + .cd-timeline-content::before { + top: 24px; + left: 100%; + border-color: transparent; + border-left-color: white; + } + .cd-timeline-content .cd-read-more { + float: left; + } + .cd-timeline-content .cd-date { + position: absolute; + width: 100%; + left: 122%; + top: 6px; + font-size: 16px; + } + .cd-timeline-block:nth-child(even) .cd-timeline-content { + float: right; + } + .cd-timeline-block:nth-child(even) .cd-timeline-content::before { + top: 24px; + left: auto; + right: 100%; + border-color: transparent; + border-right-color: white; + } + .cd-timeline-block:nth-child(even) .cd-timeline-content .cd-read-more { + float: right; + } + .cd-timeline-block:nth-child(even) .cd-timeline-content .cd-date { + left: auto; + right: 122%; + text-align: right; + } + .cssanimations .cd-timeline-content.is-hidden { + visibility: hidden; + } + .cssanimations .cd-timeline-content.bounce-in { + visibility: visible; + -webkit-animation: cd-bounce-2 0.6s; + -moz-animation: cd-bounce-2 0.6s; + animation: cd-bounce-2 0.6s; + } +} + +@media only screen and (min-width: 1000px) { + /* inverse bounce effect on even content blocks */ + .cssanimations .cd-timeline-block:nth-child(even) .cd-timeline-content.bounce-in { + -webkit-animation: cd-bounce-2-inverse 0.6s; + -moz-animation: cd-bounce-2-inverse 0.6s; + animation: cd-bounce-2-inverse 0.6s; + } +} + +@-webkit-keyframes cd-bounce-2 { + 0% { + opacity: 0; + -webkit-transform: translateX(-100px); + } + + 60% { + opacity: 1; + -webkit-transform: translateX(20px); + } + + 100% { + -webkit-transform: translateX(0); + } +} + +@-moz-keyframes cd-bounce-2 { + 0% { + opacity: 0; + -moz-transform: translateX(-100px); + } + + 60% { + opacity: 1; + -moz-transform: translateX(20px); + } + + 100% { + -moz-transform: translateX(0); + } +} + +@keyframes cd-bounce-2 { + 0% { + opacity: 0; + -webkit-transform: translateX(-100px); + -moz-transform: translateX(-100px); + -ms-transform: translateX(-100px); + -o-transform: translateX(-100px); + transform: translateX(-100px); + } + + 60% { + opacity: 1; + -webkit-transform: translateX(20px); + -moz-transform: translateX(20px); + -ms-transform: translateX(20px); + -o-transform: translateX(20px); + transform: translateX(20px); + } + + 100% { + -webkit-transform: translateX(0); + -moz-transform: translateX(0); + -ms-transform: translateX(0); + -o-transform: translateX(0); + transform: translateX(0); + } +} + +@-webkit-keyframes cd-bounce-2-inverse { + 0% { + opacity: 0; + -webkit-transform: translateX(100px); + } + + 60% { + opacity: 1; + -webkit-transform: translateX(-20px); + } + + 100% { + -webkit-transform: translateX(0); + } +} + +@-moz-keyframes cd-bounce-2-inverse { + 0% { + opacity: 0; + -moz-transform: translateX(100px); + } + + 60% { + opacity: 1; + -moz-transform: translateX(-20px); + } + + 100% { + -moz-transform: translateX(0); + } +} + +@keyframes cd-bounce-2-inverse { + 0% { + opacity: 0; + -webkit-transform: translateX(100px); + -moz-transform: translateX(100px); + -ms-transform: translateX(100px); + -o-transform: translateX(100px); + transform: translateX(100px); + } + + 60% { + opacity: 1; + -webkit-transform: translateX(-20px); + -moz-transform: translateX(-20px); + -ms-transform: translateX(-20px); + -o-transform: translateX(-20px); + transform: translateX(-20px); + } + + 100% { + -webkit-transform: translateX(0); + -moz-transform: translateX(0); + -ms-transform: translateX(0); + -o-transform: translateX(0); + transform: translateX(0); + } +} \ No newline at end of file diff --git a/examples/client/img/logo_bigchaindb_negative.png b/examples/client/img/logo_bigchaindb_negative.png new file mode 100644 index 0000000..0ed9c3b Binary files /dev/null and b/examples/client/img/logo_bigchaindb_negative.png differ diff --git a/examples/client/js/react/components/account_list.js b/examples/client/js/react/components/account_list.js index 5b9eb97..a4ae7e9 100644 --- a/examples/client/js/react/components/account_list.js +++ b/examples/client/js/react/components/account_list.js @@ -10,6 +10,7 @@ import Spinner from './spinner'; const AccountList = React.createClass({ propTypes: { activeAccount: React.PropTypes.object, + accountList: React.PropTypes.array, appName: React.PropTypes.string, children: React.PropTypes.node, className: React.PropTypes.string, @@ -41,17 +42,22 @@ const AccountList = React.createClass({ render() { const { activeAccount, + accountList, children, className, handleAccountClick } = this.props; - - const { accountList } = this.state; - if (accountList && accountList.length > 0) { + let accountListLocal = accountList; + + if (!accountList) { + accountListLocal = this.state.accountList; + } + + if (accountListLocal && accountListLocal.length > 0) { return (
- {accountList + {accountListLocal .sort((a, b) => { if (a.name < b.name) return -1; if (a.name > b.name) return 1; @@ -61,7 +67,7 @@ const AccountList = React.createClass({ {children} diff --git a/examples/client/js/react/components/button_menu.js b/examples/client/js/react/components/button_menu.js new file mode 100644 index 0000000..940833d --- /dev/null +++ b/examples/client/js/react/components/button_menu.js @@ -0,0 +1,54 @@ +import React from 'react'; + +import { Glyphicon } from 'react-bootstrap/lib'; + + +const ButtonMenu = React.createClass({ + propTypes: { + children: React.PropTypes.node, + glyphIcon: React.PropTypes.string + }, + + getInitialState() { + return { + showMenu: true + } + }, + + handleMenuShow() { + this.setState({ + showMenu: !this.state.showMenu + }); + }, + + render() { + const { + showMenu + } = this.state; + + const { + children, + glyphIcon + } = this.props; + + return ( +
+ { + showMenu ? + : null + } +
+ +
+
+ + ); + } +}); + + +export default ButtonMenu; diff --git a/examples/client/package.json b/examples/client/package.json index 7484821..2857841 100644 --- a/examples/client/package.json +++ b/examples/client/package.json @@ -30,12 +30,14 @@ "bootstrap-sass": "^3.3.6", "bs58": "^4.0.0", "classnames": "^2.2.5", + "codemirror": "^5.25.2", "core-js": "^2.4.0", "ilp-plugin-bigchaindb": "^0.0.7", "js-utility-belt": "^1.5.0", "moment": "^2.14.1", "react": "^15.2.1", "react-bootstrap": "^0.30.7", + "react-codemirror": "^0.3.0", "react-dom": "^15.2.1", "react-matrix": "0.0.6", "react-modal": "^1.7.7", diff --git a/examples/client/webpack.config.js b/examples/client/webpack.config.js index c26e7df..05ad7da 100644 --- a/examples/client/webpack.config.js +++ b/examples/client/webpack.config.js @@ -18,6 +18,7 @@ const EXTRACT = process.env.NODE_ENV === 'extract'; const PATHS = { TX_EXPLORER: path.resolve(__dirname, 'tx_explorer/js/app.js'), AUDIO_METER: path.resolve(__dirname, 'audio_lock/js/app.js'), + ASSET_COMPOSITION: path.resolve(__dirname, 'asset_composition/js/app.js'), SHARE_TRADER: path.resolve(__dirname, 'share_trader/js/app.js'), INTERLEDGER: path.resolve(__dirname, 'interledger/js/app.js'), @@ -32,6 +33,7 @@ const ENTRY = { // Use one entry per app // tx_explorer: PATHS.TX_EXPLORER, audio_lock: PATHS.AUDIO_METER, + asset_composition: PATHS.ASSET_COMPOSITION // sharetrader: PATHS.SHARE_TRADER, // interledger: PATHS.INTERLEDGER, }; @@ -39,6 +41,7 @@ const ENTRY = { const ENTRY_NAMES = { tx_explorer: 'Transaction Explorer', audio_lock: 'Audio Lock', + asset_composition: 'Asset Composition', sharetrader: 'Share Trader', interledger: 'Interledger', }; diff --git a/plugins/bigchaindb-smart-assets b/plugins/bigchaindb-smart-assets new file mode 160000 index 0000000..969288e --- /dev/null +++ b/plugins/bigchaindb-smart-assets @@ -0,0 +1 @@ +Subproject commit 969288efaa4c80bd356bd51cad5f0743ab074fb7