From 39cfa73e8f2c1f438834ea84b24490c9ab3eac18 Mon Sep 17 00:00:00 2001 From: Santiago Siri Date: Mon, 28 Jan 2019 23:45:50 -0500 Subject: [PATCH] new design with templating system done --- i18n/en.i18n.json | 2 +- .../components/decision/editor/editor.html | 8 ++-- .../components/decision/editor/editor.js | 7 ++++ .../components/identity/login/EmailLogin.jsx | 25 +++++++----- imports/ui/templates/layout/templater.js | 10 +++++ lib/token.js | 36 +++++++++++++----- public/templates/sovereign/extra.css | 3 -- .../sovereign/images/decision-draft.png | Bin 0 -> 26551 bytes public/templates/sovereign/sovereign.css | 15 +++++--- public/templates/sovereign/sovereign.json | 1 + 10 files changed, 74 insertions(+), 33 deletions(-) create mode 100644 public/templates/sovereign/images/decision-draft.png diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 9710ae02c..a1b62fd41 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -533,7 +533,7 @@ "domain": "Domain", "email-valid-domain": "Verified E-mail Domain", "electorate-sentence-anyone": "Anyone", - "electorate-sentence-anyone-textonly": "Anyone logged in can vote on this proposal.", + "electorate-sentence-anyone-textonly": "You are allowed to vote on this proposal.", "cancel": "Cancel", "electorate-requisites": "Election Requisites", "electorate-sentence-only": "{{setting0}}", diff --git a/imports/ui/templates/components/decision/editor/editor.html b/imports/ui/templates/components/decision/editor/editor.html index 4b9760c12..faac6a15a 100644 --- a/imports/ui/templates/components/decision/editor/editor.html +++ b/imports/ui/templates/components/decision/editor/editor.html @@ -9,7 +9,7 @@ {{/with}}
- +
@@ -31,18 +31,18 @@ {{/each}}
- +
{{sinceDate}}
- +
diff --git a/imports/ui/templates/components/decision/editor/editor.js b/imports/ui/templates/components/decision/editor/editor.js index abf70cd31..91ac8b5a4 100644 --- a/imports/ui/templates/components/decision/editor/editor.js +++ b/imports/ui/templates/components/decision/editor/editor.js @@ -5,6 +5,7 @@ import { $ } from 'meteor/jquery'; import { ReactiveVar } from 'meteor/reactive-var'; import { TAPi18n } from 'meteor/tap:i18n'; +import { templetize, getImage } from '/imports/ui/templates/layout/templater'; import { stripHTMLfromText } from '/imports/ui/modules/utils'; import { timers } from '/lib/const'; import { Contracts } from '/imports/api/contracts/Contracts'; @@ -167,6 +168,9 @@ Template.editor.onCreated(function () { Template.instance().ready = new ReactiveVar(true); Template.instance().contract = new ReactiveVar(contract); Template.instance().reply = new ReactiveVar(); + + Template.instance().imageTemplate = new ReactiveVar(); + templetize(Template.instance()); }); Template.editor.onDestroyed(() => { @@ -279,6 +283,9 @@ Template.editor.helpers({ } return undefined; }, + getImage(pic) { + return getImage(Template.instance().imageTemplate.get(), pic); + }, menu() { return [ { diff --git a/imports/ui/templates/components/identity/login/EmailLogin.jsx b/imports/ui/templates/components/identity/login/EmailLogin.jsx index f7fd01b8d..f630eab31 100644 --- a/imports/ui/templates/components/identity/login/EmailLogin.jsx +++ b/imports/ui/templates/components/identity/login/EmailLogin.jsx @@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor'; import React, { Component } from 'react'; import { TAPi18n } from 'meteor/tap:i18n'; +import { getImageTemplate } from '/imports/ui/templates/layout/templater'; import { clearPopups } from '/imports/ui/modules/popup'; import Warning from '../../../widgets/warning/Warning.jsx'; import Signup from '../signup/Signup.jsx'; @@ -15,6 +16,7 @@ export default class EmailLogin extends Component { loginScreen: true, passwordKnown: true, incorrectUser: false, + images: {}, }; this.handleLoginRender = this.handleLoginRender.bind(this); @@ -24,13 +26,8 @@ export default class EmailLogin extends Component { this.handleFocus = this.handleFocus.bind(this); } - handleFacebookLogin() { - Meteor.call('updateAPIKeys'); - Meteor.loginWithFacebook({}, function (err) { - if (err.reason) { - throw new Meteor.Error('Facebook login failed ', err.reason); - } - }); + async componentWillMount() { + await getImageTemplate().then((resolved) => { this.setState({ images: resolved }); }); } handleLoginRender() { @@ -49,6 +46,15 @@ export default class EmailLogin extends Component { this.setState({ incorrectUser: true }); } + handleFacebookLogin() { + Meteor.call('updateAPIKeys'); + Meteor.loginWithFacebook({}, function (err) { + if (err.reason) { + throw new Meteor.Error('Facebook login failed ', err.reason); + } + }); + } + handleSubmit(event) { event.preventDefault(); @@ -66,6 +72,7 @@ export default class EmailLogin extends Component { // User not found or incorrect password this.handleSigninError(); break; + default: } } else { // Successful login @@ -85,10 +92,10 @@ export default class EmailLogin extends Component {
{loginScreen ? - lock + lock :
- lock + lock
} {TAPi18n.__('authenticate-self')} diff --git a/imports/ui/templates/layout/templater.js b/imports/ui/templates/layout/templater.js index b3460be10..d9031b832 100644 --- a/imports/ui/templates/layout/templater.js +++ b/imports/ui/templates/layout/templater.js @@ -22,6 +22,15 @@ const _getImageTemplate = async () => { return template.images; }; +/** +* @summary gets image but for react calls +* @param {string} pic to use +*/ +const _getReactImage = async (pic) => { + const template = await promise; + return template.images[pic]; +}; + /** * @summary gets the right image given by template * @param {object} imageTemplate that is getting the images from @@ -69,4 +78,5 @@ export const getCSS = _getStyles; export const getHeader = _getHeader; export const getImageTemplate = _getImageTemplate; export const getImage = _getImage; +export const getReactImage = _getReactImage; export const templetize = _templetize; diff --git a/lib/token.js b/lib/token.js index 1e8731d28..0be841bc2 100644 --- a/lib/token.js +++ b/lib/token.js @@ -4,6 +4,23 @@ let _token; // TODO: maxSupply and supply numbers need to be updated via a trusted API. const _tokenRinkeby = { coin: [ + { + code: 'VOTE', + format: '0,0', + emoji: '', + unicode: '', + name: 'Democracy Earth', + maxSupply: 500000000, + supply: 2500000, + decimals: 18, + inflationary: true, + title: 'Universal Basic Income token for verified citizens of the Democracy Earth Network.', + color: '#5a0075', + type: 'ERC20', + blockchain: 'ETHEREUM', + contractAddress: '0xf9f8587544471dcf00a48b0d4231ce7ca9b03487', + defaultVote: '1', + }, { code: 'ETH', subcode: 'WEI', @@ -23,21 +40,20 @@ const _tokenRinkeby = { defaultVote: '0.0001', }, { - code: 'VOTE', - format: '0,0', + code: 'DAI', + format: '0,0.0a', emoji: '', unicode: '', - name: 'Democracy Earth', - maxSupply: 500000000, - supply: 2500000, + name: 'Maker', decimals: 18, - inflationary: true, - title: 'Universal Basic Income token for verified citizens of the Democracy Earth Network.', - color: '#00c091', + maxSupply: 74560600, + supply: 1050141509, + color: '#faa700', + title: 'DAI is a stable coin based on Collateral Debt Positions created with Maker DAO.', type: 'ERC20', blockchain: 'ETHEREUM', - contractAddress: '0xf9f8587544471dcf00a48b0d4231ce7ca9b03487', - defaultVote: '1', + contractAddress: '0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359', + defaultVote: '0.1', }, { code: 'MANA', diff --git a/public/templates/sovereign/extra.css b/public/templates/sovereign/extra.css index 4cf253ae2..d2514204a 100644 --- a/public/templates/sovereign/extra.css +++ b/public/templates/sovereign/extra.css @@ -149,9 +149,6 @@ html { textarea, select, input, button, #titleContent { outline: none; } video { - display: inline-block; - vertical-align: baseline; - border: 1px solid #4e3767; border-radius: 5px; } diff --git a/public/templates/sovereign/images/decision-draft.png b/public/templates/sovereign/images/decision-draft.png new file mode 100644 index 0000000000000000000000000000000000000000..12df371826809ea2593233a2bab37bbe9f1873b4 GIT binary patch literal 26551 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 literal 0 HcmV?d00001 diff --git a/public/templates/sovereign/sovereign.css b/public/templates/sovereign/sovereign.css index a60364ffe..9fddf33f6 100755 --- a/public/templates/sovereign/sovereign.css +++ b/public/templates/sovereign/sovereign.css @@ -1098,7 +1098,7 @@ blockquote { .button-icon { width: 24px; height: 24px; - margin: 0px -12px -10px -10px; + margin: 2px -17px -10px -7px; float: left; } @@ -4076,8 +4076,7 @@ blockquote { } .navbar-button.navbar-button-active.navbar-button-action:hover { - background-image: -webkit-gradient(linear, left top, left bottom, from(#f04), to(#ff9a74)); - background-image: linear-gradient(180deg, #f04, #ff9a74); + background-color: #ff0085; } .navbar-button.navbar-button-active.navbar-button-action.navbar-button-action-disabled { @@ -4286,10 +4285,14 @@ blockquote { margin-right: auto; margin-left: auto; 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: #5c5c6e; - box-shadow: 0 3px 8px -4px #000; - color: #fff; + background-color: #eaeaea; + box-shadow: 0 6px 20px 4px rgba(0, 0, 0, .13); font-size: 16px; text-align: center; } diff --git a/public/templates/sovereign/sovereign.json b/public/templates/sovereign/sovereign.json index 9c1db1204..b37d10897 100644 --- a/public/templates/sovereign/sovereign.json +++ b/public/templates/sovereign/sovereign.json @@ -21,6 +21,7 @@ "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",