diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index 24c4254..bb78fa7 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -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: diff --git a/package-lock.json b/package-lock.json index 91aa9a1..0569d68 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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", diff --git a/package.json b/package.json index b408455..c5050b5 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/app/about/about.component.ts b/src/app/about/about.component.ts index 26596b4..3d293a4 100644 --- a/src/app/about/about.component.ts +++ b/src/app/about/about.component.ts @@ -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 { } diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 70dc380..52a84ae 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -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 { diff --git a/src/app/profile/profile.component.ts b/src/app/profile/profile.component.ts index c5b8ea6..16fa22f 100644 --- a/src/app/profile/profile.component.ts +++ b/src/app/profile/profile.component.ts @@ -3,6 +3,7 @@ import { Component } from '@angular/core'; @Component({ selector: 'app-profile', templateUrl: './profile.component.html', + styleUrls: ['./profile.component.scss'] }) export class ProfileComponent { diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts index 9157906..44c1f14 100644 --- a/src/app/settings/settings.component.ts +++ b/src/app/settings/settings.component.ts @@ -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( diff --git a/src/version.json b/src/version.json new file mode 100644 index 0000000..c158d5b --- /dev/null +++ b/src/version.json @@ -0,0 +1,3 @@ +{ + "version": "0.0.0" +} \ No newline at end of file