Merge branch 'release/v0.7.6' into master

webern-unibas-ch · Oct 9, 2020 · 16adb2f · 16adb2f
2 parents daac122 + 07cea23
commit 16adb2f
Show file tree

Hide file tree

Showing 49 changed files with 1,322 additions and 807 deletions.
diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
@@ -4,10 +4,11 @@ on:
     push:
         branches:
             - '**'
+            - '!master' # do not run on master
         tags-ignore:
             - '*'
         paths-ignore:
-            - '**.md'
+            - '**.md' # ignore changes to markdown files
 
 jobs:
     test:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.7.6](https://github.com/webern-unibas-ch/awg-app/compare/v0.7.5...v0.7.6) (2020-10-09)
+
+### Features
+
+-   **shared:** add directive for external links ([6a56a04](https://github.com/webern-unibas-ch/awg-app/commit/6a56a04538bb7a015406b08994b3ea5df9b79848))
+
+### Bug Fixes
+
+-   **app:** move target blank from links to directive ([af4223f](https://github.com/webern-unibas-ch/awg-app/commit/af4223fba57ecdd08dbc8db34304896eef2533ab))
+-   **core:** move analytics config also into service ([6599fba](https://github.com/webern-unibas-ch/awg-app/commit/6599fba83af1af04cfac34796d70ecdf45b51ccd))
+-   **core:** move analytics handling into service ([a6faaf3](https://github.com/webern-unibas-ch/awg-app/commit/a6faaf3c61c6d8c1adcc9452b29d93c7113eb88d))
+-   **core:** move analytics id to app config ([57020b8](https://github.com/webern-unibas-ch/awg-app/commit/57020b894fa9c17cf54c07e462548b01305af55b))
+-   **shared:** fix errors with osm and external link directive ([769fc1a](https://github.com/webern-unibas-ch/awg-app/commit/769fc1a9d3140969ace45dd6a3461c7dc582639a))
+
 ### [0.7.5](https://github.com/webern-unibas-ch/awg-app/compare/v0.7.4...v0.7.5) (2020-08-28)
 
 ### Features

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "awg-app",
-    "version": "0.7.5",
+    "version": "0.7.6",
     "license": "MIT",
     "author": {
         "name": "Stefan Münnich",
@@ -33,9 +33,10 @@
         "lint": "ng lint awg-app",
         "lint-staged": "lint-staged",
         "tslint-check": "tslint-config-prettier-check ./tslint.json",
-        "format:check": "prettier --check \"src/**/*.ts\"",
-        "format:fix": "pretty-quick --staged",
-        "doc": "yarn compodoc --tsconfig tsconfig.base.json --theme Readthedocs --output dist/awg-app/compodoc --disableRoutesGraph",
+        "format:check": "prettier --check \"src/**/*.{ts,js,css,html}\"",
+        "format:write": "prettier --write \"src/**/*.{ts,js,css,html}\"",
+        "format:fix-staged": "pretty-quick --staged",
+        "doc": "yarn compodoc --tsconfig tsconfig.doc.json --theme Readthedocs --output dist/awg-app/compodoc --disableRoutesGraph",
         "serve:doc": "yarn doc --serve --watch",
         "build:doc": "yarn doc",
         "build": "ng build",
@@ -66,20 +67,20 @@
     },
     "husky": {
         "hooks": {
-            "pre-commit": "run-s -l format:fix lint-staged",
+            "pre-commit": "run-s -l format:fix-staged lint-staged",
             "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
         }
     },
     "prettier": {
+        "arrowParens": "avoid",
+        "bracketSpacing": true,
+        "jsxBracketSameLine": true,
         "printWidth": 120,
-        "tabWidth": 4,
-        "useTabs": false,
         "semi": true,
         "singleQuote": true,
+        "tabWidth": 4,
         "trailingComma": "none",
-        "bracketSpacing": true,
-        "jsxBracketSameLine": true,
-        "arrowParens": "avoid"
+        "useTabs": false
     },
     "dependencies": {
         "@angular/animations": "~10.0.4",
@@ -92,22 +93,22 @@
         "@angular/platform-browser-dynamic": "~10.0.4",
         "@angular/platform-server": "~10.0.4",
         "@angular/router": "~10.0.4",
-        "@ctrl/ngx-codemirror": "^4.0.0",
+        "@ctrl/ngx-codemirror": "^4.0.1",
         "@fortawesome/angular-fontawesome": "^0.7.0",
-        "@fortawesome/fontawesome-svg-core": "^1.2.30",
-        "@fortawesome/free-solid-svg-icons": "^5.14.0",
+        "@fortawesome/fontawesome-svg-core": "^1.2.32",
+        "@fortawesome/free-solid-svg-icons": "^5.15.1",
         "@kolkov/ngx-gallery": "^1.2.3",
         "@ng-bootstrap/ng-bootstrap": "^7.0.0",
         "bootstrap": "^4.5.2",
-        "codemirror": "^5.57.0",
+        "codemirror": "^5.58.1",
         "core-js": "^3.6.5",
-        "d3-drag": "^1.2.5",
+        "d3-drag": "^2.0.0",
         "d3-force": "^2.0.1",
         "d3-selection": "^1.4.2",
-        "d3-zoom": "^1.8.3",
+        "d3-zoom": "^2.0.0",
         "font-awesome": "^4.7.0",
         "json2typescript": "^1.4.1",
-        "n3": "^1.6.2",
+        "n3": "^1.6.3",
         "ngx-json-viewer": "^2.4.0",
         "rdfstore": "^0.9.17",
         "rxjs": "~6.5.5",
@@ -119,31 +120,31 @@
         "@angular-devkit/build-angular": "~0.1000.3",
         "@angular/cli": "~10.0.3",
         "@angular/compiler-cli": "~10.0.4",
-        "@commitlint/cli": "^9.1.2",
-        "@commitlint/config-angular": "^9.1.2",
+        "@commitlint/cli": "^11.0.0",
+        "@commitlint/config-angular": "^11.0.0",
         "@compodoc/compodoc": "^1.1.11",
-        "@types/d3": "^5.7.2",
+        "@types/d3": "^5.16.3",
         "@types/jasmine": "~3.5.0",
         "@types/jasminewd2": "~2.0.3",
-        "@types/node": "^14.6.1",
+        "@types/node": "^14.11.5",
         "angular-cli-ghpages": "^0.6.2",
         "codelyzer": "^6.0.0",
         "conventional-recommended-bump": "^6.0.10",
         "cross-var": "^1.1.0",
-        "gzipper": "^4.0.0",
-        "husky": "^4.2.5",
+        "gzipper": "^4.0.2",
+        "husky": "^4.3.0",
         "jasmine-core": "~3.5.0",
         "jasmine-spec-reporter": "~5.0.0",
         "karma": "~5.0.0",
         "karma-chrome-launcher": "~3.1.0",
         "karma-coverage-istanbul-reporter": "~3.0.2",
         "karma-jasmine": "~3.3.0",
         "karma-jasmine-html-reporter": "^1.5.0",
-        "lint-staged": "^10.2.13",
+        "lint-staged": "^10.4.0",
         "ng-lint-staged": "^0.1.6",
         "npm-run-all": "^4.1.5",
-        "prettier": "~2.1.1",
-        "pretty-quick": "^3.0.0",
+        "prettier": "~2.1.2",
+        "pretty-quick": "^3.0.2",
         "protractor": "~7.0.0",
         "source-map-explorer": "^2.5.0",
         "standard-version": "^9.0.0",

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { NavigationEnd, Router } from '@angular/router';
 
-import { RouterEventsService } from '@awg-core/services';
+import { AnalyticsService, RouterEventsService } from '@awg-core/services';
 
 /**
  * The main component of the AWG App.
@@ -20,15 +20,17 @@ export class AppComponent {
      * It declares private instances of the Angular router and the RouterEventsService.
      *
      * @param {Router} router Instance of the Angular router.
+     * @param {AnalyticsService} analyticsService Instance of the AnalyticsService.
      * @param {RouterEventsService} routerEventsService Instance of the RouterEventsService.
      */
-    constructor(private readonly router: Router, private routerEventsService: RouterEventsService) {
+    constructor(
+        private readonly router: Router,
+        private analyticsService: AnalyticsService,
+        private routerEventsService: RouterEventsService
+    ) {
         this.router.events.subscribe(event => {
             if (event instanceof NavigationEnd) {
-                //  catch GoogleAnalytics pageview events,
-                // cf. https://codeburst.io/using-google-analytics-with-angular-25c93bffaa18
-                (window as any).ga('set', 'page', event.urlAfterRedirects);
-                (window as any).ga('send', 'pageview');
+                this.analyticsService.trackPageView(event.urlAfterRedirects);
             }
         });
     }

diff --git a/src/app/app.config.ts b/src/app/app.config.ts
@@ -16,6 +16,26 @@ export class AppConfig {
         return root + api;
     }
 
+    /**
+     * Getter for the URL of the Analytics endpoint
+     * ({@link https://www.google-analytics.com/}).
+     *
+     * @returns {string}
+     */
+    public static get ANALYTICS_ENDPOINT(): string {
+        return 'https://www.google-analytics.com/';
+    }
+
+    /**
+     * Getter for the Analytics id
+     * ({@link 'UA-XXXXXXX-Y'}).
+     *
+     * @returns {string}
+     */
+    public static get ANALYTICS_ID(): string {
+        return 'UA-64657372-2';
+    }
+
     /**
      * Getter for the URL of the Inseri Test Instance
      * ({@link http://test-nieos.nie-ine.ch}).
@@ -115,7 +135,7 @@ export class AppConfig {
     }
 
     /**
-     * Getter for the unsanitized OSM emebed link.
+     * Getter for the unsanitized OSM embed link.
      *
      * @returns {string}
      */

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 Fri Aug 28 14:15:55 CEST 2020
+// Generated last time on Fri Oct  9 12:39:18 CEST 2020
 
 /**
  * The latest version of the AWG App
  */
-export const appVersion = '0.7.5';
+export const appVersion = '0.7.6';
 
 /**
  * The release date of the latest version of the AWG App
  */
-export const appVersionReleaseDate = '28. August 2020';
+export const appVersionReleaseDate = '09. Oktober 2020';
 
 /**
  * The URL of the AWG App

diff --git a/src/app/core/core-models/geo-names.model.ts b/src/app/core/core-models/geo-names.model.ts
@@ -73,24 +73,11 @@ export class GeoNames {
         const geoIcon =
             '<img src="assets/img/logos/geonames.png" height="25" width="25" alt="' + this.shortLabel + '" />';
         const geoLink =
-            '<a href="https://www.geonames.org/' +
-            this.gnid +
-            '" title="' +
-            this.longLabel +
-            '" target="_blank" rel="noopener noreferrer">' +
-            geoIcon +
-            '</a>';
+            '<a href="https://www.geonames.org/' + this.gnid + '" title="' + this.longLabel + '>' + geoIcon + '</a>';
         let wikiLink = '';
         if (this.wiki) {
             const wikiIcon = '<img src="assets/img/logos/wiki.svg" height="25" width="25" alt="' + this.wiki + '" />';
-            wikiLink =
-                '<a href="https://' +
-                this.wiki +
-                '" title="' +
-                this.wiki +
-                '" target="_blank" rel="noopener noreferrer">' +
-                wikiIcon +
-                '</a>';
+            wikiLink = '<a href="https://' + this.wiki + '" title="' + this.wiki + '>' + wikiIcon + '</a>';
         }
         this.html = this.shortLabel + ' ' + geoLink + wikiLink;
     }

diff --git a/src/app/core/footer/footer-declaration/footer-declaration.component.html b/src/app/core/footer/footer-declaration/footer-declaration.component.html
@@ -1,24 +1,14 @@
-<p class="awg-version-title">
-    Prototyp AWG-Online-Edition
-</p>
+<p class="awg-version-title">Prototyp AWG-Online-Edition</p>
 <p class="awg-version-desc">
-    <a
-        href="https://github.com/webern-unibas-ch/awg-app/blob/v{{ pageMetaData?.version }}/CHANGELOG.md"
-        target="_blank"
-        rel="noopener noreferrer"
-    >
+    <a href="https://github.com/webern-unibas-ch/awg-app/blob/v{{ pageMetaData?.version }}/CHANGELOG.md">
         Version <span id="awg-version">{{ pageMetaData?.version }}</span> &#9671;
         <span id="awg-version-date">{{ pageMetaData?.versionReleaseDate }}</span>
     </a>
 </p>
 <p id="awg-contact-link">
     <small>
-        <a id="awg-imp" [routerLink]="['/contact']" fragment="awg-imprint">
-            Impressum
-        </a>
+        <a id="awg-imp" [routerLink]="['/contact']" fragment="awg-imprint"> Impressum </a>
         |
-        <a id="awg-doc" [routerLink]="['/contact']" fragment="awg-documentation">
-            Dokumentation
-        </a>
+        <a id="awg-doc" [routerLink]="['/contact']" fragment="awg-documentation"> Dokumentation </a>
     </small>
 </p>
diff --git a/src/app/core/footer/footer-logo/footer-logo.component.html b/src/app/core/footer/footer-logo/footer-logo.component.html
@@ -1,3 +1,3 @@
-<a class="awg-logo-link" href="{{ logo.href }}" target="_blank" rel="noopener noreferrer">
+<a class="awg-logo-link" href="{{ logo.href }}">
     <img [ngClass]="getLogoClass(logo.id)" id="{{ logo.id }}" src="{{ logo.src }}" alt="{{ logo.alt }}" width="200" />
 </a>
diff --git a/src/app/core/navbar/navbar.component.html b/src/app/core/navbar/navbar.component.html
@@ -4,8 +4,6 @@
     <a
         class="navbar-brand col-3 col-md-4 col-xl-3 d-sm-none d-md-inline mr-0 my-auto"
         href="{{ pageMetaData?.awgProjectUrl }}"
-        target="_blank"
-        rel="noopener noreferrer"
     >
         <span class="webernlogo">
             ANTON WEBERN <br />
@@ -135,8 +133,6 @@ <h6 class="dropdown-header">Kritischer Bericht</h6>
         <a
             class="navbar-brand col-3 col-md-4 col-xl-3 d-sm-inline d-md-none mr-0 my-auto"
             href="{{ pageMetaData?.awgProjectUrl }}"
-            target="_blank"
-            rel="noopener noreferrer"
         >
             <span class="webernlogo">
                 ANTON WEBERN <br />