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

humans.txt, SC image on SC songs, minor styling

Browse source
This commit is contained in:
lone-cloud 2015-10-18 12:49:03 -07:00
parent eb1ffca5ec
commit a7ae51c616
10 changed files with 70 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/index.html
View file

@ -11,7 +11,7 @@
<link href='http://fonts.googleapis.com/css?family=Slabo+27px' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
<link rel="apple-touch-icon" sizes="57x57" href="assets/images/favicons/apple-touch-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="assets/images/favicons/apple-touch-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="assets/images/favicons/apple-touch-icon-72x72.png">

2
app/pods/components/groups-list/template.hbs
View file

@ -1,6 +1,6 @@
{{#paper-list}}
{{#paper-item class="newGroupRow"}}
<div class="newGroup" {{action "toggleAddGroupsModal"}}>Add a new light group</div>
<div class="newGroup" {{action "toggleAddGroupsModal"}}>Add a new group</div>
{{/paper-item}}
{{#each groupsArrData as |group|}}

3
app/pods/components/hue-controls/template.hbs
View file

@ -8,8 +8,7 @@
<div id="settings" class="col-sm-3 col-xs-4">
<div class="settingsItem">
<span data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Light Groups <span class="caret"></span>
<span data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Groups <span class="caret"></span>
</span>
{{groups-list lightsData=lightsData groupsData=groupsData activeLights=activeLights apiURL=apiURL updateGroupsData=updateGroupsData groupControlDisplayed=groupControlDisplayed}}

12
app/pods/components/light-group/component.js
View file

@ -10,6 +10,18 @@ export default Em.Component.extend({
actions: {
clickLight(id, data){
var light = Em.$(event.target);
if(!light.hasClass('bootstrapTooltip')){
light = light.parent();
}
if(light.hasClass('lightInactive')){
light.addClass('lightActive').removeClass('lightInactive');
} else if(light.hasClass('lightActive')){
light.addClass('lightInactive').removeClass('lightActive');
}
this.sendAction('action', id, data);
},
lightStartHover(id){

3
app/pods/components/music-tab/component.js
View file

@ -17,6 +17,7 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, {
actions: {
gotoURL(URL){
Em.$('.tooltip').remove();
window.open(URL, '_blank');
},
handleNewSoundCloudURL(URL){
@ -35,7 +36,7 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, {
picture = result.user.avatar_url;
}
this.get('playQueue').pushObject({url: result.stream_url + '?client_id=' + this.get('SC_CLIENT_ID'), fileName: result.title + ' - ' + result.user.username, artist: result.user.username, artistUrl: result.user.permalink_url, title: result.title, artworkUrl: result.artwork_url, picture: picture });
this.get('playQueue').pushObject({url: result.stream_url + '?client_id=' + this.get('SC_CLIENT_ID'), fileName: result.title + ' - ' + result.user.username, artist: result.user.username, scUrl: result.permalink_url, title: result.title, artworkUrl: result.artwork_url, picture: picture });
} else {
failedSongs.push(result.title);
}

11
app/pods/components/music-tab/mixins/music-tab.js
View file

@ -107,6 +107,17 @@ export default Em.Mixin.create({
return '<div class="alert alert-danger" role="alert">Failed to play file ( ' + fileName + ' ).</div>';
},
scUrl: function(){
var rtn = null,
currentSong = this.get('playQueue')[this.get('playQueuePointer')];
if(currentSong && currentSong.scUrl){
rtn = currentSong.scUrl;
}
return rtn;
}.property('playQueuePointer', 'playQueue.[]'),
playQueueEmpty: Em.computed.empty('playQueue'),
playQueueNotEmpty: Em.computed.notEmpty('playQueue'),
playQueueMultiple: function(){

12
app/pods/components/music-tab/template.hbs
View file

@ -23,10 +23,14 @@
{{/if}}
<span class="pull-right">
<span data-toggle="tooltip" data-placement="top" class="bootstrapTooltip" data-title="Visualizations" {{action "toggleVisualizations"}}>{{paper-icon icon="remove-red-eye" class="playerControllIcon"}}</span>
<span data-toggle="tooltip" data-placement="top" class="bootstrapTooltip" data-title="Full screen" {{action "fullscreen"}}>{{paper-icon icon="fullscreen" class="playerControllIcon"}}
</span>
</span>
{{#if scUrl}}
<a href="#" data-toggle="tooltip" data-placement="top" class="soundCloudLink bootstrapTooltip" data-title="Listen on SoundCloud" {{action "gotoURL" scUrl}}>
<img src="assets/images/sc-white.png" />
</a>
{{/if}}
<span data-toggle="tooltip" data-placement="top" class="bootstrapTooltip" data-title="Visualizations" {{action "toggleVisualizations"}}>{{paper-icon icon="remove-red-eye" class="playerControllIcon"}}</span>
<span data-toggle="tooltip" data-placement="top" class="bootstrapTooltip" data-title="Full screen" {{action "fullscreen"}}>{{paper-icon icon="fullscreen" class="playerControllIcon"}}</span>
</span>
</div>
</div>

21
app/styles/app.scss
View file

@ -41,6 +41,7 @@ md-progress-circular[md-mode=indeterminate] .md-spinner-wrapper {
padding-right: 5px;
text-align: right;
z-index: 3;
font-size:16px
}
.settingsItem {
@ -412,6 +413,7 @@ md-toolbar {
}
.close {
font-size: 18px !important;
color: rgb(51, 51, 51);
display: none;
opacity: 1;
@ -458,7 +460,7 @@ md-switch.md-default-theme.md-checked .md-thumb {
z-index: 20;
background: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.7));
.tooltip.top {
margin-top: -15px;
margin-top: -17px;
}
.tooltip-arrow {
display: none;
@ -866,6 +868,19 @@ body.dimmerOn {
}
}
.dimmerWrapper:hover i {
animation: neon 1.5s ease-in-out infinite alternate;
}
@keyframes neon {
from {
text-shadow: 0 0 10px #fff, 0 0 20px #fff, 0 0 30px #fff, 0 0 40px #228DFF, 0 0 70px #228DFF, 0 0 80px #228DFF, 0 0 100px #228DFF, 0 0 150px #228DFF;
}
to {
text-shadow: 0 0 5px #fff, 0 0 10px #fff, 0 0 15px #fff, 0 0 20px #228DFF, 0 0 35px #228DFF, 0 0 40px #228DFF, 0 0 50px #228DFF, 0 0 75px #228DFF;
}
}
.noUi-value-vertical {
margin-top: -10px;
}
@ -928,3 +943,7 @@ button.md-warn {
.addNewMusic:hover {
background: linear-gradient(lighten(#db8e01,5%), lighten(#871e0a,5%));
}
.soundCloudLink {
margin-right: 5px;
}

BIN
public/assets/images/sc-white.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

14
public/humans.txt Normal file
View file

@ -0,0 +1,14 @@
/* TEAM */
Your title: Egor Philippov
Site: https://www.linkedin.com/pub/egor-philippov/7b/220/148
Location: Vancouver, Canada.
/* THANKS */
Name: Edmond Cheung
/* SITE */
Last update: 2015
Standards: HTML5, CSS3
Components: ember, jQuery, bootstrap, font-awesome, three.js, intro.js, locallyjs, nouislider, dancer.js, jquery-mousewheel, ember paper, ember notify, JavaScript-ID3-Reader