Merge branch 'release/v0.7.0'

webern-unibas-ch · Feb 5, 2020 · 153143c · 153143c
2 parents fdd7843 + a10c29a
commit 153143c
Show file tree

Hide file tree

Showing 217 changed files with 6,865 additions and 2,618 deletions.
diff --git a/.dependabot/config.yml b/.dependabot/config.yml
@@ -0,0 +1,6 @@
+version: 1
+update_configs:
+    - package_manager: 'javascript'
+      directory: '/'
+      update_schedule: 'live'
+      target_branch: 'develop'
diff --git a/.gitignore b/.gitignore
@@ -12,8 +12,8 @@
 /bower_components
 
 # profiling files
-chrome-profiler-events.json
-speed-measure-plugin.json
+chrome-profiler-events*.json
+speed-measure-plugin*.json
 
 # IDEs and editors
 /.idea

diff --git a/.travis.yml b/.travis.yml
@@ -6,11 +6,7 @@ node_js:
     - '10'
 
 addons:
-    apt:
-        sources:
-            - google-chrome
-        packages:
-            - google-chrome-stable
+    chrome: stable
 
 cache:
     directories:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,49 @@
 
 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.0](https://github.com/webern-unibas-ch/awg-app/compare/v0.6.1...v0.7.0) (2020-02-05)
+
+### ⚠ BREAKING CHANGES
+
+-   **edition:** This change affects the url of the edition sheet view.
+    Sketch id's are now provided via query params instead of "normal" route params.
+
+### Features
+
+-   **core:** write the GND value of a resource to the localStorage ([29234f5](https://github.com/webern-unibas-ch/awg-app/commit/29234f5ae995a5699613c93b5e2c475f6579cde3))
+-   **edition:** add edition constants ([74f7156](https://github.com/webern-unibas-ch/awg-app/commit/74f715678ace35442ac7d92adaff3c40b4e802d5))
+-   **edition:** add graph component with static graphs ([f7cf641](https://github.com/webern-unibas-ch/awg-app/commit/f7cf641e7cb9ca9c7fead047118dd8f2d2597048))
+-   **edition:** add svg assets for op25 ([aac1f2f](https://github.com/webern-unibas-ch/awg-app/commit/aac1f2f7978bb899c41f7e73ddb92be177387357))
+-   **edition:** add SvgSheetList to handle SvgSheet array ([f9a1c53](https://github.com/webern-unibas-ch/awg-app/commit/f9a1c53ec1473f1a91b09fdc3b04d6b8a74d543e))
+-   **edition:** auto-instantiate EditionPath from class ([c7403dc](https://github.com/webern-unibas-ch/awg-app/commit/c7403dca7e200b70e75f2c8cc5c690ed510ccc2c))
+-   **edition:** get EditionReportData for multiple works ([782d0b3](https://github.com/webern-unibas-ch/awg-app/commit/782d0b34f84acb76590fb1b78a95aece418f71ca))
+-   **edition:** make convolute view handle multiple convolutes ([81e8fef](https://github.com/webern-unibas-ch/awg-app/commit/81e8fef2a8143422fcdec9cf3c27615ebf6e40a0))
+-   **edition:** make EditionIntro handle multiple works ([f0d3215](https://github.com/webern-unibas-ch/awg-app/commit/f0d32159f806d4b712e4aadeb77d320864053421))
+-   **edition:** make routes working with multiple compositions ([c37be2a](https://github.com/webern-unibas-ch/awg-app/commit/c37be2ad394758ff4f6904a4b02dcba33080e55d))
+-   **edition:** make source description work with multiple compositions ([d31b29d](https://github.com/webern-unibas-ch/awg-app/commit/d31b29df98a54400a18f22569b8fd9dbc7212467))
+-   **edition:** make source evaluation work with multiple compositions ([2743b42](https://github.com/webern-unibas-ch/awg-app/commit/2743b426438be49d390e28a1cdea93852e1e325e))
+-   **edition:** make textcritics work with multiple compositions ([a03430d](https://github.com/webern-unibas-ch/awg-app/commit/a03430da0ee2d052100405ce423beb1325d977b5))
+-   **edition:** move edition assets into structured folders ([afe526b](https://github.com/webern-unibas-ch/awg-app/commit/afe526bc84e0aa4034810415e6fef6ccc19dc17a))
+-   **edition:** prepare EditionView to handle multiple EditionWorks ([c26d355](https://github.com/webern-unibas-ch/awg-app/commit/c26d355bdb9c7401b503e1f33c9c0d135d0b3da6))
+-   **edition:** use queryParams instead of urlParams for sketch routing ([af9ef35](https://github.com/webern-unibas-ch/awg-app/commit/af9ef357c0bfedd3111b3172657b35e70b672053))
+
+### Bug Fixes
+
+-   **app:** move op12 assets into separate folder ([7036d30](https://github.com/webern-unibas-ch/awg-app/commit/7036d301e10c4c8e384d70bb58750fdd9882c0cd))
+-   **app:** use EditionConstants for routerLinks ([7824cd8](https://github.com/webern-unibas-ch/awg-app/commit/7824cd8cda686dd75f9fbc4f747e2b9dc24a3e40))
+-   **core:** improve handling for gnd recognition ([c2fdbd8](https://github.com/webern-unibas-ch/awg-app/commit/c2fdbd86ec3c07aa0dd0edd18ee874430122a916))
+-   **edition:** avoid circular dependency in EditionPath imports ([15ee461](https://github.com/webern-unibas-ch/awg-app/commit/15ee461137e89225f506b09742b539f3350aedf7))
+-   **edition:** get firmSigns dynamically ([3415f84](https://github.com/webern-unibas-ch/awg-app/commit/3415f8447b7fbb7044a2f34baea79ac4b8193c34))
+-   **edition:** improve handling of textcritical comments flow ([de94dbe](https://github.com/webern-unibas-ch/awg-app/commit/de94dbe367c6279f0535d0edbc07904f809dc66c))
+-   **edition:** make modals work with multiple works ([5c84f76](https://github.com/webern-unibas-ch/awg-app/commit/5c84f76bee00eac87dabcf0a6bf9ba3d4989cd2c))
+-   **edition:** move back to root and link for routerLinks ([8f1c476](https://github.com/webern-unibas-ch/awg-app/commit/8f1c4764cb549eb84acc198b7372ca08404d254c))
+-   **edition:** move edition assets path to edition constants ([e906b6d](https://github.com/webern-unibas-ch/awg-app/commit/e906b6d620edb4a39e915e8f165f44bbca07d1bf))
+-   **edition:** remove hard-coded EditionWork from navigation ([8ed8f47](https://github.com/webern-unibas-ch/awg-app/commit/8ed8f476caea6d4f0ba656e86c3ec16a4747b054))
+-   **edition:** use EditionRoutes for EditionWork class ([c6e0da7](https://github.com/webern-unibas-ch/awg-app/commit/c6e0da71a08aab14ff41a99fa914d5a24313f40e))
+-   **search:** repair nav arrows for imageobject component ([78e0f73](https://github.com/webern-unibas-ch/awg-app/commit/78e0f730e573311bad52fe4fc4867b8e4bfdc246))
+-   **shared:** make queryParamsHandling for routerLinkButton configurable ([233e1d8](https://github.com/webern-unibas-ch/awg-app/commit/233e1d831e1aed39a744832f78f6efded612dda7))
+-   **shared:** name routerLinkButtons consistently ([fba09ab](https://github.com/webern-unibas-ch/awg-app/commit/fba09abbccb1170118056e8e4a863f4415560a9d))
+
 ### [0.6.1](https://github.com/webern-unibas-ch/awg-app/compare/v0.6.0...v0.6.1) (2019-07-19)
 
 ### Build System

diff --git a/angular.json b/angular.json
@@ -21,8 +21,9 @@
                         "assets": ["src/favicon.ico", "src/assets"],
                         "aot": false,
                         "styles": [
-                            "node_modules/bootstrap/dist/css/bootstrap.min.css",
                             "src/index.style.css",
+                            "node_modules/bootstrap/dist/css/bootstrap.min.css",
+                            "node_modules/font-awesome/scss/font-awesome.scss",
                             "src/styles.css"
                         ],
                         "scripts": [
@@ -53,6 +54,11 @@
                                     "type": "initial",
                                     "maximumWarning": "2mb",
                                     "maximumError": "5mb"
+                                },
+                                {
+                                    "type": "anyComponentStyle",
+                                    "maximumWarning": "6kb",
+                                    "maximumError": "10kb"
                                 }
                             ]
                         }
@@ -86,6 +92,7 @@
                         "styles": [
                             "src/index.style.css",
                             "node_modules/bootstrap/dist/css/bootstrap.min.css",
+                            "node_modules/font-awesome/scss/font-awesome.scss",
                             "src/styles.css"
                         ],
                         "scripts": [

diff --git a/commitlint.config.js b/commitlint.config.js
@@ -8,6 +8,7 @@ module.exports = {
             'always',
             [
                 'app',
+                'deps',
                 'core',
                 'shared',
                 'side-info',

diff --git a/e2e/src/app.e2e-spec.ts b/e2e/src/app.e2e-spec.ts
@@ -10,7 +10,7 @@ describe('awg-app', () => {
 
     it('should display welcome message', () => {
         page.navigateTo();
-        expect(page.getTitleText()).toEqual('Welcome to awg-app!');
+        expect(page.getTitleText()).toEqual('awg-app is running!');
     });
 
     afterEach(async () => {

diff --git a/karma.conf.js b/karma.conf.js
@@ -30,24 +30,19 @@ module.exports = function(config) {
             fixWebpackSourcePaths: true
         },
         reporters: ['progress', 'kjhtml'],
+        customLaunchers: {
+            // cf. https://medium.com/faun/configuring-travis-ci-for-angular-application-34afee1715f
+            ChromeHeadlessNoSandbox: {
+                base: 'ChromeHeadless',
+                flags: ['--no-sandbox']
+            }
+        },
         port: 9876,
         colors: true,
         logLevel: config.LOG_INFO,
         autoWatch: true,
         browsers: ['Chrome'],
         singleRun: false,
-        restartOnFileChange: true,
-        customLaunchers: {
-            ChromeHeadless: {
-                base: 'Chrome',
-                flags: [
-                    // See https://chromium.googlesource.com/chromium/src/+/lkgr/headless/README.md
-                    '--headless',
-                    '--disable-gpu',
-                    // Without a remote debugging port, Google Chrome exits immediately.
-                    '--remote-debugging-port=9222'
-                ]
-            }
-        }
+        restartOnFileChange: true
     });
 };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "awg-app",
-    "version": "0.6.1",
+    "version": "0.7.0",
     "license": "MIT",
     "author": {
         "name": "Stefan Münnich",
@@ -28,7 +28,7 @@
         "e2e": "ng e2e",
         "test": "ng test",
         "test:cov": "ng test awg-app --code-coverage",
-        "test:ci": "yarn test:cov --watch=false --browsers=ChromeHeadless",
+        "test:ci": "yarn test:cov --watch=false --browsers=ChromeHeadlessNoSandbox",
         "lint": "ng lint awg-app",
         "tslint-check": "tslint-config-prettier-check ./tslint.json",
         "format:check": "prettier --check \"src/**/*.ts\"",
@@ -41,7 +41,7 @@
         "build:gh": "cross-var yarn build:prod --base-href $npm_package_homepage",
         "gzip:dist": "gzipper ./dist",
         "prewpanalyzer": "yarn build:prod --statsJson",
-        "wpanalyzer": "webpack-bundle-analyzer dist/stats.json",
+        "wpanalyzer": "webpack-bundle-analyzer dist/stats-es2015.json",
         "presourcemap": "yarn build:prod --sourceMap",
         "sourcemap": "source-map-explorer dist/*.js",
         "build:css": "./themes/bin/build-css",
@@ -81,65 +81,66 @@
         "arrowParens": "avoid"
     },
     "dependencies": {
-        "@angular/animations": "^8.0.3",
-        "@angular/common": "^8.0.3",
-        "@angular/compiler": "^8.0.3",
-        "@angular/core": "^8.0.3",
-        "@angular/forms": "^8.0.3",
-        "@angular/platform-browser": "^8.0.3",
-        "@angular/platform-browser-dynamic": "^8.0.3",
-        "@angular/platform-server": "^8.0.3",
-        "@angular/router": "^8.0.3",
-        "@fortawesome/angular-fontawesome": "^0.4.0",
-        "@fortawesome/fontawesome-svg-core": "^1.2.19",
-        "@fortawesome/free-solid-svg-icons": "^5.9.0",
-        "@ng-bootstrap/ng-bootstrap": "^4.2.1",
-        "bootstrap": "^4.3.1",
+        "@angular/animations": "~8.2.14",
+        "@angular/common": "~8.2.14",
+        "@angular/compiler": "~8.2.14",
+        "@angular/core": "~8.2.14",
+        "@angular/forms": "~8.2.14",
+        "@angular/platform-browser": "~8.2.14",
+        "@angular/platform-browser-dynamic": "~8.2.14",
+        "@angular/platform-server": "~8.2.14",
+        "@angular/router": "~8.2.14",
+        "@fortawesome/angular-fontawesome": "^0.5.0",
+        "@fortawesome/fontawesome-svg-core": "^1.2.26",
+        "@fortawesome/free-solid-svg-icons": "^5.12.0",
+        "@kolkov/ngx-gallery": "^1.0.9",
+        "@ng-bootstrap/ng-bootstrap": "^5.1.5",
+        "bootstrap": "^4.4.1",
+        "font-awesome": "^4.7.0",
         "json2typescript": "^1.2.3",
-        "ngx-gallery": "git://github.com/musicEnfanthen/ngx-gallery-dist-patch",
         "ngx-json-viewer": "^2.4.0",
-        "rxjs": "~6.5.2",
+        "rxjs": "~6.5.4",
         "snapsvg": "^0.5.1",
-        "tslib": "^1.9.0",
+        "tslib": "^1.10.0",
         "zone.js": "~0.9.1"
     },
     "devDependencies": {
-        "@angular-devkit/build-angular": "~0.800.6",
-        "@angular/cli": "~8.0.6",
-        "@angular/compiler-cli": "^8.0.3",
-        "@angular/language-service": "^8.0.3",
-        "@commitlint/cli": "^8.0.0",
-        "@commitlint/config-angular": "^8.0.0",
-        "@compodoc/compodoc": "^1.1.9",
+        "@angular-devkit/build-angular": "~0.803.21",
+        "@angular/cli": "~8.3.21",
+        "@angular/compiler-cli": "~8.2.14",
+        "@angular/language-service": "~8.2.14",
+        "@commitlint/cli": "^8.3.4",
+        "@commitlint/config-angular": "^8.3.4",
+        "@compodoc/compodoc": "^1.1.11",
         "@types/jasmine": "~3.3.8",
         "@types/jasminewd2": "~2.0.3",
         "@types/node": "~8.9.4",
-        "angular-cli-ghpages": "^0.5.3",
-        "codelyzer": "^5.0.0",
-        "conventional-recommended-bump": "^5.0.0",
+        "angular-cli-ghpages": "^0.6.2",
+        "codelyzer": "^5.2.1",
+        "conventional-recommended-bump": "^6.0.5",
         "cross-var": "^1.1.0",
-        "gzipper": "^2.8.0",
-        "husky": "^2.4.1",
+        "gzipper": "^3.4.2",
+        "husky": "^4.0.0",
         "jasmine-core": "~3.4.0",
         "jasmine-spec-reporter": "~4.2.1",
         "karma": "~4.1.0",
         "karma-chrome-launcher": "~2.2.0",
         "karma-coverage-istanbul-reporter": "~2.0.1",
         "karma-jasmine": "~2.0.1",
         "karma-jasmine-html-reporter": "^1.4.0",
-        "node-sass": "^4.12.0",
-        "nodemon": "^1.19.1",
+        "node-sass": "^4.13.0",
+        "nodemon": "^2.0.2",
         "npm-run-all": "^4.1.5",
-        "prettier": "1.18.2",
-        "pretty-quick": "^1.11.1",
+        "prettier": "~1.19.1",
+        "pretty-quick": "^2.0.1",
         "protractor": "~5.4.0",
-        "source-map-explorer": "^2.0.1",
-        "standard-version": "^6.0.1",
+        "source-map-explorer": "^2.2.1",
+        "standard-version": "^7.0.1",
         "ts-node": "~7.0.0",
         "tslint": "~5.15.0",
         "tslint-config-prettier": "^1.18.0",
-        "typescript": "~3.4.5",
-        "webpack-bundle-analyzer": "^3.3.2"
+        "typescript": "~3.5.3",
+        "webpack-bundle-analyzer": "^3.6.0"
     },
     "engines": {
         "node": ">= 8.9.0",

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -1,36 +1,35 @@
 import { NgModule } from '@angular/core';
 import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
 
-import { HomeViewComponent } from './views/home-view/home-view.component';
-import { PageNotFoundViewComponent } from './views/page-not-found-view/page-not-found-view.component';
-
 /* routes of the AppModule */
 const appRoutes: Routes = [
-    // eager loaded
-    { path: 'home', component: HomeViewComponent },
-
     // lazy loaded
-    { path: 'contact', loadChildren: () => import('./views/contact-view/contact.module').then(m => m.ContactModule) },
-    { path: 'data', loadChildren: () => import('./views/data-view/data.module').then(m => m.DataModule) },
-    { path: 'edition', loadChildren: () => import('./views/edition-view/edition.module').then(m => m.EditionModule) },
+    { path: 'home', loadChildren: () => import('@awg-views/home-view/home-view.module').then(m => m.HomeViewModule) },
+    {
+        path: 'contact',
+        loadChildren: () => import('@awg-views/contact-view/contact-view.module').then(m => m.ContactViewModule)
+    },
+    { path: 'data', loadChildren: () => import('@awg-views/data-view/data-view.module').then(m => m.DataViewModule) },
+    {
+        path: 'edition',
+        loadChildren: () => import('@awg-views/edition-view/edition-view.module').then(m => m.EditionViewModule)
+    },
     { path: 'editions', redirectTo: 'edition', pathMatch: 'full' },
     {
         path: 'structure',
-        loadChildren: () => import('./views/structure-view/structure.module').then(m => m.StructureModule)
+        loadChildren: () => import('@awg-views/structure-view/structure-view.module').then(m => m.StructureViewModule)
     },
 
     // default routes
     { path: '', redirectTo: 'home', pathMatch: 'full' },
-    { path: '404', component: PageNotFoundViewComponent },
+    {
+        path: '404',
+        loadChildren: () =>
+            import('@awg-views/page-not-found-view/page-not-found-view.module').then(m => m.PageNotFoundViewModule)
+    },
     { path: '**', redirectTo: '404', pathMatch: 'full' }
 ];
 
-/**
- * Routed components of the {@link AppModule}:
- * {@link HomeViewComponent} and {@link PageNotFoundViewComponent}.
- */
-export const routedAppComponents = [HomeViewComponent, PageNotFoundViewComponent];
-
 /**
  * Main app module routing.
  *
@@ -40,10 +39,10 @@ export const routedAppComponents = [HomeViewComponent, PageNotFoundViewComponent
     imports: [
         RouterModule.forRoot(appRoutes, {
             anchorScrolling: 'enabled', // use anchor scrolling
-            scrollPositionRestoration: 'enabled', // restore scroll position
             onSameUrlNavigation: 'reload', // reload when navigating to same url
+            scrollPositionRestoration: 'enabled', // restore scroll position
             preloadingStrategy: PreloadAllModules // preload all lazy modules
-            // enableTracing: true          // TODO: do not enable tracing for prodcution
+            // enableTracing: true          // TODO: do not enable tracing for production
         })
     ],
     exports: [RouterModule]

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -20,7 +20,7 @@ export class AppComponent {
      *
      * @param {Router} router Instance of the Angular router.
      */
-    constructor(private router: Router) {
+    constructor(private readonly router: Router) {
         this.router.events.subscribe(event => {
             if (event instanceof NavigationEnd) {
                 (window as any).ga('set', 'page', event.urlAfterRedirects);

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 Jul 19 15:15:56 CEST 2019
+// Generated last time on Wed Feb  5 14:49:11 CET 2020
 
 /**
  * The latest version of the AWG App
  */
-export const appVersion = '0.6.1';
+export const appVersion = '0.7.0';
 
 /**
  * The release date of the latest version of the AWG App
  */
-export const appVersionReleaseDate = '19. Juli 2019';
+export const appVersionReleaseDate = '05. Februar 2020';
 
 /**
  * The URL of the AWG App
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ module.exports = { @@
                 'always',
                 [
                     'app',
+                    'deps',
                     'core',
                     'shared',
                     'side-info',
@@ Expand Down @@