Hotfix/adjust icon for electron (#158)

* Add icons into electron version

Author: michelu89

core/electron-libs/app-menu.js

@@ -48,8 +48,9 @@ const {
   SIGNAL_ZOOM_OUT,
   SIGNAL_LOAD_FROM_TEXT,
 } = require('./events');
-const {icons} = require('./consts');
+const {icons, models, inDevMode} = require('./consts');
 const {isMac} = require('./os-checker');
+const path = require('path');
 
 const readFile = promisify(fs.readFile);
 
@@ -115,19 +116,21 @@ const fileSubmenu = [
         id: 'LOAD_DEFAULT_EXAMPLE',
         label: 'SimpleAspect.ttl',
         icon: getIcon(icons.LOAD_DEFAULT_EXAMPLE.enabled),
-        click: (menuItem, browserWindow, _) =>
-          getFileInfo('./apps/ame/src/assets/aspect-models/org.eclipse.examples/1.0.0/SimpleAspect.ttl')
+        click: (menuItem, browserWindow, _) => {
+          return getFileInfo(path.join(models, 'SimpleAspect.ttl'))
             .then(fileInfo => browserWindow.webContents.send(SIGNAL_LOAD_SPECIFIC_FILE, fileInfo))
-            .catch(error => console.error(error)),
+            .catch(error => console.error(error));
+        },
       },
       {
         id: 'LOAD_MOVEMENT_EXAMPLE',
         label: 'Movement.ttl',
         icon: getIcon(icons.LOAD_MOVEMENT_EXAMPLE.enabled),
-        click: (menuItem, browserWindow, _) =>
-          getFileInfo('./apps/ame/src/assets/aspect-models/org.eclipse.examples/1.0.0/Movement.ttl')
+        click: (menuItem, browserWindow, _) => {
+          return getFileInfo(path.join(models, 'Movement.ttl'))
             .then(fileInfo => browserWindow.webContents.send(SIGNAL_LOAD_SPECIFIC_FILE, fileInfo))
-            .catch(error => console.error(error)),
+            .catch(error => console.error(error));
+        },
       },
     ],
   },

core/electron-libs/consts.js

@@ -21,11 +21,16 @@ function inProdMode() {
   return !inDevMode();
 }
 
-const iconsPath = inDevMode() ? path.join('.', 'apps', 'ame', 'src', 'assets', 'img', 'png', 'app-menu') : path.join();
+const iconsPath = inDevMode()
+  ? path.join('.', 'apps', 'ame', 'src', 'assets', 'img', 'png', 'app-menu')
+  : path.join(__dirname, '..', '..', '..', 'app-menu');
+
 const disabledIconsPath = `${iconsPath}${path.sep}disabled`;
 const enabledIconsPath = `${iconsPath}${path.sep}enabled`;
 
-const modelsPath = inDevMode() ? path.join('.', 'apps', 'ame', 'src', 'assets', 'aspect-models') : path.join();
+const modelsPath = inDevMode()
+  ? path.join('.', 'apps', 'ame', 'src', 'assets', 'aspect-models', 'org.eclipse.examples', '1.0.0')
+  : path.join(__dirname, '..', '..', '..', 'default-models');
 
 module.exports.paths = {
   icons: {

core/package.json

@@ -23,6 +23,20 @@
           "filter": [
             "**/*"
           ]
+        },
+        {
+          "from": "./apps/ame/src/assets/aspect-models/org.eclipse.examples/1.0.0/",
+          "to": "default-models/",
+          "filter": [
+            "**/*"
+          ]
+        },
+        {
+          "from": "./apps/ame/src/assets/img/png/app-menu/",
+          "to": "app-menu/",
+          "filter": [
+            "**/*"
+          ]
         }
       ]
     },
@@ -41,6 +55,20 @@
           "filter": [
             "**/*"
           ]
+        },
+        {
+          "from": "./apps/ame/src/assets/aspect-models/org.eclipse.examples/1.0.0/",
+          "to": "default-models/",
+          "filter": [
+            "**/*"
+          ]
+        },
+        {
+          "from": "./apps/ame/src/assets/img/png/app-menu/",
+          "to": "app-menu/",
+          "filter": [
+            "**/*"
+          ]
         }
       ]
     },
@@ -59,6 +87,20 @@
           "filter": [
             "**/*"
           ]
+        },
+        {
+          "from": "./apps/ame/src/assets/aspect-models/org.eclipse.examples/1.0.0/",
+          "to": "default-models/",
+          "filter": [
+            "**/*"
+          ]
+        },
+        {
+          "from": "./apps/ame/src/assets/img/png/app-menu/",
+          "to": "app-menu/",
+          "filter": [
+            "**/*"
+          ]
         }
       ]
     },