Compare commits
10 commits
Author | SHA1 | Date | |
---|---|---|---|
5c22207f0a | |||
034d9d4c37 | |||
14363c721b | |||
20bfd3116e | |||
b6c4cd280a | |||
f5828ae1e6 | |||
674fd71de9 | |||
fd9dc302cb | |||
780bf3b6c9 | |||
3874e84a6e |
8 changed files with 20 additions and 19 deletions
|
@ -7,7 +7,7 @@ when:
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
npm:
|
npm:
|
||||||
image: code.philo.ydns.eu/philorg/pnpm
|
image: code.philo.ydns.eu/philorg/pnpm-deb
|
||||||
environment:
|
environment:
|
||||||
ORG: philorg
|
ORG: philorg
|
||||||
REGISTRY_TOKEN:
|
REGISTRY_TOKEN:
|
||||||
|
@ -20,6 +20,11 @@ steps:
|
||||||
- pnpm publish --no-git-checks
|
- pnpm publish --no-git-checks
|
||||||
failure: ignore
|
failure: ignore
|
||||||
|
|
||||||
|
build:
|
||||||
|
image: code.philo.ydns.eu/philorg/pnpm-deb
|
||||||
|
commands:
|
||||||
|
- pnpm build
|
||||||
|
|
||||||
build_publish:
|
build_publish:
|
||||||
image: quay.io/podman/stable:latest
|
image: quay.io/podman/stable:latest
|
||||||
# Caution: This image is built daily. It might fill up your image store quickly.
|
# Caution: This image is built daily. It might fill up your image store quickly.
|
||||||
|
@ -32,7 +37,7 @@ steps:
|
||||||
environment:
|
environment:
|
||||||
registry: code.philo.ydns.eu
|
registry: code.philo.ydns.eu
|
||||||
org: philorg
|
org: philorg
|
||||||
container_name: oidc-vue-test
|
container_name: treetrail-frontend
|
||||||
registry_token:
|
registry_token:
|
||||||
from_secret: registry_token
|
from_secret: registry_token
|
||||||
commands:
|
commands:
|
||||||
|
|
4
package-lock.json
generated
4
package-lock.json
generated
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "treetrail",
|
"name": "treetrail",
|
||||||
"version": "0.4.1",
|
"version": "0.4.5",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "treetrail",
|
"name": "treetrail",
|
||||||
"version": "0.4.1",
|
"version": "0.4.5",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "^18.2.6",
|
"@angular/animations": "^18.2.6",
|
||||||
"@angular/cdk": "^18.2.6",
|
"@angular/cdk": "^18.2.6",
|
||||||
|
|
|
@ -1,14 +1,13 @@
|
||||||
{
|
{
|
||||||
"name": "treetrail-frontend",
|
"name": "treetrail-frontend",
|
||||||
"version": "0.4.1",
|
"version": "0.4.5",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"ng": "ng",
|
"ng": "ng",
|
||||||
"start": "ng serve --proxy-config proxy.conf.json --port 4201 --serve-path /treetrail --host 0.0.0.0",
|
"start": "ng serve --proxy-config proxy.conf.json --port 4201 --serve-path /treetrail --host 0.0.0.0",
|
||||||
"build": "ng build",
|
"build": "ng build",
|
||||||
"watch": "ng build --watch --configuration development",
|
"watch": "ng build --watch --configuration development",
|
||||||
"test": "ng test",
|
"test": "ng test",
|
||||||
"openapi-ts": "openapi-ts",
|
"openapi-ts": "openapi-ts"
|
||||||
"version": "echo \"{\\\"version\\\":\\\"$(git describe --tags --dirty --always)\\\"}\" > src/version.json"
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "^18.2.6",
|
"@angular/animations": "^18.2.6",
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import { Component, OnInit } from '@angular/core'
|
import { Component, OnInit } from '@angular/core'
|
||||||
|
|
||||||
import { ConfigService } from '../config.service'
|
import { ConfigService } from '../config.service'
|
||||||
import versionJson from '../../version.json'
|
import packageJson from '../../../package.json'
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-about',
|
selector: 'app-about',
|
||||||
|
@ -13,7 +13,7 @@ export class AboutComponent implements OnInit {
|
||||||
public configService: ConfigService,
|
public configService: ConfigService,
|
||||||
) { }
|
) { }
|
||||||
|
|
||||||
public version: string = versionJson.version
|
public version: string = packageJson.version
|
||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
import { Component, OnInit,
|
import {
|
||||||
ChangeDetectorRef, ChangeDetectionStrategy } from '@angular/core'
|
Component, OnInit,
|
||||||
|
ChangeDetectorRef, ChangeDetectionStrategy
|
||||||
|
} from '@angular/core'
|
||||||
import { DataService } from './data.service'
|
import { DataService } from './data.service'
|
||||||
|
|
||||||
import { ActionService } from './action.service'
|
import { ActionService } from './action.service'
|
||||||
|
@ -10,7 +12,6 @@ import { combineLatest } from 'rxjs'
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-root',
|
selector: 'app-root',
|
||||||
templateUrl: './app.component.html',
|
templateUrl: './app.component.html',
|
||||||
styleUrls: ['./app.component.scss'],
|
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
})
|
})
|
||||||
export class AppComponent implements OnInit {
|
export class AppComponent implements OnInit {
|
||||||
|
@ -20,7 +21,7 @@ export class AppComponent implements OnInit {
|
||||||
public actionService: ActionService,
|
public actionService: ActionService,
|
||||||
public appUpdateService: AppUpdateService,
|
public appUpdateService: AppUpdateService,
|
||||||
public cdr: ChangeDetectorRef,
|
public cdr: ChangeDetectorRef,
|
||||||
) {}
|
) { }
|
||||||
title = 'treetrail'
|
title = 'treetrail'
|
||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
|
|
|
@ -3,7 +3,6 @@ import { Component } from '@angular/core';
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-profile',
|
selector: 'app-profile',
|
||||||
templateUrl: './profile.component.html',
|
templateUrl: './profile.component.html',
|
||||||
styleUrls: ['./profile.component.scss']
|
|
||||||
})
|
})
|
||||||
export class ProfileComponent {
|
export class ProfileComponent {
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ import { Router } from '@angular/router'
|
||||||
|
|
||||||
import { ActionService } from '../action.service'
|
import { ActionService } from '../action.service'
|
||||||
import { ConfigService, Config } from '../config.service'
|
import { ConfigService, Config } from '../config.service'
|
||||||
import versionJson from '../../version.json'
|
import packageJson from '../../../package.json'
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-settings',
|
selector: 'app-settings',
|
||||||
|
@ -18,7 +18,7 @@ export class SettingsComponent implements OnInit {
|
||||||
public router: Router,
|
public router: Router,
|
||||||
) { }
|
) { }
|
||||||
|
|
||||||
public version: string = versionJson.version
|
public version: string = packageJson.version
|
||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
this.configService.conf.subscribe(
|
this.configService.conf.subscribe(
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
{
|
|
||||||
"version": "0.0.0"
|
|
||||||
}
|
|
Loading…
Add table
Add a link
Reference in a new issue