Changes

maitree7 · Sep 10, 2020 · 90e7152 · 90e7152
2 parents 6a1dad2 + 05db44b
commit 90e7152
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/contact.html b/contact.html
@@ -1,6 +1,6 @@
 
 	<!-- Page top section -->
-	<section class="page-top-section set-bg" data-setbg="./frontend/img/page-top-bg.jpg">
+	<section class="page-top-section set-bg" style='padding-top: 0px;height:100%;' data-setbg="./frontend/img/page-top-bg.jpg">
 		<div class="container text-white">
 			<h2>CONTACT US</h2>
 		</div>

diff --git a/dapp.js b/dapp.js
@@ -1,6 +1,9 @@
 // @TODO: Update this address to match your deployed DealerlessMarket contract!
-const marketContractAddress = "0x32813a28AF59d90381A6cFBF57A57B069E0690a3";
-const rentalContractAddress = "0xD7cE93961EB65dd39DcEf12FcF343889FbF77879";
+//const marketContractAddress = "0xd22c15A4eC20963ee61e741f96F3f65Ecf5DaAF0";
+//const rentalContractAddress = "0x33E81cfF891EC074721e879753C0B752FaD81ee8";
+
+const marketContractAddress = "0x8c890aF8BE8335174b32EBc671681fE4270004F0";
+const rentalContractAddress = "0xDE7A61c24B50e7dA6F9694a07FFD46323d0DBe45";
 
 const dApp = {
   ethEnabled: function() {
@@ -34,7 +37,9 @@ const dApp = {
       this.rentalsJson,
       this.rentalContractAddress,
       { defaultAccount: this.accounts[0] }
-    );
+    ).deploy({
+      arguments: [0x33E81cfF891EC074721e879753C0B752FaD81ee8],
+    });
 
     console.log("Contract object", this.marsContract);
     console.log("Contract Rental object", this.rentalContract);
@@ -237,7 +242,7 @@ const dApp = {
       await this.updateUI();
     });
   },
-  rentalStatus:async function(event){
+  isUnderRental : async function(tokenId){
 
   },
   main: async function() {
@@ -247,4 +252,4 @@ const dApp = {
   }
 };
 
-dApp.main();
+dApp.main();
diff --git a/frontend/js/main.js b/frontend/js/main.js
@@ -44,10 +44,7 @@ $(window).on('load', function() {
 			modal.find('.modal-body #itemId').val(tokenId)
 		  })
 
-		document.addEventListener('DOMContentLoaded', function() {
-			var elems = document.querySelectorAll('.modal');
-			var instances = M.Modal.init(elems, options);
-		  });
+
 
 		  $('.modal-trigger').on('click', function(){$('.modal').modal();});