From 0cc8688ae1302cb4572d83bb002ccbe709fd147c Mon Sep 17 00:00:00 2001 From: Raja Ilayaperumal Date: Wed, 7 Sep 2022 13:08:46 +0530 Subject: [PATCH] fix: .btc holders were not able to vote. Copy share link and QR code both are introduced. --- common/constants.js | 4 +- components/builder/BuilderComponent.js | 18 ++- components/common/HeaderComponent.js | 101 ++++++++++++---- components/common/InformationComponent.js | 3 +- .../dashboard/DashboardAllPollsComponent.js | 6 +- .../dashboard/DashboardMenuComponent.js | 21 +++- components/poll/PollComponent.js | 13 +- components/poll/QRCodePopup.js | 113 ++++++++++++++++++ node_modules/.package-lock.json | 8 ++ package-lock.json | 15 +++ package.json | 1 + pages/index.js | 21 +++- pages/p/[[...id]].js | 12 +- public/images/logo/ballot.png | Bin 5079 -> 2208 bytes services/contract.js | 5 +- styles/QRCodePopup.module.css | 27 +++++ yarn.lock | 5 + 17 files changed, 318 insertions(+), 55 deletions(-) create mode 100644 components/poll/QRCodePopup.js create mode 100644 styles/QRCodePopup.module.css diff --git a/common/constants.js b/common/constants.js index 9e4c2cfc..02e0b469 100644 --- a/common/constants.js +++ b/common/constants.js @@ -5,7 +5,7 @@ export const Constants = { GAIA_HUB_PREFIX: "https://gaia.blockstack.org/hub/", // IPFS gateway - IPFS_GATEWAY: "https://ipfs.owl.link/ipfs/", + IPFS_GATEWAY: "https://cloudflare-ipfs.com/ipfs/", // FAQs FAQ: [ @@ -31,7 +31,7 @@ export const Constants = { }, { question: "Who are the developers of Ballot.gg?", - answer: `We are developers from Team BlockSurvey.`, + answer: `We are developers from Team BlockSurvey ↗.`, } ] }; diff --git a/components/builder/BuilderComponent.js b/components/builder/BuilderComponent.js index a2c8225d..cb6becc6 100644 --- a/components/builder/BuilderComponent.js +++ b/components/builder/BuilderComponent.js @@ -7,6 +7,7 @@ import { getRecentBlock } from "../../services/utils"; import { getFileFromGaia, getMyStxAddress, getUserData, putFileToGaia } from "../../services/auth.js"; import styles from "../../styles/Builder.module.css"; import PreviewComponent from "./Preview.component"; +import { nanoid } from 'nanoid' export default function BuilderComponent(props) { // Variables @@ -327,7 +328,7 @@ export default function BuilderComponent(props) { pollObject['endAtBlock'] = calculateBlockTime(new Date(pollObject?.endAtDate).getTime(), currentBlock?.height); } - const contractName = "ballot-" + getTitleWithOutSpecialChar(); + const contractName = "ballot-" + getTitleWithOutSpecialChar() + "-" + nanoid(5); pollObject["publishedInfo"] = { "contractAddress": getMyStxAddress(), "contractName": contractName @@ -338,7 +339,7 @@ export default function BuilderComponent(props) { const publishContract = (contractName) => { // Publish contract - deployContract(pollObject, contractName, callbackFunction); + deployContract(pollObject, contractName, callbackFunction, cancelCallbackFunction); } const callbackFunction = (data) => { @@ -353,6 +354,10 @@ export default function BuilderComponent(props) { } } + const cancelCallbackFunction = (data) => { + window.location.reload(); + } + const publishPollToIPFS = async () => { setCurrentProgressMessage("Publishing to IPFS ..."); @@ -390,7 +395,7 @@ export default function BuilderComponent(props) { } const getTitleWithOutSpecialChar = () => { - return pollObject?.title?.replace(/[^a-zA-Z0-9]/g, ''); + return pollObject?.title?.replace(/\s+/g, '-').replace(/[^a-zA-Z0-9-]/g, '').substr(0, 16); } return ( @@ -404,7 +409,7 @@ export default function BuilderComponent(props) {

{pollId && pollId === "new" ? "New" : "Edit"} Poll

{pollObject && pollObject.id ? -
+ Title @@ -491,6 +496,7 @@ export default function BuilderComponent(props) { id="voting-strategy-id" name="votingStrategyFlag" onChange={handleChange} + checked={pollObject.votingStrategyFlag} /> @@ -498,7 +504,9 @@ export default function BuilderComponent(props) { <> Default strategy - + diff --git a/components/common/HeaderComponent.js b/components/common/HeaderComponent.js index 391388b2..da79da20 100644 --- a/components/common/HeaderComponent.js +++ b/components/common/HeaderComponent.js @@ -1,11 +1,25 @@ import { formStacksExplorerUrl } from "../../services/utils"; - +import Tooltip from "react-bootstrap/Tooltip"; +import { useState } from "react"; +import OverlayTrigger from "react-bootstrap/OverlayTrigger"; +import QRCodePopup from "../poll/QRCodePopup"; export default function HeaderComponent(props) { // Variables - const { pollObject } = props; + const { pollObject, publicUrl } = props; + + const [copyText, setCopyText] = useState("Copy"); + const [showQRCodePopupFlag, setShowQRCodePopupFlag] = useState(false); // Function + const copyToClipBoard = () => { + if (pollObject?.id) { + // Update tooltip message + setCopyText("Copied"); + + navigator.clipboard.writeText(publicUrl); + } + }; // Design return ( @@ -16,29 +30,63 @@ export default function HeaderComponent(props) {

{pollObject?.title}

{/* Info Bar */} -
- {pollObject?.status == "draft" ? "Draft" : "Active"} {' '} - {pollObject?.userStxAddress && - - - {pollObject?.userStxAddress?.substring(0, 10)} { } - - - - - - } +
+ {/* Status */} +
+ {pollObject?.status == "draft" ? "Draft" : "Active"} {' '} +
+ + {/* Created by */} +
+ Created by {' '} + {pollObject?.userStxAddress && + + + {pollObject?.userStxAddress?.substring(0, 10)} { } + + + + + + } +
+ + {/* Copy link */} + {copyText}}> + + + + {/* QR code */} + QR code}> + +
{/* Description */} @@ -50,6 +98,9 @@ export default function HeaderComponent(props) {
} + + ); } \ No newline at end of file diff --git a/components/common/InformationComponent.js b/components/common/InformationComponent.js index 56477761..806784e4 100644 --- a/components/common/InformationComponent.js +++ b/components/common/InformationComponent.js @@ -1,3 +1,4 @@ +import { Constants } from "../../common/constants"; import { convertToDisplayDateFormat, formStacksExplorerUrl } from "../../services/utils"; @@ -47,7 +48,7 @@ export default function InformationComponent(props) { pollObject?.ipfsLocation && diff --git a/components/dashboard/DashboardMenuComponent.js b/components/dashboard/DashboardMenuComponent.js index c6054468..7c5fe0a9 100644 --- a/components/dashboard/DashboardMenuComponent.js +++ b/components/dashboard/DashboardMenuComponent.js @@ -1,5 +1,6 @@ import Link from "next/link"; import { Container, Row, Col, Button } from "react-bootstrap"; +import { signOut } from "../../services/auth"; export default function DashboardMenuComponent() { @@ -8,23 +9,35 @@ export default function DashboardMenuComponent() { -

Ballot

+
-
-
+
-
+ +
+ +
diff --git a/components/poll/PollComponent.js b/components/poll/PollComponent.js index 1174d6d8..1db17df1 100644 --- a/components/poll/PollComponent.js +++ b/components/poll/PollComponent.js @@ -23,7 +23,8 @@ export default function PollComponent(props) { noHoldingToken, holdingTokenArr, holdingTokenIdArr, - votingPower } = props; + votingPower, + publicUrl } = props; // Capture the vote const [voteObject, setVoteObject] = useState({}); @@ -82,7 +83,7 @@ export default function PollComponent(props) { {/* Left Side */}
{/* Header */} - + {/* Cast your vote */}
@@ -103,13 +104,13 @@ export default function PollComponent(props) { ))} {userSession && userSession.isUserSignedIn() ? - : - @@ -125,7 +126,7 @@ export default function PollComponent(props) { {/* Already voted */} {alreadyVoted &&
- You have already cast your vote. + Your vote has already been cast.
} @@ -204,7 +205,7 @@ export default function PollComponent(props) { Information - Successfully! You have cast your vote. Check your transaction status on explorer + Voted successfully! Your vote has been cast. Here is a link to your transaction status { + props.setShowQRCodePopupFlag(false); + }; + + // Functions + // Download QR code + const downloadQRCode = () => { + const qrCodeURL = document + .getElementById("qrCodeEl") + .toDataURL("image/png") + .replace("image/png", "image/octet-stream"); + let aEl = document.createElement("a"); + aEl.href = qrCodeURL; + aEl.download = "Ballot_" + (pollObject?.title ? pollObject?.title.replaceAll(".", "_") : "") + ".png"; + document.body.appendChild(aEl); + aEl.click(); + document.body.removeChild(aEl); + }; + + // View + return ( + <> + {/* QR code */} + + {/* Header */} +
+
Ballot QR code
+ +
+ + {/* Body */} + + + + ); +} diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index 7ad205a0..e85c1fce 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -3112,6 +3112,14 @@ "node": ">=6" } }, + "node_modules/qrcode.react": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/qrcode.react/-/qrcode.react-3.1.0.tgz", + "integrity": "sha512-oyF+Urr3oAMUG/OiOuONL3HXM+53wvuH3mtIWQrYmsXoAq0DkvZp2RYUWFSMFtbdOpuS++9v+WAkzNVkMlNW6Q==", + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + } + }, "node_modules/query-string": { "version": "6.14.1", "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz", diff --git a/package-lock.json b/package-lock.json index afa70cfa..e7cf2d40 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,7 @@ "lodash": "^4.17.21", "nanoid": "^4.0.0", "next": "12.2.5", + "qrcode.react": "^3.1.0", "react": "18.2.0", "react-bootstrap": "^2.5.0", "react-dom": "18.2.0", @@ -3315,6 +3316,14 @@ "node": ">=6" } }, + "node_modules/qrcode.react": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/qrcode.react/-/qrcode.react-3.1.0.tgz", + "integrity": "sha512-oyF+Urr3oAMUG/OiOuONL3HXM+53wvuH3mtIWQrYmsXoAq0DkvZp2RYUWFSMFtbdOpuS++9v+WAkzNVkMlNW6Q==", + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + } + }, "node_modules/query-string": { "version": "6.14.1", "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz", @@ -6365,6 +6374,12 @@ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "dev": true }, + "qrcode.react": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/qrcode.react/-/qrcode.react-3.1.0.tgz", + "integrity": "sha512-oyF+Urr3oAMUG/OiOuONL3HXM+53wvuH3mtIWQrYmsXoAq0DkvZp2RYUWFSMFtbdOpuS++9v+WAkzNVkMlNW6Q==", + "requires": {} + }, "query-string": { "version": "6.14.1", "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz", diff --git a/package.json b/package.json index 79431a7d..ff5b0ca9 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "lodash": "^4.17.21", "nanoid": "^4.0.0", "next": "12.2.5", + "qrcode.react": "^3.1.0", "react": "18.2.0", "react-bootstrap": "^2.5.0", "react-dom": "18.2.0", diff --git a/pages/index.js b/pages/index.js index d28103e9..c2f559b4 100644 --- a/pages/index.js +++ b/pages/index.js @@ -155,9 +155,9 @@ export default function Home() { {/* Steps */}
-
+
{/* Step 1 */} -
+
{/* Image */}
@@ -168,7 +168,7 @@ export default function Home() { {/* Text */}

- Sign in to Ballot.gg
using Hiro Wallet + Sign in to Ballot.gg using Hiro Wallet.

@@ -179,9 +179,7 @@ export default function Home() {
-
-
{/* Step 2 */}
{/* Image */} @@ -261,8 +259,19 @@ export default function Home() { */} + {/* GitHub */} + + + + {/* Discard */} - +
diff --git a/public/images/logo/ballot.png b/public/images/logo/ballot.png index 92dbfcb3aa58fe209798bfa2ffe11584797642d3..dfc4c0dc7edaec42ed768427d1e78f09a151e22a 100644 GIT binary patch delta 2161 zcmV-%2#)vHC!i6KD+>z~000XU0RWnu7?Cy~e+V^6L_t(|0qxySP!vZL2JqLt&ghMJN z)&P3Lok_oeB?!3ePWS9i&wjtEt%YUvvR}P^)7{f6$N<-Mt1?6_o+q266t#lV&D_0R0~v z?-ZfJB#0PLLAqFIkO~UWbN9ss1Si=9$)0zdw=d@Z{yeCvQ}>GGUG?TBg2Yq(>r4fC z2lA;#a=SOoyDyJrNKPO;E&*hv#FslND{pRmc~gM6Vdn9VFl@o=7EVeeN)+ix7u$fwI*gPt|79j3>xC1AEtu;M+?)I#IVQmOo9lD+nKyEyg?NUS8e**uq zR)Lm1*+T%^t9s?psq8O71w!?K0kuZ>eDEFEL}iIeCN%!I}!nM zK!89G0t8wRAkcyUfffV^v>-sBf2D$AZikbmxT&tGp>#SOJZjX>)zvjr-_W2QyMy1$ ziI{g6eTuO-1}GN}*WTu4YHMp(&-*Cp5TFQU!_;-=Y+@@D0#qce?d^#S5}N2DxidIO zA2c@5_upNnBtZo#0Up}!-5*XwH9`d{fw|dP`s~w>X?kjkY=;1qNK!(Ce*l%x;^Lz9 zAwqykj6-zvNPF;XBLpZ0csR55>I?yjiT=JmdNe*xwn2bm#KtO=_<10nYiU*MQekm# zvb3}qJkP43ChCTl=ZARt!xph$jn~DKc3s_P$s`_XZV%p~JGTePw2|T8tO^i@un_nI zzTVqMe?6Yks%~3}B9u`=e}FXb@W?^pMN(6EsI+Nb2mvyntGnB1h#rkUBwHXrhH!{X z^)B43+X4YH$W#@YLx9Q?SD{-@8fDCKiYtJRP2?&s3e0N4UL4XXaOeb## zWiAL%4AoTIv(*&=GHl7fzMg7}_DUl_hMAbdvFV0H1jw-IY5ipgf14U{1jrz+KDwL2 zcrGbzQ6r838DwHZSZmwoWD^9)5MBV~yH9oS>V8|h+3g`wLx2pJnwp}cNAxSl=`&_G zz7+!kq^bW#Z*Xsy?&Z6U)rTd1OKTK((-#Nlwi>cbtekVxJam7UY?Sx_1@~NC(Qj^f zg`BI*xVp+Rz1`x+f1moSJ!k=^bCekGA>z$ww!#orLf2L0X|=HLSq}j!0UoYy{yInv z3E299tFR*LIDUdg{}@k1co-^Bk?{Rve1l`s&PYUnBE*;HTyZ)&JFQyZDg>^=ihvhL zTUXDGPFe**fQl?>$Ni#-E;3$lJ@8>O_4oBs5+Fb&z)KTk#AwULkczAcAuKpW+)>I(`$S`i&JC1jf4i3+q!CPbl1SkR~&ZQn1 zv7?zrfFi(iIl2dKMlshE1q3J}_4Rr?4sAIv8Uc!ki4!)ar~an6Lx5t;hV?N7D8`o1 z1A&g&IaHvsm4vVK&IbY%5fewgAkwynELKh8;<)$fDGg6 zqkGg{R(->6iaP|zpxM>^&8FCJ+%E!T2p_V^;W2gi6mJc&;Z6h}`7I$o@$h30+s9KwJ* zQ)5O5e?g;T53TvW3^dU(!#6?V%T^$i+S*z=ea5a6TM?j`;Gye>>%G<;vVZ`^#ObbX z?S0gxfB?mS&4-O+9;k$>s;cOlOP8%aY#ae95pI|Vez|4+dC>?^ktOZuUj(Q~l6qz| z0u(Wx6g+h3lf)i2jsO|PA>q&*RH12Bm*qCie=3I&`vAptZiIuvkIKq4RoB!86M) z3$MsKu<^xB0pjxHk@qzLtdk+{tMx-yf7X`!f!=kT0UqlJfL8jR_Z(+vtG|g{|L~dX z_6U*}2+9_RXQ$)zyy@>b1H|TCw?!4Ip9z=uD6arzVMt571vO+{%Qa+eR8W8zSEH0iJyObJ1W6GD=OxkATV28K zjQkZGpsXNBMEfO)lj^_0#G{q`2R`{@VSU7FgyS$00000NkvXXu0mjfhHmYs delta 5055 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 diff --git a/services/contract.js b/services/contract.js index 98c37a92..87f9334e 100644 --- a/services/contract.js +++ b/services/contract.js @@ -2,7 +2,7 @@ import { openContractCall, openContractDeploy } from "@stacks/connect"; import { AnchorMode, bufferCV, listCV, stringAsciiCV, uintCV } from "@stacks/transactions"; import { getNetworkType } from "../services/auth"; -export async function deployContract(pollObject, contractName, callbackFunction) { +export async function deployContract(pollObject, contractName, callbackFunction, cancelCallbackFunction) { const contract = getContract(pollObject); // Transaction options @@ -16,6 +16,7 @@ export async function deployContract(pollObject, contractName, callbackFunction) icon: window.location.origin + "/images/logo/ballot.png" }, onFinish: callbackFunction, + onCancel: cancelCallbackFunction }; // Call contract function @@ -324,7 +325,7 @@ export async function castMyVoteContractCall(contractAddress, contractName, vote network: getNetworkType(), appDetails: { name: "Ballot", - icon: window.location.origin + "/images/logo/owllink.png", + icon: window.location.origin + "/images/logo/ballot.png", }, onFinish: callbackFunction, }; diff --git a/styles/QRCodePopup.module.css b/styles/QRCodePopup.module.css new file mode 100644 index 00000000..5cd47cd4 --- /dev/null +++ b/styles/QRCodePopup.module.css @@ -0,0 +1,27 @@ +/* Modal */ +.dashboard_modal_header_box { + position: relative; + padding: 20px; + font-size: 18px; + font-weight: 500; +} +.dashboard_modal_close_icon_btn_box { + position: absolute; + right: 20px; + top: 20px; + width: 24px; + height: 24px; + border-radius: 50%; + border: none; + display: flex; + align-items: center; + justify-content: center; + transition: 0.3s all ease; +} +.dashboard_modal_body_box { + padding: 14px 20px; +} +.dashboard_transactions_modal_body_box { + max-height: 360px; + overflow: auto; +} diff --git a/yarn.lock b/yarn.lock index 9f45d508..338a18a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1780,6 +1780,11 @@ "resolved" "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz" "version" "1.3.2" +"qrcode.react@^3.1.0": + "integrity" "sha512-oyF+Urr3oAMUG/OiOuONL3HXM+53wvuH3mtIWQrYmsXoAq0DkvZp2RYUWFSMFtbdOpuS++9v+WAkzNVkMlNW6Q==" + "resolved" "https://registry.npmjs.org/qrcode.react/-/qrcode.react-3.1.0.tgz" + "version" "3.1.0" + "query-string@^6.13.1": "integrity" "sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==" "resolved" "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz"