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(core/application): app switch #1007

Merged
merged 54 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from 52 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
fff10ba
feat(core/appplication-header): additional integration features
danielleroux Nov 15, 2023
70cb442
chore: test storybook
danielleroux Nov 15, 2023
e360bd0
feat: add overflow handling
danielleroux Nov 16, 2023
028d58d
fix: cleanuo
danielleroux Nov 16, 2023
ab528fd
feat: add switcher to context
danielleroux Nov 17, 2023
619cf58
feat: example model
danielleroux Nov 20, 2023
aefa7b5
fix: build
danielleroux Nov 20, 2023
026fa3b
fix: remove storybook test
danielleroux Nov 20, 2023
7399072
fix: test
danielleroux Nov 21, 2023
dedda99
fix: add internal component to react and vue
danielleroux Nov 27, 2023
8f51228
fix: jsdocs
danielleroux Dec 11, 2023
c70df09
Merge remote-tracking branch 'origin/main' into feat/cross-app-navigaโ€ฆ
danielleroux Dec 13, 2023
62fbbce
docs: create
danielleroux Dec 13, 2023
f2273ad
docs: point
danielleroux Dec 14, 2023
5274676
docs: adjust structure
danielleroux Dec 14, 2023
1bbdfe2
docs: fix
danielleroux Dec 15, 2023
96ab9cf
fix: loading
danielleroux Dec 15, 2023
36d9952
fix: async
danielleroux Dec 15, 2023
016ad64
Merge remote-tracking branch 'origin/main' into feat/cross-app-navigaโ€ฆ
danielleroux Dec 15, 2023
3fd1631
fix: build
danielleroux Dec 18, 2023
8611269
docs: remove path information from component-doc
danielleroux Dec 18, 2023
b796526
fix: compo doc json
danielleroux Dec 18, 2023
27979e7
fix: update deps
danielleroux Dec 18, 2023
5c061d5
test: update snapshots
danielleroux Dec 18, 2023
477c1c4
docs: fix
danielleroux Dec 18, 2023
d1c3cb6
fix: clean
danielleroux Dec 18, 2023
6db4bf9
Merge remote-tracking branch 'origin/main' into feat/cross-app-navigaโ€ฆ
danielleroux Dec 18, 2023
43c57e7
fix: liniting
danielleroux Dec 18, 2023
c63bac7
test: add tests
danielleroux Dec 18, 2023
2677778
fix: update 4.9.0
danielleroux Dec 19, 2023
dd417ee
fix: naming
danielleroux Dec 19, 2023
ee37cfb
fix: Update packages/core/src/components/basic-navigation/basic-navigโ€ฆ
danielleroux Dec 19, 2023
5b536db
fix: Update packages/core/src/components/content/content.tsx
danielleroux Dec 19, 2023
9c821d4
fix: Update packages/core/src/components/dropdown/dropdown.tsx
danielleroux Dec 19, 2023
84f39cb
fix: Update packages/core/src/components/map-navigation/map-navigatioโ€ฆ
danielleroux Dec 19, 2023
ad376b9
fix: Update packages/core/src/components/menu-avatar-item/menu-avatarโ€ฆ
danielleroux Dec 19, 2023
f52f212
fix: Update packages/core/src/components/menu-avatar/menu-avatar.tsx
danielleroux Dec 19, 2023
139237c
fix: Update packages/documentation/docs/controls/_avatar_code.md
danielleroux Dec 19, 2023
9da34c9
fix: Update packages/documentation/docs/controls/application-frame/apโ€ฆ
danielleroux Dec 19, 2023
95d043d
fix: convert to rem
danielleroux Dec 19, 2023
1da1950
test: add application vrt tests
danielleroux Dec 19, 2023
23e86e7
docs: migrate docs
danielleroux Dec 20, 2023
ba5dd1d
docs: fix
danielleroux Dec 20, 2023
61143b3
fix: improve jsdocs output
danielleroux Dec 20, 2023
8b8d7c6
docs: fix to examplesByName
danielleroux Dec 20, 2023
7cf6359
docs: add angular examples
danielleroux Dec 21, 2023
f841556
docs: add react examples
danielleroux Dec 21, 2023
27d13bc
docs: add vue
danielleroux Dec 21, 2023
24a778a
docs: remove todos
danielleroux Dec 21, 2023
2a7e1a5
fix: examples
danielleroux Dec 21, 2023
07ac43b
Update packages/documentation/docs/controls/application-frame/applicaโ€ฆ
danielleroux Jan 8, 2024
0015092
Merge remote-tracking branch 'origin/main' into feat/cross-app-navigaโ€ฆ
danielleroux Jan 9, 2024
a2f0eee
ci: change path
danielleroux Jan 9, 2024
10d2d05
fix: test
danielleroux Jan 9, 2024
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
2 changes: 2 additions & 0 deletions .github/workflows/deploy-pages-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: Deploy to GitHub Pages (DEV Version)

on:
workflow_dispatch:
schedule:
- cron: '0 6 * * 1-4'

permissions:
contents: write
Expand Down
25 changes: 25 additions & 0 deletions packages/angular-test-app/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ import { RouterModule, Routes } from '@angular/router';
import AboutAndLegal from 'src/preview-examples/about-and-legal';
import ActionCard from 'src/preview-examples/action-card';
import AGGrid from 'src/preview-examples/aggrid';
import ApplicationExample from 'src/preview-examples/application';
import ApplicationAppSwitchExample from 'src/preview-examples/application-app-switch';
import ApplicationBreakpointExample from 'src/preview-examples/application-breakpoints';
import ApplicationHeaderExample from 'src/preview-examples/application-header';
import BasicNavigation from 'src/preview-examples/basic-navigation';
import BasicNavigationWithOutHeader from 'src/preview-examples/basic-navigation-without-header';
import Blind from 'src/preview-examples/blind';
Expand All @@ -28,6 +32,7 @@ import CategoryFilterSuggestions from 'src/preview-examples/category-filter-sugg
import Checkbox from 'src/preview-examples/checkbox';
import CheckboxIndeterminate from 'src/preview-examples/checkbox-indeterminate';
import Chip from 'src/preview-examples/chip';
import ContentExample from 'src/preview-examples/content';
import PageHeader from 'src/preview-examples/content-header';
import PageHeaderNoBack from 'src/preview-examples/content-header-no-back';
import DateDropdown from 'src/preview-examples/date-dropdown';
Expand Down Expand Up @@ -160,6 +165,26 @@ const routes: Routes = [
{
path: 'preview',
children: [
{
path: 'application',
component: ApplicationExample,
},
{
path: 'application-breakpoints',
component: ApplicationBreakpointExample,
},
{
path: 'application-app-switch',
component: ApplicationAppSwitchExample,
},
{
path: 'application-header',
component: ApplicationHeaderExample,
},
{
path: 'content',
component: ContentExample,
},
{
path: 'buttons',
component: Buttons,
Expand Down
10 changes: 10 additions & 0 deletions packages/angular-test-app/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ import { AgGridModule } from 'ag-grid-angular';
import AboutAndLegal from 'src/preview-examples/about-and-legal';
import ActionCard from 'src/preview-examples/action-card';
import AGGrid from 'src/preview-examples/aggrid';
import ApplicationExample from 'src/preview-examples/application';
import ApplicationAppSwitchExample from 'src/preview-examples/application-app-switch';
import ApplicationBreakpointExample from 'src/preview-examples/application-breakpoints';
import ApplicationHeaderExample from 'src/preview-examples/application-header';
import BasicNavigation from 'src/preview-examples/basic-navigation';
import BasicNavigationWithOutHeader from 'src/preview-examples/basic-navigation-without-header';
import Blind from 'src/preview-examples/blind';
Expand All @@ -35,6 +39,7 @@ import CategoryFilterSuggestions from 'src/preview-examples/category-filter-sugg
import Checkbox from 'src/preview-examples/checkbox';
import CheckboxIndeterminate from 'src/preview-examples/checkbox-indeterminate';
import Chip from 'src/preview-examples/chip';
import ContentExample from 'src/preview-examples/content';
import ContentHeader from 'src/preview-examples/content-header';
import ContentHeaderNoBack from 'src/preview-examples/content-header-no-back';
import DateDropdown from 'src/preview-examples/date-dropdown';
Expand Down Expand Up @@ -142,7 +147,12 @@ import { NavigationTestComponent } from './components/navigation-test.component'

@NgModule({
declarations: [
ApplicationExample,
ApplicationBreakpointExample,
ApplicationAppSwitchExample,
ApplicationHeaderExample,
AppComponent,
ContentExample,
Buttons,
ButtonGroup,
AGGrid,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<ix-application>
<ix-application-header>
<div class="placeholder-logo" slot="logo"></div>
</ix-application-header>
<ix-menu #menu>
<ix-menu-about>
<ix-menu-about-item label="Tab 1">Content 1</ix-menu-about-item>
<ix-menu-about-item label="Tab 2">Content 2</ix-menu-about-item>
</ix-menu-about>
</ix-menu>
</ix-application>
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,7 @@ import { AfterViewInit, Component, ElementRef, ViewChild } from '@angular/core';

@Component({
selector: 'app-example',
template: `
<ix-basic-navigation>
<div class="placeholder-logo" slot="logo"></div>
<ix-menu #menu>
<ix-menu-about>
<ix-menu-about-item label="Tab 1">Content 1</ix-menu-about-item>
<ix-menu-about-item label="Tab 2">Content 2</ix-menu-about-item>
</ix-menu-about>
</ix-menu>
</ix-basic-navigation>
`,
templateUrl: './about-and-legal.html',
})
export default class AboutAndLegal implements AfterViewInit {
@ViewChild('menu', { read: ElementRef })
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<ix-application [appSwitchConfig]="appSwitchConfig">
<ix-application-header name="My Application">
<div class="placeholder-logo" slot="logo"></div>
</ix-application-header>
<ix-menu>
<ix-menu-item>Item 1</ix-menu-item>
<ix-menu-item>Item 2</ix-menu-item>
</ix-menu>

<ix-content>
<ix-content-header
slot="header"
header-title="My Content Page"
>
</ix-content-header>
</ix-content>
</ix-application>
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
* SPDX-FileCopyrightText: 2023 Siemens AG
*
* SPDX-License-Identifier: MIT
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

import { Component } from '@angular/core';
import { AppSwitchConfiguration } from '@siemens/ix';

@Component({
selector: 'app-example',
templateUrl: './application-app-switch.html',
})
export default class ApplicationAppSwitchExample {
appSwitchConfig: AppSwitchConfiguration = {
i18nAppSwitch: 'Switch to Application',
currentAppId: 'demo-app-2',
apps: [
{
id: 'demo-app-1',
name: 'Floor App',
iconSrc: 'https://www.svgrepo.com/show/530661/genetic-data.svg',
url: 'https://ix.siemens.io/',
description: 'Example description for floor app',
target: '_self',
},
{
id: 'demo-app-2',
name: 'Calculator App',
iconSrc: 'https://www.svgrepo.com/show/530661/genetic-data.svg',
url: 'https://ix.siemens.io/',
description: 'Example description for floor app',
target: '_self',
},
],
};
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<ix-application application-name="Application name" [breakpoints]="breakpoints">
<ix-application-header name="My Application">
<div class="placeholder-logo" slot="logo"></div>

<ix-dropdown-button variant="secondary" label="Select config" ghost>
<ix-dropdown-item label="Config 1"></ix-dropdown-item>
<ix-dropdown-item label="Config 2"></ix-dropdown-item>
<ix-dropdown-item label="Config 3"></ix-dropdown-item>
</ix-dropdown-button>

<ix-avatar>
<ix-dropdown-item label="Action 1"></ix-dropdown-item>
<ix-dropdown-item label="Action 2"></ix-dropdown-item>
<ix-dropdown-item label="Action 3"></ix-dropdown-item>
</ix-avatar>
</ix-application-header>

<ix-menu>
<ix-menu-item>Item 1</ix-menu-item>
<ix-menu-item>Item 2</ix-menu-item>
</ix-menu>
<ix-content>
<ix-content-header
slot="header"
header-title="Choose breakpoint"
>
</ix-content-header>

<input id="small" type="radio" name="layout" value="sm" (change)="onCheckedChange('sm')" />
<label for="small">Small</label>

<input id="medium" type="radio" name="layout" value="md" (change)="onCheckedChange('md')" checked />
<label for="medium">Medium</label>

<input id="large" type="radio" name="layout" value="lg" (change)="onCheckedChange('lg')" />
<label for="large">Large</label>
</ix-content>
</ix-application>
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* SPDX-FileCopyrightText: 2023 Siemens AG
*
* SPDX-License-Identifier: MIT
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
import { Component } from '@angular/core';
import { Breakpoint } from '@siemens/ix';

@Component({
selector: 'app-example',
templateUrl: './application-breakpoints.html',
})
export default class ApplicationBreakpointExample {
breakpoints: Breakpoint[] = ['md'];

onCheckedChange(breakpoint: Breakpoint) {
this.breakpoints = [breakpoint];
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<ix-application-header name="My Application">
<div class="placeholder-logo" slot="logo"></div>

<ix-icon-button ghost icon="checkboxes"></ix-icon-button>
<ix-icon-button ghost icon="checkboxes"></ix-icon-button>
<ix-icon-button ghost icon="checkboxes"></ix-icon-button>

<ix-dropdown-button variant="secondary" label="Select config" ghost>
<ix-dropdown-item label="Config 1"></ix-dropdown-item>
<ix-dropdown-item label="Config 2"></ix-dropdown-item>
<ix-dropdown-item label="Config 3"></ix-dropdown-item>
</ix-dropdown-button>

<ix-avatar>
<ix-dropdown-item label="Action 1"></ix-dropdown-item>
<ix-dropdown-item label="Action 2"></ix-dropdown-item>
<ix-dropdown-item label="Action 3"></ix-dropdown-item>
</ix-avatar>
</ix-application-header>
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/*
* SPDX-FileCopyrightText: 2023 Siemens AG
*
* SPDX-License-Identifier: MIT
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

import { Component } from '@angular/core';

@Component({
selector: 'app-example',
templateUrl: './application-header.html',
})
export default class ApplicationHeaderExample {}
17 changes: 17 additions & 0 deletions packages/angular-test-app/src/preview-examples/application.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<ix-application>
<ix-application-header name="My Application">
<div class="placeholder-logo" slot="logo"></div>
</ix-application-header>
<ix-menu>
<ix-menu-item>Item 1</ix-menu-item>
<ix-menu-item>Item 2</ix-menu-item>
</ix-menu>

<ix-content>
<ix-content-header
slot="header"
header-title="My Content Page"
>
</ix-content-header>
</ix-content>
</ix-application>
16 changes: 16 additions & 0 deletions packages/angular-test-app/src/preview-examples/application.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/*
* SPDX-FileCopyrightText: 2023 Siemens AG
*
* SPDX-License-Identifier: MIT
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

import { Component } from '@angular/core';

@Component({
selector: 'app-example',
templateUrl: './application.html',
})
export default class ApplicationExample {}
13 changes: 13 additions & 0 deletions packages/angular-test-app/src/preview-examples/content.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<ix-content>
<ix-content-header slot="header" header-title="My Content Page">
</ix-content-header>
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.
</ix-content>
16 changes: 16 additions & 0 deletions packages/angular-test-app/src/preview-examples/content.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/*
* SPDX-FileCopyrightText: 2023 Siemens AG
*
* SPDX-License-Identifier: MIT
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

import { Component } from '@angular/core';

@Component({
selector: 'app-example',
templateUrl: './content.html',
})
export default class ContentExample {}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ix-basic-navigation>
<ix-application>
<ix-menu>
<ix-menu-item home icon="home">Home</ix-menu-item>
<ix-menu-item icon="globe">Normal Tab</ix-menu-item>
Expand All @@ -7,4 +7,4 @@
<ix-menu-item icon="globe">Nested Tab</ix-menu-item>
</ix-menu-category>
</ix-menu>
</ix-basic-navigation>
</ix-application>
13 changes: 13 additions & 0 deletions packages/angular-test-app/src/preview-examples/popover-news.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<ix-application>
<ix-application-header>
<div class="placeholder-logo" slot="logo"></div>
</ix-application-header>
<ix-menu>
<ix-menu-about>
<ix-menu-about-item label="Example"> </ix-menu-about-item>
</ix-menu-about>
<ix-menu-about-news label="Test" show about-item-label="Example">
Test
</ix-menu-about-news>
</ix-menu>
</ix-application>
14 changes: 1 addition & 13 deletions packages/angular-test-app/src/preview-examples/popover-news.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,6 @@ import { Component } from '@angular/core';

@Component({
selector: 'app-example',
template: `
<ix-basic-navigation>
<div class="placeholder-logo" slot="logo"></div>
<ix-menu>
<ix-menu-about>
<ix-menu-about-item label="Example"> </ix-menu-about-item>
</ix-menu-about>
<ix-menu-about-news label="Test" show about-item-label="Example">
Test
</ix-menu-about-news>
</ix-menu>
</ix-basic-navigation>
`,
templateUrl: './popover-news.html',
})
export default class PopoverNews {}
Loading
Loading