ing

2018-09-26 23:20:09 +09:00 · 2018-09-26 23:20:09 +09:00 · 9a8e7d4fe7
commit 9a8e7d4fe7
parent a2430e73e9
9 changed files with 81 additions and 83 deletions
--- a/@overflow/commons/ui/component/menu/menu-bar.component.ts
+++ b/@overflow/commons/ui/component/menu/menu-bar.component.ts
@ -8,7 +8,7 @@ import { MenuItem } from 'primeng/primeng';
 })
 export class MenuBarComponent implements OnInit {

-  private items: MenuItem[];
+  items: MenuItem[];

  constructor(
  ) { }
--- a/config/build/windows/nsis/installer.nsh
+++ b/config/build/windows/nsis/installer.nsh
@ -14,6 +14,6 @@ Var SystemDrive

  File "${BUILD_RESOURCES_DIR}\drivers\nrfconnect-driver-installer.exe"

-  ExecWait '"$INSTDIR\nrfconnect-driver-installer.exe"'
+  ExecWait '"$INSTDIR\nrfconnect-driver-installer.exe" /npf_startup=yes /admin_only=no /dot11_support=yes /vlan_support=yes /winpcap_mode=yes'

 !macroend
--- a/electron-builder.json
+++ b/electron-builder.json
@ -1,20 +1,38 @@
 {
  "appId": "com.loafle.overflow.scanner",
-  "copyright": "©2015 LOAFLE",
  "productName": "overFlow Network Scanner",
+  "copyright": "Copyright © 2015 LOAFLE",
+  "directories": {
+    "buildResources": "electron/"
+  },
  "files": [
-    "**/*"
+    "**/*",
+    "!*.ts",
+    "!*.code-workspace",
+    "!@overflow/",
+    "!build/",
+    "!config/",
+    "!e2e/",
+    "!src/",
+    "!.editorconfig",
+    "!.gitignore",
+    "!angular.json",
+    "!karma.conf.js",
+    "!LICENSE.md",
+    "!package.json",
+    "!package-lock.json",
+    "!README.md",
+    "!tsconfig.json",
+    "!tslint.json",
+    "!webpack.js",
+    "!yarn.lock"
  ],
  "asar": true,
  "compression": "normal",
  "npmRebuild": false,
  "npmSkipBuildFromSource": false,
  "artifactName": "${productName}[${env.WAVES_CONFIGURATION}]-${version}-${os}.${ext}",
-  "directories": {
-    "buildResources": "electron/"
-  },
  "linux": {
-    "category": "Utility",
    "target": [
      {
        "target": "deb",
@ -29,15 +47,12 @@
          "x64",
          "ia32"
        ]
-      },
-      {
-        "target": "zip",
-        "arch": [
-          "x64"
-        ]
      }
    ],
    "executableName": "overFlow-Network-Scanner",
+    "icon": "config/build/linux/icon/overflow.png",
+    "synopsis": "overFlow Network Scanner",
+    "category": "Utility",
    "extraFiles": [
      {
        "from": "build/nrfjprog/unpacked/nrfjprog",
@ -46,6 +61,20 @@
      }
    ]
  },
+  "deb": {
+    "depends": [
+      "libpcap"
+    ],
+    "afterInstall": "config/build/linux/after-install.tpl",
+    "afterRemove": "config/build/linux/after-remove.tpl"
+  },
+  "rpm": {
+    "depends": [
+      "libpcap"
+    ],
+    "afterInstall": "config/build/linux/after-install.tpl",
+    "afterRemove": "config/build/linux/after-remove.tpl"
+  },
  "mac": {
    "category": "public.app-category.utilities",
    "artifactName": "${productName}-${version}-${arch}.${ext}",
@ -63,27 +92,6 @@
      }
    ]
  },
-  "win": {
-    "target": [
-      {
-        "target": "nsis",
-        "arch": [
-          "x64",
-          "ia32"
-        ]
-      }
-    ],
-    "legalTrademarks": "overFlow",
-    "publisherName": "LOAFLE",
-    "icon": "config/build/windows/icon/icon.ico"
-  },
-  "nsis": {
-    "artifactName": "${name}-setup-${version}.${ext}",
-    "menuCategory": "overFlow",
-    "include": "config/build/windows/nsis/installer.nsh",
-    "installerIcon": "config/build/windows/icon/icon.ico",
-    "uninstallerIcon": "config/build/windows/icon/icon.ico"
-  },
  "dmg": {
    "icon": null,
    "iconSize": 160,
@ -101,20 +109,28 @@
    ],
    "background": "config/build/darwin/icon/macos-installer-bg.tiff"
  },
-  "deb": {
-    "synopsis": "overFlow Network Scanner",
-    "afterInstall": "config/build/linux/after-install.tpl",
-    "afterRemove": "config/build/linux/after-remove.tpl",
-    "depends": [
-      "libpcap"
-    ]
+  "win": {
+    "target": [
+      {
+        "target": "nsis",
+        "arch": [
+          "x64",
+          "ia32"
+        ]
+      }
+    ],
+    "legalTrademarks": "overFlow",
+    "publisherName": "LOAFLE",
+    "icon": "config/build/windows/icon/icon.ico"
  },
-  "rpm": {
-    "synopsis": "overFlow Network Scanner",
-    "afterInstall": "config/build/linux/after-install.tpl",
-    "afterRemove": "config/build/linux/after-remove.tpl",
-    "depends": [
-      "libpcap"
-    ]
+  "nsis": {
+    "oneClick": false,
+    "perMachine": true,
+    "allowToChangeInstallationDirectory": true,
+    "installerIcon": "config/build/windows/icon/icon.ico",
+    "uninstallerIcon": "config/build/windows/icon/icon.ico",
+    "include": "config/build/windows/nsis/installer.nsh",
+    "artifactName": "${productName} Setup ${version}.${ext}",
+    "menuCategory": "overFlow"
  }
 }
--- a/package.json
+++ b/package.json
@ -1,6 +1,11 @@
 {
  "name": "scanner-app",
  "version": "0.0.0",
+  "author": {
+    "name": "LOAFLE",
+    "email": "rnd@loafle.com",
+    "url": "https://www.loafle.com"
+  },
  "scripts": {
    "postinstall": "yarn electron:builder:install-app-deps",
    "ng": "ng",
@ -9,11 +14,13 @@
    "start:electron:hmr": "npm-run-all -p start:hmr wait-on:build:main:dev",
    "build": "ng build",
    "build:main:dev": "webpack --config config/webpack.config.main.js --progress --profile",
+    "build:main:prod": "webpack --config config/webpack.config.main.js --progress --profile",
    "test": "ng test",
    "lint": "ng lint",
    "e2e": "ng e2e",
    "wait-on:build:main:dev": "wait-on http-get://localhost:4200/ && yarn build:main:dev",
-    "electron:builder:install-app-deps": "electron-builder install-app-deps"
+    "electron:builder:install-app-deps": "electron-builder install-app-deps",
+    "electron:builder:linux": "yarn build && electron-builder build --linux"
  },
  "private": true,
  "dependencies": {
--- a/src/commons/component/d3-force.component.html
+++ b/src/commons/component/d3-force.component.html
@ -1,6 +0,0 @@
-<svg #svg [attr.width]="_options.width" [attr.height]="_options.height">
-  <g [zoomableOf]="svg">
-    <g [linkVisual]="link" *ngFor="let link of links"></g>
-    <g [nodeVisual]="node" *ngFor="let node of nodes" [draggableNode]="node" [draggableInGraph]="graph"></g>
-  </g>
-</svg>
--- a/src/commons/component/d3-force.component.ts
+++ b/src/commons/component/d3-force.component.ts
@ -1,19 +0,0 @@
-import { Component, Input } from '@angular/core';
-import { Host } from '@overflow/model/discovery';
-
-
-@Component({
-  selector: 'app-d3-force',
-  templateUrl: './d3-force.component.html',
-})
-export class D3ForceComponent {
-
-  @Input() host: Host;
-
-  constructor(
-  ) {
-
-  }
-
-
-}
--- a/src/commons/component/host-detail.component.html
+++ b/src/commons/component/host-detail.component.html
@ -28,17 +28,17 @@
          <span class="meta-value">{{host.address}}</span>
        </li>

-        <li *ngIf="host.deviceType">
+        <li *ngIf="host.hostType">
          Type
-          <span class="meta-value">{{host.deviceType}}</span>
+          <span class="meta-value">{{host.hostType}}</span>
        </li>
-        <li *ngIf="host.deviceVendor">
+        <li *ngIf="host.hostVendor">
          Vendor
-          <span class="meta-value">{{host.deviceVendor}}</span>
+          <span class="meta-value">{{host.hostVendor}}</span>
        </li>
-        <li *ngIf="host.model">
+        <li *ngIf="host.hostModel">
          Model
-          <span class="meta-value">{{host.model}}</span>
+          <span class="meta-value">{{host.hostModel}}</span>
        </li>

        <li *ngIf="host.osType">
--- a/src/commons/component/scanner-setting-dropdown.component.html
+++ b/src/commons/component/scanner-setting-dropdown.component.html
@ -96,7 +96,7 @@
  </p-panel>
   -->
  <div class="ui-g-12 ui-button-right">
-    <button type="button" pButton label="Reset" (click)="setDefault($event)" class="ui-button-secondary"></button>
+    <button type="button" pButton label="Reset" (click)="setDefault()" class="ui-button-secondary"></button>
    <button type="button" pButton label="Apply" (click)="done()" [disabled]="portErrMsg || ipErrMsg"></button>
  </div>
  <!-- <p-footer>
--- a/src/electron/app-window.ts
+++ b/src/electron/app-window.ts
@ -66,7 +66,7 @@ export class AppWindow {
    } else if (__WIN32__) {
      // windowOptions.frame = false;
    } else if (__LINUX__) {
-      windowOptions.icon = path.join(__dirname, 'static', 'icon-logo.png');
+      windowOptions.icon = path.join(__dirname, '..', '..', 'config', 'build', 'linux', 'icon', 'overflow_512.png');
    }

    this.window = new BrowserWindow(windowOptions);