May 25, 2023, 8:04 AM

xthet · May 25, 2023 · fcfa90e · fcfa90e
1 parent 79c1e4c
commit fcfa90e
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 64 deletions.
diff --git a/contracts/Campaign.sol b/contracts/Campaign.sol
@@ -185,16 +185,16 @@ contract Campaign is KeeperCompatibleInterface, ReentrancyGuard{
 
   function makeReward( 
     uint256 _price, string memory _title, 
-    string memory _detsLink
-    // string memory _description, string memory _rpic,
-    // string[] memory _perks, 
-    // uint256 _deadline, uint256 _quantity, bool _infinite, 
-    // string[] memory _shipsTo
+    // string memory _detsLink,
+    string memory _description, string memory _rpic,
+    string[] memory _perks, 
+    uint256 _deadline, uint256 _quantity, bool _infinite, 
+    string[] memory _shipsTo
     ) external isCreator {
     if(rewards[_price] != address(0)){revert();}
     rKeys.push(_price);
-    Reward newReward = new Reward(address(this), i_creator, _price, _title, _detsLink);
-    // _description, _rpic, _perks, _deadline, _quantity, _infinite, _shipsTo);
+    Reward newReward = new Reward(address(this), i_creator, _price, _title,
+    _description, _rpic, _perks, _deadline, _quantity, _infinite, _shipsTo);
     rewards[_price] = address(newReward);
   }
 
@@ -209,35 +209,35 @@ contract Campaign is KeeperCompatibleInterface, ReentrancyGuard{
     s_campaignURI = _campaignURI;
   }
 
-  // function updateDur(uint256 _addedDur) external isCreator {
-  //   duration = (((duration + _addedDur)) > i_maxDur) ? i_maxDur : (duration + _addedDur);
-  //   deadline = i_initTimeStamp + duration;
-  // }
+  function updateDur(uint256 _addedDur) external isCreator {
+    duration = (((duration + _addedDur)) > i_maxDur) ? i_maxDur : (duration + _addedDur);
+    deadline = i_initTimeStamp + duration;
+  }
 
   // getter functions
-  // function getRewardKeys() external view returns(uint256[] memory){
-  //   return rKeys;
-  // }
+  function getRewardKeys() external view returns(uint256[] memory){
+    return rKeys;
+  }
 
-  // function getReward(uint256 _priceID) external view returns(Reward.RewardObject memory) {
-  //   Reward reward = Reward(rewards[_priceID]);
-  //   return reward.getRewardDetails();
-  // }
+  function getReward(uint256 _priceID) external view returns(Reward.RewardObject memory) {
+    Reward reward = Reward(rewards[_priceID]);
+    return reward.getRewardDetails();
+  }
 
-  // function getCampaignDetails() external view returns(CampaignObject memory) {
-  //   return CampaignObject(
-  //     i_creator,
-  //     s_title, 
-  //     s_description,
-  //     s_category,
-  //     s_tags,
-  //     goalAmount,
-  //     duration,
-  //     currentBalance,
-  //     c_state,
-  //     s_imageURI,
-  //     s_campaignURI,
-  //     deadline
-  //   );
-  // }
+  function getCampaignDetails() external view returns(CampaignObject memory) {
+    return CampaignObject(
+      i_creator,
+      s_title, 
+      s_description,
+      s_category,
+      s_tags,
+      goalAmount,
+      duration,
+      currentBalance,
+      c_state,
+      s_imageURI,
+      s_campaignURI,
+      deadline
+    );
+  }
 }
diff --git a/contracts/Reward.sol b/contracts/Reward.sol
@@ -40,27 +40,27 @@ contract Reward {
     address _creator,
     uint256 _price, 
     string memory _title, 
-    string memory _detsLink
-    // string memory _description, 
-    // string memory _rpic,
-    // string[] memory _perks, 
-    // uint256 _deadline, 
-    // uint256 _quantity, 
-    // bool _infinite, 
-    // string[] memory _shipsTo
+    // string memory _detsLink,
+    string memory _description, 
+    string memory _rpic,
+    string[] memory _perks, 
+    uint256 _deadline, 
+    uint256 _quantity, 
+    bool _infinite, 
+    string[] memory _shipsTo
     ) {
     i_price = _price;
     i_campaignAddress = _campaignAddress;
     i_creator = _creator;
 
     title = _title;
-    // description = _description;
-    // rpic = _rpic;
-    // perks = _perks;
-    // delDate = _deadline;
-    // quantity = _quantity;
-    // infinite = _infinite;
-    // shipsTo = _shipsTo;
+    description = _description;
+    rpic = _rpic;
+    perks = _perks;
+    delDate = _deadline;
+    quantity = _quantity;
+    infinite = _infinite;
+    shipsTo = _shipsTo;
   }
 
   function updateSurveyLink(string memory _surveylink) external {
@@ -103,19 +103,19 @@ contract Reward {
     surveyResponses[msg.sender] = _response;
   }
 
-  // function getRewardDetails() external view returns(RewardObject memory){
-  //   return RewardObject(
-  //     i_price,
-  //     title,
-  //     description,
-  //     rpic,
-  //     perks,
-  //     delDate,
-  //     quantity,
-  //     infinite,
-  //     shipsTo,
-  //     donators,
-  //     surveyLink
-  //   );
-  // }
+  function getRewardDetails() external view returns(RewardObject memory){
+    return RewardObject(
+      i_price,
+      title,
+      description,
+      rpic,
+      perks,
+      delDate,
+      quantity,
+      infinite,
+      shipsTo,
+      donators,
+      surveyLink
+    );
+  }
 }