adding app icon and upgrading color palette

TODO.md

@@ -1,17 +1,23 @@
-* hourly forecast usability improvement
-* show weather icon for hourly forecast
-* "no internet connection" error
+## v0.3.0
 * ~~"no api key" error~~
 * ~~"api error"~~
-* app icon
 * ~~menubar dark mode icon~~
+* ~~app icon~~
+* ~~global shortcut~~
+* ~~upgrading color palette~~
+* ~~bugs~~
+
+## v0.4.0
+* hourly forecast usability improvement
+* show weather icon for hourly forecast
+* "no internet connection" error
 * snow animation
-* city autocomplete
 * loading animation
 * time and date of city
-* ~~global shortcut~~
 * auto updates
-* landing page
-* ~~allow copy, paste, select all~~
-* upgrading color palette
 * outsource configs
+
+## v0.5.0
+* landing page
+* web demo
+* city autocomplete

index.html

@@ -8,7 +8,6 @@
     <link rel="stylesheet" href="src/libs/animate.min.css">
     <link rel="stylesheet" href="node_modules/js-autocomplete/auto-complete.css">
     <link rel="stylesheet" href="src/style.css">
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700,400italic">
     <script type="text/javascript" src="src/utils.js"></script>
     <script type="text/javascript" src="src/timezone.js"></script>
@@ -85,7 +84,7 @@ <h1>
                     <button class="close">Close</button>
                 </div>
                 <div class="footer">
-                    <a href="https://github.com/jackd248/temps" target="_blank" alt="temps">temps</a> v0.2.0 &copy; 2016
+                    <a href="https://github.com/jackd248/temps" target="_blank" alt="temps">temps</a> - v0.3.0 &copy; 2016
                 </div>
             </div>
         </div>

package.json

@@ -16,14 +16,14 @@
     "dev": "electron . --debug",
     "clean:dist": "rm -rf ./dist",
     "build": "npm run build:osx && npm run build:win && npm run build:linux",
-    "build:osx": "electron-packager . $npm_package_productName --out=dist --ignore='^/dist$' --overwrite --prune --asar --arch=all --platform=darwin --version=$npm_package_electronVersion --app-version=$npm_package_version",
-    "build:win": "electron-packager . $npm_package_productName --out=dist --arch=all --platform=win32 --ignore='^/dist$' --prune --asar --overwrite --version=$npm_package_electronVersion --app-version=$npm_package_version",
-    "build:linux": "electron-packager . $npm_package_productName --out=dist --arch=all --platform=linux --ignore='^/dist$' --prune --asar --overwrite --version=$npm_package_electronVersion --app-version=$npm_package_version",
+    "build:osx": "electron-packager . $npm_package_productName --out=dist --ignore='^/dist$' --overwrite --prune --asar --arch=all --platform=darwin --icon=./assets/app.icns --version=$npm_package_electronVersion --app-version=$npm_package_version",
+    "build:win": "electron-packager . $npm_package_productName --out=dist --arch=all --platform=win32 --ignore='^/dist$' --prune --asar --overwrite --icon=./assets/app.ico --version=$npm_package_electronVersion --app-version=$npm_package_version",
+    "build:linux": "electron-packager . $npm_package_productName --out=dist --arch=all --platform=linux --ignore='^/dist$' --prune --asar --overwrite --icon=./assets/app.png --version=$npm_package_electronVersion --app-version=$npm_package_version",
     "package": "npm run package:win32 && npm run package:win64 && npm run package:osx && npm run package:linux",
-    "package:win64": "electron-builder dist/Ampersand-win32-x64/ --platform=win --out=dist --config=config.json && mv 'dist/Ampersand Setup.exe' dist/Ampersand_Windows64.exe",
-    "package:win32": "electron-builder dist/Ampersand-win32-ia32/ --platform=win --out=dist --config=config.json && mv 'dist/Ampersand Setup.exe' dist/Ampersand_Windows32.exe",
-    "package:osx": "hdiutil create -format UDZO -srcfolder dist/Ampersand-darwin-x64/Ampersand.app dist/Ampersand_Mac.dmg",
-    "package:linux": "cd dist/ && zip -r Ampersand_Linux_x64.zip Ampersand-linux-x64 && zip -r Ampersand_Linux_ia32.zip Ampersand-linux-ia32 && cd ../"
+    "package:win64": "electron-builder dist/Temps-win32-x64/ --platform=win --out=dist --config=config.json && mv 'dist/Temps Setup.exe' dist/Temps_Windows64.exe",
+    "package:win32": "electron-builder dist/Temps-win32-ia32/ --platform=win --out=dist --config=config.json && mv 'dist/Temps Setup.exe' dist/Temps_Windows32.exe",
+    "package:osx": "hdiutil create -format UDZO -srcfolder dist/Temps-darwin-x64/Temps.app dist/Temps_Mac.dmg",
+    "package:linux": "cd dist/ && zip -r Temps_Linux_x64.zip Temps-linux-x64 && zip -r Temps_Linux_ia32.zip Temps-linux-ia32 && cd ../"
   },
   "author": "Konrad Michalik <[email protected]>",
   "license": "MIT",

src/style.css

@@ -320,6 +320,17 @@ h1:after {
     transition: all 1s ease-in-out;
 }
 
+#settings h1:before {
+    width: 40px;
+    height: 40px;
+    content: ' ';
+    background: url('../assets/app.png') no-repeat center center;
+    background-size: cover;
+    position: absolute;
+    margin-left: -50px;
+    margin-top: -5px;
+}
+
 #settings .content {
     display: none;
     padding: 10px;

src/timezone.js

@@ -3,9 +3,6 @@ var apikey = 'AIzaSyD7CnHeMDQV_XCXlimoPwiPSB_83Wfq7LE';
 function getTimezone () {
     jQuery.get("https://maps.googleapis.com/maps/api/timezone/json?location=" + wdata.coord.lat + "," + wdata.coord.lon + "&timestamp=1331161200&key=" + apikey, function(data){
         console.log(data);
-        var d = new Date();
-        console.log(Date.UTC(d.getFullYear(),(d.getMonth()+1),d.getDate(),d.getHours(),d.getMinutes(),d.getSeconds()));
-        console.log(d.getTimezoneOffset()*60);
     }).done(function() {
 
     }).fail(function() {

src/utils.js

@@ -51,7 +51,7 @@ var colorPalette = function() {
     }
     var temp = roundTemp(wdata.main.temp);
     // var colors = ['#b1695a', '#db9864', '#e3bb88', '#def1c5', '#80bbb2', '#69a5a6'];
-    var colors = ['#b1695a', '#FF7043', '#FFB74D', '#e3bb88', '#AFB42B', '#7CB342', '#26A69A', '#0097A7', '#0288D1', '#1976D2'];
+    var colors = ['#b1695a', '#DB9864', '#E3BB88', '#D0C7A8', '#B1C2A3', '#80BBB2', '#6D9E96', '#8F95A5', '#6F7685'];
 
     if (getFormat() == 'metric') {
         if (temp > 30) {
@@ -184,6 +184,10 @@ var setMbInfo = function(bool) {
 
 var showErrorMessage = function(message) {
     setColor('#444444');
+    jQuery('#main .actual-icon svg').html('');
+    jQuery('#details .location').html('');
+    jQuery('#details .forecast').html('');
+    jQuery('#details .hourly').html('');
     jQuery('#main .content .temp').html('=( ');
     jQuery('#main .content .temp-note').html(message);
     jQuery('#main .actual-icon svg').html('<image xlink:href="assets/icons/11d.svg" src="assets/icons/11d.svg" width="80" height="80"/>');
@@ -203,7 +207,6 @@ var getApiKey = function () {
         return store.get('apikey')
     } else {
         showErrorMessage('No API Key');
-        store.set('apikey', '3262d5cec239ea0fc97e9b9ebddf9a10');
     }
 };
 
@@ -238,10 +241,6 @@ var showThunder = function() {
 };
 
 var reset = function() {
-    jQuery('#main .actual-icon svg').html('');
-    jQuery('#details .location').html('');
-    jQuery('#details .forecast').html('');
-    jQuery('#details .hourly').html('');
     jQuery('.drop').remove();
     jQuery('.thunder').remove();
 };