From a90638f893c5103aee8d1ed63527c61dab2622aa Mon Sep 17 00:00:00 2001 From: reyraa Date: Fri, 2 Jun 2017 12:35:30 +0200 Subject: [PATCH 1/4] Add code styling for signed and verified message --- src/components/signVerify/sign-message.less | 17 +++++++++++++++++ src/components/signVerify/signMessage.js | 1 + src/components/signVerify/signMessage.pug | 2 +- src/components/signVerify/verifyMessage.pug | 2 +- 4 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 src/components/signVerify/sign-message.less diff --git a/src/components/signVerify/sign-message.less b/src/components/signVerify/sign-message.less new file mode 100644 index 000000000..bfbe2620b --- /dev/null +++ b/src/components/signVerify/sign-message.less @@ -0,0 +1,17 @@ +sign-message, verify-message { + md-input-container { + margin-bottom: 0; + textarea.result { + background: #333; + border-radius: 5px; + overflow: hidden; + color: #fff; + font-family: monospace; + padding: 12px 24px; + } + + .md-errors-spacer:empty { + display: none; + } + } +} diff --git a/src/components/signVerify/signMessage.js b/src/components/signVerify/signMessage.js index 018185aca..d1db12c41 100644 --- a/src/components/signVerify/signMessage.js +++ b/src/components/signVerify/signMessage.js @@ -1,4 +1,5 @@ import lisk from 'lisk-js'; +import './sign-message.less'; /** * This component contains the form for signing a message diff --git a/src/components/signVerify/signMessage.pug b/src/components/signVerify/signMessage.pug index 968786e57..4a34797bd 100644 --- a/src/components/signVerify/signMessage.pug +++ b/src/components/signVerify/signMessage.pug @@ -24,5 +24,5 @@ div md-button.md-raised.md-primary.sign-button(ngclipboard, data-clipboard-text='{{$ctrl.result}}', ng-click='$ctrl.showResult()', ngclipboard-success="$ctrl.dialog.successToast('Result copied to clipboard')", ng-disabled='!$ctrl.result || $ctrl.resultIsShown') Sign and copy result to clipboard div(ng-if='$ctrl.resultIsShown') md-input-container.md-block - label Result + h4 Result textarea.result(name='result', ng-model='$ctrl.result', readonly) diff --git a/src/components/signVerify/verifyMessage.pug b/src/components/signVerify/verifyMessage.pug index 9e99fb99f..bcfc20d48 100644 --- a/src/components/signVerify/verifyMessage.pug +++ b/src/components/signVerify/verifyMessage.pug @@ -24,6 +24,6 @@ div div(ng-message='invalid') Invalid div(ng-show='$ctrl.result') md-input-container.md-block - label Original Message + h4 Original Message textarea.result(name='result', ng-model='$ctrl.result', readonly) From 558ba642ed3c7647ee3ec6bbae446ba0740d897f Mon Sep 17 00:00:00 2001 From: reyraa Date: Fri, 2 Jun 2017 14:20:44 +0200 Subject: [PATCH 2/4] Minor fixings --- src/components/signVerify/sign-message.less | 7 +++++++ src/components/signVerify/signMessage.pug | 2 +- src/components/signVerify/verifyMessage.pug | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/components/signVerify/sign-message.less b/src/components/signVerify/sign-message.less index bfbe2620b..640e36473 100644 --- a/src/components/signVerify/sign-message.less +++ b/src/components/signVerify/sign-message.less @@ -14,4 +14,11 @@ sign-message, verify-message { display: none; } } + + div.result-wrapper { + padding-top: 24px; + md-input-container { + margin-top: 0; + } + } } diff --git a/src/components/signVerify/signMessage.pug b/src/components/signVerify/signMessage.pug index 4a34797bd..446496568 100644 --- a/src/components/signVerify/signMessage.pug +++ b/src/components/signVerify/signMessage.pug @@ -22,7 +22,7 @@ div md-button(ng-click="$ctrl.$mdDialog.cancel()") Cancel span(flex) md-button.md-raised.md-primary.sign-button(ngclipboard, data-clipboard-text='{{$ctrl.result}}', ng-click='$ctrl.showResult()', ngclipboard-success="$ctrl.dialog.successToast('Result copied to clipboard')", ng-disabled='!$ctrl.result || $ctrl.resultIsShown') Sign and copy result to clipboard - div(ng-if='$ctrl.resultIsShown') + div.result-wrapper(ng-if='$ctrl.resultIsShown') md-input-container.md-block h4 Result textarea.result(name='result', ng-model='$ctrl.result', readonly) diff --git a/src/components/signVerify/verifyMessage.pug b/src/components/signVerify/verifyMessage.pug index bcfc20d48..8c2f8e6ca 100644 --- a/src/components/signVerify/verifyMessage.pug +++ b/src/components/signVerify/verifyMessage.pug @@ -22,7 +22,7 @@ div textarea.signature(name='signature', ng-model='$ctrl.signature.value', ng-change='$ctrl.verify()') div(ng-messages='$ctrl.signature.error') div(ng-message='invalid') Invalid - div(ng-show='$ctrl.result') + div.result-wrapper(ng-show='$ctrl.result') md-input-container.md-block h4 Original Message textarea.result(name='result', ng-model='$ctrl.result', readonly) From 1a2d657435988d25189313f6d682730e5afe0660 Mon Sep 17 00:00:00 2001 From: reyraa Date: Fri, 2 Jun 2017 14:25:10 +0200 Subject: [PATCH 3/4] Renamed the less file and also imported in verifyMessage module --- src/components/signVerify/signMessage.js | 2 +- .../signVerify/{sign-message.less => signVerifyMessage.less} | 0 src/components/signVerify/verifyMessage.js | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) rename src/components/signVerify/{sign-message.less => signVerifyMessage.less} (100%) diff --git a/src/components/signVerify/signMessage.js b/src/components/signVerify/signMessage.js index d1db12c41..bc1137913 100644 --- a/src/components/signVerify/signMessage.js +++ b/src/components/signVerify/signMessage.js @@ -1,5 +1,5 @@ import lisk from 'lisk-js'; -import './sign-message.less'; +import './signVerifyMessage.less'; /** * This component contains the form for signing a message diff --git a/src/components/signVerify/sign-message.less b/src/components/signVerify/signVerifyMessage.less similarity index 100% rename from src/components/signVerify/sign-message.less rename to src/components/signVerify/signVerifyMessage.less diff --git a/src/components/signVerify/verifyMessage.js b/src/components/signVerify/verifyMessage.js index 6591149b0..72a886fb7 100644 --- a/src/components/signVerify/verifyMessage.js +++ b/src/components/signVerify/verifyMessage.js @@ -1,4 +1,5 @@ import lisk from 'lisk-js'; +import './signVerifyMessage.less'; /** * This component contains the form for verifying a signed message From 34694f7cbb79d7f63253cf654e2579c401b04ca1 Mon Sep 17 00:00:00 2001 From: Vit Stanislav Date: Fri, 2 Jun 2017 15:31:42 +0200 Subject: [PATCH 4/4] Fix sign message action row padding ... and hide it after result shown --- src/components/signVerify/signMessage.pug | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/signVerify/signMessage.pug b/src/components/signVerify/signMessage.pug index 446496568..4852ad409 100644 --- a/src/components/signVerify/signMessage.pug +++ b/src/components/signVerify/signMessage.pug @@ -18,10 +18,10 @@ div md-input-container.md-block label Message textarea.message(name='message', ng-model='$ctrl.message', ng-change='$ctrl.sign()', md-autofocus) - div(layout='row', layout-align='center center') - md-button(ng-click="$ctrl.$mdDialog.cancel()") Cancel - span(flex) - md-button.md-raised.md-primary.sign-button(ngclipboard, data-clipboard-text='{{$ctrl.result}}', ng-click='$ctrl.showResult()', ngclipboard-success="$ctrl.dialog.successToast('Result copied to clipboard')", ng-disabled='!$ctrl.result || $ctrl.resultIsShown') Sign and copy result to clipboard + md-dialog-actions(layout='row', ng-if='!$ctrl.resultIsShown') + md-button(ng-click="$ctrl.$mdDialog.cancel()") Cancel + span(flex) + md-button.md-raised.md-primary.sign-button(ngclipboard, data-clipboard-text='{{$ctrl.result}}', ng-click='$ctrl.showResult()', ngclipboard-success="$ctrl.dialog.successToast('Result copied to clipboard')", ng-disabled='!$ctrl.result || $ctrl.resultIsShown') Sign and copy result to clipboard div.result-wrapper(ng-if='$ctrl.resultIsShown') md-input-container.md-block h4 Result