From c2398aeee26df2e86e5a2d332cdf0492888fcacf Mon Sep 17 00:00:00 2001 From: grimsi <9295182+grimsi@users.noreply.github.com> Date: Wed, 24 Aug 2022 13:35:43 +0200 Subject: [PATCH 1/3] Gameyfin version is now displayed in footer --- frontend/package-lock.json | 4 ++-- frontend/package.json | 2 +- frontend/pom.xml | 11 +++++++++++ .../src/app/components/footer/footer.component.html | 2 +- .../src/app/components/footer/footer.component.ts | 2 ++ 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index a3cd74f..8a9abd3 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "frontend", - "version": "@project.version@", + "version": "1.2.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "frontend", - "version": "@project.version@", + "version": "1.2.0", "dependencies": { "@angular/animations": "^14.0.0", "@angular/cdk": "^14.1.0", diff --git a/frontend/package.json b/frontend/package.json index 1a5a3a5..1b99f1b 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "@project.version@", + "version": "1.2.0", "scripts": { "ng": "ng", "start": "ng serve", diff --git a/frontend/pom.xml b/frontend/pom.xml index b7da3fa..9fa85da 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -63,6 +63,17 @@ + + + npm version + + npm + + + version ${project.version} + + + npm run build diff --git a/frontend/src/app/components/footer/footer.component.html b/frontend/src/app/components/footer/footer.component.html index fd02256..03357b7 100644 --- a/frontend/src/app/components/footer/footer.component.html +++ b/frontend/src/app/components/footer/footer.component.html @@ -1 +1 @@ -

© {{date| date:'yyyy'}} grimsi | GitHub

+

© {{date| date:'yyyy'}} grimsi | Gameyfin v{{gameyfinVersion}} | GitHub

diff --git a/frontend/src/app/components/footer/footer.component.ts b/frontend/src/app/components/footer/footer.component.ts index abf206d..3dd698c 100644 --- a/frontend/src/app/components/footer/footer.component.ts +++ b/frontend/src/app/components/footer/footer.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import packageJson from 'package.json'; @Component({ selector: 'app-footer', @@ -8,6 +9,7 @@ import { Component, OnInit } from '@angular/core'; export class FooterComponent implements OnInit { githubUrl: string = "https://github.com/grimsi/gameyfin"; + gameyfinVersion: string = packageJson.version; date: Date = new Date(); constructor() { } From b8812d900d9f9d9ad1ae3306e59364b46b558d44 Mon Sep 17 00:00:00 2001 From: grimsi <9295182+grimsi@users.noreply.github.com> Date: Wed, 24 Aug 2022 13:41:30 +0200 Subject: [PATCH 2/3] Add "--allow-same-version" to npm version in build. Update version to 1.2.1 --- backend/pom.xml | 2 +- frontend/package-lock.json | 4 ++-- frontend/package.json | 2 +- frontend/pom.xml | 4 ++-- pom.xml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index 1fc2007..b975a11 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -7,7 +7,7 @@ gameyfin de.grimsi - 1.2.0 + 1.2.1 gameyfin-backend diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 8a9abd3..5d66472 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "frontend", - "version": "1.2.0", + "version": "1.2.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "frontend", - "version": "1.2.0", + "version": "1.2.1", "dependencies": { "@angular/animations": "^14.0.0", "@angular/cdk": "^14.1.0", diff --git a/frontend/package.json b/frontend/package.json index 1b99f1b..e6137b3 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "1.2.0", + "version": "1.2.1", "scripts": { "ng": "ng", "start": "ng serve", diff --git a/frontend/pom.xml b/frontend/pom.xml index 9fa85da..d3e8103 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -5,7 +5,7 @@ gameyfin de.grimsi - 1.2.0 + 1.2.1 4.0.0 @@ -70,7 +70,7 @@ npm - version ${project.version} + version ${project.version} --allow-same-version diff --git a/pom.xml b/pom.xml index e34baa5..b100e7d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ de.grimsi gameyfin - 1.2.0 + 1.2.1 gameyfin gameyfin From 9c5b46daf01d15755bb48817a4ed5c40cfaf1da6 Mon Sep 17 00:00:00 2001 From: grimsi <9295182+grimsi@users.noreply.github.com> Date: Mon, 29 Aug 2022 18:09:20 +0200 Subject: [PATCH 3/3] Added new docker-compose example file for multiple library folders Updated docker-compose example file environment variable names due to incompatibility --- ...ose.example-with-multiple-source-folders.yml | 17 +++++++++++++++++ docker/docker-compose.example.yml | 10 +++++----- 2 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 docker/docker-compose.example-with-multiple-source-folders.yml diff --git a/docker/docker-compose.example-with-multiple-source-folders.yml b/docker/docker-compose.example-with-multiple-source-folders.yml new file mode 100644 index 0000000..7c09334 --- /dev/null +++ b/docker/docker-compose.example-with-multiple-source-folders.yml @@ -0,0 +1,17 @@ +version: "3" +services: + gameyfin: + image: grimsi/gameyfin:latest + container_name: gameyfin + environment: + - GAMEYFIN_USER= + - GAMEYFIN_PASSWORD= + - GAMEYFIN_IGDB_API_CLIENT_ID= + - GAMEYFIN_IGDB_API_CLIENT_SECRET= + - GAMEYFIN_SOURCES=/opt/gameyfin-library/library-1,/opt/gameyfin-library/library-2,/opt/gameyfin-library/library-3 + volumes: + - :/opt/gameyfin-library/library-1 + - :/opt/gameyfin-library/library-2 + - :/opt/gameyfin-library/library-3 + ports: + - "8080:8080" diff --git a/docker/docker-compose.example.yml b/docker/docker-compose.example.yml index 265152c..dd9713b 100644 --- a/docker/docker-compose.example.yml +++ b/docker/docker-compose.example.yml @@ -4,11 +4,11 @@ services: image: grimsi/gameyfin:latest container_name: gameyfin environment: - - gameyfin.user= - - gameyfin.password= - - gameyfin.igdb.api.client-id= - - gameyfin.igdb.api.client-secret= + - GAMEYFIN_USER= + - GAMEYFIN_PASSWORD= + - GAMEYFIN_IGDB_API_CLIENT_ID= + - GAMEYFIN_IGDB_API_CLIENT_SECRET= volumes: - :/opt/gameyfin-library ports: - - "8080:8080" \ No newline at end of file + - "8080:8080"