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