ing
This commit is contained in:
parent
a81dca3232
commit
7e5ffb9d65
|
@ -1,15 +0,0 @@
|
|||
import { TestBed, inject } from '@angular/core/testing';
|
||||
|
||||
import { AuthGuard } from './auth-guard';
|
||||
|
||||
describe('AuthGuardService', () => {
|
||||
beforeEach(() => {
|
||||
TestBed.configureTestingModule({
|
||||
providers: [AuthGuard]
|
||||
});
|
||||
});
|
||||
|
||||
it('should be created', inject([AuthGuard], (service: AuthGuard) => {
|
||||
expect(service).toBeTruthy();
|
||||
}));
|
||||
});
|
|
@ -1,9 +0,0 @@
|
|||
import { Injectable } from '@angular/core';
|
||||
import { CanActivate } from '@angular/router';
|
||||
import { Store, select } from '@ngrx/store';
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
import { map, take } from 'rxjs/operators';
|
||||
|
||||
@Injectable()
|
||||
export class AuthGuard {
|
||||
}
|
|
@ -9,7 +9,6 @@ import { RouterStateSnapshot, Params } from '@angular/router';
|
|||
* need the URL and query parameters from the snapshot in the store. Other items could be
|
||||
* returned such as route parameters and static route data.
|
||||
*/
|
||||
|
||||
export interface RouterStateURL {
|
||||
url: string;
|
||||
params: Params;
|
||||
|
|
|
@ -14,6 +14,7 @@ export class RESTService {
|
|||
constructor(
|
||||
@Inject(HttpClient) private _httpClient: HttpClient,
|
||||
) {
|
||||
this.baseURL = 'http://192.168.1.101:80/webapp';
|
||||
this.httpHeaders = new HttpHeaders()
|
||||
.set('Accept', 'application/json')
|
||||
.set('Content-Type', 'application/json');
|
||||
|
@ -27,7 +28,7 @@ export class RESTService {
|
|||
const headers: HttpHeaders = this.httpHeaders;
|
||||
|
||||
return this._httpClient
|
||||
.get<T>('', {
|
||||
.get<T>(`${this.baseURL}${entry}`, {
|
||||
headers: headers,
|
||||
params: params,
|
||||
responseType: 'json',
|
||||
|
@ -38,7 +39,7 @@ export class RESTService {
|
|||
const headers: HttpHeaders = this.httpHeaders;
|
||||
|
||||
return this._httpClient
|
||||
.post<T>('', body, {
|
||||
.post<T>(`${this.baseURL}${entry}`, body, {
|
||||
headers: headers,
|
||||
params: params,
|
||||
responseType: 'json',
|
||||
|
|
|
@ -1,25 +0,0 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
|
||||
import { MaterialModule } from 'app/commons/ui/material/material.module';
|
||||
import { DiscoverySettingComponent } from 'app/packages/sensor/component/setting/setting.component';
|
||||
import { SettingResultComponent } from 'app/packages/sensor/component/setting-result/setting-result.component';
|
||||
|
||||
import {FormsModule} from '@angular/forms';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule,
|
||||
MaterialModule,
|
||||
FormsModule
|
||||
],
|
||||
declarations: [
|
||||
DiscoverySettingComponent,
|
||||
SettingResultComponent,
|
||||
],
|
||||
exports: [
|
||||
DiscoverySettingComponent,
|
||||
SettingResultComponent
|
||||
]
|
||||
})
|
||||
export class SensorModule { }
|
|
@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
|
|||
|
||||
import { FlexLayoutModule } from '@angular/flex-layout';
|
||||
|
||||
import { MemberModule } from 'app/packages/member/member.module';
|
||||
import { MemberModule } from 'packages/member/member.module';
|
||||
|
||||
import { AuthPageComponent } from './auth-page.component';
|
||||
import { AuthPageRoutingModule } from './auth-page-routing.module';
|
||||
|
|
|
@ -4,7 +4,7 @@ import { CommonModule } from '@angular/common';
|
|||
import { DiscoveryPageComponent } from './discovery-page.component';
|
||||
import { DiscoveryPageRoutingModule } from './discovery-page-routing.module';
|
||||
|
||||
import { DiscoveryModule } from '../../packages/discovery/discovery.module';
|
||||
import { DiscoveryModule } from 'packages/discovery/discovery.module';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
|
|
@ -6,7 +6,7 @@ import { InfraPageRoutingModule } from './infra-page-routing.module';
|
|||
|
||||
import { MaterialModule } from 'app/commons/ui/material/material.module';
|
||||
|
||||
import { InfraModule } from '../../packages/infra/infra.module';
|
||||
import { InfraModule } from 'packages/infra/infra.module';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
|
|
@ -13,7 +13,7 @@ import { NgxChartsModule } from '@swimlane/ngx-charts';
|
|||
import { HostSummaryCardComponent } from '../../commons/component/host-summary-card/host-summary-card.component';
|
||||
import { AppSummaryCardComponent } from '../../commons/component/app-summary-card/app-summary-card.component';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import { SensorItemModule } from '../../packages/sensor-item/sensor-item.module';
|
||||
import { SensorItemModule } from 'packages/sensor-item/sensor-item.module';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
|
|
@ -13,7 +13,7 @@ import {
|
|||
PERFECT_SCROLLBAR_CONFIG,
|
||||
PerfectScrollbarConfigInterface
|
||||
} from 'ngx-perfect-scrollbar';
|
||||
import { NotificationComponent } from 'app/packages/notification/notification.component';
|
||||
import { NotificationModule } from 'packages/notification/notification.module';
|
||||
|
||||
const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
|
||||
suppressScrollX: true
|
||||
|
@ -27,6 +27,7 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
|
|||
CovalentModule,
|
||||
MaterialModule,
|
||||
PerfectScrollbarModule,
|
||||
NotificationModule,
|
||||
],
|
||||
declarations: [
|
||||
PagesComponent,
|
||||
|
@ -34,7 +35,6 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
|
|||
HeaderComponent,
|
||||
FooterComponent,
|
||||
MenuItemComponent,
|
||||
NotificationComponent,
|
||||
],
|
||||
providers: [
|
||||
{
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { Routes, RouterModule } from '@angular/router';
|
||||
import { ProbePageComponent } from './probe-page.component';
|
||||
import { DetailComponent as ProbeDetailComponent } from 'app/packages/probe/component/detail/detail.component';
|
||||
import { ListComponent as TargetListComponent } from 'app/packages/target/component/list/list.component';
|
||||
import { DetailComponent as ProbeDetailComponent } from 'packages/probe/component/detail/detail.component';
|
||||
import { ListComponent as TargetListComponent } from 'packages/target/component/list/list.component';
|
||||
|
||||
const routes: Routes = [
|
||||
{
|
||||
|
|
|
@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
|
|||
import { ProbePageComponent } from './probe-page.component';
|
||||
import { ProbePageRoutingModule } from './probe-page-routing.module';
|
||||
import { MaterialModule } from 'app/commons/ui/material/material.module';
|
||||
import { ProbeModule } from 'app/packages/probe/probe.module';
|
||||
import { ProbeModule } from 'packages/probe/probe.module';
|
||||
import { SubMenubarModule } from 'app/commons/component/sub-menubar/sub-menubar.module';
|
||||
|
||||
@NgModule({
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { Routes, RouterModule } from '@angular/router';
|
||||
import { ProbesPageComponent } from './probes-page.component';
|
||||
import { ListComponent as ProbeListComponent } from 'app/packages/probe/component/list/list.component';
|
||||
import { ListComponent as NoauthListComponent } from 'app/packages/noauth/component/list/list.component';
|
||||
import { DownloadComponent } from 'app/packages/probe/component/download/download.component';
|
||||
import { DetailComponent as ProbeDetailComponent } from 'app/packages/probe/component/detail/detail.component';
|
||||
import { ListComponent as ProbeListComponent } from 'packages/probe/component/list/list.component';
|
||||
import { ListComponent as NoauthListComponent } from 'packages/noauth/component/list/list.component';
|
||||
import { DownloadComponent } from 'packages/probe/component/download/download.component';
|
||||
import { DetailComponent as ProbeDetailComponent } from 'packages/probe/component/detail/detail.component';
|
||||
|
||||
const routes: Routes = [
|
||||
{
|
||||
|
|
|
@ -3,8 +3,8 @@ import { CommonModule } from '@angular/common';
|
|||
import { ProbesPageComponent } from './probes-page.component';
|
||||
import { ProbesPageRoutingModule } from './probes-page-routing.module';
|
||||
import { MaterialModule } from 'app/commons/ui/material/material.module';
|
||||
import { ProbeModule } from 'app/packages/probe/probe.module';
|
||||
import { NoauthModule } from 'app/packages/noauth/noauth.module';
|
||||
import { ProbeModule } from 'packages/probe/probe.module';
|
||||
import { NoauthModule } from 'packages/noauth/noauth.module';
|
||||
import { SubMenubarModule } from 'app/commons/component/sub-menubar/sub-menubar.module';
|
||||
|
||||
@NgModule({
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { Component, OnInit } from '@angular/core';
|
||||
|
||||
import {MatDialog} from '@angular/material';
|
||||
import { DiscoverySettingComponent } from 'app/packages/sensor/component/setting/setting.component';
|
||||
import { DiscoverySettingComponent } from 'packages/sensor/component/setting/setting.component';
|
||||
|
||||
|
||||
@Component({
|
||||
|
|
|
@ -2,12 +2,12 @@ import { NgModule } from '@angular/core';
|
|||
import { CommonModule } from '@angular/common';
|
||||
import { SensorSettingPageRoutingModule } from 'app/pages/sensor-setting/sensor-setting-page-routing.module';
|
||||
import { SensorSettingPageComponent } from 'app/pages/sensor-setting/sensor-setting-page.component';
|
||||
import { SensorModule } from 'app/packages/sensor/sensor.module';
|
||||
import { SensorModule } from 'packages/sensor/sensor.module';
|
||||
import { MaterialModule } from 'app/commons/ui/material/material.module';
|
||||
|
||||
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import { DiscoverySettingComponent } from 'app/packages/sensor/component/setting/setting.component';
|
||||
import { DiscoverySettingComponent } from 'packages/sensor/component/setting/setting.component';
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
|
|||
import { TargetPageComponent } from './target-page.component';
|
||||
import { TargetPageRoutingModule } from './target-page-routing.module';
|
||||
import { MaterialModule } from 'app/commons/ui/material/material.module';
|
||||
import { TargetModule } from 'app/packages/target/target.module';
|
||||
import { TargetModule } from 'packages/target/target.module';
|
||||
import { SubMenubarModule } from 'app/commons/component/sub-menubar/sub-menubar.module';
|
||||
|
||||
@NgModule({
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { Routes, RouterModule } from '@angular/router';
|
||||
import { ListComponent as ProbeListComponent } from 'app/packages/probe/component/list/list.component';
|
||||
import { ListComponent as ProbeListComponent } from 'packages/probe/component/list/list.component';
|
||||
import { TargetsPageComponent } from 'app/pages/targets/targets-page.component';
|
||||
|
||||
const routes: Routes = [
|
||||
|
|
|
@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
|
|||
import { MaterialModule } from 'app/commons/ui/material/material.module';
|
||||
import { SubMenubarModule } from 'app/commons/component/sub-menubar/sub-menubar.module';
|
||||
import { TargetsPageComponent } from 'app/pages/targets/targets-page.component';
|
||||
import { TargetModule } from 'app/packages/target/target.module';
|
||||
import { TargetModule } from 'packages/target/target.module';
|
||||
import { TargetsPageRoutingModule } from 'app/pages/targets/targets-page-routing.module';
|
||||
|
||||
@NgModule({
|
||||
|
|
|
@ -4,16 +4,16 @@ import { CommonModule } from '@angular/common';
|
|||
import { SettingComponent } from './component/setting/setting.component';
|
||||
import { MaterialModule } from 'app/commons/ui/material/material.module';
|
||||
|
||||
export const COMPONENTS = [
|
||||
SettingComponent,
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule,
|
||||
MaterialModule
|
||||
],
|
||||
declarations: [
|
||||
SettingComponent,
|
||||
],
|
||||
exports: [
|
||||
SettingComponent,
|
||||
]
|
||||
declarations: COMPONENTS,
|
||||
exports: COMPONENTS,
|
||||
})
|
||||
export class DiscoveryModule { }
|
|
@ -1,19 +1,20 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
|
||||
import { MapComponent } from './component/map/map.component';
|
||||
import { MaterialModule } from 'app/commons/ui/material/material.module';
|
||||
|
||||
import { MapComponent } from './component/map/map.component';
|
||||
|
||||
export const COMPONENTS = [
|
||||
MapComponent,
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule,
|
||||
MaterialModule
|
||||
],
|
||||
declarations: [
|
||||
MapComponent,
|
||||
],
|
||||
exports: [
|
||||
MapComponent,
|
||||
]
|
||||
declarations: COMPONENTS,
|
||||
exports: COMPONENTS,
|
||||
})
|
||||
export class InfraModule { }
|
|
@ -1,13 +1,17 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { ListComponent } from 'app/packages/noauth/component/list/list.component';
|
||||
|
||||
import { ListComponent } from './component/list/list.component';
|
||||
|
||||
export const COMPONENTS = [
|
||||
ListComponent,
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule
|
||||
],
|
||||
declarations: [
|
||||
ListComponent
|
||||
]
|
||||
declarations: COMPONENTS,
|
||||
exports: COMPONENTS,
|
||||
})
|
||||
export class NoauthModule { }
|
25
src/packages/notification/notification.module.ts
Normal file
25
src/packages/notification/notification.module.ts
Normal file
|
@ -0,0 +1,25 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import {
|
||||
PerfectScrollbarModule,
|
||||
} from 'ngx-perfect-scrollbar';
|
||||
|
||||
import { MaterialModule } from 'app/commons/ui/material/material.module';
|
||||
|
||||
import { NotificationComponent } from './component/notification/notification.component';
|
||||
|
||||
export const COMPONENTS = [
|
||||
NotificationComponent,
|
||||
];
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule,
|
||||
PerfectScrollbarModule,
|
||||
MaterialModule,
|
||||
],
|
||||
declarations: COMPONENTS,
|
||||
exports: COMPONENTS,
|
||||
})
|
||||
export class NotificationModule { }
|
|
@ -1,10 +1,17 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { ListComponent } from 'app/packages/probe/component/list/list.component';
|
||||
import { DownloadComponent } from 'app/packages/probe/component/download/download.component';
|
||||
import { MaterialModule } from 'app/commons/ui/material/material.module';
|
||||
import { InfoTableModule } from 'app/commons/component/info-table/info-table.module';
|
||||
import { DetailComponent } from 'app/packages/probe/component/detail/detail.component';
|
||||
|
||||
import { DetailComponent } from './component/detail/detail.component';
|
||||
import { ListComponent } from './component/list/list.component';
|
||||
import { DownloadComponent } from './component/download/download.component';
|
||||
|
||||
export const COMPONENTS = [
|
||||
ListComponent,
|
||||
DetailComponent,
|
||||
DownloadComponent,
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
@ -12,10 +19,7 @@ import { DetailComponent } from 'app/packages/probe/component/detail/detail.comp
|
|||
MaterialModule,
|
||||
InfoTableModule,
|
||||
],
|
||||
declarations: [
|
||||
ListComponent,
|
||||
DownloadComponent,
|
||||
DetailComponent,
|
||||
],
|
||||
declarations: COMPONENTS,
|
||||
exports: COMPONENTS,
|
||||
})
|
||||
export class ProbeModule { }
|
|
@ -3,17 +3,17 @@ import { CommonModule } from '@angular/common';
|
|||
import { MaterialModule } from 'app/commons/ui/material/material.module';
|
||||
import { ListComponent } from './component/list/list.component';
|
||||
|
||||
export const COMPONENTS = [
|
||||
ListComponent,
|
||||
];
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule,
|
||||
MaterialModule,
|
||||
],
|
||||
declarations: [
|
||||
ListComponent
|
||||
],
|
||||
exports: [
|
||||
ListComponent
|
||||
]
|
||||
declarations: COMPONENTS,
|
||||
exports: COMPONENTS,
|
||||
})
|
||||
export class SensorItemModule { }
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user