From 963d3437c086877beb21ad17811bd9371a6d2a50 Mon Sep 17 00:00:00 2001 From: phil Date: Mon, 4 Nov 2024 03:49:11 +0100 Subject: [PATCH 01/35] Frontend version: disable - method to be polished --- build.yaml | 9 +++++++-- src/app/about/about.component.html | 2 +- src/app/about/about.component.ts | 6 +++++- tsconfig.json | 3 +++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/build.yaml b/build.yaml index 0ed0cf8..8b195eb 100644 --- a/build.yaml +++ b/build.yaml @@ -1,8 +1,11 @@ -- name: Build container +- name: Build container image hosts: localhost gather_facts: false vars: repository: tiptop:5000 + force_rm: false + cache: false + tasks: - name: Install dependencies command: pnpm install @@ -28,8 +31,10 @@ path: "{{ playbook_dir }}" build: format: oci - cache: no + force_rm: "{{ force_rm }}" + cache: "{{ cache }}" file: Containerfile + extra_args: "--build-arg APP_VERSION={{ version.stdout }}" push: true push_args: dest: "{{ repository }}/treetrail-frontend:{{ version.stdout }}" diff --git a/src/app/about/about.component.html b/src/app/about/about.component.html index c7e6ba7..358852a 100644 --- a/src/app/about/about.component.html +++ b/src/app/about/about.component.html @@ -4,7 +4,7 @@

Version

-

Client: {{ (configService.conf | async).bootstrap.client.version }}>

+

Server: {{ (configService.conf | async).bootstrap.server.version }}

 \ No newline at end of file diff --git a/src/app/about/about.component.ts b/src/app/about/about.component.ts index edfc557..79f29cb 100644 --- a/src/app/about/about.component.ts +++ b/src/app/about/about.component.ts @@ -1,6 +1,8 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit } from '@angular/core' import { ConfigService } from '../config.service' +// TODO: get the dynamic version from the git tags +//import packageJson from '../../../package.json' @Component({ selector: 'app-about', @@ -12,6 +14,8 @@ export class AboutComponent implements OnInit { public configService: ConfigService, ) { } + //public version: string = packageJson.version + ngOnInit(): void { } } diff --git a/tsconfig.json b/tsconfig.json index 78cbf2f..51a9bd8 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,6 +15,9 @@ "importHelpers": true, "target": "ES2022", "module": "es2020", + // TODO: get the dynamic version from the git tags + //"allowSyntheticDefaultImports": true, + //"resolveJsonModule": true, "lib": [ "es2019", "dom" From 73430a0fe9582f28b31a442a2992d451286d6283 Mon Sep 17 00:00:00 2001 From: phil Date: Tue, 5 Nov 2024 13:07:41 +0100 Subject: [PATCH 02/35] CI: clean --- .forgejo/workflows/build.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 344de1d..75fffe2 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -53,10 +53,6 @@ jobs: - name: Build package (transpile ts => js) run: ng build - #- name: Git unshallow - get all history from Git to get the tag for the computation of the version - # if: ${{ inputs.build }} - # run: git pull --unshallow - - name: Build container if: fromJSON(steps.builder.outputs.run) uses: actions/buildah-build@v1 From d343f413e3847988f406ec82986fc98e26b4097a Mon Sep 17 00:00:00 2001 From: phil Date: Tue, 5 Nov 2024 13:07:56 +0100 Subject: [PATCH 03/35] 0.0.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 55c3ef2..946ba96 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "treetrail", - "version": "0.0.0", + "version": "0.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "treetrail", - "version": "0.0.0", + "version": "0.0.1", "dependencies": { "@angular/animations": "^18.2.6", "@angular/cdk": "^18.2.6", diff --git a/package.json b/package.json index 0638632..e630acf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "treetrail", - "version": "0.0.0", + "version": "0.0.1", "scripts": { "ng": "ng", "start": "ng serve --proxy-config proxy.conf.json --port 4201 --serve-path /treetrail", From 08a5d07c4da589722e72074213fc088412d96b18 Mon Sep 17 00:00:00 2001 From: phil Date: Tue, 5 Nov 2024 13:09:17 +0100 Subject: [PATCH 04/35] 0.0.2 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 946ba96..941e71d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "treetrail", - "version": "0.0.1", + "version": "0.0.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "treetrail", - "version": "0.0.1", + "version": "0.0.2", "dependencies": { "@angular/animations": "^18.2.6", "@angular/cdk": "^18.2.6", diff --git a/package.json b/package.json index e630acf..ada16c0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "treetrail", - "version": "0.0.1", + "version": "0.0.2", "scripts": { "ng": "ng", "start": "ng serve --proxy-config proxy.conf.json --port 4201 --serve-path /treetrail", From 839159e59aacf34af4439566f0c98b803a73b6a2 Mon Sep 17 00:00:00 2001 From: phil Date: Tue, 5 Nov 2024 13:11:56 +0100 Subject: [PATCH 05/35] 0.0.3 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 941e71d..f3d7457 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "treetrail", - "version": "0.0.2", + "version": "0.0.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "treetrail", - "version": "0.0.2", + "version": "0.0.3", "dependencies": { "@angular/animations": "^18.2.6", "@angular/cdk": "^18.2.6", diff --git a/package.json b/package.json index ada16c0..6cac1dd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "treetrail", - "version": "0.0.2", + "version": "0.0.3", "scripts": { "ng": "ng", "start": "ng serve --proxy-config proxy.conf.json --port 4201 --serve-path /treetrail", From 54096165308496fe773de96db4d6bff58b74bc2a Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 8 Nov 2024 23:52:10 +0100 Subject: [PATCH 06/35] Add client version --- src/app/about/about.component.html | 2 +- src/app/about/about.component.ts | 5 ++--- src/version.json | 3 +++ tsconfig.json | 3 +-- 4 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 src/version.json diff --git a/src/app/about/about.component.html b/src/app/about/about.component.html index 358852a..6bd500d 100644 --- a/src/app/about/about.component.html +++ b/src/app/about/about.component.html @@ -4,7 +4,7 @@

Version

- +

Client: {{ version }}>

Server: {{ (configService.conf | async).bootstrap.server.version }}

 \ No newline at end of file diff --git a/src/app/about/about.component.ts b/src/app/about/about.component.ts index 79f29cb..3d293a4 100644 --- a/src/app/about/about.component.ts +++ b/src/app/about/about.component.ts @@ -1,8 +1,7 @@ import { Component, OnInit } from '@angular/core' import { ConfigService } from '../config.service' -// TODO: get the dynamic version from the git tags -//import packageJson from '../../../package.json' +import versionJson from '../../version.json' @Component({ selector: 'app-about', @@ -14,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/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 diff --git a/tsconfig.json b/tsconfig.json index 51a9bd8..b149b41 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,9 +15,8 @@ "importHelpers": true, "target": "ES2022", "module": "es2020", - // TODO: get the dynamic version from the git tags //"allowSyntheticDefaultImports": true, - //"resolveJsonModule": true, + "resolveJsonModule": true, "lib": [ "es2019", "dom" From b2c5a9062e38b323a1b23004fb485d172e23c4d7 Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 9 Nov 2024 00:32:19 +0100 Subject: [PATCH 07/35] Display frontend version in settings --- src/app/settings/settings.component.html | 2 +- src/app/settings/settings.component.ts | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html index 2032ada..3dd65d4 100644 --- a/src/app/settings/settings.component.html +++ b/src/app/settings/settings.component.html @@ -108,7 +108,7 @@
  • Dave Storey: communication

    • Contact: phil.treetrail at philome.mooo.com

    -

    Version: {{conf.bootstrap?.client.version }}

    +

    Version: {{conf.bootstrap?.client.version }}, frontend: {{ version }}

    diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts index 498387d..44c1f14 100644 --- a/src/app/settings/settings.component.ts +++ b/src/app/settings/settings.component.ts @@ -3,6 +3,7 @@ import { Router } from '@angular/router' import { ActionService } from '../action.service' import { ConfigService, Config } from '../config.service' +import versionJson from '../../version.json' @Component({ selector: 'app-settings', @@ -17,6 +18,8 @@ export class SettingsComponent implements OnInit { public router: Router, ) { } + public version: string = versionJson.version + ngOnInit(): void { this.configService.conf.subscribe( conf => this.conf = conf From 8c272ab6ffe219a8c48fdba53725dac2eb710e11 Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 9 Nov 2024 02:32:42 +0100 Subject: [PATCH 08/35] CI: add app version --- .forgejo/workflows/build.yaml | 10 ++++++++-- build.yaml | 5 +++++ package.json | 3 ++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 75fffe2..c02c209 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -4,7 +4,7 @@ on: inputs: build: description: "Build container" - required: false + required: true default: false type: boolean @@ -50,6 +50,9 @@ jobs: - name: Install dependencies run: pnpm install + - name: Update version.json from git describe + run: pnpm run version + - name: Build package (transpile ts => js) run: ng build @@ -63,6 +66,8 @@ jobs: tags: ${{ steps.version.outputs.version }} containerfiles: | ./Containerfile + build-args: | + APP_VERSION=${{ steps.version.outputs.version }} - name: Workaround for bug of podman-login if: fromJSON(steps.builder.outputs.run) @@ -79,8 +84,9 @@ jobs: password: ${{ secrets.REGISTRY_PASSWORD }} auth_file_path: /tmp/auth.json - - uses: actions/push-to-registry@v2 + - name: Push the image to the registry if: fromJSON(steps.builder.outputs.run) + uses: actions/push-to-registry@v2 with: registry: "docker://${{ vars.REGISTRY }}" image: treetrail-frontend diff --git a/build.yaml b/build.yaml index 8b195eb..0bd92e0 100644 --- a/build.yaml +++ b/build.yaml @@ -23,6 +23,11 @@ args: chdir: "{{ playbook_dir }}" + - name: Update version.json + command: pnpm run version + args: + chdir: "{{ playbook_dir }}" + - name: Build frontend container containers.podman.podman_image: name: "treetrail-frontend:{{ version.stdout }}" diff --git a/package.json b/package.json index 6cac1dd..43ef986 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "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" }, "private": true, "dependencies": { From 4ed8fc7d557cd93290c76aef6c8355683d1fc019 Mon Sep 17 00:00:00 2001 From: phil Date: Thu, 5 Dec 2024 18:51:22 +0100 Subject: [PATCH 09/35] Update registry for CI --- .forgejo/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index c02c209..4ac6fc9 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -88,6 +88,6 @@ jobs: if: fromJSON(steps.builder.outputs.run) uses: actions/push-to-registry@v2 with: - registry: "docker://${{ vars.REGISTRY }}" + registry: "docker://${{ vars.REGISTRY }}/${{ vars.ORGANISATION }}" image: treetrail-frontend tags: ${{ steps.version.outputs.version }} From 1bf7ef7e28fca3863c52c1457d1bf03337ff945e Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 6 Dec 2024 05:30:05 +0100 Subject: [PATCH 10/35] Update .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 105c00f..ee6bec4 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ testem.log # System Files .DS_Store Thumbs.db + +.npmrc From 6949d96117259e0d4217299369057c1cae90d85f Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 6 Dec 2024 05:31:22 +0100 Subject: [PATCH 11/35] Add my registry to package.json --- package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 43ef986..8b6ab4f 100644 --- a/package.json +++ b/package.json @@ -62,5 +62,8 @@ "karma-jasmine-html-reporter": "^2.1.0", "typescript": "~5.4.5" }, - "packageManager": "pnpm@9.12.2" + "packageManager": "pnpm@9.12.2", + "publishConfig": { + "registry": "http://code.philo.ydns.eu/repository/npmjs" + } } From fd6e67b33262d9939cc2e702d2e735a11a9816ea Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 6 Dec 2024 05:33:34 +0100 Subject: [PATCH 12/35] Add my registry to package.json fix --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8b6ab4f..56fffca 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,6 @@ }, "packageManager": "pnpm@9.12.2", "publishConfig": { - "registry": "http://code.philo.ydns.eu/repository/npmjs" + "registry": "http://code.philo.ydns.eu/api/packages/philorg/npm/" } } From ed1a9242c98fb8ff1ed565e78f83c047b52b32ad Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 6 Dec 2024 05:34:44 +0100 Subject: [PATCH 13/35] Remove private in package.json --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 56fffca..8537246 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,6 @@ "openapi-ts": "openapi-ts", "version": "echo \"{\\\"version\\\":\\\"$(git describe --tags --dirty --always)\\\"}\" > src/version.json" }, - "private": true, "dependencies": { "@angular/animations": "^18.2.6", "@angular/cdk": "^18.2.6", From 6aaf93b0985daed7460c05ff034549ebb318c256 Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 6 Dec 2024 05:43:54 +0100 Subject: [PATCH 14/35] CI: set version dynamically --- .forgejo/workflows/build.yaml | 9 +++++++++ package.json | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 4ac6fc9..080e390 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -53,9 +53,18 @@ jobs: - name: Update version.json from git describe run: pnpm run version + - name: Set the version in package.json + env: + VERSION: ${{ steps.version.outputs.version }} + run: sed "s/0.0.0/${VERSION}/" -i package.json + - name: Build package (transpile ts => js) run: ng build + - name: Publish + if: fromJSON(steps.builder.outputs.run) + run: pnpm publish + - name: Build container if: fromJSON(steps.builder.outputs.run) uses: actions/buildah-build@v1 diff --git a/package.json b/package.json index 8537246..6b0a851 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "treetrail", - "version": "0.0.3", + "name": "treetrail-frontend", + "version": "0.0.0", "scripts": { "ng": "ng", "start": "ng serve --proxy-config proxy.conf.json --port 4201 --serve-path /treetrail", From db769c70aedf346d559770c40028f078167645e6 Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 6 Dec 2024 05:48:04 +0100 Subject: [PATCH 15/35] CI: set version dynamically fix --- .forgejo/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 080e390..6042df4 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -63,7 +63,7 @@ jobs: - name: Publish if: fromJSON(steps.builder.outputs.run) - run: pnpm publish + run: pnpm publish --no-git-checks - name: Build container if: fromJSON(steps.builder.outputs.run) From b726fb1daaba93f2c90fd93069f8ab8e506473f6 Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 6 Dec 2024 05:59:15 +0100 Subject: [PATCH 16/35] Cosmetic --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d692ad1..c7e08b7 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ -Front-end for *Tree Trail*, a fun and pedagogic tool to discover the trails and trees around. \ No newline at end of file +Front-end for *Tree Trail*, a fun and pedagogic tool to discover the trails and trees around. + From d72ea0da6f21528eb2461ac98a618f047e5cec40 Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 6 Dec 2024 06:15:06 +0100 Subject: [PATCH 17/35] CI: add token auth to NPM registry --- .forgejo/workflows/build.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 6042df4..2bbf384 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -61,6 +61,11 @@ jobs: - name: Build package (transpile ts => js) run: ng build + - name: Set registry token for pnpm" + env: + LOCAL_NPM_TOKEN: ${{ secrets.LOCAL_NPM_TOKEN }} + run: pnpm set "//code.philo.ydns.eu/api/packages/philorg/npm/:_authToken=${LOCAL_NPM_TOKEN}" + - name: Publish if: fromJSON(steps.builder.outputs.run) run: pnpm publish --no-git-checks From 63c980095e008d616b51df2a5b5ebf7a06ffaacf Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 6 Dec 2024 20:10:07 +0100 Subject: [PATCH 18/35] CI: publish container with tag latest along with the version --- .forgejo/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 2bbf384..36824de 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -104,4 +104,4 @@ jobs: with: registry: "docker://${{ vars.REGISTRY }}/${{ vars.ORGANISATION }}" image: treetrail-frontend - tags: ${{ steps.version.outputs.version }} + tags: latest ${{ steps.version.outputs.version }} From 1a061e3f201d47b6201424e9853997ad2720e08f Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 6 Dec 2024 20:16:00 +0100 Subject: [PATCH 19/35] CI: build container with version and latest tags --- .forgejo/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 36824de..bb1d291 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -77,7 +77,7 @@ jobs: image: treetrail-frontend oci: true labels: treetrail-frontend - tags: ${{ steps.version.outputs.version }} + tags: latest ${{ steps.version.outputs.version }} containerfiles: | ./Containerfile build-args: | From b2a3feb58c88e84023f7786a0705e6bacd426b3c Mon Sep 17 00:00:00 2001 From: phil Date: Sun, 8 Dec 2024 13:34:12 +0100 Subject: [PATCH 20/35] Update README --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index c7e08b7..4649578 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,5 @@ Front-end for *Tree Trail*, a fun and pedagogic tool to discover the trails and trees around. +Home page (source, bugs, etc): . + +The main documentation for Tree Trail is: . From 48ee87220887e2a517857e2d6c3c8083b42acc0e Mon Sep 17 00:00:00 2001 From: phil Date: Thu, 12 Dec 2024 14:45:35 +0100 Subject: [PATCH 21/35] Update README --- README.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4649578..ede9083 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,10 @@ -Front-end for *Tree Trail*, a fun and pedagogic tool to discover the trails and trees around. +# Treetrail web front-end -Home page (source, bugs, etc): . +Front-end for *Tree Trail*, a fun and pedagogic tool +to discover the trails and trees around. -The main documentation for Tree Trail is: . +Home page (source, bugs, etc): + . + +The main documentation for Tree Trail is: + . From af559b7faa332122d6f886fe5543ec83f492e3cb Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 00:44:42 +0200 Subject: [PATCH 22/35] Cleanup --- src/app/app.component.scss | 0 src/app/profile/profile.component.scss | 0 src/assets/.gitkeep | 0 src/assets/fonts/.gitignore | 0 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/app/app.component.scss delete mode 100644 src/app/profile/profile.component.scss delete mode 100644 src/assets/.gitkeep delete mode 100644 src/assets/fonts/.gitignore diff --git a/src/app/app.component.scss b/src/app/app.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/profile/profile.component.scss b/src/app/profile/profile.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/assets/.gitkeep b/src/assets/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/src/assets/fonts/.gitignore b/src/assets/fonts/.gitignore deleted file mode 100644 index e69de29..0000000 From cd5093899f2522896bc4499a417bcac70d872e25 Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 00:44:48 +0200 Subject: [PATCH 23/35] Cleanup --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6b0a851..c9be825 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "scripts": { "ng": "ng", - "start": "ng serve --proxy-config proxy.conf.json --port 4201 --serve-path /treetrail", + "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", From 4caf0cf44ff55ecd4210489f03871f5413d19e0f Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 00:47:43 +0200 Subject: [PATCH 24/35] CI: switch to Woodpecker --- .forgejo/workflows/build.yaml | 107 ---------------------------------- .woodpecker/build.yaml | 45 ++++++++++++++ package.json | 2 +- 3 files changed, 46 insertions(+), 108 deletions(-) delete mode 100644 .forgejo/workflows/build.yaml create mode 100644 .woodpecker/build.yaml diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml deleted file mode 100644 index bb1d291..0000000 --- a/.forgejo/workflows/build.yaml +++ /dev/null @@ -1,107 +0,0 @@ -on: - push: - workflow_dispatch: - inputs: - build: - description: "Build container" - required: true - default: false - type: boolean - -jobs: - build: - runs-on: container - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Get the version from git - id: version - run: echo "version=$(git describe --dirty --tags)" >> $GITHUB_OUTPUT - - - name: Check if the container should be built - id: builder - env: - RUN: ${{ toJSON(inputs.build || !contains(steps.version.outputs.version, '-')) }} - run: | - echo "run=$RUN" >> $GITHUB_OUTPUT - echo "Run build: $RUN" - - - name: Info - version and if the image container should be built - env: - VERSION: ${{ steps.version.outputs.version }} - RUN: ${{ steps.builder.outputs.run }} - FORCE: ${{ toJSON(inputs.build) }} - run: | - echo "Version $VERSION, force (manual input): $FORCE, run the build: $RUN" - - - uses: pnpm/action-setup@v4 - name: Install pnpm - with: - run_install: false - - - name: Install Node.js - uses: actions/setup-node@v4 - with: - node-version: 20 - cache: "pnpm" - - - name: Install dependencies - run: pnpm install - - - name: Update version.json from git describe - run: pnpm run version - - - name: Set the version in package.json - env: - VERSION: ${{ steps.version.outputs.version }} - run: sed "s/0.0.0/${VERSION}/" -i package.json - - - name: Build package (transpile ts => js) - run: ng build - - - name: Set registry token for pnpm" - env: - LOCAL_NPM_TOKEN: ${{ secrets.LOCAL_NPM_TOKEN }} - run: pnpm set "//code.philo.ydns.eu/api/packages/philorg/npm/:_authToken=${LOCAL_NPM_TOKEN}" - - - name: Publish - if: fromJSON(steps.builder.outputs.run) - run: pnpm publish --no-git-checks - - - name: Build container - if: fromJSON(steps.builder.outputs.run) - uses: actions/buildah-build@v1 - with: - image: treetrail-frontend - oci: true - labels: treetrail-frontend - tags: latest ${{ steps.version.outputs.version }} - containerfiles: | - ./Containerfile - build-args: | - APP_VERSION=${{ steps.version.outputs.version }} - - - name: Workaround for bug of podman-login - if: fromJSON(steps.builder.outputs.run) - run: | - mkdir -p $HOME/.docker - echo "{ \"auths\": {} }" > $HOME/.docker/config.json - - - name: Log in to container registry (with another workaround) - if: fromJSON(steps.builder.outputs.run) - uses: actions/podman-login@v1 - with: - registry: ${{ vars.REGISTRY }} - username: ${{ secrets.REGISTRY_USER }} - password: ${{ secrets.REGISTRY_PASSWORD }} - auth_file_path: /tmp/auth.json - - - name: Push the image to the registry - if: fromJSON(steps.builder.outputs.run) - uses: actions/push-to-registry@v2 - with: - registry: "docker://${{ vars.REGISTRY }}/${{ vars.ORGANISATION }}" - image: treetrail-frontend - tags: latest ${{ steps.version.outputs.version }} diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml new file mode 100644 index 0000000..bb78fa7 --- /dev/null +++ b/.woodpecker/build.yaml @@ -0,0 +1,45 @@ +when: + - event: manual + - event: tag + +#depends_on: + #- test + +steps: + npm: + image: code.philo.ydns.eu/philorg/pnpm + environment: + ORG: philorg + REGISTRY_TOKEN: + from_secret: registry_token + volumes: + - pnpm:/root/.local/share/pnpm + commands: + - pnpm install --frozen-lockfile + - pnpm set "//code.philo.ydns.eu/api/packages/$ORG/npm/:_authToken=$REGISTRY_TOKEN" + - pnpm publish --no-git-checks + failure: ignore + + build_publish: + image: quay.io/podman/stable:latest + # Caution: This image is built daily. It might fill up your image store quickly. + #pull: true + volumes: + - containers:/var/lib/containers + - pnpm:/root/.local/share/pnpm + # Fill in the trusted checkbox in Woodpecker's settings as well + privileged: true + environment: + registry: code.philo.ydns.eu + org: philorg + container_name: oidc-vue-test + registry_token: + from_secret: registry_token + commands: + # Login at the registry + - podman login -u __token__ --password $registry_token $registry + # Build the container image + - podman build --volume=/var/lib/containers:/var/lib/containers --tag $registry/$org/$container_name:latest --tag $registry/$org/$container_name:$CI_COMMIT_TAG . + # Push the image + - podman push $registry/$org/$container_name:latest + - podman push $registry/$org/$container_name:$CI_COMMIT_TAG diff --git a/package.json b/package.json index c9be825..471e24e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "treetrail-frontend", - "version": "0.0.0", + "version": "0.4.0", "scripts": { "ng": "ng", "start": "ng serve --proxy-config proxy.conf.json --port 4201 --serve-path /treetrail --host 0.0.0.0", From 00767ac20b6d1a7d1f185fff4c3cfa612f2a5b15 Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 00:47:59 +0200 Subject: [PATCH 25/35] 0.4.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index f3d7457..0569d68 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "treetrail", - "version": "0.0.3", + "version": "0.4.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "treetrail", - "version": "0.0.3", + "version": "0.4.1", "dependencies": { "@angular/animations": "^18.2.6", "@angular/cdk": "^18.2.6", diff --git a/package.json b/package.json index 471e24e..c5050b5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "treetrail-frontend", - "version": "0.4.0", + "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", From 3874e84a6ebbee213e4b1fbfeca27bd6ab542338 Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 00:49:54 +0200 Subject: [PATCH 26/35] Remove CI artifact for version --- package.json | 3 +-- src/version.json | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 src/version.json diff --git a/package.json b/package.json index c5050b5..529a564 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,7 @@ "build": "ng build", "watch": "ng build --watch --configuration development", "test": "ng test", - "openapi-ts": "openapi-ts", - "version": "echo \"{\\\"version\\\":\\\"$(git describe --tags --dirty --always)\\\"}\" > src/version.json" + "openapi-ts": "openapi-ts" }, "dependencies": { "@angular/animations": "^18.2.6", diff --git a/src/version.json b/src/version.json deleted file mode 100644 index c158d5b..0000000 --- a/src/version.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "version": "0.0.0" -} \ No newline at end of file From 780bf3b6c9d26d6d8daa5400c14f66f9c2e2aaf0 Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 00:50:07 +0200 Subject: [PATCH 27/35] 0.4.2 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0569d68..7da953c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "treetrail", - "version": "0.4.1", + "version": "0.4.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "treetrail", - "version": "0.4.1", + "version": "0.4.2", "dependencies": { "@angular/animations": "^18.2.6", "@angular/cdk": "^18.2.6", diff --git a/package.json b/package.json index 529a564..5eea59d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "treetrail-frontend", - "version": "0.4.1", + "version": "0.4.2", "scripts": { "ng": "ng", "start": "ng serve --proxy-config proxy.conf.json --port 4201 --serve-path /treetrail --host 0.0.0.0", From fd9dc302cbf117aadffb7849865c8185aa894eac Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 02:40:57 +0200 Subject: [PATCH 28/35] Get version from package.json --- src/app/about/about.component.ts | 4 ++-- src/app/app.component.ts | 9 +++++---- src/app/profile/profile.component.ts | 1 - src/app/settings/settings.component.ts | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app/about/about.component.ts b/src/app/about/about.component.ts index 3d293a4..26596b4 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 versionJson from '../../version.json' +import packageJson from '../../../package.json' @Component({ selector: 'app-about', @@ -13,7 +13,7 @@ export class AboutComponent implements OnInit { public configService: ConfigService, ) { } - public version: string = versionJson.version + public version: string = packageJson.version ngOnInit(): void { } diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 52a84ae..70dc380 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,5 +1,7 @@ -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' @@ -10,7 +12,6 @@ import { combineLatest } from 'rxjs' @Component({ selector: 'app-root', templateUrl: './app.component.html', - styleUrls: ['./app.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) export class AppComponent implements OnInit { @@ -20,7 +21,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 16fa22f..c5b8ea6 100644 --- a/src/app/profile/profile.component.ts +++ b/src/app/profile/profile.component.ts @@ -3,7 +3,6 @@ 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 44c1f14..9157906 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 versionJson from '../../version.json' +import packageJson from '../../../package.json' @Component({ selector: 'app-settings', @@ -18,7 +18,7 @@ export class SettingsComponent implements OnInit { public router: Router, ) { } - public version: string = versionJson.version + public version: string = packageJson.version ngOnInit(): void { this.configService.conf.subscribe( From 674fd71de9916d2ac24f2b9084fcff6fdcb57a0a Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 02:41:27 +0200 Subject: [PATCH 29/35] CI: use pnpm-python builder --- .woodpecker/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index bb78fa7..b5c087b 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -7,7 +7,7 @@ when: steps: npm: - image: code.philo.ydns.eu/philorg/pnpm + image: code.philo.ydns.eu/philorg/pnpm-python environment: ORG: philorg REGISTRY_TOKEN: From f5828ae1e6d26069ea70ce7621700e8522fc39d6 Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 02:41:52 +0200 Subject: [PATCH 30/35] 0.4.3 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7da953c..7c63733 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "treetrail", - "version": "0.4.2", + "version": "0.4.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "treetrail", - "version": "0.4.2", + "version": "0.4.3", "dependencies": { "@angular/animations": "^18.2.6", "@angular/cdk": "^18.2.6", diff --git a/package.json b/package.json index 5eea59d..cc72d00 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "treetrail-frontend", - "version": "0.4.2", + "version": "0.4.3", "scripts": { "ng": "ng", "start": "ng serve --proxy-config proxy.conf.json --port 4201 --serve-path /treetrail --host 0.0.0.0", From b6c4cd280a684b1db593f633f15a9978ab29a095 Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 02:47:04 +0200 Subject: [PATCH 31/35] CI: force pull builder --- .woodpecker/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index b5c087b..d2ce4a3 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -8,6 +8,7 @@ when: steps: npm: image: code.philo.ydns.eu/philorg/pnpm-python + pull: true environment: ORG: philorg REGISTRY_TOKEN: From 20bfd3116ef19f8f72a4e7d1fcd606c0642c2670 Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 02:47:14 +0200 Subject: [PATCH 32/35] 0.4.4 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7c63733..7115ee1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "treetrail", - "version": "0.4.3", + "version": "0.4.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "treetrail", - "version": "0.4.3", + "version": "0.4.4", "dependencies": { "@angular/animations": "^18.2.6", "@angular/cdk": "^18.2.6", diff --git a/package.json b/package.json index cc72d00..1c9d05c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "treetrail-frontend", - "version": "0.4.3", + "version": "0.4.4", "scripts": { "ng": "ng", "start": "ng serve --proxy-config proxy.conf.json --port 4201 --serve-path /treetrail --host 0.0.0.0", From 14363c721b1d8cb2ece9a53ac808ae36292577ea Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 03:19:46 +0200 Subject: [PATCH 33/35] CI: use debian based builder --- .woodpecker/build.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index d2ce4a3..f6a4c09 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -7,8 +7,7 @@ when: steps: npm: - image: code.philo.ydns.eu/philorg/pnpm-python - pull: true + image: code.philo.ydns.eu/philorg/pnpm-deb environment: ORG: philorg REGISTRY_TOKEN: @@ -33,7 +32,7 @@ steps: environment: registry: code.philo.ydns.eu org: philorg - container_name: oidc-vue-test + container_name: treetrail-frontend registry_token: from_secret: registry_token commands: From 034d9d4c3717ef28a2fda8cbb752c3d801e4c434 Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 03:19:56 +0200 Subject: [PATCH 34/35] 0.4.5 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7115ee1..91aa9a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "treetrail", - "version": "0.4.4", + "version": "0.4.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "treetrail", - "version": "0.4.4", + "version": "0.4.5", "dependencies": { "@angular/animations": "^18.2.6", "@angular/cdk": "^18.2.6", diff --git a/package.json b/package.json index 1c9d05c..b408455 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "treetrail-frontend", - "version": "0.4.4", + "version": "0.4.5", "scripts": { "ng": "ng", "start": "ng serve --proxy-config proxy.conf.json --port 4201 --serve-path /treetrail --host 0.0.0.0", From 5c22207f0a0726014693acd4390c5a610ced6cf8 Mon Sep 17 00:00:00 2001 From: phil Date: Sat, 28 Jun 2025 03:40:22 +0200 Subject: [PATCH 35/35] CI: build ts --- .woodpecker/build.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index f6a4c09..24c4254 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -20,6 +20,11 @@ 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.