This commit is contained in:
parent
5ff197ad49
commit
4c4dc3fc5c
4 changed files with 93 additions and 80 deletions
|
@ -2,7 +2,7 @@
|
||||||
<mat-toolbar fxFlex="2em" id='top-toolbar'>
|
<mat-toolbar fxFlex="2em" id='top-toolbar'>
|
||||||
<span
|
<span
|
||||||
style='font-family:GisafSymbols'
|
style='font-family:GisafSymbols'
|
||||||
matTooltip="Gisaf v. {{ (configService.conf | async).bsData?.version }}"
|
matTooltip="Gisaf version: backend {{ version.backend }}, frontend {{ version.frontend }}"
|
||||||
matTooltipPosition="below"
|
matTooltipPosition="below"
|
||||||
class='gisafIcon'
|
class='gisafIcon'
|
||||||
>
|
>
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
import { Component, OnInit,
|
import {
|
||||||
ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core'
|
Component, OnInit,
|
||||||
|
ChangeDetectionStrategy, ChangeDetectorRef
|
||||||
|
} from '@angular/core'
|
||||||
import { Title } from '@angular/platform-browser'
|
import { Title } from '@angular/platform-browser'
|
||||||
import { BootstrapService } from './_services/bootstrap.service'
|
import { BootstrapService } from './_services/bootstrap.service'
|
||||||
import { ConfigService } from './_services/config.service'
|
import { ConfigService } from './_services/config.service'
|
||||||
|
@ -8,6 +10,12 @@ import { MatDialog, MatDialogRef } from '@angular/material/dialog'
|
||||||
|
|
||||||
import { AuthenticationService } from './_services/authentication.service'
|
import { AuthenticationService } from './_services/authentication.service'
|
||||||
import { LoginDialogComponent } from './login/login.component'
|
import { LoginDialogComponent } from './login/login.component'
|
||||||
|
import versionJson from '../version.json'
|
||||||
|
|
||||||
|
export class Version {
|
||||||
|
public backend: string
|
||||||
|
public frontend: string
|
||||||
|
}
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-root',
|
selector: 'app-root',
|
||||||
|
@ -16,8 +24,8 @@ import { LoginDialogComponent } from './login/login.component'
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
})
|
})
|
||||||
export class AppComponent implements OnInit {
|
export class AppComponent implements OnInit {
|
||||||
title = 'Gisaf'
|
title: string = 'Gisaf'
|
||||||
version: string
|
version: Version = new Version()
|
||||||
|
|
||||||
routes = [
|
routes = [
|
||||||
{
|
{
|
||||||
|
@ -46,13 +54,14 @@ export class AppComponent implements OnInit {
|
||||||
private cdr: ChangeDetectorRef,
|
private cdr: ChangeDetectorRef,
|
||||||
public dialogRef: MatDialogRef<LoginDialogComponent>,
|
public dialogRef: MatDialogRef<LoginDialogComponent>,
|
||||||
public dialog: MatDialog
|
public dialog: MatDialog
|
||||||
) {}
|
) { }
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
// Bootstrap: set app wide configuration
|
// Bootstrap: set app wide configuration
|
||||||
this.bootstrapService.get().subscribe({
|
this.bootstrapService.get().subscribe({
|
||||||
next: res => {
|
next: res => {
|
||||||
this.version = res.version
|
this.version.backend = res.version
|
||||||
|
this.version.frontend = versionJson["version"]
|
||||||
this.title = res.title || this.title
|
this.title = res.title || this.title
|
||||||
this.titleService.setTitle(res.windowTitle || this.title)
|
this.titleService.setTitle(res.windowTitle || this.title)
|
||||||
this.configService.setConf(res)
|
this.configService.setConf(res)
|
||||||
|
|
3
src/version.json
Normal file
3
src/version.json
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
{
|
||||||
|
"version": "0.0.0"
|
||||||
|
}
|
|
@ -1,24 +1,25 @@
|
||||||
{
|
{
|
||||||
"compileOnSave": false,
|
"compileOnSave": false,
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"importHelpers": true,
|
|
||||||
"module": "es2020",
|
|
||||||
"esModuleInterop": true,
|
|
||||||
"outDir": "./dist/out-tsc",
|
|
||||||
"sourceMap": true,
|
|
||||||
"declaration": false,
|
"declaration": false,
|
||||||
"moduleResolution": "node",
|
"esModuleInterop": true,
|
||||||
"experimentalDecorators": true,
|
"experimentalDecorators": true,
|
||||||
"target": "ES2022",
|
"importHelpers": true,
|
||||||
"typeRoots": [
|
|
||||||
"node_modules/@types",
|
|
||||||
"@types"
|
|
||||||
],
|
|
||||||
"lib": [
|
"lib": [
|
||||||
"es2019",
|
"es2019",
|
||||||
"dom",
|
"dom",
|
||||||
"esnext.asynciterable"
|
"esnext.asynciterable"
|
||||||
],
|
],
|
||||||
|
"module": "es2020",
|
||||||
|
"moduleResolution": "node",
|
||||||
|
"resolveJsonModule": true,
|
||||||
|
"outDir": "./dist/out-tsc",
|
||||||
|
"sourceMap": true,
|
||||||
|
"target": "ES2022",
|
||||||
|
"typeRoots": [
|
||||||
|
"node_modules/@types",
|
||||||
|
"@types"
|
||||||
|
],
|
||||||
"useDefineForClassFields": false
|
"useDefineForClassFields": false
|
||||||
},
|
},
|
||||||
"angularCompilerOptions": {
|
"angularCompilerOptions": {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue