From 8f0f78b450d1c80cfe966b0b63af8e374616b1a4 Mon Sep 17 00:00:00 2001 From: Philipp Gfeller Date: Wed, 27 Nov 2024 12:56:37 +0100 Subject: [PATCH 1/9] move changes from main to v8 --- .../intranet-header-workspace/CHANGELOG.md | 31 +++-- .../intranet-header-workspace/package.json | 42 ++++--- .../intranet-header-showcase/CHANGELOG.md | 31 +++-- .../intranet-header-showcase/package.json | 2 +- .../src/app.module.ts | 6 + .../navigation/navigation.component.html | 40 +++---- .../navigation/navigation.component.spec.ts | 1 + .../src/samples/samples-index.component.ts | 1 + ...navigation-condensed-header.component.html | 17 +++ ...igation-condensed-header.component.spec.ts | 22 ++++ ...s-navigation-condensed-header.component.ts | 7 ++ .../sidebar-with-searchbar.component.html | 4 +- .../samples/sidebar/sidebar.component.html | 4 +- .../tsconfig.app.json | 3 +- .../projects/intranet-header/CHANGELOG.md | 32 +++-- .../projects/intranet-header/package.json | 4 +- .../swisspost-intranet-header.component.html | 113 +++++++++++------- .../swisspost-intranet-header.component.ts | 52 +++++--- 18 files changed, 266 insertions(+), 146 deletions(-) create mode 100644 packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/samples-navigation-condensed-header/samples-navigation-condensed-header.component.html create mode 100644 packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/samples-navigation-condensed-header/samples-navigation-condensed-header.component.spec.ts create mode 100644 packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/samples-navigation-condensed-header/samples-navigation-condensed-header.component.ts diff --git a/packages/intranet-header-workspace/CHANGELOG.md b/packages/intranet-header-workspace/CHANGELOG.md index 04dcf0193d..312f4cf937 100644 --- a/packages/intranet-header-workspace/CHANGELOG.md +++ b/packages/intranet-header-workspace/CHANGELOG.md @@ -1,46 +1,53 @@ # @swisspost/design-system-intranet-header-workspace -## 3.0.27 +## 3.0.22-next.6 ### Patch Changes - Updated dependencies: - - @swisspost/design-system-styles@8.6.0 + - @swisspost/design-system-styles@9.0.0-next.6 -## 3.0.26 +## 3.0.22-next.5 ### Patch Changes - Updated dependencies: - - @swisspost/design-system-styles@8.5.0 + - @swisspost/design-system-styles@9.0.0-next.5 -## 3.0.25 +## 3.0.22-next.4 ### Patch Changes - Updated dependencies: - - @swisspost/design-system-styles@8.4.0 + - @swisspost/design-system-styles@9.0.0-next.4 -## 3.0.24 +## 3.0.22-next.3 ### Patch Changes - Updated dependencies: - - @swisspost/design-system-styles@8.3.0 + - @swisspost/design-system-styles@9.0.0-next.3 -## 3.0.23 +## 3.0.22-next.2 ### Patch Changes - Updated dependencies: - - @swisspost/design-system-styles@8.2.2 + - @swisspost/design-system-styles@9.0.0-next.2 -## 3.0.22 +## 3.0.22-next.1 ### Patch Changes - Updated dependencies: - - @swisspost/design-system-styles@8.2.1 + - @swisspost/design-system-styles@9.0.0-next.1 + +## 3.0.22-next.0 + +### Patch Changes + +- Updated dependencies: + - @swisspost/design-system-styles@9.0.0-next.0 ## 3.0.21 diff --git a/packages/intranet-header-workspace/package.json b/packages/intranet-header-workspace/package.json index 69529ca695..a04f4aa0c0 100644 --- a/packages/intranet-header-workspace/package.json +++ b/packages/intranet-header-workspace/package.json @@ -1,24 +1,26 @@ { "name": "@swisspost/design-system-intranet-header-workspace", - "version": "3.0.27", + "version": "3.0.22", "license": "Apache-2.0", "private": true, "scripts": { "clean": "rimraf dist", - "start": "ng serve --port 9320", + "start": "npm-run-all --parallel --print-label start:**", + "start:lib": "rimraf dist/intranet-header && ng build intranet-header --watch", + "start:app": "wait-on dist/intranet-header && ng serve --port 9320", "build": "ng build intranet-header", "lint": "ng lint" }, "dependencies": { - "@angular/animations": "18.1.3", - "@angular/common": "18.1.3", - "@angular/compiler": "18.1.3", - "@angular/core": "18.1.3", - "@angular/forms": "18.1.3", - "@angular/localize": "18.1.3", - "@angular/platform-browser": "18.1.3", - "@angular/platform-browser-dynamic": "18.1.3", - "@angular/router": "18.1.3", + "@angular/animations": "18.2.10", + "@angular/common": "18.2.10", + "@angular/compiler": "18.2.10", + "@angular/core": "18.2.10", + "@angular/forms": "18.2.10", + "@angular/localize": "18.2.10", + "@angular/platform-browser": "18.2.10", + "@angular/platform-browser-dynamic": "18.2.10", + "@angular/router": "18.2.10", "@ng-bootstrap/ng-bootstrap": "17.0.0", "@popperjs/core": "2.11.8", "@swisspost/design-system-styles": "workspace:8.6.0", @@ -28,13 +30,13 @@ "zone.js": "0.14.8" }, "devDependencies": { - "@angular-devkit/build-angular": "18.1.3", - "@angular-eslint/builder": "18.2.0", - "@angular-eslint/eslint-plugin": "18.2.0", - "@angular-eslint/eslint-plugin-template": "18.2.0", - "@angular-eslint/template-parser": "18.2.0", - "@angular/cli": "18.1.3", - "@angular/compiler-cli": "18.1.3", + "@angular-devkit/build-angular": "18.2.11", + "@angular-eslint/builder": "18.4.0", + "@angular-eslint/eslint-plugin": "18.4.0", + "@angular-eslint/eslint-plugin-template": "18.4.0", + "@angular-eslint/template-parser": "18.4.0", + "@angular/cli": "18.2.11", + "@angular/compiler-cli": "18.2.10", "@types/jasmine": "5.1.4", "@types/node": "20.14.14", "@typescript-eslint/eslint-plugin": "7.18.0", @@ -47,8 +49,10 @@ "karma-jasmine": "5.1.0", "karma-jasmine-html-reporter": "2.1.0", "ng-packagr": "18.1.0", + "npm-run-all2": "5.0.0", "rimraf": "6.0.1", - "typescript": "5.5.4" + "typescript": "5.5.4", + "wait-on": "8.0.1" }, "keywords": [ "components", diff --git a/packages/intranet-header-workspace/projects/intranet-header-showcase/CHANGELOG.md b/packages/intranet-header-workspace/projects/intranet-header-showcase/CHANGELOG.md index d07c3b0493..fe1e9e9a1e 100644 --- a/packages/intranet-header-workspace/projects/intranet-header-showcase/CHANGELOG.md +++ b/packages/intranet-header-workspace/projects/intranet-header-showcase/CHANGELOG.md @@ -1,46 +1,53 @@ # @swisspost/design-system-intranet-header-showcase -## 1.0.15 +## 1.0.10-next.6 ### Patch Changes - Updated dependencies: - - @swisspost/design-system-intranet-header@8.6.0 + - @swisspost/design-system-intranet-header@9.0.0-next.6 -## 1.0.14 +## 1.0.10-next.5 ### Patch Changes - Updated dependencies: - - @swisspost/design-system-intranet-header@8.5.0 + - @swisspost/design-system-intranet-header@9.0.0-next.5 -## 1.0.13 +## 1.0.10-next.4 ### Patch Changes - Updated dependencies: - - @swisspost/design-system-intranet-header@8.4.0 + - @swisspost/design-system-intranet-header@9.0.0-next.4 -## 1.0.12 +## 1.0.10-next.3 ### Patch Changes - Updated dependencies: - - @swisspost/design-system-intranet-header@8.3.0 + - @swisspost/design-system-intranet-header@9.0.0-next.3 -## 1.0.11 +## 1.0.10-next.2 ### Patch Changes - Updated dependencies: - - @swisspost/design-system-intranet-header@8.2.2 + - @swisspost/design-system-intranet-header@9.0.0-next.2 -## 1.0.10 +## 1.0.10-next.1 ### Patch Changes - Updated dependencies: - - @swisspost/design-system-intranet-header@8.2.1 + - @swisspost/design-system-intranet-header@9.0.0-next.1 + +## 1.0.10-next.0 + +### Patch Changes + +- Updated dependencies: + - @swisspost/design-system-intranet-header@9.0.0-next.0 ## 1.0.9 diff --git a/packages/intranet-header-workspace/projects/intranet-header-showcase/package.json b/packages/intranet-header-workspace/projects/intranet-header-showcase/package.json index 210b0c938b..56e0b1d99a 100644 --- a/packages/intranet-header-workspace/projects/intranet-header-showcase/package.json +++ b/packages/intranet-header-workspace/projects/intranet-header-showcase/package.json @@ -1,6 +1,6 @@ { "name": "@swisspost/design-system-intranet-header-showcase", - "version": "1.0.15", + "version": "1.0.10", "license": "Apache-2.0", "private": true, "dependencies": { diff --git a/packages/intranet-header-workspace/projects/intranet-header-showcase/src/app.module.ts b/packages/intranet-header-workspace/projects/intranet-header-showcase/src/app.module.ts index b69838702f..e048acb2c4 100644 --- a/packages/intranet-header-workspace/projects/intranet-header-showcase/src/app.module.ts +++ b/packages/intranet-header-workspace/projects/intranet-header-showcase/src/app.module.ts @@ -8,12 +8,17 @@ import { SamplesSidebarComponent } from './samples/sidebar/sidebar.component'; import { SwissPostIntranetHeaderModule } from '@swisspost/design-system-intranet-header'; import { SamplesIndexComponent } from './samples/samples-index.component'; import { SamplesSidebarWithSearchbarComponent } from './samples/sidebar-with-searchbar/sidebar-with-searchbar.component'; +import { SamplesNavigationCondensedHeaderComponent } from './samples/samples-navigation-condensed-header/samples-navigation-condensed-header.component'; const routes: Routes = [ { path: '', redirectTo: 'index', pathMatch: 'full' }, { path: 'index', component: SamplesIndexComponent }, { path: 'samples-navigation', component: SamplesNavigationComponent }, + { + path: 'samples-navigation-with-condensed-header', + component: SamplesNavigationCondensedHeaderComponent, + }, { path: 'samples-sidebar', component: SamplesSidebarComponent }, { path: 'samples-sidebar-with-searchbar', component: SamplesSidebarWithSearchbarComponent }, ]; @@ -22,6 +27,7 @@ const routes: Routes = [ declarations: [ AppComponent, SamplesNavigationComponent, + SamplesNavigationCondensedHeaderComponent, SamplesSidebarComponent, SamplesSidebarWithSearchbarComponent, ], diff --git a/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/navigation/navigation.component.html b/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/navigation/navigation.component.html index 71d249541e..ca43b25572 100644 --- a/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/navigation/navigation.component.html +++ b/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/navigation/navigation.component.html @@ -1,35 +1,35 @@
- + - +
- + - +
@@ -42,18 +42,18 @@ [optionHeaderContent]="headerOptions" [optionDropdownContent]="myCustomOptions" > - + - + @@ -64,18 +64,18 @@ [optionHeaderContent]="headerOptions" [optionDropdownContent]="myCustomOptions" > - + - + diff --git a/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/navigation/navigation.component.spec.ts b/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/navigation/navigation.component.spec.ts index 16e17d36e7..3d7bf904a5 100644 --- a/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/navigation/navigation.component.spec.ts +++ b/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/navigation/navigation.component.spec.ts @@ -1,3 +1,4 @@ +import 'jasmine'; import { TestBed } from '@angular/core/testing'; import { SamplesNavigationComponent } from './navigation.component'; diff --git a/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/samples-index.component.ts b/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/samples-index.component.ts index 5fadaaa14b..8ddbcc95b8 100644 --- a/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/samples-index.component.ts +++ b/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/samples-index.component.ts @@ -5,6 +5,7 @@ import { Component } from '@angular/core'; template: ` diff --git a/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/samples-navigation-condensed-header/samples-navigation-condensed-header.component.html b/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/samples-navigation-condensed-header/samples-navigation-condensed-header.component.html new file mode 100644 index 0000000000..0821c32829 --- /dev/null +++ b/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/samples-navigation-condensed-header/samples-navigation-condensed-header.component.html @@ -0,0 +1,17 @@ +
+ + + + + + + +
diff --git a/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/samples-navigation-condensed-header/samples-navigation-condensed-header.component.spec.ts b/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/samples-navigation-condensed-header/samples-navigation-condensed-header.component.spec.ts new file mode 100644 index 0000000000..db578a736e --- /dev/null +++ b/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/samples-navigation-condensed-header/samples-navigation-condensed-header.component.spec.ts @@ -0,0 +1,22 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SamplesNavigationCondensedHeaderComponent } from './samples-navigation-condensed-header.component'; + +describe('SamplesNavigationCondensedHeaderComponent', () => { + let component: SamplesNavigationCondensedHeaderComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [SamplesNavigationCondensedHeaderComponent], + }).compileComponents(); + + fixture = TestBed.createComponent(SamplesNavigationCondensedHeaderComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/samples-navigation-condensed-header/samples-navigation-condensed-header.component.ts b/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/samples-navigation-condensed-header/samples-navigation-condensed-header.component.ts new file mode 100644 index 0000000000..e971b3646f --- /dev/null +++ b/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/samples-navigation-condensed-header/samples-navigation-condensed-header.component.ts @@ -0,0 +1,7 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-samples-navigation-condensed-header', + templateUrl: './samples-navigation-condensed-header.component.html', +}) +export class SamplesNavigationCondensedHeaderComponent {} diff --git a/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/sidebar-with-searchbar/sidebar-with-searchbar.component.html b/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/sidebar-with-searchbar/sidebar-with-searchbar.component.html index 9ad11e04e1..e9741bc70e 100644 --- a/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/sidebar-with-searchbar/sidebar-with-searchbar.component.html +++ b/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/sidebar-with-searchbar/sidebar-with-searchbar.component.html @@ -11,7 +11,7 @@
-
+

Content

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor diff --git a/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/sidebar/sidebar.component.html b/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/sidebar/sidebar.component.html index aa2c812d15..0772621393 100644 --- a/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/sidebar/sidebar.component.html +++ b/packages/intranet-header-workspace/projects/intranet-header-showcase/src/samples/sidebar/sidebar.component.html @@ -3,7 +3,7 @@

-
+

Content

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor diff --git a/packages/intranet-header-workspace/projects/intranet-header-showcase/tsconfig.app.json b/packages/intranet-header-workspace/projects/intranet-header-showcase/tsconfig.app.json index fcc1452a19..25de0649c0 100644 --- a/packages/intranet-header-workspace/projects/intranet-header-showcase/tsconfig.app.json +++ b/packages/intranet-header-workspace/projects/intranet-header-showcase/tsconfig.app.json @@ -5,5 +5,6 @@ "outDir": "../../out-tsc/app", "types": [] }, - "include": ["src/**/*.ts"] + "include": ["src/**/*.ts"], + "exclude": ["**/*.spec.ts"] } diff --git a/packages/intranet-header-workspace/projects/intranet-header/CHANGELOG.md b/packages/intranet-header-workspace/projects/intranet-header/CHANGELOG.md index 353b1dbced..239dab278c 100644 --- a/packages/intranet-header-workspace/projects/intranet-header/CHANGELOG.md +++ b/packages/intranet-header-workspace/projects/intranet-header/CHANGELOG.md @@ -1,47 +1,53 @@ # @swisspost/design-system-intranet-header -## 8.6.0 +## 9.0.0-next.6 ### Patch Changes - Updated dependencies: - - @swisspost/design-system-styles@8.6.0 + - @swisspost/design-system-styles@9.0.0-next.6 -## 8.5.0 +## 9.0.0-next.5 ### Patch Changes - Updated dependencies: - - @swisspost/design-system-styles@8.5.0 + - @swisspost/design-system-styles@9.0.0-next.5 -## 8.4.0 +## 9.0.0-next.4 ### Patch Changes - Updated dependencies: - - @swisspost/design-system-styles@8.4.0 + - @swisspost/design-system-styles@9.0.0-next.4 -## 8.3.0 +## 9.0.0-next.3 ### Patch Changes -- Improve accessibility of intranet header by adding an alternative text to the user profile image. (by [@leagrdv](https://github.com/leagrdv) with [#3711](https://github.com/swisspost/design-system/pull/3711)) - Updated dependencies: - - @swisspost/design-system-styles@8.3.0 + - @swisspost/design-system-styles@9.0.0-next.3 -## 8.2.2 +## 9.0.0-next.2 ### Patch Changes - Updated dependencies: - - @swisspost/design-system-styles@8.2.2 + - @swisspost/design-system-styles@9.0.0-next.2 -## 8.2.1 +## 9.0.0-next.1 ### Patch Changes - Updated dependencies: - - @swisspost/design-system-styles@8.2.1 + - @swisspost/design-system-styles@9.0.0-next.1 + +## 9.0.0-next.0 + +### Patch Changes + +- Updated dependencies: + - @swisspost/design-system-styles@9.0.0-next.0 ## 8.2.0 diff --git a/packages/intranet-header-workspace/projects/intranet-header/package.json b/packages/intranet-header-workspace/projects/intranet-header/package.json index 18c05006c4..4d52cd734e 100644 --- a/packages/intranet-header-workspace/projects/intranet-header/package.json +++ b/packages/intranet-header-workspace/projects/intranet-header/package.json @@ -8,7 +8,7 @@ "type": "git", "url": "https://github.com/swisspost/design-system.git" }, - "homepage": "https://swisspost-web-frontend.netlify.app", + "homepage": "https://design-system.post.ch", "bugs": { "url": "https://github.com/swisspost/design-system/issues" }, @@ -22,7 +22,7 @@ "tslib": "2.6.3" }, "devDependencies": { - "@swisspost/design-system-intranet-header-workspace": "workspace:3.0.27" + "@swisspost/design-system-intranet-header-workspace": "workspace:3.0.22" }, "peerDependencies": { "@angular/common": "^16.0.0 || ^17.0.0 || ^18.0.0", diff --git a/packages/intranet-header-workspace/projects/intranet-header/src/lib/swisspost-intranet-header.component.html b/packages/intranet-header-workspace/projects/intranet-header/src/lib/swisspost-intranet-header.component.html index 864ead9012..cf2c7264e7 100644 --- a/packages/intranet-header-workspace/projects/intranet-header/src/lib/swisspost-intranet-header.component.html +++ b/packages/intranet-header-workspace/projects/intranet-header/src/lib/swisspost-intranet-header.component.html @@ -2,37 +2,44 @@