fixed spelling and cleaned up debugging code

This commit is contained in:
Landon 2018-03-06 17:28:05 +09:00
commit 82e43fb078
5 changed files with 132 additions and 10 deletions

View file

@ -7,7 +7,7 @@
<meta name="msapplication-tap-highlight" content="no">
<meta name="format-detection" content="telephone=no">
<link rel="stylesheet" type="text/css" href="css/main.css">
<link rel="stylesheet" type="text/css" href="css/payment_recieved.css">
<link rel="stylesheet" type="text/css" href="css/payment-received.css">
<link rel="stylesheet" type="text/css" href="css/chartist.css">
<link rel="stylesheet" type="text/css" href="css/bitcoin.com.css">
<link rel="stylesheet" type="text/css" href="css/icomoon.css">

View file

@ -5,7 +5,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
var listeners = [];
$scope.bchAddressType = { type: 'cashaddr' };
var bchAddresses = {};
$scope.payment_recieved = false;
$scope.showingPaymentReceived = false;
$scope.isCordova = platformInfo.isCordova;
$scope.isNW = platformInfo.isNW;
@ -56,14 +56,14 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
// create subscription
var msg = JSON.stringify(paymentSubscriptionObj);
currentAddressSocket.onopen = function (event) {
console.log("message sent: " + msg);
//console.log("message sent: " + msg);
currentAddressSocket.send(msg);
}
// listen for response
currentAddressSocket.onmessage = function (event) {
console.log("message received:" + event.data);
//console.log("message received:" + event.data);
receivedPayment(event.data);
}
@ -118,7 +118,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
}*/
if (data.op == "utx") {
$scope.payment_recieved = true
$scope.showingPaymentReceived = true
$scope.$apply();
}
}

View file

@ -0,0 +1,122 @@
/*
CSS svg animation
Copyright (c) 2018 by Lee Porter (https://codepen.io/elevaunt/pen/JYRBzJ)
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
svg {
width: 100px;
display: block;
margin: 40px auto 0;
}
.path {
stroke-dasharray: 1000;
stroke-dashoffset: 0;
}
.path.circle {
-webkit-animation: dash 0.9s ease-in-out;
animation: dash 0.9s ease-in-out;
}
.path.line {
stroke-dashoffset: 1000;
-webkit-animation: dash 0.9s 0.35s ease-in-out forwards;
animation: dash 0.9s 0.35s ease-in-out forwards;
}
.path.check {
stroke-dashoffset: -100;
-webkit-animation: dash-check 0.9s 0.35s ease-in-out forwards;
animation: dash-check 0.9s 0.35s ease-in-out forwards;
}
p {
text-align: center;
margin: 20px 0 60px;
font-size: 1.25em;
}
p.success {
color: #27B03C;
font-family:sans-serif;
}
@-webkit-keyframes dash {
0% {
stroke-dashoffset: 1000;
}
100% {
stroke-dashoffset: 0;
}
}
@keyframes dash {
0% {
stroke-dashoffset: 1000;
}
100% {
stroke-dashoffset: 0;
}
}
@-webkit-keyframes dash-check {
0% {
stroke-dashoffset: -100;
}
100% {
stroke-dashoffset: 900;
}
}
@keyframes dash-check {
0% {
stroke-dashoffset: -100;
}
100% {
stroke-dashoffset: 900;
}
}
/*!
* animate.css -http://daneden.me/animate
* Version - 3.6.0
* Licensed under the MIT license - http://opensource.org/licenses/MIT
*
* Copyright (c) 2018 Daniel Eden
*/
.animated {
animation-delay: 0.55s;
-webkit-animation-duration: 0.5s;
animation-duration: 0.5s;
-webkit-animation-fill-mode: both;
animation-fill-mode: both;
}
@-webkit-keyframes fadeIn {
from {
opacity: 0;
}
to {
opacity: 1;
}
}
@keyframes fadeIn {
from {
opacity: 0;
}
to {
opacity: 1;
}
}
.fadeIn {
-webkit-animation-name: fadeIn;
animation-name: fadeIn;
}

View file

@ -7,7 +7,7 @@
<meta name="msapplication-tap-highlight" content="no">
<meta name="format-detection" content="telephone=no">
<link rel="stylesheet" type="text/css" href="css/main.css">
<link rel="stylesheet" type="text/css" href="css/payment_recieved.css">
<link rel="stylesheet" type="text/css" href="css/payment-received.css">
<link rel="stylesheet" type="text/css" href="css/chartist.css">
<link rel="stylesheet" type="text/css" href="css/bitcoin.com.css">
<link rel="stylesheet" type="text/css" href="css/icomoon.css">

View file

@ -28,7 +28,7 @@
</div>
</div>
<div class="address-info" ng-if="wallet && wallet.isComplete()">
<div ng-show="!payment_recieved">
<div ng-show="!showingPaymentReceived">
<div>
<button ng-show="addr" class="button button-standard button-small" ng-click="requestSpecificAmount()">
<span translate>Request Specific amount</span>
@ -53,13 +53,13 @@
</div>
</div>
</div>
<!-- animation for payment recieved -->
<div ng-show="payment_recieved" ng-click="payment_recieved = false">
<!-- animation for payment received -->
<div ng-show="showingPaymentReceived" ng-click="showingPaymentReceived = false">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 130.2 130.2">
<circle class="path circle" fill="none" stroke="#19B234" stroke-width="6" stroke-miterlimit="10" cx="65.1" cy="65.1" r="62.1"/>
<polyline class="path check" fill="none" stroke="#19B234" stroke-width="6" stroke-linecap="round" stroke-miterlimit="10" points="100.2,40.2 51.5,88.8 29.8,67.5 "/>
</svg>
<p class="success animated fadeIn">Payment Received!<br> Click To See Address Again</p>
<p class="success animated fadeIn">Payment Received!<br> <br>Return To Address</p>
</div>
<!-- end of animation -->
<div ng-show="addr && wallet.coin == 'bch'">