merge

app/mycard.component.css

+<<<<<<< HEAD
 body {
     font-family: "Helvetica Neue", Helvetica, Arial, 'Source Sans Pro', "Microsoft YaHei", 'Microsoft JhengHei', "WenQuanYi Micro Hei", sans-serif;
 }
@@ -16,6 +17,12 @@ nav.darwin {
 .navbar-right > div, #user > .item {
     float: left;
     margin: 0 0.5rem
+#wrapper {
+    padding-top: 60px;
+    /*margin-bottom: 60px;*/
+}
+.nav-right {
+    float: right;
 }
 
 #avatar {

app/mycard.component.html

@@ -63,8 +63,9 @@
         </div>
     </nav>
 </div>-->
-
-<login></login>
-<store></store>
-<lobby></lobby>
-<community></community>
+<div id="wrapper">
+<login [hidden]="routingService.component != 'login'"></login>
+<store [hidden]="routingService.component != 'store'"></store>
+<lobby [hidden]="routingService.component != 'lobby'"></lobby>
+<community [hidden]="routingService.component != 'community'"></community>
\ No newline at end of file
+</div>
\ No newline at end of file

app/mycard.component.ts

 import { Component } from '@angular/core';
 declare var process;
+import { RoutingService } from './routing.service';
 @Component({
   selector: 'mycard',
   templateUrl: 'app/mycard.component.html',
@@ -9,4 +10,5 @@ declare var process;
 
 export class MyCardComponent {
   platform = process.platform;
+  constructor(private routingService: RoutingService) { }
 }

app/mycard.module.ts

@@ -6,10 +6,13 @@ import { StoreComponent } from './store.component';
 import { LobbyComponent } from './lobby.component';
 import { CommunityComponent } from './community.component';
 
+import { RoutingService } from './routing.service';
+
 
 @NgModule({
   imports:      [ BrowserModule ],
   declarations: [ MyCardComponent, LoginComponent, StoreComponent, LobbyComponent, CommunityComponent ],
-  bootstrap:    [ MyCardComponent ]
+  bootstrap:    [ MyCardComponent ],
+  providers:    [ RoutingService ],
 })
 export class MyCard { }
\ No newline at end of file

app/routing.service.ts

+import { Injectable } from '@angular/core';
+
+@Injectable()
+export class RoutingService {
+    component = 'lobby';
+    app;
+}
\ No newline at end of file

app/store.component.html

-<!-- Begin page content -->
-<div class="container">
+store
\ No newline at end of file
-    <div class="m-t-1">
-        <h1>Sticky footer with fixed navbar</h1>
-    </div>
-    <p class="lead">Pin a fixed-height footer to the bottom of the viewport in desktop browsers with this custom HTML and CSS. A fixed navbar has been added with <code>padding-top: 60px;</code> on the <code>body &gt; .container</code>.</p>
-    <p>Back to <a href="../sticky-footer">the default sticky footer</a> minus the navbar.</p>
-</div>
-
-<footer class="footer">
-    <div class="container">
-        <span class="text-muted">Place sticky footer content here.</span>
-    </div>
-</footer>
\ No newline at end of file

appveyor.yml

+version: '{build}'
+
+platform:
+  - x64
+
+cache:
+  - node_modules
+  - app\node_modules
+  - '%APPDATA%\npm-cache'
+  - '%USERPROFILE%\.electron'
+
+init:
+  - git config --global core.autocrlf input
+
+install:
+  - ps: Install-Product node 6 x64
+  - git reset --hard HEAD
+  - npm install npm -g
+  - npm install electron-builder
+  - npm install
+  - npm prune
+
+build_script:
+  - node --version
+  - npm --version
+  - npm run dist
+
+test: off
\ No newline at end of file

package.json

@@ -3,10 +3,13 @@
   "description": "mycard",
   "author": "zh99998 <zh99998@gmail.com>",
   "homepage": "https://mycard.moe",
-  "version": "3.0.0",
+  "version": "3.0.0-dev.3",
+  "repository": "github:mycard/mycard",
   "scripts": {
     "pack": "./node_modules/.bin/build --dir",
     "dist": "./node_modules/.bin/build",
+    "release": "build",
+    "electron": "electron",
     "start": "tsc && concurrently \"npm run tsc:w\" \"npm run lite\" ",
     "lite": "lite-server",
     "postinstall": "typings install",
@@ -45,7 +48,7 @@
   "build": {
     "productName": "MyCard",
     "appId": "com.mycard.mycard",
-    "category": "public.app-category.entertainment",
+    "category": "public.app-category.social-networking",
     "win": {
       "iconUrl": "http://mycard.moe/logo.png"
     },