Skip to content

Commit

Permalink
Merge branch 'release/v0.11.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
musicEnfanthen committed Feb 19, 2024
2 parents 3c496b6 + 73091f1 commit b07c10c
Show file tree
Hide file tree
Showing 61 changed files with 1,359 additions and 920 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci_optimize_svgs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # ratchet:actions/[email protected]
- name: Optimize SVGs
uses: ericcornelissen/svgo-action@f7f55c2a50142a9eeefca82470290ce62ceebad5 # ratchet:ericcornelissen/[email protected].7
uses: ericcornelissen/svgo-action@b8b3198fffbb1210e81aa68cde2ca4e4568d5386 # ratchet:ericcornelissen/[email protected].8
id: svgo
with:
repo-token: ${{secrets.GITHUB_TOKEN}}
Expand Down
36 changes: 36 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,42 @@

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.11.6](https://github.com/webern-unibas-ch/awg-app/compare/v0.11.5...v0.11.6) (2024-02-19)


### Features

* **edition:** add option to display reversed folio items ([08df6b4](https://github.com/webern-unibas-ch/awg-app/commit/08df6b4bee336f666cd46a0fa4f05dde17ff9ebc))


### Bug Fixes

* **assets:** add convolute ids for text versions ([612be8b](https://github.com/webern-unibas-ch/awg-app/commit/612be8b3e375c88ffceaa799e1e152c1b4a6d79e))
* **assets:** move convolutes to sheet contents ([2dd0b77](https://github.com/webern-unibas-ch/awg-app/commit/2dd0b7751c8b9b2d6f6f3696da7b73c848428cf7))
* **assets:** unify description of writing material in op25 ([1fcbdcf](https://github.com/webern-unibas-ch/awg-app/commit/1fcbdcf76827baf66f0b4367b2eb85084fa8f468))
* **edition:** fix overlapping of svgs on reload ([b9b0cf6](https://github.com/webern-unibas-ch/awg-app/commit/b9b0cf6aa90e72f0d8830f5fcb32e88c28054e54))
* **edition:** fix reload of svgs again ([cf857c8](https://github.com/webern-unibas-ch/awg-app/commit/cf857c8484012ace28be5bc97e462413d33a3c8d))
* **edition:** move convolute to sheet content model ([946ad3e](https://github.com/webern-unibas-ch/awg-app/commit/946ad3e952809721ff2b171ea3bf2cc1453b3fbf))
* **edition:** update condition for displaying sheet viewer switch ([46d1426](https://github.com/webern-unibas-ch/awg-app/commit/46d1426a2963dbbd7055f541363806c65dbc488d))


### Tests

* **edition:** create deep instead of shallow copy of mock objects ([bb30323](https://github.com/webern-unibas-ch/awg-app/commit/bb30323385dd0420edf28618431edefad6f511fc))


### Build System

* **deps-dev:** bump the angular-cli-devkit group with 2 updates ([b7aec87](https://github.com/webern-unibas-ch/awg-app/commit/b7aec87fd87e3d7f5446f43336b085cc6837d515))
* **deps:** bump ericcornelissen/svgo-action from 4.0.7 to 4.0.8 ([20d5ba4](https://github.com/webern-unibas-ch/awg-app/commit/20d5ba44ab70f0364f9d587adee6e03d3fcb0bdf))
* **deps:** bump the angular group with 11 updates ([02be766](https://github.com/webern-unibas-ch/awg-app/commit/02be766b40306e134226c0aa808d5e4cb1da208b))
* **deps:** bump undici from 5.27.2 to 5.28.3 ([b1ba896](https://github.com/webern-unibas-ch/awg-app/commit/b1ba8964b72a09f7e87c86fffdecf391edba25af))


### Code Refactoring

* **assets:** restructure firm sign folder ([98356bc](https://github.com/webern-unibas-ch/awg-app/commit/98356bc575c95b5617c112db7909b5215638e86b))

### [0.11.5](https://github.com/webern-unibas-ch/awg-app/compare/v0.11.4...v0.11.5) (2024-02-14)

### Features
Expand Down
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "awg-app",
"version": "0.11.5",
"version": "0.11.6",
"license": "MIT",
"author": {
"name": "Stefan Münnich",
Expand Down Expand Up @@ -82,16 +82,16 @@
"deploy:ci": "ng deploy --no-build --message=\"Release $npm_package_name (v$npm_package_version) on gh-pages\""
},
"dependencies": {
"@angular/animations": "^17.1.3",
"@angular/common": "^17.1.3",
"@angular/compiler": "^17.1.3",
"@angular/core": "^17.1.3",
"@angular/forms": "^17.1.3",
"@angular/localize": "^17.1.3",
"@angular/platform-browser": "^17.1.3",
"@angular/platform-browser-dynamic": "^17.1.3",
"@angular/platform-server": "^17.1.3",
"@angular/router": "^17.1.3",
"@angular/animations": "^17.2.1",
"@angular/common": "^17.2.1",
"@angular/compiler": "^17.2.1",
"@angular/core": "^17.2.1",
"@angular/forms": "^17.2.1",
"@angular/localize": "^17.2.1",
"@angular/platform-browser": "^17.2.1",
"@angular/platform-browser-dynamic": "^17.2.1",
"@angular/platform-server": "^17.2.1",
"@angular/router": "^17.2.1",
"@codemirror/legacy-modes": "^6.3.3",
"@fortawesome/angular-fontawesome": "^0.14.1",
"@fortawesome/fontawesome-svg-core": "^6.5.1",
Expand All @@ -118,14 +118,14 @@
"zone.js": "~0.14.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "^17.1.3",
"@angular-devkit/build-angular": "^17.2.0",
"@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.1.3",
"@angular/compiler-cli": "^17.1.3",
"@angular/cli": "^17.2.0",
"@angular/compiler-cli": "^17.2.1",
"@commitlint/cli": "^18.6.1",
"@commitlint/config-angular": "^18.6.1",
"@compodoc/compodoc": "^1.1.23",
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 Wed, Feb 14, 2024 1:15:38 PM
// Generated last time on Mon, Feb 19, 2024 6:33:56 PM

/**
* The latest version of the AWG App
*/
export const appVersion = '0.11.5';
export const appVersion = '0.11.6';

/**
* The release date of the latest version of the AWG App
*/
export const appVersionReleaseDate = '14. Februar 2024';
export const appVersionReleaseDate = '19. Februar 2024';

/**
* The URL of the AWG App
Expand Down
24 changes: 12 additions & 12 deletions src/app/views/edition-view/data/edition-firm-signs.data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const EDITION_FIRM_SIGNS_DATA = {
* The path to the assets image of a firm sign: JE No. 12, 12 Lines.
*/
FIRM_JE_NO_2_LIN_12: {
route: 'assets/img/edition/firm-signs/firm_je_no2_lin12.png',
route: 'assets/img/edition/firm-signs/je/no2_lin12/firm_je_no2_lin12.png',
short: '[JE] | No. 2 | 12 linig.',
full: 'J. E. & Co. [diagonal ansteigend auf schildförmiger Papierrolle, rechts von einem Löwen gehalten, links und unten Blattgirlande] | Protokoll. Schutzmarke | No. 2 | 12 linig.',
},
Expand All @@ -18,7 +18,7 @@ export const EDITION_FIRM_SIGNS_DATA = {
* The path to the assets image of a firm sign: JE No. 12, 12 Lines (variant "b").
*/
FIRM_JE_NO_2_LIN_12_B: {
route: 'assets/img/edition/firm-signs/firm_je_no2_lin12_b.png',
route: 'assets/img/edition/firm-signs/je/no2_lin12/firm_je_no2_lin12_b.png',
short: '[JE] | No. 2 | 12 linig.',
full: 'J. E. & Co. [diagonal ansteigend auf schildförmiger Papierrolle, rechts von einem Löwen gehalten, links und unten Blattgirlande] | Protokoll. Schutzmarke | No. 2 | 12 linig.',
},
Expand All @@ -27,34 +27,34 @@ export const EDITION_FIRM_SIGNS_DATA = {
* The path to the assets image of a firm sign: JE No. 3, 14 Lines.
*/
FIRM_JE_NO_3_LIN_14: {
route: 'assets/img/edition/firm-signs/firm_je_no3_lin14.png',
route: 'assets/img/edition/firm-signs/je/no3_lin14/firm_je_no3_lin14.png',
short: '[JE] | No. 3 | 14 linig.',
full: 'J. E. & Co. [diagonal ansteigend auf schildförmiger Papierrolle, rechts von einem Löwen gehalten, links und unten Blattgirlande] | Protokoll. Schutzmarke | No. 3 | 14 linig.',
},

/**
* The path to the assets image of a firm sign: JE No. 5, 18 Lines.
*/
FIRM_JE_NO_5_LIN_18B: {
route: 'assets/img/edition/firm-signs/firm_je_no5_lin18b.png',
FIRM_JE_NO_5_LIN_18_B: {
route: 'assets/img/edition/firm-signs/je/no5_lin18/firm_je_no5_lin18_b.png',
short: '[JE] | No. 5 | 18 linig.',
full: 'J. E. & Co. [diagonal ansteigend auf schildförmiger Papierrolle, rechts von einem Löwen gehalten, links und unten Blattgirlande] | Protokoll. Schutzmarke | No. 5 | 18 linig.',
},

/**
* The path to the assets image of a firm sign: JE No. 5, 18 Lines.
*/
FIRM_JE_NO_5_LIN_18C: {
route: 'assets/img/edition/firm-signs/firm_je_no5_lin18c.png',
FIRM_JE_NO_5_LIN_18_C: {
route: 'assets/img/edition/firm-signs/je/no5_lin18/firm_je_no5_lin18_c.png',
short: '[JE] | No. 5 | 18 linig.',
full: 'J. E. & Co. [diagonal ansteigend auf schildförmiger Papierrolle, rechts von einem Löwen gehalten, links und unten Blattgirlande] | Protokoll. Schutzmarke | No. 5 | 18 linig.',
},

/**
* The path to the assets image of a firm sign: JE No. 5, 18 Lines.
*/
FIRM_JE_NO_5_LIN_18D: {
route: 'assets/img/edition/firm-signs/firm_je_no5_lin18d.png',
FIRM_JE_NO_5_LIN_18_D: {
route: 'assets/img/edition/firm-signs/je/no5_lin18/firm_je_no5_lin18_d.png',
short: '[JE] | No. 5 | 18 linig.',
full: 'J. E. & Co. [diagonal ansteigend auf schildförmiger Papierrolle, rechts von einem Löwen gehalten, links und unten Blattgirlande] | Protokoll. Schutzmarke | No. 5 | 18 linig.',
},
Expand All @@ -63,7 +63,7 @@ export const EDITION_FIRM_SIGNS_DATA = {
* The path to the assets image of a firm sign: JE No. 6, 20 Lines.
*/
FIRM_JE_NO_6_LIN_20: {
route: 'assets/img/edition/firm-signs/firm_je_no6_lin20.png',
route: 'assets/img/edition/firm-signs/je/no6_lin20/firm_je_no6_lin20.png',
short: '[JE] | No. 6 | 20 linig.',
full: 'J. E. & Co. [diagonal ansteigend auf schildförmiger Papierrolle, rechts von einem Löwen gehalten, links und unten Blattgirlande] | Protokoll. Schutzmarke | No. 6 | 20 linig.',
},
Expand All @@ -72,7 +72,7 @@ export const EDITION_FIRM_SIGNS_DATA = {
* The path to the assets image of a firm sign: JE No. 9, 28 Lines.
*/
FIRM_JE_NO_9_LIN_28: {
route: 'assets/img/edition/firm-signs/firm_je_no9_lin28.png',
route: 'assets/img/edition/firm-signs/je/no9_lin28/firm_je_no9_lin28.png',
short: '[JE] | No. 9 | 28 linig.',
full: 'J. E. & Co. [diagonal ansteigend auf schildförmiger Papierrolle, rechts von einem Löwen gehalten, links und unten Blattgirlande] | Protokoll. Schutzmarke | No. 9 | 28 linig.',
},
Expand All @@ -81,7 +81,7 @@ export const EDITION_FIRM_SIGNS_DATA = {
* The path to the assets image of a firm sign: JE No. 15, 16 Lines.
*/
FIRM_JE_NO_15_LIN_16: {
route: 'assets/img/edition/firm-signs/firm_je_no15_lin16.png',
route: 'assets/img/edition/firm-signs/je/no15_lin16/firm_je_no15_lin16.png',
short: '[JE] | No. 15 | 16 linig.',
full: 'J. E. & Co. [diagonal ansteigend auf schildförmiger Papierrolle, rechts von einem Löwen gehalten, links und unten Blattgirlande] | Protokoll. Schutzmarke | No. 15 | 16 linig.',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export class EditionComplexComponent implements OnDestroy, OnInit {
*/
getEditionComplexFromRoute(): void {
this.route.paramMap.subscribe(params => {
const id: string = params.get('complexId') ? params.get('complexId') : '';
const id: string = params.get('complexId') || '';
this.editionService.updateEditionComplex(EDITION_COMPLEXES[id.toUpperCase()]);
this.selectedEditionComplex$ = this.editionService.getEditionComplex().pipe(delay(0));
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ describe('EditionGraphComponent (DONE)', () => {

expectedEditionComplex = EDITION_COMPLEXES.OP12;

expectedEditionGraphDataEmpty = mockEditionData.mockGraphEmptyData;
expectedEditionGraphDataEmpty = JSON.parse(JSON.stringify(mockEditionData.mockGraphEmptyData));

expectedEditionGraphDataOp25 = new GraphList();
expectedEditionGraphDataOp25.graph = [];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@ describe('IntroComponent (DONE)', () => {
expectedComplexId = 'testComplex1';
expectedNextComplexId = 'testComplex2';
expectedFragment = 'source_A';
expectedModalSnippet = mockEditionData.mockModalSnippet;
expectedEditionIntroData = mockEditionData.mockIntroData;
expectedEditionIntroEmptyData = mockEditionData.mockIntroEmptyData;
expectedSvgSheet = mockEditionData.mockSvgSheet_Sk1;
expectedNextSvgSheet = mockEditionData.mockSvgSheet_Sk2;
expectedModalSnippet = JSON.parse(JSON.stringify(mockEditionData.mockModalSnippet));
expectedEditionIntroData = JSON.parse(JSON.stringify(mockEditionData.mockIntroData));
expectedEditionIntroEmptyData = JSON.parse(JSON.stringify(mockEditionData.mockIntroEmptyData));
expectedSvgSheet = JSON.parse(JSON.stringify(mockEditionData.mockSvgSheet_Sk1));
expectedNextSvgSheet = JSON.parse(JSON.stringify(mockEditionData.mockSvgSheet_Sk2));

// Spies on functions
editionDataServiceGetEditionIntroDataSpy = spyOn(editionDataService, 'getEditionIntroData').and.returnValue(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,14 +179,14 @@ describe('EditionReportComponent', () => {
expectedEditionComplexBaseRoute = '/edition/complex/op12/';
expectedComplexId = 'testComplex1';
expectedNextComplexId = 'testComplex2';
expectedModalSnippet = mockEditionData.mockModalSnippet;
expectedSvgSheet = mockEditionData.mockSvgSheet_Sk1;
expectedNextSvgSheet = mockEditionData.mockSvgSheet_Sk2;

expectedSourceListData = mockEditionData.mockSourceListData;
expectedSourceDescriptionListData = mockEditionData.mockSourceDescriptionListData;
expectedSourceEvaluationListData = mockEditionData.mockSourceEvaluationListData;
expectedTextcriticsData = mockEditionData.mockTextcriticsData;
expectedModalSnippet = JSON.parse(JSON.stringify(mockEditionData.mockModalSnippet));
expectedSvgSheet = JSON.parse(JSON.stringify(mockEditionData.mockSvgSheet_Sk1));
expectedNextSvgSheet = JSON.parse(JSON.stringify(mockEditionData.mockSvgSheet_Sk2));

expectedSourceListData = JSON.parse(JSON.stringify(mockEditionData.mockSourceListData));
expectedSourceDescriptionListData = JSON.parse(JSON.stringify(mockEditionData.mockSourceDescriptionListData));
expectedSourceEvaluationListData = JSON.parse(JSON.stringify(mockEditionData.mockSourceEvaluationListData));
expectedTextcriticsData = JSON.parse(JSON.stringify(mockEditionData.mockTextcriticsData));

expectedEditionReportData = [
expectedSourceListData,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ describe('SourceDescriptionComponent (DONE)', () => {
expectedNextComplexId = 'testComplex2';
expectedSheetId = 'test_item_id_1';
expectedNextSheetId = 'test_item_id_2';
expectedModalSnippet = mockEditionData.mockModalSnippet;
expectedSourceDescriptionListData = mockEditionData.mockSourceDescriptionListData;
expectedModalSnippet = JSON.parse(JSON.stringify(mockEditionData.mockModalSnippet));
expectedSourceDescriptionListData = JSON.parse(JSON.stringify(mockEditionData.mockSourceDescriptionListData));
expectedFirmSigns = {
OP12: {
A: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_9_LIN_28],
Expand All @@ -78,22 +78,22 @@ describe('SourceDescriptionComponent (DONE)', () => {
B: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_6_LIN_20],
},
M30: {
B: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18B],
B: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18_B],
},
M31: {
B: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18B],
B: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18_B],
},
M34: {
A: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18C],
B: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18D],
A: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18_C],
B: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18_D],
},
M35_42: {
A: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18C],
C: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18D],
A: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18_C],
C: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18_D],
},
M37: {
A: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18C],
B: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18D],
A: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18_C],
B: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18_D],
},
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,22 @@ export class SourceDescriptionComponent {
B: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_6_LIN_20],
},
M30: {
B: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18B],
B: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18_B],
},
M31: {
B: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18B],
B: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18_B],
},
M34: {
A: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18C],
B: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18D],
A: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18_C],
B: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18_D],
},
M35_42: {
A: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18C],
C: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18D],
A: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18_C],
C: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18_D],
},
M37: {
A: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18C],
B: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18D],
A: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18_C],
B: [EDITION_FIRM_SIGNS_DATA.FIRM_JE_NO_5_LIN_18_D],
},
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,13 @@ describe('SourceEvaluationComponent (DONE)', () => {
expectedComplexId = 'testComplex1';
expectedNextComplexId = 'testComplex2';
expectedFragment = 'source_A';
expectedSvgSheet = mockEditionData.mockSvgSheet_Sk1;
expectedNextSvgSheet = mockEditionData.mockSvgSheet_Sk2;
expectedModalSnippet = mockEditionData.mockModalSnippet;
expectedSourceEvaluationListData = { ...mockEditionData.mockSourceEvaluationListData };
expectedSourceEvaluationListEmptyData = { ...mockEditionData.mockSourceEvaluationListEmptyData };
expectedSvgSheet = JSON.parse(JSON.stringify(mockEditionData.mockSvgSheet_Sk1));
expectedNextSvgSheet = JSON.parse(JSON.stringify(mockEditionData.mockSvgSheet_Sk2));
expectedModalSnippet = JSON.parse(JSON.stringify(mockEditionData.mockModalSnippet));
expectedSourceEvaluationListData = JSON.parse(JSON.stringify(mockEditionData.mockSourceEvaluationListData));
expectedSourceEvaluationListEmptyData = JSON.parse(
JSON.stringify(mockEditionData.mockSourceEvaluationListEmptyData)
);

mockDocument = TestBed.inject(DOCUMENT);

Expand Down
Loading

0 comments on commit b07c10c

Please sign in to comment.