diff --git a/README.md b/README.md index a5a10b8..413c21f 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,13 @@ Music awesomeness for hue lights. ## FEATURES - app intro with intro.js - music visualizations with three.js +- microphone mode +- about, help page, youtube video ## BUGS - BUGS BUGS BUGS ## POSSIBLE FEATURES -- help, contact, about, youtube video ??? - beat settings by interval - auto beat detection mode - display player time when hovering over seek bar diff --git a/app/pods/components/huegasm-app/component.js b/app/pods/components/huegasm-app/component.js index 6995ea4..1282ccf 100644 --- a/app/pods/components/huegasm-app/component.js +++ b/app/pods/components/huegasm-app/component.js @@ -18,7 +18,7 @@ export default Em.Component.extend({ className = null; if(dimmerOn){ - className = 'active'; + className = 'dimmerBulbOn'; Em.$('body').addClass('dimmerOn'); Em.$('html').addClass('dimmerOn'); Em.$('md-icon').addClass('dimmerOn'); diff --git a/app/pods/components/huegasm-app/template.hbs b/app/pods/components/huegasm-app/template.hbs index 6f94d5d..832af1d 100644 --- a/app/pods/components/huegasm-app/template.hbs +++ b/app/pods/components/huegasm-app/template.hbs @@ -5,5 +5,57 @@ {{/if}} \ No newline at end of file diff --git a/app/pods/components/music-tab/component.js b/app/pods/components/music-tab/component.js index 1deca8c..df2a5d1 100644 --- a/app/pods/components/music-tab/component.js +++ b/app/pods/components/music-tab/component.js @@ -60,7 +60,7 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, { processResult(resultObj); } - if(this.get('playQueuePointer') === -1){ + if(this.get('playQueuePointer') === -1 && !this.get('firstVisit')){ this.send('next'); } }, () => { @@ -665,7 +665,7 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, { this.set('usingMicSupported', false); } - ['volume', 'shuffle', 'repeat', 'volumeMuted', 'threshold', 'interval', 'frequency', 'speakerViewed', 'transitionTime', 'randomTransition', 'playerBottomDisplayed', 'onBeatBriAndColor', 'audioMode', 'songBeatPreferences', 'debugFiltered'].forEach(function (item) { + ['volume', 'shuffle', 'repeat', 'volumeMuted', 'threshold', 'interval', 'frequency', 'speakerViewed', 'transitionTime', 'randomTransition', 'playerBottomDisplayed', 'onBeatBriAndColor', 'audioMode', 'songBeatPreferences', 'debugFiltered', 'firstVisit'].forEach(function (item) { if (!Em.isNone(storage.get('huegasm.' + item))) { var itemVal = storage.get('huegasm.' + item); @@ -711,6 +711,15 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, { } }); + // demo tracks + if(this.get('firstVisit')){ + this.send('handleNewSoundCloudURL', 'https://soundcloud.com/jacobanthony43/jacobychillcatalystbarstommisch'); + this.send('handleNewSoundCloudURL', 'https://soundcloud.com/odesza/light-feat-little-dragon'); + this.send('handleNewSoundCloudURL', 'https://soundcloud.com/sinusic-prod/lisboa'); + // TODO: uncomment and test + //this.get('storage').set('huegasm.firstVisit', false); + } + if(!this.get('playerBottomDisplayed')) { Em.$('#playerBottom').hide(); } diff --git a/app/pods/components/music-tab/mixins/music-tab.js b/app/pods/components/music-tab/mixins/music-tab.js index 3c2688a..5ac18fe 100644 --- a/app/pods/components/music-tab/mixins/music-tab.js +++ b/app/pods/components/music-tab/mixins/music-tab.js @@ -148,6 +148,7 @@ export default Em.Mixin.create({ usingBeatPreferences: false, oldBeatPrefCache: null, storage: null, + firstVisit: true, // used to insure that we don't replay the same thing multiple times in shuffle mode shufflePlayed: [], @@ -241,6 +242,10 @@ export default Em.Mixin.create({ return classes; }.property('dragging', 'draggingOverPlayListArea', 'dimmerOn'), + dimmerOnClass: function(){ + return this.get('dimmerOn') ? 'dimmerOn' : null; + }.property('dimmerOn'), + volumeMutedClass: function(){ var classes = 'playerControllIcon volumeButton'; diff --git a/app/pods/components/music-tab/template.hbs b/app/pods/components/music-tab/template.hbs index 8597b6c..d90a368 100644 --- a/app/pods/components/music-tab/template.hbs +++ b/app/pods/components/music-tab/template.hbs @@ -1,5 +1,6 @@
- +
+
{{#if usingLocalAudio}} @@ -32,7 +33,7 @@ {{paper-icon icon="fullscreen" class="playerControllIcon"}}
- +
@@ -73,7 +74,7 @@ Add your music files here {{/if}}
- {{paper-icon icon="library-music"}} + {{paper-icon icon="library-music" class=dimmerOnClass}} {{/if}} {{#each playQueue as |item index|}} diff --git a/app/styles/app.scss b/app/styles/app.scss index 407f708..6a31bae 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -2,7 +2,6 @@ @import 'bower_components/bootstrap-sass/assets/stylesheets/_bootstrap'; @import 'ember-modal-dialog/ember-modal-structure'; @import 'ember-modal-dialog/ember-modal-appearance'; -@import "bower_components/font-awesome/scss/font-awesome"; @import "fancy-speaker"; $playerHeight: 400px; @@ -817,14 +816,18 @@ md-switch.md-default-theme.md-checked .md-thumb { } } - - #ytplayer{ display: block; width: 100%; height: 100% } +.dimmerBulbOn { + fill: white; + stroke: white; + stroke-width: 10px; +} + div.dimmerOn { color: white !important; background: #171717 !important; @@ -838,6 +841,29 @@ html.dimmerOn { body.dimmerOn { color: white; background: #242424; + .md-track, .color { + background: white !important; + } + .playlistItem { + color: #cdcdcd; + background: #2D2D2D; + } + .playlistItem.active { + background: darken(#2D2D2D, 13%) !important; + } + .playlistItem:hover { + background: darken(#2D2D2D, 10%); + } + .close { + color: #cdcdcd !important; + } + .close:hover { + color: white !important; + } + svg { + -webkit-filter: drop-shadow(0 0 5px #228DFF); + filter: drop-shadow(0 0 5px #228DFF); + } } .power-settings-new.dimmerOn, @@ -848,36 +874,17 @@ body.dimmerOn { .library-music.dimmerOn { color: inherit !important; text-shadow: $glowingText; - opacity: 1 !important; -} - -body.dimmerOn { - .md-track, .color { - background: white !important; - } + opacity: 0.9 !important; } .dimmerWrapper { - font-size: 40px; position: absolute; left: -50px; bottom: -16px; cursor: pointer; - i.active { - text-shadow: $glowingText; - } -} - -.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; + svg { + width: 40px; + height: 40px; } } @@ -901,8 +908,8 @@ body.dimmerOn { #saveBeatPreferencesStar { position: absolute; - top: 0; - left: 0; + top: 5px; + left: 5px; color: $secondaryThemeColor !important; font-size: 25px; } @@ -931,7 +938,7 @@ button.md-warn { .addNewMusic { font-size: 16px; - padding: 4px; + padding: 3px; color: white; border: none; text-shadow: 1px 1px 2px rgba(0,0,0,.8); @@ -947,3 +954,11 @@ button.md-warn { .soundCloudLink { margin-right: 5px; } + +#visualization { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; +} diff --git a/assets/icon.psd b/assets/icon.psd new file mode 100644 index 0000000..fef175b Binary files /dev/null and b/assets/icon.psd differ diff --git a/assets/missingArtwork.psd b/assets/missingArtwork.psd index c9fa6d7..2b7cc12 100644 Binary files a/assets/missingArtwork.psd and b/assets/missingArtwork.psd differ diff --git a/bower.json b/bower.json index 6c62092..86a3caa 100644 --- a/bower.json +++ b/bower.json @@ -10,7 +10,6 @@ "ember-qunit": "0.4.9", "ember-qunit-notifications": "0.0.7", "ember-resolver": "~0.1.18", - "font-awesome": "~4.4.0", "hammerjs": "~2.0.4", "intro.js": "~1.1.1", "JavaScript-ID3-Reader": "https://github.com/aadsm/JavaScript-ID3-Reader.git", diff --git a/package.json b/package.json index a67416d..e9ad855 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "ember-cli-babel": "^5.0.0", "ember-cli-content-security-policy": "0.4.0", "ember-cli-dependency-checker": "^1.0.0", - "ember-cli-font-awesome": "0.1.1", "ember-cli-htmlbars": "1.0.1", "ember-cli-htmlbars-inline-precompile": "^0.3.0", "ember-cli-ic-ajax": "0.2.1", diff --git a/public/assets/images/favicon.ico b/public/assets/images/favicon.ico deleted file mode 100644 index 99c8d83..0000000 Binary files a/public/assets/images/favicon.ico and /dev/null differ diff --git a/public/assets/images/favicons/android-chrome-144x144.png b/public/assets/images/favicons/android-chrome-144x144.png index f2b39ce..0771276 100644 Binary files a/public/assets/images/favicons/android-chrome-144x144.png and b/public/assets/images/favicons/android-chrome-144x144.png differ diff --git a/public/assets/images/favicons/android-chrome-192x192.png b/public/assets/images/favicons/android-chrome-192x192.png index d295281..604d8fa 100644 Binary files a/public/assets/images/favicons/android-chrome-192x192.png and b/public/assets/images/favicons/android-chrome-192x192.png differ diff --git a/public/assets/images/favicons/android-chrome-36x36.png b/public/assets/images/favicons/android-chrome-36x36.png index c08a5d3..025f2db 100644 Binary files a/public/assets/images/favicons/android-chrome-36x36.png and b/public/assets/images/favicons/android-chrome-36x36.png differ diff --git a/public/assets/images/favicons/android-chrome-48x48.png b/public/assets/images/favicons/android-chrome-48x48.png index 501ac49..f18576d 100644 Binary files a/public/assets/images/favicons/android-chrome-48x48.png and b/public/assets/images/favicons/android-chrome-48x48.png differ diff --git a/public/assets/images/favicons/android-chrome-72x72.png b/public/assets/images/favicons/android-chrome-72x72.png index 621ed49..818bcaa 100644 Binary files a/public/assets/images/favicons/android-chrome-72x72.png and b/public/assets/images/favicons/android-chrome-72x72.png differ diff --git a/public/assets/images/favicons/android-chrome-96x96.png b/public/assets/images/favicons/android-chrome-96x96.png index 48f367f..aa0eaf4 100644 Binary files a/public/assets/images/favicons/android-chrome-96x96.png and b/public/assets/images/favicons/android-chrome-96x96.png differ diff --git a/public/assets/images/favicons/apple-touch-icon-114x114.png b/public/assets/images/favicons/apple-touch-icon-114x114.png index 83f731d..541d5ac 100644 Binary files a/public/assets/images/favicons/apple-touch-icon-114x114.png and b/public/assets/images/favicons/apple-touch-icon-114x114.png differ diff --git a/public/assets/images/favicons/apple-touch-icon-120x120.png b/public/assets/images/favicons/apple-touch-icon-120x120.png index fc60f6a..51769c2 100644 Binary files a/public/assets/images/favicons/apple-touch-icon-120x120.png and b/public/assets/images/favicons/apple-touch-icon-120x120.png differ diff --git a/public/assets/images/favicons/apple-touch-icon-144x144.png b/public/assets/images/favicons/apple-touch-icon-144x144.png index 984ff7c..1c58cb4 100644 Binary files a/public/assets/images/favicons/apple-touch-icon-144x144.png and b/public/assets/images/favicons/apple-touch-icon-144x144.png differ diff --git a/public/assets/images/favicons/apple-touch-icon-152x152.png b/public/assets/images/favicons/apple-touch-icon-152x152.png index 42d9d48..b83ccc2 100644 Binary files a/public/assets/images/favicons/apple-touch-icon-152x152.png and b/public/assets/images/favicons/apple-touch-icon-152x152.png differ diff --git a/public/assets/images/favicons/apple-touch-icon-180x180.png b/public/assets/images/favicons/apple-touch-icon-180x180.png index 81fc058..e0fd7ae 100644 Binary files a/public/assets/images/favicons/apple-touch-icon-180x180.png and b/public/assets/images/favicons/apple-touch-icon-180x180.png differ diff --git a/public/assets/images/favicons/apple-touch-icon-57x57.png b/public/assets/images/favicons/apple-touch-icon-57x57.png index f3da3cc..7cf6fd3 100644 Binary files a/public/assets/images/favicons/apple-touch-icon-57x57.png and b/public/assets/images/favicons/apple-touch-icon-57x57.png differ diff --git a/public/assets/images/favicons/apple-touch-icon-60x60.png b/public/assets/images/favicons/apple-touch-icon-60x60.png index 45a14ba..7e859a3 100644 Binary files a/public/assets/images/favicons/apple-touch-icon-60x60.png and b/public/assets/images/favicons/apple-touch-icon-60x60.png differ diff --git a/public/assets/images/favicons/apple-touch-icon-72x72.png b/public/assets/images/favicons/apple-touch-icon-72x72.png index e344326..da30998 100644 Binary files a/public/assets/images/favicons/apple-touch-icon-72x72.png and b/public/assets/images/favicons/apple-touch-icon-72x72.png differ diff --git a/public/assets/images/favicons/apple-touch-icon-76x76.png b/public/assets/images/favicons/apple-touch-icon-76x76.png index 8c5e270..297c434 100644 Binary files a/public/assets/images/favicons/apple-touch-icon-76x76.png and b/public/assets/images/favicons/apple-touch-icon-76x76.png differ diff --git a/public/assets/images/favicons/apple-touch-icon-precomposed.png b/public/assets/images/favicons/apple-touch-icon-precomposed.png index dc0829e..add7fc6 100644 Binary files a/public/assets/images/favicons/apple-touch-icon-precomposed.png and b/public/assets/images/favicons/apple-touch-icon-precomposed.png differ diff --git a/public/assets/images/favicons/apple-touch-icon.png b/public/assets/images/favicons/apple-touch-icon.png index 81fc058..e0fd7ae 100644 Binary files a/public/assets/images/favicons/apple-touch-icon.png and b/public/assets/images/favicons/apple-touch-icon.png differ diff --git a/public/assets/images/favicons/browserconfig.xml b/public/assets/images/favicons/browserconfig.xml index e30c20f..bc730c6 100644 --- a/public/assets/images/favicons/browserconfig.xml +++ b/public/assets/images/favicons/browserconfig.xml @@ -2,10 +2,10 @@ - - - - + + + + #da532c diff --git a/public/assets/images/favicons/favicon-16x16.png b/public/assets/images/favicons/favicon-16x16.png index 029688e..59c7b46 100644 Binary files a/public/assets/images/favicons/favicon-16x16.png and b/public/assets/images/favicons/favicon-16x16.png differ diff --git a/public/assets/images/favicons/favicon-194x194.png b/public/assets/images/favicons/favicon-194x194.png index 96d493f..8c06502 100644 Binary files a/public/assets/images/favicons/favicon-194x194.png and b/public/assets/images/favicons/favicon-194x194.png differ diff --git a/public/assets/images/favicons/favicon-32x32.png b/public/assets/images/favicons/favicon-32x32.png index 0e87d75..28ef728 100644 Binary files a/public/assets/images/favicons/favicon-32x32.png and b/public/assets/images/favicons/favicon-32x32.png differ diff --git a/public/assets/images/favicons/favicon-96x96.png b/public/assets/images/favicons/favicon-96x96.png index c99dceb..a041852 100644 Binary files a/public/assets/images/favicons/favicon-96x96.png and b/public/assets/images/favicons/favicon-96x96.png differ diff --git a/public/assets/images/favicons/favicon.ico b/public/assets/images/favicons/favicon.ico index f1f5798..ae53d4e 100644 Binary files a/public/assets/images/favicons/favicon.ico and b/public/assets/images/favicons/favicon.ico differ diff --git a/public/assets/images/favicons/manifest.json b/public/assets/images/favicons/manifest.json index 882d3fa..06c4302 100644 --- a/public/assets/images/favicons/manifest.json +++ b/public/assets/images/favicons/manifest.json @@ -2,37 +2,37 @@ "name": "Huegasm", "icons": [ { - "src": "assets\\images\/android-chrome-36x36.png", + "src": "assets\/images\/favicons\/android-chrome-36x36.png", "sizes": "36x36", "type": "image\/png", "density": "0.75" }, { - "src": "assets\\images\/android-chrome-48x48.png", + "src": "assets\/images\/favicons\/android-chrome-48x48.png", "sizes": "48x48", "type": "image\/png", "density": "1.0" }, { - "src": "assets\\images\/android-chrome-72x72.png", + "src": "assets\/images\/favicons\/android-chrome-72x72.png", "sizes": "72x72", "type": "image\/png", "density": "1.5" }, { - "src": "assets\\images\/android-chrome-96x96.png", + "src": "assets\/images\/favicons\/android-chrome-96x96.png", "sizes": "96x96", "type": "image\/png", "density": "2.0" }, { - "src": "assets\\images\/android-chrome-144x144.png", + "src": "assets\/images\/favicons\/android-chrome-144x144.png", "sizes": "144x144", "type": "image\/png", "density": "3.0" }, { - "src": "assets\\images\/android-chrome-192x192.png", + "src": "assets\/images\/favicons\/android-chrome-192x192.png", "sizes": "192x192", "type": "image\/png", "density": "4.0" diff --git a/public/assets/images/favicons/mstile-144x144.png b/public/assets/images/favicons/mstile-144x144.png index 5948fe5..fdef3d7 100644 Binary files a/public/assets/images/favicons/mstile-144x144.png and b/public/assets/images/favicons/mstile-144x144.png differ diff --git a/public/assets/images/favicons/mstile-150x150.png b/public/assets/images/favicons/mstile-150x150.png index 25e464b..df1b537 100644 Binary files a/public/assets/images/favicons/mstile-150x150.png and b/public/assets/images/favicons/mstile-150x150.png differ diff --git a/public/assets/images/favicons/mstile-310x150.png b/public/assets/images/favicons/mstile-310x150.png index 82ad060..b594a39 100644 Binary files a/public/assets/images/favicons/mstile-310x150.png and b/public/assets/images/favicons/mstile-310x150.png differ diff --git a/public/assets/images/favicons/mstile-310x310.png b/public/assets/images/favicons/mstile-310x310.png index fd96ca3..16d8f42 100644 Binary files a/public/assets/images/favicons/mstile-310x310.png and b/public/assets/images/favicons/mstile-310x310.png differ diff --git a/public/assets/images/favicons/mstile-70x70.png b/public/assets/images/favicons/mstile-70x70.png index dbb73d3..92f885d 100644 Binary files a/public/assets/images/favicons/mstile-70x70.png and b/public/assets/images/favicons/mstile-70x70.png differ diff --git a/public/assets/images/favicons/safari-pinned-tab.svg b/public/assets/images/favicons/safari-pinned-tab.svg index 46b4dd6..6bec049 100644 --- a/public/assets/images/favicons/safari-pinned-tab.svg +++ b/public/assets/images/favicons/safari-pinned-tab.svg @@ -9,21 +9,402 @@ Created by potrace 1.11, written by Peter Selinger 2001-2013 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/assets/images/missingArtwork.png b/public/assets/images/missingArtwork.png index ee7582f..f644cbf 100644 Binary files a/public/assets/images/missingArtwork.png and b/public/assets/images/missingArtwork.png differ diff --git a/public/humans.txt b/public/humans.txt index e5de457..c310717 100644 --- a/public/humans.txt +++ b/public/humans.txt @@ -3,10 +3,6 @@ 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