From 9a8e7d4fe7b294df6ce6f9f7b8e268e693ee3df5 Mon Sep 17 00:00:00 2001 From: crusader Date: Wed, 26 Sep 2018 23:20:09 +0900 Subject: [PATCH] ing --- .../ui/component/menu/menu-bar.component.ts | 2 +- config/build/windows/nsis/installer.nsh | 2 +- electron-builder.json | 110 ++++++++++-------- package.json | 9 +- src/commons/component/d3-force.component.html | 6 - src/commons/component/d3-force.component.ts | 19 --- .../component/host-detail.component.html | 12 +- .../scanner-setting-dropdown.component.html | 2 +- src/electron/app-window.ts | 2 +- 9 files changed, 81 insertions(+), 83 deletions(-) delete mode 100644 src/commons/component/d3-force.component.html delete mode 100644 src/commons/component/d3-force.component.ts diff --git a/@overflow/commons/ui/component/menu/menu-bar.component.ts b/@overflow/commons/ui/component/menu/menu-bar.component.ts index f7ff8c1..b8b2975 100644 --- 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( ) { } diff --git a/config/build/windows/nsis/installer.nsh b/config/build/windows/nsis/installer.nsh index f31e04b..0b81b8a 100644 --- 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 \ No newline at end of file diff --git a/electron-builder.json b/electron-builder.json index cd28356..47e94e7 100644 --- 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" } } \ No newline at end of file diff --git a/package.json b/package.json index 7058133..6b206d2 100644 --- 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": { diff --git a/src/commons/component/d3-force.component.html b/src/commons/component/d3-force.component.html deleted file mode 100644 index 5afe9f1..0000000 --- a/src/commons/component/d3-force.component.html +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/commons/component/d3-force.component.ts b/src/commons/component/d3-force.component.ts deleted file mode 100644 index b91d9af..0000000 --- a/src/commons/component/d3-force.component.ts +++ /dev/null @@ -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( - ) { - - } - - -} diff --git a/src/commons/component/host-detail.component.html b/src/commons/component/host-detail.component.html index f032e7d..8d62a9d 100644 --- a/src/commons/component/host-detail.component.html +++ b/src/commons/component/host-detail.component.html @@ -28,17 +28,17 @@ {{host.address}} -
  • +
  • Type - {{host.deviceType}} + {{host.hostType}}
    • -
  • +
  • Vendor - {{host.deviceVendor}} + {{host.hostVendor}}
    • -
  • +
  • Model - {{host.model}} + {{host.hostModel}}
  • diff --git a/src/commons/component/scanner-setting-dropdown.component.html b/src/commons/component/scanner-setting-dropdown.component.html index 793dea0..3e3cbbc 100644 --- a/src/commons/component/scanner-setting-dropdown.component.html +++ b/src/commons/component/scanner-setting-dropdown.component.html @@ -96,7 +96,7 @@ -->
    - +