diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a84d2b..32fdf18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,8 +13,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Changed -- (2022-07-22) Invoice dialog completed. Notifications to inform - successful/fail of URL copy to clipboard added. +- (2022-07-23) - Checkout dialog with QR image redesigned. + - Invoice dialog completed. Notifications to inform + successful/failed URL-copy-to-clipboard added. - (2022-07-22) Notifier service created - replaces snackbar used for reporting invalid viewing key. Notifier component created - used to apply custom style to message sent by Notifier service. diff --git a/src/app/checkout/checkout.component.css b/src/app/checkout/checkout.component.css index 0b79f36..459eaa2 100644 --- a/src/app/checkout/checkout.component.css +++ b/src/app/checkout/checkout.component.css @@ -1,3 +1,14 @@ .text { font-family: 'Spartan', sans-serif; } + +.askPayment { + font-family: "Spartan"; + background: #ff5722; + font-weight: 700; + font-size: 18px; + text-align: center; + color: white; + line-height: 20px; + padding: 10px; +} diff --git a/src/app/checkout/checkout.component.html b/src/app/checkout/checkout.component.html index 6765d9d..401da48 100644 --- a/src/app/checkout/checkout.component.html +++ b/src/app/checkout/checkout.component.html @@ -1,28 +1,37 @@ -
-

Scan to make payment

-
+
- -
+
+ Scan to make payment
- - - +

+	
- - + + -
- - - - - + +
-
+ + + + + + + + +
+ + + + + +
+
+ +
diff --git a/src/app/checkout/checkout.component.ts b/src/app/checkout/checkout.component.ts index 79698b6..0dae1ff 100644 --- a/src/app/checkout/checkout.component.ts +++ b/src/app/checkout/checkout.component.ts @@ -32,12 +32,18 @@ export class CheckoutComponent implements OnInit{ } ngOnInit() { - var qrcode = new QRCode(document.getElementById("checkout-qr"), { - text: this.codeString, - logo: "/assets/zcash.png", - logoWidth: 80, - logoHeight: 80 - }); + var qrcode = new QRCode(document.getElementById("checkout-qr"), + { + text: this.codeString, + logo: "/assets/zcash.png", + width: 220, + height: 220, + logoWidth: 60, + logoHeight: 60, + correctLevel: QRCode.CorrectLevel.H + }); + console.log(">>> " + qrcode); + } confirm() { diff --git a/src/app/prompt-invoice/prompt-invoice.component.css b/src/app/prompt-invoice/prompt-invoice.component.css index 8000f07..b3176b0 100644 --- a/src/app/prompt-invoice/prompt-invoice.component.css +++ b/src/app/prompt-invoice/prompt-invoice.component.css @@ -40,3 +40,10 @@ cursor: pointer; } +.qr-code{ + border-radius: 0.5rem; + border-bottom-left-radius: 0.5rem; + border-bottom-right-radius: 0.5rem; +} + + diff --git a/src/app/receipt-qr/receipt-qr.component.css b/src/app/receipt-qr/receipt-qr.component.css index ef8f0ab..d4899c1 100644 --- a/src/app/receipt-qr/receipt-qr.component.css +++ b/src/app/receipt-qr/receipt-qr.component.css @@ -2,3 +2,21 @@ .text { font-family: 'Spartan', sans-serif; } + +.receipt { + font-family: "Spartan"; + background: #ff5722; + font-weight: 700; + font-size: 18px; + text-align: center; + color: white; + line-height: 20px; + padding: 10px; +} + +.qrbody { + display: flex; + flex-direction: column; + align-items: center; + background-color: #e8eaf0; +} \ No newline at end of file diff --git a/src/app/receipt-qr/receipt-qr.component.html b/src/app/receipt-qr/receipt-qr.component.html index 0533f99..0d743e1 100644 --- a/src/app/receipt-qr/receipt-qr.component.html +++ b/src/app/receipt-qr/receipt-qr.component.html @@ -1,13 +1,18 @@ -
-

Scan for your Receipt

-
+
- -
-
+
+ Scan for your Receipt +
- - - +
+
+
+ + + + + + +
\ No newline at end of file