Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/npm_and_yarn/develop/types/nod…
Browse files Browse the repository at this point in the history
…e-18.19.32
  • Loading branch information
musicEnfanthen authored May 8, 2024
2 parents 827fb66 + 40f3ee0 commit bc9945e
Show file tree
Hide file tree
Showing 18 changed files with 52 additions and 52 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
egress-policy: audit

- name: Checkout repository
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # ratchet:actions/checkout@v4.1.4
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # ratchet:actions/checkout@v4.1.5
with:
fetch-depth: 0 # Get all history and branches

Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
egress-policy: audit

- name: Checkout repository
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # ratchet:actions/checkout@v4.1.4
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # ratchet:actions/checkout@v4.1.5
with:
# ref (branch, tag or SHA) to check out
ref: ${{ env.DEV_GH_PAGES_BRANCH }}
Expand Down Expand Up @@ -200,7 +200,7 @@ jobs:
egress-policy: audit

- name: Checkout repository
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # ratchet:actions/checkout@v4.1.4
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # ratchet:actions/checkout@v4.1.5
- name: Set up node ${{ matrix.node-version}}
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # ratchet:actions/setup-node@v4.0.2
with:
Expand Down Expand Up @@ -245,7 +245,7 @@ jobs:
- name: Create Release
id: create_release
if: ${{ success() && startsWith(github.ref, 'refs/tags/') }}
uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564 # ratchet:softprops/action-gh-release@v2.0.4
uses: softprops/action-gh-release@69320dbe05506a9a39fc8ae11030b214ec2d1f87 # ratchet:softprops/action-gh-release@v2.0.5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAG_VERSION: ${{ steps.get_version.outputs.VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
egress-policy: audit

- name: Checkout repository
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
with:
fetch-depth: 2
# Initializes the CodeQL tools for scanning.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ jobs:
egress-policy: audit

- name: 'Checkout Repository'
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
- name: 'Dependency Review'
uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # v4.3.2
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
egress-policy: audit

- name: "Checkout code"
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
with:
persist-credentials: false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/visualize-repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
egress-policy: audit

- name: Checkout repository
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # ratchet:actions/checkout@v4.1.4
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # ratchet:actions/checkout@v4.1.5
with:
ref: develop
token: ${{ secrets.REPO_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/address/address.component.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<address>
<p id="awg-address-header" class="caps">
<p id="awg-address-header" class="smallcaps">
<strong>
<a href="{{ pageMetaData?.awgProjectUrl }}">{{ pageMetaData?.awgProjectName }}</a>
</strong>
Expand Down
18 changes: 9 additions & 9 deletions src/app/views/contact-view/contact-view.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<!-- citation description -->
<div class="awg-citation-description mb-5">
<p class="caps">Empfohlene Zitierweisen:</p>
<p class="smallcaps">Empfohlene Zitierweisen:</p>

<p class="italic">Website:</p>
<p class="awg-citation-text">
Expand Down Expand Up @@ -34,15 +34,15 @@
<!-- documentation description -->
<div class="awg-documentation-description mb-5">
<p class="awg-documentation-text">
<span class="caps">GitHub:</span><br />
<span class="smallcaps">GitHub:</span><br />
Repository unter:
<a href="{{ pageMetaData?.githubUrl }}">
{{ pageMetaData?.githubUrl }}
</a>
</p>

<p class="awg-documentation-text">
<span class="caps">Compodoc:</span><br />
<span class="smallcaps">Compodoc:</span><br />
Dokumentation von Struktur und Funktionalitäten der Angular App:
<a id="awg-compodoc" href="{{ pageMetaData?.compodocUrl }}"> awg-app documentation </a>
</p>
Expand All @@ -55,7 +55,7 @@
<!-- imprint description -->
<div class="awg-imprint-description">
<p>
<span class="caps">Herausgeber:</span><br />
<span class="smallcaps">Herausgeber:</span><br />
{{ pageMetaData.awgProjectName }}<br />
{{ contactMetaData.address.institution }}<br />
{{ contactMetaData.address.street }}<br />
Expand All @@ -64,21 +64,21 @@
</p>

<p>
<span class="caps">Konzept:</span><br />
<span class="smallcaps">Konzept:</span><br />
{{ pageMetaData.awgProjectName }}<br /><br />
</p>
<p>
<span class="caps">Texte/Inhalte:</span><br />
<span class="smallcaps">Texte/Inhalte:</span><br />
Die Verantwortung für die Inhalte der Website liegt bei der {{ pageMetaData.awgProjectName }}. Bei inhaltlichen
Fragen wenden Sie sich bitte an die unter Kontakt angegebene Adresse.<br /><br />
</p>
<p>
<span class="caps">Materialien, Notentexte und Bilder (vgl. Lizenzierung):</span><br />
<span class="smallcaps">Materialien, Notentexte und Bilder (vgl. Lizenzierung):</span><br />
Digitales Archiv der {{ pageMetaData.awgProjectName }}<br />
Online-Edition der {{ pageMetaData.awgProjectName }}<br /><br />
</p>
<p>
<span class="caps">Programmierung &amp; Webdesign:</span><br />
<span class="smallcaps">Programmierung &amp; Webdesign:</span><br />
Stefan Münnich<br />
Wissenschaftlicher Mitarbeiter der {{ pageMetaData.awgProjectName }}, Basel<br /><a
href="mailto:stefan.muennich@unibas.ch"
Expand All @@ -89,7 +89,7 @@

<!-- disclaimer description -->
<div id="awg-disclaimer">
<p><span class="caps">Disclaimer/Haftungserklärung:</span><br /></p>
<p><span class="smallcaps">Disclaimer/Haftungserklärung:</span><br /></p>
<p class="italic">Urheberrecht und Lizenzierung:</p>
<p>
Sämtliche im Rahmen der {{ pageMetaData.awgProjectName }} erarbeiteten und auf ihrer Website oder ihrer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@
!sourceDescription.description.writingMaterial
) {
<p class="awg-source-description-writing-material">
<span class="caps">Beschreibstoff:&nbsp;</span>
<span class="smallcaps">Beschreibstoff:&nbsp;</span>
<span
[compile-html]="sourceDescription.description.writingMaterialString"
[compile-html-ref]="ref"></span>
</p>
}
@if (sourceDescription.description.writingMaterial) {
<p class="awg-source-description-writing-material">
<span class="caps">Beschreibstoff:&nbsp;</span>
<span class="smallcaps">Beschreibstoff:&nbsp;</span>

@for (
writingMaterial of sourceDescription?.description?.writingMaterial;
Expand Down Expand Up @@ -153,7 +153,7 @@
@if (utils.isNotEmptyObject(sourceDescription.description.writingInstruments)) {
@if (sourceDescription.description.writingInstruments.main) {
<p class="awg-source-description-writing-instruments">
<span class="caps">Schreibstoff:&nbsp;</span>
<span class="smallcaps">Schreibstoff:&nbsp;</span>
<span
[compile-html]="
getWritingInstruments(sourceDescription.description.writingInstruments)
Expand All @@ -165,7 +165,7 @@
<!-- title -->
@if (sourceDescription.description.title) {
<p class="awg-source-description-title">
<span class="caps">Titel:&nbsp;</span>
<span class="smallcaps">Titel:&nbsp;</span>
<span
[compile-html]="sourceDescription.description.title"
[compile-html-ref]="ref"></span>
Expand All @@ -174,7 +174,7 @@
<!-- date -->
@if (sourceDescription.description.date) {
<p class="awg-source-description-date">
<span class="caps">Datierung:&nbsp;</span>
<span class="smallcaps">Datierung:&nbsp;</span>
<span
[compile-html]="sourceDescription.description.date"
[compile-html-ref]="ref"></span>
Expand All @@ -183,7 +183,7 @@
<!-- pagination -->
@if (sourceDescription.description.pagination) {
<p class="awg-source-description-pagination">
<span class="caps">Paginierung:&nbsp;</span>
<span class="smallcaps">Paginierung:&nbsp;</span>
<span
[compile-html]="sourceDescription.description.pagination"
[compile-html-ref]="ref"></span>
Expand All @@ -192,7 +192,7 @@
<!-- measureNumbers -->
@if (sourceDescription.description.measureNumbers) {
<p class="awg-source-description-measure-numbers">
<span class="caps">Taktzahlen:&nbsp;</span>
<span class="smallcaps">Taktzahlen:&nbsp;</span>
<span
[compile-html]="sourceDescription.description.measureNumbers"
[compile-html-ref]="ref"></span>
Expand All @@ -201,7 +201,7 @@
<!-- instrumentation -->
@if (sourceDescription.description.instrumentation) {
<p class="awg-source-description-instrumentation">
<span class="caps">Instrumentenvorsatz:&nbsp;</span>
<span class="smallcaps">Instrumentenvorsatz:&nbsp;</span>
<span
[compile-html]="sourceDescription.description.instrumentation"
[compile-html-ref]="ref"></span>
Expand All @@ -210,7 +210,7 @@
<!-- annotations -->
@if (sourceDescription.description.annotations) {
<p class="awg-source-description-annotations">
<span class="caps">Eintragungen:&nbsp;</span>
<span class="smallcaps">Eintragungen:&nbsp;</span>
<span
[compile-html]="sourceDescription.description.annotations"
[compile-html-ref]="ref"></span>
Expand All @@ -219,7 +219,7 @@
<!-- content -->
@if (utils.isNotEmptyArray(sourceDescription.description.content)) {
<div class="awg-source-description-content">
<p class="no-para"><span class="caps">Inhalt:</span></p>
<p class="no-para"><span class="smallcaps">Inhalt:</span></p>
@for (content of sourceDescription.description.content; track content) {
<p class="half-para">
<!-- content.itemDescription -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ describe('SourceDescriptionComponent (DONE)', () => {
// Process HTML expression of expected text content
const expectedHtmlTextContent = mockDocument.createElement('p');
expectedHtmlTextContent.innerHTML =
'<span class="caps">Beschreibstoff:&nbsp;</span><span>' +
'<span class="smallcaps">Beschreibstoff:&nbsp;</span><span>' +
expectedSourceDescriptionListData.sources[1].description.writingMaterialString +
'</span>';

Expand All @@ -387,7 +387,7 @@ describe('SourceDescriptionComponent (DONE)', () => {
// Process HTML expression of expected text content
const expectedHtmlTextContent = mockDocument.createElement('p');
expectedHtmlTextContent.innerHTML =
'<span class="caps">Schreibstoff:&nbsp;</span><span>' +
'<span class="smallcaps">Schreibstoff:&nbsp;</span><span>' +
instruments.main +
'; ' +
instruments.secondary.join(', ') +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ng-template>
@if (utils.isNotEmptyArray(textcritic.description)) {
<div>
<p class="caps">Skizzenkommentar:</p>
<p class="smallcaps">Skizzenkommentar:</p>
<awg-edition-tka-description
[textcriticalDescriptions]="textcritic.description"
(navigateToReportFragmentRequest)="navigateToReportFragment($event)"
Expand All @@ -28,7 +28,7 @@
}
@if (utils.isNotEmptyArray(textcritic.comments)) {
<div>
<p class="caps">Textkritischer Kommentar:</p>
<p class="smallcaps">Textkritischer Kommentar:</p>
<awg-edition-tka-table
[textcriticalComments]="textcritic.comments"
[isRowTable]="textcritic.rowtable"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
&nbsp;
</span>
}
<span class="caps">Skizzenkommentar:</span>
<span class="smallcaps">Skizzenkommentar:</span>
@if (selectedTextcritics.description && !utils.isNotEmptyArray(selectedTextcritics.description)) {
<span>&nbsp;---</span>
}
Expand All @@ -25,7 +25,7 @@
</div>
@if (showTkA) {
<div class="awg-edition-svg-sheet-footer-textcritics">
<p class="caps">Textkritischer Kommentar:</p>
<p class="smallcaps">Textkritischer Kommentar:</p>
<awg-edition-tka-table
[textcriticalComments]="selectedTextcriticalComments"
[isRowTable]="selectedTextcritics.rowtable"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ describe('EditionSvgSheetFooterComponent (DONE)', () => {
expect(iconDes[0].children[0].classes['fa-chevron-up']).toBeTrue();
});

it('... should contain a span.caps in p with heading for Skizzenkommentar', () => {
it('... should contain a span.smallcaps in p with heading for Skizzenkommentar', () => {
const divDes = getAndExpectDebugElementByCss(
compDe,
'div.awg-edition-svg-sheet-footer-evaluation',
Expand All @@ -245,7 +245,7 @@ describe('EditionSvgSheetFooterComponent (DONE)', () => {
);

const pDes = getAndExpectDebugElementByCss(divDes[0], 'p', 1, 1);
const spanDes = getAndExpectDebugElementByCss(pDes[0], 'span.caps', 1, 1);
const spanDes = getAndExpectDebugElementByCss(pDes[0], 'span.smallcaps', 1, 1);
const spanEl = spanDes[0].nativeElement;

expectToBe(spanEl.textContent, 'Skizzenkommentar:');
Expand Down Expand Up @@ -311,7 +311,7 @@ describe('EditionSvgSheetFooterComponent (DONE)', () => {
getAndExpectDebugElementByCss(compDe, 'div.awg-edition-svg-sheet-footer-textcritics', 1, 1);
});

it('... should contain one p.caps header in textcritics div', () => {
it('... should contain one p.smallcaps header in textcritics div', () => {
const divDes = getAndExpectDebugElementByCss(
compDe,
'div.awg-edition-svg-sheet-footer-textcritics',
Expand All @@ -322,7 +322,7 @@ describe('EditionSvgSheetFooterComponent (DONE)', () => {
const pEl = pDes[0].nativeElement;

expect(pEl.classList).toBeDefined();
expect(pEl.classList).toContain('caps');
expect(pEl.classList).toContain('smallcaps');

expectToBe(pEl.textContent, `Textkritischer Kommentar:`);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2001,7 +2001,7 @@
"main": "",
"secondary": []
},
"title": "<em>VIER LIEDER | für Gesang und Klavier | von | ANTON WEBERN | Op. 12</em> auf der vorderen Umschlagseite (S. [a]) sowie auf S. [1];<br /><em><span class=\"caps\">Der Tag ist vergangen</span> | (Volkslied)</em> [Mitte] | <em>Anton Webern, Op. 12 Nr. 1</em> [rechts] auf S. 2 oben (Kopftitel);<br /><em><span class=\"caps\">Die geheimnsivolle Flöte</span> | Li-Tai-Po | (aus Hans Bethges „Chinesischer Flöte“)</em> [Mitte] | <em>Anton Webern, Op.12 Nr. 2</em> [rechts] auf S. 4 oben (Kopftitel);<br /><em><span class=\"caps\">Schien mir’s, als ich sah die Sonne</span> | (aus August Strindbergs „Gespenstersonate“)</em> [Mitte] | <em>Anton Webern, Op. 12 Nr. 3</em> [rechts] auf S. 6 oben (Kopftitel);<br /><em><span class=\"caps\">Gleich und Gleich</span> | (Goethe)</em> [Mitte] | <em>Anton Webern, Op. 12 Nr. 4</em> [rechts] auf S. 8 oben (Kopftitel).",
"title": "<em>VIER LIEDER | für Gesang und Klavier | von | ANTON WEBERN | Op. 12</em> auf der vorderen Umschlagseite (S. [a]) sowie auf S. [1];<br /><em><span class=\"smallcaps\">Der Tag ist vergangen</span> | (Volkslied)</em> [Mitte] | <em>Anton Webern, Op. 12 Nr. 1</em> [rechts] auf S. 2 oben (Kopftitel);<br /><em><span class=\"smallcaps\">Die geheimnsivolle Flöte</span> | Li-Tai-Po | (aus Hans Bethges „Chinesischer Flöte“)</em> [Mitte] | <em>Anton Webern, Op.12 Nr. 2</em> [rechts] auf S. 4 oben (Kopftitel);<br /><em><span class=\"smallcaps\">Schien mir’s, als ich sah die Sonne</span> | (aus August Strindbergs „Gespenstersonate“)</em> [Mitte] | <em>Anton Webern, Op. 12 Nr. 3</em> [rechts] auf S. 6 oben (Kopftitel);<br /><em><span class=\"smallcaps\">Gleich und Gleich</span> | (Goethe)</em> [Mitte] | <em>Anton Webern, Op. 12 Nr. 4</em> [rechts] auf S. 8 oben (Kopftitel).",
"date": "",
"pagination": "<em>2</em> bis <em>9</em> auf S. 2–9 Außenecken oben.",
"measureNumbers": "",
Expand Down
Loading

0 comments on commit bc9945e

Please sign in to comment.