lone-cloud/huegasm
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removing error handling on bridge finding ( TODO ), minor styling improvements

Browse source
This commit is contained in:
Egor 2017-02-12 11:48:58 -08:00
parent c7bb6a814e
commit 7db49d310c
3 changed files with 26 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
web/app/pods/components/bridge-finder/component.js
View file

@ -28,7 +28,6 @@ export default Component.extend({
manualBridgeIp: null, manualBridgeIp: null,
manualBridgeIpNotFound: false, manualBridgeIpNotFound: false,
multipleBridgeIps: [], multipleBridgeIps: [],
error: false,
isAuthenticating: computed.notEmpty('bridgePingIntervalHandle'), isAuthenticating: computed.notEmpty('bridgePingIntervalHandle'),
// try to authenticate against the bridge here // try to authenticate against the bridge here
@ -104,9 +103,6 @@ export default Component.extend({
this.set('bridgeUsername', result[0].success.username); this.set('bridgeUsername', result[0].success.username);
} }
} }
}).fail(()=>{
this.clearBridgePingIntervalHandle();
this.set('error', true);
}); });
this.incrementProperty('bridgeUserNamePingIntervalProgress', this.get('bridgeUsernamePingIntervalTime')/bridgeUsernamePingMaxTime*100); this.incrementProperty('bridgeUserNamePingIntervalProgress', this.get('bridgeUsernamePingIntervalTime')/bridgeUsernamePingMaxTime*100);

26
web/app/pods/components/bridge-finder/template.hbs
View file

@ -1,23 +1,17 @@
<div class="title"><img src="assets/images/logo.png" alt="Huegasm"></div> <div class="title"><img src="assets/images/logo.png" alt="Huegasm"></div>
{{#unless bridgeUsername}} {{#unless bridgeUsername}}
{{#if bridgeIp}} {{#if bridgeIp}}
{{#if error}} <img src="assets/images/pressButtonBridge.png" id="press-bridge-button-img">
<p>Huegasm encountered a critical error while trying to connect to your bridge.<br><br> {{paper-progress-linear warn=true value=bridgeUserNamePingIntervalProgress}}
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}}
{{#if isAuthenticating}} {{#if isAuthenticating}}
<p> <p>
Your bridge IP is <b>{{bridgeIp}}</b> Your bridge IP is <b>{{bridgeIp}}</b>
<br> <br>
Press the button on your bridge to authenticate this application. Press the button on your bridge to authenticate this application.
</p> </p>
{{else}} {{else}}
<p>You failed to press the button in time. <a class="no-text-decoration" href="#" {{action 'retry'}}>RETRY</a></p> <p>You failed to press the button in time. <a class="no-text-decoration" href="#" {{action 'retry'}}>RETRY</a></p>
{{/if}}
{{/if}} {{/if}}
{{else}} {{else}}
{{#unless bridgeFindStatus}} {{#unless bridgeFindStatus}}

26
web/app/styles/music-tab.scss
View file

@ -19,8 +19,8 @@
} }
} }
#slide-toggle:hover{ #slide-toggle:hover {
color: lighten($playerDefaultIconColor, 30%) !important;; color: lighten($playerDefaultIconColor, 30%) !important;
} }
#player-controls { #player-controls {
@ -45,10 +45,12 @@
.tooltip-arrow { .tooltip-arrow {
display: none; display: none;
} }
md-menu-item > .md-button md-icon { md-menu-item>.md-button md-icon {
margin: auto 0 5px 10px; margin: auto 0 5px 10px;
} }
.play-arrow, .pause, .replay { .play-arrow,
.pause,
.replay {
font-size: 30px; font-size: 30px;
} }
} }
@ -116,7 +118,8 @@
display: inline-block; 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; content: none;
} }
@ -217,7 +220,7 @@
.playlist-item { .playlist-item {
border-bottom: 1px solid rgba(128, 128, 128, 0.3); 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; height: 62px;
font-family: 'Open Sans', sans-serif; font-family: 'Open Sans', sans-serif;
padding: 0 20px 0 5px; padding: 0 20px 0 5px;
@ -296,10 +299,10 @@
margin: 0; margin: 0;
} }
.option-description { .option-description {
display: inline-flex;
font-size: 20px; font-size: 20px;
white-space: nowrap; justify-content: center;
overflow: hidden; flex-direction: column;
text-overflow: ellipsis;
} }
button { button {
margin-top: 0; margin-top: 0;
@ -323,7 +326,7 @@
#beat-container { #beat-container {
display: flex; display: flex;
margin-bottom: 10px; margin-bottom: 10px;
} }
#beat-area .light-group { #beat-area .light-group {
margin: 10px 20px 0 40px; margin: 10px 20px 0 40px;
@ -458,6 +461,9 @@
#sensitivity-settings .noUi-value-vertical { #sensitivity-settings .noUi-value-vertical {
display: none; display: none;
} }
.option-description {
height: 55px;
}
} }
// mobile overrides // mobile overrides