fixed timezone API calls. Shown valid date now. Using google geolocation

musicpro · May 8, 2019 · dcd2a05 · dcd2a05
1 parent 4ce12af
commit dcd2a05
Show file tree

Hide file tree

Showing 177 changed files with 3,096 additions and 22 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
diff --git a/.travis.yml b/.travis.yml
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/assets/IconTemplate.png b/assets/IconTemplate.png
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/app.icns b/assets/app.icns
diff --git a/assets/app.ico b/assets/app.ico
diff --git a/assets/app.png b/assets/app.png
diff --git a/assets/background.png b/assets/background.png
diff --git a/assets/checkboxes.png b/assets/checkboxes.png
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/dropdown.png b/assets/dropdown.png
diff --git a/assets/[email protected] b/assets/[email protected]
diff --git a/assets/icons/01d.png b/assets/icons/01d.png
diff --git a/assets/icons/01d.svg b/assets/icons/01d.svg
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/01dTemplate.png b/assets/icons/01dTemplate.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/01dW.png b/assets/icons/01dW.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/01n.png b/assets/icons/01n.png
diff --git a/assets/icons/01n.svg b/assets/icons/01n.svg
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/01nTemplate.png b/assets/icons/01nTemplate.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/01nW.png b/assets/icons/01nW.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/02d.png b/assets/icons/02d.png
diff --git a/assets/icons/02d.svg b/assets/icons/02d.svg
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/02dTemplate.png b/assets/icons/02dTemplate.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/02dW.png b/assets/icons/02dW.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/02n.png b/assets/icons/02n.png
diff --git a/assets/icons/02n.svg b/assets/icons/02n.svg
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/02nTemplate.png b/assets/icons/02nTemplate.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/02nW.png b/assets/icons/02nW.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/03d.png b/assets/icons/03d.png
diff --git a/assets/icons/03d.svg b/assets/icons/03d.svg
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/03dTemplate.png b/assets/icons/03dTemplate.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/03dW.png b/assets/icons/03dW.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/03n.png b/assets/icons/03n.png
diff --git a/assets/icons/03n.svg b/assets/icons/03n.svg
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/03nTemplate.png b/assets/icons/03nTemplate.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/03nW.png b/assets/icons/03nW.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/04d.png b/assets/icons/04d.png
diff --git a/assets/icons/04d.svg b/assets/icons/04d.svg
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/04dTemplate.png b/assets/icons/04dTemplate.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/04dW.png b/assets/icons/04dW.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/04n.png b/assets/icons/04n.png
diff --git a/assets/icons/04n.svg b/assets/icons/04n.svg
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/04nTemplate.png b/assets/icons/04nTemplate.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/04nW.png b/assets/icons/04nW.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/09d.png b/assets/icons/09d.png
diff --git a/assets/icons/09d.svg b/assets/icons/09d.svg
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/09dTemplate.png b/assets/icons/09dTemplate.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/09dW.png b/assets/icons/09dW.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/09n.png b/assets/icons/09n.png
diff --git a/assets/icons/09n.svg b/assets/icons/09n.svg
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/09nTemplate.png b/assets/icons/09nTemplate.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/09nW.png b/assets/icons/09nW.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/10d.png b/assets/icons/10d.png
diff --git a/assets/icons/10d.svg b/assets/icons/10d.svg
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/10dTemplate.png b/assets/icons/10dTemplate.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/10dW.png b/assets/icons/10dW.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/10n.png b/assets/icons/10n.png
diff --git a/assets/icons/10n.svg b/assets/icons/10n.svg
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/10nTemplate.png b/assets/icons/10nTemplate.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/10nW.png b/assets/icons/10nW.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/11d.png b/assets/icons/11d.png
diff --git a/assets/icons/11d.svg b/assets/icons/11d.svg
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/11dTemplate.png b/assets/icons/11dTemplate.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/11dW.png b/assets/icons/11dW.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/11n.png b/assets/icons/11n.png
diff --git a/assets/icons/11n.svg b/assets/icons/11n.svg
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/11nTemplate.png b/assets/icons/11nTemplate.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/11nW.png b/assets/icons/11nW.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/12d.png b/assets/icons/12d.png
diff --git a/assets/icons/12d.svg b/assets/icons/12d.svg
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/12dTemplate.png b/assets/icons/12dTemplate.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/12dW.png b/assets/icons/12dW.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/12n.png b/assets/icons/12n.png
diff --git a/assets/icons/12n.svg b/assets/icons/12n.svg
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/12nTemplate.png b/assets/icons/12nTemplate.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/12nW.png b/assets/icons/12nW.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/13d.png b/assets/icons/13d.png
diff --git a/assets/icons/13d.svg b/assets/icons/13d.svg
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/13dTemplate.png b/assets/icons/13dTemplate.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/13dW.png b/assets/icons/13dW.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/13n.png b/assets/icons/13n.png
diff --git a/assets/icons/13n.svg b/assets/icons/13n.svg
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/13nTemplate.png b/assets/icons/13nTemplate.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/13nW.png b/assets/icons/13nW.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/50d.png b/assets/icons/50d.png
diff --git a/assets/icons/50d.svg b/assets/icons/50d.svg
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/50dTemplate.png b/assets/icons/50dTemplate.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/50dW.png b/assets/icons/50dW.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/50n.png b/assets/icons/50n.png
diff --git a/assets/icons/50n.svg b/assets/icons/50n.svg
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/50nTemplate.png b/assets/icons/50nTemplate.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/50nW.png b/assets/icons/50nW.png
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/icons/[email protected] b/assets/icons/[email protected]
diff --git a/assets/s1.png b/assets/s1.png
diff --git a/assets/s2.png b/assets/s2.png
diff --git a/assets/s3.png b/assets/s3.png
diff --git a/assets/screenshot-overview.png b/assets/screenshot-overview.png
diff --git a/assets/screenshot.jpg b/assets/screenshot.jpg
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "temps",
   "productName": "Temps",
   "website": "https://jackd248.github.io/temps/",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "icon": "assets/app.png",
   "description": "A simple but smart menubar weather app",
   "main": "src/app.js",
@@ -49,17 +49,17 @@
     "standard": "^8.3.0"
   },
   "dependencies": {
-    "electron": "1.4.12",
-    "menubar": "^5.1.0",
-    "auto-launch": "^5.0.1",
     "applescript": "^1.0.0",
+    "auto-launch": "^5.0.1",
+    "chart.js": "^2.2.1",
+    "countup.js": "^1.7.1",
+    "electron": "1.4.12",
     "jquery": "^3.1.1",
     "json-storage": "^2.1.1",
     "localStorage": "^1.0.3",
-    "chart.js": "^2.2.1",
-    "countup.js": "^1.7.1",
+    "menubar": "^5.1.0",
+    "moment": "^2.17.1",
     "semver": "^5.1.0",
-    "superagent": "^3.3.1",
-    "moment": "^2.17.1"
+    "superagent": "^3.3.1"
   }
 }
diff --git a/src/.DS_Store b/src/.DS_Store
diff --git a/src/app.js b/src/app.js
@@ -17,6 +17,8 @@ const path = require('path')
 let autoLaunch = true
 let iconSetting = 'auto'
 
+process.env.GOOGLE_API_KEY = 'AIzaSyAIyKnnlRNzl4zE8Msjii2YxzBVyquutuk'
+
 // Quit when all windows are closed.
 app.on('window-all-closed', function () {
   // On OS X it is common for applications and their menu bar
@@ -35,6 +37,7 @@ const mb = menubar({
   index: path.join('file://', __dirname, '/main/index.html'),
   icon: path.join(__dirname, '/../assets/IconTemplate.png'),
   width: 280,
+  // width: 780,
   height: 480,
   resizable: false,
   showDockIcon: false,
@@ -225,4 +228,4 @@ const autoUpdater = function () {
           }
         }
       })
-}
+}
diff --git a/src/components/timezone.js b/src/components/timezone.js
@@ -10,12 +10,14 @@ let timeoffset = config.timezone.offset
 
 const getTimezone = function () {
   const wdata = store.getWdata()
+
   superagent
       .get(config.timezone.url)
       .query({location: wdata[0].coord.lat + ',' + wdata[0].coord.lon})
       .query({timestamp: Math.floor(Date.now() / 1000)})
       .query({key: config.timezone.apikey})
       .end(function (err, res) {
+        console.log(res)
         let loading = utils.getLoading()
         loading[3] = false
         utils.setLoading(loading)
@@ -46,6 +48,7 @@ const addSeconds = function (date, seconds) {
 }
 
 const getDate = function (date) {
+  // console.log(convertDateToUTC(date))
   return addSeconds(convertDateToUTC(date), timeoffset)
 }
 

diff --git a/src/components/weather.js b/src/components/weather.js
@@ -55,8 +55,8 @@ const getWeatherByCoord = function (url, lat, lon, option, callback) {
     .query({ units: store.getFormat() })
     .query({ appid: store.getApiKey() })
     .end(function (err, res) {
-      console.log(err)
-      console.log(res)
+      // console.log(err)
+      // console.log(res)
       let loading = utils.getLoading
       loading[option] = false
       utils.setLoading(loading)
@@ -86,6 +86,14 @@ const refreshInfo = function () {
   }, config.start.interval)
 }
 
+const refreshLocationInfo = function () {
+  setInterval(function () {
+    // refreshWeather()
+    getGeolocation();
+    console.log('refresh location')
+  }, 2 * 3600000)
+}
+
 const refreshWeather = function () {
   jQuery('.spinner').fadeIn()
   utils.showAll()
@@ -97,7 +105,7 @@ const refreshWeather = function () {
   getWeatherByCity(config.weather.url.hourly, store.getCity(), 2)
 
   window.setTimeout(function () {
-    // console.log(wdata)
+
     if (store.getMbInfo() && wdata[0].cod !== 404) {
       ipcRenderer.send('set-title', {
         temperature: utils.roundTemp(wdata[0].main.temp),
@@ -110,6 +118,7 @@ const refreshWeather = function () {
     }
   }, 500)
 
+
   window.setTimeout(color.colorPalette, 1000)
 }
 
@@ -342,10 +351,43 @@ const getGeolocation = function () {
   //   }
   // )
 
+  navigator.geolocation.getCurrentPosition(res => {
+    console.log(res)
+    const lat = res.coords.latitude
+    const lon = res.coords.longitude
+
+    utils.reset()
+    getWeatherByCoord(config.weather.url.actual, lat, lon, 0, showWeatherData)
+    getWeatherByCoord(config.weather.url.daily, lat, lon, 1, showForecastWeatherData)
+    getWeatherByCoord(config.weather.url.hourly, lat, lon, 2)
+
+    const wdata = store.getWdata()
+
+    window.setTimeout(function () {
+      if (store.getMbInfo() & wdata[0].cod !== 404) {
+        ipcRenderer.send('set-title', {
+          temperature: utils.roundTemp(wdata[0].main.temp),
+          location: store.getCity(),
+          icon: wdata[0].weather[0].icon
+        })
+      }
+      if (wdata[0].cod !== 404) {
+        timezone.getTimezone()
+      }
+    }, 500)
+
+    window.setTimeout(color.colorPalette, 1000)
+  }, err => {
+    console.log(err)
+    utils.showErrorMessage('Failure during location fetching')
+  });
+
+/*
   superagent
-    .get("http://ip-api.com/json/")
-    // .query({ browser: 'chromium' })
-    // .query({ sensor: true })
+    .get("https://www.googleapis.com/geolocation/v1/geolocate?key=AIzaSyAIyKnnlRNzl4zE8Msjii2YxzBVyquutuk")
+    // .get("http://ip-api.com/json/")
+    .query({ browser: 'chromium' })
+    .query({ sensor: true })
     .end(function (err, res) {
       if (err || !res.ok) {
         console.log(err)
@@ -378,6 +420,7 @@ const getGeolocation = function () {
         window.setTimeout(color.colorPalette, 1000)
       }
     })
+    */
 }
 
 const showRain = function (nbDrop = 100) {
@@ -410,6 +453,7 @@ const setNumAnimTemp = function (na) {
 exports.getWeatherByCity = getWeatherByCity
 exports.getWeatherByCoord = getWeatherByCoord
 exports.refreshInfo = refreshInfo
+exports.refreshLocationInfo = refreshLocationInfo
 exports.refreshWeather = refreshWeather
 exports.showWeatherData = showWeatherData
 exports.showForecastWeatherData = showForecastWeatherData

diff --git a/src/main/config.json b/src/main/config.json
@@ -4,7 +4,7 @@
   "apikey": "547bbdc38bd641bef6645cd2c4bc613f",
   "timezone": {
     "url": "https://maps.googleapis.com/maps/api/timezone/json",
-    "apikey": "AIzaSyD7CnHeMDQV_XCXlimoPwiPSB_83Wfq7LE",
+    "apikey": "AIzaSyAIyKnnlRNzl4zE8Msjii2YxzBVyquutuk",
     "offset": 0
   },
   "weather": {
@@ -17,7 +17,7 @@
   "location": {
     "url": "https://maps.googleapis.com/maps/api/browserlocation/json"
   },
-  "color": {
+  "color": { 
     "error" : "#444444",
     "list": ["#b1695a", "#DB9864", "#E3BB88", "#D0C7A8", "#B1C2A3", "#80BBB2", "#6D9E96", "#8F95A5", "#6F7685"]
   },

diff --git a/src/main/index.html b/src/main/index.html
diff --git a/src/main/main.js b/src/main/main.js
@@ -6,6 +6,7 @@ const store = require('./../utilities/store')
 const weather = require('./../components/weather')
 const utils = require('./../utilities/utils')
 
+
 window.onload = function () {
   init()
 
@@ -20,6 +21,7 @@ const loadEventListener = function () {
 
   utils.showDate()
   weather.refreshInfo()
+  weather.refreshLocationInfo()
 
   jQuery('input#city').keypress(function (e) {
     if (e.which === 13) {

diff --git a/src/main/style.css b/src/main/style.css
diff --git a/src/utilities/color.js b/src/utilities/color.js
diff --git a/src/utilities/store.js b/src/utilities/store.js
diff --git a/src/utilities/utils.js b/src/utilities/utils.js
@@ -60,8 +60,8 @@ const toggleDetails = function () {
 }
 
 const showDate = function () {
-  jQuery('#details .header .date').html(getTodayDate())
-  jQuery('#main .clock').html(getTime())
+  // jQuery('#details .header .date').html(getTodayDate())
+  // jQuery('#main .clock').html(getTime())
   setInterval(function () {
     refreshClock()
   }, 60000)