Merge pull request #8 from ssysm/update

Update

client/package.json

@@ -8,7 +8,8 @@
     "build": "ng build --prod",
     "test": "ng test",
     "lint": "ng lint",
-    "e2e": "ng e2e"
+    "e2e": "ng e2e",
+    "analyzer": "webpack-bundle-analyzer dist/stats.json"
   },
   "private": true,
   "dependencies": {
@@ -48,6 +49,7 @@
     "protractor": "~5.1.2",
     "ts-node": "~3.2.0",
     "tslint": "~5.7.0",
-    "typescript": "~2.4.2"
+    "typescript": "~2.4.2",
+    "webpack-bundle-analyzer": "^2.9.2"
   }
 }

client/src/app/app.component.ts

@@ -1,10 +1,18 @@
-import { Component } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.css']
 })
-export class AppComponent {
-  title = 'app';
+export class AppComponent implements OnInit{
+
+  loaded:Boolean = false;
+  constructor(){
+
+  }
+
+  ngOnInit(){
+    this.loaded = true;
+  }
 }

client/src/app/service/version.service.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
 import {Http} from "@angular/http";
+import {environment} from "../../environments/environment";
 
 @Injectable()
 export class VersionService {
@@ -10,13 +11,13 @@ export class VersionService {
 
   getLatestCommit(){
     return this.http
-      .get('https://api.github.com/repos/ssysm/starrysea-nextgen/commits/')
+      .get(environment.apiBase+'/version/latest/commit')
 
   }
 
-  getVersion(){
+  getLatestVersion(){
     return this.http
-      .get('https://api.github.com/repos/ssysm/starrysea-nextgen/releases')
+      .get(environment.apiBase+'/version/latest/version')
   }
 
 }

client/src/app/view/about/about.component.html

@@ -21,10 +21,11 @@ <h1 class="text-center introh1 h1">关于我们</h1>
   </blockquote>
   <div class="row" id="sysInfo">
     <div class="col-sm-12">
-      <h3>系统版本号: <span class="badge badge-success">v1.0.3</span></h3>
+      <p class="h5">Latest System Releases: <span class="badge badge-success">{{Version}}</span></p>
     <div style="display: inline">
-      <p style="display: inline">前端: <span class="badge badge-success">v1.0.3</span></p>
-      <p style="display: inline">后端: <span class="badge badge-success">v1.0.2</span></p>
+      <p style="display: inline">Front-End: <span class="badge badge-success">v1.0.3</span></p>
+      <p style="display: inline">Back-End: <span class="badge badge-success">v1.0.3</span></p>
+      <p>Latest Commit: <span class="badge badge-info">{{commit}}</span></p>
     </div>
     </div>
   </div>

client/src/app/view/about/about.component.ts

@@ -15,6 +15,26 @@ export class AboutComponent implements OnInit {
   commit:any;
   Version:string;
   ngOnInit() {
+    this.versionService.getLatestCommit()
+      .subscribe(data=>{
+        if(data.json().success){
+          this.commit = data.json().response.commit;
+        }else{
+          this.commit = "N/A"
+        }
+      },(error)=>{
+        this.commit = "N/A"
+      });
+    this.versionService.getLatestVersion()
+      .subscribe(data=>{
+        if(data.json().success){
+          this.Version = data.json().response.tag_name
+        }else{
+          this.Version = "N/A"
+        }
+      },(error)=>{
+        this.Version = "N/A"
+      })
   }
 
 }

client/src/app/view/home/home.component.css

@@ -21,7 +21,7 @@
 }
 
 .title{
-  font-size: 3.8rem;
+  font-size: 3.5rem;
   color:#409cc3;
 }
 

client/src/app/view/partical/navbar/navbar.component.css

@@ -1,6 +1,7 @@
 .navbar{
   background: url("/assets/img/navbar.jpg") no-repeat fixed;
-  background-size: contain;
+  background-size: 100%;
+  width: 100%;
 }
 
 @media screen and (min-width: 991px) {

client/src/app/view/partical/navbar/navbar.component.html

@@ -18,4 +18,3 @@
     </ul>
   </div>
 </nav>
-<router-outlet></router-outlet>

client/src/app/view/partical/not-found/not-found.component.html

@@ -1,6 +1,7 @@
 <div class="container">
   <div class="text-center">
-    <p class="h1 text-thin">404 页面未找到</p>
-    <p class="h2 text-thin">请稍后重试</p>
+    <p class="h1 text-thin">404 Page Not Found</p>
+    <img src="/assets/img/error_dia.png" alt="Error" style="width: 55%;">
+    <p class="h2 text-thin">Please Try Again Later</p>
   </div>
 </div>