Suppression de Yahoo Weather et remplacement par OpenWeatherMap

5 years ago · ecb4dd3d93
--- a/dist/config.json
+++ b/dist/config.json
@ -1,6 +1,7 @@
 {
  "unsplashCollectionID": 1053828,
  "defaultWeatherLocation": "Paris",
  "WeatherKey": "c9d49310f8023ee2617a7634de23c2aa",
  "defaultSearchBaseURL": "https://encrypted.google.com/search?q=",
  "commands" : [
  	{ "key": "s", "name": "Shaarlo", "url": "https://www.shaarlo.fr", "search": "/index.php?from=20130000&to=90130000&q=" },
--- a/dist/css/style.css
+++ b/dist/css/style.css
--- a/dist/img/weather/day/clear.png
+++ b/dist/img/weather/day/clear.png
--- a/dist/img/weather/day/clouds.png
+++ b/dist/img/weather/day/clouds.png
--- a/dist/img/weather/day/mist.png
+++ b/dist/img/weather/day/mist.png
--- a/dist/img/weather/day/rain.png
+++ b/dist/img/weather/day/rain.png
--- a/dist/img/weather/day/snow.png
+++ b/dist/img/weather/day/snow.png
--- a/dist/img/weather/day/storm.png
+++ b/dist/img/weather/day/storm.png
--- a/dist/img/weather/night/clear.png
+++ b/dist/img/weather/night/clear.png
--- a/dist/img/weather/night/clouds.png
+++ b/dist/img/weather/night/clouds.png
--- a/dist/img/weather/night/mist.png
+++ b/dist/img/weather/night/mist.png
--- a/dist/img/weather/night/rain.png
+++ b/dist/img/weather/night/rain.png
--- a/dist/img/weather/night/snow.png
+++ b/dist/img/weather/night/snow.png
--- a/dist/img/weather/night/storm.png
+++ b/dist/img/weather/night/storm.png
--- a/dist/index.html
+++ b/dist/index.html
@ -1 +1 @@
 <!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="robots" content="noindex"><meta name="viewport" content="width=device-width,initial-scale=1"><meta http-equiv="x-ua-compatible" content="ie=edge"><title>Nouvel onglet</title><link rel="shortcut icon" href="favicon.ico?1.1" type="image/x-icon"><link rel="icon" href="favicon.ico?1.1" type="image/x-icon"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:300:latin"><link rel="stylesheet" href="css/style.css"></head><body><div id="wrapper"><div class="box"><time class="time" id="js-time"></time><br><span id="quotes"></span><br><span id="weather"></span><br><form class="search" id="js-search" autocomplete="off"><input class="search-text" id="js-search-text" type="text" autofocus></form><pre class="help" id="js-help"></pre></div><div class="grid"></div><form id="addLinkForm"><div><label for="titre">Titre du lien</label> <input type="text" id="titre" value=""></div><div><label for="cible">Cible du lien</label> <input type="text" id="cible" value=""></div><input type="submit" value="Ajouter"></form></div><script src="js/script.js"></script></body></html>
 <!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="robots" content="noindex"><meta name="viewport" content="width=device-width,initial-scale=1"><meta http-equiv="x-ua-compatible" content="ie=edge"><title>Nouvel onglet</title><link rel="shortcut icon" href="favicon.ico?1.1" type="image/x-icon"><link rel="icon" href="favicon.ico?1.1" type="image/x-icon"><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:300:latin"><link rel="stylesheet" href="css/style.css"></head><body><div id="wrapper"><div class="box"><time class="time" id="js-time"></time><br><span id="quotes"></span><br><span id="weather-wrapper"><img src="" class="weather-icon" alt="Weather Icon"> <span id="weather"></span></span><br><form class="search" id="js-search" autocomplete="off"><input class="search-text" id="js-search-text" type="text" autofocus></form><pre class="help" id="js-help"></pre></div><div class="grid"></div><form id="addLinkForm"><div><label for="titre">Titre du lien</label> <input type="text" id="titre" value=""></div><div><label for="cible">Cible du lien</label> <input type="text" id="cible" value=""></div><input type="submit" value="Ajouter"></form></div><script src="js/script.js"></script></body></html>
--- a/dist/js/script.js
+++ b/dist/js/script.js
--- a/gulpfile.js
+++ b/gulpfile.js
@ -52,9 +52,7 @@ gulp.task('styles', function () {

 // Gulp task to minify JavaScript files
 gulp.task('scripts', function() {
  return gulp.src(['src/js/jquery-1.12.0.min.js', 'src/js/jquery-ui.min.js', 'src/js/jquery.simpleWeather.min.js', 'src/js/jstorage.min.js', 'src/js/alertify.min.js', 'src/js/app.js'])
    // Minify the file
    .pipe(uglify())
  return gulp.src(['src/js/jquery-1.12.0.min.js', 'src/js/jquery-ui.min.js', 'src/js/openweather.min.js', 'src/js/jstorage.min.js', 'src/js/alertify.min.js', 'src/js/app.js'])
    .pipe(concat('script.js'))
    // Output
    .pipe(gulp.dest('./dist/js'))
@ -75,6 +73,8 @@ gulp.task('clean', () => del(['dist']));
 gulp.task('copy', function(){
  gulp.src(['./src/fonts/*']).pipe(gulp.dest('./dist/fonts/'));
  gulp.src(['./src/favicon.ico*']).pipe(gulp.dest('./dist/'));
  gulp.src(['./src/img/weather/day/*']).pipe(gulp.dest('./dist/img/weather/day/'));
  gulp.src(['./src/img/weather/night/*']).pipe(gulp.dest('./dist/img/weather/night/'));
  gulp.src(['./src/config.json*']).pipe(gulp.dest('./dist/'));
 });

--- a/src/config.json
+++ b/src/config.json
@ -1,6 +1,7 @@
 {
  "unsplashCollectionID": 1053828,
  "defaultWeatherLocation": "Paris",
  "WeatherKey": "c9d49310f8023ee2617a7634de23c2aa",
  "defaultSearchBaseURL": "https://encrypted.google.com/search?q=",
  "commands" : [
  	{ "key": "s", "name": "Shaarlo", "url": "https://www.shaarlo.fr", "search": "/index.php?from=20130000&to=90130000&q=" },
--- a/src/css/style.css
+++ b/src/css/style.css
@ -66,15 +66,14 @@ input:focus {

 #quotes {
    font-weight: bold;
    font-size:2em;
 }

 #weather {
    color: #999999;
    font-size:4em;
 }

 .weatherinfo{
    font-size:2rem;
 #weather-wrapper{
    margin:15px 0 0;
    display: block;
    font-size:2em;
    font-weight: bold;
 }

 #wrapper {
--- a/src/img/weather/day/clear.png
+++ b/src/img/weather/day/clear.png
--- a/src/img/weather/day/clouds.png
+++ b/src/img/weather/day/clouds.png
--- a/src/img/weather/day/mist.png
+++ b/src/img/weather/day/mist.png
--- a/src/img/weather/day/rain.png
+++ b/src/img/weather/day/rain.png
--- a/src/img/weather/day/snow.png
+++ b/src/img/weather/day/snow.png
--- a/src/img/weather/day/storm.png
+++ b/src/img/weather/day/storm.png
--- a/src/img/weather/night/clear.png
+++ b/src/img/weather/night/clear.png
--- a/src/img/weather/night/clouds.png
+++ b/src/img/weather/night/clouds.png
--- a/src/img/weather/night/mist.png
+++ b/src/img/weather/night/mist.png
--- a/src/img/weather/night/rain.png
+++ b/src/img/weather/night/rain.png
--- a/src/img/weather/night/snow.png
+++ b/src/img/weather/night/snow.png
--- a/src/img/weather/night/storm.png
+++ b/src/img/weather/night/storm.png
--- a/src/index.html
+++ b/src/index.html
@ -22,7 +22,10 @@
            <br>
            <span id="quotes"></span>
            <br>
            <span id="weather"></span>
            <span id="weather-wrapper">
                <img src="" class="weather-icon" alt="Weather Icon" />
                <span id="weather"></span>
            </span>
            <br>
            <form class="search" id="js-search" autocomplete="off">
                <input class="search-text" id="js-search-text" type="text" autofocus>
--- a/src/js/app.js
+++ b/src/js/app.js
@ -1,5 +1,6 @@
 var unsplashCollectionID = 1053828;
 var defaultWeatherLocation = 'Paris';
 var WeatherKey = 'c9d49310f8023ee2617a7634de23c2aa';    //~ Go to https://openweathermap.org/api
 var defaultSearchBaseURL = 'https://encrypted.google.com/search?q=';
 var commands = [
    { "key": "s", "name": "Shaarlo", "url": "https://www.shaarlo.fr", "search": "/index.php?from=20130000&to=90130000&q=" },
@ -27,20 +28,21 @@ var messages = [
    },
 ];

 function loadWeather(location, woeid) {
    $.simpleWeather({
        location: location,
        woeid: woeid,
        unit: 'c',
        success: function (weather) {
            var html = '<i class="icon-'+weather.code+'"></i><div class="weatherinfo">'+weather.temp+'&deg;'+weather.units.temp+'</div>';
            html += ''+weather.city+', '+weather.region+'';
 function loadWeather(location, key) {
    $('#weather').openWeather({
        key: key,
        city: location,
        lang: 'fr',
        units: 'c',
        iconTarget: '.weather-icon',
        customIcons: 'img/weather/',
        success: function(weather) {
            var html = '<div class="weatherinfo">'+weather.temperature.current+'</div>';
            html += ''+weather.city;
            $("#weather").html(html);

        },
        error: function (error) {
 			console.log(error);
            $("#weather").html('<p>' + error + '</p>');
        error: function(data) {
            
        }
    });
 }
@ -172,7 +174,7 @@ $(function() {

        $('#quotes').text(timedQuotes());

        loadWeather(defaultWeatherLocation, '');
        loadWeather(defaultWeatherLocation, WeatherKey);

        loadLinks();
    });
--- a/src/js/openweather.min.js
+++ b/src/js/openweather.min.js
@ -0,0 +1,11 @@
 /*!

 Name: Open Weather
 Dependencies: jQuery, OpenWeatherMap API
 Author: Michael Lynch
 Author URL: http://michaelynch.com
 Date Created: August 28, 2013
 Licensed under the MIT license

 */
 !function(t){t.fn.openWeather=function(e){if(!this.length)return this;const n=t(this);this.settings={},this.settings=t.extend({},{descriptionTarget:null,maxTemperatureTarget:null,minTemperatureTarget:null,windSpeedTarget:null,humidityTarget:null,sunriseTarget:null,sunsetTarget:null,placeTarget:null,iconTarget:null,customIcons:null,units:"c",city:null,lat:null,lng:null,key:null,lang:"en",success:function(){},error:function(t){}},e);const r=this.settings,i=function(t){const e=new Date(1e3*t);let n=e.getHours();if(n>12){n=12-(24-n)}let r=e.getMinutes();return(r=r.toString()).length<2&&(r=0+r),n+":"+r};let a,l,s,u,o="//api.openweathermap.org/data/2.5/weather?lang="+r.lang;null!=r.city?o+="&q="+r.city:null!=r.lat&&null!=r.lng&&(o+="&lat="+r.lat+"&lon="+r.lng),null!=r.key&&(o+="&appid="+r.key),t.ajax({type:"GET",url:o,dataType:"jsonp",success:function(e){if(e){if("f"==r.units?(l=Math.round(1.8*(e.main.temp-273.15)+32)+"°F",s=Math.round(1.8*(e.main.temp_min-273.15)+32)+"°F",u=Math.round(1.8*(e.main.temp_max-273.15)+32)+"°F"):(l=Math.round(e.main.temp-273.15)+"°C",s=Math.round(e.main.temp_min-273.15)+"°C",u=Math.round(e.main.temp_max-273.15)+"°C"),a={city:`${e.name}, ${e.sys.country}`,temperature:{current:l,min:s,max:u,units:r.units.toUpperCase()},description:e.weather[0].description,windspeed:`${Math.round(e.wind.speed)} Mps`,humidity:`${e.main.humidity}%`,sunrise:`${i(e.sys.sunrise)} AM`,sunset:`${i(e.sys.sunset)} PM`},n.html(l),null!=r.minTemperatureTarget&&t(r.minTemperatureTarget).text(s),null!=r.maxTemperatureTarget&&t(r.maxTemperatureTarget).text(u),t(r.descriptionTarget).text(a.description),null!=r.iconTarget&&null!=e.weather[0].icon){let n;if(null!=r.customIcons){const t=e.weather[0].icon;let i,a;i=-1!=t.indexOf("d")?"day":"night","01d"!=t&&"01n"!=t||(a="clear"),"02d"!=t&&"02n"!=t&&"03d"!=t&&"03n"!=t&&"04d"!=t&&"04n"!=t||(a="clouds"),"09d"!=t&&"09n"!=t&&"10d"!=t&&"10n"!=t||(a="rain"),"11d"!=t&&"11n"!=t||(a="storm"),"13d"!=t&&"13n"!=t||(a="snow"),"50d"!=t&&"50n"!=t||(a="mist"),n=`${r.customIcons}${i}/${a}.png`}else n=`http://openweathermap.org/img/w/${e.weather[0].icon}.png`;t(r.iconTarget).attr("src",n)}null!=r.placeTarget&&t(r.placeTarget).text(a.city),null!=r.windSpeedTarget&&t(r.windSpeedTarget).text(a.windspeed),null!=r.humidityTarget&&t(r.humidityTarget).text(a.humidity),null!=r.sunriseTarget&&t(r.sunriseTarget).text(a.sunrise),null!=r.sunsetTarget&&t(r.sunsetTarget).text(a.sunset),r.success.call(this,a)}},error:function(t,e,n){r.error.call(this,{error:e})}})}}(jQuery);