custom transaction directive added

pull/30/head
moneroexamples 7 years ago
parent 476cc7f20e
commit 5d2cc16879

@ -94,6 +94,7 @@ target_link_libraries(${PROJECT_NAME}
mysqlpp
mysqlclient
easylogging
readline
${Boost_LIBRARIES}
pthread
unbound

@ -1,4 +1,3 @@
<!DOCTYPE html>
<html ng-app="thinWallet">
@ -69,6 +68,7 @@
<!--<script src="js/directives/scroll.js?1"></script>-->
<script src="js/directives/qr_code.js?1"></script>
<script src="js/directives/modal.js?1"></script>
<script src="js/directives/transacation.js?1"></script>
<!--<script src="js/directives/forms.js?1"></script>-->
<script src="js/routes.js?4"></script>
</head>

@ -0,0 +1,7 @@
thinwalletDirectives.directive('transaction', function () {
return {
restrict: 'E',
templateUrl:"/js/directives/transaction.html",
replace: true,
};
});

@ -0,0 +1,40 @@
<div class="w-row">
<div class="w-row" ng-click="toggle_tx_detail(tx)">
<div class="w-col w-col-2 responsive-column">
<div class="transaction-detail value-bold" style="color: #e65a5a;" ng-show="tx_is_mempool(tx)">
{{tx.amount | money}} (unconfirmed)
</div>
<div class="transaction-detail value-bold" ng-show="!tx_is_mempool(tx)">
{{tx.amount | money}} <span ng-show="!tx_is_unlocked(tx)"><i class="fa fa-lock"></i></span>
</div>
</div>
<div class="w-col w-col-3 responsive-column">
<div class="transaction-detail">{{tx.timestamp | time}}</div>
</div>
<div class="w-col w-col-1 responsive-column">
<div class="transaction-detail">{{tx.mixin}}</div>
</div>
<div class="w-col w-col-6 responsive-column">
<div class="move-text-div">
<div class="transaction-address">{{tx.hash}}</div>
</div>
</div>
</div>
<div class="w-row" style="margin-bottom: 15px;" ng-show="showing_tx_detail(tx)">
<div class="w-col w-col-11">
<div class="transaction-detail" style="font-size: 10px;" ng-show="!tx_is_unlocked(tx)">
{{tx_locked_reason(tx)}}
</div>
<div class="transaction-detail transaction-page move-text-div">
<div class="transaction-address">
<span class="bold">Block no:</span> &nbsp;&nbsp;{{tx_is_mempool(tx) ? 'N/A (tx in mempool)' : tx.height}}
&nbsp;&nbsp;&nbsp;&nbsp;<span class="bold">Payment ID:</span> &nbsp;&nbsp;{{tx.payment_id || "N/A"}}
</div>
</div>
</div>
</div>
</div>

@ -50,57 +50,7 @@
</div>
</div>
<div class="received-div" ng-repeat="tx in transactions | limitTo:10">
<div class="w-row" ng-click="toggle_tx_detail(tx)">
<div class="w-col w-col-2 responsive-column">
<!--
<div class="transaction-detail value-bold" ng-show="tx_is_confirmed(tx)">
{{tx.amount | money}} <span ng-show="!tx_is_unlocked(tx)"><i class="fa fa-lock"></i></span>
</div>
<div class="transaction-detail value-bold" style="color: #e65a5a;" ng-show="!tx_is_confirmed(tx)">
{{tx.amount | money}} (unconfirmed<span ng-show="tx_is_mempool(tx)">, mempool</span>)
<span ng-show="!tx_is_unlocked(tx)"><i class="fa fa-lock"></i></span>
</div>
-->
<div class="transaction-detail value-bold" style="color: #e65a5a;" ng-show="tx_is_mempool(tx)">
{{tx.amount | money}} (unconfirmed)
</div>
<div class="transaction-detail value-bold" ng-show="!tx_is_mempool(tx)">
{{tx.amount | money}} <span ng-show="!tx_is_unlocked(tx)"><i class="fa fa-lock"></i></span>
</div>
</div>
<div class="w-col w-col-3 responsive-column">
<div class="transaction-detail">{{tx.timestamp | time}}</div>
</div>
<div class="w-col w-col-1 responsive-column">
<div class="transaction-detail">{{tx.mixin}}</div>
</div>
<div class="w-col w-col-6 responsive-column">
<div class="move-text-div">
<div class="transaction-address">{{tx.hash}}</div>
</div>
</div>
</div>
<div class="w-row" style="margin-bottom: 15px;" ng-show="showing_tx_detail(tx)">
<div class="w-col w-col-11">
<div class="transaction-detail" style="font-size: 10px;" ng-show="!tx_is_unlocked(tx)">
{{tx_locked_reason(tx)}}
</div>
<div class="transaction-detail transaction-page move-text-div">
<div class="transaction-address">
<span class="bold">Block no:</span> &nbsp;&nbsp;{{tx_is_mempool(tx) ? 'N/A (tx in mempool)' : tx.height}}
&nbsp;&nbsp;&nbsp;&nbsp;<span class="bold">Payment ID:</span> &nbsp;&nbsp;{{tx.payment_id || "N/A"}}
</div>
</div>
</div>
</div>
</div>
<transaction></transaction>
</div>
</div>

@ -62,56 +62,8 @@
</div>
<div class="received-div transaction-body lighter" ng-repeat="tx in transactions | orderBy:predicate:reverse | startFrom:pageNum*pageSize | limitTo:pageSize">
<div class="w-row" ng-click="toggle_tx_detail(tx)">
<div class="w-col w-col-2">
<div class="transaction-detail transaction-left transaction-page">
<!--
<strong class="bold" ng-show="tx_is_confirmed(tx)">{{tx.amount | money}} <span ng-show="!tx_is_unlocked(tx)"><i class="fa fa-lock"></i></span></strong>
<strong class="bold red" ng-show="!tx_is_confirmed(tx)">
{{tx.amount | money}} (unconfirmed<span ng-show="tx_is_mempool(tx)">, mempool</span>)
<span ng-show="!tx_is_unlocked(tx)"><i class="fa fa-lock"></i></span>
</strong>
-->
<div class="transaction-detail value-bold" style="color: #e65a5a;" ng-show="tx_is_mempool(tx)">
{{tx.amount | money}} (unconfirmed)
</div>
<div class="transaction-detail value-bold" ng-show="!tx_is_mempool(tx)">
{{tx.amount | money}} <span ng-show="!tx_is_unlocked(tx)"><i class="fa fa-lock"></i></span>
</div>
</div>
</div>
<div class="w-col w-col-3">
<div class="transaction-detail transaction-page">{{tx.timestamp | time}}</div>
</div>
<div class="w-col w-col-1">
<div class="transaction-detail transaction-page">{{tx.mixin}}</div>
</div>
<div class="w-col w-col-6">
<div class="move-text-div">
<div class="transaction-address transaction-page">{{tx.hash}}</div>
</div>
</div>
<transaction></transaction>
</div>
<div class="w-row" ng-show="showing_tx_detail(tx)">
<div class="w-col w-col-11">
<div class="transaction-detail transaction-left" style="font-size: 10px;" ng-show="!tx_is_unlocked(tx)">
{{tx_locked_reason(tx)}}
</div>
<div class="transaction-detail transaction-page move-text-div">
<div class="transaction-address transaction-page">
<span class="bold">Block no:</span> &nbsp;&nbsp;{{tx_is_mempool(tx) ? 'N/A (tx in mempool)' : tx.height}}
&nbsp;&nbsp;&nbsp;&nbsp;<span class="bold">Payment ID:</span> &nbsp;&nbsp;{{tx.payment_id || "N/A"}}
</div>
</div>
</div>
</div>
</div>
<a class="table-btn left pointer" ng-click="navigatePage(1)">&lt;&lt; Previous 10</a>
<a class="table-btn right pointer" ng-click="navigatePage(-1)">Next 10 &gt;&gt;</a>
</div>

Loading…
Cancel
Save