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

A few formatting and trial changes

Browse source
This commit is contained in:
lone-cloud 2015-09-08 15:51:44 -07:00
parent 308acd58e8
commit 80a57e9fff
10 changed files with 35 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/components/bridge-controls.js
View file

@ -85,5 +85,9 @@ export default Em.Component.extend({
}); });
} }
}); });
} },
ready: function() {
return this.get('trial') || !Em.isNone(this.get('lightsData'));
}.property('lightsData', 'trial')
}); });

2
app/components/bridge-finder.js
View file

@ -1,7 +1,7 @@
import Em from 'ember'; import Em from 'ember';
export default Em.Component.extend({ export default Em.Component.extend({
classNames: ['container', 'center-block'], classNames: ['container'],
elementId: 'finderContainer', elementId: 'finderContainer',
bridgeIp: null, bridgeIp: null,

3
app/components/huegasm-footer.js
View file

@ -1,4 +1,7 @@
import Em from 'ember'; import Em from 'ember';
export default Em.Component.extend({ export default Em.Component.extend({
tagName: 'footer',
classNames: ['footer']
}); });

23
app/styles/app.scss
View file

@ -10,7 +10,13 @@ $playListBackgroundColor: #1E1E1E;
$playerDefaultIconColor: #BBBBBB; $playerDefaultIconColor: #BBBBBB;
// BRIDGE FINDER // BRIDGE FINDER
.footer .container { .footer {
position: absolute;
bottom: 0;
width: 100%;
}
.footer .text-muted {
padding-left: 0; padding-left: 0;
margin-top: 30px; margin-top: 30px;
text-align: center; text-align: center;
@ -22,7 +28,7 @@ $playerDefaultIconColor: #BBBBBB;
#finderContainer { #finderContainer {
text-align: center; text-align: center;
margin-top: 40px; padding-top: 20px;
} }
#finderContainer .title { #finderContainer .title {
@ -37,18 +43,13 @@ $playerDefaultIconColor: #BBBBBB;
margin: 0 auto; margin: 0 auto;
} }
} }
#finderContainer p {
padding-top: 50px;
}
md-progress-circular { md-progress-circular {
margin: 0 auto; margin: 0 auto 20px auto !important;
} }
#pressButtonBridgeImg { #pressButtonBridgeImg {
width: 200px; width: 200px;
margin: 0 auto 0 auto; margin: 0 auto 30px auto;
display: inherit; display: inherit;
} }
@ -440,9 +441,9 @@ md-toolbar {
#vertDivider { #vertDivider {
position: absolute; position: absolute;
right: 40px; right: 2.857em;
top: 25%; top: 25%;
width: 1px; width: 0.071em;
height: 50%; height: 50%;
background-color: white; background-color: white;
} }

13
app/templates/components/bridge-controls.hbs
View file

@ -1,4 +1,4 @@
{{#liquid-if lightsData}} {{#if ready}}
{{#paper-nav-container class="ember-app"}} {{#paper-nav-container class="ember-app"}}
@ -19,16 +19,13 @@
</div> </div>
{{#liquid-if lightsTabSelected class="tabSwitch"}} {{#liquid-if lightsTabSelected class="tabSwitch"}}
{{controls/light-control apiURL=apiURL lightsData=lightsData activeLights=activeLights}} {{controls/light-control apiURL=apiURL lightsData=lightsData activeLights=activeLights trial=trial}}
{{/liquid-if}} {{/liquid-if}}
{{#liquid-if musicTabSelected class="tabSwitch"}} {{#liquid-if musicTabSelected class="tabSwitch"}}
{{controls/music-control apiURL=apiURL lightsData=lightsData activeLights=activeLights}} {{controls/music-control apiURL=apiURL lightsData=lightsData activeLights=activeLights}}
{{/liquid-if}} {{/liquid-if}}
{{/paper-content}}
{{/paper-nav-container}}
{{huegasm-footer}} {{huegasm-footer}}
{{/liquid-if}} {{/paper-content}}
{{/paper-nav-container}}
{{/if}}

5
app/templates/components/controls/light-control.hbs
View file

@ -7,7 +7,7 @@
{{#paper-item class="item"}} {{#paper-item class="item"}}
{{paper-icon icon="power-settings-new"}} {{paper-icon icon="power-settings-new"}}
<p>Lights</p> <p>Lights</p>
{{#paper-switch checked=lightsOn}} {{lightsOnTxt}} {{/paper-switch}} {{#paper-switch checked=lightsOn disabled=trial}} {{lightsOnTxt}} {{/paper-switch}}
{{/paper-item}} {{/paper-item}}
{{#paper-item class="item"}} {{#paper-item class="item"}}
@ -19,9 +19,8 @@
{{#paper-item class="item"}} {{#paper-item class="item"}}
{{paper-icon icon="flare"}} {{paper-icon icon="flare"}}
<p>Strobe</p> <p>Strobe</p>
{{#paper-switch checked=strobeOn}} {{strobeOnTxt}} {{/paper-switch}} {{#paper-switch checked=strobeOn disabled=trial}} {{strobeOnTxt}} {{/paper-switch}}
{{/paper-item}} {{/paper-item}}
{{modals/light-control-modal modalData=modalData apiURL=apiURL action="clickLight" isShowingLightsModal=isShowingLightsModal}} {{modals/light-control-modal modalData=modalData apiURL=apiURL action="clickLight" isShowingLightsModal=isShowingLightsModal}}
{{/paper-list}} {{/paper-list}}

4
app/templates/components/huegasm-app.hbs
View file

@ -2,6 +2,8 @@
{{bridge-controls bridgeIp=bridgeIp bridgeUsername=bridgeUsername trial=trial}} {{bridge-controls bridgeIp=bridgeIp bridgeUsername=bridgeUsername trial=trial}}
{{else}} {{else}}
{{bridge-finder bridgeIp=bridgeIp bridgeUsername=bridgeUsername trial=trial}} {{bridge-finder bridgeIp=bridgeIp bridgeUsername=bridgeUsername trial=trial}}
{{huegasm-footer}}
{{/liquid-if}} {{/liquid-if}}
{{#unless bridgeUsername}}
{{huegasm-footer}}
{{/unless}}

4
app/templates/components/huegasm-footer.hbs
View file

@ -1,5 +1 @@
<footer class="footer">
<div class="container">
<p class="text-muted">Made with ¯\_(ツ)_/¯ by <a href="//egorphilippov.me">egorphilippov.me</a> © 2015 Huegasm</p> <p class="text-muted">Made with ¯\_(ツ)_/¯ by <a href="//egorphilippov.me">egorphilippov.me</a> © 2015 Huegasm</p>
</div>
</footer>

3
bower.json
View file

@ -16,5 +16,8 @@
"loader.js": "ember-cli/loader.js#3.2.0", "loader.js": "ember-cli/loader.js#3.2.0",
"nouislider": "^8.0.1", "nouislider": "^8.0.1",
"qunit": "~1.18.0" "qunit": "~1.18.0"
},
"resolutions": {
"ember": "~2.0.2"
} }
} }