Skip to content

Commit

Permalink
Merge branch 'release/v0.7.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
musicEnfanthen committed Apr 9, 2020
2 parents 765b97b + e920d82 commit e59c258
Show file tree
Hide file tree
Showing 99 changed files with 1,822 additions and 934 deletions.
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,29 @@

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.3](https://github.com/webern-unibas-ch/awg-app/compare/v0.7.2...v0.7.3) (2020-04-09)

### Bug Fixes

- **app:** move editor info from home to edition view ([f0434cc](https://github.com/webern-unibas-ch/awg-app/commit/f0434cce4962f5ff7c06e8bfe1033e4b2c91c69a))
- **app:** use rel attribute for target links instead of wrong ref attr ([04578ee](https://github.com/webern-unibas-ch/awg-app/commit/04578ee1bfa811613beb72bf0faa2084bbd88a2c))
- **core:** add sagw logo to footer ([b41d013](https://github.com/webern-unibas-ch/awg-app/commit/b41d013deec3e30fca6ae03e1398676199b48a82))
- **core:** remove MetaEdition from MetaModel ([010d02f](https://github.com/webern-unibas-ch/awg-app/commit/010d02f07173d93a152ec9fe0f48c81da4baa5fe))
- **edition:** add dropdown for sample queries in graph view ([c995ada](https://github.com/webern-unibas-ch/awg-app/commit/c995ada1d10101b2e8fb3f0930b798f7b309d220))
- **edition:** add modal hint on how to use graph ([626d024](https://github.com/webern-unibas-ch/awg-app/commit/626d0240f7e75ba9a6ad1d44ded459217ff8d579))
- **edition:** add resp statement to work model ([d9eefae](https://github.com/webern-unibas-ch/awg-app/commit/d9eefae9f4f5ae15f55ce687d749cdf481b20941))
- **edition:** do not remove all svg when redrawing force graph ([e6cfdac](https://github.com/webern-unibas-ch/awg-app/commit/e6cfdac716aadb11211834be0d6be8bb9266910d))
- **edition:** improve general remarks for graph view ([b1b1c24](https://github.com/webern-unibas-ch/awg-app/commit/b1b1c2499080728b5f0ca144a512331094187a87))
- **edition:** improve handling of triples dropdown button in force-graph ([c41925b](https://github.com/webern-unibas-ch/awg-app/commit/c41925b796815a1670fbc415bfb96541e89f30cc))
- **edition:** improve query reset in graph view ([09e309c](https://github.com/webern-unibas-ch/awg-app/commit/09e309ca8dcfa0e6290e32cdbb1535a965d725dc))
- **edition:** refactor EditionWork to provide all needed info ([0319790](https://github.com/webern-unibas-ch/awg-app/commit/03197908d689c59a0235a1a9616b362edf6eeeff))
- **edition:** remove unused EditionDetailNotification ([4e1f151](https://github.com/webern-unibas-ch/awg-app/commit/4e1f15100fa6de68346c991d284825edf0318315))
- **edition:** shorten short forms of some EditionConstants ([61a297d](https://github.com/webern-unibas-ch/awg-app/commit/61a297d8c5af924dc69ef096b67015143970982d))
- **edition:** use full EditionRoute for EditionWork routes ([2c98f5d](https://github.com/webern-unibas-ch/awg-app/commit/2c98f5d39b28a4cf961cc9812dd8e160eeb054aa))
- **edition:** use modal for edition detail hint & improve hint message ([0383470](https://github.com/webern-unibas-ch/awg-app/commit/0383470e67715b76898562329f3f90b1b34d1707))
- **edition:** use queryList in graph data to allow multiple queries ([ca988f2](https://github.com/webern-unibas-ch/awg-app/commit/ca988f208a699045063679245effa200089afd69))
- **home:** add sketch edition link to Opus 25 header ([aaeaa80](https://github.com/webern-unibas-ch/awg-app/commit/aaeaa801669f4d8a3a32823e0e8872d39f7f14ea))

### [0.7.2](https://github.com/webern-unibas-ch/awg-app/compare/v0.7.1...v0.7.2) (2020-03-20)

### Features
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "awg-app",
"version": "0.7.2",
"version": "0.7.3",
"license": "MIT",
"author": {
"name": "Stefan Münnich",
Expand Down
5 changes: 5 additions & 0 deletions src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { of as observableOf } from 'rxjs';

import Spy = jasmine.Spy;

import { cleanStylesFromDOM } from '@testing/clean-up-helper';
import { getAndExpectDebugElementByDirective } from '@testing/expect-helper';

import { RouterEventsService } from '@awg-core/services';
Expand Down Expand Up @@ -71,6 +72,10 @@ describe('AppComponent (DONE)', () => {
(window as any).ga = undefined;
});

afterAll(() => {
cleanStylesFromDOM();
});

it('should create the app', async(() => {
expect(component).toBeTruthy();
}));
Expand Down
6 changes: 3 additions & 3 deletions src/app/app.globals.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// THIS IS AN AUTO-GENERATED FILE. DO NOT CHANGE IT MANUALLY!
// Generated last time on Sat Mar 21 00:35:34 2020
// Generated last time on Thu Apr 9 12:48:35 2020

/**
* The latest version of the AWG App
*/
export const appVersion = '0.7.2';
export const appVersion = '0.7.3';

/**
* The release date of the latest version of the AWG App
*/
export const appVersionReleaseDate = '21. März 2020';
export const appVersionReleaseDate = '09. April 2020';

/**
* The URL of the AWG App
Expand Down
4 changes: 2 additions & 2 deletions src/app/core/core-models/geo-names.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export class GeoNames {
this.gnid +
'" title="' +
this.longLabel +
'" target="_blank" ref="noopener noreferrer">' +
'" target="_blank" rel="noopener noreferrer">' +
geoIcon +
'</a>';
let wikiLink = '';
Expand All @@ -88,7 +88,7 @@ export class GeoNames {
this.wiki +
'" title="' +
this.wiki +
'" target="_blank" ref="noopener noreferrer">' +
'" target="_blank" rel="noopener noreferrer">' +
wikiIcon +
'</a>';
}
Expand Down
4 changes: 2 additions & 2 deletions src/app/core/core-models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

import { GeoNames } from './geo-names.model';
import { Logo, Logos } from './logos.model';
import { Meta, MetaContact, MetaEdition, MetaPage, MetaStructure, MetaSectionTypes } from './meta.model';
import { Meta, MetaContact, MetaPage, MetaStructure, MetaSectionTypes } from './meta.model';

export { GeoNames, Logo, Logos, Meta, MetaContact, MetaEdition, MetaPage, MetaStructure, MetaSectionTypes };
export { GeoNames, Logo, Logos, Meta, MetaContact, MetaPage, MetaStructure, MetaSectionTypes };
30 changes: 3 additions & 27 deletions src/app/core/core-models/meta.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
*/
export enum MetaSectionTypes {
page = 'page',
edition = 'edition',
structure = 'structure',
contact = 'contact'
}
Expand All @@ -17,14 +16,14 @@ export enum MetaSectionTypes {
*/
export class MetaPerson {
/**
* The name of the person.
* The (FOAF) name of the person.
*/
name: string;

/**
* The contact (webadress) of a person.
* The (FOAF) homepage of a person.
*/
contactUrl: string;
homepage: string;
}

/**
Expand Down Expand Up @@ -80,24 +79,6 @@ export class MetaPage {
versionReleaseDate: string;
}

/**
* The MetaEdition class.
*
* It is used in the context of the edition view
* to store the meta data about the edition.
*/
export class MetaEdition {
/**
* The editors of an edition.
*/
editors: MetaPerson[];

/**
* The last modification date of an edition.
*/
lastModified: string;
}

/**
* The MetaStructure class.
*
Expand Down Expand Up @@ -205,11 +186,6 @@ export class Meta {
*/
page: MetaPage;

/**
* The meta data for the edition view.
*/
edition: MetaEdition;

/**
* The meta data for the structure view.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { DebugElement } from '@angular/core';

import { cleanStylesFromDOM } from '@testing/clean-up-helper';
import { getAndExpectDebugElementByCss } from '@testing/expect-helper';

import { Meta, MetaPage, MetaSectionTypes } from '@awg-core/core-models';
import { MetaPage, MetaSectionTypes } from '@awg-core/core-models';
import { METADATA } from '@awg-core/mock-data';

import { FooterCopyrightComponent } from './footer-copyright.component';
Expand Down Expand Up @@ -32,6 +33,10 @@ describe('FooterCopyrightComponent (DONE)', () => {
expectedPageMetaData = METADATA[MetaSectionTypes.page];
});

afterAll(() => {
cleanStylesFromDOM();
});

it('should create', () => {
expect(component).toBeTruthy();
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { DebugElement } from '@angular/core';

import { cleanStylesFromDOM } from '@testing/clean-up-helper';
import { click } from '@testing/click-helper';
import { getAndExpectDebugElementByCss, getAndExpectDebugElementByDirective } from '@testing/expect-helper';
import { RouterLinkStubDirective } from '@testing/router-stubs';
Expand Down Expand Up @@ -36,6 +37,10 @@ describe('FooterDeclarationComponent (DONE)', () => {
expectedPageMetaData = METADATA[MetaSectionTypes.page];
});

afterAll(() => {
cleanStylesFromDOM();
});

it('should create', () => {
expect(component).toBeTruthy();
});
Expand Down
4 changes: 2 additions & 2 deletions src/app/core/footer/footer-logo/footer-logo.component.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<a href="{{ logo.href }}" target="_blank" ref="noopener noreferrer">
<img id="{{ logo.id }}" src="{{ logo.src }}" alt="{{ logo.alt }}" />
<a class="awg-logo-link" href="{{ logo.href }}" target="_blank" rel="noopener noreferrer">
<img [ngClass]="getLogoClass(logo.id)" id="{{ logo.id }}" src="{{ logo.src }}" alt="{{ logo.alt }}" width="200" />
</a>
Loading

0 comments on commit e59c258

Please sign in to comment.