removing error handling on bridge finding ( TODO ), minor styling improvements
This commit is contained in:
parent
c7bb6a814e
commit
7db49d310c
3 changed files with 26 additions and 30 deletions
|
|
@ -28,7 +28,6 @@ export default Component.extend({
|
|||
manualBridgeIp: null,
|
||||
manualBridgeIpNotFound: false,
|
||||
multipleBridgeIps: [],
|
||||
error: false,
|
||||
isAuthenticating: computed.notEmpty('bridgePingIntervalHandle'),
|
||||
|
||||
// try to authenticate against the bridge here
|
||||
|
|
@ -104,9 +103,6 @@ export default Component.extend({
|
|||
this.set('bridgeUsername', result[0].success.username);
|
||||
}
|
||||
}
|
||||
}).fail(()=>{
|
||||
this.clearBridgePingIntervalHandle();
|
||||
this.set('error', true);
|
||||
});
|
||||
|
||||
this.incrementProperty('bridgeUserNamePingIntervalProgress', this.get('bridgeUsernamePingIntervalTime')/bridgeUsernamePingMaxTime*100);
|
||||
|
|
|
|||
|
|
@ -1,23 +1,17 @@
|
|||
<div class="title"><img src="assets/images/logo.png" alt="Huegasm"></div>
|
||||
{{#unless bridgeUsername}}
|
||||
{{#if bridgeIp}}
|
||||
{{#if error}}
|
||||
<p>Huegasm encountered a critical error while trying to connect to your bridge.<br><br>
|
||||
This likely happened because you're using an outdated browser and/or because your browser does not support <a href="https://en.wikipedia.org/wiki/Cross-origin_resource_sharing" target="_blank" rel="noopener noreferrer">CORS</a>. Feel free to contact me through the link at the bottom of the page if you feel like this is not the case.<br>
|
||||
For the best browsing experience on this site ( and every other one known to man ) please switch to <a href="https://www.google.com/chrome/" target="_blank" rel="noopener noreferrer">Google Chrome</a> or <a href="https://www.mozilla.org/en-US/firefox/new/" target="_blank" rel="noopener noreferrer">Firefox.</a></p>
|
||||
{{else}}
|
||||
<img src="assets/images/pressButtonBridge.png" id="press-bridge-button-img">
|
||||
{{paper-progress-linear warn=true value=bridgeUserNamePingIntervalProgress}}
|
||||
<img src="assets/images/pressButtonBridge.png" id="press-bridge-button-img">
|
||||
{{paper-progress-linear warn=true value=bridgeUserNamePingIntervalProgress}}
|
||||
|
||||
{{#if isAuthenticating}}
|
||||
<p>
|
||||
Your bridge IP is <b>{{bridgeIp}}</b>
|
||||
<br>
|
||||
Press the button on your bridge to authenticate this application.
|
||||
</p>
|
||||
{{else}}
|
||||
<p>You failed to press the button in time. <a class="no-text-decoration" href="#" {{action 'retry'}}>RETRY</a></p>
|
||||
{{/if}}
|
||||
{{#if isAuthenticating}}
|
||||
<p>
|
||||
Your bridge IP is <b>{{bridgeIp}}</b>
|
||||
<br>
|
||||
Press the button on your bridge to authenticate this application.
|
||||
</p>
|
||||
{{else}}
|
||||
<p>You failed to press the button in time. <a class="no-text-decoration" href="#" {{action 'retry'}}>RETRY</a></p>
|
||||
{{/if}}
|
||||
{{else}}
|
||||
{{#unless bridgeFindStatus}}
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
}
|
||||
}
|
||||
|
||||
#slide-toggle:hover{
|
||||
color: lighten($playerDefaultIconColor, 30%) !important;;
|
||||
#slide-toggle:hover {
|
||||
color: lighten($playerDefaultIconColor, 30%) !important;
|
||||
}
|
||||
|
||||
#player-controls {
|
||||
|
|
@ -45,10 +45,12 @@
|
|||
.tooltip-arrow {
|
||||
display: none;
|
||||
}
|
||||
md-menu-item > .md-button md-icon {
|
||||
md-menu-item>.md-button md-icon {
|
||||
margin: auto 0 5px 10px;
|
||||
}
|
||||
.play-arrow, .pause, .replay {
|
||||
.play-arrow,
|
||||
.pause,
|
||||
.replay {
|
||||
font-size: 30px;
|
||||
}
|
||||
}
|
||||
|
|
@ -116,7 +118,8 @@
|
|||
display: inline-block;
|
||||
}
|
||||
|
||||
#player-area * .noUi-handle::after, #player-area * .noUi-handle::before {
|
||||
#player-area * .noUi-handle::after,
|
||||
#player-area * .noUi-handle::before {
|
||||
content: none;
|
||||
}
|
||||
|
||||
|
|
@ -217,7 +220,7 @@
|
|||
|
||||
.playlist-item {
|
||||
border-bottom: 1px solid rgba(128, 128, 128, 0.3);
|
||||
border-top: 1px solid rgba(128,128,128,0.3);
|
||||
border-top: 1px solid rgba(128, 128, 128, 0.3);
|
||||
height: 62px;
|
||||
font-family: 'Open Sans', sans-serif;
|
||||
padding: 0 20px 0 5px;
|
||||
|
|
@ -296,10 +299,10 @@
|
|||
margin: 0;
|
||||
}
|
||||
.option-description {
|
||||
display: inline-flex;
|
||||
font-size: 20px;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
justify-content: center;
|
||||
flex-direction: column;
|
||||
}
|
||||
button {
|
||||
margin-top: 0;
|
||||
|
|
@ -323,7 +326,7 @@
|
|||
#beat-container {
|
||||
display: flex;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
#beat-area .light-group {
|
||||
margin: 10px 20px 0 40px;
|
||||
|
|
@ -458,6 +461,9 @@
|
|||
#sensitivity-settings .noUi-value-vertical {
|
||||
display: none;
|
||||
}
|
||||
.option-description {
|
||||
height: 55px;
|
||||
}
|
||||
}
|
||||
|
||||
// mobile overrides
|
||||
|
|
|
|||
Reference in a new issue