Dev

.travis.yml

@@ -22,4 +22,5 @@ before_install:
  - sudo apt-get install -y libappindicator1 fonts-liberation
  - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
  - sudo dpkg -i google-chrome*.deb
-
+after_success:
+  - npm run coveralls

Dockerfile

@@ -0,0 +1,22 @@
+FROM node:8.4
+
+ENV HOME=/home/app
+WORKDIR $HOME
+
+COPY package.json package.json
+COPY package-lock.json package-lock.json
+
+RUN npm install
+
+COPY tsconfig.json tsconfig.json
+COPY tslint.json tslint.json
+COPY protractor.conf.js protractor.conf.js
+COPY karma.conf.js karma.conf.js
+COPY .angular-cli.json .angular-cli.json
+
+COPY e2e e2e
+COPY src src
+
+EXPOSE 4200:4200
+
+ENTRYPOINT ["npm", "start", "--"]

README.md

@@ -1,6 +1,6 @@
 # AngularFrontend
-Master-Branch: [![Build Status](https://travis-ci.org/BPChain/angular-frontend.svg?branch=master)](https://travis-ci.org/BPChain/angular-frontend)
-Dev-Branch: [![Build Status](https://travis-ci.org/BPChain/angular-frontend.svg?branch=dev)](https://travis-ci.org/BPChain/angular-frontend)
+Master-Branch: [![Build Status](https://travis-ci.org/BPChain/angular-frontend.svg?branch=master)](https://travis-ci.org/BPChain/angular-frontend) [![Coverage Status](https://coveralls.io/repos/github/BPChain/angular-frontend/badge.svg?branch=master)](https://coveralls.io/github/BPChain/angular-frontend?branch=master)</br>
+Dev-Branch: [![Build Status](https://travis-ci.org/BPChain/angular-frontend.svg?branch=dev)](https://travis-ci.org/BPChain/angular-frontend) [![Coverage Status](https://coveralls.io/repos/github/BPChain/angular-frontend/badge.svg?branch=dev)](https://coveralls.io/github/BPChain/angular-frontend?branch=dev)</br>
 
 This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.5.4.
 

docker-compose.yml

@@ -0,0 +1,7 @@
+version: "3.3"
+services:
+  angular-frontend:
+    build: .
+    container_name: angular-frontend
+    ports:
+      - "4200:4200"

karma.conf.js

@@ -22,6 +22,7 @@ module.exports = function (config) {
     angularCli: {
       environment: 'dev'
     },
+    exclude: ['docker-compose.yml', 'Dockerfile'],
     reporters: ['progress', 'kjhtml'],
     port: 9876,
     colors: true,

package.json

@@ -4,11 +4,12 @@
   "license": "MIT",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve",
+    "start": "ng serve --host=0.0.0.0 --port=4200 --disable-host-check",
     "build": "ng build",
-    "test": "ng test",
+    "test": "npm run lint && ng test --code-cover",
     "lint": "ng lint",
-    "e2e": "ng e2e"
+    "e2e": "ng e2e",
+    "coveralls": "cat ./coverage/lcov.info | coveralls  && rm -rf ./coverage"
   },
   "private": true,
   "dependencies": {
@@ -38,6 +39,7 @@
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "^6.0.96",
     "codelyzer": "^4.0.1",
+    "coveralls": "^3.0.0",
     "jasmine-core": "~2.6.2",
     "jasmine-spec-reporter": "~4.1.0",
     "karma": "~1.7.0",

src/app/app-material.module.ts

@@ -0,0 +1,42 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import {
+  MatButtonModule, MatCardModule, MatCheckboxModule, MatDatepickerModule, MatFormFieldModule, MatIconModule,
+  MatInputModule,
+  MatNativeDateModule, MatSelectModule, MatSnackBarModule,
+  MatToolbarModule
+} from '@angular/material';
+import {FlexLayoutModule} from '@angular/flex-layout';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FlexLayoutModule,
+    MatToolbarModule,
+    MatButtonModule,
+    MatIconModule,
+    MatCardModule,
+    MatCheckboxModule,
+    MatDatepickerModule,
+    MatNativeDateModule,
+    MatFormFieldModule,
+    MatInputModule,
+    MatSnackBarModule,
+    MatSelectModule,
+  ],
+  exports: [
+    FlexLayoutModule,
+    MatToolbarModule,
+    MatButtonModule,
+    MatIconModule,
+    MatCardModule,
+    MatCheckboxModule,
+    MatDatepickerModule,
+    MatNativeDateModule,
+    MatFormFieldModule,
+    MatInputModule,
+    MatSnackBarModule,
+    MatSelectModule,
+  ],
+})
+export class AppMaterialModule { }

src/app/app-routing-module.ts

@@ -0,0 +1,26 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { RouterModule } from '@angular/router';
+
+import { NotFoundComponent } from './not-found/not-found.component';
+import {DashboardComponent} from './dashboard/dashboard.component';
+import {ImpressumComponent} from './impressum/impressum.component';
+
+export const appRoutes = [
+  { path: 'impressum', component: ImpressumComponent },
+  { path: 'dashboard', component: DashboardComponent },
+  { path: '', pathMatch: 'full', redirectTo: '/dashboard' },
+  { path: '**', component: NotFoundComponent }
+];
+
+@NgModule({
+  imports: [
+    CommonModule,
+    RouterModule.forRoot(appRoutes)
+  ],
+  declarations: [],
+  exports: [
+    RouterModule
+  ]
+})
+export class AppRoutingModule { }

src/app/app.component.html

@@ -1,7 +1,7 @@
 <div class="page-wrap">
   <app-header></app-header>
   <main class="content">
-    <app-dashboard></app-dashboard>
+    <router-outlet></router-outlet>
   </main>
   <footer>
     <app-footer></app-footer>

src/app/app.component.spec.ts

@@ -1,6 +1,6 @@
 import { TestBed, async } from '@angular/core/testing';
 import { AppComponent } from './app.component';
-import {CUSTOM_ELEMENTS_SCHEMA} from "@angular/core";
+import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
 
 describe('AppComponent', () => {
   beforeEach(async(() => {

src/app/app.module.ts

@@ -1,71 +1,32 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
-import { CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
-
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
 import { AppComponent } from './app.component';
 import { FooterComponent } from './menu/footer/footer.component';
 import { HeaderComponent } from './menu/header/header.component';
-import { DashboardComponent } from './dashboard/dashboard.component';
-import { WelcomeComponent } from './dashboard/welcome/welcome.component';
-import { FormComponent } from './dashboard/form/form.component';
-import { MetricComponent } from './dashboard/metric/metric.component';
-import {PublicChartsComponent} from "./dashboard/charts/public-charts/public-charts.component";
-import {PrivateChartsComponent} from "./dashboard/charts/private-charts/private-charts.component";
-import {BarchartComponent} from "./dashboard/charts/barchart/barchart.component";
-import {LinechartComponent} from "./dashboard/charts/linechart/linechart.component";
-
-
-
-import {
-  MatButtonModule, MatIconModule, MatToolbarModule, MatCardModule, MatCheckboxModule,
-  MatDatepickerModule, MatFormFieldModule, MatNativeDateModule, MatInputModule, MatSnackBarModule,
-} from "@angular/material";
-import {FormsModule, ReactiveFormsModule} from "@angular/forms";
-import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
-import {ChartsModule} from "ng2-charts";
-import {HttpClientModule} from "@angular/common/http";
-import {DatePipe} from "@angular/common";
-import {FlexLayoutModule} from "@angular/flex-layout";
-
-
-
+import { NotFoundComponent } from './not-found/not-found.component';
+import { AppRoutingModule } from './app-routing-module';
+import { ImpressumComponent } from './impressum/impressum.component';
+import { AppMaterialModule } from './app-material.module';
+import { DashboardModule } from './dashboard/dashboard.module';
 
 @NgModule({
   declarations: [
     AppComponent,
-    FooterComponent,
     HeaderComponent,
-    DashboardComponent,
-    WelcomeComponent,
-    FormComponent,
-    MetricComponent,
-    PublicChartsComponent,
-    PrivateChartsComponent,
-    BarchartComponent,
-    LinechartComponent,
+    FooterComponent,
+    NotFoundComponent,
+    ImpressumComponent,
   ],
   imports: [
     BrowserModule,
-    FormsModule,
-    ReactiveFormsModule,
     BrowserAnimationsModule,
-    ChartsModule,
-    HttpClientModule,
-    FlexLayoutModule,
-    MatToolbarModule,
-    MatButtonModule,
-    MatIconModule,
-    MatCardModule,
-    MatCheckboxModule,
-    MatDatepickerModule,
-    MatNativeDateModule,
-    MatFormFieldModule,
-    MatInputModule,
-    MatSnackBarModule,
+    AppMaterialModule,
+    DashboardModule,
+    AppRoutingModule,
+
   ],
-  providers: [HttpClientModule, DatePipe],
   bootstrap: [AppComponent],
-  schemas: [CUSTOM_ELEMENTS_SCHEMA],
 })
 export class AppModule { }

src/app/dashboard/charts/barchart/barchart.component.spec.ts

@@ -1,8 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { BarchartComponent } from './barchart.component';
-import {ChartsModule} from "ng2-charts";
-import {CUSTOM_ELEMENTS_SCHEMA} from "@angular/core";
+import {ChartsModule} from 'ng2-charts';
+import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
 
 describe('BarchartComponent', () => {
   let component: BarchartComponent;

src/app/dashboard/charts/barchart/barchart.component.ts

@@ -1,5 +1,4 @@
 import {Component, Input, OnChanges, OnInit} from '@angular/core';
-import {PrivateStatistics} from "../../../services/PrivateStatistics";
 
 @Component({
   selector: 'app-barchart',
@@ -40,19 +39,19 @@ export class BarchartComponent implements OnInit, OnChanges {
 
   ngOnChanges() {
     this.barChartData = [];
-    for(let i = 0; i < this.labels.length; i++){
+    for (let i = 0; i < this.labels.length; i++) {
       this.barChartData.push(
         {data: [this.statistics[this.labels[i]]], label: this.labels[i]}
-      )
+      );
     }
   }
 
   // events
-  public chartClicked(e:any):void {
+  public chartClicked(e: any): void {
     console.log(e);
   }
 
-  public chartHovered(e:any):void {
+  public chartHovered(e: any): void {
     console.log(e);
   }