[Bugfix] timezone api fail

Basster · Nov 12, 2016 · fc446b0 · fc446b0
1 parent d3295db
commit fc446b0
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -2,11 +2,11 @@
   "name": "temps",
   "productName": "Temps",
   "website": "https://jackd248.github.io/temps/",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "icon": "assets/app.png",
   "description": "A simple but smart menubar weather app",
   "main": "src/app.js",
-  "electronVersion": "1.4.2",
+  "electronVersion": "1.4.6",
   "keywords": [
     "electron",
     "temperature",
@@ -45,11 +45,11 @@
     "electron-packager": "^8.0.0",
     "electron-prebuilt": "^1.4.1",
     "electron-installer-dmg": "0.1.2",
-    "electron-builder": "7.11.4",
+    "electron-builder": "8.3.0",
     "standard": "^8.3.0"
   },
   "dependencies": {
-    "electron": "1.4.3",
+    "electron": "1.4.6",
     "menubar": "^5.1.0",
     "auto-launch": "^5.0.1",
     "applescript": "^1.0.0",

diff --git a/src/app.js b/src/app.js
@@ -119,7 +119,8 @@ mb.on('show', function show () {
 })
 
 const appLauncher = new AutoLaunch({
-  name: 'temps'
+  name: 'temps',
+  isHidden: true
 })
 
 appLauncher.isEnabled().then(function (enabled) {

diff --git a/src/components/timezone.js b/src/components/timezone.js
@@ -22,7 +22,13 @@ const getTimezone = function () {
         if (err || !res.ok) {
           utils.showErrorMessage('Failure during data fetching')
         } else {
-          timeoffset = res.body.rawOffset + res.body.dstOffset
+          if (res.body.status === 'OVER_QUERY_LIMIT') {
+            const d = new Date()
+            const n = d.getTimezoneOffset()
+            timeoffset = n * 60 * -1
+          } else {
+            timeoffset = res.body.rawOffset + res.body.dstOffset
+          }
           jQuery('#details .header .date').html(utils.getTodayDate())
           utils.refreshClock()
           utils.checkLoading()

diff --git a/src/components/weather.js b/src/components/weather.js
@@ -268,6 +268,7 @@ const showHourlyWeatherData = function () {
 
               jQuery('#chartjs-tooltip .icon').load('../../assets/icons/' + tooltip.footer[0] + '.svg', null, function () {
                 jQuery(this).find('svg path').css('fill', color.getColor())
+                jQuery(this).find('svg circle').css('fill', color.getColor())
               })
               let x = tooltip.x
               if (x < 0) {
@@ -367,11 +368,11 @@ const showRain = function (nbDrop = 100) {
 }
 
 const showThunder = function () {
-  jQuery('#main').prepend('<div class="thunder"></div>')
+  jQuery('#main').append('<div class="thunder"></div>')
 }
 
 const showSnow = function () {
-  jQuery('#main').prepend('<div class="snow"></div>')
+  jQuery('#main').append('<div class="snow"></div>')
 }
 
 const getNumAnimTemp = function () {

diff --git a/src/main/config.json b/src/main/config.json
@@ -1,11 +1,11 @@
 {
   "name": "temps",
-  "version": "v0.6.1",
+  "version": "v0.6.2",
   "apikey": "547bbdc38bd641bef6645cd2c4bc613f",
   "timezone": {
     "url": "https://maps.googleapis.com/maps/api/timezone/json",
     "apikey": "AIzaSyD7CnHeMDQV_XCXlimoPwiPSB_83Wfq7LE",
-    "offset": 7200
+    "offset": 0
   },
   "weather": {
     "url": {

diff --git a/src/main/index.html b/src/main/index.html
@@ -116,7 +116,7 @@ <h1>
                     <button class="quit pull-right">Quit</button>
                 </div>
                 <div class="footer">
-                    <a href="https://jackd248.github.io/temps/" target="_blank" alt="temps">temps</a> - v0.6.1 &copy; 2016
+                    <a href="https://jackd248.github.io/temps/" target="_blank" alt="temps">temps</a> - v0.6.2 &copy; 2016
                 </div>
             </div>
         </div>

diff --git a/src/main/style.css b/src/main/style.css
@@ -281,6 +281,7 @@ h1:after {
     top: 10px;
     left: 10px;
     position: absolute;
+    z-index: 2;
 }
 
 #main .settings img:hover, #main .settings:hover {
@@ -659,7 +660,7 @@ body {
     background: none;
     font-family: Androgyne;
     background-image: url('http://www.wearewebstars.dk/codepen/img/s1.png'), url('http://www.wearewebstars.dk/codepen/img//s2.png'), url('http://www.wearewebstars.dk/codepen/img//s3.png');
-    height: 100%;
+    height: 300px;
     left: 0;
     position: absolute;
     top: 0;

diff --git a/src/utilities/utils.js b/src/utilities/utils.js
@@ -102,6 +102,7 @@ const showErrorMessage = function (message) {
 const reset = function () {
   jQuery('.drop').remove()
   jQuery('.thunder').remove()
+  jQuery('.snow').remove()
   jQuery('#chartjs-tooltip').css('opacity', 0)
 }