Merge branch 'release/v0.12.0'

webern-unibas-ch · Apr 23, 2024 · 7c7af7a · 7c7af7a
2 parents ed888f5 + fa12552
commit 7c7af7a
Show file tree

Hide file tree

Showing 141 changed files with 35,725 additions and 74,937 deletions.
diff --git a/.github/workflows/ci_optimize_svgs.yml b/.github/workflows/ci_optimize_svgs.yml
@@ -18,15 +18,15 @@ jobs:
         if: github.repository_owner == 'webern-unibas-ch'
         steps:
             - name: Checkout repository
-              uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # ratchet:actions/[email protected].1
+              uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # ratchet:actions/[email protected].3
             - name: Optimize SVGs
               uses: ericcornelissen/svgo-action@b8b3198fffbb1210e81aa68cde2ca4e4568d5386 # ratchet:ericcornelissen/[email protected]
               id: svgo
               with:
                   repo-token: ${{secrets.GITHUB_TOKEN}}
                   svgo-version: 3 # defaults to 2
             - name: Commit optimizations
-              uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d # ratchet:stefanzweifel/[email protected].0
+              uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # ratchet:stefanzweifel/[email protected].1
               if: ${{steps.svgo.outputs.DID_OPTIMIZE}}
               with:
                   commit_message: 'fix(assets): optimize ${{steps.svgo.outputs.OPTIMIZED_COUNT}} SVG(s) with SVGO'
diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml
@@ -26,7 +26,7 @@ jobs:
                 node-version: [18.19, 20.9] # TODO (when Angular allows it): 21.x
         steps:
             - name: Checkout repository
-              uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # ratchet:actions/[email protected].1
+              uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # ratchet:actions/[email protected].3
               with:
                   fetch-depth: 0 # Get all history and branches
             - name: Set up node ${{ matrix.node-version}}
@@ -42,7 +42,9 @@ jobs:
                   yarn run test:ci
             - name: Upload code coverage
               if: matrix.node-version == 20.9 # upload coverage report for current node version only
-              uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # ratchet:codecov/[email protected]
+              uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # ratchet:codecov/[email protected]
+              env:
+                  CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
               with:
                   flags: unittests
                   env_vars: ${{ matrix.os }}, ${{ matrix.node-version }}
@@ -68,7 +70,7 @@ jobs:
                 node-version: [20.9]
         steps:
             - name: Checkout repository
-              uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # ratchet:actions/[email protected].1
+              uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # ratchet:actions/[email protected].3
             - name: Set up node ${{ matrix.node-version}}
               uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # ratchet:actions/[email protected]
               with:
@@ -103,7 +105,7 @@ jobs:
             - name: Create Release
               id: create_release
               if: ${{ success() && startsWith(github.ref, 'refs/tags/') }}
-              uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # ratchet:softprops/action-gh-release@v0.1.15
+              uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564 # ratchet:softprops/action-gh-release@v2.0.4
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                   TAG_VERSION: ${{ steps.get_version.outputs.VERSION }}

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -23,7 +23,7 @@ jobs:
 
         steps:
             - name: Checkout repository
-              uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # ratchet:actions/checkout@v3
+              uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # ratchet:actions/checkout@v4.1.3
               with:
                   fetch-depth: 2
             # Initializes the CodeQL tools for scanning.

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "awg-app",
-    "version": "0.11.7",
+    "version": "0.12.0",
     "license": "MIT",
     "author": {
         "name": "Stefan Münnich",
@@ -82,20 +82,20 @@
         "deploy:ci": "ng deploy --no-build --message=\"Release $npm_package_name (v$npm_package_version) on gh-pages\""
     },
     "dependencies": {
-        "@angular/animations": "^17.2.4",
-        "@angular/common": "^17.2.4",
-        "@angular/compiler": "^17.2.4",
-        "@angular/core": "^17.2.4",
-        "@angular/forms": "^17.2.4",
-        "@angular/localize": "^17.2.4",
-        "@angular/platform-browser": "^17.2.4",
-        "@angular/platform-browser-dynamic": "^17.2.4",
-        "@angular/platform-server": "^17.2.4",
-        "@angular/router": "^17.2.4",
-        "@codemirror/legacy-modes": "^6.3.3",
+        "@angular/animations": "^17.3.5",
+        "@angular/common": "^17.3.5",
+        "@angular/compiler": "^17.3.5",
+        "@angular/core": "^17.3.5",
+        "@angular/forms": "^17.3.5",
+        "@angular/localize": "^17.3.5",
+        "@angular/platform-browser": "^17.3.5",
+        "@angular/platform-browser-dynamic": "^17.3.5",
+        "@angular/platform-server": "^17.3.5",
+        "@angular/router": "^17.3.5",
+        "@codemirror/legacy-modes": "^6.4.0",
         "@fortawesome/angular-fontawesome": "^0.14.1",
-        "@fortawesome/fontawesome-svg-core": "^6.5.1",
-        "@fortawesome/free-solid-svg-icons": "^6.5.1",
+        "@fortawesome/fontawesome-svg-core": "^6.5.2",
+        "@fortawesome/free-solid-svg-icons": "^6.5.2",
         "@kolkov/ngx-gallery": "2.0.1",
         "@ng-bootstrap/ng-bootstrap": "^16.0.0",
         "@popperjs/core": "^2.11.8",
@@ -108,39 +108,39 @@
         "d3-zoom": "^3.0.0",
         "font-awesome": "^4.7.0",
         "json2typescript": "^1.5.1",
-        "n3": "^1.17.2",
+        "n3": "^1.17.3",
         "ngx-json-viewer": "^3.2.1",
-        "rdfstore": "musicenfanthen/rdfstore-js#v0.9.18-alpha.14",
+        "rdfstore": "musicenfanthen/rdfstore-js#v0.9.18-alpha.15",
         "rxjs": "~7.8.1",
         "stream": "^0.0.2",
         "tslib": "^2.6.2",
         "zone.js": "~0.14.2"
     },
     "devDependencies": {
-        "@angular-devkit/build-angular": "^17.2.3",
-        "@angular-eslint/builder": "^17.2.1",
-        "@angular-eslint/eslint-plugin": "^17.2.1",
-        "@angular-eslint/eslint-plugin-template": "^17.2.1",
-        "@angular-eslint/schematics": "^17.2.1",
-        "@angular-eslint/template-parser": "^17.2.1",
-        "@angular/cli": "^17.2.3",
-        "@angular/compiler-cli": "^17.2.4",
-        "@commitlint/cli": "^19.0.3",
-        "@commitlint/config-angular": "^19.0.3",
+        "@angular-devkit/build-angular": "^17.3.5",
+        "@angular-eslint/builder": "^17.3.0",
+        "@angular-eslint/eslint-plugin": "^17.3.0",
+        "@angular-eslint/eslint-plugin-template": "^17.3.0",
+        "@angular-eslint/schematics": "^17.3.0",
+        "@angular-eslint/template-parser": "^17.3.0",
+        "@angular/cli": "^17.3.5",
+        "@angular/compiler-cli": "^17.3.5",
+        "@commitlint/cli": "^19.3.0",
+        "@commitlint/config-angular": "^19.3.0",
         "@compodoc/compodoc": "^1.1.23",
         "@types/d3": "^7.4.3",
         "@types/jasmine": "~5.1.4",
-        "@types/node": "^18.19.22",
-        "@typescript-eslint/eslint-plugin": "^7.1.1",
-        "@typescript-eslint/parser": "^7.1.1",
+        "@types/node": "^18.19.31",
+        "@typescript-eslint/eslint-plugin": "^7.7.1",
+        "@typescript-eslint/parser": "^7.7.1",
         "angular-cli-ghpages": "^1.0.7",
         "conventional-recommended-bump": "^9.0.0",
         "eslint": "^8.57.0",
         "eslint-config-prettier": "^9.1.0",
         "eslint-plugin-angular": "^4.1.0",
         "eslint-plugin-deprecation": "^2.0.0",
         "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-jsdoc": "^48.2.1",
+        "eslint-plugin-jsdoc": "^48.2.3",
         "eslint-plugin-prettier": "^5.1.3",
         "gzipper": "^7.2.0",
         "husky": "^9.0.11",
@@ -155,7 +155,7 @@
         "source-map-explorer": "^2.5.3",
         "standard-version": "^9.5.0",
         "typescript": "~5.2.2",
-        "webpack-bundle-analyzer": "^4.10.1"
+        "webpack-bundle-analyzer": "^4.10.2"
     },
     "engines": {
         "node": ">= 18.19.0",

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
+import { ExtraOptions, PreloadAllModules, RouterModule, Routes } from '@angular/router';
 
 import { HomeViewComponent } from '@awg-views/home-view/home-view.component';
 
@@ -53,6 +53,16 @@ const APP_ROUTES: Routes = [
     },
 ];
 
+/**
+ * Options for the app routes.
+ */
+const APP_ROUTER_OPTIONS: ExtraOptions = {
+    anchorScrolling: 'enabled',
+    onSameUrlNavigation: 'reload',
+    scrollPositionRestoration: 'enabled',
+    preloadingStrategy: PreloadAllModules,
+};
+
 /**
  * Routed components of the {@link AppModule}:
  * {@link HomeViewComponent}.
@@ -65,14 +75,7 @@ export const routedAppComponents = [HomeViewComponent];
  * It activates the APP_ROUTES, esp. lazy-loaded View Modules.
  */
 @NgModule({
-    imports: [
-        RouterModule.forRoot(APP_ROUTES, {
-            anchorScrolling: 'enabled',
-            onSameUrlNavigation: 'reload',
-            scrollPositionRestoration: 'enabled',
-            preloadingStrategy: PreloadAllModules,
-        }),
-    ],
+    imports: [RouterModule.forRoot(APP_ROUTES, APP_ROUTER_OPTIONS)],
     exports: [RouterModule],
 })
 export class AppRoutingModule {}
diff --git a/src/app/app.globals.ts b/src/app/app.globals.ts
@@ -1,15 +1,15 @@
 // THIS IS AN AUTO-GENERATED FILE. DO NOT CHANGE IT MANUALLY!
-// Generated last time on Thu, Mar  7, 2024  2:49:33 PM
+// Generated last time on Tue, Apr 23, 2024  3:51:46 PM
 
 /**
  * The latest version of the AWG App
  */
-export const appVersion = '0.11.7';
+export const appVersion = '0.12.0';
 
 /**
  * The release date of the latest version of the AWG App
  */
-export const appVersionReleaseDate = '07. März 2024';
+export const appVersionReleaseDate = '23. April 2024';
 
 /**
  * The URL of the AWG App

diff --git a/src/app/core/core-data/logos.data.ts b/src/app/core/core-data/logos.data.ts
@@ -14,6 +14,12 @@ export const LOGOSDATA: Logos = {
         alt: 'Logo Angular',
         href: 'https://angular.io',
     },
+    awg: {
+        id: 'awglogo',
+        src: 'assets/img/logos/awg.png',
+        alt: 'Logo AWG',
+        href: 'https://www.anton-webern.ch/',
+    },
     bootstrap: {
         id: 'bootstraplogo',
         src: 'assets/img/logos/ng-bootstrap.svg',

diff --git a/src/app/core/footer/footer.component.ts b/src/app/core/footer/footer.component.ts
@@ -19,18 +19,18 @@ import { CoreService } from '@awg-core/services';
 })
 export class FooterComponent implements OnInit {
     /**
-     * Public variable: pageMetaData.
+     * Public variable: logos.
      *
-     * It keeps the page metadata for the footer.
+     * It keeps the logos for the footer.
      */
-    pageMetaData: MetaPage;
+    logos: Logos;
 
     /**
-     * Public variable: logos.
+     * Public variable: pageMetaData.
      *
-     * It keeps the logos for the footer.
+     * It keeps the page metadata for the footer.
      */
-    logos: Logos;
+    pageMetaData: MetaPage;
 
     /**
      * Constructor of the FooterComponent.

diff --git a/src/app/core/navbar/navbar.component.html b/src/app/core/navbar/navbar.component.html
@@ -1,14 +1,11 @@
 <nav class="navbar navbar-expand-sm navbar-light awg-main-navbar ps-4 pe-2">
     <!-- Brand -->
-    <!-- length of 3 cols (4 on md), do not display on sm devices, no right margin, auto vertical align -->
-    <a
-        class="navbar-brand col-3 col-md-4 col-xl-3 d-sm-none d-md-inline me-0 my-auto"
-        href="{{ pageMetaData?.awgProjectUrl }}">
-        <span class="webernlogo">
-            ANTON WEBERN <br />
-            <span>GESAMTAUSGABE</span>
-        </span>
-    </a>
+    <!-- length of 3 cols (4 on md), do not display on xs and sm devices, no right margin, auto vertical align -->
+    <div class="navbar-brand-container col-3 col-md-4 col-xl-3 d-inline d-sm-none d-md-inline me-0 my-auto">
+        <a class="navbar-brand" [href]="logos?.['awg'].href">
+            <img [src]="logos?.['awg'].src" [alt]="logos?.['awg'].alt" height="auto" />
+        </a>
+    </div>
 
     <!-- Toggle button -->
     <button
@@ -45,7 +42,7 @@ <h6 class="dropdown-header">Allgemein</h6>
                         class="dropdown-item"
                         [routerLink]="[editionRouteConstants.EDITION.route, editionRouteConstants.SERIES.route]"
                         routerLinkActive="active"
-                        >Editionsübersicht</a
+                        >{{ editionRouteConstants.SERIES.full }}</a
                     >
                     <a
                         class="dropdown-item"
@@ -96,15 +93,12 @@ <h6 class="dropdown-header">
             </li>
         </ul>
         <!-- END left navbar -->
-        <!-- brand to display on center on sm devices, auto vertical align -->
-        <a
-            class="navbar-brand col-3 col-md-4 col-xl-3 d-sm-inline d-md-none me-0 my-auto"
-            href="{{ pageMetaData?.awgProjectUrl }}">
-            <span class="webernlogo">
-                ANTON WEBERN <br />
-                <span>GESAMTAUSGABE</span>
-            </span>
-        </a>
+        <!-- brand to display on center on sm devices, auto align -->
+        <div class="navbar-brand-container col-3 d-none d-sm-inline d-md-none ms-5 me-auto my-auto">
+            <a class="navbar-brand" [href]="logos?.['awg'].href">
+                <img [src]="logos?.['awg'].src" height="auto" [alt]="logos?.['awg'].alt" />
+            </a>
+        </div>
 
         <!-- right nav links, auto vertical align -->
         <ul class="navbar-nav my-auto">