Skip to content

Commit

Permalink
Merge pull request #249 from chronologic/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
adibas03 authored Apr 20, 2018
2 parents dc459e9 + bb8dd8f commit 37ec59c
Show file tree
Hide file tree
Showing 54 changed files with 9,163 additions and 4,106 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
4 changes: 1 addition & 3 deletions .env.dev
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
HTTP_PROVIDER="https://kovan.infura.io"
KEEN_PROJECT_ID="5a8ad8f146e0fb00016bc353"
KEEN_WRITE_KEY="7A8EFD6315E74E131701296C580E9A05D04A4630D3030B4B0FF8AFC8CA343F5611FD1593A189114AC0F43F5596F2AEB82B19973202D7BF6ABC0BF1450AF6F77A19290EE6E5F9D23265637AD8B0FAA83B31C42FA174AE09BAE3D6BD33D651F139"
KEEN_READ_KEY="8A667A700E42CF4EFD62599F49CF9A224B9200BC626EED814E11D28B585102D9B980D45E720F1AF1F49CC332D640B7BE77DB0DC8160D22B3244ED59A102429AE31DEA6C8C4AB56476130B43FA8EB17FF10FE18DEB2D4BA4E33250FC871BE5578"
DAY_TOKEN_ADDRESS={"1":"0xe814aee960a85208c3db542c53e7d4a6c8d5f60f","3":"0x7941bc77E1d6BD4628467b6cD3650F20F745dB06","42":"0x5a6b5c6387196bd4ea264f627792af9d09096876"}
DAY_FAUCET_ADDRESS={"3":"0xfc5c1dc438411dce1cee4971fa333ecd3c3fa7d3","42":"0x3baebd8b6839f8ae0c88fc15b9d8d7b641d06731"}
KEEN_READ_KEY="8A667A700E42CF4EFD62599F49CF9A224B9200BC626EED814E11D28B585102D9B980D45E720F1AF1F49CC332D640B7BE77DB0DC8160D22B3244ED59A102429AE31DEA6C8C4AB56476130B43FA8EB17FF10FE18DEB2D4BA4E33250FC871BE5578"
4 changes: 1 addition & 3 deletions .env.prod
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
HTTP_PROVIDER="https://kovan.infura.io"
KEEN_PROJECT_ID="5a8ad8f146e0fb00016bc353"
KEEN_WRITE_KEY="7A8EFD6315E74E131701296C580E9A05D04A4630D3030B4B0FF8AFC8CA343F5611FD1593A189114AC0F43F5596F2AEB82B19973202D7BF6ABC0BF1450AF6F77A19290EE6E5F9D23265637AD8B0FAA83B31C42FA174AE09BAE3D6BD33D651F139"
KEEN_READ_KEY="8A667A700E42CF4EFD62599F49CF9A224B9200BC626EED814E11D28B585102D9B980D45E720F1AF1F49CC332D640B7BE77DB0DC8160D22B3244ED59A102429AE31DEA6C8C4AB56476130B43FA8EB17FF10FE18DEB2D4BA4E33250FC871BE5578"
DAY_TOKEN_ADDRESS={"1":"0xe814aee960a85208c3db542c53e7d4a6c8d5f60f","3":"0x7941bc77E1d6BD4628467b6cD3650F20F745dB06","42":"0x5a6b5c6387196bd4ea264f627792af9d09096876"}
DAY_FAUCET_ADDRESS={"3":"0xfc5c1dc438411dce1cee4971fa333ecd3c3fa7d3","42":"0x3baebd8b6839f8ae0c88fc15b9d8d7b641d06731"}
KEEN_READ_KEY="8A667A700E42CF4EFD62599F49CF9A224B9200BC626EED814E11D28B585102D9B980D45E720F1AF1F49CC332D640B7BE77DB0DC8160D22B3244ED59A102429AE31DEA6C8C4AB56476130B43FA8EB17FF10FE18DEB2D4BA4E33250FC871BE5578"
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"keyword-spacing": "error",
"no-extra-semi": "error",
"semi": ["error", "always"],
"quotes": ["error", "single", { "allowTemplateLiterals": true }]
"quotes": ["error", "single", { "allowTemplateLiterals": true }],
"jsx-quotes": ["error", "prefer-double"]
},
"plugins": ["jest"]
}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
out/
.DS_Store
.DS_Store
yarn-error.log
8 changes: 8 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"printWidth": 100,
"singleQuote": true,
"useTabs": false,
"semi": true,
"tabWidth": 2,
"trailingComma": "none"
}
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ A DApp that interacts with the Ethereum Alarm Clock.
3. `npm run dev` - Run the dev server
4. Check `localhost:8080` in your browser

## Docker
Useful in case a developer would like to test a feature in an isolated environment.
1. Build containers - `npm run docker-build`
2. Wait for the containers to finish building and starting.
3. Visit `localhost:8080` on your browser. If it still not running, check logs with `docker logs ethalarmclockdapp_dapp_1`.
4. Once the DApp is running, point your MetaMask provider to `http://localhost:9545` and import an account with the following private key: `c87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3` (default Ganache account).
5. You are now running a fully dockerized environment!
6. (Optional) If you need test DAY tokens, you can get some from the faucet.

## Debugging
Having issues with the project? Try these:
- Try cleaning the project `npm run clean` then running `npm run dev`
Expand Down
8 changes: 7 additions & 1 deletion __tests__/Header.unit.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,16 @@ describe('Header', () => {
});

const keenStore = {};
const eacService = {
getActiveContracts: () => {
return {};
}
};

const injectables = {
keenStore,
web3Service
web3Service,
eacService
};

let mockedRender = renderer.create(
Expand Down
73 changes: 73 additions & 0 deletions __tests__/__snapshots__/Header.unit.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,79 @@ exports[`Header displays current block number 1`] = `
5361200
</span>
</div>
<div
className="pull-left p-l-10 fs-14 font-heading d-block"
>
<span
className="left-separator d-lg"
/>
<span
className="active-timenodes"
data-toggle="dropdown"
>
<i
className="fa fa-file-alt ml-2 cursor-pointer"
/>
 
</span>
<div
aria-labelledby="notification-center"
className="dropdown-menu notification-toggle"
role="menu"
>
<div
className="notification-panel"
>
<div
className="scroll-wrapper notification-body scrollable"
>
<div
className="notification-body d-block scrollable scroll-content scroll-visible"
>
<div
className="notification-item clearfix"
>
<div
className="heading row"
>
<div
className="d-block text-uppercase font-weight-bold text-dark"
>
Ethereum Alarm Clock contracts
</div>
</div>
</div>
<div
className="notification-item clearfix"
>
<div
className="heading row"
>
<div
className="d-block text-uppercase font-weight-bold text-dark"
>
Schedulers
</div>
</div>
</div>
<div
className="notification-item clearfix"
>
<div
className="heading row"
>
<div
className="d-block text-uppercase font-weight-bold text-dark"
>
Libraries
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div
className="d-flex"
Expand Down
Loading

0 comments on commit 37ec59c

Please sign in to comment.