Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: intranet header condensed #4084

Merged
merged 12 commits into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/deploy-demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ name: Deploy Demo App Preview to Netlify
on:
workflow_run:
workflows: ['Build Demo App']
types:
- completed
types: [completed]

jobs:
deploy:
Expand Down
5 changes: 5 additions & 0 deletions packages/demo/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ import { LayoutContainerComponent } from './layout-container/layout-container.co
import { IntranetHeaderDemoRegularComponent } from './intranet-layout/components/intranet-header-demo-regular/intranet-header-demo-regular.component';
import { IntranetHeaderDemoBigSidebarComponent } from './intranet-layout/components/intranet-header-demo-big-sidebar/intranet-header-demo-big-sidebar.component';
import { IntranetHeaderDemoSmallSidebarComponent } from './intranet-layout/components/intranet-header-demo-small-sidebar/intranet-header-demo-small-sidebar.component';
import { IntranetHeaderDemoCondensedComponent } from './intranet-layout/components/intranet-header-demo-condensed/intranet-header-demo-condensed.component';
/* tslint:enable:max-line-length */

const routes: Routes = [
Expand Down Expand Up @@ -166,6 +167,10 @@ const routes: Routes = [
path: 'intranet-layout-sidebar-small-sidebar',
component: IntranetHeaderDemoSmallSidebarComponent,
},
{
path: 'intranet-layout-condensed',
component: IntranetHeaderDemoCondensedComponent,
},
],
},
];
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<section class="layout-container header-small">
<sp-intranet-header siteTitle="Condensed" searchUrl="/" [condenseHeader]="true">
<li class="nav-item"><a href="/postweb" class="col-auto py-3 px-5 nav-link">Home</a></li>
<li class="nav-item">
<a href="/postweb/post-informatik" class="col-auto py-3 px-5 nav-link" target="_self">
Post Informatik
</a>
</li>
<li class="nav-item"><a class="col-auto py-3 px-5 nav-link">HR-Portal</a></li>
<li class="nav-item">
<a href="/postweb/service-portal" class="col-auto py-3 px-5 nav-link">Service-Portal</a>
</li>
<li class="nav-item">
<a href="/postweb/die-post" class="col-auto py-3 px-5 nav-link">Die Post</a>
</li>
</sp-intranet-header>

<div class="container header-margin">
<main role="main" class="col-md-9 col-lg-10 p-3">
<h1>Content</h1>
<p>
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor
invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam
et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est
Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed
diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd
gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit
amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et
dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores
et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit
amet.
</p>
</main>
</div>
</section>
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { Component, Inject, LOCALE_ID } from '@angular/core';
import { HttpErrorResponse } from '@angular/common/http';
import { ErrorService } from '../../services/error.service';

@Component({
selector: 'app-intranet-header-condesed',
templateUrl: './intranet-header-demo-condensed.component.html',
styleUrls: ['../../intranet-layout.component.css'],
})
export class IntranetHeaderDemoCondensedComponent {
openedMenu = false;

constructor(@Inject(LOCALE_ID) public language: string, private errorService: ErrorService) {
// handle language for ngx-translate and for angular PIPE
// Handle unexpected errors
this.errorService.unexpectedErrorEvent.subscribe((response: HttpErrorResponse) => {
console.error('Unexpected error', response);
});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { HighlightProvider } from '../common/highlight.provider';
import { IntranetHeaderDemoRegularComponent } from './components/intranet-header-demo-regular/intranet-header-demo-regular.component';
import { IntranetHeaderDemoBigSidebarComponent } from './components/intranet-header-demo-big-sidebar/intranet-header-demo-big-sidebar.component';
import { IntranetHeaderDemoSmallSidebarComponent } from './components/intranet-header-demo-small-sidebar/intranet-header-demo-small-sidebar.component';
import { IntranetHeaderDemoCondensedComponent } from './components/intranet-header-demo-condensed/intranet-header-demo-condensed.component';

@NgModule({
imports: [CommonModule, RouterModule, NgbModule, SwissPostIntranetHeaderModule, HighlightModule],
Expand All @@ -16,11 +17,13 @@ import { IntranetHeaderDemoSmallSidebarComponent } from './components/intranet-h
IntranetHeaderDemoRegularComponent,
IntranetHeaderDemoBigSidebarComponent,
IntranetHeaderDemoSmallSidebarComponent,
IntranetHeaderDemoCondensedComponent,
],
exports: [
IntranetHeaderDemoRegularComponent,
IntranetHeaderDemoBigSidebarComponent,
IntranetHeaderDemoSmallSidebarComponent,
IntranetHeaderDemoCondensedComponent,
],
providers: [HighlightProvider.Config],
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -392,3 +392,24 @@ <h4 class="bold mt-5">Intranet-Header "postweb"</h4>
[languages]="['html', 'scss', 'css', 'typescript', 'javascript']"
></code>
</div>

gfellerph marked this conversation as resolved.
Show resolved Hide resolved
<h4 class="bold mt-5">With condensed top navigation</h4>
<div class="header-showcase-container p-huge-r">
<div class="header-showcase-page">
<iframe
title="Intranet-header example without top navigation and with sidenav"
src="/#/samples/intranet-layout-condensed"
class="w-100"
style="min-height: 500px"
></iframe>
</div>
</div>

<div class="container">
<span class="spacer"></span>
<code
class="block"
[highlight]="codeTemplateCond"
[languages]="['html', 'scss', 'css', 'typescript', 'javascript']"
></code>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ const CODE_TEMPLATE_SMALL =
require('!!raw-loader!./components/intranet-header-demo-small-sidebar/intranet-header-demo-small-sidebar.component.html').default;
const CODE_TEMPLATE_BIG =
require('!!raw-loader!./components/intranet-header-demo-big-sidebar/intranet-header-demo-big-sidebar.component.html').default;
const CODE_TEMPLATE_COND =
require('!!raw-loader!./components/intranet-header-demo-condensed/intranet-header-demo-condensed.component.html').default;

@Component({
selector: 'app-intranet-layout',
Expand All @@ -30,4 +32,5 @@ export class IntranetLayoutComponent {
codeTemplateSmall = CODE_TEMPLATE_SMALL;
codeTemplateBig = CODE_TEMPLATE_BIG;
codeTemplateReg = CODE_TEMPLATE_REG;
codeTemplateCond = CODE_TEMPLATE_COND;
}
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,19 @@ const meta: MetaComponent = {
},
},
},
condenseHeader: {
name: 'condenseHeader',
description: 'Display the navigation on one line',
control: 'boolean',
table: {
defaultValue: {
summary: 'false',
},
type: {
summary: 'boolean',
},
},
},
},
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
];
Expand All @@ -22,6 +27,7 @@ const routes: Routes = [
declarations: [
AppComponent,
SamplesNavigationComponent,
SamplesNavigationCondensedHeaderComponent,
SamplesSidebarComponent,
SamplesSidebarWithSearchbarComponent,
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'jasmine';
import { TestBed } from '@angular/core/testing';
import { SamplesNavigationComponent } from './navigation.component';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Component } from '@angular/core';
template: `
<ul>
<li><a href="samples-navigation">Samples navigation</a></li>
<li><a href="samples-navigation-with-condensed-header">Samples navigation with condensed header</a></li>
<li><a href="samples-sidebar">Samples sidebar</a></li>
<li><a href="samples-sidebar-with-searchbar">Samples sidebar with searchbar</a></li>
</ul>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<section class="preview">
<sp-intranet-header siteTitle="Condensed" searchUrl="/" [condenseHeader]="true">
<li class="nav-item"><a href="/postweb" class="col-auto py-3 px-5 nav-link">Home</a></li>
<li class="nav-item">
<a href="/postweb/post-informatik" class="col-auto py-3 px-5 nav-link" target="_self">
Post Informatik
</a>
</li>
<li class="nav-item"><a class="col-auto py-3 px-5 nav-link">HR-Portal</a></li>
<li class="nav-item">
<a href="/postweb/service-portal" class="col-auto py-3 px-5 nav-link">Service-Portal</a>
</li>
<li class="nav-item">
<a href="/postweb/die-post" class="col-auto py-3 px-5 nav-link">Die Post</a>
</li>
</sp-intranet-header>
</section>
Original file line number Diff line number Diff line change
@@ -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<SamplesNavigationCondensedHeaderComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [SamplesNavigationCondensedHeaderComponent],
}).compileComponents();

fixture = TestBed.createComponent(SamplesNavigationCondensedHeaderComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
Original file line number Diff line number Diff line change
@@ -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 {}
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
"outDir": "../../out-tsc/app",
"types": []
},
"include": ["src/**/*.ts"]
"include": ["src/**/*.ts"],
"exclude": ["**/*.spec.ts"]
}
Loading
Loading