Merge pull request #6 from stefansl/dev

Dev
stefansl · Feb 5, 2018 · ac4f20f · ac4f20f
2 parents ac0ddad + 7842325
commit ac4f20f
Show file tree

Hide file tree

Showing 43 changed files with 3,863 additions and 140 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,10 @@ node_modules
 .idea
 release-builds
 .DS_Store
-release
 /.gitignore
 /package-lock.json
+build/
+dist/
+script.sh
+/Mac_Distribution_Provisioning_Profiles_.provisionprofile
+!/build/
diff --git a/README.md b/README.md
@@ -10,8 +10,8 @@ Drag your image file onto the Image Shrinker window and it will saved in the sam
 The original graphic will be not replaced.
 
 ## Download and Installation on MacOsX
-Download Image Shrinker here:
-https://github.com/stefansl/image-shrinker/releases/download/v1.2.0/Image.Shrinker.zip
+Download Image Shrinker here:  
+https://github.com/stefansl/image-shrinker/releases/download/v1.2.1/Image%20Shrinker-1.2.1.dmg
 
 Unpack and copy or drag the app into your MacOSX application folder.
 For uninstalling, just drop the app into the bin.

diff --git a/assets/css/imageshrinker.css b/assets/css/imageshrinker.css
diff --git a/assets/css/imageshrinker.css.map b/assets/css/imageshrinker.css.map
diff --git a/assets/css/imageshrinker.scss b/assets/css/imageshrinker.scss
@@ -98,7 +98,7 @@ body {
 #result {
   max-height: 400px;
   overflow-y: scroll;
-  -webkit-mask-image: -webkit-linear-gradient(bottom, transparent 1%, white 20%, white 90%,transparent 99%);
+  -webkit-mask-image: -webkit-linear-gradient(bottom, transparent 1%, white 20%, white 90%, transparent 99%);
 
 }
 
@@ -120,12 +120,13 @@ body {
 
 #menuSettings {
   position: absolute;
+  z-index: 10;
   padding: 3rem 1rem;
   top: 0;
   left: 0;
   width: 100vw;
   height: 100vh;
-  background-color: rgba($black, .85);
+  background-color: rgba($black, .9);
   color: rgba($white, .95);
   transform: translate3d(-100%, 0, 0);
   transition: transform 450ms cubic-bezier(0.23, 1, 0.32, 1);
@@ -154,6 +155,20 @@ body {
   }
 }
 
+#btnOpenSettings {
+  z-index: 5;
+  &:hover {
+    color: rgba($black, .50);
+  }
+}
+
+#btnCloseSettings {
+  &:hover {
+    color: rgba($white, .75);
+  }
+
+}
+
 #btnOpenSettings, #btnCloseSettings {
   position: absolute;
   right: 1rem;

diff --git a/assets/icons/mac/icon_image-shrinker.icns b/assets/icons/mac/icon_image-shrinker.icns
diff --git a/assets/icons/mac/icon_image-shrinker.svg.icns b/assets/icons/mac/icon_image-shrinker.svg.icns
diff --git a/assets/icons/png/128x128.png b/assets/icons/png/128x128.png
diff --git a/assets/icons/png/[email protected] b/assets/icons/png/[email protected]
diff --git a/assets/icons/png/16x16.png b/assets/icons/png/16x16.png
diff --git a/assets/icons/png/[email protected] b/assets/icons/png/[email protected]
diff --git a/assets/icons/png/24x24.png b/assets/icons/png/24x24.png
diff --git a/assets/icons/png/256x256.png b/assets/icons/png/256x256.png
diff --git a/assets/icons/png/[email protected] b/assets/icons/png/[email protected]
diff --git a/assets/icons/png/32x32.png b/assets/icons/png/32x32.png
diff --git a/assets/icons/png/[email protected] b/assets/icons/png/[email protected]
diff --git a/assets/icons/png/48x48.png b/assets/icons/png/48x48.png
diff --git a/assets/icons/png/512x512.png b/assets/icons/png/512x512.png
diff --git a/assets/icons/png/[email protected] b/assets/icons/png/[email protected]
diff --git a/assets/icons/png/64x64.png b/assets/icons/png/64x64.png
diff --git a/assets/icons/png/96x96.png b/assets/icons/png/96x96.png
diff --git a/assets/img/screen.min.png b/assets/img/screen.min.png
diff --git a/assets/img/screen.png b/assets/img/screen.png
diff --git a/build/128x128.png b/build/128x128.png
diff --git a/build/[email protected] b/build/[email protected]
diff --git a/build/16x16.png b/build/16x16.png
diff --git a/build/[email protected] b/build/[email protected]
diff --git a/build/256x256.png b/build/256x256.png
diff --git a/build/[email protected] b/build/[email protected]
diff --git a/build/32x32.png b/build/32x32.png
diff --git a/build/[email protected] b/build/[email protected]
diff --git a/build/512x512.png b/build/512x512.png
diff --git a/build/[email protected] b/build/[email protected]
diff --git a/build/bg_dmg.png b/build/bg_dmg.png
diff --git a/build/bg_dmg.tiff b/build/bg_dmg.tiff
diff --git a/build/[email protected] b/build/[email protected]
diff --git a/build/icon.icns b/build/icon.icns
diff --git a/build/icon_dmg.icns b/build/icon_dmg.icns
diff --git a/index.html b/index.html
@@ -10,8 +10,7 @@
 <body>
 <div class="wrapper">
 
-
-    <i class="icon icon-more-horiz icon-2x float-right" id="btnOpenSettings"></i>
+    <i class="icon icon-more-horiz icon-2x float-right d-block" id="btnOpenSettings"></i>
 
     <section id="dragzone" class="">
         <h1>Drag files here</h1>
@@ -45,7 +44,6 @@ <h3>Settings</h3>
             </div>
 
 
-
             <div class="columns">
                 <div class="column col-9">
                     Enable notifications
@@ -80,7 +78,7 @@ <h3>Settings</h3>
             </a>
         </div>
 
-        <i class="icon icon-cross icon-2x" id="btnCloseSettings"></i>
+        <i class="icon icon-cross icon-2x d-block" id="btnCloseSettings"></i>
     </section>
 </div>
 <div id="background">

diff --git a/main.js b/main.js
@@ -8,6 +8,7 @@ const settings = require('electron-settings');
 const execFile = require('child_process').execFile;
 const mozjpeg = require('mozjpeg');
 const pngquant = require('pngquant-bin');
+const mkdirp = require('mkdirp');
 // const console = require('console'); // only for dev
 
 let svg = new svgo();
@@ -82,7 +83,7 @@ app.on('activate', () => {
 ipcMain.on(
     'shrinkImage', (event, fileName, filePath) => {
 
-        fs.readFile(filePath, 'utf8', function (err, data) {
+        fs.readFile(filePath, 'utf8', (err, data) => {
 
             if (err) {
                 throw err;
@@ -95,8 +96,13 @@ ipcMain.on(
                 case '.svg':
                     svg.optimize(data)
                         .then(function (result) {
-                            fs.writeFile(newFile, result.data, '', () => {});
-                            event.sender.send('isShrinked', newFile);
+                            fs.writeFile(newFile, result.data, (err) => {
+                                if (!err) event.sender.send('isShrinked', newFile);
+                                else dialog.showMessageBox({
+                                    'type': 'error',
+                                    'message': 'I\'m not able to write your new image. Sorry!'
+                                });
+                            });
                         })
                         .catch(function (error) {
                             dialog(error.message);
@@ -106,15 +112,23 @@ ipcMain.on(
 
                 case '.jpg':
                 case '.jpeg':
-                    execFile(mozjpeg, ['-outfile', newFile, filePath], () => {
-                        event.sender.send('isShrinked', newFile);
+                    execFile(mozjpeg, ['-outfile', newFile, filePath], (err) => {
+                        if (!err) event.sender.send('isShrinked', newFile);
+                        else dialog.showMessageBox({
+                            'type': 'error',
+                            'message': 'I\'m not able to write your new image. Sorry!'
+                        });
                     });
 
                     break;
 
                 case '.png':
-                    execFile(pngquant, ['-o', newFile, filePath], () => {
-                        event.sender.send('isShrinked', newFile);
+                    execFile(pngquant, ['-fo', newFile, filePath], (err) => {
+                        if (!err) event.sender.send('isShrinked', newFile);
+                        else dialog.showMessageBox({
+                            'type': 'error',
+                            'message': 'I\'m not able to write your new image. Sorry!'
+                        });
                     });
 
                     break;
@@ -130,12 +144,21 @@ ipcMain.on(
 );
 
 
-const generateNewPath = pathName => {
+const generateNewPath = (pathName) => {
 
     let fullpath = path.parse(pathName);
 
-    if(settings.get('folderswitch') === false && typeof settings.get('savepath') !== 'undefined') {
-        fullpath.dir = settings.get('savepath')[0];
+    if (settings.get('folderswitch') === false && typeof settings.get('savepath') !== 'undefined') {
+
+        let savepath = settings.get('savepath')[0];
+
+        if (!isDirSync(savepath)) {
+            mkdirp(savepath, function (err) {
+                if (err) console.error(err);
+            });
+        }
+
+        fullpath.dir = savepath;
     }
 
     fullpath.base = fullpath.name + '.min' + fullpath.ext;
@@ -144,4 +167,15 @@ const generateNewPath = pathName => {
 };
 
 
+// Check, if folder exists
+const isDirSync = (aPath) => {
+    try {
+        return fs.statSync(aPath).isDirectory();
+    } catch (e) {
+        if (e.code === 'ENOENT') {
+            return false;
+        }
+    }
+};
+
 module.exports = debug;