diff --git a/app/index.html b/app/index.html index 58043f9..5c224a6 100644 --- a/app/index.html +++ b/app/index.html @@ -34,7 +34,18 @@ - + + + diff --git a/app/pods/components/hue-controls/component.js b/app/pods/components/hue-controls/component.js index bb7e24f..46e1bd9 100644 --- a/app/pods/components/hue-controls/component.js +++ b/app/pods/components/hue-controls/component.js @@ -39,17 +39,17 @@ export default Em.Component.extend({ steps: [ { element: '#musicTab', - intro: 'This is the music tab. Here you\'ll be able to play music and synchronize it with your active lights.

' + + intro: 'This is the music tab. You\'ll use this to play music and synchronize it with your active lights.

' + 'TIP: Control which lights are active through the Lights tab or through the Groups menu dropdown.' }, { element: '#playlist', intro: 'You can add and select music to play from your playlist here. You may listen to local audio files, stream music from soundcloud or stream directly from a connected microphone.

' + - 'TIP: Songs added through soundcloud will be saved for when you visit this page again.' + 'TIP: Songs added through Soundcloud will be saved for when you visit this page again.' }, { element: '#usingMicAudioTooltip', - intro: 'This icon will trigger the mode in which the application will listen to your microphone.
' + + intro: 'This icon will toggle microphone mode - a mode in which the application will listen to sound through your mic.
' + 'Note that this is a highly experimental feature that will require your authorization to be able to listen to the microphone. Also note that the beat detection will not be nearly as accurate in this mode.' }, { diff --git a/app/pods/components/huegasm-app/template.hbs b/app/pods/components/huegasm-app/template.hbs index 0e7637c..b29de70 100644 --- a/app/pods/components/huegasm-app/template.hbs +++ b/app/pods/components/huegasm-app/template.hbs @@ -6,7 +6,7 @@ {{else}}
Huegasm
-

Huegasm is a free web application for controlling your Philips Hue lights...oh and it's kind of awesome at syncing music with your lights.

+

Huegasm is a free web application for controlling your Philips Hue lights...oh and it's kind of awesome at syncing music with your lights.

diff --git a/app/pods/components/music-tab/component.js b/app/pods/components/music-tab/component.js index 2bff80f..25d0b39 100644 --- a/app/pods/components/music-tab/component.js +++ b/app/pods/components/music-tab/component.js @@ -65,14 +65,15 @@ export default Em.Component.extend(helperMixin, visualizerMixin, { if(resultObj instanceof Array){ resultObj.forEach(processResult); - - if(failedSongs.length > 0) { - this.get('notify').alert({html: this.get('notStreamableHtml')(failedSongs)}); - } } else { + processResult(resultObj); } + if(failedSongs.length > 0) { + this.get('notify').alert({html: this.get('notStreamableHtml')(failedSongs)}); + } + if(this.get('playQueuePointer') === -1){ if(this.get('firstVisit')){ this.send('goToSong', 0); diff --git a/app/styles/app.scss b/app/styles/app.scss index e5f95f7..993b5bf 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -20,10 +20,19 @@ html { body { font-family: 'Slabo 27px', serif; - margin-bottom: $footerHeight + 20px; + margin-bottom: $footerHeight + 30px; position: static; } +#introPic { + display: block; + margin: 0 auto; +} + +.introParagraph { + margin-bottom: 30px; +} + .goButton { margin-top: 20px; border-radius: 100% !important; @@ -35,6 +44,10 @@ body { } } +.introjs-overlay{ + background: black; +} + .goButton:hover { background: darken(#3f51b5, 10%) !important; } @@ -45,6 +58,9 @@ md-progress-circular[md-mode=indeterminate] .md-spinner-wrapper { } .md-button { flex-direction: unset; + span { + width: 100%; + } } .alert { @@ -1031,7 +1047,6 @@ div.ember-modal-dialog { bottom: -37px; right: 17px; border-radius: 0 0 5px 5px; - opacity: 0.3; } #extraOptionsMenu:hover { @@ -1068,8 +1083,3 @@ div.ember-modal-dialog { #micBoost { margin-top: 50px; } - -#introPic { - display: block; - margin: 0 auto; -} diff --git a/config/environment.js b/config/environment.js index e7df01d..bfe8a51 100644 --- a/config/environment.js +++ b/config/environment.js @@ -21,7 +21,7 @@ module.exports = function(environment) { contentSecurityPolicy: { 'default-src': "'none'", - 'script-src': "'self' 'unsafe-inline' connect.soundcloud.com", + 'script-src': "'self' 'unsafe-inline' connect.soundcloud.com www.google-analytics.com", 'font-src': "'self' fonts.gstatic.com", 'connect-src': "'self' *", 'img-src': "'self' *.sndcdn.com data:", @@ -53,7 +53,7 @@ module.exports = function(environment) { } if (environment === 'production') { - ENV.baseURL = '/huegasm'; + //ENV.baseURL = '/huegasm'; } return ENV;