Fix issues#3

config/builder.json

@@ -2,7 +2,7 @@
     "appId": "figma-linux",
     "productName": "figma-linux",
     "extraMetadata": "main/main.js",
-    "icon": "resources",
+    "icon": "resources/256x256.png",
     "files": [
         "**/*"
     ],
@@ -18,7 +18,7 @@
 
     "linux": {
         "description": "Unofficial desktop application for linux",
-        "icon": "resources/figma256.png",
+        "icon": "resources/256x256.png",
         "category": "Graphic",
         "depends": [
             "libgconf2-4"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "figma-linux",
-  "version": "0.0.4",
+  "version": "0.0.4-2",
   "description": "Figma is the first interface design tool based in the browser, making it easier for teams to create software.",
   "main": "src/main/index.js",
   "repository": "git@github.com:ChugunovRoman/figma-linux.git",

src/main/index.ts

@@ -1,5 +1,4 @@
 import {
-    shell,
     app,
     net,
     session,
@@ -27,23 +26,29 @@ const winOptions: Electron.BrowserWindowConstructorOptions = {
     }
 };
 
+app.on('browser-window-created', (event, window) => {
+    window.setMenu(null);
+});
+
 app.on('ready', () => {
     let window = new BrowserWindow(winOptions);
 
-    window.loadURL(HOME);
+    window.loadURL(`${HOME}/login`);
+    // console.log(`load url: ${HOME}/login`);
+
 
-    window.webContents.on('will-navigate', (event, url) => {
-        const parts = url.split("/");
-        if (parts[0] + "//" + parts[2] != HOME) {
-            event.preventDefault()
-            shell.openExternal(url)
-        };
-    });
+    // window.webContents.on('will-navigate', (event, url) => {
+    //     const parts = url.split("/");
+
+    //     if (parts[0] + "//" + parts[2] != HOME) {
+    //         event.preventDefault();
+    //         shell.openExternal(url);
+    //     };
+    // });
 
     shorcuts(window);
     menu(window);
 
-
     window.webContents.on('will-navigate', (event, newUrl) => {
         const currentUrl = event.sender.getURL();
 
@@ -62,6 +67,8 @@ app.on('ready', () => {
             return;
         }
 
+        console.log('will-navigate event, to: ', to);
+
         if (to.pathname === '/logout') {
             net.request(`${HOME}/logout`).on('response', response => {
                 response.on('data', chunk => {});
@@ -81,8 +88,13 @@ app.on('ready', () => {
                             app.quit();
                         });
                     }
+
+                    if (response.statusCode >= 400) {
+                        session.defaultSession!.clearStorageData();
+                        window.webContents.loadURL(`${HOME}/login`);
+                    }
                 });
-            }).end();;
+            }).end();
 
             event.preventDefault();
             return;

src/main/menu.ts

@@ -22,6 +22,7 @@ export default (window: BrowserWindow) => {
         }
     }));
 
-    Menu.setApplicationMenu(menu);
+    window.setMenu(menu);
+    // Menu.setApplicationMenu(menu);
     window.setMenuBarVisibility(false);
 }

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "figma-linux",
-  "version": "0.0.4",
+  "version": "0.0.4-2",
   "description": "Figma is the first interface design tool based in the browser, making it easier for teams to create software.",
   "main": "main/main.js",
   "repository": "git@github.com:ChugunovRoman/figma-linux.git",
@@ -11,8 +11,6 @@
     "start": "electron main/main.js"
   },
   "dependencies": {
-    "raven": "^2.4.1",
-    "raven-js": "^3.22.3",
     "react": "^16.2.0",
     "react-dom": "^16.2.0",
     "react-redux": "^5.0.6",

src/renderer/index.tsx

@@ -3,6 +3,6 @@ import { render } from 'react-dom';
 
 render(
     <h1>Figma</h1>,
-    document.getElementById('root')
+    document.getElementById('app')
 );