bug fixes

This commit is contained in:
lone-cloud 2015-10-29 23:30:02 -07:00
parent bd7fa0d33a
commit 48a2bc7a80
6 changed files with 40 additions and 18 deletions

View file

@ -34,7 +34,18 @@
<meta name="msapplication-config" content="assets/images/favicons/browserconfig.xml">
<meta name="theme-color" content="#ffffff">
<link rel="stylesheet" href="assets/vendor.css">
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-69470561-1', 'auto');
ga('send', 'pageview');
</script>
<link rel="stylesheet" integrity="" href="assets/vendor.css">
<link rel="stylesheet" href="assets/huegasm.css">
<script src="https://connect.soundcloud.com/sdk/sdk-3.0.0.js"></script>

View file

@ -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.<br><br>' +
intro: 'This is the music tab. You\'ll use this to play music and synchronize it with your active lights.<br><br>' +
'<i><b>TIP</b>: Control which lights are active through the <b>Lights</b> tab or through the <b>Groups</b> menu dropdown.</i>'
},
{
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.<br><br>' +
'<i><b>TIP</b>: Songs added through soundcloud will be saved for when you visit this page again.</i>'
'<i><b>TIP</b>: Songs added through Soundcloud will be saved for when you visit this page again.</i>'
},
{
element: '#usingMicAudioTooltip',
intro: 'This icon will trigger the mode in which the application will listen to your microphone.<br>' +
intro: 'This icon will toggle microphone mode - a mode in which the application will listen to sound through your mic.<br>' +
'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.'
},
{

View file

@ -6,7 +6,7 @@
{{else}}
<div class="readyBlock">
<div class="title">Huegasm</div>
<p>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.</p>
<p class="introParagraph">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.</p>
<a href="#" {{action "isReady"}}>
<img src="assets/images/intro.png" id="introPic" />

View file

@ -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);

View file

@ -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;
}

View file

@ -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;