diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package.json index 7ac0ea90d0..8a04aade7e 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package.json +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/package.json @@ -1,5 +1,5 @@ { - "name": "Company.WebApplication1", + "name": "company.webapplication1", "version": "0.0.0", "scripts": { "ng": "ng", diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/app.module.ts b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/app.module.ts index 908d0c7c7f..f66fa53203 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/app.module.ts +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/app.module.ts @@ -9,6 +9,11 @@ import { NavMenuComponent } from './nav-menu/nav-menu.component'; import { HomeComponent } from './home/home.component'; import { CounterComponent } from './counter/counter.component'; import { FetchDataComponent } from './fetch-data/fetch-data.component'; +////#if (IndividualLocalAuth) +import { ApiAuthorizationModule } from 'src/api-authorization/api-authorization.module'; +import { AuthorizeGuard } from 'src/api-authorization/authorize.guard'; +import { AuthorizeInterceptor } from 'src/api-authorization/authorize.interceptor'; +////#endif @NgModule({ declarations: [ @@ -22,13 +27,26 @@ import { FetchDataComponent } from './fetch-data/fetch-data.component'; BrowserModule.withServerTransition({ appId: 'ng-cli-universal' }), HttpClientModule, FormsModule, + ////#if (IndividualLocalAuth) + ApiAuthorizationModule, + ////#endif RouterModule.forRoot([ { path: '', component: HomeComponent, pathMatch: 'full' }, { path: 'counter', component: CounterComponent }, + ////#if (IndividualLocalAuth) + { path: 'fetch-data', component: FetchDataComponent, canActivate: [AuthorizeGuard] }, + ////#else { path: 'fetch-data', component: FetchDataComponent }, + ////#endif ]) ], + ////#if (IndividualLocalAuth) + providers: [ + { provide: HTTP_INTERCEPTORS, useClass: AuthorizeInterceptor, multi: true } + ], + ////#else providers: [], + ////#endif bootstrap: [AppComponent] }) export class AppModule { } diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/fetch-data/fetch-data.component.ts b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/fetch-data/fetch-data.component.ts index 08994fc9ec..75aadd8bfe 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/fetch-data/fetch-data.component.ts +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/fetch-data/fetch-data.component.ts @@ -1,17 +1,22 @@ -import { Component, Inject } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; +import { Component, Inject } from "@angular/core"; +import { HttpClient } from "@angular/common/http"; @Component({ - selector: 'app-fetch-data', - templateUrl: './fetch-data.component.html' + selector: "app-fetch-data", + templateUrl: "./fetch-data.component.html" }) export class FetchDataComponent { public forecasts: WeatherForecast[]; - constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string) { - http.get(baseUrl + 'api/Company.WebApplication1Data/WeatherForecasts').subscribe(result => { - this.forecasts = result; - }, error => console.error(error)); + constructor(http: HttpClient, @Inject("BASE_URL") baseUrl: string) { + http + .get(baseUrl + "api/SampleData/WeatherForecasts") + .subscribe( + result => { + this.forecasts = result; + }, + error => console.error(error) + ); } } diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/nav-menu/nav-menu.component.html b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/nav-menu/nav-menu.component.html index c53b0e739d..79a4b2185c 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/nav-menu/nav-menu.component.html +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/app/nav-menu/nav-menu.component.html @@ -19,6 +19,9 @@ class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse" [ngClass]="{ show: isExpanded }" > + + +