electron packaging is added

This commit is contained in:
병준 박 2019-11-18 13:57:41 +09:00
parent 7eda167067
commit ae413a3843
11 changed files with 447 additions and 514 deletions

View File

@ -7,6 +7,9 @@
"editor.trimAutoWhitespace": true, "editor.trimAutoWhitespace": true,
"files.trimTrailingWhitespace": true, "files.trimTrailingWhitespace": true,
"files.trimFinalNewlines": true, "files.trimFinalNewlines": true,
"files.watcherExclude": {
"**/dist/electron/win-unpacked/**": true
},
"go.testFlags": ["-v"], "go.testFlags": ["-v"],
"go.testTimeout": "100s", "go.testTimeout": "100s",
"debug.node.autoAttach": "on" "debug.node.autoAttach": "on"

View File

@ -103,6 +103,7 @@
"with": "projects/ucap-webmessenger-app/src/environments/environment-renderer.dev.ts" "with": "projects/ucap-webmessenger-app/src/environments/environment-renderer.dev.ts"
} }
], ],
"tsConfig": "projects/ucap-webmessenger-app/tsconfig-es5.app.json",
"optimization": false, "optimization": false,
"outputHashing": "all", "outputHashing": "all",
"sourceMap": true, "sourceMap": true,
@ -132,6 +133,7 @@
"with": "projects/ucap-webmessenger-app/src/environments/environment-renderer.prod.ts" "with": "projects/ucap-webmessenger-app/src/environments/environment-renderer.prod.ts"
} }
], ],
"tsConfig": "projects/ucap-webmessenger-app/tsconfig-es5.app.json",
"optimization": true, "optimization": true,
"outputHashing": "all", "outputHashing": "all",
"sourceMap": false, "sourceMap": false,

View File

@ -1,10 +1,10 @@
{ {
"productName": "WooriTalk", "productName": "UCapMessenger",
"appId": "lgcns.ucap.messenger", "appId": "com.lgucap.messenger",
"asar": true, "asar": true,
"protocols": { "protocols": {
"name": "WooriTalk", "name": "UCapMessenger",
"schemes": ["WooriTalk"] "schemes": ["UCapMessenger"]
}, },
"publish": { "publish": {
"provider": "generic", "provider": "generic",
@ -15,7 +15,7 @@
"icon": "./resources/installer/woori.icns" "icon": "./resources/installer/woori.icns"
}, },
"dmg": { "dmg": {
"title": "WooriTalk", "title": "UCapMessenger",
"icon": "./resources/installer/woori.icns" "icon": "./resources/installer/woori.icns"
}, },
"win": { "win": {
@ -33,8 +33,8 @@
"differentialPackage": true "differentialPackage": true
}, },
"directories": { "directories": {
"buildResources": "resources/installer/", "buildResources": "./resources/installer/",
"output": "dist-electron/", "output": "./dist/electron/",
"app": "." "app": "."
} }
} }

867
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -2,23 +2,29 @@
"name": "ucap-webmessenger", "name": "ucap-webmessenger",
"version": "0.0.0", "version": "0.0.0",
"scripts": { "scripts": {
"postinstall": "electron-builder install-app-deps",
"ng": "ng", "ng": "ng",
"start": "npm-run-all -p start:renderer start:main", "start": "npm-run-all -p start:renderer start:main",
"start:main": "wait-on http-get://localhost:4200/ && npm run build:main:development && electron --nolazy --inspect-brk=9229 .", "start:main": "wait-on http-get://localhost:4200/ && npm run build:main:development && electron --nolazy --inspect-brk=9229 .",
"start:renderer": "cross-env UCAP_ENV_RUNTIME=ELECTRON ng serve -c renderer-development", "start:renderer": "cross-env UCAP_ENV_RUNTIME=ELECTRON ng serve -c renderer-development",
"start:browser": "cross-env UCAP_ENV_RUNTIME=BROWSER ng serve -c browser-development -o", "start:browser": "cross-env UCAP_ENV_RUNTIME=BROWSER ng serve -c browser-development -o",
"run": "electron .",
"build": "npm-run-all -p build:renderer build:main:production", "build": "npm-run-all -p build:renderer build:main:production",
"build:renderer": "cross-env NODE_ENV=production ng build --base-href ./", "build:renderer": "cross-env NODE_ENV=production ng build -c renderer-development --base-href ./",
"build:browser": "cross-env UCAP_ENV_RUNTIME=BROWSER ng build -c browser-development", "build:browser": "cross-env UCAP_ENV_RUNTIME=BROWSER ng build -c browser-development",
"build:main:development": "cross-env NODE_ENV=development TS_NODE_PROJECT='./config/tsconfig.webpack.json' parallel-webpack --config=config/main.webpack.config.ts", "build:main:development": "cross-env NODE_ENV=development TS_NODE_PROJECT='./config/tsconfig.webpack.json' parallel-webpack --config=config/main.webpack.config.ts",
"build:main:production": "cross-env NODE_ENV=production TS_NODE_PROJECT='./config/tsconfig.webpack.json' NODE_OPTIONS='--max_old_space_size=4096' parallel-webpack --config=config/main.webpack.config.ts", "build:main:production": "cross-env NODE_ENV=production TS_NODE_PROJECT='./config/tsconfig.webpack.json' NODE_OPTIONS='--max_old_space_size=4096' parallel-webpack --config=config/main.webpack.config.ts",
"electron:windows": "electron-builder build --windows",
"test": "ng test", "test": "ng test",
"lint": "ng lint", "lint": "ng lint",
"e2e": "ng e2e" "e2e": "ng e2e"
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"tslib": "^1.10.0" "@angular/core": "~8.2.12",
"electron-window-state": "^5.0.3",
"fs-extra": "^8.1.0",
"rxjs": "^6.5.2"
}, },
"devDependencies": { "devDependencies": {
"@angular-builders/custom-webpack": "^8.2.0", "@angular-builders/custom-webpack": "^8.2.0",
@ -30,7 +36,6 @@
"@angular/common": "~8.2.12", "@angular/common": "~8.2.12",
"@angular/compiler": "~8.2.12", "@angular/compiler": "~8.2.12",
"@angular/compiler-cli": "~8.2.12", "@angular/compiler-cli": "~8.2.12",
"@angular/core": "~8.2.12",
"@angular/flex-layout": "^8.0.0-beta.27", "@angular/flex-layout": "^8.0.0-beta.27",
"@angular/forms": "~8.2.12", "@angular/forms": "~8.2.12",
"@angular/language-service": "~8.2.12", "@angular/language-service": "~8.2.12",
@ -73,17 +78,15 @@
"cross-env": "^5.2.1", "cross-env": "^5.2.1",
"detect-browser": "^4.6.0", "detect-browser": "^4.6.0",
"devtron": "^1.4.0", "devtron": "^1.4.0",
"electron": "^6.1.2", "electron": "^7.1.1",
"electron-builder": "^21.2.0", "electron-builder": "^21.2.0",
"electron-debug": "^3.0.1", "electron-debug": "^3.0.1",
"electron-devtools-installer": "^2.2.4", "electron-devtools-installer": "^2.2.4",
"electron-log": "^3.0.8", "electron-log": "^3.0.9",
"electron-reload": "^1.5.0", "electron-reload": "^1.5.0",
"electron-store": "^4.0.0", "electron-store": "^5.1.0",
"electron-updater": "^4.1.2", "electron-updater": "^4.2.0",
"electron-window-state": "^5.0.3",
"file-saver": "^2.0.2", "file-saver": "^2.0.2",
"fs-extra": "^8.1.0",
"filesize": "^4.1.2", "filesize": "^4.1.2",
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",
"jasmine-core": "~3.4.0", "jasmine-core": "~3.4.0",
@ -98,11 +101,11 @@
"ngrx-store-freeze": "^0.2.4", "ngrx-store-freeze": "^0.2.4",
"ngx-logger": "^4.0.5", "ngx-logger": "^4.0.5",
"ngx-perfect-scrollbar": "^8.0.0", "ngx-perfect-scrollbar": "^8.0.0",
"rimraf": "^3.0.0",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"parallel-webpack": "^2.4.0", "parallel-webpack": "^2.4.0",
"protractor": "~5.4.0", "protractor": "~5.4.0",
"queueing-subject": "^0.3.4", "queueing-subject": "^0.3.4",
"rxjs": "^6.5.2",
"semver": "^6.3.0", "semver": "^6.3.0",
"ts-node": "~7.0.0", "ts-node": "~7.0.0",
"tsickle": "^0.37.0", "tsickle": "^0.37.0",

View File

@ -8,7 +8,7 @@
.login-wrapper { .login-wrapper {
flex: 1 0 auto; flex: 1 0 auto;
background: url(/assets/images/bg_login.png)no-repeat 50% bottom; background: url(/assets/images/bg_login.png) no-repeat 50% bottom;
background-size: 100% auto; background-size: 100% auto;
} }
} }

View File

@ -47,7 +47,7 @@
<app-layout-messenger-right-drawer <app-layout-messenger-right-drawer
[selectedRightDrawer]="selectedRightDrawer$ | async" [selectedRightDrawer]="selectedRightDrawer$ | async"
(openProfile)="onClickOpenProfile($event)" (openProfile)="onClickOpenProfile($event)"
(closeRightDrawer)="onCloseRightDrawer($event)" (closeRightDrawer)="onCloseRightDrawer()"
> >
</app-layout-messenger-right-drawer> </app-layout-messenger-right-drawer>
</mat-drawer> </mat-drawer>

View File

@ -1,11 +1,7 @@
import { TranslateLoader } from '@ngx-translate/core'; import { TranslateLoader } from '@ngx-translate/core';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { NativeService } from '@ucap-webmessenger/native'; import { NativeService } from '@ucap-webmessenger/native';
import { Injectable } from '@angular/core';
@Injectable({
providedIn: 'root',
})
export class TranslateLoaderService implements TranslateLoader { export class TranslateLoaderService implements TranslateLoader {
constructor( constructor(
private nativeService: NativeService, private nativeService: NativeService,

View File

@ -1,11 +1,7 @@
import { TranslateLoader } from '@ngx-translate/core'; import { TranslateLoader } from '@ngx-translate/core';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { NativeService } from '@ucap-webmessenger/native'; import { NativeService } from '@ucap-webmessenger/native';
import { Injectable } from '@angular/core';
@Injectable({
providedIn: 'root',
})
export class TranslateLoaderService implements TranslateLoader { export class TranslateLoaderService implements TranslateLoader {
constructor( constructor(
private nativeService: NativeService, private nativeService: NativeService,

View File

@ -9,7 +9,11 @@
class="organization-tree" class="organization-tree"
> >
<!-- This is the tree node template for leaf nodes --> <!-- This is the tree node template for leaf nodes -->
<mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding class="mat-tree-last-node"> <mat-tree-node
*matTreeNodeDef="let node"
matTreeNodePadding
class="mat-tree-last-node"
>
<li> <li>
<div (click)="onClickNode(node)"> <div (click)="onClickNode(node)">
{{ node.name }} {{ node.name }}

View File

@ -33,28 +33,28 @@
} }
} }
}*/ }*/
.organization-tree{ .organization-tree {
.tree-node-frame { .tree-node-frame {
height:40px; height: 40px;
min-height:40px; min-height: 40px;
li{ li {
display:flex; display: flex;
align-items: center; align-items: center;
cursor:pointer; cursor: pointer;
width:100%; width: 100%;
} }
} }
.mat-tree-last-node{ .mat-tree-last-node {
height:30px; height: 40px;
min-height:30px; min-height: 30px;
font-size: 13px; font-size: 13px;
li{ li {
display:flex; display: flex;
align-items: center; align-items: center;
width:100%; width: 100%;
height:100%; height: 100%;
padding-left:10px; padding-left: 10px;
cursor:pointer; cursor: pointer;
&:hover { &:hover {
background-color: #f4f4f4; background-color: #f4f4f4;
border: 1px solid #cccccc; border: 1px solid #cccccc;