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
fa3c9e90
Commit
fa3c9e90
authored
Aug 07, 2018
by
Paul Herbert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2100 - Breeze ICO updates. Improved error visuals
parent
8ae7ee4f
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
32 additions
and
15 deletions
+32
-15
advanced.component.html
Breeze.UI/src/app/wallet/advanced/advanced.component.html
+4
-8
advanced.component.ts
Breeze.UI/src/app/wallet/advanced/advanced.component.ts
+1
-1
feedback.component.html
.../src/app/wallet/advanced/feedback/feedback.component.html
+7
-4
feedback.component.ts
...UI/src/app/wallet/advanced/feedback/feedback.component.ts
+18
-0
serialDisposable.ts
Breeze.UI/src/app/wallet/advanced/serialDisposable.ts
+2
-2
if_Error_16.png
Breeze.UI/src/assets/images/if_Error_16.png
+0
-0
No files found.
Breeze.UI/src/app/wallet/advanced/advanced.component.html
View file @
fa3c9e90
...
...
@@ -19,10 +19,8 @@
<input
formControlName=
"addressCountControl"
type=
"text"
class=
"form-control"
placeholder=
"Number to generate..."
style=
"border-radius: 0px; width: 163px"
>
<button
*
ngIf=
"!addressCountControl.invalid && addressCount"
[
disabled
]="
addressCountControl
.
invalid
||
!
addressCount
"
(
click
)="
generateAddresses
()"
class=
"btn btn-darkgray btn-sm"
type=
"button"
style=
"margin-left: 5px"
>
Go
</button>
<img
style=
"width:16px; height:16px; margin-left:6px; margin-top:8px"
*
ngIf=
"showAddressesTick"
src=
"../../../assets/images/Tick_Mark-16.png"
/>
<app-feedback
*
ngIf=
"!generateAddressesLoadingState.success"
style=
"margin-left:5px; width:115px"
[
loading
]="
generateAddressesLoadingState
.
loading
"
[
errored
]="
generateAddressesLoadingState
.
errored
"
[
erroredText
]="'
Failed
'"
></app-feedback>
<app-feedback
style=
"margin-left:5px; width:115px"
[
loading
]="
generateAddressesLoadingState
.
loading
"
[
success
]="
showAddressesTick
"
[
errored
]="
generateAddressesLoadingState
.
errored
"
[
erroredText
]="'
Failed
'"
[
showSuccessTick
]="
true
"
></app-feedback>
</div>
</div>
...
...
@@ -33,10 +31,8 @@
formControlName=
"datePickerControl"
></ngb-datepicker>
<button
[
disabled
]="!
resyncDate
"
style=
"margin-left: 5px; align-self:flex-start; height:34px"
(
click
)="
resync
()"
class=
"btn btn-darkgray btn-sm"
type=
"button"
>
Go
</button>
<img
style=
"width:16px; height:16px; margin-left:6px; margin-top:8px"
*
ngIf=
"showResyncTick"
src=
"../../../assets/images/Tick_Mark-16.png"
/>
<app-feedback
*
ngIf=
"!resyncLoadingState.success"
style=
"margin-left:5px; width:65px"
[
loading
]="
resyncLoadingState
.
loading
"
[
errored
]="
resyncLoadingState
.
errored
"
[
erroredText
]="'
Failed
'"
></app-feedback>
<app-feedback
style=
"margin-left:5px; width:65px"
[
loading
]="
resyncLoadingState
.
loading
"
[
showSuccessTick
]="
true
"
[
errored
]="
resyncLoadingState
.
errored
"
[
erroredText
]="'
Failed
'"
[
success
]="
showResyncTick
"
></app-feedback>
</div>
</div>
</div>
...
...
Breeze.UI/src/app/wallet/advanced/advanced.component.ts
View file @
fa3c9e90
...
...
@@ -17,7 +17,7 @@ export class AdvancedComponent implements OnInit, OnDestroy {
private
extPubKeySubs
=
new
SerialDisposable
();
private
generateAddressesSubs
=
new
SerialDisposable
();
private
resyncSubs
=
new
SerialDisposable
();
private
addresses
=
new
Array
<
string
>
()
;
private
addresses
:
string
[]
=
[]
;
private
resyncActioned
=
false
;
constructor
(
private
advancedService
:
AdvancedService
,
private
formBuilder
:
FormBuilder
)
{
...
...
Breeze.UI/src/app/wallet/advanced/feedback/feedback.component.html
View file @
fa3c9e90
<div>
<div
class=
"progress"
*
ngIf=
"loading"
>
<div
class=
"progress-bar progress-bar-striped progress-bar-animated"
role=
"progressbar"
aria-valuenow=
"100"
aria-valuem
in=
"0"
aria-valuem
ax=
"100"
style=
"width: 100%"
>
<div
class=
"progress-bar progress-bar-striped progress-bar-animated"
role=
"progressbar"
aria-valuenow=
"100"
aria-valuemin=
"0"
aria-valuemax=
"100"
style=
"width: 100%"
>
<label
style=
"font-size:10px"
>
Working...
</label>
</div>
</div>
<div
class=
"alert alert-danger"
role=
"alert"
*
ngIf=
"errored"
>
<label>
{{erroredText}}
</label>
<div
*
ngIf=
"errored"
>
<img
style=
"width:16px; height:16px; margin-left:3px"
src=
"../../../../assets/images/if_Error_16.png"
/>
</div>
<div
*
ngIf=
"success"
>
<img
style=
"width:16px; height:16px; margin-left:3px"
src=
"../../../../assets/images/Tick_Mark-16.png"
/>
</div>
</div>
\ No newline at end of file
Breeze.UI/src/app/wallet/advanced/feedback/feedback.component.ts
View file @
fa3c9e90
...
...
@@ -9,6 +9,8 @@ export class FeedbackComponent {
private
_loading
=
false
;
private
_errored
=
false
;
private
_erroredText
=
"Failed"
;
private
_success
=
false
;
private
_showSuccessTick
=
false
;
@
Input
()
public
set
loading
(
value
:
boolean
)
{
...
...
@@ -33,4 +35,20 @@ export class FeedbackComponent {
public
get
erroredText
():
string
{
return
this
.
_erroredText
;
}
@
Input
()
public
set
success
(
value
:
boolean
)
{
this
.
_success
=
value
;
}
public
get
success
():
boolean
{
return
this
.
_success
;
}
@
Input
()
public
set
showSuccessTick
(
value
:
boolean
)
{
this
.
_showSuccessTick
=
value
;
}
public
get
showSuccessTick
():
boolean
{
return
this
.
_showSuccessTick
;
}
}
Breeze.UI/src/app/wallet/advanced/serialDisposable.ts
View file @
fa3c9e90
...
...
@@ -6,10 +6,10 @@ export class SerialDisposable {
this
.
dispose
();
this
.
subscription
=
value
;
}
public
dispose
()
{
dispose
()
{
if
(
this
.
subscription
)
{
this
.
subscription
.
unsubscribe
();
this
.
subscription
=
null
;
}
}
}
\ No newline at end of file
}
Breeze.UI/src/assets/images/if_Error_16.png
0 → 100644
View file @
fa3c9e90
411 Bytes
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