Browse Source

update: theme-basic package for the latest upgrade (state management and html properties)

pull/25690/head
sumeyye 4 months ago
parent
commit
48d8b997b9
  1. 2
      npm/ng-packs/packages/theme-basic/project.json
  2. 25
      npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.html
  3. 3
      npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.ts
  4. 25
      npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html
  5. 2
      npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts

2
npm/ng-packs/packages/theme-basic/project.json

@ -31,7 +31,7 @@
"executor": "@nx/vitest:test",
"outputs": ["{options.reportsDirectory}"],
"options": {
"reportsDirectory": "../../coverage/packages/theme-basic"
"reportsDirectory": "{projectRoot}/../../coverage/packages/theme-basic"
}
}
}

25
npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.html

@ -4,7 +4,7 @@
style="min-height: 4rem"
>
<div class="container">
<abp-logo *abpReplaceableTemplate="{ componentKey: service.logoComponentKey }"></abp-logo>
<abp-logo *abpReplaceableTemplate="{ componentKey: service.logoComponentKey }" />
<button
class="navbar-toggler"
type="button"
@ -18,13 +18,14 @@
[class.overflow-hidden]="service.smallScreen"
id="main-navbar-collapse"
>
<ng-container *ngTemplateOutlet="!service.smallScreen ? navigations : null"></ng-container>
<ng-container *ngTemplateOutlet="!service.smallScreen ? navigations : null" />
@if (service.smallScreen) {
<div
[@collapseWithMargin]="service.isCollapsed ? 'collapsed' : 'expanded'"
class="abp-collapse-margin"
[class.abp-collapse-margin-collapsed]="service.isCollapsed"
>
<ng-container *ngTemplateOutlet="navigations"></ng-container>
<ng-container *ngTemplateOutlet="navigations" />
</div>
}
@ -33,18 +34,18 @@
*abpReplaceableTemplate="{
componentKey: service.routesComponentKey,
inputs: {
smallScreen: { value: service.smallScreen }
}
smallScreen: { value: service.smallScreen },
},
}"
class="mx-auto"
[smallScreen]="service.smallScreen"
></abp-routes>
/>
<abp-nav-items
*abpReplaceableTemplate="{
componentKey: service.navItemsComponentKey
componentKey: service.navItemsComponentKey,
}"
></abp-nav-items>
/>
</ng-template>
</div>
</div>
@ -52,12 +53,12 @@
<!-- [@slideFromBottom]="outlet.isActivated && outlet.activatedRoute?.routeConfig?.path" TODO: throws ExpressionChangedAfterItHasBeenCheck when animation is active. It should be fixed -->
<div class="container">
<abp-page-alert-container></abp-page-alert-container>
<abp-page-alert-container />
<abp-auth-wrapper
*abpReplaceableTemplate="{
componentKey: authWrapperKey
componentKey: authWrapperKey,
}"
>
<router-outlet #outlet="outlet"></router-outlet>
<router-outlet #outlet="outlet" />
</abp-auth-wrapper>
</div>

3
npm/ng-packs/packages/theme-basic/src/lib/components/account-layout/account-layout.component.ts

@ -8,12 +8,9 @@ import { NavItemsComponent } from '../nav-items/nav-items.component';
import { AuthWrapperComponent } from './auth-wrapper/auth-wrapper.component';
import { PageAlertContainerComponent } from '../page-alert-container/page-alert-container.component';
import { RouterOutlet } from '@angular/router';
import { collapseWithMargin } from '@abp/ng.theme.shared';
@Component({
selector: 'abp-layout-account',
templateUrl: './account-layout.component.html',
animations: [collapseWithMargin],
providers: [LayoutService, SubscriptionService],
imports: [
NgTemplateOutlet,

25
npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html

@ -4,7 +4,7 @@
style="min-height: 4rem"
>
<div class="container">
<abp-logo *abpReplaceableTemplate="{ componentKey: service.logoComponentKey }"></abp-logo>
<abp-logo *abpReplaceableTemplate="{ componentKey: service.logoComponentKey }" />
<button
class="navbar-toggler"
type="button"
@ -18,11 +18,14 @@
[class.overflow-hidden]="service.smallScreen"
id="main-navbar-collapse"
>
<ng-container *ngTemplateOutlet="!service.smallScreen ? navigations : null"></ng-container>
<ng-container *ngTemplateOutlet="!service.smallScreen ? navigations : null" />
@if (service.smallScreen) {
<div [@collapseWithMargin]="service.isCollapsed ? 'collapsed' : 'expanded'">
<ng-container *ngTemplateOutlet="navigations"></ng-container>
<div
class="abp-collapse-margin"
[class.abp-collapse-margin-collapsed]="service.isCollapsed"
>
<ng-container *ngTemplateOutlet="navigations" />
</div>
}
@ -31,18 +34,18 @@
*abpReplaceableTemplate="{
componentKey: service.routesComponentKey,
inputs: {
smallScreen: { value: service.smallScreen }
}
smallScreen: { value: service.smallScreen },
},
}"
class="mx-auto"
[smallScreen]="service.smallScreen"
></abp-routes>
/>
<abp-nav-items
*abpReplaceableTemplate="{
componentKey: service.navItemsComponentKey
componentKey: service.navItemsComponentKey,
}"
></abp-nav-items>
/>
</ng-template>
</div>
</div>
@ -50,7 +53,7 @@
<!-- [@slideFromBottom]="outlet.isActivated && outlet.activatedRoute?.routeConfig?.path" TODO: throws ExpressionChangedAfterItHasBeenCheck when animation is active. It should be fixed -->
<div class="container">
<abp-page-alert-container></abp-page-alert-container>
<abp-page-alert-container />
<router-outlet #outlet="outlet"></router-outlet>
<router-outlet #outlet="outlet" />
</div>

2
npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts

@ -1,5 +1,4 @@
import { eLayoutType, ReplaceableTemplateDirective, SubscriptionService } from '@abp/ng.core';
import { collapseWithMargin, slideFromBottom } from '@abp/ng.theme.shared';
import { AfterViewInit, Component, inject } from '@angular/core';
import { LayoutService } from '../../services/layout.service';
import { NgTemplateOutlet } from '@angular/common';
@ -12,7 +11,6 @@ import { NavItemsComponent } from '../nav-items/nav-items.component';
@Component({
selector: 'abp-layout-application',
templateUrl: './application-layout.component.html',
animations: [slideFromBottom, collapseWithMargin],
providers: [LayoutService, SubscriptionService],
imports: [
NgTemplateOutlet,

Loading…
Cancel
Save