Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
Breeze
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DeStream-public
Breeze
Commits
25505b59
Commit
25505b59
authored
Jun 28, 2017
by
dev0tion
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add polling
parent
53abca4c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
13 deletions
+46
-13
api.service.ts
Breeze.UI/src/app/shared/services/api.service.ts
+17
-4
dashboard.component.ts
Breeze.UI/src/app/wallet/dashboard/dashboard.component.ts
+19
-7
history.component.ts
Breeze.UI/src/app/wallet/history/history.component.ts
+10
-2
No files found.
Breeze.UI/src/app/shared/services/api.service.ts
View file @
25505b59
...
@@ -2,7 +2,9 @@ import { Injectable } from '@angular/core';
...
@@ -2,7 +2,9 @@ import { Injectable } from '@angular/core';
import
{
Http
,
Headers
,
Response
,
RequestOptions
,
URLSearchParams
}
from
'@angular/http'
;
import
{
Http
,
Headers
,
Response
,
RequestOptions
,
URLSearchParams
}
from
'@angular/http'
;
import
{
Observable
}
from
'rxjs/Observable'
;
import
{
Observable
}
from
'rxjs/Observable'
;
import
'rxjs/add/operator/map'
;
import
'rxjs/add/operator/map'
;
import
'rxjs/add/operator/switchMap'
;
import
'rxjs/add/operator/catch'
;
import
'rxjs/add/operator/catch'
;
import
"rxjs/add/observable/interval"
;
import
{
WalletCreation
}
from
'../classes/wallet-creation'
;
import
{
WalletCreation
}
from
'../classes/wallet-creation'
;
import
{
WalletRecovery
}
from
'../classes/wallet-recovery'
;
import
{
WalletRecovery
}
from
'../classes/wallet-recovery'
;
...
@@ -22,6 +24,7 @@ export class ApiService {
...
@@ -22,6 +24,7 @@ export class ApiService {
private
mockApiUrl
=
'http://localhost:3000/api'
;
private
mockApiUrl
=
'http://localhost:3000/api'
;
private
webApiUrl
=
'http://localhost:5000/api'
;
private
webApiUrl
=
'http://localhost:5000/api'
;
private
headers
=
new
Headers
({
'Content-Type'
:
'application/json'
});
private
headers
=
new
Headers
({
'Content-Type'
:
'application/json'
});
private
pollingInterval
=
2000
;
/**
/**
* Gets available wallets at the default path
* Gets available wallets at the default path
...
@@ -76,9 +79,14 @@ export class ApiService {
...
@@ -76,9 +79,14 @@ export class ApiService {
params
.
set
(
'walletName'
,
data
.
walletName
);
params
.
set
(
'walletName'
,
data
.
walletName
);
params
.
set
(
'coinType'
,
data
.
coinType
.
toString
());
params
.
set
(
'coinType'
,
data
.
coinType
.
toString
());
return
this
.
http
return
Observable
.
get
(
this
.
webApiUrl
+
'/wallet/balance'
,
new
RequestOptions
({
headers
:
this
.
headers
,
search
:
params
}))
.
interval
(
this
.
pollingInterval
)
.
switchMap
(()
=>
this
.
http
.
get
(
this
.
webApiUrl
+
'/wallet/balance'
,
new
RequestOptions
({
headers
:
this
.
headers
,
search
:
params
})))
.
map
((
response
:
Response
)
=>
response
);
.
map
((
response
:
Response
)
=>
response
);
// return this.http
// .get(this.webApiUrl + '/wallet/balance', new RequestOptions({headers: this.headers, search: params}))
// .map((response: Response) => response);
}
}
/**
/**
...
@@ -89,9 +97,14 @@ export class ApiService {
...
@@ -89,9 +97,14 @@ export class ApiService {
params
.
set
(
'walletName'
,
data
.
walletName
);
params
.
set
(
'walletName'
,
data
.
walletName
);
params
.
set
(
'coinType'
,
data
.
coinType
.
toString
());
params
.
set
(
'coinType'
,
data
.
coinType
.
toString
());
return
this
.
http
return
Observable
.
get
(
this
.
webApiUrl
+
'/wallet/history'
,
new
RequestOptions
({
headers
:
this
.
headers
,
search
:
params
}))
.
interval
(
this
.
pollingInterval
)
.
switchMap
(()
=>
this
.
http
.
get
(
this
.
webApiUrl
+
'/wallet/history'
,
new
RequestOptions
({
headers
:
this
.
headers
,
search
:
params
})))
.
map
((
response
:
Response
)
=>
response
);
.
map
((
response
:
Response
)
=>
response
);
// return this.http
// .get(this.webApiUrl + '/wallet/history', new RequestOptions({headers: this.headers, search: params}))
// .map((response: Response) => response);
}
}
/**
/**
...
...
Breeze.UI/src/app/wallet/dashboard/dashboard.component.ts
View file @
25505b59
import
{
Component
,
OnInit
,
Input
}
from
'@angular/core'
;
import
{
Component
,
OnInit
,
OnDestroy
,
Input
}
from
'@angular/core'
;
import
{
NgbModal
,
NgbActiveModal
}
from
'@ng-bootstrap/ng-bootstrap'
;
import
{
NgbModal
,
NgbActiveModal
}
from
'@ng-bootstrap/ng-bootstrap'
;
import
{
ApiService
}
from
'../../shared/services/api.service'
;
import
{
ApiService
}
from
'../../shared/services/api.service'
;
import
{
GlobalService
}
from
'../../shared/services/global.service'
;
import
{
GlobalService
}
from
'../../shared/services/global.service'
;
...
@@ -8,6 +8,10 @@ import { WalletInfo } from '../../shared/classes/wallet-info';
...
@@ -8,6 +8,10 @@ import { WalletInfo } from '../../shared/classes/wallet-info';
import
{
SendComponent
}
from
'../send/send.component'
;
import
{
SendComponent
}
from
'../send/send.component'
;
import
{
ReceiveComponent
}
from
'../receive/receive.component'
;
import
{
ReceiveComponent
}
from
'../receive/receive.component'
;
import
{
Observable
}
from
'rxjs/Rx'
;
import
{
Subscription
}
from
'rxjs/Subscription'
;
import
'rxjs/add/operator/first'
;
@
Component
({
@
Component
({
selector
:
'dashboard-component'
,
selector
:
'dashboard-component'
,
templateUrl
:
'./dashboard.component.html'
,
templateUrl
:
'./dashboard.component.html'
,
...
@@ -20,10 +24,17 @@ export class DashboardComponent {
...
@@ -20,10 +24,17 @@ export class DashboardComponent {
private
confirmedBalance
:
number
;
private
confirmedBalance
:
number
;
private
unconfirmedBalance
:
number
;
private
unconfirmedBalance
:
number
;
private
transactions
:
any
;
private
transactions
:
any
;
private
walletBalanceSubscription
:
Subscription
;
private
walletHistorySubscription
:
Subscription
;
ngOnInit
()
{
ngOnInit
()
{
this
.
getWalletBalance
();
this
.
getWalletBalance
();
this
.
getHistory
();
this
.
getHistory
();
};
ngOnDestroy
()
{
this
.
walletBalanceSubscription
.
unsubscribe
();
this
.
walletHistorySubscription
.
unsubscribe
();
};
};
private
openSendDialog
()
{
private
openSendDialog
()
{
...
@@ -36,8 +47,9 @@ export class DashboardComponent {
...
@@ -36,8 +47,9 @@ export class DashboardComponent {
private
getWalletBalance
()
{
private
getWalletBalance
()
{
let
walletInfo
=
new
WalletInfo
(
this
.
globalService
.
getWalletName
(),
this
.
globalService
.
getCoinType
())
let
walletInfo
=
new
WalletInfo
(
this
.
globalService
.
getWalletName
(),
this
.
globalService
.
getCoinType
())
this
.
apiService
.
getWalletBalance
(
walletInfo
)
this
.
walletBalanceSubscription
=
this
.
apiService
.
getWalletBalance
(
walletInfo
)
.
subscribe
(
.
first
()
.
subscribe
(
response
=>
{
response
=>
{
if
(
response
.
status
>=
200
&&
response
.
status
<
400
)
{
if
(
response
.
status
>=
200
&&
response
.
status
<
400
)
{
let
balanceResponse
=
response
.
json
();
let
balanceResponse
=
response
.
json
();
...
@@ -56,7 +68,7 @@ export class DashboardComponent {
...
@@ -56,7 +68,7 @@ export class DashboardComponent {
private
getHistory
()
{
private
getHistory
()
{
let
walletInfo
=
new
WalletInfo
(
this
.
globalService
.
getWalletName
(),
this
.
globalService
.
getCoinType
())
let
walletInfo
=
new
WalletInfo
(
this
.
globalService
.
getWalletName
(),
this
.
globalService
.
getCoinType
())
this
.
apiService
.
getWalletHistory
(
walletInfo
)
this
.
walletHistorySubscription
=
this
.
apiService
.
getWalletHistory
(
walletInfo
)
.
subscribe
(
.
subscribe
(
response
=>
{
response
=>
{
if
(
response
.
status
>=
200
&&
response
.
status
<
400
)
{
if
(
response
.
status
>=
200
&&
response
.
status
<
400
)
{
...
...
Breeze.UI/src/app/wallet/history/history.component.ts
View file @
25505b59
import
{
Component
,
OnInit
}
from
'@angular/core'
;
import
{
Component
,
OnInit
,
OnDestroy
}
from
'@angular/core'
;
import
{
ApiService
}
from
'../../shared/services/api.service'
;
import
{
ApiService
}
from
'../../shared/services/api.service'
;
import
{
GlobalService
}
from
'../../shared/services/global.service'
;
import
{
GlobalService
}
from
'../../shared/services/global.service'
;
import
{
WalletInfo
}
from
'../../shared/classes/wallet-info'
;
import
{
WalletInfo
}
from
'../../shared/classes/wallet-info'
;
import
{
Observable
}
from
'rxjs/Rx'
;
import
{
Subscription
}
from
'rxjs/Subscription'
;
@
Component
({
@
Component
({
selector
:
'history-component'
,
selector
:
'history-component'
,
templateUrl
:
'./history.component.html'
,
templateUrl
:
'./history.component.html'
,
...
@@ -16,14 +19,19 @@ export class HistoryComponent {
...
@@ -16,14 +19,19 @@ export class HistoryComponent {
private
transactions
:
any
;
private
transactions
:
any
;
private
errorMessage
:
string
;
private
errorMessage
:
string
;
private
walletHistorySubscription
:
Subscription
;
ngOnInit
()
{
ngOnInit
()
{
this
.
getHistory
();
this
.
getHistory
();
}
}
ngOnDestroy
()
{
this
.
walletHistorySubscription
.
unsubscribe
();
}
private
getHistory
()
{
private
getHistory
()
{
let
walletInfo
=
new
WalletInfo
(
this
.
globalService
.
getWalletName
(),
this
.
globalService
.
getCoinType
())
let
walletInfo
=
new
WalletInfo
(
this
.
globalService
.
getWalletName
(),
this
.
globalService
.
getCoinType
())
this
.
apiService
.
getWalletHistory
(
walletInfo
)
this
.
walletHistorySubscription
=
this
.
apiService
.
getWalletHistory
(
walletInfo
)
.
subscribe
(
.
subscribe
(
response
=>
{
response
=>
{
if
(
response
.
status
>=
200
&&
response
.
status
<
400
)
{
if
(
response
.
status
>=
200
&&
response
.
status
<
400
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment