Merge pull request #11 from Schwartz10/negativeNumberBug

fixes negative number bug, and renders post properly after creating a…

build/contracts/Migrations.json

@@ -823,5 +823,5 @@
     }
   },
   "schemaVersion": "1.0.1",
-  "updatedAt": "2018-01-19T23:48:42.207Z"
+  "updatedAt": "2018-01-20T17:25:13.159Z"
 }

build/contracts/SimpleStorage.json

@@ -344,5 +344,5 @@
     }
   },
   "schemaVersion": "1.0.1",
-  "updatedAt": "2018-01-19T23:48:42.206Z"
+  "updatedAt": "2018-01-20T17:25:13.158Z"
 }

contracts/CapCoin.sol

@@ -1,11 +1,13 @@
 pragma solidity ^0.4.18;
 
-contract CapCoin {
+import 'zeppelin-solidity/contracts/ownership/Ownable.sol';
+
+contract CapCoin is Ownable {
 
   event NewUser(string name);
   event BoughtTokens(uint coinBalance);
   event CreatedPost(string url);
-  event LikedPost(uint lotteryAmount, string posterName,
+  event LikedPost(int lotteryAmount, string posterName,
     address poster, uint posterCoinbalance, string likerName,
     address liker, uint likerCoinbalance);
 
@@ -20,7 +22,7 @@ contract CapCoin {
   struct Post {
     string url;
     string userName;
-    uint lotteryAmount;
+    int lotteryAmount;
     address owner;
   }
 
@@ -35,7 +37,7 @@ contract CapCoin {
     NewUser(name);
   }
 
-  function getUser() public view returns (string, uint, string, uint, address) {
+  function getUser() public view returns (string, uint, string, int, address) {
     return (addressToUser[msg.sender].name,
       addressToUser[msg.sender].coinBalance,
       addressToPost[msg.sender].url,
@@ -65,7 +67,7 @@ contract CapCoin {
   }
 
   function likePost(address post, uint amount) public {
-    addressToPost[post].lotteryAmount += amount;
+    addressToPost[post].lotteryAmount += int(amount);
     addressToUser[post].coinBalance += amount;
     addressToUser[msg.sender].coinBalance -= amount;
     LikedPost(addressToPost[post].lotteryAmount,

readme.md

@@ -9,4 +9,5 @@
 
 c87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3
 ae6ae8e5ccbfb04590405997ee2d52d2b330726137b875053c36d94e974d162f
+0dbbe8e4ae425a6d2687f1a7e3ba17bc98c673636790f1b8ad91193c05875ef1
 http://127.0.0.1:7545

src/components/CreatePost.js

@@ -42,7 +42,7 @@ class CreatePost extends Component {
               />
               <RaisedButton
                 onClick={e =>
-                this.props.post(e, this.state.postUrl, this.props.contract.createPost, this.props.accounts[0])}
+                this.props.post(e, this.state.postUrl, this.props.contract.createPost, this.props.accounts[0], this.props.user.name)}
                 label="Create Post" primary={true}
               />
             </div>
@@ -71,9 +71,9 @@ const mapState = (state) => {
 
 const mapDispatch = (dispatch) => {
   return {
-    post: function(e, postUrl, contractFunc, account){
+    post: function(e, postUrl, contractFunc, account, username){
       e.preventDefault();
-      return dispatch(post(postUrl, contractFunc, account));
+      return dispatch(post(postUrl, contractFunc, account, username));
     }
   }
 }

src/components/Explore.js

@@ -22,15 +22,15 @@ class Explore extends Component {
           <h1 className="single-view-header">Explore</h1>
           {this.props.posts.length > 0 &&
             this.props.posts.map(post =>
-              <div id="post-container" key={post.username}>
+                <div id="post-container" key={post.username}>
                   <Post
                     username={post.username}
                     tokenPot={post.tokenPot}
                     postUrl={post.postUrl}
                     address={post.address}
                     isPreview={false}
                   />
-              </div>
+                </div>
           )}
       </div>
     )

src/store/posts.js

@@ -23,14 +23,15 @@ const likedPost = post => ({type: LIKED_POST, post});
  * THUNK CREATORS
  */
 
-export const post = (url, contractFunc, account) =>
+export const post = (url, contractFunc, account, username) =>
   dispatch =>
     contractFunc(url, {from: account})
     .then(res => {
       let newPost = {}
       newPost.postUrl = res.logs[0].args.url;
-      newPost.account = account;
-      newPost.tokenPot = -5
+      newPost.address = account;
+      newPost.tokenPot = -5;
+      newPost.username = username;
       return dispatch(createPost(newPost));
     })
     .catch(err => console.log(err));