From 3dee4744f9d0643026ebcf100fc839e2a4a1aa32 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 29 Sep 2016 16:31:55 +0200 Subject: contract playground --- lib/i18n.ts | 12 ++++++-- lib/wallet/renderHtml.ts | 49 +++++++++++++++++++++++++++++++++ pages/confirm-contract.tsx | 20 ++------------ playground/contract.html | 68 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 129 insertions(+), 20 deletions(-) create mode 100644 lib/wallet/renderHtml.ts create mode 100644 playground/contract.html diff --git a/lib/i18n.ts b/lib/i18n.ts index c78e8dbbf..c91b385a7 100644 --- a/lib/i18n.ts +++ b/lib/i18n.ts @@ -19,7 +19,11 @@ document.addEventListener( "DOMContentLoaded", function () { - document.body.lang = chrome.i18n.getUILanguage(); + try { + document.body.lang = chrome.i18n.getUILanguage(); + } catch (e) { + // chrome.* not available? + } }); declare var i18n: any; @@ -134,7 +138,11 @@ var i18n = function i18n(strings: string[], ...values: any[]) { return tr; }; -i18n.lang = chrome.i18n.getUILanguage(); +try { + i18n.lang = chrome.i18n.getUILanguage(); +} catch (e) { + console.warn("i18n default language not available"); +} i18n.strings = {}; diff --git a/lib/wallet/renderHtml.ts b/lib/wallet/renderHtml.ts new file mode 100644 index 000000000..6d9823d71 --- /dev/null +++ b/lib/wallet/renderHtml.ts @@ -0,0 +1,49 @@ +/* + This file is part of TALER + (C) 2016 INRIA + + TALER is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + TALER is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + TALER; see the file COPYING. If not, see + */ + +/** + * Helpers functions to render Taler-related data structures to HTML. + * + * @author Florian Dold + */ + + +import {AmountJson, Contract} from "./types"; + + +export function prettyAmount(amount: AmountJson) { + let v = amount.value + amount.fraction / 1e6; + return `${v.toFixed(2)} ${amount.currency}`; +} + +export function renderContract(contract: Contract): any { + let merchantName = m("strong", contract.merchant.name); + let amount = m("strong", prettyAmount(contract.amount)); + + return m("div", {}, [ + m("p", + i18n.parts`${merchantName} + wants to enter a contract over ${amount} + with you.`), + m("p", + i18n`You are about to purchase:`), + m('ul', + + contract.products.map( + (p: any) => m("li", + `${p.description}: ${prettyAmount(p.price)}`))) + ]); +} \ No newline at end of file diff --git a/pages/confirm-contract.tsx b/pages/confirm-contract.tsx index 19b049eb5..52e4cb79a 100644 --- a/pages/confirm-contract.tsx +++ b/pages/confirm-contract.tsx @@ -27,15 +27,9 @@ import MithrilComponent = _mithril.MithrilComponent; import {substituteFulfillmentUrl} from "../lib/wallet/helpers"; import m from "mithril"; import {Contract, AmountJson} from "../lib/wallet/types"; +import {renderContract, prettyAmount} from "../lib/wallet/renderHtml"; "use strict"; - -function prettyAmount(amount: AmountJson) { - let v = amount.value + amount.fraction / 1e6; - return `${v.toFixed(2)} ${amount.currency}`; -} - - const Details = { controller() { return {collapsed: m.prop(true)}; @@ -77,17 +71,7 @@ export function main() { var Contract = { view(ctrl: any) { return [ - m("p", - i18n.parts`${m("strong", contract.merchant.name)} - wants to enter a contract over ${m("strong", - prettyAmount(contract.amount))} - with you.`), - m("p", - i18n`You are about to purchase:`), - m('ul', - _.map(contract.products, - (p: any) => m("li", - `${p.description}: ${prettyAmount(p.price)}`))), + renderContract(contract), m("button.accept", {onclick: doPayment, disabled: payDisabled}, i18n`Confirm Payment`), (error ? m("p.errorbox", error) : []), m(Details, contract) diff --git a/playground/contract.html b/playground/contract.html new file mode 100644 index 000000000..3bc7d3480 --- /dev/null +++ b/playground/contract.html @@ -0,0 +1,68 @@ + + + + Contract playground + + + + + + + +
+ + + -- cgit v1.2.3