-
- {{#if castSingleVote}}
- {{#unless voted}}
- {{#with voteSettings}}
- {{> liquid _id=this.voteId sourceId=this.sourceId targetId=this.targetId wallet=this.wallet editable=true contract=contract candidateBallot=candidateBallot singleVote=true singleRevoke=false}}
- {{/with}}
- {{else}}
- {{#with revokeSettings}}
- {{> liquid _id=this.voteId sourceId=this.sourceId targetId=this.targetId wallet=this.wallet editable=true contract=contract candidateBallot=candidateBallot singleVote=true singleRevoke=true}}
- {{/with}}
- {{/unless}}
- {{/if}}
- {{#unless editorMode}}
- {{#unless readOnly}}
- {{#if currentUser}}
-
-
+ {{#if castSingleVote}}
+ {{#unless voted}}
+ {{#with voteSettings}}
+ {{> liquid _id=this.voteId sourceId=this.sourceId targetId=this.targetId wallet=this.wallet editable=true contract=contract candidateBallot=candidateBallot singleVote=true singleRevoke=false}}
+ {{/with}}
+ {{else}}
+ {{#with revokeSettings}}
+ {{> liquid _id=this.voteId sourceId=this.sourceId targetId=this.targetId wallet=this.wallet editable=true contract=contract candidateBallot=candidateBallot singleVote=true singleRevoke=true}}
+ {{/with}}
+ {{/unless}}
{{/if}}
-
-
- {{#with voteSettings}}
- {{> liquid _id=this.voteId sourceId=this.sourceId targetId=this.targetId wallet=this.wallet editable=true contract=contract candidateBallot=candidateBallot}}
- {{/with}}
+ {{#unless editorMode}}
+ {{#unless readOnly}}
+ {{#if currentUser}}
+
- {{/if}}
- {{/unless}}
-
+
-
+ {{#with voteSettings}}
+ {{> liquid _id=this.voteId sourceId=this.sourceId targetId=this.targetId wallet=this.wallet editable=true contract=contract candidateBallot=candidateBallot}}
+ {{/with}}
+
-
-
-
- 
- 
-
- {{/unless}}
+ {{/unless}}
+ {{/if}}
diff --git a/imports/ui/templates/components/decision/ballot/ballot.js b/imports/ui/templates/components/decision/ballot/ballot.js
index 43debf8b4..bea3b0cb1 100644
--- a/imports/ui/templates/components/decision/ballot/ballot.js
+++ b/imports/ui/templates/components/decision/ballot/ballot.js
@@ -5,91 +5,168 @@ import { Session } from 'meteor/session';
import { ReactiveVar } from 'meteor/reactive-var';
import { TAPi18n } from 'meteor/tap:i18n';
import { Router } from 'meteor/iron:router';
+import { BigNumber } from 'bignumber.js';
import { removeFork, updateBallotRank, addChoiceToBallot, getTickValue, getTotalVoters } from '/imports/ui/modules/ballot';
import { getContractToken } from '/imports/ui/templates/widgets/transaction/transaction';
+import { transact } from '/imports/api/transactions/transaction';
import { displayTimedWarning } from '/lib/utils';
import { Contracts } from '/imports/api/contracts/Contracts';
import { timers } from '/lib/const';
import { verifyConstituencyRights, getTokenAddress, getTokenContractAddress, checkTokenAvailability } from '/imports/ui/templates/components/decision/electorate/electorate.js';
import { introEditor } from '/imports/ui/templates/widgets/compose/compose';
import { createContract } from '/imports/startup/both/modules/Contract';
-import { transactWithMetamask, setupWeb3 } from '/imports/startup/both/modules/metamask';
+import { transactWithMetamask, setupWeb3, coinvote, verifyCoinVote } from '/imports/startup/both/modules/metamask';
import { displayModal } from '/imports/ui/modules/modal';
import { templetize, getImage } from '/imports/ui/templates/layout/templater';
+import { currentBlock, isPollOpen } from '/imports/ui/templates/components/decision/countdown/countdown';
+import { getBalance } from '/imports/api/blockchain/modules/web3Util';
import '/imports/ui/templates/components/decision/ballot/ballot.html';
import '/imports/ui/templates/components/decision/fork/fork.js';
import '/imports/ui/templates/components/decision/liquid/liquid.js';
import '/imports/ui/templates/widgets/warning/warning.js';
+
+const numeral = require('numeral');
+
+/**
+* @summary reject vote message;
+*/
+const _rejectVote = () => {
+ if (!checkTokenAvailability(Meteor.user(), Template.instance().ticket.get().token) && Template.instance().ticket.get().token !== 'WEB VOTE') {
+ // lack of token
+ displayModal(
+ true,
+ {
+ icon: 'images/olive.png',
+ title: TAPi18n.__('place-vote'),
+ message: TAPi18n.__('insufficient-votes'),
+ action: TAPi18n.__('get-tokens'),
+ cancel: TAPi18n.__('not-now'),
+ },
+ () => {
+ window.open(Meteor.settings.public.web.sites.tokens, '_blank');
+ }
+ );
+ } else {
+ // wrong requisites
+ displayModal(
+ true,
+ {
+ icon: 'images/olive.png',
+ title: TAPi18n.__('place-vote'),
+ message: TAPi18n.__('incompatible-requisites'),
+ cancel: TAPi18n.__('close'),
+ alertMode: true,
+ },
+ );
+ }
+};
+
+/**
+* @summary poll no longer open;
+*/
+const _pollClosed = () => {
+ // poll already closed
+ displayModal(
+ true,
+ {
+ icon: 'images/olive.png',
+ title: TAPi18n.__('poll-closed'),
+ message: TAPi18n.__('poll-is-closed'),
+ cancel: TAPi18n.__('close'),
+ alertMode: true,
+ },
+ );
+};
+
+/**
+* @summary already voted here
+*/
+const _alreadyVoted = () => {
+ // poll already closed
+ displayModal(
+ true,
+ {
+ icon: 'images/olive.png',
+ title: TAPi18n.__('already-voted'),
+ message: TAPi18n.__('already-voted-detail'),
+ cancel: TAPi18n.__('close'),
+ alertMode: true,
+ },
+ );
+};
+
/**
* @summary executes token vote
*/
const _cryptoVote = () => {
- Template.instance().voteEnabled = verifyConstituencyRights(Template.currentData().contract);
+ const contract = Template.currentData().contract;
+ Template.instance().voteEnabled = verifyConstituencyRights(contract);
if (Meteor.user()) {
if (Template.instance().voteEnabled) {
- if (setupWeb3(true)) {
- // wallet alert
- let icon;
- if (Meteor.settings.public.Collective.profile.logo) {
- icon = Meteor.settings.public.Collective.profile.logo;
+ if (isPollOpen(Template.instance().now.get(), contract)) {
+ if (!verifyCoinVote(contract.pollId ? Contracts.findOne({ _id: contract.pollId }) : contract)) {
+ if (setupWeb3(true)) {
+ // wallet alert
+
+ let icon;
+ if (Meteor.settings.public.Collective.profile.logo) {
+ icon = Meteor.settings.public.Collective.profile.logo;
+ } else {
+ icon = 'images/olive.png';
+ }
+ displayModal(
+ true,
+ {
+ icon,
+ title: TAPi18n.__('place-vote'),
+ message: contract.rules.balanceVoting ? TAPi18n.__('metamask-confirm-tally') : TAPi18n.__('metamask-confirm-transaction'),
+ cancel: TAPi18n.__('close'),
+ awaitMode: true,
+ displayProfile: true,
+ profileId: Template.currentData().contract.signatures[0]._id,
+ },
+ );
+
+ if (contract.rules.balanceVoting) {
+ // off chain vote
+ coinvote(
+ getTokenAddress(Meteor.user(), Template.instance().ticket.get().token),
+ Template.currentData().contract.blockchain.publicAddress,
+ getBalance(Meteor.user(), Template.currentData().contract),
+ Template.instance().ticket.get().token,
+ getTokenContractAddress(Template.instance().ticket.get().token),
+ Meteor.userId(),
+ Template.currentData().contract._id,
+ Template.currentData().contract.signatures[0]._id,
+ contract.title,
+ `${(window.location.origin)}${contract.url}`,
+ );
+ } else {
+ // on chain vote
+ transactWithMetamask(
+ getTokenAddress(Meteor.user(), Template.instance().ticket.get().token),
+ Template.currentData().contract.blockchain.publicAddress,
+ Template.currentData().contract.blockchain.votePrice,
+ Template.instance().ticket.get().token,
+ getTokenContractAddress(Template.instance().ticket.get().token),
+ Meteor.userId(),
+ Template.currentData().contract._id,
+ Template.currentData().contract.signatures[0]._id,
+
+ );
+ }
+ }
} else {
- icon = 'images/olive.png';
+ _alreadyVoted();
}
- displayModal(
- true,
- {
- icon,
- title: TAPi18n.__('place-vote'),
- message: TAPi18n.__('metamask-confirm-transaction'),
- cancel: TAPi18n.__('close'),
- awaitMode: true,
- displayProfile: true,
- profileId: Template.currentData().contract.signatures[0]._id,
- },
- );
-
- // prompt metamask
- transactWithMetamask(
- getTokenAddress(Meteor.user(), Template.instance().ticket.get().token),
- Template.currentData().contract.blockchain.publicAddress,
- Template.currentData().contract.blockchain.votePrice,
- Template.instance().ticket.get().token,
- getTokenContractAddress(Template.instance().ticket.get().token),
- Meteor.userId(),
- Template.currentData().contract._id,
- Template.currentData().contract.signatures[0]._id,
- );
+ } else {
+ _pollClosed();
}
- } else if (!checkTokenAvailability(Meteor.user(), Template.instance().ticket.get().token)) {
- // lack of token
- displayModal(
- true,
- {
- icon: 'images/olive.png',
- title: TAPi18n.__('place-vote'),
- message: TAPi18n.__('insufficient-votes'),
- action: TAPi18n.__('get-tokens'),
- cancel: TAPi18n.__('not-now'),
- },
- () => {
- window.open(Meteor.settings.public.web.sites.tokens, '_blank');
- }
- );
} else {
- // wrong requisites
- displayModal(
- true,
- {
- icon: 'images/olive.png',
- title: TAPi18n.__('place-vote'),
- message: TAPi18n.__('incompatible-requisites'),
- cancel: TAPi18n.__('close'),
- alertMode: true,
- },
- );
+ _rejectVote();
}
} else {
// not logged
@@ -106,6 +183,23 @@ const _cryptoVote = () => {
}
};
+/**
+* @summary checks if a given user voted on this contract
+* @param {object} contract to get data from
+* @param {string} userId to check
+* @return ticker string
+*/
+const _checkUserVoted = (contract, userId) => {
+ switch (contract && contract.blockchain.coin.code) {
+ case 'WEB VOTE':
+ return _.contains(_.pluck(contract.tally.voter, '_id'), userId);
+ default:
+ if (contract.rules && contract.rules.balanceVoting) {
+ return verifyCoinVote(contract);
+ }
+ }
+};
+
/**
* @summary composes url to share stuff on twitter
* @param {object} contract to get data from
@@ -269,6 +363,14 @@ function activateDragging() {
}).disableSelection();
}
+/*
+const _getPollSstatus = async (contract) => {
+ const pollOpen = await isPollOpen(contract);
+ console.log(`pollOpen: ${pollOpen}`);
+ return pollOpen;
+};
+*/
+
Template.ballot.onCreated(() => {
Template.instance().forks = _generateForks(this.contract);
Template.instance().emptyBallot = new ReactiveVar();
@@ -277,12 +379,19 @@ Template.ballot.onCreated(() => {
Template.instance().contract = new ReactiveVar(Template.currentData().contract);
Template.instance().ticket = new ReactiveVar(getContractToken({ contract: Template.currentData().contract, isButton: true }));
Template.instance().voteEnabled = verifyConstituencyRights(Template.currentData().contract);
+ Template.instance().pollScore = new ReactiveVar(0);
Template.instance().imageTemplate = new ReactiveVar();
templetize(Template.instance());
+
+ Template.instance().now = new ReactiveVar();
+ currentBlock(Template.instance());
});
Template.ballot.helpers({
+ poll() {
+ return this.poll;
+ },
allowForks() {
return this.contract.allowForks;
},
@@ -560,10 +669,50 @@ Template.ballot.helpers({
return label;
},
token() {
- return Template.instance().ticket.get();
+ Template.instance().ticket.set(getContractToken({ contract: Template.currentData().contract, isButton: true }));
+ const instance = Template.instance();
+ const ticket = instance.ticket.get();
+ ticket.rules = this.contract.rules;
+ return ticket;
+ },
+ hasPoll() {
+ return (this.contract.poll && this.contract.poll.length > 0);
+ },
+ pollScore() {
+ // color
+ let score = '';
+
+ // score
+ let choiceVotes;
+ if (this.pollTotals) {
+ switch (this.contract.blockchain.coin.code) {
+ case 'WEB VOTE':
+ choiceVotes = 0;
+ for (let k = 0; k < this.contract.tally.voter.length; k += 1) {
+ choiceVotes += this.contract.tally.voter[k].votes;
+ }
+ break;
+ default:
+ choiceVotes = this.contract.blockchain.score ? this.contract.blockchain.score.totalConfirmed : '0';
+ }
+ }
+ const bnVotes = new BigNumber(choiceVotes);
+ const bnTotal = new BigNumber(this.pollTotals);
+ let percentage;
+ // eslint-disable-next-line eqeqeq
+ if (bnTotal != 0) {
+ percentage = new BigNumber(bnVotes.multipliedBy(100)).dividedBy(bnTotal);
+ } else {
+ percentage = 0;
+ }
+ Template.instance().pollScore.set(percentage);
+ score = `${numeral(percentage).format('0.00')}%`;
+
+ return score;
},
tokenFriendly() {
- return Template.instance().ticket.get().token !== 'NONE';
+ // return Template.instance().ticket.get().token !== 'NONE';
+ return true;
},
castSingleVote() {
return (Session.get('castSingleVote') === this.contract.keyword);
@@ -616,6 +765,34 @@ Template.ballot.helpers({
getImage(pic) {
return getImage(Template.instance().imageTemplate.get(), pic);
},
+ checkSelected(element) {
+ const contract = Contracts.findOne({ _id: this.contract._id });
+ if (_checkUserVoted(contract, Meteor.userId())) {
+ return `check-mini-selected-${element}`;
+ }
+ return `check-mini-unselected-${element}`;
+ },
+ removableVotes() {
+ const contract = Contracts.findOne({ _id: this.contract._id });
+ if (_checkUserVoted(contract, Meteor.userId())) {
+ return (contract.blockchain.coin.code === 'WEB VOTE');
+ }
+ return false;
+ },
+ firstPollChoice() {
+ const contract = Contracts.findOne({ _id: this.contract._id });
+ if (contract.poll && contract.poll.length > 0) {
+ const choice = Contracts.findOne({ _id: contract.poll[0].contractId });
+ return choice;
+ }
+ return contract;
+ },
+ smallPercentageStyle() {
+ if (Template.instance().pollScore.get() < 10) {
+ return 'poll-score-small';
+ }
+ return '';
+ },
});
Template.ballot.events({
@@ -623,31 +800,84 @@ Template.ballot.events({
event.preventDefault();
event.stopPropagation();
const currency = Template.currentData().contract.wallet.currency;
- if (currency === 'NONE') {
- displayModal(
- true,
- {
- icon: 'images/olive.png',
- title: TAPi18n.__('place-vote'),
- message: TAPi18n.__('tokenless-post'),
- cancel: TAPi18n.__('close'),
- alertMode: true,
- },
- );
- } else if (currency === 'STX') {
- displayModal(
- true,
- {
- icon: 'images/olive.png',
- title: TAPi18n.__('place-vote'),
- message: TAPi18n.__('insufficient-votes'),
- cancel: TAPi18n.__('close'),
- alertMode: true,
- },
- );
- } else {
- // ERC20 token
- _cryptoVote();
+ if (!this.editorMode) {
+ const contractData = Template.currentData().contract;
+ // contract in which to evaluate if it can vote
+ let contract = Template.currentData().contract;
+ if (contract.poll.length > 0) {
+ contract = Contracts.findOne({ _id: contract.poll[0].contractId });
+ }
+ Template.instance().voteEnabled = verifyConstituencyRights(contract);
+
+ if (Meteor.user()) {
+ if (Template.instance().voteEnabled) {
+ if (isPollOpen(Template.instance().now.get(), contractData)) {
+ if (currency === 'WEB VOTE') {
+ const userId = Meteor.user()._id;
+ const _contractId = contractData._id;
+ const voteAmount = 1; // Template.currentData().voteAmount or something similar
+
+ const transactSettings = {
+ kind: 'VOTE',
+ currency: 'WEB VOTE',
+ contractId: _contractId,
+ quadraticVoting: contractData.rules.quadraticVoting,
+ };
+
+ transact(userId, _contractId, voteAmount, transactSettings, undefined);
+ } else if (currency === 'STX') {
+ displayModal(
+ true,
+ {
+ icon: 'images/olive.png',
+ title: TAPi18n.__('place-vote'),
+ message: TAPi18n.__('insufficient-votes'),
+ cancel: TAPi18n.__('close'),
+ alertMode: true,
+ },
+ );
+ } else {
+ // ERC20 token
+ _cryptoVote();
+ }
+ } else {
+ _pollClosed();
+ }
+ } else {
+ _rejectVote();
+ }
+ } else {
+ // not logged
+ displayModal(
+ true,
+ {
+ icon: 'images/olive.png',
+ title: TAPi18n.__('place-vote'),
+ message: TAPi18n.__('unlogged-cant-vote'),
+ cancel: TAPi18n.__('close'),
+ alertMode: true,
+ },
+ );
+ }
+ }
+ },
+ 'click #single-remove'(event) {
+ event.preventDefault();
+ event.stopPropagation();
+ const currency = Template.currentData().contract.wallet.currency;
+ if (currency === 'WEB VOTE') {
+ const userId = Meteor.user()._id;
+ const _contractId = Template.currentData().contract._id;
+ const voteAmount = 1;
+
+ const transactSettings = {
+ kind: 'VOTE',
+ currency: 'WEB VOTE',
+ contractId: _contractId,
+ quadraticVoting: Template.currentData().contract.rules.quadraticVoting,
+ };
+
+ transact(_contractId, userId, voteAmount, transactSettings, undefined);
}
},
'click #edit-reply'(event) {
diff --git a/imports/ui/templates/components/decision/blockchain/blockchain.html b/imports/ui/templates/components/decision/blockchain/blockchain.html
index 984dc99aa..0f3c3d647 100644
--- a/imports/ui/templates/components/decision/blockchain/blockchain.html
+++ b/imports/ui/templates/components/decision/blockchain/blockchain.html
@@ -1,8 +1,11 @@
{{label 'debate'}} {{{quantity 'debate'}}}
-
-
- {{label 'twitter'}} {{{quantity 'twitter'}}}
-
- {{#if tokenFriendly}}
-
-
- 
- {{{label 'vote'}}}
- {{#with token}}
- {{> balance}}
- {{/with}}
-
-
+ {{/if}}
+ {{/unless}}
+
+
-
+
- {{> electorate contract=contract readOnly=true}}
+
+
+
+
+ {{#if hasPoll}}
+ {{> electorate contract=firstPollChoice readOnly=true}}
+ {{else}}
+ {{> electorate contract=contract readOnly=true}}
{{/if}}
{{label 'debate'}} {{{quantity 'debate'}}}
+
+ {{label 'twitter'}} {{{quantity 'twitter'}}}
+
+ {{#if tokenFriendly}}
+ {{#unless hasPoll}}
+
+
+
+ {{{label 'vote'}}}
+ {{#with token}}
+ {{> balance}}
+ {{/with}}
+
+
+
+ {{/unless}}
+ {{/if}}
+
- 
+ 
{{{status}}}
- {{#if userWithTokenReserves}}
+
+ {{#if pollInside}}
+ {{_ 'poll-inside'}}
+ {{else}}
- {{else}}
-
diff --git a/imports/ui/templates/components/decision/blockchain/blockchain.js b/imports/ui/templates/components/decision/blockchain/blockchain.js
index 1d18ab640..6fabeede5 100644
--- a/imports/ui/templates/components/decision/blockchain/blockchain.js
+++ b/imports/ui/templates/components/decision/blockchain/blockchain.js
@@ -3,12 +3,13 @@ import { Template } from 'meteor/templating';
import { Session } from 'meteor/session';
import { $ } from 'meteor/jquery';
import { TAPi18n } from 'meteor/tap:i18n';
+import { ReactiveVar } from 'meteor/reactive-var';
import { displayPopup, animatePopup } from '/imports/ui/modules/popup';
-import { getContractToken } from '/imports/ui/templates/widgets/transaction/transaction';
import { getCoin } from '/imports/api/blockchain/modules/web3Util.js';
import { token } from '/lib/token';
import { formatCryptoValue } from '/imports/ui/templates/components/decision/balance/balance';
+import { templetize, getImage } from '/imports/ui/templates/layout/templater';
import '/imports/ui/templates/components/decision/blockchain/blockchain.html';
@@ -83,6 +84,7 @@ const _writeRule = (contract, textOnly) => {
}
let sentence = TAPi18n.__(`electorate-sentence-anyone${format}`);
let setting;
+
if (contract.constituency) {
sentence = TAPi18n.__(`electorate-sentence-only${format}`);
let coin;
@@ -123,6 +125,9 @@ Template.blockchain.onCreated(() => {
}
Session.set('showCoinSettings', false);
Template.instance().voteEnabled = _verifyConstituencyRights(contract);
+
+ Template.instance().imageTemplate = new ReactiveVar();
+ templetize(Template.instance());
});
const _toggleCoinSettings = () => {
@@ -149,6 +154,15 @@ Template.blockchain.onRendered(function () {
}
}
});
+
+ instance.autorun(function () {
+ $('.right').scroll(() => {
+ if (Session.get('showCoinSettings')) {
+ Session.set('showCoinSettings', false);
+ animatePopup(false, 'blockchain-popup');
+ }
+ });
+ });
});
Template.blockchain.helpers({
@@ -164,11 +178,20 @@ Template.blockchain.helpers({
}
return '';
},
+ pollInside() {
+ const contract = Session.get('draftContract');
+ return (contract.rules && contract.rules.pollVoting);
+ },
ticker() {
- if (Meteor.user().profile.wallet.reserves) {
- return Session.get('draftContract').wallet.currency;
+ const contract = Session.get('draftContract');
+ const label = contract.wallet.currency;
+ /* if (contract.rules && contract.rules.quadraticVoting) {
+ label = `${TAPi18n.__('ticker-rule-quadratic')} ${label}`;
}
- return `${TAPi18n.__('no-tokens')}`;
+ if (contract.rules && contract.rules.balanceVoting) {
+ label = `${label} ${TAPi18n.__('ticker-rule-balance')}`;
+ }*/
+ return label;
},
tickerStyle() {
let color;
@@ -216,6 +239,14 @@ Template.blockchain.helpers({
check() {
return Template.instance().voteEnabled;
},
+ getImage() {
+ if (!this.readOnly) {
+ if (Session.get('showCoinSettings')) {
+ return getImage(Template.instance().imageTemplate.get(), 'vote-active');
+ }
+ }
+ return getImage(Template.instance().imageTemplate.get(), 'vote-enabled');
+ },
icon() {
if (!this.readOnly) {
if (Session.get('showCoinSettings')) {
@@ -240,7 +271,7 @@ Template.blockchain.helpers({
Template.blockchain.events({
'click #blockchain-button'() {
- if (!this.readOnly && Meteor.user().profile.wallet.reserves !== undefined) {
+ if (!this.readOnly) {
killPopup();
}
},
diff --git a/imports/ui/templates/components/decision/calendar/calendar.html b/imports/ui/templates/components/decision/calendar/calendar.html
new file mode 100644
index 000000000..d909f60a9
--- /dev/null
+++ b/imports/ui/templates/components/decision/calendar/calendar.html
@@ -0,0 +1,35 @@
+
+ {{#if currentUser}}
+
+
{{ticker}}
@@ -11,12 +14,7 @@
{{balance}}
-
{{/if}}
+
- {{ticker}}
-
-
+
+ {{/if}}
+
diff --git a/imports/ui/templates/components/decision/calendar/calendar.js b/imports/ui/templates/components/decision/calendar/calendar.js
new file mode 100644
index 000000000..4a26f8e87
--- /dev/null
+++ b/imports/ui/templates/components/decision/calendar/calendar.js
@@ -0,0 +1,151 @@
+import { Session } from 'meteor/session';
+import { Template } from 'meteor/templating';
+import { animatePopup } from '/imports/ui/modules/popup';
+
+import { blocktimes } from '/lib/const';
+import { token } from '/lib/token';
+import { getBlockHeight } from '/imports/startup/both/modules/metamask.js';
+
+import { TAPi18n } from 'meteor/tap:i18n';
+
+import '/imports/ui/templates/components/decision/calendar/calendar.html';
+import '/imports/ui/templates/widgets/switcher/switcher.js';
+
+const _save = () => {
+ const draft = Session.get('draftContract');
+ const cache = Session.get('cachedDraft');
+
+ draft.closingm = cache.closing;
+ draft.rules.alwaysOn = cache.rules.alwaysOn;
+
+ Session.set('draftContract', cache);
+};
+
+/**
+* @summary sets the block time configuration for closing in cached contract
+* @param {number} blocks length in blockchain
+*/
+const _setBlockTime = async (blocks) => {
+ const cache = Session.get('cachedDraft');
+ const blockHeight = await getBlockHeight();
+ let days = 0;
+
+ if (blockHeight) {
+ cache.closing.delta = blocks;
+ cache.closing.height = blockHeight + blocks;
+
+ switch (blocks) {
+ case blocktimes.ETHEREUM_DAY:
+ days = 1;
+ break;
+ case blocktimes.ETHEREUM_WEEK:
+ days = 7;
+ break;
+ case blocktimes.ETHEREUM_MONTH:
+ days = 30;
+ break;
+ case blocktimes.ETHEREUM_QUARTER:
+ days = 90;
+ break;
+ case blocktimes.ETHEREUM_YEAR:
+ default:
+ days = 365;
+ }
+ const today = new Date();
+ cache.closing.calendar = today.setDate(today.getDate() + days);
+ }
+
+ Session.set('cachedDraft', cache);
+};
+
+Template.calendar.onRendered(function () {
+ const instance = Template.instance();
+ Session.set('cachedDraft', Session.get('draftContract'));
+
+ // default setting
+ if (Session.get('cachedDraft') && Session.get('cachedDraft').closing.delta === 0) {
+ _setBlockTime(blocktimes.ETHEREUM_WEEK);
+ }
+
+ window.addEventListener('click', function (e) {
+ if (document.getElementById('card-calendar-popup') && !document.getElementById('card-calendar-popup').contains(e.target)) {
+ if (!instance.data.readOnly) {
+ Session.set('showClosingEditor', false);
+ animatePopup(false, 'calendar-popup');
+ }
+ }
+ });
+});
+
+Template.calendar.helpers({
+ alwaysOn() {
+ return (Session.get('cachedDraft') && Session.get('cachedDraft').rules) ? Session.get('cachedDraft').rules.alwaysOn : false;
+ },
+ criteria() {
+ const cache = Session.get('cachedDraft');
+ if (cache && !cache.rules.alwaysOn) {
+ let criteria = TAPi18n.__('blockchain-time-closing-criteria');
+ const result = _.where(token.coin, { code: cache.closing.blockchain });
+ criteria = criteria.replace('{{blockchain}}', result[0].name);
+ criteria = criteria.replace('{{height}}', cache.closing.height.toLocaleString(undefined, [{ style: 'decimal' }]));
+ criteria = criteria.replace('{{date}}', new Date(cache.closing.calendar).format('{Month} {d}, {yyyy}'));
+ return criteria;
+ }
+ return TAPi18n.__('blockchain-time-always-on');
+ },
+ timers() {
+ const cache = Session.get('cachedDraft');
+ return {
+ enabled: cache ? !cache.rules.alwaysOn : false,
+ option: [
+ {
+ value: cache ? (cache.closing.delta === blocktimes.ETHEREUM_DAY) : false,
+ label: 'blockchain-time-daily',
+ action: () => {
+ _setBlockTime(blocktimes.ETHEREUM_DAY);
+ },
+ },
+ {
+ value: cache ? (cache.closing.delta === blocktimes.ETHEREUM_WEEK) : false,
+ label: 'blockchain-time-weekly',
+ action: () => {
+ _setBlockTime(blocktimes.ETHEREUM_WEEK);
+ },
+ },
+ {
+ value: cache ? (cache.closing.delta === blocktimes.ETHEREUM_MONTH) : false,
+ label: 'blockchain-time-monthly',
+ action: () => {
+ _setBlockTime(blocktimes.ETHEREUM_MONTH);
+ },
+ },
+ {
+ value: cache ? (cache.closing.delta === blocktimes.ETHEREUM_QUARTER) : false,
+ label: 'blockchain-time-quarterly',
+ action: () => {
+ _setBlockTime(blocktimes.ETHEREUM_QUARTER);
+ },
+ },
+ {
+ value: cache ? (cache.closing.delta === blocktimes.ETHEREUM_YEAR) : false,
+ label: 'blockchain-time-annual',
+ action: () => {
+ _setBlockTime(blocktimes.ETHEREUM_YEAR);
+ },
+ },
+ ],
+ };
+ },
+});
+
+Template.calendar.events({
+ 'click #cancel-calendar'() {
+ animatePopup(false, 'calendar-popup');
+ Session.set('showClosingEditor', false);
+ },
+ 'click #execute-calendar'() {
+ _save();
+ animatePopup(false, 'calendar-popup');
+ Session.set('showClosingEditor', false);
+ },
+});
diff --git a/imports/ui/templates/components/decision/closing/closing.html b/imports/ui/templates/components/decision/closing/closing.html
new file mode 100644
index 000000000..47c14b720
--- /dev/null
+++ b/imports/ui/templates/components/decision/closing/closing.html
@@ -0,0 +1,6 @@
+
+
+
+
+
+ {{> setting label='always-on' tooltip='always-on-tooltip' toggle=true sessionContract="cachedDraft" rules="alwaysOn" value=alwaysOn enabled=true}}
+
+
+ {{_ 'decision-deadline'}}
+
+ {{#with timers}}
+ {{> switcher}}
+ {{/with}}
+
+ {{_ 'blockchain-time'}}
+
+
+ {{{criteria}}}
+
+
+ 
+ {{{status}}}
+
+
\ No newline at end of file
diff --git a/imports/ui/templates/components/decision/closing/closing.js b/imports/ui/templates/components/decision/closing/closing.js
new file mode 100644
index 000000000..3a120174e
--- /dev/null
+++ b/imports/ui/templates/components/decision/closing/closing.js
@@ -0,0 +1,109 @@
+import { Meteor } from 'meteor/meteor';
+import { $ } from 'meteor/jquery';
+import { Session } from 'meteor/session';
+import { Template } from 'meteor/templating';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { TAPi18n } from 'meteor/tap:i18n';
+
+import { blocktimes } from '/lib/const';
+import { animatePopup, displayPopup } from '/imports/ui/modules/popup';
+import { templetize, getImage } from '/imports/ui/templates/layout/templater';
+
+import '/imports/ui/templates/components/decision/closing/closing.html';
+import '/imports/ui/templates/components/decision/calendar/calendar.js';
+
+const _killPopup = () => {
+ if (Session.get('showClosingEditor')) {
+ Session.set('showClosingEditor', false);
+ } else {
+ Session.set('showClosingEditor', true);
+ }
+ displayPopup($('#closing-button')[0], 'calendar', Meteor.userId(), 'click', 'calendar-popup');
+};
+
+/**
+* @summary the closing criteria for this post
+* @return {string} closing rule
+*/
+const _draftClosing = () => {
+ const draft = Session.get('draftContract');
+ const closing = TAPi18n.__('closing-date');
+ let status = closing;
+
+ if (draft.rules.alwaysOn) {
+ status += ` · ${TAPi18n.__('always-on')}`;
+ } else {
+ switch (draft.closing.delta) {
+ case blocktimes.ETHEREUM_DAY:
+ status += ` · ${TAPi18n.__('blockchain-time-daily')}`;
+ break;
+ case blocktimes.ETHEREUM_WEEK:
+ status += ` · ${TAPi18n.__('blockchain-time-weekly')}`;
+ break;
+ case blocktimes.ETHEREUM_MONTH:
+ status += ` · ${TAPi18n.__('blockchain-time-monthly')}`;
+ break;
+ case blocktimes.ETHEREUM_QUARTER:
+ status += ` · ${TAPi18n.__('blockchain-time-quarterly')}`;
+ break;
+ case blocktimes.ETHEREUM_YEAR:
+ default:
+ status += ` · ${TAPi18n.__('blockchain-time-annual')}`;
+ break;
+ }
+ }
+ return status;
+};
+
+Template.closing.onCreated(function () {
+ Template.instance().imageTemplate = new ReactiveVar();
+ templetize(Template.instance());
+});
+
+Template.closing.onRendered(function () {
+ const instance = Template.instance();
+
+ instance.autorun(function () {
+ $('.right').scroll(() => {
+ if (Session.get('showClosingEditor')) {
+ Session.set('showClosingEditor', false);
+ animatePopup(false, 'calendar-popup');
+ }
+ });
+ });
+});
+
+Template.closing.helpers({
+ getImage(pic) {
+ if (Session.get('showClosingEditor')) {
+ return getImage(Template.instance().imageTemplate.get(), 'calendar-active');
+ }
+ return getImage(Template.instance().imageTemplate.get(), pic);
+ },
+ status() {
+ return _draftClosing();
+ },
+ closingId() {
+ if (!this.readOnly) {
+ return 'closing-button';
+ }
+ return '';
+ },
+ icon() {
+ if (!this.readOnly) {
+ if (Session.get('showClosingEditor')) {
+ return 'active';
+ }
+ }
+ return 'enabled';
+ },
+});
+
+Template.closing.events({
+ 'click #closing-button'() {
+ if (!this.readOnly) {
+ _killPopup();
+ }
+ },
+});
+
diff --git a/imports/ui/templates/components/decision/coin/coin.html b/imports/ui/templates/components/decision/coin/coin.html
index c6665f8d6..2f817e940 100644
--- a/imports/ui/templates/components/decision/coin/coin.html
+++ b/imports/ui/templates/components/decision/coin/coin.html
@@ -1,28 +1,57 @@
{{#if currentUser}}
-
-
- 
-
- {{#if showTokens}}
- {{> suggest tokenList=true}}
- {{/if}}
+
+
-
+
+
+
+ {{#if showTokens}}
+ {{> suggest tokenList=true}}
+ {{/if}}
+
+
+
+ 
+
+ {{#if wrongAddress}}
+
+ {{> warning label='blockchain-wrong-address'}}
+
+ {{/if}}
+
-
-
-
- {{#if wrongAddress}}
-
-
+
{{#if showNations}}
{{> suggest}}
{{/if}}
@@ -16,7 +16,7 @@
{{_ 'email-valid-domain'}}
-
+
{{#if wrongAddress}}
- {{> warning label='blockchain-wrong-address'}}
-
- {{/if}}
+
+
+
+ {{_ 'decision-rules'}}
+
+
+ {{> setting label='voting-editor-poll-voting' tooltip='voting-editor-poll-tooltip' toggle=true sessionContract="cachedDraft" rules="pollVoting" value=pollVoting enabled=true}}
+ {{> setting label='voting-editor-balance-toggle' tooltip='voting-editor-balance-tooltip' toggle=true sessionContract="cachedDraft" rules="balanceVoting" value=balanceVoting enabled=allowBalance}}
+ {{> setting label='voting-editor-quadratic-toggle' tooltip='voting-editor-quadratic-tooltip' toggle=true sessionContract="cachedDraft" rules="quadraticVoting" value=quadraticVoting enabled=allowQuadratic}}
+
+
@@ -38,3 +67,4 @@
{{/if}}
+
diff --git a/imports/ui/templates/components/decision/coin/coin.js b/imports/ui/templates/components/decision/coin/coin.js
index 1e282fd46..64a0874b7 100644
--- a/imports/ui/templates/components/decision/coin/coin.js
+++ b/imports/ui/templates/components/decision/coin/coin.js
@@ -1,12 +1,17 @@
import { Template } from 'meteor/templating';
import { Session } from 'meteor/session';
import { ReactiveVar } from 'meteor/reactive-var';
+import { Meteor } from 'meteor/meteor';
import { templetize, getImage } from '/imports/ui/templates/layout/templater';
import { animatePopup } from '/imports/ui/modules/popup';
import { searchJSON } from '/imports/ui/modules/JSON';
import { token } from '/lib/token';
+import { createPoll, removePoll } from '/imports/startup/both/modules/Contract';
+import { Contracts } from '/imports/api/contracts/Contracts';
+import { getCoin } from '/imports/api/blockchain/modules/web3Util';
+import '/imports/ui/templates/widgets/setting/setting.js';
import '/imports/ui/templates/components/decision/coin/coin.html';
const Web3 = require('web3');
@@ -29,6 +34,7 @@ const _save = () => {
check: 'EQUAL',
});
draft.wallet.currency = coin.code;
+ draft.blockchain.coin.code = coin.code;
}
if (draft.constituency.length === 0) {
@@ -44,21 +50,52 @@ const _save = () => {
}
}
+ draft.rules = Session.get('cachedDraft').rules;
+ if (draft.rules && draft.rules.pollVoting === true) {
+ draft.poll = createPoll(draft).poll;
+ } else {
+ if (draft.rules && !draft.rules.pollVoting && draft.poll.length > 0) {
+ removePoll(draft);
+ }
+ draft.poll = [];
+ }
+
Session.set('draftContract', draft);
};
+/**
+* @summary checks if there's an issue with lockchain address
+* @return {boolean} true or false baby
+*/
+const _verifyBlockchainAddress = () => {
+ const draft = Session.get('draftContract');
+ if (draft.blockchain.coin.code !== 'STX') {
+ // return Session.get('checkBlockchainAddress');
+ if (document.getElementById('editBlockchainAddress') && document.getElementById('editBlockchainAddress').value) {
+ return !web3.utils.isAddress(document.getElementById('editBlockchainAddress').value);
+ }
+ }
+ return false;
+};
+
/**
* @summary check form inputs are ok
* @return {boolean} true or false baby
*/
const _checkInputs = () => {
- return !(Session.get('noCoinFound') || Session.get('newCoin') === '' || (Session.get('draftContract').blockchain.publicAddress && !Session.get('checkBlockchainAddress')));
+ return !(Session.get('noCoinFound')
+ || Session.get('newCoin') === ''
+ || (Session.get('draftContract').blockchain.publicAddress && !Session.get('checkBlockchainAddress'))
+ || (!Meteor.user().profile.wallet.reserves && Session.get('draftContract').blockchain.coin.code !== 'WEB VOTE')
+ || (_verifyBlockchainAddress() && Session.get('newCoin') && Session.get('newCoin').code !== 'WEB VOTE'));
};
Template.coin.onCreated(() => {
Session.set('showTokens', false);
Session.set('suggestDisplay', '');
+ Template.instance().currentCoin = new ReactiveVar();
+ Template.instance().showAdvanced = new ReactiveVar(false);
Template.instance().imageTemplate = new ReactiveVar();
templetize(Template.instance());
});
@@ -77,6 +114,14 @@ Template.coin.onRendered(function () {
break;
}
}
+
+ // let advancedSettings = false;
+ // _.find(Session.get('draftContract').rules, function (num) { if (num) { advancedSettings = true; } });
+ // Template.instance().showAdvanced.set(advancedSettings);
+ Template.instance().showAdvanced.set((Session.get('draftContract').rules.quadraticVoting === true));
+
+
+ Session.set('cachedDraft', Session.get('draftContract'));
});
Template.coin.helpers({
@@ -91,7 +136,7 @@ Template.coin.helpers({
},
address() {
const draft = Session.get('draftContract');
- if (draft.blockchain.publicAddress) {
+ if (draft.blockchain && draft.blockchain.publicAddress && Session.get('newCoin').code !== 'WEB VOTE') {
Session.set('checkBlockchainAddress', web3.utils.isAddress(draft.blockchain.publicAddress));
return draft.blockchain.publicAddress;
}
@@ -104,22 +149,93 @@ Template.coin.helpers({
}
return '';
},
- wrongAddress() {
- const draft = Session.get('draftContract');
- if (draft.blockchain.coin.code !== 'STX') {
- return !Session.get('checkBlockchainAddress');
+ contract() {
+ return Session.get('draftContract');
+ },
+ balanceVoting() {
+ if (Session.get('newCoin')) {
+ const coin = getCoin(Session.get('newCoin').code);
+ if (!coin.editor.allowBalanceToggle) {
+ const cache = Session.get('cachedDraft');
+ cache.rules.balanceVoting = false;
+ Session.set('cachedDraft', cache);
+ }
+ return Session.get('cachedDraft').rules ? (Session.get('cachedDraft').rules.balanceVoting && coin.editor.allowBalanceToggle) : false;
+ }
+ return false;
+ },
+ quadraticVoting() {
+ if (Session.get('newCoin')) {
+ const coin = getCoin(Session.get('newCoin').code);
+ if (!coin.editor.allowQuadraticToggle) {
+ const cache = Session.get('cachedDraft');
+ cache.rules.quadraticVoting = false;
+ Session.set('cachedDraft', cache);
+ }
+ return Session.get('cachedDraft').rules ? (Session.get('cachedDraft').rules.quadraticVoting && coin.editor.allowQuadraticToggle) : false;
+ }
+ return false;
+ },
+ pollVoting() {
+ return (Session.get('cachedDraft') && Session.get('cachedDraft').rules) ? Session.get('cachedDraft').rules.pollVoting : false;
+ },
+ allowBalance() {
+ if (Session.get('newCoin')) {
+ const coin = getCoin(Session.get('newCoin').code);
+ return coin.editor.allowBalanceToggle;
}
return false;
},
+ allowQuadratic() {
+ if (Session.get('newCoin')) {
+ const coin = getCoin(Session.get('newCoin').code);
+ return coin.editor.allowQuadraticToggle;
+ }
+ return false;
+ },
+ wrongAddress() {
+ if (Session.get('isAddressWrong')) { return true; }
+ if (Session.get('newCoin')) {
+ const coin = getCoin(Session.get('newCoin').code);
+ if (coin.type === 'ERC20' || coin.type === 'NATIVE') {
+ if (document.getElementById('editBlockchainAddress') && document.getElementById('editBlockchainAddress').value === '') {
+ if (Meteor.user().profile.wallet.reserves.length > 0 && Meteor.user().profile.wallet.reserves[0].publicAddress) {
+ document.getElementById('editBlockchainAddress').value = Meteor.user().profile.wallet.reserves[0].publicAddress;
+ Session.set('isAddressWrong', false);
+ }
+ }
+ return _verifyBlockchainAddress();
+ }
+ }
+ return Session.get('isAddressWrong');
+ },
+ addressStyle() {
+ if (Session.get('newCoin') && Session.get('newCoin').code === 'WEB VOTE') {
+ return 'display: none;';
+ }
+ return '';
+ },
buttonDisable() {
- if (!_checkInputs()) {
- return 'button-disabled';
+ if (Session.get('isAddressWrong')) { return 'button-disabled'; }
+ if (Session.get('newCoin')) {
+ if (!_checkInputs() || (document.getElementById('editBlockchainAddress') && document.getElementById('editBlockchainAddress').value === '')) {
+ return 'button-disabled';
+ }
}
return '';
},
getImage(pic) {
return getImage(Template.instance().imageTemplate.get(), pic);
},
+ showAdvanced() {
+ return Template.instance().showAdvanced.get();
+ },
+ showReserves() {
+ if (Meteor.user() && Meteor.user().profile.wallet.reserves) {
+ return 'display:auto;';
+ }
+ return 'display:none;';
+ },
});
Template.coin.events({
@@ -127,8 +243,13 @@ Template.coin.events({
animatePopup(false, 'blockchain-popup');
Session.set('showCoinSettings', false);
},
+ 'click #advanced'(event) {
+ event.preventDefault();
+ const advanced = Template.instance().showAdvanced.get();
+ Template.instance().showAdvanced.set(!advanced);
+ },
'click #execute-coin'() {
- if (_checkInputs()) {
+ if (_checkInputs() || !Session.get('isAddressWrong')) {
_save();
animatePopup(false, 'blockchain-popup');
Session.set('showCoinSettings', false);
@@ -136,8 +257,7 @@ Template.coin.events({
},
'input #editBlockchainAddress'() {
if (document.getElementById('editBlockchainAddress')) {
- const address = document.getElementById('editBlockchainAddress').value;
- Session.set('checkBlockchainAddress', web3.utils.isAddress(address));
+ Session.set('isAddressWrong', _verifyBlockchainAddress());
}
},
'input #editVotePrice'() {
diff --git a/imports/ui/templates/components/decision/constituency/constituency.html b/imports/ui/templates/components/decision/constituency/constituency.html
index 088288d01..aff0a7813 100644
--- a/imports/ui/templates/components/decision/constituency/constituency.html
+++ b/imports/ui/templates/components/decision/constituency/constituency.html
@@ -6,7 +6,7 @@
{{_ 'voter-nationality'}}
{{> warning label='domain-wrong-address'}}
diff --git a/imports/ui/templates/components/decision/countdown/countdown.html b/imports/ui/templates/components/decision/countdown/countdown.html
new file mode 100644
index 000000000..15a962041
--- /dev/null
+++ b/imports/ui/templates/components/decision/countdown/countdown.html
@@ -0,0 +1,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/imports/ui/templates/components/decision/countdown/countdown.js b/imports/ui/templates/components/decision/countdown/countdown.js
new file mode 100644
index 000000000..241666c86
--- /dev/null
+++ b/imports/ui/templates/components/decision/countdown/countdown.js
@@ -0,0 +1,158 @@
+import { Template } from 'meteor/templating';
+import { TAPi18n } from 'meteor/tap:i18n';
+import { ReactiveVar } from 'meteor/reactive-var';
+
+import { getBlockHeight } from '/imports/startup/both/modules/metamask.js';
+import { blocktimes } from '/lib/const';
+
+import '/imports/ui/templates/components/decision/countdown/countdown.html';
+
+
+/**
+* @summary returns if effectively the poll is within a valid date
+* @param {number} now current block
+* @param {object} contract being analysed
+* @return {boolean} true or fase
+*/
+const _isPollOpen = (now, contract) => {
+ if (contract && contract.rules.alwaysOn) {
+ return true;
+ }
+ if (contract && contract.closing && contract.rules) {
+ return (now < contract.closing.height);
+ }
+ return true;
+};
+
+/**
+* @summary percentage of time already transcurred for this decision
+* @param {number} currentBlock now
+* @param {number} delta length
+* @param {number} finalBlock end
+
+* @return {number} percentage in float
+*/
+const _getPercentage = (currentBlock, delta, finalBlock) => {
+ if (finalBlock <= currentBlock) {
+ return 0;
+ }
+ const initialBlock = parseInt(finalBlock - delta, 10);
+ const confirmedBlocks = parseInt(currentBlock - initialBlock, 10);
+ const percentage = parseFloat((confirmedBlocks * 100) / delta);
+
+ return parseFloat(100 - percentage, 10);
+};
+
+/**
+* @summary percentage of time already transcurred for this decision
+* @param {number} remainingBlocks until dedadline
+* @param {number} height final block
+* @param {boolean} alwaysOn if on always
+* @param {boolean} editorMode if editor
+* @return {string} with countdown sentence
+*/
+const _getDeadline = (now, remainingBlocks, length, height, alwaysOn, editorMode) => {
+ let countdown = TAPi18n.__('countdown-expiration');
+ let count = remainingBlocks;
+
+ if (editorMode) {
+ if (!alwaysOn) {
+ countdown = TAPi18n.__('poll-hypothetical');
+ } else {
+ countdown = TAPi18n.__('poll-never-ends');
+ }
+ } else if (alwaysOn) {
+ countdown = TAPi18n.__('poll-never-ends');
+ } else if (height <= now) {
+ countdown = TAPi18n.__('poll-closed-after-time');
+ count = length;
+ }
+
+ // get total seconds between the times
+ let delta = parseInt(count * blocktimes.ETHEREUM_SECONDS_PER_BLOCK, 10);
+
+ // calculate (and subtract) whole days
+ const days = Math.floor(delta / 86400);
+ delta -= days * 86400;
+
+ // calculate (and subtract) whole hours
+ const hours = Math.floor(delta / 3600) % 24;
+ delta -= hours * 3600;
+
+ // calculate (and subtract) whole minutes
+ const minutes = Math.floor(delta / 60) % 60;
+ delta -= minutes * 60;
+
+ // what's left is seconds
+ const seconds = delta % 60;
+
+
+ if (days > 0) {
+ countdown = countdown.replace('{{days}}', `${days} ${days > 1 ? TAPi18n.__('days-compressed') : TAPi18n.__('days-singular')}`);
+ } else {
+ countdown = countdown.replace('{{days}}', '');
+ }
+ if (hours > 0) {
+ countdown = countdown.replace('{{hours}}', `${hours} ${hours > 1 ? TAPi18n.__('hours-compressed') : TAPi18n.__('hours-singular')}`);
+ } else {
+ countdown = countdown.replace('{{hours}}', '');
+ }
+ if (minutes > 0) {
+ countdown = countdown.replace('{{minutes}}', `${minutes} ${minutes > 1 ? TAPi18n.__('minutes-compressed') : TAPi18n.__('minutes-singular')}`);
+ } else {
+ countdown = countdown.replace('{{minutes}}', '');
+ }
+ if (seconds > 0) {
+ countdown = countdown.replace('{{seconds}}', `${seconds} ${seconds > 1 ? TAPi18n.__('seconds-compressed') : TAPi18n.__('seconds-singular')}`);
+ } else {
+ countdown = countdown.replace('{{seconds}}', '');
+ }
+
+ if (height) {
+ countdown = countdown.replace('{{height}}', `${height.toLocaleString(undefined, [{ style: 'decimal' }])}`);
+ }
+
+ countdown = countdown.replace('{{blocks}}', `${remainingBlocks.toLocaleString(undefined, [{ style: 'decimal' }])} ${remainingBlocks > 1 ? TAPi18n.__('blocks-compressed') : TAPi18n.__('blocks-singular')}`);
+
+ return `${countdown}`;
+};
+
+
+/**
+* @summary determines deadline status based on current blockheight
+* @param {object} instance where to write last block number
+*/
+const _currentBlock = async (instance) => {
+ const now = await getBlockHeight().then((resolved) => { instance.now.set(resolved); });
+ return now;
+};
+
+Template.countdown.onCreated(function () {
+ Template.instance().now = new ReactiveVar();
+ _currentBlock(Template.instance());
+});
+
+Template.countdown.helpers({
+ label() {
+ const now = Template.instance().now.get();
+ const confirmed = parseInt(this.delta - (this.height - now), 10);
+ const deadline = _getDeadline(now, parseInt(this.delta - confirmed, 10), this.delta, this.height, this.alwaysOn, this.editorMode);
+ return deadline;
+ },
+ timerStyle() {
+ return `width: ${_getPercentage(Template.instance().now.get(), this.delta, this.height)}%`;
+ },
+ alertMode() {
+ const percentage = _getPercentage(Template.instance().now.get(), this.delta, this.height);
+
+ if (percentage && percentage < 25) {
+ return 'countdown-timer-final';
+ } else if (percentage && percentage < 5) {
+ return 'countdown-timer-final';
+ }
+ return '';
+ },
+});
+
+export const currentBlock = _currentBlock;
+export const isPollOpen = _isPollOpen;
diff --git a/imports/ui/templates/components/decision/editor/editor.html b/imports/ui/templates/components/decision/editor/editor.html
index 58b3a5c1a..5cccc36c6 100644
--- a/imports/ui/templates/components/decision/editor/editor.html
+++ b/imports/ui/templates/components/decision/editor/editor.html
@@ -1,23 +1,25 @@
{{#if compressed}}
-
-
+ {{label}}
+
+
+
-
+ {{#if quadraticEnabled}}
+
- {{#with currentUser}}
-
+ {{#if userWithTokenReserves}}
+
+ {{/if}}
- {{> avatar size=24 profile=this._id includeName=false includeNation=false editable=false microFont=true disabled=false includeRole=false}}
+ {{#unless adminBallotCreatorOnly}}
+
+
+
-
+
+ {{/unless}}
{{else}}
+ {{#with currentUser}}
+
-
+ {{> avatar size=24 profile=this._id includeName=false includeNation=false editable=false microFont=true disabled=false includeRole=false}}
+
+ {{/with}}
+
+ 
+
+ {{_ 'draft'}}
+
+ {{_ 'post-new-idea'}}
- {{/with}}
-
-
-
- {{_ 'draft'}}
- {{_ 'post-new-idea'}}
-
@@ -47,6 +49,13 @@
@@ -60,6 +69,26 @@
+ {{{_ 'election-rule-quadratic'}}}
+ {{> help tooltip='voting-editor-quadratic-tooltip'}}
+
+ {{/if}}
+ {{#if balanceEnabled}}
+
+ {{{_ 'election-rule-balance'}}}
+ {{> help tooltip='voting-editor-balance-tooltip'}}
+
+ {{/if}}
+ {{#if pollingEnabled}}
+ {{> poll list=pollList pollId=pollId editorMode=true pollTotals=0 quadratic=quadraticEnabled balance=balanceEnabled}}
+ {{/if}}
+ {{#if requiresClosing}}
+ {{#with closingData}}
+ {{> countdown}}
+ {{/with}}
+ {{/if}}
{{#if stakingEnabled}}
@@ -71,12 +100,6 @@
{{> editorButton}}
{{/each}}
-->
- {{#if userWithTokenReserves}}
-
- {{/if}}
{{#unless isPhone}}
{{> authentication desktop=true}}
diff --git a/imports/ui/templates/components/decision/editor/editor.js b/imports/ui/templates/components/decision/editor/editor.js
index 19e41ca31..fef7cdf9a 100644
--- a/imports/ui/templates/components/decision/editor/editor.js
+++ b/imports/ui/templates/components/decision/editor/editor.js
@@ -14,11 +14,13 @@ import { timeCompressed } from '/imports/ui/modules/chronos';
import '/imports/ui/templates/components/decision/editor/editor.html';
import '/imports/ui/templates/components/decision/editor/editorButton.js';
+import '/imports/ui/templates/components/decision/poll/poll.js';
import '/imports/ui/templates/components/decision/editor/counter.js';
import '/imports/ui/templates/components/decision/constituency/constituency.js';
import '/imports/ui/templates/components/decision/coin/coin.js';
import '/imports/ui/templates/components/decision/electorate/electorate.js';
import '/imports/ui/templates/components/decision/blockchain/blockchain.js';
+import '/imports/ui/templates/components/decision/closing/closing.js';
const _keepKeyboard = () => {
@@ -160,6 +162,9 @@ const _contextCheck = (elementId, event) => {
if (document.getElementById('card-blockchain-popup')) {
return document.getElementById('card-blockchain-popup') && !document.getElementById('card-blockchain-popup').contains(event.target) && document.getElementById(elementId) && !document.getElementById(elementId).contains(event.target);
}
+ if (document.getElementById('card-calendar-popup')) {
+ return document.getElementById('card-calendar-popup') && !document.getElementById('card-calendar-popup').contains(event.target) && document.getElementById(elementId) && !document.getElementById(elementId).contains(event.target);
+ }
return document.getElementById(elementId) && !document.getElementById(elementId).contains(event.target);
};
@@ -239,10 +244,11 @@ Template.editor.helpers({
return '#';
},
userWithTokenReserves() {
- if (Meteor.user() && Meteor.user().profile.wallet.reserves) {
- return true;
- }
- return false;
+ // TODO - this helper might not be needed under new model, consider removing
+ // if (Meteor.user() && Meteor.user().profile.wallet.reserves) {
+ // return true;
+ // }
+ return true;
},
ballotEnabled() {
if (Session.get('draftContract')) {
@@ -256,9 +262,18 @@ Template.editor.helpers({
}
return false;
},
+ pollingEnabled() {
+ return Session.get('draftContract') ? Session.get('draftContract').rules.pollVoting : false;
+ },
+ pollList() {
+ return Session.get('draftContract') ? Session.get('draftContract').poll : false;
+ },
+ pollId() {
+ return Session.get('draftContract') ? Session.get('draftContract')._id : false;
+ },
blockchainAddress() {
const draft = Session.get('draftContract');
- if (draft) {
+ if (draft && draft.blockchain.publicAddress) {
return `${draft.blockchain.publicAddress.substring(0, 6)}...${draft.blockchain.publicAddress.slice(-4)}`;
}
return '';
@@ -348,6 +363,38 @@ Template.editor.helpers({
},*/
];
},
+ adminBallotCreatorOnly() {
+ if (Meteor.settings.public.app.config.interface.adminBallotCreatorOnly.active) {
+ // If adminBallotCreatorOnly is active then only the user with a verified email specified in settings can create new ballots
+ if (Meteor.user().emails && Meteor.user().emails[0].verified && Meteor.user().emails[0].address === Meteor.settings.public.app.config.interface.adminBallotCreatorOnly.email) {
+ return false;
+ }
+ return true;
+ }
+ return false;
+ },
+ quadraticEnabled() {
+ const draft = Session.get('draftContract');
+
+ return draft.rules ? draft.rules.quadraticVoting : false;
+ },
+ balanceEnabled() {
+ const draft = Session.get('draftContract');
+
+ return draft.rules ? draft.rules.balanceVoting : false;
+ },
+ requiresClosing() {
+ const draft = Session.get('draftContract');
+ return draft.rules ? ((draft.rules.alwaysOn === false) || draft.rules.pollVoting) : false;
+ },
+ closingData() {
+ const closing = Session.get('draftContract').closing;
+ if (closing) {
+ closing.alwaysOn = Session.get('draftContract').rules.alwaysOn;
+ closing.editorMode = true;
+ }
+ return closing;
+ },
});
Template.editor.events({
diff --git a/imports/ui/templates/components/decision/electorate/electorate.html b/imports/ui/templates/components/decision/electorate/electorate.html
index bd65f3cab..92d4aefd8 100644
--- a/imports/ui/templates/components/decision/electorate/electorate.html
+++ b/imports/ui/templates/components/decision/electorate/electorate.html
@@ -1,6 +1,6 @@
- 
+
{{{status}}}
-
+
\ No newline at end of file
diff --git a/imports/ui/templates/components/decision/electorate/electorate.js b/imports/ui/templates/components/decision/electorate/electorate.js
index 006347624..d1e8da8de 100644
--- a/imports/ui/templates/components/decision/electorate/electorate.js
+++ b/imports/ui/templates/components/decision/electorate/electorate.js
@@ -2,12 +2,14 @@ import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating';
import { Session } from 'meteor/session';
import { $ } from 'meteor/jquery';
+import { ReactiveVar } from 'meteor/reactive-var';
import { TAPi18n } from 'meteor/tap:i18n';
import { displayPopup, animatePopup } from '/imports/ui/modules/popup';
import { toggle } from '/imports/ui/templates/components/decision/editor/editor.js';
import { geo } from '/lib/geo';
import { token } from '/lib/token';
+import { templetize, getImage } from '/imports/ui/templates/layout/templater';
import '/imports/ui/templates/components/decision/electorate/electorate.html';
import '/imports/ui/templates/components/decision/blockchain/blockchain';
@@ -61,6 +63,9 @@ const _checkTokenAvailability = (user, ticker) => {
* @return {string} address
*/
const _getTokenAddress = (user, ticker) => {
+ if (ticker === 'WEB VOTE') {
+ return (user.profile.wallet.currency === ticker);
+ }
if (user.profile.wallet.reserves && user.profile.wallet.reserves.length > 0) {
for (let i = 0; i < user.profile.wallet.reserves.length; i += 1) {
for (let k = 0; k < token.coin.length; k += 1) {
@@ -93,7 +98,7 @@ const _getTokenContractAddress = (ticker) => {
const _verifyConstituencyRights = (contract) => {
let legitimacy = true;
- if (Meteor.user() && contract.wallet.currency !== 'NONE') {
+ if (Meteor.user() && contract && contract.wallet.currency !== 'NONE') {
if (contract.constituency && contract.constituency.length > 0) {
for (const i in contract.constituency) {
switch (contract.constituency[i].kind) {
@@ -118,7 +123,7 @@ const _verifyConstituencyRights = (contract) => {
break;
case 'NATION':
default:
- if (Meteor.user().profile.country && Meteor.user().profile.country.code !== contract.constituency[i].code) {
+ if ((Meteor.user().profile.country && Meteor.user().profile.country.code !== contract.constituency[i].code) || !Meteor.user().profile.country) {
legitimacy = false;
}
break;
@@ -214,6 +219,9 @@ Template.electorate.onCreated(() => {
}
Session.set('showConstituencyEditor', false);
Template.instance().voteEnabled = _verifyConstituencyRights(contract);
+
+ Template.instance().imageTemplate = new ReactiveVar();
+ templetize(Template.instance());
});
const killPopup = () => {
@@ -237,9 +245,30 @@ Template.electorate.onRendered(function () {
}
}
});
+
+ instance.autorun(function () {
+ $('.right').scroll(() => {
+ if (Session.get('showConstituencyEditor')) {
+ Session.set('showConstituencyEditor', false);
+ animatePopup(false, 'constituency-popup');
+ }
+ });
+ });
});
Template.electorate.helpers({
+ getImage() {
+ if (!this.readOnly) {
+ if (Session.get('showConstituencyEditor')) {
+ return getImage(Template.instance().imageTemplate.get(), 'electorate-check-active');
+ }
+ return getImage(Template.instance().imageTemplate.get(), 'electorate-check-editor');
+ }
+ if (!Template.instance().voteEnabled) {
+ return getImage(Template.instance().imageTemplate.get(), 'electorate-check-reject-enabled');
+ }
+ return getImage(Template.instance().imageTemplate.get(), 'electorate-check-enabled');
+ },
status() {
let rule;
if (!this.readOnly) {
diff --git a/imports/ui/templates/components/decision/poll/poll.html b/imports/ui/templates/components/decision/poll/poll.html
new file mode 100644
index 000000000..825373b55
--- /dev/null
+++ b/imports/ui/templates/components/decision/poll/poll.html
@@ -0,0 +1,11 @@
+
+ {{#if ready}}
+
+
+
+ {{/if}}
+
\ No newline at end of file
diff --git a/imports/ui/templates/components/decision/poll/poll.js b/imports/ui/templates/components/decision/poll/poll.js
new file mode 100644
index 000000000..77e07f7f5
--- /dev/null
+++ b/imports/ui/templates/components/decision/poll/poll.js
@@ -0,0 +1,92 @@
+import { Template } from 'meteor/templating';
+import { ReactiveVar } from 'meteor/reactive-var';
+
+import { Contracts } from '/imports/api/contracts/Contracts';
+import { query } from '/lib/views';
+
+import '/imports/ui/templates/components/decision/ballot/ballot.js';
+import '/imports/ui/templates/components/decision/poll/poll.html';
+
+Template.poll.onCreated(function () {
+ Template.instance().ready = new ReactiveVar(false);
+ Template.instance().contracts = new ReactiveVar();
+});
+
+Template.poll.onRendered(function () {
+ const instance = this;
+ const pollId = instance.data.pollId;
+
+ // instance.autorun(function (computation) {
+ if (pollId) {
+ const options = { view: 'poll', pollId };
+ const parameters = query(options);
+
+ const dbQuery = Contracts.find(parameters.find, parameters.options);
+
+ instance.handle = dbQuery.observeChanges({
+ addedBefore: (id, fields) => {
+ const currentFeed = instance.contracts.get();
+ const post = fields;
+
+ post._id = id;
+
+ if (!currentFeed) {
+ instance.contracts.set([post]);
+ } else {
+ currentFeed.push(post);
+ instance.contracts.set(_.uniq(currentFeed));
+ }
+ instance.ready.set(true);
+ },
+ changed: (id, fields) => {
+ const feed = instance.contracts.get();
+
+ for (let i = 0; i < feed.length; i += 1) {
+ if (feed[i]._id === id) {
+ feed[i] = Object.assign(feed[i], fields);
+ break;
+ }
+ }
+
+ instance.contracts.set(feed);
+ },
+ removed: (id) => {
+ const feed = instance.contracts.get();
+
+ for (let i = 0; i < feed.length; i += 1) {
+ if (feed[i]._id === id) {
+ feed.splice(i, 1);
+ break;
+ }
+ }
+
+ instance.contracts.set(feed);
+ },
+ });
+ }
+ // });
+});
+
+Template.poll.helpers({
+ ready() {
+ return Template.instance().ready.get();
+ },
+ item() {
+ const contracts = Template.instance().contracts.get();
+ const item = [];
+ for (let i = 0; i < contracts.length; i += 1) {
+ item.push({
+ contract: contracts[i],
+ totals: this.pollTotals,
+ editor: this.editorMode,
+ });
+ }
+ return item;
+ },
+ quadratic() {
+ return this.quadratic;
+ },
+ balance() {
+ return this.balance;
+ },
+});
diff --git a/imports/ui/templates/components/identity/avatar/avatar.js b/imports/ui/templates/components/identity/avatar/avatar.js
index 1b77ae1ed..c27b561d9 100644
--- a/imports/ui/templates/components/identity/avatar/avatar.js
+++ b/imports/ui/templates/components/identity/avatar/avatar.js
@@ -80,7 +80,7 @@ const getNation = (profile, flagOnly, nameOnly, codeOnly) => {
const country = searchJSON(geo.country, Meteor.user().profile.country.name);
if (country !== undefined) {
if (flagOnly) {
- return `${country[0].emoji}`;
+ return `${country[0] ? country[0].emoji : ''}`;
}
if (nameOnly) {
return `${country[0].name}`;
@@ -88,7 +88,7 @@ const getNation = (profile, flagOnly, nameOnly, codeOnly) => {
if (codeOnly) {
return `${country[0].code}`;
}
- return `${Meteor.user().profile.country.name} ${country[0].emoji}`;
+ return `${Meteor.user().profile.country.name} ${country[0] ? country[0].emoji : ''}`;
}
}
if (flagOnly || nameOnly || codeOnly) { return ''; }
@@ -97,7 +97,7 @@ const getNation = (profile, flagOnly, nameOnly, codeOnly) => {
} else if (profile.country !== undefined) {
if (profile.country.name !== TAPi18n.__('unknown')) {
if (flagOnly) {
- return `${searchJSON(geo.country, profile.country.name)[0].emoji}`;
+ return `${searchJSON(geo.country, profile.country.name)[0] ? searchJSON(geo.country, profile.country.name)[0].emoji : ''}`;
}
if (nameOnly) {
return `${searchJSON(geo.country, profile.country.name)[0].name}`;
@@ -105,7 +105,7 @@ const getNation = (profile, flagOnly, nameOnly, codeOnly) => {
if (codeOnly) {
return `${searchJSON(geo.country, profile.country.name)[0].code}`;
}
- return `${profile.country.name} ${searchJSON(geo.country, profile.country.name)[0].emoji}`;
+ return `${profile.country.name} ${searchJSON(geo.country, profile.country.name)[0] ? searchJSON(geo.country, profile.country.name)[0].emoji : ''}`;
}
if (flagOnly) { return ''; }
return TAPi18n.__('unknown');
@@ -116,7 +116,7 @@ const getNation = (profile, flagOnly, nameOnly, codeOnly) => {
const country = searchJSON(geo.country, user.profile.country.name);
if (user.profile.country.name !== TAPi18n.__('unknown') && country !== undefined) {
if (flagOnly) {
- return `${country[0].emoji}`;
+ return `${country[0] ? country[0].emoji : ''}`;
}
if (nameOnly) {
return user.profile.country.name;
@@ -124,7 +124,7 @@ const getNation = (profile, flagOnly, nameOnly, codeOnly) => {
if (codeOnly) {
return user.profile.country.code;
}
- return `${user.profile.country.name} ${country[0].emoji}`;
+ return `${user.profile.country.name} ${country[0] ? country[0].emoji : ''}`;
}
if (flagOnly || nameOnly || codeOnly) { return ''; }
return TAPi18n.__('unknown');
diff --git a/imports/ui/templates/components/identity/card/card.html b/imports/ui/templates/components/identity/card/card.html
index 5dfb1246b..3a93818b0 100644
--- a/imports/ui/templates/components/identity/card/card.html
+++ b/imports/ui/templates/components/identity/card/card.html
@@ -1,5 +1,5 @@
-
+ {{#each item}}
+ {{> ballot poll=true contract=this.contract pollTotals=this.totals editorMode=this.editor}}
+ {{/each}}
+
+
+
{{> avatar profile=this includeName=true includeNation=true includeAddress=true editable=false disabled=true includeRole=false}}
+
diff --git a/imports/ui/templates/components/identity/login/profile/multiTokenProfile.js b/imports/ui/templates/components/identity/login/profile/multiTokenProfile.js
index 727b5fb79..5a3c7258c 100644
--- a/imports/ui/templates/components/identity/login/profile/multiTokenProfile.js
+++ b/imports/ui/templates/components/identity/login/profile/multiTokenProfile.js
@@ -1,24 +1,34 @@
import { Template } from 'meteor/templating';
+import { ReactiveVar } from 'meteor/reactive-var';
+
+import { rules } from '/lib/const';
import '/imports/ui/templates/components/identity/login/profile/multiTokenProfile.html';
import '/imports/ui/templates/components/decision/balance/balance.js';
+const numeral = require('numeral');
+
+Template.multiTokenProfile.onCreated(function () {
+ Template.instance().pollScore = new ReactiveVar(0);
+});
+
Template.multiTokenProfile.helpers({
tokens() {
const wallet = this.profile.wallet;
const tokens = [];
- // push VOTE balance as first element in tokens array
- /*
- @ NOTE: this type of token push is for off-chain tokens, not supported in first beta release.
- const voteToken = {
- token: wallet.currency,
- balance: wallet.balance,
- available: wallet.available,
- placed: wallet.placed,
- };
- tokens.push(voteToken);
- */
+ // push WEB VOTE balance as first element in tokens array, if present
+ if (wallet.balance > 0) {
+ const webVote = {
+ token: wallet.currency,
+ balance: wallet.balance,
+ available: wallet.available,
+ placed: wallet.placed,
+ disableStake: true,
+ disableBar: false,
+ };
+ tokens.push(webVote);
+ }
// loop through reserves array and push each to tokens
for (const i in wallet.reserves) {
@@ -34,4 +44,53 @@ Template.multiTokenProfile.helpers({
}
return tokens;
},
+ noBarStyle() {
+ if (this.disableBar) {
+ return 'token-wrap-multi';
+ }
+ return '';
+ },
+ pollScore(available, balance) {
+ const percentage = ((available * 100) / rules.VOTES_INITIAL_QUANTITY);
+ Template.instance().pollScore.set(percentage);
+ return `${numeral(percentage).format('0.00')}%`;
+ /*
+ // color
+ let score = '';
+
+ // score
+ let choiceVotes;
+ if (this.pollTotals) {
+ switch (this.contract.blockchain.coin.code) {
+ case 'WEB VOTE':
+ choiceVotes = 0;
+ for (let k = 0; k < this.contract.tally.voter.length; k += 1) {
+ choiceVotes += this.contract.tally.voter[k].votes;
+ }
+ break;
+ default:
+ choiceVotes = this.contract.blockchain.score ? this.contract.blockchain.score.totalConfirmed : '0';
+ }
+ }
+ const bnVotes = new BigNumber(choiceVotes);
+ const bnTotal = new BigNumber(this.pollTotals);
+ let percentage;
+ // eslint-disable-next-line eqeqeq
+ if (bnTotal != 0) {
+ percentage = new BigNumber(bnVotes.multipliedBy(100)).dividedBy(bnTotal);
+ } else {
+ percentage = 0;
+ }
+ Template.instance().pollScore.set(percentage);
+ score = `${numeral(percentage).format('0.00')}%`;
+
+ return score;
+ */
+ },
+ smallPercentageStyle() {
+ if (Template.instance().pollScore.get() < 10) {
+ return 'poll-score-small';
+ }
+ return '';
+ },
});
diff --git a/imports/ui/templates/components/identity/login/profile/profile.html b/imports/ui/templates/components/identity/login/profile/profile.html
index d79c7b1df..846359fb4 100644
--- a/imports/ui/templates/components/identity/login/profile/profile.html
+++ b/imports/ui/templates/components/identity/login/profile/profile.html
@@ -4,13 +4,17 @@
{{else}}
+
+
+ {{/unless}}
{{/each}}
+ {{pollScore this.available}}
+
+
{{> avatar includeName=true includeNation=true editable=false includeAddress=true}}
- {{#if isMultiTokenUser}}
+
+
+
- {{/if}}
-
- {{#unless isPhone}}
- {{#if replyEditor}}
- {{#with replyData}}
- {{> compose}}
- {{/with}}
- {{/if}}
+ {{#unless isPhone}}
+ {{#if replyEditor}}
+ {{#with replyData}}
+ {{> compose}}
+ {{/with}}
+ {{/if}}
+ {{/unless}}
{{/unless}}
{{/if}}
{{/if}}
diff --git a/imports/ui/templates/widgets/feed/feedItem.js b/imports/ui/templates/widgets/feed/feedItem.js
index 2600af804..122652c58 100644
--- a/imports/ui/templates/widgets/feed/feedItem.js
+++ b/imports/ui/templates/widgets/feed/feedItem.js
@@ -21,6 +21,9 @@ import '/imports/ui/templates/widgets/feed/feedItem.html';
import '/imports/ui/templates/widgets/transaction/transaction.js';
import '/imports/ui/templates/widgets/spinner/spinner.js';
import '/imports/ui/templates/components/identity/avatar/avatar.js';
+import '/imports/ui/templates/components/decision/countdown/countdown.js';
+
+import BigNumber from 'bignumber.js';
/**
* @summary determines whether this decision can display results or notice
@@ -72,6 +75,26 @@ const _here = (item) => {
return (window.location.pathname.substring(0, item.url.length) === `${item.url}`);
};
+/**
+* @summary Strips markdown format to render HTML link correctly
+* @param {string} text - Expected format is:
+*
+* "[Click me](www.test.com)"
+*
+* @param {string} humanStr - Refers to part within brackets, 'Click me' in the example above
+* @returns {string} HTML format that actually contains the human readable part, as in:
+*
+* "Click me"
+*
+*/
+const stripMarkdownLink = (text, humanStr) => {
+ text = text.slice(text.search('") + 16);
+ text = text + humanStr + '';
+
+ return text;
+};
+
/**
* @summary parses a url in a plain text and returns link html
* @param {string} text to be parsed
@@ -79,6 +102,12 @@ const _here = (item) => {
*/
const parseURL = (text) => {
const exp = /(\b(((https?|ftp|file|):\/\/)|www[.])[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig;
+ const markdownLinkExp = /\[(.*?)\]\((.+?)\)/g;
+ const markdownImgExp = /(?:!\[(.*?)\]\((.*?)\))/ig;
+
+ // If markdown image format present, ignore
+ if (text.search(markdownImgExp) !== -1) return text;
+
let temp = text.replace(exp, "$1");
let result = '';
@@ -96,6 +125,9 @@ const parseURL = (text) => {
}
}
+ // If markdown link format (`[]()`) present, strip for correct rendering
+ result = result.replace(markdownLinkExp, stripMarkdownLink(result, '$1'));
+
return result;
};
@@ -123,7 +155,6 @@ const _hasSubstring = (str, items) => {
* @return {string} html with linked url
*/
const _clickOnWhitespace = (className) => {
- console.log(className);
return _hasSubstring(className, ['checkbox', 'title-input', 'option-title', 'identity-list']);
};
@@ -156,14 +187,18 @@ const renderMarkup = (text) => {
html = _replaceAll(html, "href='/@@", "href='/@");
// tokens
- html = html.replace(/(^|\s)(\$[a-z\d][\w-]*)/ig, "$1$2");
- html = _replaceAll(html, "href='/token/$", "href='$");
+ // html = html.replace(/(^|\s)(\$[a-z\d][\w-]*)/ig, "$1$2");
+ // html = _replaceAll(html, "href='/token/$", "href='$");
// markup
html = html.replace(/\*\*(.*?)\*\*/g, '$1');
html = html.replace(/__(.*?)__/g, '$1');
html = html.replace(/--(.*?)--/g, '$1');
html = html.replace(/~~(.*?)~~/g, '$1');
+ html = html.replace(/##(.*?)##/g, '$1');
+
+ // images
+ html = html.replace(/(?:!\[(.*?)\]\((.*?)\))/g, '
');
// paragraphs
html = html.replace(/\n/g, '
'); @@ -353,14 +388,66 @@ Template.feedItem.helpers({ feedContract() { return Template.instance().contract.get(); }, + pollingEnabled() { + return this.rules ? this.rules.pollVoting : false; + }, + quadraticEnabled() { + return this.rules ? this.rules.quadraticVoting : false; + }, + balanceEnabled() { + return this.rules ? this.rules.balanceVoting : false; + }, + pollList() { + return this.poll; + }, + pollId() { + return this._id; + }, + pollTotals() { + const choices = Contracts.find({ pollId: this._id }).fetch(); + let total = new BigNumber(0); + for (let i = 0; i < choices.length; i += 1) { + switch (this.blockchain.coin.code) { + case 'WEB VOTE': + for (let k = 0; k < choices[i].tally.voter.length; k += 1) { + total = total.plus(choices[i].tally.voter[k].votes); + } + break; + default: + if (choices[i].blockchain.score && choices[i].blockchain.score.totalConfirmed) { + total = total.plus(choices[i].blockchain.score.totalConfirmed); + } + } + } + return total.toString(); + }, + rules() { + return this.rules; + }, voters() { let total; - const dbContract = Contracts.findOne({ _id: this._id }); - if (dbContract && dbContract.tally) { - total = dbContract.tally.voter.length; + let list = []; + const contract = Contracts.findOne({ _id: this._id }); + let choice; + + if (contract.poll && contract.poll.length > 0) { + // poll contract + total = 0; + for (let i = 0; i < contract.poll.length; i += 1) { + choice = Contracts.findOne({ _id: contract.poll[i].contractId }); + + if (choice) { + list = list.concat(_.pluck(choice.tally.voter, '_id')); + } + } + total = _.uniq(list).length; + } else if (contract && contract.tally) { + // normal + total = contract.tally.voter.length; } else { total = getTotalVoters(this); } + if (total === 1) { return `${total} ${TAPi18n.__('voter').toLowerCase()}`; } else if (total === 0) { @@ -419,6 +506,25 @@ Template.feedItem.helpers({ getImage(pic) { return getImage(Template.instance().imageTemplate.get(), pic); }, + pollContent() { + return this.pollId; + }, + pollStyle() { + if (this.poll && this.poll.length > 0) { + return 'vote-poll'; + } + return ''; + }, + requiresClosing() { + return ((this.rules.alwaysOn === false) || this.rules.pollVoting); + }, + closingData() { + const closing = this.closing; + if (closing) { + closing.alwaysOn = this.rules.alwaysOn; + } + return closing; + }, }); Template.feedItem.events({ diff --git a/imports/ui/templates/widgets/feed/paginator.js b/imports/ui/templates/widgets/feed/paginator.js index 1a54ab138..d91a307e3 100644 --- a/imports/ui/templates/widgets/feed/paginator.js +++ b/imports/ui/templates/widgets/feed/paginator.js @@ -60,7 +60,6 @@ Template.paginator.onRendered(function () { Template.paginator.helpers({ end() { - console.log(`end why? skip: ${this.options.skip} + limit: ${this.options.limit} < count: ${this.count}`); return !((this.options.skip + this.options.limit) < this.count); }, empty() { diff --git a/imports/ui/templates/widgets/help/help.html b/imports/ui/templates/widgets/help/help.html new file mode 100644 index 000000000..8634a3b12 --- /dev/null +++ b/imports/ui/templates/widgets/help/help.html @@ -0,0 +1,10 @@ + +
"
+ },
+
+ "spinner": {
+ "lines": 17,
+ "length": 6,
+ "width": 1.5,
+ "radius": 16,
+ "scale": 0.4,
+ "corners": 1,
+ "color": "#5a0075",
+ "opacity": 0.3,
+ "rotate": 0,
+ "direction": 1,
+ "speed": 1,
+ "trail": 60,
+ "fps": 20,
+ "zIndex": 2e9,
+ "className": "spinner",
+ "top": "0px",
+ "left": "auto",
+ "shadow": false,
+ "hwaccel": false,
+ "position": "relative"
+ },
+
+ "images": {
+ "back": "/templates/sovereign/images/back.png",
+ "black": "/templates/sovereign/images/black.png",
+ "block": "/templates/sovereign/images/block.png",
+ "clock": "/templates/sovereign/images/clock.png",
+ "debate": "/templates/sovereign/images/debate.png",
+ "reply": "/templates/sovereign/images/reply.png",
+ "tweet": "/templates/sovereign/images/tweet.png",
+ "vote": "/templates/sovereign/images/vote.png",
+ "flag": "/templates/sovereign/images/flag.png",
+ "camera": "/templates/sovereign/images/camera.png",
+ "forward": "/templates/sovereign/images/forward.png",
+ "token": "/templates/sovereign/images/token.png",
+ "domain": "/templates/sovereign/images/domain.png",
+ "decision-draft": "/templates/sovereign/images/decision-draft.png",
+ "blockchain-address": "/templates/sovereign/images/blockchain-address.png",
+ "fingerprint": "/templates/sovereign/images/fingerprint.png",
+ "logout": "/templates/sovereign/images/logout.png",
+ "vote-icon-black": "/templates/sovereign/images/vote-icon-black.png",
+ "mail-closed": "/templates/sovereign/images/mail-closed.png",
+ "mail-closed-login-button": "/templates/sovereign/images/mail-closed-login-button.png",
+ "lock": "/templates/sovereign/images/lock.png",
+ "id-card": "/templates/sovereign/images/id-card.png"
+ }
+
+}
diff --git a/public/templates/decentraland/decentraland.json b/public/templates/decentraland/decentraland.json
new file mode 100644
index 000000000..af7a3768f
--- /dev/null
+++ b/public/templates/decentraland/decentraland.json
@@ -0,0 +1,58 @@
+{
+ "stylesheet": {
+ "list": ["/styles/normalize.css", "/styles/webflow.css", "/templates/decentraland/decentraland.css", "/templates/decentraland/extra.css"]
+ },
+
+ "header": {
+ "html": ""
+ },
+
+ "spinner": {
+ "lines": 17,
+ "length": 6,
+ "width": 1.5,
+ "radius": 16,
+ "scale": 0.4,
+ "corners": 1,
+ "color": "#5a0075",
+ "opacity": 0.3,
+ "rotate": 0,
+ "direction": 1,
+ "speed": 1,
+ "trail": 60,
+ "fps": 20,
+ "zIndex": 2e9,
+ "className": "spinner",
+ "top": "0px",
+ "left": "auto",
+ "shadow": false,
+ "hwaccel": false,
+ "position": "relative"
+ },
+
+ "images": {
+ "back": "/templates/decentraland/images/back.png",
+ "black": "/templates/decentraland/images/black.png",
+ "block": "/templates/decentraland/images/block.png",
+ "clock": "/templates/decentraland/images/clock.png",
+ "debate": "/templates/decentraland/images/debate.png",
+ "reply": "/templates/decentraland/images/reply.png",
+ "tweet": "/templates/decentraland/images/tweet.png",
+ "vote": "/templates/decentraland/images/vote.png",
+ "flag": "/templates/decentraland/images/flag.png",
+ "camera": "/templates/decentraland/images/camera.png",
+ "forward": "/templates/decentraland/images/forward.png",
+ "token": "/templates/decentraland/images/token.png",
+ "domain": "/templates/decentraland/images/domain.png",
+ "decision-draft": "/templates/decentraland/images/decision-draft.png",
+ "blockchain-address": "/templates/decentraland/images/blockchain-address.png",
+ "fingerprint": "/templates/decentraland/images/fingerprint.png",
+ "logout": "/templates/decentraland/images/logout.png",
+ "vote-icon-black": "/templates/decentraland/images/vote-icon-black.png",
+ "mail-closed": "/templates/decentraland/images/mail-closed.png",
+ "mail-closed-login-button": "/templates/decentraland/images/mail-closed-login-button.png",
+ "lock": "/templates/decentraland/images/lock.png",
+ "id-card": "/templates/decentraland/images/id-card.png"
+ }
+
+}
diff --git a/public/templates/decentraland/extra.css b/public/templates/decentraland/extra.css
index 253e9caec..daa3c1cc2 100644
--- a/public/templates/decentraland/extra.css
+++ b/public/templates/decentraland/extra.css
@@ -194,3 +194,483 @@ body, h4, h1, h2 {
background-color:#f2f2f5;
}
+
+.hero-cover {
+ z-index: 1;
+}
+
+.accounts-dialog .login-button {
+ margin: 15px 0px 0px;
+ padding: 12px 14px;
+ border-radius: 6px;
+ background-color: #580074;
+ font-family: Lato, sans-serif;
+ color: #fff;
+ font-size: 14px;
+ font-weight: 500;
+ text-align: center;
+ text-transform: uppercase;
+ cursor: pointer;
+ border: 1px solid #580074;
+ font-size: 14px;
+}
+
+#login-buttons .login-button:hover, .accounts-dialog .login-button:hover {
+ border-style: solid;
+ border-color: #ff617e;
+ background-color: #ff617e;
+ color: #fff;
+}
+
+.accounts-dialog input[type=text][type], .accounts-dialog input[type=email][type], .accounts-dialog input[type=password][type] {
+ width: 100%;
+ height: 44px;
+ margin-bottom: 0px;
+ border-style: none none solid;
+ border-width: 0px 0px 1px;
+ border-color: #000 #000 #c7b7cc;
+ background-color: transparent;
+ box-shadow: none;
+ color: #5a0075;
+ font-size: 16px;
+ font-weight: 300;
+ border-radius:0px;
+ text-align: left;
+ -webkit-text-fill-color: #5a0075 !important;
+}
+
+.accounts-dialog:focus {
+ border-color:#ff617e;
+}
+
+.accounts-dialog label {
+ margin-top: 0px;
+ margin-bottom: 0px;
+ font-size: 11px;
+ line-height: 22px;
+ font-weight: 300;
+ text-transform: uppercase;
+}
+
+.accounts-centered-dialog {
+ display: block;
+ overflow: hidden;
+ max-width: 400px;
+ margin-top: -100px;
+ padding: 18px 12px;
+ border-color: #f3f3f3 #e0e0e0 #e0e0e0 #f3f3f3;
+ border-top-style: solid;
+ border-top-width: 1px;
+ border-left-style: solid;
+ border-left-width: 1px;
+ border-radius: 5px;
+ background-color: #eaeaea;
+ box-shadow: 0 6px 20px 4px rgba(0, 0, 0, .13);
+ font-size: 16px;
+ text-align: center;
+}
+
+.toggle-label {
+ float: left;
+ text-transform: none;
+ font-size: 14px;
+}
+
+.toggle-button {
+ width: 26px;
+ height: 26px;
+ margin: 2px;
+ border-radius: 100px;
+ background-color: #fff;
+ transition: all 200ms ease;
+}
+
+.toggle-button.toggle-button-active {
+ margin-left: 32px;
+}
+
+.toggle-setting {
+ clear: both;
+ display: inline-block;
+ width: 100%;
+ border-radius: 5px;
+ margin: -5px 0px 0px;
+ padding: 10px 10px;
+ background: #747484;
+}
+
+.toggle {
+ width: 60px;
+ height: 30px;
+ float: right;
+ border-radius: 100px;
+ background-color: #ccc;
+ cursor: pointer;
+}
+
+.toggles {
+ margin-bottom:10px;
+ line-height:27px;
+}
+
+ .login-advanced {
+ margin-bottom:20px;
+ }
+
+ .login-advanced-link {
+ border: solid #ff617e;
+ border-width: 0 2px 2px 0;
+ display: inline-block;
+ padding: 3px;
+ margin-left: 8px;
+ margin-bottom: 2px;
+ }
+
+ .login-advanced-link.login-advanced-link-up {
+ transform: rotate(-135deg);
+ -webkit-transform: rotate(-135deg);
+ margin-bottom: -2px;
+ z-index:-1;
+ }
+
+ .login-advanced-link.login-advanced-link-down {
+ transform: rotate(45deg);
+ -webkit-transform: rotate(45deg);
+ z-index:-1;
+ }
+
+.help-tooltip {
+ position:absolute;
+ font-size:11px;
+ color:#a57213;
+ background-color:#feda96;
+ line-height:16px;
+ max-width:200px;
+ text-align:left;
+ padding:7px;
+ border-radius:3px;
+ z-index:1;
+ box-shadow:4px 4px 15px #0000003d;
+}
+
+.hero-cta-input {
+-webkit-appearance: none;
+}
+
+.poll {
+ display: inline-block;
+ width: 100%;
+ margin-top:5px;
+}
+
+.poll-choice {
+ padding: 5px;
+ float: left;
+ /* display: inline-block; */
+ width: 50%;
+}
+
+@media (max-width: 767px) {
+
+ .poll-choice {
+ padding: 5px;
+ clear:both;
+ /* display: inline-block; */
+ width: 100%;
+ }
+
+}
+
+.choice {
+ width: 100%;
+ box-shadow: 0px 3px 6px 0px #88888826;
+ float: left;
+ line-height: 32px;
+ /* margin-bottom: -17px; */
+ margin: 0px;
+ text-transform: none;
+ color: #000;
+ background: #f0eef2;
+ text-align: left;
+ font-size: 12px;
+ /* padding: 7px; */
+ /* text-transform: none; */
+ border-radius: 5px;
+ border: 1px solid #ede9f3;
+ border-top: 1px solid #f1edf7;
+ border-left: 1px solid #f1edf7;
+ padding: 5px 10px 9px;
+ transition: all 200ms ease;
+}
+
+.choice:hover {
+ background: #fcf9ff;
+ /* border: 1px solid #5d0077; */
+ margin: -2px 0px 2px 0px;
+ box-shadow: 0px 3px 6px 0px #88888847;
+ border: 1px solid #f8f3ff;
+ border-top: 1px solid #faf8fd;
+ border-left: 1px solid #faf8fd;
+}
+
+.choice:active {
+ background: #fcf9ff;
+ /* border: 1px solid #5d0077; */
+ margin: 0px 0px 0px 0px;
+ box-shadow: 0px 0px 0px 0px #88888847;
+ border: 1px solid #ede9f3;
+ border-top: 1px solid #f1edf7;
+ border-left: 1px solid #f1edf7;
+
+}
+
+.poll-score-bar {
+ background: #fff;
+ margin: 8px 0px 0px;
+ height: 16px;
+ border: 1px solid #e8e8e8d9;
+ float: left;
+ width: 100%;
+ border-radius: 10px;
+ overflow: hidden;
+}
+
+.poll-score-bar-fill {
+ width: 1%;
+ height: 20px;
+ background: #00c190;
+ transition: all 200ms ease;
+}
+
+.section-poll {
+ margin:0 -10px;
+}
+
+.micro-button.micro-button-feed.no-underline.micro-button-poll {
+ float: right;
+ margin: 1px -3px;
+ padding: 0px;
+ height: 25px;
+}
+
+.login-label-subtitle {
+ margin-bottom: 15px;
+}
+
+.toggle-disabled {
+ opacity: 0.3;
+ cursor: default;
+}
+
+.checkbox-mini {
+width: 20px;
+ height: 20px;
+ margin-top: 6px;
+ margin-right: 7px;
+ margin-left: 2px;
+ padding: 2px;
+ float: left;
+ border: 1px solid #ebe4f3;
+ border-radius: 25px;
+ background-color: #fff;
+}
+
+.check-mini-selected-box {
+ background: #00c190;
+ border: 1px solid #00c190;
+}
+
+.check-mini-unselected-box {
+ background: #fff;
+}
+
+
+.checkmark_kick.check-mini-selected-mark,
+.checkmark_stem.check-mini-selected-mark,
+.checkmark_kick.check-mini-unselected-mark,
+.checkmark_stem.check-mini-unselected-mark {
+ background: #fff;
+}
+
+
+.checkmark_kick {
+ width: 1px;
+ height: 5px;
+ background-color: #00c190;
+ transform: rotate(129deg);
+ margin-top: 7px;
+ margin-bottom: 0px;
+ margin-left: 3px;
+}
+
+.checkmark_stem {
+width: 1px;
+ height: 11px;
+ background-color: #00c190;
+ transform: rotate(34deg);
+ margin: auto;
+ margin-top: -11px;
+ margin-left: 8px;
+}
+
+.poll-score-percentage {
+ color: #fff;
+ float: right;
+ position: absolute;
+ font-size: 9px;
+ text-shadow:#00000059 1px 1px 0px;
+ margin: 0px 7px;
+}
+
+.poll-score-percentage.poll-score-small {
+ color:#5a5a5a;
+}
+
+.checkbox-mini.check-mini-selected-box:hover {
+ margin:5px 7px 1px 2px;
+ border: 1px solid #00c190;
+ box-shadow: 0px 1px 5px #00000040;
+}
+
+.token-ticker {
+ min-width: 35px;
+ padding: 3px;
+ float: left;
+ border: 1px solid #9696c1;
+ /* border-top-left-radius: 5px; */
+ /* border-bottom-left-radius: 5px; */
+ background-color: #9695c3;
+ border-radius: 5px;
+ margin-right: 3px;
+ font-size: 10px;
+ line-height: 10px;
+ font-weight: 400;
+ text-align: center;
+}
+
+.token-balance {
+ display: inline;
+ min-width: 35px;
+ padding: 3px 5px;
+ float: left;
+ border: 1px solid #9696c1;
+ /* border-top-right-radius: 5px; */
+ /* border-bottom-right-radius: 5px; */
+ border-radius: 5px;
+ font-size: 10px;
+ line-height: 10px;
+ font-weight: 400;
+ text-align: right;
+ text-transform: uppercase;
+}
+
+.checkbox-mini.checkbox-mini-remove {
+ background-color: #ff617e;
+ position: absolute;
+ border-color: #ff617e;
+ opacity:0;
+}
+
+.checkmark_kick.checkmark-kick-remove {
+width: 1px;
+ height: 10px;
+ background-color: #fff;
+ transform: rotate(135deg);
+ margin-top: 2px;
+ margin-bottom: 0px;
+ margin-left: 6px;
+}
+
+.checkmark_stem.checkmark-stem-remove {
+ width: 1px;
+ height: 10px;
+ background-color: #fff;
+ transform: rotate(45deg);
+ margin: auto;
+ margin-top: -10px;
+ margin-left: 6px;
+}
+
+.checkbox-mini.checkbox-mini-remove:hover {
+ opacity:1;
+}
+
+.vote.vote-search.vote-feed.nondraggable.vote-poll:active {
+ margin-top: -4px;
+ margin-bottom: 25px;
+ box-shadow: 0 10px 20px 0 rgba(0, 0, 0, .1);
+ color: #0d0d17;
+}
+
+.stage.stage-vote.stage-loosing {
+ border-color: #e6e6e6;
+ padding: 0px;
+ background-color: transparent;
+ background-color: #e6e6e6;
+ width: 0px;
+ height: 0px;
+ min-width: 0px;
+ overflow: hidden;
+}
+
+.button.login-button.button-half.button-half-disabled {
+ opacity:0.2;
+}
+
+.election-rule {
+ background: #e8ddec;
+ color: #5a0074;
+ font-size: 13px;
+ display: inline-block;
+ padding: 0px 5px;
+ border-radius: 5px;
+ line-height: 28px;
+ margin: 15px 5px 0px -5px;
+ cursor: default;
+};
+
+.budget {
+ margin-top:15px;
+}
+
+.token-wrap-next {
+ margin-top:20px;
+}
+
+.poll-score {
+ margin-bottom: 60px;
+}
+
+.poll-score-button {
+ margin-bottom: 0px;
+}
+
+.help {
+ display: block;
+ margin-top: 6px;
+ margin-left: 7px;
+ padding-right: 5px;
+ padding-left: 5px;
+ float: right;
+ border: 1px solid #ff617e;
+ border-radius: 100px;
+ background-color: #ff617e;
+ color: #fff;
+ font-size: 10px;
+ line-height: 15px;
+ font-weight: 400;
+ cursor: default;
+}
+
+.button {
+ margin: 10px 0px;
+}
+
+.editor-menu {
+ margin: -2px -16px 10px;
+ background: #ffffff;
+ display: inline-block;
+ padding: 5px 5px;
+ box-shadow: 0px 11px 15px 0px #e6e6e666;
+ border-radius: 0px;
+}
diff --git a/public/templates/decentraland/decentraland/back.png b/public/templates/decentraland/images/back.png
similarity index 100%
rename from public/templates/decentraland/decentraland/back.png
rename to public/templates/decentraland/images/back.png
diff --git a/public/templates/decentraland/images/black.png b/public/templates/decentraland/images/black.png
new file mode 100644
index 000000000..2d1308147
Binary files /dev/null and b/public/templates/decentraland/images/black.png differ
diff --git a/public/templates/decentraland/images/block.png b/public/templates/decentraland/images/block.png
new file mode 100644
index 000000000..75e20ff4d
Binary files /dev/null and b/public/templates/decentraland/images/block.png differ
diff --git a/public/templates/decentraland/images/blockchain-address.png b/public/templates/decentraland/images/blockchain-address.png
new file mode 100644
index 000000000..989964620
Binary files /dev/null and b/public/templates/decentraland/images/blockchain-address.png differ
diff --git a/public/templates/decentraland/images/camera.png b/public/templates/decentraland/images/camera.png
new file mode 100644
index 000000000..295b5274e
Binary files /dev/null and b/public/templates/decentraland/images/camera.png differ
diff --git a/public/templates/decentraland/images/clock.png b/public/templates/decentraland/images/clock.png
new file mode 100644
index 000000000..a7773ae2a
Binary files /dev/null and b/public/templates/decentraland/images/clock.png differ
diff --git a/public/templates/decentraland/images/debate.png b/public/templates/decentraland/images/debate.png
new file mode 100644
index 000000000..a58f426db
Binary files /dev/null and b/public/templates/decentraland/images/debate.png differ
diff --git a/public/templates/decentraland/decentraland/decentraland-logo.svg b/public/templates/decentraland/images/decentraland-logo.svg
similarity index 100%
rename from public/templates/decentraland/decentraland/decentraland-logo.svg
rename to public/templates/decentraland/images/decentraland-logo.svg
diff --git a/public/templates/decentraland/images/decision-draft.png b/public/templates/decentraland/images/decision-draft.png
new file mode 100644
index 000000000..12df37182
Binary files /dev/null and b/public/templates/decentraland/images/decision-draft.png differ
diff --git a/public/templates/decentraland/images/domain.png b/public/templates/decentraland/images/domain.png
new file mode 100644
index 000000000..0a537746c
Binary files /dev/null and b/public/templates/decentraland/images/domain.png differ
diff --git a/public/templates/decentraland/images/fingerprint.png b/public/templates/decentraland/images/fingerprint.png
new file mode 100644
index 000000000..7e7a3737b
Binary files /dev/null and b/public/templates/decentraland/images/fingerprint.png differ
diff --git a/public/templates/decentraland/images/flag.png b/public/templates/decentraland/images/flag.png
new file mode 100644
index 000000000..db63e771c
Binary files /dev/null and b/public/templates/decentraland/images/flag.png differ
diff --git a/public/templates/decentraland/images/forward.png b/public/templates/decentraland/images/forward.png
new file mode 100644
index 000000000..3dbfb3f94
Binary files /dev/null and b/public/templates/decentraland/images/forward.png differ
diff --git a/public/templates/decentraland/images/id-card.png b/public/templates/decentraland/images/id-card.png
new file mode 100644
index 000000000..d2895b2a9
Binary files /dev/null and b/public/templates/decentraland/images/id-card.png differ
diff --git a/public/templates/decentraland/images/lock.png b/public/templates/decentraland/images/lock.png
new file mode 100755
index 000000000..553855949
Binary files /dev/null and b/public/templates/decentraland/images/lock.png differ
diff --git a/public/templates/decentraland/images/logout.png b/public/templates/decentraland/images/logout.png
new file mode 100644
index 000000000..c1232adcb
Binary files /dev/null and b/public/templates/decentraland/images/logout.png differ
diff --git a/public/templates/decentraland/images/mail-closed-login-button.png b/public/templates/decentraland/images/mail-closed-login-button.png
new file mode 100644
index 000000000..cb65c7bd8
Binary files /dev/null and b/public/templates/decentraland/images/mail-closed-login-button.png differ
diff --git a/public/templates/decentraland/images/mail-closed.png b/public/templates/decentraland/images/mail-closed.png
new file mode 100755
index 000000000..265c15206
Binary files /dev/null and b/public/templates/decentraland/images/mail-closed.png differ
diff --git a/public/templates/decentraland/images/reply.png b/public/templates/decentraland/images/reply.png
new file mode 100644
index 000000000..45f735e2c
Binary files /dev/null and b/public/templates/decentraland/images/reply.png differ
diff --git a/public/templates/decentraland/images/token.png b/public/templates/decentraland/images/token.png
new file mode 100644
index 000000000..34c6694e5
Binary files /dev/null and b/public/templates/decentraland/images/token.png differ
diff --git a/public/templates/decentraland/images/tweet.png b/public/templates/decentraland/images/tweet.png
new file mode 100644
index 000000000..a944e08a2
Binary files /dev/null and b/public/templates/decentraland/images/tweet.png differ
diff --git a/public/templates/decentraland/images/vote-icon-black.png b/public/templates/decentraland/images/vote-icon-black.png
new file mode 100644
index 000000000..2d1308147
Binary files /dev/null and b/public/templates/decentraland/images/vote-icon-black.png differ
diff --git a/public/templates/decentraland/images/vote.png b/public/templates/decentraland/images/vote.png
new file mode 100644
index 000000000..0210a1bdf
Binary files /dev/null and b/public/templates/decentraland/images/vote.png differ
diff --git a/public/templates/earth/earth.css b/public/templates/earth/earth.css
index 90a00a56c..721523077 100755
--- a/public/templates/earth/earth.css
+++ b/public/templates/earth/earth.css
@@ -6280,6 +6280,7 @@ blockquote {
.token-wrap {
display: inline-block;
margin-right: 10px;
+ margin-top: 5px;
float: left;
}
diff --git a/public/templates/sovereign/extra.css b/public/templates/sovereign/extra.css
index 3bd77ed81..e1d2a85f7 100644
--- a/public/templates/sovereign/extra.css
+++ b/public/templates/sovereign/extra.css
@@ -132,26 +132,6 @@ body {
}
}
-.checkmark_stem {
- width: 10%;
- height: 83%;
- background-color: #6c5b7c;
- transform: rotate(37deg);
- margin: auto;
- margin-top: -84%;
- margin-left: 56%;
-}
-
-.checkmark_kick {
- width: 12%;
- height: 41%;
- background-color: #6c5b7c;
- transform: rotate(129deg);
- margin-top: 47%;
- margin-bottom: 0%;
- margin-left: 16%;
-}
-
html {
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
@@ -285,3 +265,494 @@ body, h4, h1, h2 {
font-size: 16px;
text-align: center;
}
+
+.toggle-label {
+ float: left;
+ text-transform: none;
+ font-size: 14px;
+}
+
+.toggle-button {
+ width: 26px;
+ height: 26px;
+ margin: 2px;
+ border-radius: 100px;
+ background-color: #fff;
+ transition: all 200ms ease;
+}
+
+.toggle-button.toggle-button-active {
+ margin-left: 32px;
+}
+
+.toggle-setting {
+ clear: both;
+ display: inline-block;
+ width: 100%;
+ border-radius: 5px;
+ margin: -5px 0px 0px;
+ padding: 10px 10px;
+ background: #e4e4e4;
+}
+
+.toggle {
+ width: 60px;
+ height: 30px;
+ float: right;
+ border-radius: 100px;
+ background-color: #ccc;
+ cursor: pointer;
+}
+
+.toggles {
+ margin-bottom:10px;
+ line-height:27px;
+}
+
+ .login-advanced {
+ margin-bottom:20px;
+ }
+
+ .login-advanced-link {
+ border: solid #ff617e;
+ border-width: 0 2px 2px 0;
+ display: inline-block;
+ padding: 3px;
+ margin-left: 8px;
+ margin-bottom: 2px;
+ }
+
+ .login-advanced-link.login-advanced-link-up {
+ transform: rotate(-135deg);
+ -webkit-transform: rotate(-135deg);
+ margin-bottom: -2px;
+ z-index:-1;
+ }
+
+ .login-advanced-link.login-advanced-link-down {
+ transform: rotate(45deg);
+ -webkit-transform: rotate(45deg);
+ z-index:-1;
+ }
+
+.help-tooltip {
+ position:absolute;
+ font-size:11px;
+ color:#a57213;
+ background-color:#feda96;
+ line-height:16px;
+ max-width:200px;
+ text-align:left;
+ padding:7px;
+ border-radius:3px;
+ z-index:1;
+ box-shadow:4px 4px 15px #0000003d;
+}
+
+.hero-cta-input {
+-webkit-appearance: none;
+}
+
+.poll {
+ display: inline-block;
+ width: 100%;
+ margin-top:5px;
+}
+
+.poll-choice {
+ padding: 5px;
+ float: left;
+ /* display: inline-block; */
+ width: 50%;
+}
+
+@media (max-width: 767px) {
+
+ .poll-choice {
+ padding: 5px;
+ clear:both;
+ /* display: inline-block; */
+ width: 100%;
+ }
+
+}
+
+.choice {
+ width: 100%;
+ /* box-shadow: 0px 3px 6px 0px #88888826; */
+ float: left;
+ line-height: 32px;
+ /* margin-bottom: -17px; */
+ margin: 0px;
+ text-transform: none;
+ color: #000;
+ background: #ffffff;
+ text-align: left;
+ font-size: 12px;
+ /* padding: 7px; */
+ /* text-transform: none; */
+ border-radius: 5px;
+ border: 1px solid #ede9f3;
+ border-top: 1px solid #f1edf7;
+ border-left: 1px solid #f1edf7;
+ padding: 5px 10px 9px;
+ transition: all 200ms ease;
+}
+
+.choice:hover {
+ background: #fcf9ff;
+ /* border: 1px solid #5d0077; */
+ margin: -2px 0px 2px 0px;
+ box-shadow: 0px 3px 6px 0px #88888847;
+ border: 1px solid #f8f3ff;
+ border-top: 1px solid #faf8fd;
+ border-left: 1px solid #faf8fd;
+}
+
+.choice:active {
+ background: #fcf9ff;
+ /* border: 1px solid #5d0077; */
+ margin: 0px 0px 0px 0px;
+ box-shadow: 0px 0px 0px 0px #88888847;
+ border: 1px solid #ede9f3;
+ border-top: 1px solid #f1edf7;
+ border-left: 1px solid #f1edf7;
+
+}
+
+.poll-score-bar {
+ background: #fff;
+ margin: 8px 0px 0px;
+ height: 16px;
+ border: 1px solid #e8e8e8d9;
+ float: left;
+ width: 100%;
+ border-radius: 10px;
+ overflow: hidden;
+}
+
+.poll-score-bar-fill {
+ width: 1%;
+ height: 20px;
+ background: #00c190;
+ transition: all 200ms ease;
+}
+
+.section-poll {
+ margin:0 -10px;
+}
+
+.micro-button.micro-button-feed.no-underline.micro-button-poll {
+ float: right;
+ margin: 1px -3px;
+ padding: 0px;
+ height: 25px;
+}
+
+.login-label-subtitle {
+ margin-bottom: 15px;
+}
+
+.toggle-disabled {
+ opacity: 0.3;
+ cursor: default;
+}
+
+.checkbox-mini {
+width: 20px;
+ height: 20px;
+ margin-top: 6px;
+ margin-right: 7px;
+ margin-left: 2px;
+ padding: 2px;
+ float: left;
+ border: 1px solid #ebe4f3;
+ border-radius: 25px;
+ background-color: #fff;
+}
+
+.check-mini-selected-box {
+ background: #00c190;
+ border: 1px solid #00c190;
+}
+
+.check-mini-unselected-box {
+ background: #fff;
+}
+
+
+.checkmark_kick.check-mini-selected-mark,
+.checkmark_stem.check-mini-selected-mark,
+.checkmark_kick.check-mini-unselected-mark,
+.checkmark_stem.check-mini-unselected-mark {
+ background: #fff;
+}
+
+
+.checkmark_kick {
+ width: 1px;
+ height: 5px;
+ background-color: #00c190;
+ transform: rotate(129deg);
+ margin-top: 7px;
+ margin-bottom: 0px;
+ margin-left: 3px;
+}
+
+.checkmark_stem {
+width: 1px;
+ height: 11px;
+ background-color: #00c190;
+ transform: rotate(34deg);
+ margin: auto;
+ margin-top: -11px;
+ margin-left: 8px;
+}
+
+.poll-score-percentage {
+ color: #fff;
+ float: right;
+ position: absolute;
+ font-size: 9px;
+ text-shadow:#00000059 1px 1px 0px;
+ margin: 0px 7px;
+}
+
+.poll-score-percentage.poll-score-small {
+ color:#5a5a5a;
+}
+
+.checkbox-mini.check-mini-selected-box:hover {
+ margin:5px 7px 1px 2px;
+ border: 1px solid #00c190;
+ box-shadow: 0px 1px 5px #00000040;
+}
+
+.token-ticker {
+ min-width: 35px;
+ padding: 3px;
+ float: left;
+ border: 1px solid #9696c1;
+ /* border-top-left-radius: 5px; */
+ /* border-bottom-left-radius: 5px; */
+ background-color: #9695c3;
+ border-radius: 5px;
+ margin-right: 3px;
+ font-size: 10px;
+ line-height: 10px;
+ font-weight: 400;
+ text-align: center;
+}
+
+.token-balance {
+ display: inline;
+ min-width: 35px;
+ padding: 3px 5px;
+ float: left;
+ border: 1px solid #9696c1;
+ /* border-top-right-radius: 5px; */
+ /* border-bottom-right-radius: 5px; */
+ border-radius: 5px;
+ font-size: 10px;
+ line-height: 10px;
+ font-weight: 400;
+ text-align: right;
+ text-transform: uppercase;
+}
+
+.checkbox-mini.checkbox-mini-remove {
+ background-color: #ff617e;
+ position: absolute;
+ border-color: #ff617e;
+ opacity:0;
+}
+
+.checkmark_kick.checkmark-kick-remove {
+width: 1px;
+ height: 10px;
+ background-color: #fff;
+ transform: rotate(135deg);
+ margin-top: 2px;
+ margin-bottom: 0px;
+ margin-left: 6px;
+}
+
+.checkmark_stem.checkmark-stem-remove {
+ width: 1px;
+ height: 10px;
+ background-color: #fff;
+ transform: rotate(45deg);
+ margin: auto;
+ margin-top: -10px;
+ margin-left: 6px;
+}
+
+.checkbox-mini.checkbox-mini-remove:hover {
+ opacity:1;
+}
+
+.vote.vote-search.vote-feed.nondraggable.vote-poll:active {
+ margin-top: -4px;
+ margin-bottom: 25px;
+ box-shadow: 0 10px 20px 0 rgba(0, 0, 0, .1);
+ color: #0d0d17;
+}
+
+.stage.stage-vote.stage-loosing {
+ border-color: #e6e6e6;
+ padding: 0px;
+ background-color: transparent;
+ background-color: #e6e6e6;
+ width: 0px;
+ height: 0px;
+ min-width: 0px;
+ overflow: hidden;
+}
+
+.button.login-button.button-half.button-half-disabled {
+ opacity:0.2;
+}
+
+.election-rule {
+ background: transparent;
+ color: #5a0074;
+ font-size: 11px;
+ display: inline-block;
+ padding: 0px;
+ border-radius: 0px;
+ line-height: 27px;
+ margin: 15px 5px 0px 0px;
+ cursor: default;
+ border-bottom: 1px dashed #5a0074;
+};
+
+.budget {
+ margin-top:15px;
+}
+
+.token-wrap-next {
+ margin-top:20px;
+}
+
+.poll-score {
+ margin-bottom: 60px;
+}
+
+.poll-score-button {
+ margin-bottom: 0px;
+}
+
+.editor-button {
+ font-size: 11px;
+ line-height: 27px;
+}
+
+.switch-button {
+ color: #5a0075;
+ float: left;
+ font-size: 11px;
+ margin: 3px;
+ border: 1px solid #5a0075;
+ border-radius: 5px;
+ padding: 5px 10px;
+ cursor: pointer;
+}
+
+.switch-button.switch-button-selected,
+.switch-button.switch-button-selected:hover {
+ background-color: #5a0075;
+ color: white;
+}
+
+.switch-button.switch-button-disabled,
+.switch-button.switch-button-disabled:hover {
+ background-color:transparent;
+ color: grey;
+ border-color:grey;
+ cursor:default;
+}
+
+
+.switch-button:hover {
+ background-color:#5a00750f;
+}
+
+.switcher {
+ margin: -5px -3px 10px;
+ clear: both;
+ display: inline-block;
+}
+
+.toggles.toggles-untitled {
+ margin: 5px 0px 5px;
+}
+
+.blockchain-time {
+ background: #e4e4e4;
+ text-transform: none;
+ padding: 5px 10px;
+ line-height: 20px;
+ font-size: 10px;
+ border-radius: 5px;
+ margin: -5px 0px;
+}
+
+.editor-menu {
+ margin: 0px -16px 10px;
+ background: #ffffff;
+ display: inline-block;
+ padding: 5px 5px;
+ box-shadow: 0px 1px 0px 0px #d4d4d459;
+ border-radius: 0px;
+ width: 110%;
+}
+
+.countdown {
+ clear: both;
+ margin: 15px 0px 5px;
+}
+
+.countdown-label {
+ font-size: 10px;
+ color: #7d849f;
+}
+
+.countdown-timer {
+ height: 1px;
+ background: #01c190;
+ box-shadow: 0px 0px 5px #cccccc;
+}
+
+.countdown-timer.countdown-timer-alert {
+ background: #feda96;
+}
+
+.countdown-timer.countdown-timer-final {
+ background: #ff617e;
+}
+
+.help {
+ display: block;
+ margin-top: 8px;
+ margin-left: 7px;
+ /* padding-right: 5px; */
+ /* padding-left: 5px; */
+ padding: 0px 3px;
+ float: right;
+ border: 1px solid #ff617e;
+ border-radius: 100px;
+ background-color: #ff617e;
+ color: #fff;
+ font-size: 9px;
+ line-height: 11px;
+ font-weight: 400;
+ cursor: default;
+}
+
+.card {
+ box-shadow: -1px 5px 10px 0px rgba(0, 0, 0, .2);
+}
+
+.token-wrap.token-wrap-multi {
+ margin-bottom:10px;
+}
diff --git a/public/templates/sovereign/images/calendar-active.png b/public/templates/sovereign/images/calendar-active.png
new file mode 100644
index 000000000..c7d59b807
Binary files /dev/null and b/public/templates/sovereign/images/calendar-active.png differ
diff --git a/public/templates/sovereign/images/calendar-disabled.png b/public/templates/sovereign/images/calendar-disabled.png
new file mode 100644
index 000000000..60bc0f09c
Binary files /dev/null and b/public/templates/sovereign/images/calendar-disabled.png differ
diff --git a/public/templates/sovereign/images/calendar-enabled.png b/public/templates/sovereign/images/calendar-enabled.png
new file mode 100644
index 000000000..a531ef1fb
Binary files /dev/null and b/public/templates/sovereign/images/calendar-enabled.png differ
diff --git a/public/templates/sovereign/images/electorate-check-active.png b/public/templates/sovereign/images/electorate-check-active.png
new file mode 100644
index 000000000..ca500ce05
Binary files /dev/null and b/public/templates/sovereign/images/electorate-check-active.png differ
diff --git a/public/templates/sovereign/images/electorate-check-editor.png b/public/templates/sovereign/images/electorate-check-editor.png
new file mode 100644
index 000000000..886ecbc30
Binary files /dev/null and b/public/templates/sovereign/images/electorate-check-editor.png differ
diff --git a/public/templates/sovereign/images/electorate-check-enabled.png b/public/templates/sovereign/images/electorate-check-enabled.png
new file mode 100644
index 000000000..f63b2588a
Binary files /dev/null and b/public/templates/sovereign/images/electorate-check-enabled.png differ
diff --git a/public/templates/sovereign/images/electorate-check-reject-active.png b/public/templates/sovereign/images/electorate-check-reject-active.png
new file mode 100644
index 000000000..f5de1e681
Binary files /dev/null and b/public/templates/sovereign/images/electorate-check-reject-active.png differ
diff --git a/public/templates/sovereign/images/electorate-check-reject-enabled.png b/public/templates/sovereign/images/electorate-check-reject-enabled.png
new file mode 100644
index 000000000..e9bdf44d5
Binary files /dev/null and b/public/templates/sovereign/images/electorate-check-reject-enabled.png differ
diff --git a/public/templates/sovereign/images/vote-active.png b/public/templates/sovereign/images/vote-active.png
new file mode 100644
index 000000000..2e450776f
Binary files /dev/null and b/public/templates/sovereign/images/vote-active.png differ
diff --git a/public/templates/sovereign/images/vote-disabled.png b/public/templates/sovereign/images/vote-disabled.png
new file mode 100644
index 000000000..759698877
Binary files /dev/null and b/public/templates/sovereign/images/vote-disabled.png differ
diff --git a/public/templates/sovereign/images/vote-enabled.png b/public/templates/sovereign/images/vote-enabled.png
new file mode 100644
index 000000000..ace76c246
Binary files /dev/null and b/public/templates/sovereign/images/vote-enabled.png differ
diff --git a/public/templates/sovereign/sovereign.css b/public/templates/sovereign/sovereign.css
index 2a3b1225f..ddc7da326 100755
--- a/public/templates/sovereign/sovereign.css
+++ b/public/templates/sovereign/sovereign.css
@@ -922,14 +922,18 @@ blockquote {
}
.button.login-button.button-secondary:hover {
- padding-top: 10px;
- padding-bottom: 10px;
- border-style: none;
+ border-style: solid;
border-color: #ff617e;
background-color: #ff617e;
color: #fff;
}
+.button.login-button.button-secondary:active {
+ border-style: solid;
+ background-color: transparent;
+ color: #ff617e;
+}
+
.button.login-button.button-half {
width: 100%;
margin-right: 0px;
@@ -1078,9 +1082,18 @@ blockquote {
background-color: #ff617e;
}
+.button.button-cta:active {
+ padding-top: 6px;
+ padding-bottom: 9px;
+ border: 1px solid #580074;
+ background-color: transparent;
+ color: #580074;
+}
+
.button.button-menu {
margin-right: -5px;
margin-left: -5px;
+ border: 1px solid #dedcdc;
background-color: #dedcdc;
color: #4b4b4b;
text-align: left;
@@ -1088,10 +1101,15 @@ blockquote {
}
.button.button-menu:hover {
- background-color: rgba(93, 0, 119, .07);
+ border-color: #e0dbe2;
+ background-color: #e0dbe2;
color: #561072;
}
+.button.button-menu:active {
+ border: 1px solid #ff617e;
+}
+
.button-label {
float: left;
}
@@ -1382,6 +1400,12 @@ blockquote {
color: #0d0d17;
}
+.vote.vote-search.vote-feed:active {
+ margin-top: 0px;
+ margin-bottom: 21px;
+ box-shadow: 0 5px 10px 0 rgba(0, 0, 0, .1);
+}
+
.vote.vote-search.vote-feed.vote-empty {
border-style: none;
border-width: 1px;
@@ -1444,6 +1468,10 @@ blockquote {
margin-bottom: 25px;
}
+.vote.vote-search.vote-feed.vote-editor-compressed:active {
+ margin-bottom: 21px;
+}
+
.vote.vote-placeholder {
width: 50%;
height: 70px;
@@ -4077,15 +4105,25 @@ blockquote {
}
.navbar-button.navbar-button-active.navbar-button-action {
+ margin-top: 6px;
+ margin-bottom: 6px;
+ border: 1px solid #580074;
font-size: 16px;
line-height: 18px;
cursor: pointer;
}
.navbar-button.navbar-button-active.navbar-button-action:hover {
+ border-color: #ff617e;
background-color: #ff617e;
}
+.navbar-button.navbar-button-active.navbar-button-action:active {
+ border: 1px solid #580074;
+ background-color: hsla(283.6363636363637, 75.57%, 25.69%, 0.10);
+ color: #580074;
+}
+
.navbar-button.navbar-button-active.navbar-button-action.navbar-button-action-disabled {
border: 1px solid #aaa;
background-color: transparent;
@@ -4773,7 +4811,7 @@ blockquote {
}
.collective.collective-selected {
- border-color: hsla(286.6666666666667, 100.00%, 22.94%, 1.00);
+ border-color: hsla(283.6363636363637, 75.57%, 25.69%, 1.00);
background-color: #e6e0ee;
}
@@ -6364,7 +6402,7 @@ blockquote {
}
.login-button-last {
- margin-bottom: 20px;
+ margin-bottom: 10px;
}
.hero {
@@ -6615,6 +6653,23 @@ blockquote {
margin-top: 2px;
}
+.help {
+ display: block;
+ margin-top: 6px;
+ margin-left: 7px;
+ padding-right: 5px;
+ padding-left: 5px;
+ float: right;
+ border: 1px solid #ff617e;
+ border-radius: 100px;
+ background-color: #ff617e;
+ color: #fff;
+ font-size: 10px;
+ line-height: 15px;
+ font-weight: 400;
+ cursor: default;
+}
+
@media (max-width: 991px) {
.contract {
margin-right: 15px;
diff --git a/public/templates/sovereign/sovereign.json b/public/templates/sovereign/sovereign.json
index 7505d6267..11b940d23 100644
--- a/public/templates/sovereign/sovereign.json
+++ b/public/templates/sovereign/sovereign.json
@@ -52,7 +52,17 @@
"mail-closed": "/templates/sovereign/images/mail-closed.png",
"mail-closed-login-button": "/templates/sovereign/images/mail-closed-login-button.png",
"lock": "/templates/sovereign/images/lock.png",
- "id-card": "/templates/sovereign/images/id-card.png"
+ "id-card": "/templates/sovereign/images/id-card.png",
+ "calendar-enabled": "/templates/sovereign/images/calendar-enabled.png",
+ "calendar-active": "/templates/sovereign/images/calendar-active.png",
+ "calendar-disabled": "/templates/sovereign/images/calendar-disabled.png",
+ "vote-enabled": "/templates/sovereign/images/vote-enabled.png",
+ "vote-active": "/templates/sovereign/images/vote-active.png",
+ "vote-disabled": "/templates/sovereign/images/vote-disabled.png",
+ "electorate-check-active": "/templates/sovereign/images/electorate-check-active.png",
+ "electorate-check-editor": "/templates/sovereign/images/electorate-check-editor.png",
+ "electorate-check-enabled": "/templates/sovereign/images/electorate-check-enabled.png",
+ "electorate-check-reject-active": "/templates/sovereign/images/electorate-check-reject-active.png",
+ "electorate-check-reject-enabled": "/templates/sovereign/images/electorate-check-reject-enabled.png"
}
-
}
{{_ 'edit-profile'}}
diff --git a/imports/ui/templates/components/identity/login/profile/profile.js b/imports/ui/templates/components/identity/login/profile/profile.js
index 083b8b0c0..0705a80d5 100644
--- a/imports/ui/templates/components/identity/login/profile/profile.js
+++ b/imports/ui/templates/components/identity/login/profile/profile.js
@@ -51,12 +51,6 @@ Template.profile.helpers({
totalVotes() {
return `${TAPi18n.__('total-votes')} ${Meteor.user().profile.wallet.balance.toLocaleString()} `;
},
- isMultiTokenUser() {
- if (Meteor.user().profile.wallet.reserves != null) {
- return true;
- }
- return false;
- },
getImage(pic) {
return getImage(Template.instance().imageTemplate.get(), pic);
},
diff --git a/imports/ui/templates/components/identity/login/profile/profileEditor.html b/imports/ui/templates/components/identity/login/profile/profileEditor.html
index fc8130460..1ac05043e 100644
--- a/imports/ui/templates/components/identity/login/profile/profileEditor.html
+++ b/imports/ui/templates/components/identity/login/profile/profileEditor.html
@@ -3,7 +3,7 @@
{{> avatar includeName=true includeNation=true editor=true includeAddress=true}}
'); @@ -353,14 +388,66 @@ Template.feedItem.helpers({ feedContract() { return Template.instance().contract.get(); }, + pollingEnabled() { + return this.rules ? this.rules.pollVoting : false; + }, + quadraticEnabled() { + return this.rules ? this.rules.quadraticVoting : false; + }, + balanceEnabled() { + return this.rules ? this.rules.balanceVoting : false; + }, + pollList() { + return this.poll; + }, + pollId() { + return this._id; + }, + pollTotals() { + const choices = Contracts.find({ pollId: this._id }).fetch(); + let total = new BigNumber(0); + for (let i = 0; i < choices.length; i += 1) { + switch (this.blockchain.coin.code) { + case 'WEB VOTE': + for (let k = 0; k < choices[i].tally.voter.length; k += 1) { + total = total.plus(choices[i].tally.voter[k].votes); + } + break; + default: + if (choices[i].blockchain.score && choices[i].blockchain.score.totalConfirmed) { + total = total.plus(choices[i].blockchain.score.totalConfirmed); + } + } + } + return total.toString(); + }, + rules() { + return this.rules; + }, voters() { let total; - const dbContract = Contracts.findOne({ _id: this._id }); - if (dbContract && dbContract.tally) { - total = dbContract.tally.voter.length; + let list = []; + const contract = Contracts.findOne({ _id: this._id }); + let choice; + + if (contract.poll && contract.poll.length > 0) { + // poll contract + total = 0; + for (let i = 0; i < contract.poll.length; i += 1) { + choice = Contracts.findOne({ _id: contract.poll[i].contractId }); + + if (choice) { + list = list.concat(_.pluck(choice.tally.voter, '_id')); + } + } + total = _.uniq(list).length; + } else if (contract && contract.tally) { + // normal + total = contract.tally.voter.length; } else { total = getTotalVoters(this); } + if (total === 1) { return `${total} ${TAPi18n.__('voter').toLowerCase()}`; } else if (total === 0) { @@ -419,6 +506,25 @@ Template.feedItem.helpers({ getImage(pic) { return getImage(Template.instance().imageTemplate.get(), pic); }, + pollContent() { + return this.pollId; + }, + pollStyle() { + if (this.poll && this.poll.length > 0) { + return 'vote-poll'; + } + return ''; + }, + requiresClosing() { + return ((this.rules.alwaysOn === false) || this.rules.pollVoting); + }, + closingData() { + const closing = this.closing; + if (closing) { + closing.alwaysOn = this.rules.alwaysOn; + } + return closing; + }, }); Template.feedItem.events({ diff --git a/imports/ui/templates/widgets/feed/paginator.js b/imports/ui/templates/widgets/feed/paginator.js index 1a54ab138..d91a307e3 100644 --- a/imports/ui/templates/widgets/feed/paginator.js +++ b/imports/ui/templates/widgets/feed/paginator.js @@ -60,7 +60,6 @@ Template.paginator.onRendered(function () { Template.paginator.helpers({ end() { - console.log(`end why? skip: ${this.options.skip} + limit: ${this.options.limit} < count: ${this.count}`); return !((this.options.skip + this.options.limit) < this.count); }, empty() { diff --git a/imports/ui/templates/widgets/help/help.html b/imports/ui/templates/widgets/help/help.html new file mode 100644 index 000000000..8634a3b12 --- /dev/null +++ b/imports/ui/templates/widgets/help/help.html @@ -0,0 +1,10 @@ + +
+ ?
+
+ {{#if showTooltip}}
+
+ {{{_ tooltip}}}
+
+ {{/if}}
+
\ No newline at end of file
diff --git a/imports/ui/templates/widgets/help/help.js b/imports/ui/templates/widgets/help/help.js
new file mode 100644
index 000000000..e2a244b25
--- /dev/null
+++ b/imports/ui/templates/widgets/help/help.js
@@ -0,0 +1,23 @@
+import { Template } from 'meteor/templating';
+import { ReactiveVar } from 'meteor/reactive-var';
+
+import '/imports/ui/templates/widgets/help/help.html';
+
+Template.help.onCreated(function () {
+ Template.instance().showTooltip = new ReactiveVar(false);
+});
+
+Template.help.helpers({
+ showTooltip() {
+ return Template.instance().showTooltip.get();
+ },
+});
+
+Template.help.events({
+ 'mouseenter .help'() {
+ Template.instance().showTooltip.set(true);
+ },
+ 'mouseleave .help'() {
+ Template.instance().showTooltip.set(false);
+ },
+});
diff --git a/imports/ui/templates/widgets/setting/setting.html b/imports/ui/templates/widgets/setting/setting.html
new file mode 100644
index 000000000..c2cce6304
--- /dev/null
+++ b/imports/ui/templates/widgets/setting/setting.html
@@ -0,0 +1,13 @@
+
+ {{#if toggle}}
+
+
+ {{/if}}
+
\ No newline at end of file
diff --git a/imports/ui/templates/widgets/setting/setting.js b/imports/ui/templates/widgets/setting/setting.js
new file mode 100644
index 000000000..778b0d43a
--- /dev/null
+++ b/imports/ui/templates/widgets/setting/setting.js
@@ -0,0 +1,4 @@
+import '/imports/ui/templates/widgets/help/help.js';
+import '/imports/ui/templates/widgets/toggle/toggle.js';
+import '/imports/ui/templates/widgets/setting/setting.html';
+import '/imports/ui/templates/widgets/help/help.html';
diff --git a/imports/ui/templates/widgets/switcher/switcher.html b/imports/ui/templates/widgets/switcher/switcher.html
new file mode 100644
index 000000000..29bade7d8
--- /dev/null
+++ b/imports/ui/templates/widgets/switcher/switcher.html
@@ -0,0 +1,13 @@
+
+
+ {{_ label}}
+ {{> help tooltip=tooltip}}
+
+
+ {{> toggle sessionContract=sessionContract rules=rules value=value enabled=enabled}}
+
+
+ {{#each option}}
+ {{> switch this}}
+ {{/each}}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/imports/ui/templates/widgets/switcher/switcher.js b/imports/ui/templates/widgets/switcher/switcher.js
new file mode 100644
index 000000000..1046b431d
--- /dev/null
+++ b/imports/ui/templates/widgets/switcher/switcher.js
@@ -0,0 +1,44 @@
+import { Session } from 'meteor/session';
+import { Template } from 'meteor/templating';
+
+import '/imports/ui/templates/widgets/switcher/switcher.html';
+
+Template.switcher.onRendered(function () {
+ Session.set('cachedDraft', Session.get('draftContract'));
+});
+
+Template.switcher.helpers({
+ option() {
+ const option = this.option;
+ for (let i = 0; i < option.length; i += 1) {
+ option[i].enabled = this.enabled;
+ }
+ return this.option;
+ },
+ style() {
+ if (!this.enabled) {
+ return 'switcher-disabled';
+ }
+ return '';
+ },
+});
+
+Template.switch.helpers({
+ selected() {
+ if (!this.enabled) {
+ return 'switch-button-disabled';
+ }
+ if (this.value) {
+ return 'switch-button-selected';
+ }
+ return '';
+ },
+});
+
+Template.switcher.events({
+ 'click #switch-button'() {
+ if (this.enabled) {
+ this.action();
+ }
+ },
+});
diff --git a/imports/ui/templates/widgets/tally/tally.js b/imports/ui/templates/widgets/tally/tally.js
index 18bf1f5e2..87bc87a45 100644
--- a/imports/ui/templates/widgets/tally/tally.js
+++ b/imports/ui/templates/widgets/tally/tally.js
@@ -95,14 +95,20 @@ const _buildFeed = (id, fields, instance, contract, noTitle) => {
if (userSubscriptionId) {
getUser(userSubscriptionId);
}
+ let skipPending = false;
+ if (fields.kind === 'VOTE' && fields.status === 'PENDING') {
+ skipPending = true;
+ }
const voteContract = _voteToContract(post, contract, noTitle, _isWinningVote(instance.data.winningBallot, post.condition.ballot), instance.openFeed);
- if (!currentFeed) {
- instance.feed.set([voteContract]);
- } else if (!here(voteContract, currentFeed)) {
- currentFeed.push(voteContract);
- instance.feed.set(_.uniq(currentFeed));
+ if (!skipPending) {
+ if (!currentFeed) {
+ instance.feed.set([voteContract]);
+ } else if (!here(voteContract, currentFeed)) {
+ currentFeed.push(voteContract);
+ instance.feed.set(_.uniq(currentFeed));
+ }
}
};
diff --git a/imports/ui/templates/widgets/toggle/toggle.html b/imports/ui/templates/widgets/toggle/toggle.html
index c666c7c59..74b387459 100644
--- a/imports/ui/templates/widgets/toggle/toggle.html
+++ b/imports/ui/templates/widgets/toggle/toggle.html
@@ -1,9 +1,13 @@
-
-
- {{#if value}}
-
- {{else}}
+
+
diff --git a/imports/ui/templates/widgets/toggle/toggle.js b/imports/ui/templates/widgets/toggle/toggle.js
index 04efae0b0..cd64edd8f 100644
--- a/imports/ui/templates/widgets/toggle/toggle.js
+++ b/imports/ui/templates/widgets/toggle/toggle.js
@@ -65,40 +65,26 @@ Template.toggle.onRendered(() => {
Session.set('clickedToggle', this.setting);
});
-Template.toggle.onCreated(() => {
- if (!Session.get('contract')) {
- Template.instance().contract = new ReactiveVar(Template.currentData().contract);
- } else {
- Template.instance().contract = new ReactiveVar(Contracts.findOne({ _id: Session.get('contract')._id }));
- }
-
- Template.instance().rightToVote = new ReactiveVar(getRightToVote(Template.instance().contract.get()));
-});
-
Template.toggle.helpers({
value() {
- if (this.setting === Session.get('clickedToggle')) {
- const node = $(`.${this.setting}`).children();
- toggle(node, this.value, false);
- } else if (toggleMap[this.setting] === undefined) {
- toggleMap[this.setting] = this.value;
- }
+ return this.value;
},
- setting() {
- toggleMap[this.setting] = this.value;
- displayToggle();
- return this.setting;
+ enabledStyle() {
+ if (!this.enabled) {
+ return 'toggle-disabled';
+ }
+ return '';
},
});
Template.toggle.events({
'click #toggleButton'() {
- if (!Template.instance().rightToVote.get() || Template.instance().contract.get().stage === 'DRAFT') {
- Session.set('clickedToggle', this.setting);
- toggle($(`.${this.setting}`).children(), !this.value, true);
- const obj = {};
- obj[this.setting] = !this.value;
- Contracts.update(Template.instance().contract.get()._id, { $set: obj });
+ if (this.enabled) {
+ const session = Template.currentData().sessionContract;
+ const contract = Session.get(session);
+ const currentValue = contract.rules[Template.currentData().rules];
+ contract.rules[Template.currentData().rules] = !currentValue;
+ Session.set(session, contract);
}
},
});
diff --git a/lib/const.js b/lib/const.js
index 056c02f08..3daf415ad 100644
--- a/lib/const.js
+++ b/lib/const.js
@@ -32,6 +32,18 @@ const _rules = {
VOTES_INITIAL_QUANTITY: 1000, // initial votes for genesis transaction event
};
+/**
+* @summary default blocktimes
+*/
+const _blocktimes = {
+ ETHEREUM_DAY: 5800,
+ ETHEREUM_WEEK: 40600,
+ ETHEREUM_MONTH: 174000,
+ ETHEREUM_QUARTER: 522000,
+ ETHEREUM_YEAR: 2117000,
+ ETHEREUM_SECONDS_PER_BLOCK: 15,
+};
+
/**
* @summary settings applied to transactions and delegations
*/
@@ -65,7 +77,7 @@ const _gui = {
SIDEBAR_WIDTH_MAX: 260, // max width of sidebar for desktop
DESKTOP_MIN_WIDTH: 992, // min width of desktop view in pixels (connected to CSS)
MOBILE_MAX_WIDTH: 768, // max width of mobile screens
- ITEMS_PER_PAGE: 25, // max items on lazy load
+ ITEMS_PER_PAGE: 75, // max items on lazy load
ITEMS_IN_LANDING: 4, // max items on lazy load for landing navigation
};
@@ -100,3 +112,4 @@ export const rules = _rules;
export const defaultSettings = _defaultSettings;
export const gui = _gui;
export const timers = _timers;
+export const blocktimes = _blocktimes;
diff --git a/lib/token.js b/lib/token.js
index 1c92da132..ac8f09a84 100644
--- a/lib/token.js
+++ b/lib/token.js
@@ -279,95 +279,6 @@ const _tokenRinkeby = {
contractAddress: '0x3f17dd476faf0a4855572f0b6ed5115d9bba22ad',
defaultVote: '1',
},
- {
- code: 'STX',
- emoji: '',
- format: '0,0.00a',
- unicode: '',
- name: 'Blockstack',
- decimals: 6,
- supply: 1320000000,
- maxSupply: 1320000000,
- title: 'Decentralized applications.',
- color: 'rgb(236, 22, 97)',
- type: 'ERC20',
- blockchain: 'BLOCKSTACK',
- contractAddress: '0xb8549998430fa7772dbb87c7b4a05892a1231dd8',
- defaultVote: '0.1',
- },
- /*
- {
- code: 'BTC',
- subcode: 'SATOSHI',
- format: '0,0.0000',
- emoji: '',
- unicode: '',
- name: 'Bitcoin',
- decimals: 8,
- maxSupply: 21000000,
- supply: 17223338,
- inflationary: false,
- title: 'Bitcoin blockchain.',
- color: '#f7931a',
- type: 'NATIVE',
- blockchain: 'BITCOIN',
- contractAddress: '0xb8549998430fa7772dbb87c7b4a05892a1231dd8',
- defaultVote: '0.0001',
- },
- {
- code: 'BCH',
- format: '0,0.00000',
- emoji: '',
- unicode: '',
- name: 'Bitcoin Cash',
- decimals: 8,
- maxSupply: 21000000,
- supply: 17294240,
- inflationary: false,
- title: 'Bitcoin blockchain fork: Bitcoin Cash.',
- color: '#4ac846',
- type: 'NATIVE',
- blockchain: 'BITCOIN CASH',
- contractAddress: '0xb8549998430fa7772dbb87c7b4a05892a1231dd8',
- defaultVote: '0.00001',
- },
- {
- code: 'EOS',
- format: '0,0.000a',
- emoji: '',
- unicode: '',
- decimals: 18,
- name: 'EOS',
- maxSupply: 1006245120,
- inflationary: true,
- title: 'EOS Delegated Proof of Stake blockchain.',
- color: '#000',
- type: 'NATIVE',
- blockchain: 'EOS',
- contractAddress: '0xb8549998430fa7772dbb87c7b4a05892a1231dd8',
- defaultVote: '0.001',
- },
- {
- code: 'ETC',
- format: '0,0.000a',
- emoji: '',
- unicode: '',
- decimals: 18,
- maxSupply: 103979903,
- supply: 103979903,
- inflationary: true,
- name: 'Ethereum Classic',
- title: 'Original Ethereum blockchain.',
- color: '#3ab83a',
- type: 'NATIVE',
- blockchain: 'ETHEREUM CLASSIC',
- contractAddress: '0xb8549998430fa7772dbb87c7b4a05892a1231dd8',
- defaultVote: '0.001',
- },
- */
- /**
- @NOTE: removing non ethereum tokens, these will be supported in future versions, not now.
- */
],
};
@@ -388,13 +299,17 @@ const _tokenMainnet = {
blockchain: 'ETHEREUM',
contractAddress: '0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359',
defaultVote: '0.1',
+ editor: {
+ allowBalanceToggle: true,
+ allowBlockchainAddress: true,
+ },
},
{
code: 'HOUR',
format: '0,0',
emoji: '',
unicode: '',
- name: 'Democracy Earth Hours',
+ name: 'Democracy Earth Hour UBI',
maxSupply: 500000000,
supply: 2500000,
decimals: 18,
@@ -405,6 +320,11 @@ const _tokenMainnet = {
blockchain: 'ETHEREUM',
contractAddress: '0x00319f722bd546182cb2c701ca254146d3f084fc',
defaultVote: '1',
+ editor: {
+ allowQuadraticToggle: true,
+ allowBalanceToggle: true,
+ allowBlockchainAddress: true,
+ },
},
{
code: 'VOTE',
@@ -422,6 +342,10 @@ const _tokenMainnet = {
blockchain: 'ETHEREUM',
contractAddress: '0xf9f8587544471dcf00a48b0d4231ce7ca9b03487',
defaultVote: '1',
+ editor: {
+ allowBalanceToggle: true,
+ allowBlockchainAddress: true,
+ },
},
{
code: 'ETH',
@@ -440,6 +364,10 @@ const _tokenMainnet = {
blockchain: 'ETHEREUM',
contractAddress: '0xb8549998430fa7772dbb87c7b4a05892a1231dd8',
defaultVote: '0.01',
+ editor: {
+ allowBalanceToggle: true,
+ allowBlockchainAddress: true,
+ },
},
{
code: 'MANA',
@@ -456,6 +384,10 @@ const _tokenMainnet = {
blockchain: 'ETHEREUM',
contractAddress: '0x5db1a375e62abf9e569241617479c44d2d07ae6a',
defaultVote: '0.1',
+ editor: {
+ allowBalanceToggle: true,
+ allowBlockchainAddress: true,
+ },
},
{
code: 'MKR',
@@ -472,334 +404,50 @@ const _tokenMainnet = {
blockchain: 'ETHEREUM',
contractAddress: '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2',
defaultVote: '0.01',
+ editor: {
+ allowBalanceToggle: true,
+ allowBlockchainAddress: true,
+ },
},
- {
- code: 'ZEP',
- format: '0,0.00a',
- emoji: '',
- unicode: '',
- supply: 0,
- decimals: 18,
- maxSupply: 100000000,
- name: 'Zeppelin',
- color: '#12e7e1',
- title: 'Smart contract auditing.',
- type: 'ERC20',
- blockchain: 'ETHEREUM',
- contractAddress: '0x5db1a375e62abf9e569241617479c44d2d07ae6a',
- defaultVote: '1',
- },
- {
- code: 'RCN',
- emoji: '',
- format: '0,0.0a',
- unicode: '',
- supply: 999942647,
- decimals: 18,
- maxSupply: 999942647,
- color: '#4647ff',
- name: 'Ripio Credit Network',
- title: 'Peer to peer lending.',
- type: 'ERC20',
- blockchain: 'ETHEREUM',
- contractAddress: '0xb8549998430fa7772dbb87c7b4a05892a1231dd8',
- defaultVote: '0.1',
- },
- {
- code: 'ANT',
- emoji: '',
- format: '0,0.00a',
- unicode: '',
- decimals: 18,
- color: '#00cbe8',
- supply: 39609524,
- maxSupply: 39609524,
- name: 'Aragon',
- title: 'Unstoppable organizations.',
- type: 'ERC20',
- blockchain: 'ETHEREUM',
- contractAddress: '0x5db1a375e62abf9e569241617479c44d2d07ae6a',
- defaultVote: '0.01',
- },
- {
- code: 'REP',
- emoji: '',
- format: '0,0.000a',
- unicode: '',
- decimals: 18,
- maxSupply: 11000000,
- color: '#573182',
- supply: 11000000,
- name: 'Augur',
- title: 'Augur combines the magic of prediction markets with the power of a decentralized network to create a stunningly accurate forecasting tool.',
- type: 'ERC20',
- blockchain: 'ETHEREUM',
- contractAddress: '0xb8549998430fa7772dbb87c7b4a05892a1231dd8',
- defaultVote: '0.001',
- },
- {
- code: 'BNT',
- emoji: '',
- format: '0,0.00a',
- unicode: '',
- color: '#0f2545',
- decimals: 18,
- supply: 50897247,
- maxSupply: 75568405,
- name: 'Bancor',
- title: 'Bancor Protocol is a standard for a new generation of cryptocurrencies called Smart Tokens.',
- type: 'ERC20',
- blockchain: 'ETHEREUM',
- contractAddress: '0xb8549998430fa7772dbb87c7b4a05892a1231dd8',
- defaultVote: '0.01',
- },
- {
- code: 'BNB',
- emoji: '',
- format: '0,0.000a',
- unicode: '',
- decimals: 18,
- color: '#f5bb0e',
- name: 'Binance',
- maxSupply: 194972068,
- supply: 114041290,
- title: 'Binance aims to build a world-class crypto exchange, powering the future of crypto finance.',
- type: 'ERC20',
- blockchain: 'ETHEREUM',
- contractAddress: '0xb8549998430fa7772dbb87c7b4a05892a1231dd8',
- defaultVote: '0.001',
- },
- {
- code: 'GNT',
- format: '0,0.0a',
- emoji: '',
- unicode: '',
- name: 'Golem',
- decimals: 18,
- color: '#002a62',
- supply: 839242000,
- maxSupply: 1000000000,
- title: 'Golem is going to create the first decentralized global market for computing power.',
- type: 'ERC20',
- blockchain: 'ETHEREUM',
- contractAddress: '0xb8549998430fa7772dbb87c7b4a05892a1231dd8',
- defaultVote: '0.1',
- },
- {
- code: 'LOOM',
- format: '0,0.0a',
- emoji: '',
- unicode: '',
- name: 'Loom',
- decimals: 18,
- supply: 604043754,
- color: '#5a4de9',
- maxSupply: 1000000000,
- title: 'Online game & social apps.',
- type: 'ERC20',
- blockchain: 'ETHEREUM',
- contractAddress: '0xb8549998430fa7772dbb87c7b4a05892a1231dd8',
- defaultVote: '0.1',
- },
- {
- code: 'OMG',
- format: '0,0.000a',
- emoji: '',
- unicode: '',
- name: 'OmiseGO',
- supply: 102042552,
- decimals: 18,
- color: '#1f4cf4',
- maxSupply: 140245398,
- title: 'OmiseGO is a public Ethereum-based financial technology for use in mainstream digital wallets.',
- type: 'ERC20',
- blockchain: 'ETHEREUM',
- contractAddress: '0xb8549998430fa7772dbb87c7b4a05892a1231dd8',
- defaultVote: '0.001',
- },
- {
- code: 'PNK',
- format: '0,0a',
- emoji: '',
- unicode: '',
- color: '#292b2c',
- maxSupply: 329626704,
- supply: 329626704,
- decimals: 6,
- name: 'Kleros',
- title: 'Blockchain Dispute Resolution Layer.',
- type: 'ERC20',
- blockchain: 'ETHEREUM',
- contractAddress: '0x93ed3fbe21207ec2e8f2d3c3de6e058cb73bc04d',
- defaultVote: '1',
- },
- {
- code: 'SNT',
- format: '0,0.0a',
- emoji: '',
- unicode: '',
- name: 'Status Network',
- color: '#4a52bb',
- supply: 3470483788,
- decimals: 18,
- maxSupply: 6804870174,
- title: 'Open source messaging and mobile browser for dapps.',
- type: 'ERC20',
- blockchain: 'ETHEREUM',
- contractAddress: '0xb8549998430fa7772dbb87c7b4a05892a1231dd8',
- defaultVote: '0.1',
- },
- {
- code: 'TRX',
- format: '0,0.0a',
- emoji: '',
- unicode: '',
- color: '#d60b20',
- maxSupply: 100000000000,
- supply: 65748111645,
- decimals: 6,
- name: 'TRON',
- title: 'TRON is a blockchain-based decentralized protocol that aims to construct a worldwide free content entertainment system with the blockchain and distributed storage technology.',
- type: 'ERC20',
- blockchain: 'ETHEREUM',
- contractAddress: '0xb8549998430fa7772dbb87c7b4a05892a1231dd8',
- defaultVote: '0.1',
- },
- {
- code: 'WIB',
- format: '0,0a',
- emoji: '',
- unicode: '',
- color: '#4774ff',
- maxSupply: 9000000000,
- supply: 9000000000,
- decimals: 9,
- name: 'Wibson',
- title: 'Decentralized Data Marketplace.',
- type: 'ERC20',
- blockchain: 'ETHEREUM',
- contractAddress: '0x3f17dd476faf0a4855572f0b6ed5115d9bba22ad',
- defaultVote: '1',
- },
- {
- code: 'STX',
- emoji: '',
- format: '0,0.00a',
- unicode: '',
- name: 'Blockstack',
- decimals: 6,
- supply: 1320000000,
- maxSupply: 1320000000,
- title: 'Decentralized applications.',
- color: 'rgb(236, 22, 97)',
- type: 'ERC20',
- blockchain: 'BLOCKSTACK',
- contractAddress: '0xb8549998430fa7772dbb87c7b4a05892a1231dd8',
- defaultVote: '0.1',
- },
- /*
- {
- code: 'BTC',
- subcode: 'SATOSHI',
- format: '0,0.0000',
- emoji: '',
- unicode: '',
- name: 'Bitcoin',
- decimals: 8,
- maxSupply: 21000000,
- supply: 17223338,
- inflationary: false,
- title: 'Bitcoin blockchain.',
- color: '#f7931a',
- type: 'NATIVE',
- blockchain: 'BITCOIN',
- contractAddress: '0xb8549998430fa7772dbb87c7b4a05892a1231dd8',
- defaultVote: '0.0001',
- },
- {
- code: 'BCH',
- format: '0,0.00000',
- emoji: '',
- unicode: '',
- name: 'Bitcoin Cash',
- decimals: 8,
- maxSupply: 21000000,
- supply: 17294240,
- inflationary: false,
- title: 'Bitcoin blockchain fork: Bitcoin Cash.',
- color: '#4ac846',
- type: 'NATIVE',
- blockchain: 'BITCOIN CASH',
- contractAddress: '0xb8549998430fa7772dbb87c7b4a05892a1231dd8',
- defaultVote: '0.00001',
- },
- {
- code: 'EOS',
- format: '0,0.000a',
- emoji: '',
- unicode: '',
- decimals: 18,
- name: 'EOS',
- maxSupply: 1006245120,
- inflationary: true,
- title: 'EOS Delegated Proof of Stake blockchain.',
- color: '#000',
- type: 'NATIVE',
- blockchain: 'EOS',
- contractAddress: '0xb8549998430fa7772dbb87c7b4a05892a1231dd8',
- defaultVote: '0.001',
- },
- {
- code: 'ETC',
- format: '0,0.000a',
- emoji: '',
- unicode: '',
- decimals: 18,
- maxSupply: 103979903,
- supply: 103979903,
- inflationary: true,
- name: 'Ethereum Classic',
- title: 'Original Ethereum blockchain.',
- color: '#3ab83a',
- type: 'NATIVE',
- blockchain: 'ETHEREUM CLASSIC',
- contractAddress: '0xb8549998430fa7772dbb87c7b4a05892a1231dd8',
- defaultVote: '0.001',
- },
- */
- /**
- @NOTE: removing non ethereum tokens, these will be supported in future versions, not now.
- */
],
};
const _tokenWeb = {
coin: [
{
- code: 'Web VOTE',
+ code: 'WEB VOTE',
format: '0,0.00',
emoji: '',
unicode: '',
- name: 'Web-based Votes',
+ name: 'Web based votes',
decimals: 0,
maxSupply: 0,
supply: 0,
subsidy: 1000,
- color: '#00f',
+ color: '#5a0074',
title: 'Web based tokens with no crypto-economic value.',
type: 'WEB',
- blockchain: 'HTTP',
+ blockchain: 'ETHEREUM',
contractAddress: '',
defaultVote: '1',
- quadraticCompatible: true,
+ editor: {
+ allowQuadraticToggle: true,
+ allowBlockchainAddress: false,
+ },
},
],
};
+// evm-compatible token list
if (Meteor.settings.public.web3.config === 'mainnet') {
_token = _tokenMainnet;
} else if (Meteor.settings.public.web3.config === 'testnet') {
_token = _tokenRinkeby;
}
+// web-based tokens
+if (Meteor.settings.public.app.config.allowWebVotes) {
+ _token.coin = _token.coin.concat(_tokenWeb.coin);
+}
+
export const token = _token;
diff --git a/lib/views.js b/lib/views.js
index c4f75e4b8..a5c2ed1d7 100644
--- a/lib/views.js
+++ b/lib/views.js
@@ -66,7 +66,7 @@ const _mapTree = (root) => {
let list = [];
let sublist = [];
list.push(root._id);
- const query = { $or: [{ _id: root._id }, { replyId: root._id }] };
+ const query = { $or: [{ _id: root._id }, { replyId: root._id }, { pollId: root._id }] };
const children = Contracts.find(query).fetch();
for (let i = 0; i < children.length; i += 1) {
list.push(children[i]._id);
@@ -119,7 +119,7 @@ const _getThread = (contract) => {
_views.latest = (terms) => {
log(`{ view: 'latest', user: ${logUser()}, terms: ${JSON.stringify(terms)} }`);
return {
- find: { stage: { $ne: 'DRAFT' }, kind: { $ne: 'DELEGATION' } },
+ find: { stage: { $ne: 'DRAFT' }, kind: { $ne: 'DELEGATION' } }, // , pollId: { $exists: false } },
options: { sort: { createdAt: -1 }, limit: terms.limit, skip: terms.skip },
};
};
@@ -479,6 +479,26 @@ _views.geo = (terms) => {
};
};
+/**
+* @summary contracts that are in a poll
+* @param {object} terms filters and limits
+* @return {object} query to use on collection
+*/
+_views.poll = (terms) => {
+ log(`{ view: 'poll', user: ${logUser()}, pollId: '${terms.pollId}' }`);
+ if (terms.pollId) {
+ return {
+ find: { pollId: terms.pollId },
+ options: { sort: { pollChoiceId: -1 } },
+ };
+ }
+ return {
+ find: {},
+ options: { limit: 1 },
+ };
+};
+
+
/**
* @summary a contract
* @param {object} terms filters and limits
diff --git a/public/.DS_Store b/public/.DS_Store
deleted file mode 100644
index 2a9eb4a9e..000000000
Binary files a/public/.DS_Store and /dev/null differ
diff --git a/public/templates/colorado/extra.css b/public/templates/colorado/extra.css
new file mode 100644
index 000000000..d0f5eeea3
--- /dev/null
+++ b/public/templates/colorado/extra.css
@@ -0,0 +1,643 @@
+.off-screen {
+ opacity:0;
+}
+
+/* Change the white to any color ;) */
+input:-webkit-autofill {
+ -webkit-text-fill-color: #5a0075 !important;
+ -webkit-box-shadow: 0 0 0px 1000px #eaeaea inset;
+}
+input:-webkit-autofill,
+input:-webkit-autofill:hover,
+input:-webkit-autofill:focus,
+input:-webkit-autofill:active {
+ transition: #eaeaea 5000s ease-in-out 0s;
+ -webkit-box-shadow: 0 0 0px 1000px #eaeaea inset;
+}
+
+
+@media (max-width: 767px) {
+ input:-webkit-autofill,
+ input:-webkit-autofill:hover,
+ input:-webkit-autofill:focus,
+ input:-webkit-autofill:active {
+ transition: #442f58 5000s ease-in-out 0s;
+ -webkit-text-fill-color: white !important;
+ -webkit-box-shadow: 0 0 0px 1000px #442f58 inset;
+ }
+}
+
+.content-feed {
+ position: -webkit-sticky;
+}
+
+input[type="file"] {
+ display: none;
+}
+
+.button.button-upload {
+ font-family: Lato, sans-serif;
+ font-size: 14px;
+ line-height: 22px;
+ font-weight: 300;
+}
+
+
+.split.split-left.split-post-landing {
+ padding-top: 0px;
+}
+
+@media (max-width: 991px) {
+ .split.split-left.split-post-landing {
+ margin-top: 70px;
+ }
+
+ .split.split-left {
+ margin-top:70px;
+ }
+
+ .split.split-left.split-desktop {
+ margin-top:0px;
+ }
+
+ .split-post-landing {
+ top:auto;
+ }
+}
+
+
+.login {
+ text-align: center;
+}
+
+.popup {
+ -webkit-transform: translate3d(0, 0, 0);
+ -webkit-backface-visibility: hidden;
+ -webkit-perspective: 1000;
+ -webkit-transform: translateZ(0);
+}
+
+/* override sidebar style with default state while original css has designer-friendly state for development and design */
+.navbar {
+ left: 0px;
+}
+.right {
+ left: 0px;
+}
+
+#content, #modalToggle, .modal { /* .title-input {*/
+ overflow: scroll; /* has to be scroll, not auto */
+ -webkit-overflow-scrolling: touch;
+}
+
+.modal {
+ opacity: 0;
+}
+
+body {
+ overflow-x: hidden;
+ position: relative;
+}
+
+#titleContent {
+ caret-color: black;
+}
+
+.rosca {
+ display: table;
+}
+
+.vote {
+ will-change: transform;
+}
+
+.checkmark {
+ display: inline-block;
+
+ &:after {
+ /*Add another block-level blank space*/
+ content: "";
+ display: block;
+
+ /*Make it a small rectangle so the border will create an L-shape*/
+ width: 3px;
+ height: 6px;
+
+ /*Add a white border on the bottom and left, creating that 'L' */
+ border: solid #000;
+ border-width: 0 2px 2px 0;
+
+ /*Rotate the L 45 degrees to turn it into a checkmark*/
+ transform: rotate(45deg);
+ }
+}
+
+html {
+ -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+.sidebar {
+ overflow: scroll;
+ -webkit-overflow-scrolling: touch;
+}
+
+#content {
+ overflow: hidden;
+ overflow-y: scroll;
+ -webkit-overflow-scrolling: touch;
+}
+
+@media (max-width: 991px) {
+ .content-feed {
+ overflow:hidden;
+ }
+}
+
+textarea, select, input, button, #titleContent { outline: none; }
+
+video {
+ border-radius: 5px;
+}
+
+body, h4, h1, h2 {
+ font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
+}
+
+.split-anon {
+ position:unset;
+}
+
+@media (max-width: 767px) {
+ .card-title {
+ text-decoration: underline;
+ text-decoration-color: #eaeaea;
+ margin-top: 5px;
+ }
+}
+
+.split.split-left.split-landing.split-anon {
+ padding-top:0px;
+ margin-top: 0px;
+}
+
+.hero-secondary {
+ background: linear-gradient(0deg, #f2f2f8 95%, #ebe7ef);
+ padding: 60px 10px 80px 10px;
+ z-index: 1;
+ box-shadow: 0px -3px 10px 0px white;
+ background-color: #f2f2f8;
+ color: white;
+ margin-top: 0px;
+ text-align: center;
+}
+
+.hero-cover {
+ z-index: 1;
+}
+
+.accounts-dialog .login-button {
+ margin: 15px 0px 0px;
+ padding: 12px 14px;
+ border-radius: 6px;
+ background-color: #580074;
+ font-family: Lato, sans-serif;
+ color: #fff;
+ font-size: 14px;
+ font-weight: 500;
+ text-align: center;
+ text-transform: uppercase;
+ cursor: pointer;
+ border: 1px solid #580074;
+ font-size: 14px;
+}
+
+#login-buttons .login-button:hover, .accounts-dialog .login-button:hover {
+ border-style: solid;
+ border-color: #ff617e;
+ background-color: #ff617e;
+ color: #fff;
+}
+
+.accounts-dialog input[type=text][type], .accounts-dialog input[type=email][type], .accounts-dialog input[type=password][type] {
+ width: 100%;
+ height: 44px;
+ margin-bottom: 0px;
+ border-style: none none solid;
+ border-width: 0px 0px 1px;
+ border-color: #000 #000 #c7b7cc;
+ background-color: transparent;
+ box-shadow: none;
+ color: #5a0075;
+ font-size: 16px;
+ font-weight: 300;
+ border-radius:0px;
+ text-align: left;
+ -webkit-text-fill-color: #5a0075 !important;
+}
+
+.accounts-dialog:focus {
+ border-color:#ff617e;
+}
+
+.accounts-dialog label {
+ margin-top: 0px;
+ margin-bottom: 0px;
+ font-size: 11px;
+ line-height: 22px;
+ font-weight: 300;
+ text-transform: uppercase;
+}
+
+.accounts-centered-dialog {
+ display: block;
+ overflow: hidden;
+ max-width: 400px;
+ margin-top: -100px;
+ padding: 18px 12px;
+ border-color: #f3f3f3 #e0e0e0 #e0e0e0 #f3f3f3;
+ border-top-style: solid;
+ border-top-width: 1px;
+ border-left-style: solid;
+ border-left-width: 1px;
+ border-radius: 5px;
+ background-color: #eaeaea;
+ box-shadow: 0 6px 20px 4px rgba(0, 0, 0, .13);
+ font-size: 16px;
+ text-align: center;
+}
+
+.toggle-label {
+ float: left;
+ text-transform: none;
+ font-size: 14px;
+}
+
+.toggle-button {
+ width: 26px;
+ height: 26px;
+ margin: 2px;
+ border-radius: 100px;
+ background-color: #fff;
+ transition: all 200ms ease;
+}
+
+.toggle-button.toggle-button-active {
+ margin-left: 32px;
+}
+
+.toggle-setting {
+ clear: both;
+ display: inline-block;
+ width: 100%;
+ border-radius: 5px;
+ margin: -5px 0px 0px;
+ padding: 10px 10px;
+ background: #e4e4e4;
+}
+
+.toggle {
+ width: 60px;
+ height: 30px;
+ float: right;
+ border-radius: 100px;
+ background-color: #ccc;
+ cursor: pointer;
+}
+
+.toggles {
+ margin-bottom:10px;
+ line-height:27px;
+}
+
+ .login-advanced {
+ margin-bottom:20px;
+ }
+
+ .login-advanced-link {
+ border: solid #ff617e;
+ border-width: 0 2px 2px 0;
+ display: inline-block;
+ padding: 3px;
+ margin-left: 8px;
+ margin-bottom: 2px;
+ }
+
+ .login-advanced-link.login-advanced-link-up {
+ transform: rotate(-135deg);
+ -webkit-transform: rotate(-135deg);
+ margin-bottom: -2px;
+ z-index:-1;
+ }
+
+ .login-advanced-link.login-advanced-link-down {
+ transform: rotate(45deg);
+ -webkit-transform: rotate(45deg);
+ z-index:-1;
+ }
+
+.help-tooltip {
+ position:absolute;
+ font-size:11px;
+ color:#a57213;
+ background-color:#feda96;
+ line-height:16px;
+ max-width:200px;
+ text-align:left;
+ padding:7px;
+ border-radius:3px;
+ z-index:1;
+ box-shadow:4px 4px 15px #0000003d;
+}
+
+.hero-cta-input {
+-webkit-appearance: none;
+}
+
+.poll {
+ display: inline-block;
+ width: 100%;
+ margin-top:5px;
+}
+
+.poll-choice {
+ padding: 5px;
+ float: left;
+ /* display: inline-block; */
+ width: 50%;
+}
+
+@media (max-width: 767px) {
+
+ .poll-choice {
+ padding: 5px;
+ clear:both;
+ /* display: inline-block; */
+ width: 100%;
+ }
+
+}
+
+.choice {
+ width: 100%;
+ box-shadow: 0px 3px 6px 0px #88888826;
+ float: left;
+ line-height: 32px;
+ /* margin-bottom: -17px; */
+ margin: 0px;
+ text-transform: none;
+ color: #000;
+ background: #f0eef2;
+ text-align: left;
+ font-size: 12px;
+ /* padding: 7px; */
+ /* text-transform: none; */
+ border-radius: 5px;
+ border: 1px solid #ede9f3;
+ border-top: 1px solid #f1edf7;
+ border-left: 1px solid #f1edf7;
+ padding: 5px 10px 9px;
+ transition: all 200ms ease;
+}
+
+.choice:hover {
+ background: #fcf9ff;
+ /* border: 1px solid #5d0077; */
+ margin: -2px 0px 2px 0px;
+ box-shadow: 0px 3px 6px 0px #88888847;
+ border: 1px solid #f8f3ff;
+ border-top: 1px solid #faf8fd;
+ border-left: 1px solid #faf8fd;
+}
+
+.choice:active {
+ background: #fcf9ff;
+ /* border: 1px solid #5d0077; */
+ margin: 0px 0px 0px 0px;
+ box-shadow: 0px 0px 0px 0px #88888847;
+ border: 1px solid #ede9f3;
+ border-top: 1px solid #f1edf7;
+ border-left: 1px solid #f1edf7;
+
+}
+
+.poll-score-bar {
+ background: #fff;
+ margin: 8px 0px 0px;
+ height: 16px;
+ border: 1px solid #e8e8e8d9;
+ float: left;
+ width: 100%;
+ border-radius: 10px;
+ overflow: hidden;
+}
+
+.poll-score-bar-fill {
+ width: 1%;
+ height: 20px;
+ background: #00c190;
+ transition: all 200ms ease;
+}
+
+.section-poll {
+ margin:0 -10px;
+}
+
+.micro-button.micro-button-feed.no-underline.micro-button-poll {
+ float: right;
+ margin: 1px -3px;
+ padding: 0px;
+ height: 25px;
+}
+
+.login-label-subtitle {
+ margin-bottom: 15px;
+}
+
+.toggle-disabled {
+ opacity: 0.3;
+ cursor: default;
+}
+
+.checkbox-mini {
+width: 20px;
+ height: 20px;
+ margin-top: 6px;
+ margin-right: 7px;
+ margin-left: 2px;
+ padding: 2px;
+ float: left;
+ border: 1px solid #ebe4f3;
+ border-radius: 25px;
+ background-color: #fff;
+}
+
+.check-mini-selected-box {
+ background: #00c190;
+ border: 1px solid #00c190;
+}
+
+.check-mini-unselected-box {
+ background: #fff;
+}
+
+
+.checkmark_kick.check-mini-selected-mark,
+.checkmark_stem.check-mini-selected-mark,
+.checkmark_kick.check-mini-unselected-mark,
+.checkmark_stem.check-mini-unselected-mark {
+ background: #fff;
+}
+
+
+.checkmark_kick {
+ width: 1px;
+ height: 5px;
+ background-color: #00c190;
+ transform: rotate(129deg);
+ margin-top: 7px;
+ margin-bottom: 0px;
+ margin-left: 3px;
+}
+
+.checkmark_stem {
+width: 1px;
+ height: 11px;
+ background-color: #00c190;
+ transform: rotate(34deg);
+ margin: auto;
+ margin-top: -11px;
+ margin-left: 8px;
+}
+
+.poll-score-percentage {
+ color: #fff;
+ float: right;
+ position: absolute;
+ font-size: 9px;
+ text-shadow:#00000059 1px 1px 0px;
+ margin: 0px 7px;
+}
+
+.poll-score-percentage.poll-score-small {
+ color:#5a5a5a;
+}
+
+.checkbox-mini.check-mini-selected-box:hover {
+ margin:5px 7px 1px 2px;
+ border: 1px solid #00c190;
+ box-shadow: 0px 1px 5px #00000040;
+}
+
+.token-ticker {
+ min-width: 35px;
+ padding: 3px;
+ float: left;
+ border: 1px solid #9696c1;
+ /* border-top-left-radius: 5px; */
+ /* border-bottom-left-radius: 5px; */
+ background-color: #9695c3;
+ border-radius: 5px;
+ margin-right: 3px;
+ font-size: 10px;
+ line-height: 10px;
+ font-weight: 400;
+ text-align: center;
+}
+
+.token-balance {
+ display: inline;
+ min-width: 35px;
+ padding: 3px 5px;
+ float: left;
+ border: 1px solid #9696c1;
+ /* border-top-right-radius: 5px; */
+ /* border-bottom-right-radius: 5px; */
+ border-radius: 5px;
+ font-size: 10px;
+ line-height: 10px;
+ font-weight: 400;
+ text-align: right;
+ text-transform: uppercase;
+}
+
+.checkbox-mini.checkbox-mini-remove {
+ background-color: #ff617e;
+ position: absolute;
+ border-color: #ff617e;
+ opacity:0;
+}
+
+.checkmark_kick.checkmark-kick-remove {
+width: 1px;
+ height: 10px;
+ background-color: #fff;
+ transform: rotate(135deg);
+ margin-top: 2px;
+ margin-bottom: 0px;
+ margin-left: 6px;
+}
+
+.checkmark_stem.checkmark-stem-remove {
+ width: 1px;
+ height: 10px;
+ background-color: #fff;
+ transform: rotate(45deg);
+ margin: auto;
+ margin-top: -10px;
+ margin-left: 6px;
+}
+
+.checkbox-mini.checkbox-mini-remove:hover {
+ opacity:1;
+}
+
+.vote.vote-search.vote-feed.nondraggable.vote-poll:active {
+ margin-top: -4px;
+ margin-bottom: 25px;
+ box-shadow: 0 10px 20px 0 rgba(0, 0, 0, .1);
+ color: #0d0d17;
+}
+
+.stage.stage-vote.stage-loosing {
+ border-color: #e6e6e6;
+ padding: 0px;
+ background-color: transparent;
+ background-color: #e6e6e6;
+ width: 0px;
+ height: 0px;
+ min-width: 0px;
+ overflow: hidden;
+}
+
+.button.login-button.button-half.button-half-disabled {
+ opacity:0.2;
+}
+
+.election-rule {
+ background: #e8ddec;
+ color: #5a0074;
+ font-size: 13px;
+ display: inline-block;
+ padding: 0px 5px;
+ border-radius: 5px;
+ line-height: 28px;
+ margin: 15px 5px 0px -5px;
+ cursor: default;
+};
+
+.budget {
+ margin-top:15px;
+}
+
+.token-wrap-next {
+ margin-top:20px;
+}
+
+.poll-score {
+ margin-bottom: 60px;
+}
+
+.poll-score-button {
+ margin-bottom: 0px;
+}
+
diff --git a/public/templates/colorado/images/back.png b/public/templates/colorado/images/back.png
new file mode 100644
index 000000000..8e6b459e4
Binary files /dev/null and b/public/templates/colorado/images/back.png differ
diff --git a/public/templates/decentraland/decentraland/black.png b/public/templates/colorado/images/black.png
similarity index 100%
rename from public/templates/decentraland/decentraland/black.png
rename to public/templates/colorado/images/black.png
diff --git a/public/templates/decentraland/decentraland/block.png b/public/templates/colorado/images/block.png
similarity index 100%
rename from public/templates/decentraland/decentraland/block.png
rename to public/templates/colorado/images/block.png
diff --git a/public/templates/colorado/images/blockchain-address.png b/public/templates/colorado/images/blockchain-address.png
new file mode 100644
index 000000000..b18ba3ae7
Binary files /dev/null and b/public/templates/colorado/images/blockchain-address.png differ
diff --git a/public/templates/colorado/images/camera.png b/public/templates/colorado/images/camera.png
new file mode 100644
index 000000000..df789daed
Binary files /dev/null and b/public/templates/colorado/images/camera.png differ
diff --git a/public/templates/decentraland/decentraland/clock.png b/public/templates/colorado/images/clock.png
similarity index 100%
rename from public/templates/decentraland/decentraland/clock.png
rename to public/templates/colorado/images/clock.png
diff --git a/public/templates/decentraland/decentraland/debate.png b/public/templates/colorado/images/debate.png
similarity index 100%
rename from public/templates/decentraland/decentraland/debate.png
rename to public/templates/colorado/images/debate.png
diff --git a/public/templates/colorado/images/decision-draft.png b/public/templates/colorado/images/decision-draft.png
new file mode 100644
index 000000000..12df37182
Binary files /dev/null and b/public/templates/colorado/images/decision-draft.png differ
diff --git a/public/templates/colorado/images/domain.png b/public/templates/colorado/images/domain.png
new file mode 100644
index 000000000..a75e9f07c
Binary files /dev/null and b/public/templates/colorado/images/domain.png differ
diff --git a/public/templates/colorado/images/fingerprint.png b/public/templates/colorado/images/fingerprint.png
new file mode 100644
index 000000000..4f99873ea
Binary files /dev/null and b/public/templates/colorado/images/fingerprint.png differ
diff --git a/public/templates/colorado/images/flag.png b/public/templates/colorado/images/flag.png
new file mode 100644
index 000000000..bf9137817
Binary files /dev/null and b/public/templates/colorado/images/flag.png differ
diff --git a/public/templates/colorado/images/forward.png b/public/templates/colorado/images/forward.png
new file mode 100644
index 000000000..3dbfb3f94
Binary files /dev/null and b/public/templates/colorado/images/forward.png differ
diff --git a/public/templates/colorado/images/id-card.png b/public/templates/colorado/images/id-card.png
new file mode 100644
index 000000000..aab737798
Binary files /dev/null and b/public/templates/colorado/images/id-card.png differ
diff --git a/public/templates/colorado/images/lock.png b/public/templates/colorado/images/lock.png
new file mode 100755
index 000000000..ec5110ad8
Binary files /dev/null and b/public/templates/colorado/images/lock.png differ
diff --git a/public/templates/colorado/images/logout.png b/public/templates/colorado/images/logout.png
new file mode 100644
index 000000000..afb9d4272
Binary files /dev/null and b/public/templates/colorado/images/logout.png differ
diff --git a/public/templates/colorado/images/mail-closed-login-button.png b/public/templates/colorado/images/mail-closed-login-button.png
new file mode 100644
index 000000000..cb65c7bd8
Binary files /dev/null and b/public/templates/colorado/images/mail-closed-login-button.png differ
diff --git a/public/templates/colorado/images/mail-closed.png b/public/templates/colorado/images/mail-closed.png
new file mode 100755
index 000000000..448081f6b
Binary files /dev/null and b/public/templates/colorado/images/mail-closed.png differ
diff --git a/public/templates/decentraland/decentraland/reply.png b/public/templates/colorado/images/reply.png
similarity index 100%
rename from public/templates/decentraland/decentraland/reply.png
rename to public/templates/colorado/images/reply.png
diff --git a/public/templates/colorado/images/token.png b/public/templates/colorado/images/token.png
new file mode 100644
index 000000000..a3e14f8a1
Binary files /dev/null and b/public/templates/colorado/images/token.png differ
diff --git a/public/templates/decentraland/decentraland/tweet.png b/public/templates/colorado/images/tweet.png
similarity index 100%
rename from public/templates/decentraland/decentraland/tweet.png
rename to public/templates/colorado/images/tweet.png
diff --git a/public/templates/colorado/images/vote-icon-black.png b/public/templates/colorado/images/vote-icon-black.png
new file mode 100644
index 000000000..2d1308147
Binary files /dev/null and b/public/templates/colorado/images/vote-icon-black.png differ
diff --git a/public/templates/decentraland/decentraland/vote.png b/public/templates/colorado/images/vote.png
similarity index 100%
rename from public/templates/decentraland/decentraland/vote.png
rename to public/templates/colorado/images/vote.png
diff --git a/public/templates/colorado/landing.css b/public/templates/colorado/landing.css
new file mode 100644
index 000000000..cf710d9dc
--- /dev/null
+++ b/public/templates/colorado/landing.css
@@ -0,0 +1,777 @@
+.landing-item {
+ display: inline;
+ /* width: 70%; */
+ text-align: center;
+}
+
+.landing-left {
+ width: 60%;
+ text-align: center;
+}
+
+.landing-sub {
+ font-size: 32px;
+ /* text-shadow: 0px 14px 20px #00000021; */
+ padding-top: 10px;
+ line-height: 1.2em;
+}
+
+.landing-button-menu {
+ clear:both;
+ text-align:center;
+}
+
+.button.login-button.button-landing {
+ margin: 40px 5px 0px;
+ padding: 10px;
+ max-width: 240px;
+ display: inline-block;
+ font-size: 12px;
+ border-width: 1px;
+}
+
+.button.login-button.button-landing.button-landing-secondary {
+ background: #5a007514;
+ color: #580074;
+}
+
+.landing-sub-content {
+ float: none;
+ font-size: 16px;
+ line-height: 1.6em;
+ margin: 30px -30px 0px 0px;
+ text-align: left;
+ color: black;
+}
+
+.landing-sub-half-sshot {
+ min-height:300px;
+}
+
+.landing-client-round, .landing-client-square {
+ max-width: 120px;
+ margin: 15px;
+ /* display: block; */
+ box-shadow: 0px 4px 12px 0px #cacaca;
+ border-radius: 120px;
+ transition: all 200ms ease;
+ cursor:pointer;
+}
+
+.landing-sub-header.landing-sub-dapp {
+ width:30%;
+ text-align:right;
+}
+
+.landing-client-round:hover, .landing-client-square:hover {
+ margin-top:10px;
+ margin-bottom:20px;
+ box-shadow: 0px 20px 64px 0px #cacaca;
+}
+
+
+.landing-sub-half.landing-sub-quote {
+ width: 65%;
+ max-width: 600px;
+ margin-left: -20px;
+ padding: 15px 20px 0px;
+}
+
+.landing-client-square {
+ border-radius: 35px;
+}
+
+.landing-sub-header {
+ margin: 0 auto;
+ max-width: 500px;
+ padding: 0px 30px;
+ text-align: left;
+ font-size: 18px;
+ float: left;
+ color: #02020282;
+ width: 35%;
+ line-height: 1.6em;
+}
+
+.landing-company-list {
+ clear: both;
+ margin-top: 40px;
+ margin: 0px 0px 30px;
+}
+
+.landing-right {
+ width: 31%;
+ float: right;
+}
+
+.landing-sub-half {
+ width:50%;
+ float:left;
+ margin-top:-15px;
+ margin-bottom: 30px;
+}
+
+.hero-last {
+ padding-top: 0px;
+}
+
+.landing-quote {
+ background: white;
+ border: 2px #e8e2ec solid;
+ padding: 15px;
+ color: #a982b5;
+ font-size: 17px;
+ border-radius: 10px;
+ margin: 30px 0px 0px 0px;
+ box-shadow: 12px 12px #e8e2ec;
+}
+
+.landing-center {
+ text-align: center;
+ max-width: 1100px;
+ margin: 0 auto;
+ padding: 0 20px;
+}
+
+.paper-screenshot {
+ max-width: 25%;
+ box-shadow: 0 6px 20px 4px rgba(0, 0, 0, 0.21);
+ margin: 15px 25px;
+ transition: all 200ms ease;
+ cursor: pointer;
+}
+
+.paper-video {
+ width: 580px;
+ max-width: 580px;
+ border-radius: 5px;
+}
+
+.landing-sub-big {
+ font-size: 36px;
+ border-bottom: 3px solid #5a0075;
+ margin: 0px auto 30px auto;
+ display: table;
+}
+
+.paper-screenshot:hover {
+ margin-top: 10px;
+ margin-bottom: 20px;
+ box-shadow: 1px 12px 40px 10px rgba(0, 0, 0, 0.22);
+ color: #0d0d17;
+}
+
+.landing-logo {
+ max-width: 130px;
+ margin: 0px 20px;
+ opacity: 0.8;
+ cursor: pointer;
+}
+
+.landing-logo:hover {
+ opacity: 1;
+}
+
+.hero-tertiary {
+ background: linear-gradient(0deg, #00c190 75%, #00c190);
+ padding: 40px 20px;
+}
+
+.profile-landing {
+ width: 60px;
+ height: 60px;
+ margin-left: 60px;
+ margin-top: 0px;
+}
+
+.landing-quote-source {
+ float: left;
+ margin: 12px;
+ text-align:left;
+}
+
+.landing-arrow-down {
+ width: 0;
+ height: 0;
+ margin-left: 30px;
+ margin-top: -2px;
+ border-left: 30px solid transparent;
+ border-right: 0px solid transparent;
+ border-top: 30px solid #fff;
+ box-shadow: 10px 0px #e8e2ec;
+}
+
+
+.hero-quarter {
+ padding-top: 85px;
+ padding-bottom: 85px;
+}
+
+.hero-quarter-last {
+ padding-top: 60px;
+ padding-bottom: 90px;
+}
+
+.landing-footer {
+ text-align: left;
+ color: white;
+}
+
+.landing-list {
+ list-style: none;
+ /* text-transform: uppercase; */
+ font-size: 15px;
+ line-height: 30px;
+ min-width: 300px;
+ float: left;
+ margin-bottom:30px;
+}
+
+.landing-list-item {
+ margin:5px 0px;
+}
+
+.landing-client {
+ float:left;
+ width: 33%;
+ padding: 0px 20px 20px;
+}
+
+.landing-list-item-link {
+ color: #ffffff8a;
+ font-weight:200;
+}
+
+.landing-footer-logo {
+ max-width: 150px;
+ margin-top: 50px;
+}
+
+.landing-closing {
+ text-align: right;
+}
+
+.landing-footer-social-icon {
+ max-width:60px;
+ opacity:0.6;
+ cursor:pointer;
+}
+
+.landing-footer-social-icon:hover {
+ opacity: 1;
+}
+
+.landing-list-item-title {
+ text-transform: uppercase;
+ font-weight: 600;
+ font-size: 12px;
+ padding-bottom: 10px;
+}
+
+.landing-list-item-link:hover {
+ color: #ffffffc4;
+ text-decoration: dashed;
+ border-bottom: 1px solid;
+ padding-bottom: 4px;
+}
+
+.landing-section-title {
+ color: #ffffffd9;
+ font-size: 32px;
+ margin-bottom: 30px;
+ text-transform: none;
+ border-bottom: 0px dotted;
+ width: auto;
+ text-shadow: 0px 14px 20px #00000021;
+ font-weight: 400;
+ line-height: 1.2em;
+ text-align: center;
+ clear: both
+}
+
+.landing-coin {
+ max-width: 230px;
+ float: left;
+ padding: 10px;
+ text-align: center;
+ margin-bottom:-20px;
+}
+
+.landing-coin-label {
+ font-size:12px;
+}
+
+.landing-loop-arrow {
+ border-bottom: 1px dotted #34283d;
+ margin: 0 115px;
+}
+
+.landing-coin-connect {
+ max-width:200px;
+ float:left;
+}
+
+.landing-loop-arrow-end {
+ border-left: 1px dotted #34283d;
+ height: 70px;
+ margin-left: 0px;
+ margin-bottom: 1px;
+}
+
+.landing-loop-arrow-start {
+ border-right: 1px dotted #34283d;
+ height: 70px;
+ float: right;
+ margin-right: -2px;
+ margin-top: -69px;
+}
+
+.landing-scheme {
+ margin: 0 auto;
+ display: table;
+}
+
+.landing-scheme-arrow {
+ width: 150px;
+ border-bottom: 1px dotted #34283d;
+ margin-top: 110px;
+}
+
+.landing-coin-connect-label.landing-coin-connect-label-bottom, .landing-coin-connect-value.landing-coin-connect-label-bottom {
+ width: auto;
+ position: relative;
+ margin-bottom: 15px;
+}
+
+.landing-coin-connect-value.landing-coin-connect-label-bottom {
+ margin: 40px auto 0;
+ max-width: 330px;
+}
+
+.landing-coin-label a, .landing-coin-label a:hover {
+ color: #33293c;
+ font-size: 10px;
+}
+
+.landing-loop {
+ margin-bottom: 30px;
+}
+
+.landing-brand {
+ max-height: 16px;
+ margin-top: 24px;
+ margin-left: 0px;
+}
+
+.landing-sub.landing-sub-big.landing-sub-small {
+ text-align: left;
+ margin: 0px 0px 30px;
+ font-size: 28px;
+ margin-top: -30px;
+ padding-bottom: 6px;
+ border-bottom-width: 5px;
+}
+
+.landing-coin-connect-value {
+ position: absolute;
+ color: #000000;
+ margin-top: 25px;
+ font-size: 12px;
+ line-height: 18px;
+ max-width: 146px;
+ text-align: center;
+ margin-left: 0px;
+}
+
+.landing-scheme-arrow-right {
+ border-color: #34283d;
+ float: right;
+ border-width: 0 1px 1px 0;
+ margin-top: -6px;
+ margin-right: -1px;
+ border-style: dotted;
+ padding: 6px;
+ transform: rotate(-45deg);
+ -webkit-transform: rotate(-45deg);
+}
+
+.landing-scheme-arrow-up {
+ border-color: #34283d;
+ border-width: 0 1px 1px 0;
+ margin-bottom: -19px;
+ margin-left: -6px;
+ border-style: dotted;
+ display: inline-block;
+ padding: 6px;
+ transform: rotate(-135deg);
+ -webkit-transform: rotate(-135deg)
+}
+
+.landing-coin-connect-label {
+ text-transform: uppercase;
+ font-size: 11px;
+ position: absolute;
+ width: 135px;
+ line-height: 33px;
+ margin-top: -50px;
+ font-weight: 700;
+ color: #34283d;
+ text-align: center;
+}
+
+.landing-coin-connect-label-mobile {
+ text-transform: uppercase;
+ font-size: 12px;
+ line-height: 33px;
+ font-weight: 700;
+ color: #34283d;
+}
+
+.landing-token-pic-mobile {
+ max-height:100px;
+}
+
+.landing-coin-connect-value-mobile {
+ color: #000000;
+ font-size: 12px;
+ line-height: 18px;
+}
+
+.landing-coin-connect-mobile {
+ padding-right:60px;
+ margin-bottom:40px;
+ float: left;
+ clear: right;
+ width: 70%;
+}
+
+.landing-map-menu {
+ max-width: 65%;
+ margin: 0 auto;
+ float: left;
+}
+
+.hero {
+ position: -webkit-sticky;
+ position:sticky;
+}
+
+
+.landing-client.landing-client-start {
+ clear:left;
+}
+
+.hero-fifth {
+ padding: 60px 20px 40px 20px;
+ background:linear-gradient(0deg, #4a1d58 85%, #390548);
+ margin-bottom:-20px;
+}
+
+.landing-link-clean, .landing-link-clean:hover {
+ text-decoration: none;
+}
+
+.landing-play-button {
+ width: 0;
+ height: 0;
+ border-top: 60px solid transparent;
+ border-bottom: 60px solid transparent;
+ border-left: 60px solid white;
+ margin-left: 290px;
+ position: absolute;
+ margin-top: 150px;
+}
+
+.landing-video {
+ z-index: 99999;
+ position: fixed;
+ width: 90%;
+ margin: 0 auto;
+ top: 10%;
+ left: 0%;
+ right: 0%;
+}
+
+.button-landing-icon {
+ max-width: 24px;
+ margin-right: 10px;
+ margin-top: -3px;
+}
+
+.landing-scheme-mobile {
+ display:none;
+}
+
+.landing-sub-header.landing-sub-dapp.landing-sub-scheme {
+ padding: 5px 25px;
+ text-align: right;
+ float: left;
+ clear: left;
+}
+
+@media (max-width: 991px) {
+ .landing-item {
+ float: none;
+ clear:both;
+ }
+
+ .landing-coin {
+ max-width:145px;
+ }
+
+ .landing-scheme-arrow {
+ margin-top:70px;
+ }
+
+ .landing-loop-arrow {
+ margin:0 75px;
+ }
+
+ .landing-sub-half {
+ margin-top:20px;
+ }
+
+ .landing-quote {
+ margin:30px;
+ }
+
+ .landing-list {
+ min-width:250px;
+ padding-left: 20px;
+ }
+
+ .landing-closing {
+ text-align:left;
+ }
+
+ .landing-sub-header.landing-sub-half {
+ margin-top: -10px;
+ }
+
+ .landing-arrow-down {
+ margin: -2px 60px 0px;
+ }
+
+ .hero-tertiary {
+ padding: 40px 0px;
+ }
+
+ .landing-map-menu {
+ max-width: 100%;
+ float: none;
+ }
+
+ .paper-screenshot.paper-video {
+ max-width: 600px;
+ margin-bottom: 40px;
+ margin-left: auto;
+ margin-right: auto;
+ width: 100%;
+ }
+
+ .paper-screenshot.paper-video:hover {
+ margin-bottom: 40px;
+ margin-left: auto;
+ margin-right: auto;
+ }
+
+
+ .landing-sub-content {
+ text-align: center;
+ margin: 0px;
+ }
+
+ .landing-sub-header {
+ width: 100%;
+ max-width: none;
+ padding: 0 20px;
+ margin-bottom: 25px;
+ text-align: center;
+ }
+
+ .landing-logo {
+ margin:10px;
+ }
+
+ .hero-secondary, .hero-quarter {
+ padding: 40px 10px 60px 10px;
+ }
+
+ .landing-sub {
+ font-size: 30px;
+ text-align: center;
+ }
+
+ .paper-screenshot {
+ max-width: 250px;
+ margin: 10px 25px 20px 25px;
+ }
+
+ .paper-screenshot:hover {
+ margin: 10px 25px 20px 25px;
+ box-shadow: 0 6px 20px 4px rgba(0, 0, 0, 0.21); /* box-shadow: 1px 12px 40px 10px rgba(0, 0, 0, 0.22); */
+ color: #0d0d17;
+ }
+
+ .not-mobile {
+ display: none;
+ }
+}
+
+
+
+@media (max-width: 767px) {
+ .paper-screenshot {
+ max-width: 180px;
+ margin: 5px 10px 20px 10px;
+ }
+
+ .landing-footer-logo {
+ max-width: 130px;
+ display:none;
+ }
+
+ .landing-scheme {
+ display:none;
+ }
+
+ .landing-scheme-mobile {
+ display: block;
+ padding: 0 30px;
+ }
+
+ .landing-closing {
+ clear:both;
+ }
+
+ .landing-client-round, .landing-client-square {
+ max-width: 100px;
+ margin: 25px 15px;
+ }
+
+ .landing-client-square {
+ border-radius: 25px;
+ }
+
+ .button.login-button.button-landing {
+ margin: 30px 5px -20px 5px;
+ width: 100%;
+ display: inline-block;
+ max-width: 250px;
+ }
+
+ .landing-arrow-down {
+ margin: -32px 60px 0px;
+ }
+
+
+ .landing-sub-header.landing-sub-half {
+ margin-top: 0px;
+ }
+
+ .landing-quote {
+ margin:30px;
+ }
+
+ .landing-section-title {
+ font-size: 26px;
+ margin-bottom: 40px;
+ margin-top: 10px;
+ }
+
+ .landing-sub-header {
+ margin-bottom: 25px;
+ padding: 0px;
+ }
+
+ .paper-screenshot:hover {
+ margin: 15px 25px;
+ }
+
+ .landing-center {
+ padding:0 10px;
+ }
+
+ .landing-client {
+ float: none;
+ clear: both;
+ width: 500px;
+ display: block;
+ margin: 0 auto;
+ padding: 0px 20px 20px;
+ }
+}
+
+@media (max-width: 479px) {
+ .paper-screenshot {
+ max-width: 150px;
+ margin: 5px 10px 20px 10px;
+ }
+
+ .landing-sub-header.landing-sub-dapp.landing-sub-scheme {
+ padding: 0px;
+ padding-right: 20px;
+ text-align: right;
+ float: left;
+ clear: left;
+ margin-left:-10px;
+ }
+
+ .landing-coin-connect-mobile {
+ padding-right: 10px;
+ margin-bottom: 40px;
+ float: left;
+ clear: right;
+ width: 70%;
+ }
+
+ .landing-token-pic-mobile {
+ max-height: 100px;
+ padding-top: 10px;
+ }
+
+ .button.login-button.button-landing {
+ margin: 30px auto -20px auto;
+ max-width: 350px;
+ display:block;
+ }
+
+ .landing-client-round, .landing-client-square {
+ max-width: 70px;
+ margin: 25px 30px 25px 0px;
+ }
+
+ .landing-client-square {
+ border-radius: 15px;
+ }
+
+ .landing-quote-source {
+ font-size: 14px;
+ line-height: 1.6em;
+ padding-top: 6px;
+ margin-left: 40px;
+ }
+
+ .landing-arrow-down {
+ margin: -12px 60px 0px;
+ }
+
+ .landing-quote {
+ margin:10px;
+ margin-right:-30px;
+ }
+
+ .paper-screenshot:hover {
+ margin: 5px 10px 20px 10px;
+ }
+
+ .landing-logo {
+ max-width: 100px;
+ margin:10px;
+ }
+
+ .landing-client {
+ width:auto;
+ }
+}
+
diff --git a/imports/ui/css/sovereign.css b/public/templates/colorado/sovereign.css
similarity index 98%
rename from imports/ui/css/sovereign.css
rename to public/templates/colorado/sovereign.css
index 05d227f84..0c92a1006 100755
--- a/imports/ui/css/sovereign.css
+++ b/public/templates/colorado/sovereign.css
@@ -922,14 +922,18 @@ blockquote {
}
.button.login-button.button-secondary:hover {
- padding-top: 10px;
- padding-bottom: 10px;
- border-style: none;
+ border-style: solid;
border-color: #ff617e;
background-color: #ff617e;
color: #fff;
}
+.button.login-button.button-secondary:active {
+ border-style: solid;
+ background-color: transparent;
+ color: #ff617e;
+}
+
.button.login-button.button-half {
width: 100%;
margin-right: 0px;
@@ -1078,9 +1082,18 @@ blockquote {
background-color: #ff617e;
}
+.button.button-cta:active {
+ padding-top: 6px;
+ padding-bottom: 9px;
+ border: 1px solid #580074;
+ background-color: transparent;
+ color: #580074;
+}
+
.button.button-menu {
margin-right: -5px;
margin-left: -5px;
+ border: 1px solid #dedcdc;
background-color: #dedcdc;
color: #4b4b4b;
text-align: left;
@@ -1088,10 +1101,15 @@ blockquote {
}
.button.button-menu:hover {
- background-color: rgba(93, 0, 119, .07);
+ border-color: #e0dbe2;
+ background-color: #e0dbe2;
color: #561072;
}
+.button.button-menu:active {
+ border: 1px solid #ff617e;
+}
+
.button-label {
float: left;
}
@@ -1382,6 +1400,12 @@ blockquote {
color: #0d0d17;
}
+.vote.vote-search.vote-feed:active {
+ margin-top: 0px;
+ margin-bottom: 21px;
+ box-shadow: 0 5px 10px 0 rgba(0, 0, 0, .1);
+}
+
.vote.vote-search.vote-feed.vote-empty {
border-style: none;
border-width: 1px;
@@ -1406,7 +1430,7 @@ blockquote {
box-shadow: none;
-webkit-transition-property: none;
transition-property: none;
- cursor: pointer;
+ cursor: default;
}
.vote.vote-search.vote-feed.vote-delegation:hover {
@@ -1444,6 +1468,10 @@ blockquote {
margin-bottom: 25px;
}
+.vote.vote-search.vote-feed.vote-editor-compressed:active {
+ margin-bottom: 21px;
+}
+
.vote.vote-placeholder {
width: 50%;
height: 70px;
@@ -2120,12 +2148,13 @@ blockquote {
top: 0px;
right: 0px;
z-index: 14000;
- height: 60px;
+ height: 65px;
+ padding-top: 2px;
padding-right: 10px;
padding-left: 0px;
float: left;
- border-bottom: 1px solid #ddd;
- background-color: #fff;
+ border-bottom: 1px solid #e8e8e8;
+ background-color: #f2f2f8;
color: #442f58;
}
@@ -3435,6 +3464,11 @@ blockquote {
border-color: #00bf8f;
}
+.stage.stage-placed.stage-card.button:active {
+ border-radius: 5px;
+ background-color: #dad8d8;
+}
+
.stage.stage-inballot {
border-style: solid;
border-color: #00bf8f;
@@ -4071,15 +4105,25 @@ blockquote {
}
.navbar-button.navbar-button-active.navbar-button-action {
+ margin-top: 6px;
+ margin-bottom: 6px;
+ border: 1px solid #580074;
font-size: 16px;
line-height: 18px;
cursor: pointer;
}
.navbar-button.navbar-button-active.navbar-button-action:hover {
+ border-color: #ff617e;
background-color: #ff617e;
}
+.navbar-button.navbar-button-active.navbar-button-action:active {
+ border: 1px solid #580074;
+ background-color: hsla(283.6363636363637, 75.57%, 25.69%, 0.10);
+ color: #580074;
+}
+
.navbar-button.navbar-button-active.navbar-button-action.navbar-button-action-disabled {
border: 1px solid #aaa;
background-color: transparent;
@@ -4767,7 +4811,7 @@ blockquote {
}
.collective.collective-selected {
- border-color: hsla(286.6666666666667, 100.00%, 22.94%, 1.00);
+ border-color: hsla(283.6363636363637, 75.57%, 25.69%, 1.00);
background-color: #e6e0ee;
}
@@ -4799,7 +4843,7 @@ blockquote {
.collective-title {
margin-top: 5px;
margin-bottom: 5px;
- font-size: 14px;
+ font-size: 12px;
line-height: 18px;
font-weight: 400;
text-shadow: none;
@@ -6358,7 +6402,7 @@ blockquote {
}
.login-button-last {
- margin-bottom: 20px;
+ margin-bottom: 10px;
}
.hero {
@@ -6600,10 +6644,32 @@ blockquote {
padding-left: 5px;
}
+.hero-home-button {
+ display: inline-block;
+ float: left;
+}
+
.hero-home-button:active {
margin-top: 2px;
}
+.help {
+ display: block;
+ margin-top: 6px;
+ margin-left: 7px;
+ padding-right: 5px;
+ padding-left: 5px;
+ float: right;
+ border: 1px solid #ff617e;
+ border-radius: 100px;
+ background-color: #ff617e;
+ color: #fff;
+ font-size: 10px;
+ line-height: 15px;
+ font-weight: 400;
+ cursor: default;
+}
+
@media (max-width: 991px) {
.contract {
margin-right: 15px;
@@ -6753,7 +6819,6 @@ blockquote {
}
.split.split-left {
width: 100%;
- margin-top: 70px;
}
.smart {
display: block;
@@ -6948,7 +7013,6 @@ blockquote {
}
.navbar {
left: 0px;
- box-shadow: none;
}
.logo {
padding-left: 0px;
@@ -7068,6 +7132,9 @@ blockquote {
.authentication {
padding-right: 0px;
}
+ .login-input {
+ border-radius: 0px;
+ }
.popup {
left: 0px;
top: 0px;
@@ -7243,11 +7310,14 @@ blockquote {
.margin-bottom-dead {
margin-bottom: 0px;
}
+ .login-button-last {
+ margin-bottom: 10px;
+ }
.hero-title {
- margin-left: 25px;
+ margin-left: 35px;
}
.hero-call-to-action {
- margin-left: 25px;
+ margin-left: 35px;
}
.hero-cta-box {
min-width: 280px;
diff --git a/public/templates/colorado/sovereign.json b/public/templates/colorado/sovereign.json
new file mode 100644
index 000000000..514f14899
--- /dev/null
+++ b/public/templates/colorado/sovereign.json
@@ -0,0 +1,58 @@
+{
+ "stylesheet": {
+ "list": ["/styles/normalize.css", "/styles/webflow.css", "/templates/colorado/sovereign.css", "/templates/colorado/extra.css", "/templates/colorado/landing.css"]
+ },
+
+ "header": {
+ "html": "
+ {{#if value}}
+
+ {{/if}}
+
+
+
+ {{else}}
+
- {{/if}}
-
+