Skip to content
Closed
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
35 changes: 25 additions & 10 deletions packages/angular-standalone-test-app/src/app/app.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,26 +128,26 @@ export const routes: Routes = [
),
},
{
path: 'button-ghost',
path: 'button-tertiary',
loadComponent: () =>
import('../preview-examples/button-ghost').then((m) => m.default),
import('../preview-examples/button-tertiary').then((m) => m.default),
},
{
path: 'button-grey',
path: 'button-secondary',
loadComponent: () =>
import('../preview-examples/button-grey').then((m) => m.default),
import('../preview-examples/button-secondary').then((m) => m.default),
},
{
path: 'button-grey-ghost',
path: 'button-subtle-tertiary',
loadComponent: () =>
import('../preview-examples/button-grey-ghost').then(
import('../preview-examples/button-subtle-tertiary').then(
(m) => m.default
),
},
{
path: 'button-grey-secondary',
path: 'button-subtle-secondary',
loadComponent: () =>
import('../preview-examples/button-grey-secondary').then(
import('../preview-examples/button-subtle-secondary').then(
(m) => m.default
),
},
Expand All @@ -162,9 +162,9 @@ export const routes: Routes = [
import('../preview-examples/button-loading').then((m) => m.default),
},
{
path: 'button-secondary',
path: 'button-subtle-primary',
loadComponent: () =>
import('../preview-examples/button-secondary').then((m) => m.default),
import('../preview-examples/button-subtle-primary').then((m) => m.default),
},
{
path: 'button-text-icon',
Expand All @@ -186,6 +186,21 @@ export const routes: Routes = [
loadComponent: () =>
import('../preview-examples/buttons').then((m) => m.default),
},
{
path: 'button-danger-primary',
loadComponent: () =>
import('../preview-examples/button-danger-primary').then((m) => m.default),
},
{
path: 'button-danger-secondary',
loadComponent: () =>
import('../preview-examples/button-danger-secondary').then((m) => m.default),
},
{
path: 'button-danger-tertiary',
loadComponent: () =>
import('../preview-examples/button-danger-tertiary').then((m) => m.default),
},
{
path: 'card',
loadComponent: () =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { IxButton } from '@siemens/ix-angular/standalone';
@Component({
selector: 'app-example',
imports: [IxButton],
templateUrl: './button-danger-outline.html',
styleUrls: ['./button-danger-outline.css'],
templateUrl: './button-danger-primary.html',
styleUrls: ['./button-danger-primary.css'],
})
export default class Buttons {}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { IxButton } from '@siemens/ix-angular/standalone';
@Component({
selector: 'app-example',
imports: [IxButton],
templateUrl: './button-danger.html',
styleUrls: ['./button-danger.css'],
templateUrl: './button-danger-secondary.html',
styleUrls: ['./button-danger-secondary.css'],
})
export default class Buttons {}
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
LICENSE file in the root directory of this source tree.
-->

<ix-button variant="subtle-tertiary"> Button </ix-button>
<ix-button disabled variant="subtle-tertiary"> Button </ix-button>
<ix-button variant="danger-tertiary"> Button </ix-button>
<ix-button disabled variant="danger-tertiary"> Button </ix-button>
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ import { IxButton } from '@siemens/ix-angular/standalone';
@Component({
selector: 'app-example',
imports: [IxButton],
templateUrl: './button-danger-ghost.html',
templateUrl: './button-danger-tertiary.html',
})
export default class Buttons {}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ import { IxButton } from '@siemens/ix-angular/standalone';
@Component({
selector: 'app-example',
imports: [IxButton],
template: ` <ix-button variant="subtle-primary"> Button </ix-button>
<ix-button variant="subtle-primary" disabled> Button </ix-button>`,
template: `
<ix-button variant="secondary"> Button </ix-button>
<ix-button disabled variant="secondary"> Button </ix-button>
`,
styleUrls: ['./button-secondary.css'],
})
export default class Buttons {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* SPDX-FileCopyrightText: 2025 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 { IxButton } from '@siemens/ix-angular/standalone';

@Component({
selector: 'app-example',
imports: [IxButton],
template: ` <ix-button variant="subtle-primary"> Button </ix-button>
<ix-button variant="subtle-primary" disabled> Button </ix-button>`,
styleUrls: ['./button-subtle-primary.css'],
})
export default class Buttons {}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ import { IxButton } from '@siemens/ix-angular/standalone';
<ix-button variant="subtle-secondary"> Button </ix-button>
<ix-button disabled variant="subtle-secondary"> Button </ix-button>
`,
styleUrls: ['./button-grey-secondary.css'],
styleUrls: ['./button-subtle-secondary.css'],
})
export default class Buttons {}
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import { IxButton } from '@siemens/ix-angular/standalone';
@Component({
selector: 'app-example',
imports: [IxButton],
template: buttonGreyGhost(),
styleUrls: ['./button-grey-ghost.css'],
template: buttonSubtleTertiary(),
styleUrls: ['./button-subtle-tertiary.css'],
})
export default class Buttons {}

function buttonGreyGhost(): string | undefined {
function buttonSubtleTertiary(): string | undefined {
return `
<ix-button variant="subtle-tertiary">
Button
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ import { IxButton } from '@siemens/ix-angular/standalone';
<ix-button variant="tertiary"> Button </ix-button>
<ix-button variant="tertiary" disabled> Button </ix-button>
`,
styleUrls: ['./button-ghost.css'],
styleUrls: ['./button-tertiary.css'],
})
export default class Buttons {}
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ <h3>Styled Link Buttons</h3>
<ix-button href="https://siemens.com" variant="secondary"
>Secondary Link</ix-button
>
<ix-button href="https://siemens.com" variant="danger"
<ix-button href="https://siemens.com" variant="danger-primary"
>Danger Link</ix-button
>
</div>

<div style="margin-bottom: 1rem">
<h3>Outline and Ghost Links</h3>
<ix-button href="https://siemens.com" outline> Outline Link </ix-button>
<ix-button href="https://siemens.com" ghost> Ghost Link </ix-button>
<h3>Secondary and Tertiary Links</h3>
<ix-button href="https://siemens.com" variant="secondary"> Secondary Link </ix-button>
<ix-button href="https://siemens.com" variant="tertiary"> Tertiary Link </ix-button>
</div>

<div style="margin-bottom: 1rem">
Expand Down
45 changes: 30 additions & 15 deletions packages/angular-test-app/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,20 @@ import BlindVariants from '../preview-examples/blind-variants';
import Breadcrumb from '../preview-examples/breadcrumb';
import BreadcrumbNextItems from '../preview-examples/breadcrumb-next-items';
import BreadcrumbTruncate from '../preview-examples/breadcrumb-truncate';
import ButtonGhost from '../preview-examples/button-ghost';
import ButtonGrey from '../preview-examples/button-grey';
import ButtonGreyGhost from '../preview-examples/button-grey-ghost';
import ButtonGreySecondary from '../preview-examples/button-grey-secondary';
import ButtonTertiary from '../preview-examples/button-tertiary';
import ButtonSecondary from '../preview-examples/button-secondary';
import ButtonSubtleTertiary from '../preview-examples/button-subtle-tertiary';
import ButtonSubtleSecondary from '../preview-examples/button-subtle-secondary';
import ButtonGroup from '../preview-examples/button-group';
import ButtonLoading from '../preview-examples/button-loading';
import ButtonSecondary from '../preview-examples/button-secondary';
import ButtonSubtlePrimary from '../preview-examples/button-subtle-primary';
import ButtonTextIcon from '../preview-examples/button-text-icon';
import ButtonWithIcon from '../preview-examples/button-with-icon';
import ButtonWithLink from '../preview-examples/button-with-link';
import Buttons from '../preview-examples/buttons';
import ButtonDangerPrimary from '../preview-examples/button-danger-primary';
import ButtonDangerSecondary from '../preview-examples/button-danger-secondary';
import ButtonDangerTertiary from '../preview-examples/button-danger-tertiary';
import Card from '../preview-examples/card';
import CardList from '../preview-examples/card-list';
import CategoryFilter from '../preview-examples/category-filter';
Expand Down Expand Up @@ -334,20 +337,20 @@ const routes: Routes = [
component: Breadcrumb,
},
{
path: 'button-ghost',
component: ButtonGhost,
path: 'button-tertiary',
component: ButtonTertiary,
},
{
path: 'button-grey-ghost',
component: ButtonGreyGhost,
path: 'button-secondary',
component: ButtonSecondary,
},
{
path: 'button-grey-secondary',
component: ButtonGreySecondary,
path: 'button-subtle-secondary',
component: ButtonSubtleSecondary,
},
{
path: 'button-grey',
component: ButtonGrey,
path: 'button-subtle-tertiary',
component: ButtonSubtleTertiary,
},
Comment on lines +340 to 354
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The route path updates for button-secondary and button-subtle-tertiary seem to be swapped. The old button-grey-ghost path should now be button-subtle-tertiary, and the old button-grey path should be button-secondary. The current implementation has this reversed. This is inconsistent with the changes in packages/angular-standalone-test-app/src/app/app.routes.ts. Please correct the paths and components.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file names are correctly mapped to their variant values, not to old file names.

{
path: 'button-group',
Expand All @@ -358,8 +361,8 @@ const routes: Routes = [
component: ButtonLoading,
},
{
path: 'button-secondary',
component: ButtonSecondary,
path: 'button-subtle-primary',
component: ButtonSubtlePrimary,
},
{
path: 'button-text-icon',
Expand All @@ -373,6 +376,18 @@ const routes: Routes = [
path: 'button-with-link',
component: ButtonWithLink,
},
{
path: 'button-danger-primary',
component: ButtonDangerPrimary,
},
{
path: 'button-danger-secondary',
component: ButtonDangerSecondary,
},
{
path: 'button-danger-tertiary',
component: ButtonDangerTertiary,
},
{
path: 'buttons',
component: Buttons,
Expand Down
26 changes: 16 additions & 10 deletions packages/angular-test-app/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,20 @@ import BlindVariants from '../preview-examples/blind-variants';
import Breadcrumb from '../preview-examples/breadcrumb';
import BreadcrumbNextItems from '../preview-examples/breadcrumb-next-items';
import BreadcrumbTruncate from '../preview-examples/breadcrumb-truncate';
import ButtonGhost from '../preview-examples/button-ghost';
import ButtonGrey from '../preview-examples/button-grey';
import ButtonGreyGhost from '../preview-examples/button-grey-ghost';
import ButtonGreySecondary from '../preview-examples/button-grey-secondary';
import ButtonTertiary from '../preview-examples/button-tertiary';
import ButtonSecondary from '../preview-examples/button-secondary';
import ButtonSubtleTertiary from '../preview-examples/button-subtle-tertiary';
import ButtonSubtleSecondary from '../preview-examples/button-subtle-secondary';
import ButtonGroup from '../preview-examples/button-group';
import ButtonLoading from '../preview-examples/button-loading';
import ButtonSecondary from '../preview-examples/button-secondary';
import ButtonSubtlePrimary from '../preview-examples/button-subtle-primary';
import ButtonTextIcon from '../preview-examples/button-text-icon';
import ButtonWithIcon from '../preview-examples/button-with-icon';
import ButtonWithLink from '../preview-examples/button-with-link';
import Buttons from '../preview-examples/buttons';
import ButtonDangerPrimary from '../preview-examples/button-danger-primary';
import ButtonDangerSecondary from '../preview-examples/button-danger-secondary';
import ButtonDangerTertiary from '../preview-examples/button-danger-tertiary';
import Card from '../preview-examples/card';
import CardList from '../preview-examples/card-list';
import CategoryFilter from '../preview-examples/category-filter';
Expand Down Expand Up @@ -271,17 +274,20 @@ import WorkflowVertical from '../preview-examples/workflow-vertical';
BreadcrumbNextItems,
BreadcrumbTruncate,
Breadcrumb,
ButtonGhost,
ButtonGreyGhost,
ButtonGreySecondary,
ButtonGrey,
ButtonTertiary,
ButtonSecondary,
ButtonSubtleSecondary,
ButtonSubtleTertiary,
ButtonGroup,
ButtonLoading,
ButtonSecondary,
ButtonSubtlePrimary,
ButtonTextIcon,
ButtonWithIcon,
ButtonWithLink,
Buttons,
ButtonDangerPrimary,
ButtonDangerSecondary,
ButtonDangerTertiary,
Card,
CardList,
CategoryFilterSuggestions,
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { Component } from '@angular/core';
@Component({
standalone: false,
selector: 'app-example',
templateUrl: './button-danger-outline.html',
styleUrls: ['./button-danger-outline.css'],
templateUrl: './button-danger-primary.html',
styleUrls: ['./button-danger-primary.css'],
})
export default class Buttons {}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { Component } from '@angular/core';
@Component({
standalone: false,
selector: 'app-example',
templateUrl: './button-danger.html',
styleUrls: ['./button-danger.css'],
templateUrl: './button-danger-secondary.html',
styleUrls: ['./button-danger-secondary.css'],
})
export default class Buttons {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<ix-button variant="danger-tertiary"> Button </ix-button>
<ix-button disabled variant="danger-tertiary"> Button </ix-button>
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ import { Component } from '@angular/core';
@Component({
standalone: false,
selector: 'app-example',
templateUrl: './button-danger-ghost.html',
templateUrl: './button-danger-tertiary.html',
})
export default class Buttons {}
Loading
Loading