Merge pull request #1 from Schwartz10/fetchUser-take2

Fetch user take2
reard96 · Jan 18, 2018 · 5c93ed5 · 5c93ed5
2 parents cef124e + a579918
commit 5c93ed5
Show file tree

Hide file tree

Showing 6 changed files with 628 additions and 1,702 deletions.
diff --git a/build/contracts/CapCoin.json b/build/contracts/CapCoin.json
diff --git a/build/contracts/Migrations.json b/build/contracts/Migrations.json
@@ -819,9 +819,9 @@
     "5777": {
       "events": {},
       "links": {},
-      "address": "0xf12b5dd4ead5f743c6baa640b0216200e89b60da"
+      "address": "0x345ca3e014aaf5dca488057592ee47305d9b3e10"
     }
   },
   "schemaVersion": "1.0.1",
-  "updatedAt": "2018-01-18T14:33:11.577Z"
+  "updatedAt": "2018-01-18T19:03:08.782Z"
 }
diff --git a/build/contracts/SimpleStorage.json b/build/contracts/SimpleStorage.json
@@ -344,5 +344,5 @@
     }
   },
   "schemaVersion": "1.0.1",
-  "updatedAt": "2018-01-18T14:33:11.547Z"
+  "updatedAt": "2018-01-18T19:03:08.779Z"
 }
diff --git a/contracts/CapCoin.sol b/contracts/CapCoin.sol
@@ -6,6 +6,11 @@ contract CapCoin {
 
   uint coinSupply = 1000000;
   uint coinsBought = 0;
+  uint contractNum;
+
+  function CapCoin () {
+    contractNum = 1;
+  }
 
   struct User {
     string name;

diff --git a/src/App.js b/src/App.js
@@ -27,7 +27,7 @@ class App extends Component {
     await this.props.getWeb3()
     await this.props.getContract(this.props.web3)
     await this.props.getAccounts(this.props.web3)
-    // await this.props.getUser(this.props.web3)
+    await this.props.findUser(this.props.contract.getUser, this.props.accounts[0])
   }
 
   render() {
@@ -44,6 +44,8 @@ class App extends Component {
 function mapStateToProps(state){
   return {
     web3: state.web3,
+    contract: state.contract,
+    accounts: state.accounts
   }
 }
 
@@ -58,8 +60,8 @@ function mapDispatchToProps(dispatch){
     getAccounts: function (web3){
       return dispatch(fetchAccounts(web3));
     },
-    getUser: function (web3){
-      return dispatch(fetchUser(web3));
+    findUser: function (contractFunc, account){
+      return dispatch(fetchUser(contractFunc, account));
     }
   }
 }

diff --git a/src/store/user.js b/src/store/user.js
@@ -18,11 +18,24 @@ const createUser = user => ({type: CREATE_USER, user})
  * THUNK CREATORS
  */
 
-export const fetchUser = (web3, address)  => {}
+export const fetchUser = (contractFunc, account)  =>
+  dispatch =>
+    contractFunc.call({from: account})
+    .then(res => {
+      let user = {}
+      user.name = res[0];
+      user.coinBalance = Number(res[1].toString(10));
+      return dispatch(getUser(user))
+    })
+    .catch(err => console.log(err))
+
 export const addUser = (name, contractFunc, account) =>
   dispatch =>
     contractFunc(name, {from: account})
-    .then(res => dispatch(createUser(res.logs[0].args)))
+    .then(res => {
+
+      console.log(res)
+      dispatch(createUser(res.logs[0].args))})
     .catch(err => console.log(err))
 
 /**