Skip to content

Commit

Permalink
chore: upgrade design factory
Browse files Browse the repository at this point in the history
  • Loading branch information
fpaul-1A committed Feb 9, 2024
1 parent 996daed commit 2df151e
Show file tree
Hide file tree
Showing 18 changed files with 89 additions and 90 deletions.
5 changes: 3 additions & 2 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ nodeLinker: pnp

packageExtensions:
"@design-factory/design-factory@*":
peerDependencies:
"@angular/router": ~17.0.4
dependencies:
"@agnos-ui/style-bootstrap": "^0.1.1"
"@ng-select/ng-select": "~12.0.7"
"@nx/angular@^18.0.0":
dependencies:
"@angular-devkit/build-angular": ~17.0.3
Expand Down
11 changes: 5 additions & 6 deletions apps/chrome-devtools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,8 @@
"@angular/platform-browser": "~17.0.4",
"@angular/platform-browser-dynamic": "~17.0.4",
"@angular/router": "~17.0.4",
"@design-factory/design-factory": "^15.2.2",
"@design-factory/design-factory": "^17.0.0",
"@ng-bootstrap/ng-bootstrap": "^16.0.0",
"@ng-select/ng-select": "~12.0.0",
"@ngrx/entity": "~17.1.0",
"@ngrx/store": "~17.1.0",
"@o3r/application": "workspace:^",
Expand All @@ -96,10 +95,10 @@
"@o3r/localization": "workspace:^",
"@o3r/rules-engine": "workspace:^",
"@popperjs/core": "^2.11.5",
"ag-grid-angular": "~31.0.0",
"ag-grid-community": "~31.0.0",
"bootstrap": "5.2.0",
"bootstrap-icons": "^1.10.5",
"ag-grid-angular": "~31.0.3",
"ag-grid-community": "~31.0.3",
"bootstrap": "5.3.2",
"bootstrap-icons": "^1.11.3",
"rxjs": "^7.8.1",
"tslib": "^2.5.3",
"zone.js": "~0.14.2"
Expand Down
3 changes: 2 additions & 1 deletion apps/chrome-devtools/src/styles/index.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@use '@design-factory/design-factory' with (
$prefix: bs-,
$df-spinner-circumference: 2rem,
$font-path: '@design-factory/design-factory/assets/fonts'
$font-path: '@design-factory/design-factory/assets/fonts',
$utilities-bg: ()
);
@use "bootstrap-icons/font/bootstrap-icons";
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 6 additions & 7 deletions apps/showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,9 @@
"@angular/platform-browser": "~17.0.4",
"@angular/platform-browser-dynamic": "~17.0.4",
"@angular/router": "~17.0.4",
"@design-factory/design-factory": "^15.2.2",
"@design-factory/design-factory": "^17.0.0",
"@formatjs/intl-numberformat": "~8.10.0",
"@ng-bootstrap/ng-bootstrap": "^16.0.0",
"@ng-select/ng-select": "~12.0.0",
"@ngrx/effects": "~17.1.0",
"@ngrx/entity": "~17.1.0",
"@ngrx/store": "~17.1.0",
Expand All @@ -59,10 +58,10 @@
"@o3r/rules-engine": "workspace:^",
"@o3r/testing": "workspace:^",
"@popperjs/core": "^2.11.5",
"ag-grid-angular": "~31.0.0",
"ag-grid-community": "~31.0.0",
"bootstrap": "5.2.0",
"bootstrap-icons": "^1.10.5",
"ag-grid-angular": "~31.0.3",
"ag-grid-community": "~31.0.3",
"bootstrap": "5.3.2",
"bootstrap-icons": "^1.11.3",
"highlight.js": "^11.8.0",
"intl-messageformat": "~10.5.1",
"ngx-highlightjs": "^10.0.0",
Expand Down Expand Up @@ -93,7 +92,7 @@
"@playwright/test": "~1.41.0",
"@schematics/angular": "~17.0.3",
"@stylistic/eslint-plugin-ts": "^1.5.4",
"@types/bootstrap": "^5.2.6",
"@types/bootstrap": "^5.2.10",
"@types/jest": "~29.5.2",
"@types/node": "^20.0.0",
"@typescript-eslint/eslint-plugin": "^6.19.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
{
"type": "initial",
"maximumWarning": "500kb",
"maximumError": "2mb"
"maximumError": "2.2mb"
},
{
"type": "anyComponentStyle",
Expand Down
6 changes: 3 additions & 3 deletions apps/showcase/src/app/rules-engine/rules-engine.template.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ <h2 id="rules-engine-example">Example</h2>
</p>
<a href="https://github.com/AmadeusITGroup/otter/blob/main/apps/showcase/src/components/showcase/rules-engine" target="_blank" rel="noopener">Source code</a>
<ul ngbNav class="nav nav-tabs mt-3">
<li ngbNavItem class="nav-item">
<li ngbNavItem class="nav-item" role="presentation">
<a ngbNavLink class="nav-link" [class.active]="activeRuleTab === 'configuration'" (click)="activateRuleTab('configuration')">Configuration rule</a>
</li>
<li ngbNavItem class="nav-item">
<li ngbNavItem class="nav-item" role="presentation">
<a ngbNavLink class="nav-link" [class.active]="activeRuleTab === 'localization'" (click)="activateRuleTab('localization')">Localization rule</a>
</li>
<li ngbNavItem class="nav-item">
<li ngbNavItem class="nav-item" role="presentation">
<a ngbNavLink class="nav-link" [class.active]="activeRuleTab === 'dynamic-content'" (click)="activateRuleTab('dynamic-content')">Dynamic content rule</a>
</li>
<li class="nav-item">
Expand Down
23 changes: 3 additions & 20 deletions apps/showcase/src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
$prefix: bs-,
$df-spinner-circumference: 2rem,
$font-path: '@design-factory/design-factory/assets/fonts',
$df-scrollspy-color: var(--bs-scrollspy-color)
$utilities-bg: ()
);
@use "bootstrap-icons/font/bootstrap-icons";
@import "highlight.js/styles/github.css";
Expand Down Expand Up @@ -34,31 +34,14 @@ h1, h2 {
}

.hljs-built_in, .hljs-symbol {
color: #bd5208;
color: #cb3544;
}
.hljs-name, .hljs-quote, .hljs-selector-tag, .hljs-selector-pseudo {
color: #218338;
color: #1f7e36;
}

// Start overrides of design factory
.navbar {
box-shadow: none;
}
@include design-factory.media-breakpoint-down(lg) {
.nav-pills .nav-link {
font-size: 1.25rem;
--bs-nav-link-padding-y: 1rem;
}
}
// End overrides

// Start temporary workarounds until we migrate back to bootstrap 5.3
:root {
--bs-primary-bg-subtle: #cfe2ff;
--bs-tertiary-color: #2125297f;
--bs-tertiary-bg: #f8f9fa;
}
.bg-body-tertiary {
background: var(--bs-tertiary-bg);
}
// End temporary workarounds
11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,8 @@
"@commitlint/cli": "^18.0.0",
"@commitlint/config-conventional": "^18.0.0",
"@compodoc/compodoc": "^1.1.19",
"@design-factory/design-factory": "^15.2.2",
"@design-factory/design-factory": "^17.0.0",
"@ng-bootstrap/ng-bootstrap": "^16.0.0",
"@ng-select/ng-select": "~12.0.0",
"@ngrx/effects": "~17.1.0",
"@ngrx/entity": "~17.1.0",
"@ngrx/router-store": "~17.1.0",
Expand Down Expand Up @@ -201,11 +200,11 @@
"@typescript-eslint/parser": "^6.11.0",
"@typescript-eslint/types": "^6.11.0",
"@yarnpkg/sdks": "^3.0.0",
"ag-grid-angular": "~31.0.0",
"ag-grid-community": "~31.0.0",
"ag-grid-angular": "~31.0.3",
"ag-grid-community": "~31.0.3",
"babel-loader": "^9.0.0",
"bootstrap": "5.2.0",
"bootstrap-icons": "^1.10.5",
"bootstrap": "5.3.2",
"bootstrap-icons": "^1.11.3",
"browserslist": "^4.21.4",
"concurrently": "^8.0.0",
"cpy-cli": "^5.0.0",
Expand Down
Loading

0 comments on commit 2df151e

Please sign in to comment.