Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/apps.component.ts

.gitignore

@@ -5,7 +5,7 @@
 /.idea/
 *.js
 *.js.map
-
+node-debug.log
 !/node_modules/@types/
 !/node_modules/@types/mongorito/
 !systemjs.config.js

app/app-create.component.css

+.example-full-width {
+    width: 100%;
+}
+md-select {
+    margin: 16px 0;
+}
+
+md-dialog-actions {
+    text-align: right;
+}
\ No newline at end of file

app/app-create.component.html

+<h1 md-dialog-title>创建应用</h1>
+
+<form class="example-form">
+    <md-dialog-content>
+        <md-input-container class="example-full-width">
+            <input md-input placeholder="应用 ID (创建应用后无法修改)" [(ngModel)]="id" name="id">
+        </md-input-container>
+
+        <md-select placeholder="主要语言" [(ngModel)]="locale" name="locale" class="example-full-width">
+            <md-option *ngFor="let l of locales" [value]="l">{{l}}</md-option>
+        </md-select>
+
+        <md-input-container class="example-full-width">
+            <input md-input placeholder="名称" [(ngModel)]="name" name="name">
+        </md-input-container>
+
+    </md-dialog-content>
+</form>
+
+<md-dialog-actions>
+    <button md-button md-dialog-close>取消</button>
+    <button md-button (click)="submit(id, locale, name)">确定</button>
+</md-dialog-actions>
\ No newline at end of file

app/app-create.component.ts

+/**
+ * Created by weijian on 2016/12/30.
+ */
+import {Component} from '@angular/core';
+import {MdDialogRef} from '@angular/material';
+import App from '../models/browserapp';
+@Component({
+    moduleId: module.id,
+    templateUrl: 'app-create.component.html',
+    styleUrls: ['app-create.component.css'],
+})
+export class AppCreateComponent {
+    locales = ['zh-CN', 'zh-TW', 'en-US', 'ja-JP'];
+
+    locale = 'zh-CN';
+    id: string;
+    name: string;
+    app = {name: {}};
+
+    constructor(public dialogRef: MdDialogRef<AppCreateComponent>) {
+    }
+
+    submit(id: string, locale: string, name: string) {
+        this.dialogRef.close(new App({id: id, name: {[locale]: name}}));
+    }
+}

app/apps.component.css

+.example-fab {
+    position: absolute;
+    right: 20px;
+    bottom: 20px;
+}
\ No newline at end of file

app/apps.component.html

@@ -8,4 +8,7 @@
             <span class="demo-2"> -- {{app.id}} </span>
         </p>
     </md-list-item>
-</md-nav-list>
\ No newline at end of file
+</md-nav-list>
+<button md-fab class="example-fab" (click)="create_app()">
+    <md-icon>add</md-icon>
+</button>
\ No newline at end of file

app/apps.component.ts

 import {Component, OnInit} from '@angular/core';
+import App from '../models/app';
 import {AppService} from './app.service';
-import {App} from '../models/app';
+import {MdDialog} from '@angular/material';
+import {AppCreateComponent} from './app-create.component';
 
 @Component({
     selector: 'apps',
@@ -11,7 +13,7 @@ import {App} from '../models/app';
 export class AppsComponent implements OnInit {
     apps: App[];
 
-    constructor(private appService: AppService) {
+    constructor(private appService: AppService, private dialog: MdDialog) {
     }
 
     async ngOnInit() {
@@ -21,5 +23,13 @@ export class AppsComponent implements OnInit {
     async getApps() {
         this.apps = await this.appService.getApps();
     }
-}
 
+    async create_app() {
+        let dialogRef = this.dialog.open(AppCreateComponent);
+        let app: App | undefined = await dialogRef.afterClosed().toPromise();
+        if (!app) {
+            return;
+        }
+        console.log(app);
+    }
+}

app/mycard.module.ts

@@ -21,14 +21,17 @@ import {AppDetailComponent} from './app-detail.component';
 import {AppComponent} from './app.component';
 import {AppLocalesComponent} from './app-locales.component';
 import {AppPackagesComponent} from './app-packages.component';
+import {AppCreateComponent} from './app-create.component';
 
 
 @NgModule({
     imports: [
         BrowserModule, MaterialModule.forRoot(), FormsModule, RoutingModule, HttpModule,
     ],
-    declarations: [AppsComponent, MyCardComponent, AppComponent, AppDetailComponent, AppLocalesComponent, AppPackagesComponent],
+    declarations: [AppsComponent, MyCardComponent, AppComponent, AppDetailComponent, AppLocalesComponent, AppPackagesComponent,
+        AppCreateComponent],
     bootstrap: [MyCardComponent],
+    entryComponents: [AppCreateComponent],
     providers: [AppService, MdIconRegistry],
 })
 export class AppModule {

models/browserapp.ts

@@ -12,16 +12,13 @@ class App {
     news: I18n<{title: string, url: string, image: string}[]>;
     conference?: string;
     data: any;
-}
 
-export class BrowserApp {
-    id: string;
-    name: I18n<string>;
-    parent?: string;
-    locales: string[];
-    news: I18n<{title: string, url: string, image: string}[]>;
-    conference?: string;
-    data: any;
+    // TODO: 实现进 Model 里
+    constructor(o: any) {
+        for (let [key, value] of Object.entries(o)) {
+            this[key] = value;
+        }
+    }
 }
 
 export default App;

npm-debug.log

-0 info it worked if it ends with ok
-1 verbose cli [ 'C:\\Program Files\\nodejs\\node.exe',
-1 verbose cli   'C:\\Program Files\\nodejs\\node_modules\\npm\\bin\\npm-cli.js',
-1 verbose cli   'run',
-1 verbose cli   'start' ]
-2 info using npm@3.10.10
-3 info using node@v7.3.0
-4 verbose run-script [ 'prestart', 'start', 'poststart' ]
-5 info lifecycle mycard-console@1.0.0~prestart: mycard-console@1.0.0
-6 silly lifecycle mycard-console@1.0.0~prestart: no script for prestart, continuing
-7 info lifecycle mycard-console@1.0.0~start: mycard-console@1.0.0
-8 verbose lifecycle mycard-console@1.0.0~start: unsafe-perm in lifecycle true
-9 verbose lifecycle mycard-console@1.0.0~start: PATH: C:\Program Files\nodejs\node_modules\npm\bin\node-gyp-bin;D:\Github\mycard-console\node_modules\.bin;C:\Program Files\Docker\Docker\Resources\bin;C:\ProgramData\Oracle\Java\javapath;C:\Python27\;C:\Python27\Scripts;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Users\weijian\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Git\cmd;C:\Go\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files (x86)\GtkSharp\2.12\bin;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit\;C:\Program Files (x86)\Microsoft Emulator Manager\1.0\;C:\Program Files\nodejs\;C:\Program Files\OpenVPN\bin;C:\Users\weijian\AppData\Local\Microsoft\WindowsApps;D:\msys;C:\Program Files (x86)\Microsoft VS Code\bin;C:\Users\weijian\AppData\Local\atom\bin;C:\Program Files\CMake\bin;C:\Users\weijian\AppData\Roaming\npm
-10 verbose lifecycle mycard-console@1.0.0~start: CWD: D:\Github\mycard-console
-11 silly lifecycle mycard-console@1.0.0~start: Args: [ '/d /s /c',
-11 silly lifecycle   'tsc && concurrently "node server.js" "lite-server"' ]
-12 silly lifecycle mycard-console@1.0.0~start: Returned: code: 2  signal: null
-13 info lifecycle mycard-console@1.0.0~start: Failed to exec start script
-14 verbose stack Error: mycard-console@1.0.0 start: `tsc && concurrently "node server.js" "lite-server"`
-14 verbose stack Exit status 2
-14 verbose stack     at EventEmitter.<anonymous> (C:\Program Files\nodejs\node_modules\npm\lib\utils\lifecycle.js:255:16)
-14 verbose stack     at emitTwo (events.js:106:13)
-14 verbose stack     at EventEmitter.emit (events.js:191:7)
-14 verbose stack     at ChildProcess.<anonymous> (C:\Program Files\nodejs\node_modules\npm\lib\utils\spawn.js:40:14)
-14 verbose stack     at emitTwo (events.js:106:13)
-14 verbose stack     at ChildProcess.emit (events.js:191:7)
-14 verbose stack     at maybeClose (internal/child_process.js:885:16)
-14 verbose stack     at Process.ChildProcess._handle.onexit (internal/child_process.js:226:5)
-15 verbose pkgid mycard-console@1.0.0
-16 verbose cwd D:\Github\mycard-console
-17 error Windows_NT 10.0.14393
-18 error argv "C:\\Program Files\\nodejs\\node.exe" "C:\\Program Files\\nodejs\\node_modules\\npm\\bin\\npm-cli.js" "run" "start"
-19 error node v7.3.0
-20 error npm  v3.10.10
-21 error code ELIFECYCLE
-22 error mycard-console@1.0.0 start: `tsc && concurrently "node server.js" "lite-server"`
-22 error Exit status 2
-23 error Failed at the mycard-console@1.0.0 start script 'tsc && concurrently "node server.js" "lite-server"'.
-23 error Make sure you have the latest version of node.js and npm installed.
-23 error If you do, this is most likely a problem with the mycard-console package,
-23 error not with npm itself.
-23 error Tell the author that this fails on your system:
-23 error     tsc && concurrently "node server.js" "lite-server"
-23 error You can get information on how to open an issue for this project with:
-23 error     npm bugs mycard-console
-23 error Or if that isn't available, you can get their info via:
-23 error     npm owner ls mycard-console
-23 error There is likely additional logging output above.
-24 verbose exit [ 1, true ]

package.json

@@ -25,6 +25,7 @@
     "hammerjs": "^2.0.8",
     "koa": "^2.0.0",
     "koa-bodyparser": "^3.2.0",
+    "koa-log4": "^2.1.0",
     "koa-logger": "^2.0.0",
     "koa-morgan": "^1.0.1",
     "koa-router": "^7.0.1",