ember update

2017-02-03 00:47:55 -08:00 · 2017-02-03 00:47:55 -08:00 · f87daf1f83
commit f87daf1f83
parent 159566ff8c
15 changed files with 81 additions and 25 deletions
--- a/mobile/.travis.yml
+++ b/mobile/.travis.yml
@ -7,14 +7,14 @@ sudo: false

 cache:
  directories:
-    - node_modules
+    - $HOME/.npm
+    - $HOME/.cache # includes bowers cache

 before_install:
  - npm config set spin false
-  - npm install -g bower
+  - npm install -g bower phantomjs-prebuilt
  - bower --version
-  - npm install phantomjs-prebuilt
-  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
+  - phantomjs --version

 install:
  - npm install
--- a/mobile/bower.json
+++ b/mobile/bower.json
@ -3,9 +3,6 @@
  "dependencies": {
    "JavaScript-ID3-Reader": "https://github.com/aadsm/JavaScript-ID3-Reader.git",
    "bootstrap-sass": "^3.3.5",
-    "ember": "^2.10.0",
-    "ember-cli-shims": "^0.1.0",
-    "ember-qunit-notifications": "0.1.0",
    "hammer.js": "^2.0.8",
    "intro.js": "^2.1.0",
    "locallyjs": "^0.3.2",
--- a/mobile/package.json
+++ b/mobile/package.json
@ -31,7 +31,8 @@
    "ember-cli-inject-live-reload": "^1.3.1",
    "ember-cli-nouislider": "^0.11.0",
    "ember-cli-qunit": "^1.2.1",
-    "ember-cli-release": "0.2.8",
+    "ember-cli-release": "^0.2.8",
+    "ember-cli-shims": "^1.0.2",
    "ember-cli-sass": "^6.0.0",
    "ember-cli-sri": "^2.1.0",
    "ember-cli-test-loader": "^1.1.0",
@ -44,6 +45,7 @@
    "ember-paper": "^1.0.0-alpha.12",
    "ember-resolver": "^2.0.3",
    "ember-truth-helpers": "^1.2.0",
+    "ember-source": "^2.11.0",
    "loader.js": "^4.0.7"
  }
 }
--- a/mobile/tests/index.html
+++ b/mobile/tests/index.html
@ -21,7 +21,7 @@
    {{content-for "body"}}
    {{content-for "test-body"}}

-    <script src="{{rootURL}}testem.js" integrity=""></script>
+    <script src="/testem.js" integrity=""></script>
    <script src="{{rootURL}}assets/vendor.js"></script>
    <script src="{{rootURL}}assets/test-support.js"></script>
    <script src="{{rootURL}}assets/huegasm.js"></script>
--- a/web/.ember-cli
+++ b/web/.ember-cli
@ -6,5 +6,6 @@
    Setting `disableAnalytics` to true will prevent any data from being sent.
  */
  "disableAnalytics": true,
-  "usePods": true
+  "usePods": true,
+  "ssl": true
 }
--- a/web/.travis.yml
+++ b/web/.travis.yml
@ -7,14 +7,14 @@ sudo: false

 cache:
  directories:
-    - node_modules
+    - $HOME/.npm
+    - $HOME/.cache # includes bowers cache

 before_install:
  - npm config set spin false
-  - npm install -g bower
+  - npm install -g bower phantomjs-prebuilt
  - bower --version
-  - npm install phantomjs-prebuilt
-  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
+  - phantomjs --version

 install:
  - npm install
--- a/web/app/index.html
+++ b/web/app/index.html
@ -5,7 +5,7 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <title>Huegasm</title>
    <meta name="description" content="Huegasm is a free web application for managing and synchronizing your Philips Hue lights with the beat of your music.">
-    <meta name="keywords" content="huegasm,hue,philips hue,music player">
+    <meta name="keywords" content="huegasm,hue,philips hue,lights,ambience,music player">
    <meta name="author" content="Egor Philippov">
    <meta name="viewport" content="width=device-width, initial-scale=1">

--- a/web/app/pods/components/hue-controls/template.hbs
+++ b/web/app/pods/components/hue-controls/template.hbs
@ -33,7 +33,7 @@

  {{light-group lightsData=lightsData activeLights=activeLights syncLight=syncLight apiURL=apiURL dimmerOn=dimmerOn storage=storage}}

-  <div class="row">
+  <div id="huegasm-content" class="row">
    {{lights-tab active=(eq selectedTab 0) apiURL=apiURL lightsData=lightsData activeLights=activeLights syncLight=syncLight trial=trial colorLoopOn=colorLoopOn dimmerOn=dimmerOn playing=playing pauseLightUpdates=pauseLightUpdates}}

    {{music-tab active=(eq selectedTab 1) apiURL=apiURL lightsData=lightsData activeLights=activeLights pauseLightUpdates=pauseLightUpdates dimmerOn=dimmerOn storage=storage colorLoopOn=colorLoopOn playing=playing action="startIntro"}}
--- a/web/app/styles/hue-controls.scss
+++ b/web/app/styles/hue-controls.scss
@ -1,6 +1,9 @@
 #lights-tab {
  padding: 0;
-  min-height: 350px;
+  height: 100%;
+  justify-content: center;
+  flex-direction: column;
+  display: flex;
  .paper-icon {
    line-height: 0.8 !important;
  }
@ -22,7 +25,7 @@

 #hue-controls {
  max-width: 1200px;
-  flex: 1;
+  height: 90vh;
  md-progress-circular {
    position: absolute;
    top: 50%;
@ -100,6 +103,11 @@
  font-size: 16px !important;
 }

+#huegasm-content {
+  height: 80%;
+  max-height: 500px;
+}
+
@media(min-width:767px) {
  #lights-tab {
    font-size: 20px;
@ -107,8 +115,5 @@
    .paper-icon {
      font-size: 24px;
    }
-    .md-list-item-inner {
-      height: 75px;
-    }
  }
 }
--- a/web/app/styles/paper.scss
+++ b/web/app/styles/paper.scss
@ -57,6 +57,10 @@ md-switch.md-default-theme.md-checked .md-thumb {
  outline: none !important;
 }

+md-list-item {
+  margin-bottom: 2vh;
+}
+
@media(max-width:500px) {
  #save-beat-preferences-star {
    right: 5px;
--- a/web/bower.json
+++ b/web/bower.json
@ -3,9 +3,6 @@
  "dependencies": {
    "JavaScript-ID3-Reader": "https://github.com/aadsm/JavaScript-ID3-Reader.git",
    "bootstrap-sass": "^3.3.5",
-    "ember": "^2.10.0",
-    "ember-cli-shims": "^0.1.0",
-    "ember-qunit-notifications": "0.1.0",
    "hammer.js": "^2.0.8",
    "intro.js": "^2.1.0",
    "jquery-mousewheel": "^3.1.13",
--- a/web/package.json
+++ b/web/package.json
@ -30,6 +30,7 @@
    "ember-cli-nouislider": "^0.11.0",
    "ember-cli-qunit": "^1.2.1",
    "ember-cli-release": "0.2.8",
+    "ember-cli-shims": "^1.0.2",
    "ember-cli-sass": "^6.0.0",
    "ember-cli-sri": "^2.1.0",
    "ember-cli-test-loader": "^1.1.0",
@ -41,6 +42,7 @@
    "ember-paper": "^1.0.0-alpha.12",
    "ember-resolver": "^2.0.3",
    "ember-truth-helpers": "^1.2.0",
+    "ember-source": "^2.11.0",
    "loader.js": "^4.0.7"
  }
 }
--- a/web/ssl/server.crt
+++ b/web/ssl/server.crt
@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDaDCCAlACCQDSynsn/7ONRTANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJD
+QTELMAkGA1UECAwCQkMxEjAQBgNVBAcMCVZhbmNvdXZlcjESMBAGA1UECgwJTmlk
+cmF0ZWNoMQ0wCwYDVQQDDARFZ29yMSMwIQYJKoZIhvcNAQkBFhRob2JvbWFuMzEz
+QGdtYWlsLmNvbTAeFw0xNzAyMDMwODM3NDFaFw0xODAyMDMwODM3NDFaMHYxCzAJ
+BgNVBAYTAkNBMQswCQYDVQQIDAJCQzESMBAGA1UEBwwJVmFuY291dmVyMRIwEAYD
+VQQKDAlOaWRyYXRlY2gxDTALBgNVBAMMBEVnb3IxIzAhBgkqhkiG9w0BCQEWFGhv
+Ym9tYW4zMTNAZ21haWwuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAm+ebAZYcwy0wZeYTZM7KkGBQN2kVqI7WRt6Ud739HXR3/EVV+jVh2Fb4CbHC
+VRbJM0FGgkM09XPse507B/jp8UIXzL1w3/Ek5RhBt+xyX9dQDAcseoc252OcqQNF
+dSJXxL9YqPPCzXGqTrctOh/73iVvq7fK7lbby+GCrYzfFosmMzaSXYTCSSQ51Lg9
+U4j1GAF+yCaueTcjD5BnNgEtRzrsHlJ+UUFHfnUqGLzaDthJQ6x8KuMW3ddmPxdF
+OyGzOxpp2BSbx2psDod61NNLz+dRCH2R6lPic3EU6HL8EbwNzqw3qdX6PowdT8yB
+KGFLlvfVPCAlXslLlydessxFWQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQA0R2lt
+HX6+6+YUYXfWVf2POCmVWiHZ1CVrPdfG3POqnIGL4T0KjcjZJIvkE9hjl55LlC6f
+xt0dPcHvKy8+WsAFTjGIcWSKQVQSvyQpCraC7IfhtFq5MqbQHEUjmo7J1p40Xo96
+XrL14X8p+kkQmN68ylZvdmuebgj0K5x8PUQORor2sZI0sN03vgSMQDFF5/kIswkJ
+t1YvzpVel6vGiXbewRL6y+XUK/akYb/G/QjGsgrZ6Y9wIQuqzme9I9S76ynkm/in
+AUwBSYYXd/0skKpeFsnGjGv0LjXpb+9z4Tk/B0g78EXrmDjfMsEVUaiMjuv9JrIP
+6CnM3TiDqne1ahTc
+-----END CERTIFICATE-----
--- a/web/ssl/server.key
+++ b/web/ssl/server.key
@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAm+ebAZYcwy0wZeYTZM7KkGBQN2kVqI7WRt6Ud739HXR3/EVV
+jVh2Fb4CbHCVRbJM0FGgkM09XPse507B/jp8UIXzL1w3/Ek5RhBt+xyX9dQDAcs
+eoc252OcqQNFdSJXxL9YqPPCzXGqTrctOh/73iVvq7fK7lbby+GCrYzfFosmMzaS
+XYTCSSQ51Lg9U4j1GAF+yCaueTcjD5BnNgEtRzrsHlJ+UUFHfnUqGLzaDthJQ6x8
+KuMW3ddmPxdFOyGzOxpp2BSbx2psDod61NNLz+dRCH2R6lPic3EU6HL8EbwNzqw3
+qdX6PowdT8yBKGFLlvfVPCAlXslLlydessxFWQIDAQABAoIBAArUI2gQzR6hXOM2
+/9HYqyksB2ZR3jc+9JMnkphekd4h4NOc3UPrwUgNglzqA911H7R3rDYQBPWnf512
+Zks/dsBTHuQRpG1pim5/KNFlkuwlQGIVfXllOuMHgDIdEA36vK3lvHq/s6AhbPra
+rkGDRzM+1mrO8UFstweKOlFjn3spQ1VYOvZKvvis69ucbjcfqU6KB/73WmvNb25i
+3Yp4zAf41xycu+NVRvH+jEU+Pa8WA4NW1mC0tHSq/6sPrnTppXtHxGwFWGj8t/h4
+ZFPullL9V/g21LtMOlJL9a8CTimkayR1SalIeBZgwRDfANh1n3srBCZ2lZgwD3i
+iF9ahKECgYEAx9Jpxj1l9DxrB8xDwaKnEF6HO69Vb+ApMdbcqQWzlzOxplPbULcY
+3PguKtxhvE3ozJ7rGD8Ust4QhFo+SAW+P2DHYWwxOG5mzssvIfH8TUVUi2O3a9ob
+mkywj3Yl54u4x/p0QZaMFf2gOGx7TChYK2UuL99AmkogGu0EF4P/45cCgYEAx7xh
+s3ah4hpzp24ecn4pZ8AJ3c+ErnLR7A67K6rFzAXD0A6iyp4kPR/WnddvMpmVzubC
+pLvxMYghhVI2fEZ6tpzXUuTQsUa6rLfRtXB9QYVFAxDaNvJ/JvGLXk79cr3QTU0M
+ORXcFW+FkyEKGvgO3oVLG9fQ+xiJUu9Eq2g5fI8CgYEAjwWv59BydQn5oa82oBYH
+ddPy/2lTwau0UJP1hJUsIgFCGkbTJ0amaSLKCKuM2Pb6tdrZcpVT/2Kqd9EP2wUh
+UsO2cai64iVDOKh9p9JIQBZrmQlac7u9HgfeKBDsuHptW9WL+JYE1oiecURUTAJk
+eUsGcAVffA+qQxt6XkqAkSkCgYEAoTEcwBKrjqe+Uo8CL3A1xi8rR0EkWQz88T7q
+OtF1E7RLVOua4V5C7Ll3IKcubG2agwGkcAHlIw4zzz6MDjtq6VkmRRW4fnkQSjeH
+HKCN1YTSLyk4kkOd7jXdPd0Nmb4qD1hw1tkXZo08BYMSfrVWeqqj9PJ1C0+/85h5
+mMNiMW0CgYAJAsqZBgAqp4AeXjvojJ4x4SohuQskfSfe9206dclxTf0BELt3cPF0
+Lgxxe3e3srglUDMvUQzo7Sg0N/FkOidGsJInw8tLxEB9zzTBmo4uXv57vf+08R9F
+0sNsIHStt2dj67ddhFGi2vH/Lu/Ekcsipf67Qr/dwmUDeDtE6Frx/A==
+-----END RSA PRIVATE KEY-----
--- a/web/tests/index.html
+++ b/web/tests/index.html
@ -21,7 +21,7 @@
    {{content-for "body"}}
    {{content-for "test-body"}}

-    <script src="{{rootURL}}testem.js" integrity=""></script>
+    <script src="/testem.js" integrity=""></script>
    <script src="{{rootURL}}assets/vendor.js"></script>
    <script src="{{rootURL}}assets/test-support.js"></script>
    <script src="{{rootURL}}assets/huegasm.js"></script>