Browse Source

app template migrated to standalone structure

pull/22829/head
erdemcaygor 1 year ago
parent
commit
86d3bdf1c4
  1. 1
      npm/ng-packs/packages/core/src/lib/core.module.ts
  2. 2
      npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts
  3. 4
      templates/app/angular/src/app/app.component.ts
  4. 46
      templates/app/angular/src/app/app.config.ts
  5. 56
      templates/app/angular/src/app/app.module.ts
  6. 13
      templates/app/angular/src/app/app.routes.ts
  7. 11
      templates/app/angular/src/app/home/home-routing.module.ts
  8. 5
      templates/app/angular/src/app/home/home.component.spec.ts
  9. 5
      templates/app/angular/src/app/home/home.component.ts
  10. 10
      templates/app/angular/src/app/home/home.module.ts
  11. 9
      templates/app/angular/src/app/home/home.routes.ts
  12. 16
      templates/app/angular/src/main.ts

1
npm/ng-packs/packages/core/src/lib/core.module.ts

@ -3,7 +3,6 @@ import {
provideHttpClient,
withInterceptorsFromDi,
withXsrfConfiguration,
HTTP_INTERCEPTORS,
} from '@angular/common/http';
import { ModuleWithProviders, NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';

2
npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts

@ -24,7 +24,7 @@ import {
LocalizationService,
PermissionDirective,
} from '@abp/ng.core';
import { NgxValidateCoreModule, ValidationDirective } from '@ngx-validate/core';
import { NgxValidateCoreModule } from '@ngx-validate/core';
import { CommonModule } from '@angular/common';
const { required, email } = Validators;

4
templates/app/angular/src/app/app.component.ts

@ -1,12 +1,14 @@
import { Component } from '@angular/core';
import { InternetConnectionStatusComponent, LoaderBarComponent } from '@abp/ng.theme.shared';
import { DynamicLayoutComponent } from '@abp/ng.core';
@Component({
standalone: false,
selector: 'app-root',
template: `
<abp-loader-bar />
<abp-dynamic-layout />
<abp-internet-status />
`,
imports: [LoaderBarComponent, DynamicLayoutComponent, InternetConnectionStatusComponent],
})
export class AppComponent {}

46
templates/app/angular/src/app/app.config.ts

@ -0,0 +1,46 @@
import {ApplicationConfig, importProvidersFrom} from '@angular/core';
import { provideRouter } from '@angular/router';
import {provideAnimations} from "@angular/platform-browser/animations";
import { appRoutes } from './app.routes';
import { APP_ROUTE_PROVIDER } from './route.provider';
import { provideAbpCore, withOptions } from '@abp/ng.core';
import { environment } from '../environments/environment';
import { registerLocale } from '@abp/ng.core/locale';
import { provideAbpOAuth } from '@abp/ng.oauth';
import { provideAbpThemeShared } from '@abp/ng.theme.shared';
import { provideSettingManagementConfig } from '@abp/ng.setting-management/config';
import { provideAccountConfig } from '@abp/ng.account/config';
import { provideIdentityConfig } from '@abp/ng.identity/config';
import { provideTenantManagementConfig } from '@abp/ng.tenant-management/config';
import { provideFeatureManagementConfig } from '@abp/ng.feature-management';
import {ThemeLeptonXModule} from "@abp/ng.theme.lepton-x";
import {SideMenuLayoutModule} from "@abp/ng.theme.lepton-x/layouts";
import {AccountLayoutModule} from "@abp/ng.theme.lepton-x/account";
export const appConfig: ApplicationConfig = {
providers: [
provideRouter(appRoutes),
APP_ROUTE_PROVIDER,
provideAbpCore(
withOptions({
environment,
registerLocaleFn: registerLocale(),
})
),
provideAbpOAuth(),
provideAbpThemeShared(),
provideSettingManagementConfig(),
provideAccountConfig(),
provideIdentityConfig(),
provideTenantManagementConfig(),
provideFeatureManagementConfig(),
provideAnimations(),
provideAbpCore(),
importProvidersFrom([
ThemeLeptonXModule.forRoot(),
SideMenuLayoutModule.forRoot(),
AccountLayoutModule.forRoot(),
])
],
};

56
templates/app/angular/src/app/app.module.ts

@ -1,56 +0,0 @@
import { CoreModule, provideAbpCore, withOptions } from '@abp/ng.core';
import { registerLocale } from '@abp/ng.core/locale';
import {
InternetConnectionStatusComponent,
ThemeSharedModule,
provideAbpThemeShared,
} from '@abp/ng.theme.shared';
import { provideFeatureManagementConfig } from '@abp/ng.feature-management';
import { provideAbpOAuth } from '@abp/ng.oauth';
import { provideIdentityConfig } from '@abp/ng.identity/config';
import { provideSettingManagementConfig } from '@abp/ng.setting-management/config';
import { provideTenantManagementConfig } from '@abp/ng.tenant-management/config';
import { provideAccountConfig } from '@abp/ng.account/config';
import { ThemeLeptonXModule } from '@abp/ng.theme.lepton-x';
import { SideMenuLayoutModule } from '@abp/ng.theme.lepton-x/layouts';
import { AccountLayoutModule } from '@abp/ng.theme.lepton-x/account';
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { environment } from '../environments/environment';
import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
import { APP_ROUTE_PROVIDER } from './route.provider';
@NgModule({
imports: [
BrowserModule,
BrowserAnimationsModule,
AppRoutingModule,
CoreModule,
ThemeSharedModule,
ThemeLeptonXModule.forRoot(),
SideMenuLayoutModule.forRoot(),
AccountLayoutModule.forRoot(),
InternetConnectionStatusComponent,
],
declarations: [AppComponent],
providers: [
APP_ROUTE_PROVIDER,
provideAbpCore(
withOptions({
environment,
registerLocaleFn: registerLocale(),
})
),
provideAbpOAuth(),
provideAbpThemeShared(),
provideSettingManagementConfig(),
provideAccountConfig(),
provideIdentityConfig(),
provideTenantManagementConfig(),
provideFeatureManagementConfig(),
],
bootstrap: [AppComponent],
})
export class AppModule {}

13
templates/app/angular/src/app/app-routing.module.ts → templates/app/angular/src/app/app.routes.ts

@ -1,11 +1,10 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { Routes } from '@angular/router';
const routes: Routes = [
export const appRoutes: Routes = [
{
path: '',
pathMatch: 'full',
loadChildren: () => import('./home/home.module').then(m => m.HomeModule),
loadChildren: () => import('./home/home.routes').then(m => m.homeRoutes),
},
{
path: 'account',
@ -26,9 +25,3 @@ const routes: Routes = [
import('@abp/ng.setting-management').then(m => m.SettingManagementModule.forLazy()),
},
];
@NgModule({
imports: [RouterModule.forRoot(routes, {})],
exports: [RouterModule],
})
export class AppRoutingModule {}

11
templates/app/angular/src/app/home/home-routing.module.ts

@ -1,11 +0,0 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { HomeComponent } from './home.component';
const routes: Routes = [{ path: '', component: HomeComponent }];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class HomeRoutingModule {}

5
templates/app/angular/src/app/home/home.component.spec.ts

@ -6,8 +6,6 @@ import { HomeComponent } from "./home.component";
import { OAuthService } from 'angular-oauth2-oidc';
import { AuthService } from '@abp/ng.core';
describe("HomeComponent", () => {
let fixture: ComponentFixture<HomeComponent>;
const mockOAuthService = jasmine.createSpyObj('OAuthService', ['hasValidAccessToken'])
@ -15,11 +13,12 @@ describe("HomeComponent", () => {
beforeEach(
waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [HomeComponent],
declarations: [],
imports: [
CoreTestingModule.withConfig(),
ThemeSharedTestingModule.withConfig(),
NgxValidateCoreModule,
HomeComponent
],
providers: [
/* mock providers here */

5
templates/app/angular/src/app/home/home.component.ts

@ -1,11 +1,12 @@
import { AuthService } from '@abp/ng.core';
import {AuthService, LocalizationPipe} from '@abp/ng.core';
import { Component, inject } from '@angular/core';
import {CommonModule} from "@angular/common";
@Component({
standalone: false,
selector: 'app-home',
templateUrl: './home.component.html',
styleUrls: ['./home.component.scss'],
imports: [CommonModule, LocalizationPipe]
})
export class HomeComponent {
private authService = inject(AuthService);

10
templates/app/angular/src/app/home/home.module.ts

@ -1,10 +0,0 @@
import { NgModule } from '@angular/core';
import { SharedModule } from '../shared/shared.module';
import { HomeRoutingModule } from './home-routing.module';
import { HomeComponent } from './home.component';
@NgModule({
declarations: [HomeComponent],
imports: [SharedModule, HomeRoutingModule],
})
export class HomeModule {}

9
templates/app/angular/src/app/home/home.routes.ts

@ -0,0 +1,9 @@
import { Routes } from '@angular/router';
export const homeRoutes: Routes = [
{
path: '',
pathMatch: 'full',
loadComponent: () => import('./home.component').then(m => m.HomeComponent),
},
];

16
templates/app/angular/src/main.ts

@ -1,13 +1,5 @@
import { enableProdMode } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { bootstrapApplication } from '@angular/platform-browser';
import { appConfig } from './app/app.config';
import { AppComponent } from './app/app.component';
import { AppModule } from './app/app.module';
import { environment } from './environments/environment';
if (environment.production) {
enableProdMode();
}
platformBrowserDynamic()
.bootstrapModule(AppModule)
.catch(err => console.error(err));
bootstrapApplication(AppComponent, appConfig).catch(err => console.error(err));

Loading…
Cancel
Save