From 3907a1fdf19a8247a1b3a91784eefb717690441d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=A1=D0=BE=D0=B1=D0=BE?= =?UTF-8?q?=D0=BB=D0=B5=D0=B2?= Date: Sun, 23 Jun 2019 12:01:09 +0300 Subject: [PATCH] Version ready for deploy --- frontend/README.md | 2 ++ frontend/index.js | 23 ++++++++++------------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/frontend/README.md b/frontend/README.md index 89d71e5..0dc4a9c 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -1,4 +1,6 @@ # Usage +0. set the `appId` (Fluence) and `lazyAddress` (Eth contract) in `index.js` + 1. run ```npm i``` 2. run ```npm run build``` diff --git a/frontend/index.js b/frontend/index.js index 4354c51..bab5bc2 100644 --- a/frontend/index.js +++ b/frontend/index.js @@ -1,8 +1,14 @@ //CONNECT FLUENCE import * as fluence from "fluence"; -//let session; -window.onload = function () { + +window.getResultAsString = function (result) { + return result.result().then((r) => r.asString()) +}; + +var contractInstance; + +$(document).ready(function() { let contractAddress = "0xeFF91455de6D4CF57C141bD8bF819E5f873c1A01"; // set ethUrl to `undefined` to use MetaMask instead of Ethereum node @@ -16,17 +22,8 @@ window.onload = function () { console.log("Session created"); window.session = s; }); -}; -window.getResultAsString = function (result) { - return result.result().then((r) => r.asString()) -}; - -var contractInstance; - -$(document).ready(function() { - - var controllerAddress = '0x1cca1f0be338c747b11a16aba8d0905251628bdf'; + var lazyAddress = '0x1cca1f0be338c747b11a16aba8d0905251628bdf'; let ControllerAbi = [ { "constant": true, @@ -368,7 +365,7 @@ $(document).ready(function() { } ]; let ControllerContract = web3.eth.contract(ControllerAbi); - contractInstance = ControllerContract.at(controllerAddress); + contractInstance = ControllerContract.at(lazyAddress); window.ethereum.enable(); contractInstance.tasksNum(function (err, result) {