-
+
-
diff --git a/meetupdao/UI/proposals.js b/meetupdao/UI/proposals.js
new file mode 100644
index 0000000..f5923c2
--- /dev/null
+++ b/meetupdao/UI/proposals.js
@@ -0,0 +1,91 @@
+
+function newProposalInEther(){
+ var beneficiary=document.getElementById("beneficiary").value;
+ var etherAmount=document.getElementById("etherAmount").value;
+ var jobDescription=document.getElementById("jobDescription").value;
+ var transactionBytecode=document.getElementById("transactionBytecode").value;
+ var myTokenContract = web3.eth.contract(abi).at(address);
+ return myTokenContract.newProposalInEther(beneficiary, etherAmount, jobDescription, transactionBytecode, function (error, result) {})
+
+ }
+
+
+function executeProposal(proposalNumberValue){
+ var proposalNumber = proposalNumberValue;
+ var transactionBytecode=document.getElementById("transactionBytecode").value;
+ var myTokenContract = web3.eth.contract(abi).at(address);
+ return myTokenContract.executeProposal(proposalNumber, transactionBytecode, function (error, result) {})
+
+ }
+
+
+ function vote(proposalNumberValue){
+ var proposalNumber = proposalNumberValue;
+ var idYes = "supportsProposal_" + proposalNumber + "_yes";
+ var idNo = "supportsProposal_" + proposalNumber + "_no";
+ var idJustificationText = "justificationText_" + proposalNumber;
+ var yes=document.getElementById(idYes).checked;
+ var no= document.getElementById(idNo).checked;
+ if(yes==true)
+ var supportsProposal = 1;
+ else if(no==true)
+ var supportsProposal = -1;
+
+ var justificationText=document.getElementById(idJustificationText).value;
+ var myTokenContract = web3.eth.contract(abi).at(address);
+ return myTokenContract.vote(proposalNumber, supportsProposal, justificationText, function (error, result) {})
+ }
+
+
+function getProposals(){
+ var myTokenContract = web3.eth.contract(abi).at(address);
+
+ myTokenContract.totalProposals(function(error,result){
+ var totalProposals = result.c[0];
+ for(var i = 0; i < totalProposals; i++){
+ const proposalNumber = i;
+ myTokenContract.proposals(i, function(error,result){
+
+ var a1 = '
';
+ var recipient = result[0];
+ var a2 = '
EXECUTE ';
+ var message = result[2];
+
+ var voteButton1 = ' ';
+
+ var a3 = 'Proposal No.: ';
+
+ var a4 = '
Votes : Total Votes: ';
+ var totalVotes = result[6].c[0];
+ var a5 = ' Current Status: ';
+ var currentStatus = result[7].c[0];
+ var a6 = '
';
+
+ var input = a1+recipient+a2+proposalNumber+a21+message+voteButton1+proposalNumber+voteButton2+proposalNumber+voteButton3+proposalNumber+voteButton4+proposalNumber+voteButton5+a3+proposalNumber+a4+totalVotes+a5+currentStatus+a6;
+ var mydiv = document.getElementById("parent");
+ var newDiv = document.createElement('div');
+ newDiv.innerHTML = input;
+ while (newDiv.firstChild) {
+ mydiv.appendChild(newDiv.firstChild);
+ }
+
+
+ })
+ }
+ })
+}
+getProposals();
+
+function homenav(){
+ location.href ="./index.html";
+}
\ No newline at end of file
diff --git a/meetupdao/UI/stepProposal.html b/meetupdao/UI/stepProposal.html
new file mode 100755
index 0000000..5bfaf99
--- /dev/null
+++ b/meetupdao/UI/stepProposal.html
@@ -0,0 +1,175 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/meetupdao/UI/web3/abi.js b/meetupdao/UI/web3/abi.js
deleted file mode 100644
index 912c7db..0000000
--- a/meetupdao/UI/web3/abi.js
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-var address="0x4109f673b60E92c69f7d511D0fB641ecf7ea1694";
-
-var abi =
-[ { "constant": true, "inputs": [ { "name": "", "type": "uint256" } ], "name": "proposals", "outputs": [ { "name": "recipient", "type": "address", "value": "0x0000000000000000000000000000000000000000" }, { "name": "amount", "type": "uint256", "value": "0" }, { "name": "description", "type": "string", "value": "Tester" }, { "name": "fileHash", "type": "string", "value": "" }, { "name": "votingDeadline", "type": "uint256", "value": "1522839557" }, { "name": "executed", "type": "bool", "value": false }, { "name": "proposalPassed", "type": "bool", "value": false }, { "name": "numberOfVotes", "type": "uint256", "value": "0" }, { "name": "currentResult", "type": "int256", "value": "0" }, { "name": "proposalHash", "type": "bytes32", "value": "0xa86d54e9aab41ae5e520ff0062ff1b4cbd0b2192bb01080a058bb170d84e6457" } ], "payable": false, "stateMutability": "view", "type": "function" }, { "constant": false, "inputs": [ { "name": "targetMember", "type": "address" } ], "name": "removeMember", "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function" }, { "constant": false, "inputs": [ { "name": "proposalNumber", "type": "uint256" }, { "name": "transactionBytecode", "type": "bytes" } ], "name": "executeProposal", "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function" }, { "constant": true, "inputs": [ { "name": "", "type": "address" } ], "name": "memberId", "outputs": [ { "name": "", "type": "uint256", "value": "0" } ], "payable": false, "stateMutability": "view", "type": "function" }, { "constant": false, "inputs": [ { "name": "beneficiary", "type": "address" }, { "name": "weiAmount", "type": "uint256" }, { "name": "jobDescription", "type": "string" }, { "name": "uploadFileHash", "type": "string" }, { "name": "transactionBytecode", "type": "bytes" } ], "name": "newProposal", "outputs": [ { "name": "proposalID", "type": "uint256" } ], "payable": false, "stateMutability": "nonpayable", "type": "function" }, { "constant": true, "inputs": [], "name": "numProposals", "outputs": [ { "name": "", "type": "uint256", "value": "8" } ], "payable": false, "stateMutability": "view", "type": "function" }, { "constant": true, "inputs": [ { "name": "", "type": "uint256" } ], "name": "members", "outputs": [ { "name": "member", "type": "address", "value": "0x0000000000000000000000000000000000000000" }, { "name": "name", "type": "string", "value": "" }, { "name": "memberSince", "type": "uint256", "value": "1522838942" } ], "payable": false, "stateMutability": "view", "type": "function" }, { "constant": true, "inputs": [], "name": "debatingPeriodInMinutes", "outputs": [ { "name": "", "type": "uint256", "value": "5" } ], "payable": false, "stateMutability": "view", "type": "function" }, { "constant": true, "inputs": [], "name": "totalMembers", "outputs": [ { "name": "", "type": "uint256", "value": "6" } ], "payable": false, "stateMutability": "view", "type": "function" }, { "constant": true, "inputs": [], "name": "minimumQuorum", "outputs": [ { "name": "", "type": "uint256", "value": "2" } ], "payable": false, "stateMutability": "view", "type": "function" }, { "constant": true, "inputs": [], "name": "owner", "outputs": [ { "name": "", "type": "address", "value": "0x52c3a9b0f293cac8c1baabe5b62524a71211a616" } ], "payable": false, "stateMutability": "view", "type": "function" }, { "constant": false, "inputs": [ { "name": "_from", "type": "address" }, { "name": "_value", "type": "uint256" }, { "name": "_token", "type": "address" }, { "name": "_extraData", "type": "bytes" } ], "name": "receiveApproval", "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function" }, { "constant": true, "inputs": [], "name": "totalProposals", "outputs": [ { "name": "", "type": "uint256", "value": "8" } ], "payable": false, "stateMutability": "view", "type": "function" }, { "constant": true, "inputs": [], "name": "majorityMargin", "outputs": [ { "name": "", "type": "int256", "value": "0" } ], "payable": false, "stateMutability": "view", "type": "function" }, { "constant": false, "inputs": [ { "name": "minimumQuorumForProposals", "type": "uint256" }, { "name": "minutesForDebate", "type": "uint256" }, { "name": "marginOfVotesForMajority", "type": "int256" } ], "name": "changeVotingRules", "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function" }, { "constant": false, "inputs": [ { "name": "targetMember", "type": "address" }, { "name": "memberName", "type": "string" } ], "name": "addMember", "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function" }, { "constant": false, "inputs": [ { "name": "beneficiary", "type": "address" }, { "name": "etherAmount", "type": "uint256" }, { "name": "jobDescription", "type": "string" }, { "name": "uploadFileHash", "type": "string" }, { "name": "transactionBytecode", "type": "bytes" } ], "name": "newProposalInEther", "outputs": [ { "name": "proposalID", "type": "uint256" } ], "payable": false, "stateMutability": "nonpayable", "type": "function" }, { "constant": false, "inputs": [ { "name": "proposalNumber", "type": "uint256" }, { "name": "supportsProposal", "type": "bool" }, { "name": "justificationText", "type": "string" } ], "name": "vote", "outputs": [ { "name": "voteID", "type": "uint256" } ], "payable": false, "stateMutability": "nonpayable", "type": "function" }, { "constant": false, "inputs": [ { "name": "memberName", "type": "string" } ], "name": "becomeMember", "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function" }, { "constant": true, "inputs": [ { "name": "proposalNumber", "type": "uint256" }, { "name": "beneficiary", "type": "address" }, { "name": "weiAmount", "type": "uint256" }, { "name": "transactionBytecode", "type": "bytes" } ], "name": "checkProposalCode", "outputs": [ { "name": "codeChecksOut", "type": "bool", "value": true } ], "payable": false, "stateMutability": "view", "type": "function" }, { "constant": false, "inputs": [ { "name": "newOwner", "type": "address" } ], "name": "transferOwnership", "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], "payable": true, "stateMutability": "payable", "type": "constructor" }, { "payable": true, "stateMutability": "payable", "type": "fallback" }, { "anonymous": false, "inputs": [ { "indexed": false, "name": "proposalID", "type": "uint256" }, { "indexed": false, "name": "recipient", "type": "address" }, { "indexed": false, "name": "amount", "type": "uint256" }, { "indexed": false, "name": "description", "type": "string" } ], "name": "ProposalAdded", "type": "event" }, { "anonymous": false, "inputs": [ { "indexed": false, "name": "proposalID", "type": "uint256" }, { "indexed": false, "name": "position", "type": "bool" }, { "indexed": false, "name": "voter", "type": "address" }, { "indexed": false, "name": "justification", "type": "string" } ], "name": "Voted", "type": "event" }, { "anonymous": false, "inputs": [ { "indexed": false, "name": "proposalID", "type": "uint256" }, { "indexed": false, "name": "result", "type": "int256" }, { "indexed": false, "name": "quorum", "type": "uint256" }, { "indexed": false, "name": "active", "type": "bool" } ], "name": "ProposalTallied", "type": "event" }, { "anonymous": false, "inputs": [ { "indexed": false, "name": "member", "type": "address" }, { "indexed": false, "name": "isMember", "type": "bool" } ], "name": "MembershipChanged", "type": "event" }, { "anonymous": false, "inputs": [ { "indexed": false, "name": "newMinimumQuorum", "type": "uint256" }, { "indexed": false, "name": "newDebatingPeriodInMinutes", "type": "uint256" }, { "indexed": false, "name": "newMajorityMargin", "type": "int256" } ], "name": "ChangeOfRules", "type": "event" }, { "anonymous": false, "inputs": [ { "indexed": false, "name": "sender", "type": "address" }, { "indexed": false, "name": "amount", "type": "uint256" } ], "name": "receivedEther", "type": "event" }, { "anonymous": false, "inputs": [ { "indexed": false, "name": "_from", "type": "address" }, { "indexed": false, "name": "_value", "type": "uint256" }, { "indexed": false, "name": "_token", "type": "address" }, { "indexed": false, "name": "_extraData", "type": "bytes" } ], "name": "receivedTokens", "type": "event" } ];
-
diff --git a/meetupdao/UI/web3/images/roadmap.jpg b/meetupdao/UI/web3/images/roadmap.jpg
deleted file mode 100644
index 8304c10..0000000
Binary files a/meetupdao/UI/web3/images/roadmap.jpg and /dev/null differ
diff --git a/meetupdao/UI/web3/images/roadmap1.jpg b/meetupdao/UI/web3/images/roadmap1.jpg
deleted file mode 100644
index 8bbdce7..0000000
Binary files a/meetupdao/UI/web3/images/roadmap1.jpg and /dev/null differ
diff --git a/meetupdao/UI/web3/index.html b/meetupdao/UI/web3/index.html
deleted file mode 100644
index 1bb2402..0000000
--- a/meetupdao/UI/web3/index.html
+++ /dev/null
@@ -1,206 +0,0 @@
-
-
-
DAO
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
What is DAO!!!
-
- In the Ethereum ecosystem, there is no discrimination against robots or humans and contracts can create arbitrary actions like any other account would. Contracts can own tokens, participate in crowdsales, and even be voting members of other contracts.
- DAO is a business or organization whose decisions are made electronically by a written computer code or through the vote of its members. In essence it is a system of hard coded rules that define which actions an organization will take
-
-
-
-
-
-
HOW THIS DAO WORKS!!!
-
- The way this particular democracy works is that it has an Owner which works like an administrator, CEO or a President. The Owner can add (or remove) voting members to the organization. Any member can make a proposal, which is in the form of an ethereum transaction to either send ether or execute some contract, and other members can vote in support or against the proposal. Once a predetermined amount of time and a certain number of members has voted, the proposal can be executed: the contract counts the votes and if there are enough votes it will execute the given transaction.
-
-
-
-
-
- Want to join the Community? Just enter your name below and join, its as simple as that Join DAO
-
-
-
-
-
-
-
Short of Ether??
-
-
-
-
No worries.
-
Click here to get ether.
-
-
-
-
-
-
-
-
-
-
-
-
-
HOW TO CREATE A PROPOSAL
-
-
-
-
-
-
- ROADMAP
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/meetupdao/UI/web3/members.html b/meetupdao/UI/web3/members.html
deleted file mode 100644
index abac42d..0000000
--- a/meetupdao/UI/web3/members.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
DAO Members
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/meetupdao/UI/web3/proposals.js b/meetupdao/UI/web3/proposals.js
deleted file mode 100644
index f330da0..0000000
--- a/meetupdao/UI/web3/proposals.js
+++ /dev/null
@@ -1,176 +0,0 @@
-
- function previewHash(hash){
- var dialog = document.getElementById('window');
- dialog.show();
- document.getElementById('exit').onclick = function() {
- dialog.close();
- };
-
-
-
- var preview = document.querySelector('img');
- var xhttp = new XMLHttpRequest();
- xhttp.onreadystatechange = function() {
- if (this.readyState == 4 && this.status == 200) {
- // Typical action to be performed when the document is ready:
- preview.src = xhttp.responseText;
- }
- };
- xhttp.open("GET", "http://swarm-gateways.net/bzz:/" + hash, true);
- xhttp.send();
-
- }
-
- function uploadToSwarm() {
- var fileHash;
- var preview = document.querySelector('img');
- var file = document.querySelector('input[type=file]').files[0];
- if(file==undefined){
- fileHash = "";
- console.log(fileHash);
- newProposalInEther(fileHash);
- }
- else{
- var reader = new FileReader();
-
- reader.addEventListener("load", function () {
- //preview.src = reader.result;
- var xhr = new XMLHttpRequest();
- xhr.open("POST", "http://swarm-gateways.net/bzz:/", true);
- xhr.setRequestHeader('Content-Type', 'text/plain');
- xhr.send(reader.result);
- xhr.onload = function() {
- hash = this.responseText;
- console.log(hash);
- fileHash = String(hash);
- newProposalInEther(fileHash);
- }
-
- }, false);
-
- if (file) {
- reader.readAsDataURL(file);
- }
- }
- }
-
-
-function newProposalInEther(newFileHash){
-
- var beneficiary=document.getElementById("beneficiary").value;
- var etherAmount=document.getElementById("etherAmount").value;
- var jobDescription=document.getElementById("jobDescription").value;
- var transactionBytecode=document.getElementById("transactionBytecode").value;
-
- var myTokenContract = web3.eth.contract(abi).at(address);
- return myTokenContract.newProposalInEther(beneficiary, etherAmount, jobDescription, newFileHash, transactionBytecode, function (error, result) {})
-
- }
-
-
-function executeProposal(proposalNumberValue){
-
- // console.log("function successfully loladed");
- // var proposalNumber=document.getElementById("proposalNumber").value;
- var proposalNumber = proposalNumberValue;
- var transactionBytecode=document.getElementById("transactionBytecode").value;
-
- var myTokenContract = web3.eth.contract(abi).at(address);
- return myTokenContract.executeProposal(proposalNumber, transactionBytecode, function (error, result) {})
-
- }
-
-
- function vote(proposalNumberValue){
-
- var proposalNumber = proposalNumberValue;
- var idYes = "supportsProposal_" + proposalNumber + "_yes";
- var idNo = "supportsProposal_" + proposalNumber + "_no";
- var idJustificationText = "justificationText_" + proposalNumber;
- var yes=document.getElementById(idYes).checked;
- var no= document.getElementById(idNo).checked;
- if(yes==true)
- var supportsProposal = 1;
- else if(no==true)
- var supportsProposal = -1;
-
- var justificationText=document.getElementById(idJustificationText).value;
-
- var myTokenContract = web3.eth.contract(abi).at(address);
- return myTokenContract.vote(proposalNumber, supportsProposal, justificationText, function (error, result) {})
- }
-
-
-function getProposals(){
- var myTokenContract = web3.eth.contract(abi).at(address);
-
- myTokenContract.totalProposals(function(error,result){
- var totalProposals = result.c[0];
- for(var i = 0; i < totalProposals; i++){
- const proposalNumber = i;
- myTokenContract.proposals(i, function(error,result){
- //console.log(result);
-
- var a1 = '
';
-
- if (result[8].s < 0) {
- currentStatus = -currentStatus;
- }
-
- //execute button
- //var input = a1+recipient+a2+proposalNumber+a21+message+preview_but+voteButton1+proposalNumber+voteButton2+proposalNumber+voteButton3+proposalNumber+voteButton4+proposalNumber+voteButton5+a3+proposalNumber+a4+totalVotes+a5+currentStatus+a6;
-
- var input = a1+recipient+a2+preview_but+a21+message+voteButton1+proposalNumber+voteButton2+proposalNumber+voteButton3+proposalNumber+voteButton4+proposalNumber+voteButton5+a3+proposalNumber+a4+totalVotes+a5+currentStatus+a6;
- var mydiv = document.getElementById("parent");
- var newDiv = document.createElement('div');
- newDiv.innerHTML = input;
- while (newDiv.firstChild) {
- mydiv.appendChild(newDiv.firstChild);
- }
-
-
- })
- }
- })
-
-}
-
-getProposals();
\ No newline at end of file
diff --git a/meetupdao/UI/web3/stylesheet.css b/meetupdao/UI/web3/stylesheet.css
deleted file mode 100644
index 72dd636..0000000
--- a/meetupdao/UI/web3/stylesheet.css
+++ /dev/null
@@ -1,54 +0,0 @@
-.proposalCard {
- box-shadow: 4px 4px 8px 4px rgba(0,0,0,0.2);
- transition: 0.3s;
- width: 40%;
- margin-left: 5%;
- margin-right: 5% ;
- background-color: white;
- padding-top: 30px;
- padding-bottom: 30px;
- padding-left: 40px;
- padding-right: 50px;
- width: 80%;
- }
-
- .proposalCard:hover {
- box-shadow: 8px 8px 16px 8px rgba(0,0,0,0.2);
- }
-
- .container {
- padding: 2px 16px;
- }
-
-
-.card{
- box-shadow: 4px 4px 8px 4px rgba(0,0,0,0.2);
- transition: 0.3s;
- float: left;
- margin-left: 2%;
- margin-right: 2%;
- margin-bottom: 2%;
- background-color: white;
- padding-top: 30px;
- padding-bottom: 30px;
- padding-left: 20px;
- padding-right: 20px;
- width: 18%;
-}
-
-.card:hover {
- box-shadow: 8px 8px 16px 8px rgba(0,0,0,0.2);
-}
-
-.container {
- padding: 2px 16px;
-}
-
-.clearfix::after {
- content: "";
- clear: both;
- display: table;
-}
-
-
-
+ 
+ 
+ 
- 
-
- 
-