moved to single project

ui/hv2-ui/src/app/app-routing.module.ts

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { AuthGuardService } from './auth-guard.service';
+import { LoginComponent } from './login/login.component';
+import { LogoutComponent } from './logout/logout.component';
+import { TestOutputComponent } from './test-output/test-output.component';
+
+
+
+const routes: Routes = [
+  { path: 'test', component: TestOutputComponent, canActivate: [ AuthGuardService ] },
+  { path: 'logout', component: LogoutComponent },
+  { path: 'login', component: LoginComponent }
+]
+
+@NgModule({
+  imports: [RouterModule.forRoot(routes, {onSameUrlNavigation:'reload'})],
+  exports: [RouterModule]
+})
+
+export class AppRoutingModule { }

ui/hv2-ui/src/app/app.component.html

@@ -0,0 +1,3 @@
+<section class="mat-typography">
+  <app-navigation></app-navigation>
+</section>

ui/hv2-ui/src/app/app.component.spec.ts

@@ -0,0 +1,31 @@
+import { TestBed } from '@angular/core/testing';
+import { AppComponent } from './app.component';
+
+describe('AppComponent', () => {
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [
+        AppComponent
+      ],
+    }).compileComponents();
+  });
+
+  it('should create the app', () => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.componentInstance;
+    expect(app).toBeTruthy();
+  });
+
+  it(`should have as title 'hv2-ui'`, () => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.componentInstance;
+    expect(app.title).toEqual('hv2-ui');
+  });
+
+  it('should render title', () => {
+    const fixture = TestBed.createComponent(AppComponent);
+    fixture.detectChanges();
+    const compiled = fixture.nativeElement;
+    expect(compiled.querySelector('.content span').textContent).toContain('hv2-ui app is running!');
+  });
+});

ui/hv2-ui/src/app/app.component.ts

@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-root',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.css']
+})
+export class AppComponent {
+  title = 'hv2-ui';
+}

ui/hv2-ui/src/app/app.module.ts

@@ -0,0 +1,57 @@
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+
+import { AppComponent } from './app.component';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { NavigationComponent } from './navigation/navigation.component';
+import { LayoutModule } from '@angular/cdk/layout';
+import { MatToolbarModule } from '@angular/material/toolbar';
+import { MatButtonModule } from '@angular/material/button';
+import { MatSidenavModule } from '@angular/material/sidenav';
+import { MatIconModule } from '@angular/material/icon';
+import { MatListModule } from '@angular/material/list';
+import { MessagesComponent } from './messages/messages.component';
+import { AppRoutingModule } from './app-routing.module';
+import { TestOutputComponent } from './test-output/test-output.component';
+import { MatCardModule } from '@angular/material/card';
+import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { ErrorHandlerInterceptor } from './error-handler.interceptor';
+import { AuthHandlerInterceptor } from './auth-handler.interceptor';
+import { LogoutComponent } from './logout/logout.component';
+import { LoginComponent } from './login/login.component';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { MatInputModule } from '@angular/material/input';
+
+
+@NgModule({
+  declarations: [
+    AppComponent,
+    NavigationComponent,
+    MessagesComponent,
+    TestOutputComponent,
+    LogoutComponent,
+    LoginComponent
+  ],
+  imports: [
+    BrowserModule,
+    BrowserAnimationsModule,
+    LayoutModule,
+    HttpClientModule,
+    MatToolbarModule,
+    MatButtonModule,
+    MatSidenavModule,
+    MatIconModule,
+    MatListModule,
+    MatCardModule,
+    AppRoutingModule,
+    FormsModule,
+    ReactiveFormsModule,
+    MatInputModule
+  ],
+  providers: [
+    { provide: HTTP_INTERCEPTORS, useClass: ErrorHandlerInterceptor, multi: true },
+    { provide: HTTP_INTERCEPTORS, useClass: AuthHandlerInterceptor, multi: true }
+  ],
+  bootstrap: [AppComponent]
+})
+export class AppModule { }

ui/hv2-ui/src/app/auth-guard.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { AuthGuardService } from './auth-guard.service';
+
+describe('AuthGuardService', () => {
+  let service: AuthGuardService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(AuthGuardService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

ui/hv2-ui/src/app/auth-guard.service.ts

@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
+import { MessageService } from './message.service';
+import { TokenService } from './token.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class AuthGuardService implements CanActivate {
+
+  constructor(public tokenService: TokenService, public router: Router, private messageService: MessageService) { 
+  }
+
+  canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
+    this.messageService.add(`Activated: ${next.url}`)
+    if (! this.tokenService.checkAuthenticated()) {
+      return this.router.parseUrl(`/login?returnUrl=${next.url}`)
+    } else {
+      return true;
+    }
+  }
+}

ui/hv2-ui/src/app/auth-handler.interceptor.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { AuthHandlerInterceptor } from './auth-handler.interceptor';
+
+describe('AuthHandlerInterceptor', () => {
+  beforeEach(() => TestBed.configureTestingModule({
+    providers: [
+      AuthHandlerInterceptor
+      ]
+  }));
+
+  it('should be created', () => {
+    const interceptor: AuthHandlerInterceptor = TestBed.inject(AuthHandlerInterceptor);
+    expect(interceptor).toBeTruthy();
+  });
+});

ui/hv2-ui/src/app/auth-handler.interceptor.ts

@@ -0,0 +1,28 @@
+import { Injectable } from '@angular/core';
+import {
+  HttpRequest,
+  HttpHandler,
+  HttpEvent,
+  HttpInterceptor
+} from '@angular/common/http';
+import { Observable } from 'rxjs';
+import { MessageService } from './message.service';
+import { TokenService } from './token.service';
+
+@Injectable()
+export class AuthHandlerInterceptor implements HttpInterceptor {
+
+  constructor(private tokenService: TokenService, private messageService: MessageService) {}
+
+  intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
+    const token = localStorage.getItem(TokenService.Id_Token_Key)
+    if (request.url.includes('api.hv.nober.de') && token) {
+      const clone = request.clone({
+        setHeaders: { Authorization: `Bearer ${token}`}
+      })
+      return next.handle(clone)
+    }
+
+    return next.handle(request);
+  }
+}

ui/hv2-ui/src/app/config.ts

@@ -0,0 +1,2 @@
+export const serviceBaseUrl = "https://api.hv.nober.de";
+// export const serviceBaseUrl = "http://172.16.10.38:5000";

ui/hv2-ui/src/app/data-object-service.ts.tmpl

@@ -0,0 +1,35 @@
+import { Injectable } from '@angular/core';
+import { Observable, of } from 'rxjs';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+
+import { MessageService } from './message.service';
+import { serviceBaseUrl } from './config';
+
+
+#for $table in $tables    
+import { ${JsNameConverter($table.name)} } from './data-objects';
+#end for
+
+
+@Injectable({
+  providedIn: 'root'
+})
+
+
+
+
+
+#from generateHelper import JsNameConverter
+
+#for $table in $tables    
+export class ${JsNameConverter($table.name)}Service {
+  constructor(private messageService: MessageService, private http: HttpClient) { }
+  
+  async get${JsNameConverter($table.name)}(): Promise<${JsNameConverter($table.name)}> {
+    this.messageService.add(`${JsNameConverter($table.name)}Service: fetch data`);
+    return this.http.get<${JsNameConverter($table.name)}>(`\${serviceBaseUrl}/v1/${table.name}`).toPromise()
+  }
+}
+
+#end for          
+

ui/hv2-ui/src/app/data-objects.ts.tmpl

@@ -0,0 +1,11 @@
+#from generateHelper import JsNameConverter
+
+#for $table in $tables    
+export interface $JsNameConverter($table.name) {
+#for $column in $table.columns
+    ${column.name}: ${column.jstype}
+#end for
+}
+
+#end for          
+

ui/hv2-ui/src/app/error-handler.interceptor.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ErrorHandlerInterceptor } from './error-handler.interceptor';
+
+describe('ErrorHandlerInterceptor', () => {
+  beforeEach(() => TestBed.configureTestingModule({
+    providers: [
+      ErrorHandlerInterceptor
+      ]
+  }));
+
+  it('should be created', () => {
+    const interceptor: ErrorHandlerInterceptor = TestBed.inject(ErrorHandlerInterceptor);
+    expect(interceptor).toBeTruthy();
+  });
+});

ui/hv2-ui/src/app/error-handler.interceptor.ts

@@ -0,0 +1,30 @@
+import { Injectable } from '@angular/core';
+import {
+  HttpRequest,
+  HttpHandler,
+  HttpEvent,
+  HttpInterceptor,
+  HttpErrorResponse
+} from '@angular/common/http';
+import { Observable, throwError } from 'rxjs';
+import { Router } from '@angular/router';
+import { MessageService } from './message.service';
+import { catchError } from 'rxjs/operators';
+
+@Injectable()
+export class ErrorHandlerInterceptor implements HttpInterceptor {
+
+  constructor(private messageService: MessageService, private router: Router) {}
+
+  intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
+    return next.handle(request).pipe(
+      catchError((errorResponse: HttpErrorResponse) => {
+        this.messageService.add(`Intercepted http error: ${JSON.stringify(errorResponse, undefined, 4)}`)
+        if (errorResponse.status === 401) {
+          this.router.navigate(['login'])
+        }
+        return throwError(errorResponse)
+      })
+    )
+  }
+}

ui/hv2-ui/src/app/login/login.component.css

@@ -0,0 +1,9 @@
+mat-card {
+    max-width: 400px;
+    margin: 2em auto;
+    text-align: center;
+  }
+  
+  mat-form-field {
+    display: block;
+  }

ui/hv2-ui/src/app/login/login.component.html

@@ -0,0 +1,23 @@
+<mat-card>
+    <mat-card-content>
+      <form [formGroup]="form" (ngSubmit)="onSubmit()">
+        <h2>Log In</h2>
+        <mat-error *ngIf="loginInvalid">
+          The username and password were not recognized
+        </mat-error>
+        <mat-form-field class="full-width-input">
+          <input matInput placeholder="Username" formControlName="username" required>
+          <mat-error>
+            Please provide a valid email address
+          </mat-error>
+        </mat-form-field>
+        <mat-form-field class="full-width-input">
+          <input matInput type="password" placeholder="Password" formControlName="password" required>
+          <mat-error>
+            Please provide a valid password
+          </mat-error>
+        </mat-form-field>
+        <button mat-raised-button color="primary">Login</button>
+      </form>
+    </mat-card-content>
+  </mat-card>

ui/hv2-ui/src/app/login/login.component.spec.ts

@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { LoginComponent } from './login.component';
+
+describe('LoginComponent', () => {
+  let component: LoginComponent;
+  let fixture: ComponentFixture<LoginComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ LoginComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(LoginComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

ui/hv2-ui/src/app/login/login.component.ts

@@ -0,0 +1,56 @@
+import { Component, OnInit } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { ActivatedRoute, Router } from '@angular/router';
+import { MessageService } from '../message.service';
+import { TokenService } from '../token.service';
+
+
+@Component({
+  selector: 'app-login',
+  templateUrl: './login.component.html',
+  styleUrls: ['./login.component.css']
+})
+export class LoginComponent implements OnInit {
+  form: FormGroup;
+  public loginInvalid = false;
+  private formSubmitAttempt = false;
+  private returnUrl: string;
+
+  constructor(private fb: FormBuilder,
+    private route: ActivatedRoute,
+    private router: Router,
+    private tokenService: TokenService,
+    private messageService: MessageService) {
+      this.returnUrl = this.route.snapshot.queryParams.returnUrl || '/'
+      this.messageService.add(`Return URL is ${this.returnUrl}`)
+      this.form = this.fb.group({
+        username: ['', Validators.required],
+        password: ['', Validators.required]
+      })
+  }
+
+  ngOnInit(): void {
+    if (this.tokenService.checkAuthenticated()) {
+      this.router.navigate([this.returnUrl])
+    }
+  }
+
+  async onSubmit(): Promise<void> {
+    this.loginInvalid = false;
+    this.formSubmitAttempt = false;
+    if (this.form.valid) {
+      try {
+        const username = this.form.get('username')?.value;
+        const password = this.form.get('password')?.value;
+        await this.tokenService.login(username, password);
+        this.router.navigate([this.returnUrl])
+      } catch (err) {
+        this.messageService.add(`Login err: ${err.message}`)
+        this.loginInvalid = true;
+      }
+    } else {
+      this.formSubmitAttempt = true;
+    }
+  }
+
+}

ui/hv2-ui/src/app/logout/logout.component.html

@@ -0,0 +1,17 @@
+<section class="mat-typography">
+    <mat-card class="defaultCard">
+        <mat-card-header>
+            <mat-card-title>
+                Logout
+            </mat-card-title>
+        </mat-card-header>
+        <mat-card-content>
+            <div>
+
+                <h2>Good bye</h2>
+
+            </div>
+
+        </mat-card-content>
+    </mat-card>
+</section>

ui/hv2-ui/src/app/logout/logout.component.spec.ts

@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { LogoutComponent } from './logout.component';
+
+describe('LogoutComponent', () => {
+  let component: LogoutComponent;
+  let fixture: ComponentFixture<LogoutComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ LogoutComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(LogoutComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

ui/hv2-ui/src/app/logout/logout.component.ts

@@ -0,0 +1,20 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { MessageService } from '../message.service';
+import { TokenService } from '../token.service';
+
+@Component({
+  selector: 'app-logout',
+  templateUrl: './logout.component.html',
+  styleUrls: ['./logout.component.css']
+})
+export class LogoutComponent implements OnInit {
+
+  constructor(private tokenService: TokenService, private router: Router, private messageService: MessageService) { }
+
+  ngOnInit(): void {
+    this.tokenService.logout()
+    this.router.navigateByUrl('/login')
+  }
+
+}

ui/hv2-ui/src/app/message.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { MessageService } from './message.service';
+
+describe('MessageService', () => {
+  let service: MessageService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(MessageService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

ui/hv2-ui/src/app/message.service.ts

@@ -0,0 +1,16 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class MessageService {
+  messages: string[] = [];
+
+  add(message: string) {
+    this.messages.push(message);
+  }
+
+  clear() {
+    this.messages = [];
+  }
+}

ui/hv2-ui/src/app/messages/messages.component.html

@@ -0,0 +1,11 @@
+<section class="mat-typography">
+    <mat-card class="defaultCard" *ngIf="messageService.messages.length">
+        <mat-card-header>
+            <mat-card-title>Messages</mat-card-title>
+        </mat-card-header>
+        <mat-card-content>
+            <button (click)="messageService.clear()">clear</button>
+            <div *ngFor='let message of messageService.messages'> {{message}} </div>
+        </mat-card-content>
+    </mat-card>
+</section>

ui/hv2-ui/src/app/messages/messages.component.spec.ts

@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { MessagesComponent } from './messages.component';
+
+describe('MessagesComponent', () => {
+  let component: MessagesComponent;
+  let fixture: ComponentFixture<MessagesComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ MessagesComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MessagesComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

ui/hv2-ui/src/app/messages/messages.component.ts

@@ -0,0 +1,16 @@
+import { Component, OnInit } from '@angular/core';
+import { MessageService } from '../message.service';
+
+@Component({
+  selector: 'app-messages',
+  templateUrl: './messages.component.html',
+  styleUrls: ['./messages.component.css']
+})
+export class MessagesComponent implements OnInit {
+
+  constructor(public messageService: MessageService) { }
+
+  ngOnInit(): void {
+  }
+
+}

ui/hv2-ui/src/app/navigation/navigation.component.css

@@ -0,0 +1,26 @@
+.sidenav-container {
+  height: 100%;
+}
+
+.sidenav {
+  width: 200px;
+}
+
+.sidenav .mat-toolbar {
+  background: inherit;
+}
+
+.mat-toolbar.mat-primary {
+  position: sticky;
+  top: 0;
+  z-index: 1;
+}
+
+.spacer {
+  flex: 1 1 auto;
+}
+
+.gittagversion {
+  font-size: x-small;
+  margin-right: 5em;
+}

ui/hv2-ui/src/app/navigation/navigation.component.html

@@ -0,0 +1,33 @@
+<mat-sidenav-container class="sidenav-container">
+  <mat-sidenav #drawer class="sidenav" fixedInViewport
+      [attr.role]="(isHandset$ | async) ? 'dialog' : 'navigation'"
+      [mode]="(isHandset$ | async) ? 'over' : 'side'"
+      [opened]="(isHandset$ | async) === false">
+    <mat-toolbar>Menu</mat-toolbar>
+    <mat-nav-list>
+      <a mat-list-item href="/test">Mein Test</a>
+    </mat-nav-list>
+  </mat-sidenav>
+  <mat-sidenav-content>
+    <mat-toolbar color="primary">
+      <button
+        type="button"
+        aria-label="Toggle sidenav"
+        mat-icon-button
+        (click)="drawer.toggle()"
+        *ngIf="isHandset$ | async">
+        <mat-icon aria-label="Side nav toggle icon">menu</mat-icon>
+      </button>
+      <span>Nober Grundbesitz GbR Hausverwaltung</span>
+      <span class="spacer"></span>
+      <span class="gittagversion">GITTAGVERSION</span>
+      <a *ngIf="!authenticated" mat-button routerLink="/login">Login</a>
+      <a *ngIf="authenticated" mat-button routerLink="/logout">Logout</a>
+    </mat-toolbar>
+    <!-- Add Content Here -->
+
+    <router-outlet></router-outlet>
+    <app-messages></app-messages>
+
+  </mat-sidenav-content>
+</mat-sidenav-container>

ui/hv2-ui/src/app/navigation/navigation.component.spec.ts

@@ -0,0 +1,40 @@
+import { LayoutModule } from '@angular/cdk/layout';
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
+import { MatListModule } from '@angular/material/list';
+import { MatSidenavModule } from '@angular/material/sidenav';
+import { MatToolbarModule } from '@angular/material/toolbar';
+
+import { NavigationComponent } from './navigation.component';
+
+describe('NavigationComponent', () => {
+  let component: NavigationComponent;
+  let fixture: ComponentFixture<NavigationComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [NavigationComponent],
+      imports: [
+        NoopAnimationsModule,
+        LayoutModule,
+        MatButtonModule,
+        MatIconModule,
+        MatListModule,
+        MatSidenavModule,
+        MatToolbarModule,
+      ]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NavigationComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should compile', () => {
+    expect(component).toBeTruthy();
+  });
+});

ui/hv2-ui/src/app/navigation/navigation.component.ts

@@ -0,0 +1,38 @@
+import { Component } from '@angular/core';
+import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
+import { Observable } from 'rxjs';
+import { map, shareReplay } from 'rxjs/operators';
+import { TokenService } from '../token.service';
+import { NavigationEnd, Router } from '@angular/router';
+
+@Component({
+  selector: 'app-navigation',
+  templateUrl: './navigation.component.html',
+  styleUrls: ['./navigation.component.css']
+})
+export class NavigationComponent {
+
+  public authenticated: boolean
+
+  isHandset$: Observable<boolean> = this.breakpointObserver.observe(Breakpoints.Handset)
+    .pipe(
+      map(result => result.matches),
+      shareReplay()
+    );
+
+  constructor(
+    private breakpointObserver: BreakpointObserver, 
+    private tokenService: TokenService,
+    private router: Router) {
+    this.router.events.subscribe((e: any) => {
+      if (e instanceof NavigationEnd) {
+        this.authenticated = this.tokenService.checkAuthenticated()
+      }
+    })
+  }
+
+  ngOnInit() {
+    this.authenticated = this.tokenService.checkAuthenticated()
+  }
+
+}

ui/hv2-ui/src/app/test-output.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { TestOutputService } from './test-output.service';
+
+describe('TestOutputService', () => {
+  let service: TestOutputService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(TestOutputService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

ui/hv2-ui/src/app/test-output.service.ts

@@ -0,0 +1,19 @@
+import { Injectable } from '@angular/core';
+import { Observable, of } from 'rxjs';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+
+import { MessageService } from './message.service';
+import { serviceBaseUrl } from './config';
+import { TestOutput } from './testOutput';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class TestOutputService {
+  constructor(private messageService: MessageService, private http: HttpClient) { }
+  
+  async getTestOutput(): Promise<TestOutput> {
+    this.messageService.add(`TestOutputService: fetch test output`);
+    return this.http.get<TestOutput>(`${serviceBaseUrl}/v1/test`).toPromise()
+  }
+}

ui/hv2-ui/src/app/test-output/test-output.component.html

@@ -0,0 +1,22 @@
+<section class="mat-typography">
+    <mat-card class="defaultCard">
+        <mat-card-header>
+            <mat-card-title>
+                Mein Test
+            </mat-card-title>
+        </mat-card-header>
+        <mat-card-content>
+            <div>
+
+                <h2>Mein Test</h2>
+                <pre>
+                    {{testOutput.message}}
+                
+                    {{testOutput.details}}
+                </pre>
+
+            </div>
+
+        </mat-card-content>
+    </mat-card>
+</section>

ui/hv2-ui/src/app/test-output/test-output.component.spec.ts

@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TestOutputComponent } from './test-output.component';
+
+describe('TestOutputComponent', () => {
+  let component: TestOutputComponent;
+  let fixture: ComponentFixture<TestOutputComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ TestOutputComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TestOutputComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

ui/hv2-ui/src/app/test-output/test-output.component.ts

@@ -0,0 +1,29 @@
+import { Component, OnInit } from '@angular/core';
+import { MessageService } from '../message.service';
+import { TestOutputService } from '../test-output.service';
+import { TestOutput } from '../testOutput';
+
+@Component({
+  selector: 'app-test-output',
+  templateUrl: './test-output.component.html',
+  styleUrls: ['./test-output.component.css']
+})
+export class TestOutputComponent implements OnInit {
+
+  constructor(private testOutputService: TestOutputService, private messageService: MessageService) { }
+
+  testOutput : TestOutput = { "message": "abc", "details": "123" }
+
+  async getTestOutput() {
+    try {
+      this.testOutput = await this.testOutputService.getTestOutput();
+    } catch (err) {
+      this.messageService.add(JSON.stringify(err, undefined, 4))
+    }
+  }
+
+  ngOnInit(): void {
+    this.messageService.add("TestOutputComponent.ngOnInit")
+    this.getTestOutput();
+  }
+}

ui/hv2-ui/src/app/testOutput.ts

@@ -0,0 +1,4 @@
+export interface TestOutput {
+    message: string
+    details: string
+}

ui/hv2-ui/src/app/token.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { TokenService } from './token.service';
+
+describe('TokenService', () => {
+  let service: TokenService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(TokenService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

ui/hv2-ui/src/app/token.service.ts

@@ -0,0 +1,54 @@
+import { Injectable } from '@angular/core';
+import { MessageService } from './message.service';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { UserCreds } from './userCreds'
+import jwt_decode  from 'jwt-decode'
+
+@Injectable({
+  providedIn: 'root'
+})
+export class TokenService {
+
+  public static Id_Token_Key : string = "id_token";
+
+  constructor(private http: HttpClient, private messageService: MessageService) {
+  }
+
+  checkAuthenticated(): boolean {
+    let result: boolean = false
+
+    const token = localStorage.getItem(TokenService.Id_Token_Key)
+    if (token) {
+      let expiration = jwt_decode(token)["exp"]
+      if ((expiration * 1000) > Date.now()) {
+        result = true
+      } else {
+        this.logout()
+      }
+    }
+
+    return result
+  }
+
+  logout() {
+    localStorage.removeItem(TokenService.Id_Token_Key)
+    this.messageService.add("Token removed from local storage")
+  }
+
+  async login(login: string, password: string) {
+    this.messageService.add(`TokenService: trying to login and obtain token`);
+    const userCreds : UserCreds = {
+      "application": "hv2",
+      "login": login,
+      "password": password
+    }
+    const token = await this.http.post(
+      "https://authservice.hottis.de/token", 
+      userCreds,
+      {responseType:'text'}
+    ).toPromise()
+    localStorage.setItem(TokenService.Id_Token_Key, token)
+    this.messageService.add("Token saved")
+  }
+
+}

ui/hv2-ui/src/app/userCreds.ts

@@ -0,0 +1,5 @@
+export interface UserCreds {
+    application: string
+    login: string
+    password: string
+}

ui/hv2-ui/src/environments/environment.prod.ts

@@ -0,0 +1,3 @@
+export const environment = {
+  production: true
+};

ui/hv2-ui/src/environments/environment.ts

@@ -0,0 +1,16 @@
+// This file can be replaced during build by using the `fileReplacements` array.
+// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
+// The list of file replacements can be found in `angular.json`.
+
+export const environment = {
+  production: false
+};
+
+/*
+ * For easier debugging in development mode, you can import the following file
+ * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
+ *
+ * This import should be commented out in production mode because it will have a negative impact
+ * on performance if an error is thrown.
+ */
+// import 'zone.js/dist/zone-error';  // Included with Angular CLI.

ui/hv2-ui/src/index.html

@@ -0,0 +1,16 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Hv2Ui</title>
+  <base href="/">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
+  <link rel="preconnect" href="https://fonts.gstatic.com">
+  <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500&display=swap" rel="stylesheet">
+  <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+</head>
+<body class="mat-typography">
+  <app-root></app-root>
+</body>
+</html>

ui/hv2-ui/src/main.ts

@@ -0,0 +1,12 @@
+import { enableProdMode } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app/app.module';
+import { environment } from './environments/environment';
+
+if (environment.production) {
+  enableProdMode();
+}
+
+platformBrowserDynamic().bootstrapModule(AppModule)
+  .catch(err => console.error(err));

ui/hv2-ui/src/polyfills.ts

@@ -0,0 +1,63 @@
+/**
+ * This file includes polyfills needed by Angular and is loaded before the app.
+ * You can add your own extra polyfills to this file.
+ *
+ * This file is divided into 2 sections:
+ *   1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
+ *   2. Application imports. Files imported after ZoneJS that should be loaded before your main
+ *      file.
+ *
+ * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
+ * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
+ * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
+ *
+ * Learn more in https://angular.io/guide/browser-support
+ */
+
+/***************************************************************************************************
+ * BROWSER POLYFILLS
+ */
+
+/** IE11 requires the following for NgClass support on SVG elements */
+// import 'classlist.js';  // Run `npm install --save classlist.js`.
+
+/**
+ * Web Animations `@angular/platform-browser/animations`
+ * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
+ * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
+ */
+// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
+
+/**
+ * By default, zone.js will patch all possible macroTask and DomEvents
+ * user can disable parts of macroTask/DomEvents patch by setting following flags
+ * because those flags need to be set before `zone.js` being loaded, and webpack
+ * will put import in the top of bundle, so user need to create a separate file
+ * in this directory (for example: zone-flags.ts), and put the following flags
+ * into that file, and then add the following code before importing zone.js.
+ * import './zone-flags';
+ *
+ * The flags allowed in zone-flags.ts are listed here.
+ *
+ * The following flags will work for all browsers.
+ *
+ * (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
+ * (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
+ * (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
+ *
+ *  in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
+ *  with the following flag, it will bypass `zone.js` patch for IE/Edge
+ *
+ *  (window as any).__Zone_enable_cross_context_check = true;
+ *
+ */
+
+/***************************************************************************************************
+ * Zone JS is required by default for Angular itself.
+ */
+import 'zone.js/dist/zone';  // Included with Angular CLI.
+
+
+/***************************************************************************************************
+ * APPLICATION IMPORTS
+ */

ui/hv2-ui/src/styles.css

@@ -0,0 +1,9 @@
+/* You can add global styles to this file, and also import other style files */
+
+html, body { height: 100%; }
+body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; }
+
+
+.defaultCard {
+    margin: 5px;
+}

ui/hv2-ui/src/test.ts

@@ -0,0 +1,25 @@
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import 'zone.js/dist/zone-testing';
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+
+declare const require: {
+  context(path: string, deep?: boolean, filter?: RegExp): {
+    keys(): string[];
+    <T>(id: string): T;
+  };
+};
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting()
+);
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);