+ Current network environment: {{ currentNetwork }}
-Set project name:
-Crowdfunding target amount:
-End Time:
-project description:
+Set project name:
++ Crowdfunding target amount: +
++ End Time: +
++ project description: + +
{{ deploymentResult }}
{{ deploymentError }}
@@ -18,28 +25,30 @@ export default { data() { return { - currentNetwork: '', - projectName: '', - projectGoal: '', - endTime: '', - projectDescription: '', + currentNetwork: "", + projectName: "", + projectGoal: "", + endTime: "", + projectDescription: "", contractDeployed: false, - deploymentResult: '', - deploymentError: '' - } + deploymentResult: "", + deploymentError: "", + }; }, methods: { deployContract() { // 假设 deploy() 是一个返回 Promise 的函数 - deploy().then((contractAddress) => { - this.contractDeployed = true; - this.deploymentResult = '发布成功，合约地址：' + contractAddress; - }).catch((error) => { - this.deploymentError = '发布失败，请重新设置'; - }); - } - } -} + deploy() + .then((contractAddress) => { + this.contractDeployed = true; + this.deploymentResult = "发布成功，合约地址：" + contractAddress; + }) + .catch((error) => { + this.deploymentError = "发布失败，请重新设置"; + }); + }, + }, +}; diff --git a/src/components/UserCenter.vue b/src/components/UserCenter.vue index 1751ef3..d1e2510 100644 --- a/src/components/UserCenter.vue +++ b/src/components/UserCenter.vue @@ -1,11 +1,11 @@ -
-
-
-
Date: Fri, 14 Jul 2023 10:39:29 +0200
Subject: [PATCH 11/23] Main campaign is now Etherpledge
---
migrations/2_deploy_contract.js | 8 +--
src/components/FirstVue.vue | 104 +++++++++++++++++++-------------
2 files changed, 65 insertions(+), 47 deletions(-)
diff --git a/migrations/2_deploy_contract.js b/migrations/2_deploy_contract.js
index 41a28b9..d125fd6 100644
--- a/migrations/2_deploy_contract.js
+++ b/migrations/2_deploy_contract.js
@@ -3,11 +3,11 @@ const Campaign = artifacts.require("Campaign");
module.exports = function (deployer, network, accounts) {
// Define your parameters for Campaign constructor
const _goal = web3.utils.toWei('10', 'ether');
- const _duration = 60 * 60 * 24; // 1 day in seconds
+ const _duration = 7 * 60 * 60 * 24; // 1 week in seconds
const _descriptions = [
- "This is the first description",
- "This is the second description",
- "This is the third description"
+ "Add quorum to decide, when a campaign is successful.",
+ "Let multiple people create a campaign together.",
+ "Redesign of the web-interface.",
];
// Pass the parameters to the deploy function of Campaign
diff --git a/src/components/FirstVue.vue b/src/components/FirstVue.vue
index 228118c..b1bd864 100644
--- a/src/components/FirstVue.vue
+++ b/src/components/FirstVue.vue
@@ -1,20 +1,21 @@
- ![Logo]()
-
+
+
+ ![Logo]()
+
-
User Center
+User Center
-
+
- Copy
-
- Adress
- - -
- Copy
-
- PrivateKey
- - -
- Transfer
-
- Balance
- - -
+ Copy
+
+ Adress
+ + +
+ Copy
+
+ PrivateKey
+ + +
+ Transfer
+
+ Balance
+ + +Crowdfunding Project
{{ discoverCount }}
@@ -107,19 +116,31 @@ const favoriteCount = ref(5);
{{ favoriteCount }}
- Discover
- Joined
- Favorite
+ Discover
+ Joined
+ Favorite
-
- Start Crowdfunding
+
@@ -127,7 +148,9 @@ const favoriteCount = ref(5);
+
+
From c5cb451a54f8c33ca0d50e162659098c9ce57a08 Mon Sep 17 00:00:00 2001
From: Jannis Maier
+ Start Crowdfunding
- Home
+ Home
-
@@ -55,7 +56,7 @@
Top Project Today
+Etherpledge Funding
Project Information
{{ projectInfo }}
- Goal Amount: {{ goal }} + Goal Amount: {{ campaign.goal }} ETH
- Time Remaining: {{ timeRemaining }} + Time Remaining: + {{ campaign.timeRemaining }} seconds
- Raised Money {{ raisedAmount }} + Raised Money {{ campaign.raisedAmount }} ETH
Other Projects You May Be Interested In:
-
-
- +
- {{ project.name }} - {{ project.description }} @@ -147,8 +148,8 @@ h3 { top: 100px; right: 10px; - padding: 10px 30px; /* 调整按钮的上下和左右内边距 */ - font-size: 18px; /* 调整按钮的字体大小 */ + padding: 10px 30px; + font-size: 18px; } ul { @@ -180,38 +181,41 @@ export default { data() { return { + // Metadata web3: null, - campaignContract: null, - goal: null, - raisedAmount: 0, - end: null, - timeRemaining: 0, - contribution: 0, - balances: {}, isWeb3Initialized: false, + privateKey: "0xd51456b59df4839f76240a0290601d60b39a01de", // Your private key + balances: {}, + contribution: 0, + + // Etherpledge campaign + campaign: { + id: 1, + contract: null, + goal: null, + raisedAmount: 0, + end: null, + timeRemaining: 0, + status: "Open", + }, + projectInfo: - "*****************************************************\n*****************************************************\n*****************************************************\n*****************************************************", + "Join our week-long campaign for EtherPledge, your trusted decentralized platform. Your pledges are more than donations; they empower you to vote on potential new features for our site. Your support can help shape EtherPledge's future!", funderInfo: - "*****************************************************\n*****************************************************\n*****************************************************", - projects: [ - { - id: 1, - name: "Buy a Cat", - description: "A project to raise funds for buying a lovely cat", - }, - ], - privateKey: "0xd51456b59df4839f76240a0290601d60b39a01de", // 您的私钥 - status: "Open", + "Our diverse team at EtherPledge is passionate about using blockchain technology to enhance crowdfunding. United by the goal of transparency and accessibility, we value collaboration, continuous learning, and our supportive community.", + + allCampaigns: [], }; }, async mounted() { await this.initializeWeb3(); - if (this.campaignContract !== null) { + await this.loadCampaign(); + if (this.campaign.contract !== null) { this.loadBalances(); this.updateRaisedAmount(); - this.scanPastEvents(this.campaignContract); - this.subscribeToNewEvents(this.campaignContract); + this.scanPastEvents(this.campaign.contract); + this.subscribeToNewEvents(this.campaign.contract); } setInterval(this.updateTimeRemaining, 1000); this.status = "Open"; @@ -232,22 +236,28 @@ export default { this.web3.eth.defaultAccount = accounts[0]; console.log("Accounts:", accounts); // print account list - const campaignContractAddress = - "0x17BeB31346451C741BcAA09F00699Fd64A8CE476"; // replace to smart contract - this.campaignContract = new this.web3.eth.Contract( - CampaignContract.abi, - campaignContractAddress - ); - - console.log("Campaign Contract:", this.campaignContract); - console.log("Campaign Events:", this.campaignContract.events); - this.isWeb3Initialized = true; } catch (error) { console.error("Failed to initialize Web3:", error); } }, + async loadCampaign() { + const campaignContractAddress = + "0x91DBAcF75902c703414DDE734E1736bf1A168DB5"; // replace to smart contract + this.campaign.contract = new this.web3.eth.Contract( + CampaignContract.abi, + campaignContractAddress + ); + + console.log("Campaign Contract:", this.campaign.contract); + console.log("Campaign Events:", this.campaign.contract.events); + + this.campaign.id = 1; + this.campaign.goal = 10; + this.campaign.end = this.timestampOneWeekFromNow(); + }, + async scanPastEvents(contract) { try { const pastEvents = await contract.getPastEvents("allEvents", { @@ -287,8 +297,10 @@ export default { async updateTimeRemaining() { const currentTime = bigInt(Math.floor(Date.now() / 1000)); - const end = bigInt(this.end); - this.timeRemaining = Number(bigInt.max(bigInt(0), end - currentTime)); + const end = bigInt(this.campaign.end); + this.campaign.timeRemaining = Number( + bigInt.max(bigInt(0), end - currentTime) + ); }, async pledge() { @@ -298,7 +310,7 @@ export default { ); try { - await this.campaignContract.methods.pledge().send({ + await this.campaign.contract.methods.pledge().send({ from: this.web3.eth.defaultAccount, value: weiAmount, gas: 3000000, @@ -331,9 +343,9 @@ export default { async updateRaisedAmount() { try { const balance = await this.web3.eth.getBalance( - this.campaignContract.options.address + this.campaign.contract.options.address ); - this.raisedAmount = this.web3.utils.fromWei(balance, "ether"); + this.campaign.raisedAmount = this.web3.utils.fromWei(balance, "ether"); } catch (error) { console.error("Failed to update raised amount:", error); } @@ -342,6 +354,12 @@ export default { login() { this.$router.push({ name: "UserCenter" }); }, + + timestampOneWeekFromNow() { + const now = new Date(); + now.setDate(now.getDate() + 7); + return Math.floor(now.getTime() / 1000); + }, }, }; From b7752b8c12eae3b5d23280fbcf1439bc89e1869f Mon Sep 17 00:00:00 2001 From: Bin Zeng
@@ -149,13 +78,82 @@ const favoriteCount = ref(5);
+
\ No newline at end of file
+
From 305c508491762524b0807ee9f5b98aef601e1dd3 Mon Sep 17 00:00:00 2001
From: BinZeng