Browse Source

refactor(theme-basic): move change-password & profile components

pull/1672/head
mehmet-erim 7 years ago
parent
commit
90aaac0da8
  1. 1
      npm/ng-packs/packages/core/src/lib/plugins/config.plugin.ts
  2. 12
      npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts
  3. 0
      npm/ng-packs/packages/theme-shared/src/lib/components/change-password/change-password.component.html
  4. 2
      npm/ng-packs/packages/theme-shared/src/lib/components/change-password/change-password.component.ts
  5. 2
      npm/ng-packs/packages/theme-shared/src/lib/components/index.ts
  6. 0
      npm/ng-packs/packages/theme-shared/src/lib/components/profile/profile.component.html
  7. 0
      npm/ng-packs/packages/theme-shared/src/lib/components/profile/profile.component.ts
  8. 15
      npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts

1
npm/ng-packs/packages/core/src/lib/plugins/config.plugin.ts

@ -58,6 +58,7 @@ function transformRoutes(routes: Routes = [], wrappers: ABP.FullRoute[] = []): a
if (transformed.length === length) {
transformed.push({
...route.data.routes,
path: route.path,
name: snq(() => route.data.routes.name, route.path),
children: route.data.routes.children || [],

12
npm/ng-packs/packages/theme-basic/src/lib/theme-basic.module.ts

@ -1,22 +1,20 @@
import { CoreModule } from '@abp/ng.core';
import { ThemeSharedModule } from '@abp/ng.theme.shared';
import { NgModule } from '@angular/core';
import { NgbCollapseModule, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
import { ChangePasswordComponent } from './components/change-password/change-password.component';
import { NgxValidateCoreModule } from '@ngx-validate/core';
import { NgxsModule } from '@ngxs/store';
import { ToastModule } from 'primeng/toast';
import { AccountLayoutComponent } from './components/account-layout/account-layout.component';
import { ApplicationLayoutComponent } from './components/application-layout/application-layout.component';
import { EmptyLayoutComponent } from './components/empty-layout/empty-layout.component';
import { LayoutComponent } from './components/layout/layout.component';
import { ProfileComponent } from './components/profile/profile.component';
import { ThemeSharedModule } from '@abp/ng.theme.shared';
import { ToastModule } from 'primeng/toast';
import { NgxValidateCoreModule } from '@ngx-validate/core';
import { NgxsModule } from '@ngxs/store';
import { LayoutState } from './states/layout.state';
export const LAYOUTS = [ApplicationLayoutComponent, AccountLayoutComponent, EmptyLayoutComponent];
@NgModule({
declarations: [...LAYOUTS, LayoutComponent, ChangePasswordComponent, ProfileComponent],
declarations: [...LAYOUTS, LayoutComponent],
imports: [
CoreModule,
ThemeSharedModule,

0
npm/ng-packs/packages/theme-basic/src/lib/components/change-password/change-password.component.html → npm/ng-packs/packages/theme-shared/src/lib/components/change-password/change-password.component.html

2
npm/ng-packs/packages/theme-basic/src/lib/components/change-password/change-password.component.ts → npm/ng-packs/packages/theme-shared/src/lib/components/change-password/change-password.component.ts

@ -1,5 +1,4 @@
import { ChangePassword } from '@abp/ng.core';
import { ToasterService } from '@abp/ng.theme.shared';
import {
Component,
EventEmitter,
@ -16,6 +15,7 @@ import { comparePasswords } from '@ngx-validate/core';
import { Store } from '@ngxs/store';
import snq from 'snq';
import { finalize } from 'rxjs/operators';
import { ToasterService } from '../../services/toaster.service';
const { minLength, required } = Validators;

2
npm/ng-packs/packages/theme-shared/src/lib/components/index.ts

@ -1,5 +1,7 @@
export * from './button/button.component';
export * from './change-password/change-password.component';
export * from './confirmation/confirmation.component';
export * from './loader-bar/loader-bar.component';
export * from './modal/modal.component';
export * from './profile/profile.component';
export * from './toast/toast.component';

0
npm/ng-packs/packages/theme-basic/src/lib/components/profile/profile.component.html → npm/ng-packs/packages/theme-shared/src/lib/components/profile/profile.component.html

0
npm/ng-packs/packages/theme-basic/src/lib/components/profile/profile.component.ts → npm/ng-packs/packages/theme-shared/src/lib/components/profile/profile.component.ts

15
npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts

@ -15,6 +15,8 @@ import styles from './contants/styles';
import { ErrorHandler } from './handlers/error.handler';
import { ButtonComponent } from './components/button/button.component';
import { ValidationErrorComponent } from './components/errors/validation-error.component';
import { ChangePasswordComponent } from './components/change-password/change-password.component';
import { ProfileComponent } from './components/profile/profile.component';
export function appendScript(injector: Injector) {
const fn = function() {
@ -61,8 +63,19 @@ export function appendScript(injector: Injector) {
ErrorComponent,
LoaderBarComponent,
ValidationErrorComponent,
ChangePasswordComponent,
ProfileComponent,
],
exports: [
NgbModalModule,
ButtonComponent,
ConfirmationComponent,
ToastComponent,
ModalComponent,
LoaderBarComponent,
ChangePasswordComponent,
ProfileComponent,
],
exports: [NgbModalModule, ButtonComponent, ConfirmationComponent, ToastComponent, ModalComponent, LoaderBarComponent],
entryComponents: [ErrorComponent, ValidationErrorComponent],
})
export class ThemeSharedModule {

Loading…
Cancel
Save