overflow_cloud/member_webapp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	@overflow/target/component/list/list.component.ts
This commit is contained in:
geek 2018-06-07 18:22:54 +09:00
commit 6c06b405d4
13 changed files with 1834 additions and 1843 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
@overflow/infra/component/infra-map.component.ts
View File

@ -10,8 +10,7 @@ import { Observable, Subscription, of } from 'rxjs';
import { ProbeHost } from '@overflow/commons-typescript/model/probe'; import { ProbeHost } from '@overflow/commons-typescript/model/probe';
import { MenuItem } from 'primeng/primeng'; import { MenuItem } from 'primeng/primeng';
import { InfraService } from '../service/infra.service'; import { InfraService } from '../service/infra.service';
import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams'; import { Page, PageParams } from '@overflow/commons-typescript/core/model';
import { Page } from '@overflow/commons-typescript/model/commons/Page';
import { Infra } from '@overflow/commons-typescript/model/infra'; import { Infra } from '@overflow/commons-typescript/model/infra';

3
@overflow/infra/service/infra.service.ts
View File

@ -5,8 +5,7 @@ import { RPCService } from '@loafer/ng-rpc';
import { Infra } from '@overflow/commons-typescript/model/infra'; import { Infra } from '@overflow/commons-typescript/model/infra';
import { Domain } from '@overflow/commons-typescript/model/domain'; import { Domain } from '@overflow/commons-typescript/model/domain';
import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams'; import { Page, PageParams } from '@overflow/commons-typescript/core/model';
import { Page } from '@overflow/commons-typescript/model/commons/Page';
@Injectable() @Injectable()
export class InfraService { export class InfraService {

2
@overflow/notification/component/badge/badge.component.ts
View File

@ -1,6 +1,6 @@
import { Component, Input, EventEmitter, Output, ViewChild, OnInit } from '@angular/core'; import { Component, Input, EventEmitter, Output, ViewChild, OnInit } from '@angular/core';
import { Notification } from '@overflow/commons-typescript/model/notification'; import { Notification } from '@overflow/commons-typescript/model/notification';
import { Page } from '@overflow/commons-typescript/model/commons/Page'; import { Page, PageParams } from '@overflow/commons-typescript/core/model';
import { Paginator } from 'primeng/primeng'; import { Paginator } from 'primeng/primeng';
@Component({ @Component({

2
@overflow/notification/component/list/list.component.ts
View File

@ -1,6 +1,6 @@
import { Component, Input, EventEmitter, Output, ViewChild, OnInit, OnChanges, SimpleChanges } from '@angular/core'; import { Component, Input, EventEmitter, Output, ViewChild, OnInit, OnChanges, SimpleChanges } from '@angular/core';
import { Notification } from '@overflow/commons-typescript/model/notification'; import { Notification } from '@overflow/commons-typescript/model/notification';
import { Page } from '@overflow/commons-typescript/model/commons/Page'; import { Page, PageParams } from '@overflow/commons-typescript/core/model';
import { Paginator } from 'primeng/primeng'; import { Paginator } from 'primeng/primeng';
@Component({ @Component({

3
@overflow/notification/container/badge/badge-container.component.ts
View File

@ -6,8 +6,7 @@ import { Domain, DomainMember } from '@overflow/commons-typescript/model/domain'
import * as NotificationEntityStore from '../../store/entity/notification'; import * as NotificationEntityStore from '../../store/entity/notification';
import { NotificationEntitySelector } from '../../store/'; import { NotificationEntitySelector } from '../../store/';
import { AuthSelector } from '@overflow/shared/auth/store'; import { AuthSelector } from '@overflow/shared/auth/store';
import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams'; import { Page, PageParams } from '@overflow/commons-typescript/core/model';
import { Page } from '@overflow/commons-typescript/model/commons/Page';
import { Notification } from '@overflow/commons-typescript/model/notification'; import { Notification } from '@overflow/commons-typescript/model/notification';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';

3
@overflow/notification/container/list/list-container.component.ts
View File

@ -6,8 +6,7 @@ import * as NotificationEntityStore from '../../store/entity/notification';
import { NotificationEntitySelector } from '../../store/'; import { NotificationEntitySelector } from '../../store/';
import { AuthSelector } from '@overflow/shared/auth/store'; import { AuthSelector } from '@overflow/shared/auth/store';
import { Member } from '@overflow/commons-typescript/model/member'; import { Member } from '@overflow/commons-typescript/model/member';
import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams'; import { Page, PageParams } from '@overflow/commons-typescript/core/model';
import { Page } from '@overflow/commons-typescript/model/commons/Page';
import { Notification } from '@overflow/commons-typescript/model/notification'; import { Notification } from '@overflow/commons-typescript/model/notification';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import { DomainMember } from '@overflow/commons-typescript/model/domain'; import { DomainMember } from '@overflow/commons-typescript/model/domain';

3
@overflow/notification/service/notification.service.ts
View File

@ -5,8 +5,7 @@ import { RPCService } from '@loafer/ng-rpc';
import { Notification } from '@overflow/commons-typescript/model/notification'; import { Notification } from '@overflow/commons-typescript/model/notification';
import { Member } from '@overflow/commons-typescript/model/member'; import { Member } from '@overflow/commons-typescript/model/member';
import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams'; import { Page, PageParams } from '@overflow/commons-typescript/core/model';
import { Page } from '@overflow/commons-typescript/model/commons/Page';
@Injectable() @Injectable()
export class NotificationService { export class NotificationService {

3
@overflow/notification/store/entity/notification/notification.action.ts
View File

@ -1,8 +1,7 @@
import { Action } from '@ngrx/store'; import { Action } from '@ngrx/store';
import { RPCClientError } from '@loafer/ng-rpc'; import { RPCClientError } from '@loafer/ng-rpc';
import { Member } from '@overflow/commons-typescript/model/member'; import { Member } from '@overflow/commons-typescript/model/member';
import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams'; import { Page, PageParams } from '@overflow/commons-typescript/core/model';
import { Page } from '@overflow/commons-typescript/model/commons/Page';
import { Notification } from '@overflow/commons-typescript/model/notification'; import { Notification } from '@overflow/commons-typescript/model/notification';
export enum ActionType { export enum ActionType {

3
@overflow/sensor/component/sensor-list.component.ts
View File

@ -7,11 +7,10 @@ import { catchError, exhaustMap, map, tap, take } from 'rxjs/operators';
import { AuthSelector } from '@overflow/shared/auth/store'; import { AuthSelector } from '@overflow/shared/auth/store';
import { Sensor } from '@overflow/commons-typescript/model/sensor'; import { Sensor } from '@overflow/commons-typescript/model/sensor';
import { Page } from '@overflow/commons-typescript/model/commons/Page'; import { Page, PageParams } from '@overflow/commons-typescript/core/model';
import { Target } from '@overflow/commons-typescript/model/target'; import { Target } from '@overflow/commons-typescript/model/target';
import { DomainMember } from '@overflow/commons-typescript/model/domain'; import { DomainMember } from '@overflow/commons-typescript/model/domain';
import { SensorService } from '../service/sensor.service'; import { SensorService } from '../service/sensor.service';
import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams';
@Component({ @Component({
selector: 'of-sensor-list', selector: 'of-sensor-list',

3
@overflow/sensor/service/sensor.service.ts
View File

@ -8,8 +8,7 @@ import { SensorItem } from '@overflow/commons-typescript/model/sensor-item';
import { Sensor } from '@overflow/commons-typescript/model/sensor'; import { Sensor } from '@overflow/commons-typescript/model/sensor';
import { Domain } from '@overflow/commons-typescript/model/domain'; import { Domain } from '@overflow/commons-typescript/model/domain';
import { Target } from '@overflow/commons-typescript/model/target'; import { Target } from '@overflow/commons-typescript/model/target';
import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams'; import { Page, PageParams } from '@overflow/commons-typescript/core/model';
import { Page } from '@overflow/commons-typescript/model/commons/Page';
@Injectable() @Injectable()

3
@overflow/target/service/target.service.ts
View File

@ -5,8 +5,7 @@ import { Observable } from 'rxjs';
import { Target } from '@overflow/commons-typescript/model/target'; import { Target } from '@overflow/commons-typescript/model/target';
import { Host, Service } from '@overflow/commons-typescript/model/discovery'; import { Host, Service } from '@overflow/commons-typescript/model/discovery';
import {PageParams} from '@overflow/commons-typescript/model/commons/PageParams'; import { Page, PageParams } from '@overflow/commons-typescript/core/model';
import {Page} from '@overflow/commons-typescript/model/commons/Page';
import {Notification} from '@overflow/commons-typescript/model/notification'; import {Notification} from '@overflow/commons-typescript/model/notification';
@Injectable() @Injectable()

3644
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -37,7 +37,7 @@
"@ngrx/router-store": "^5.2.0", "@ngrx/router-store": "^5.2.0",
"@ngrx/store": "^5.2.0", "@ngrx/store": "^5.2.0",
"@ngrx/store-devtools": "^5.2.0", "@ngrx/store-devtools": "^5.2.0",
"@overflow/commons-typescript": "^0.0.8", "@overflow/commons-typescript": "^0.0.9",
"angular-google-recaptcha": "^1.0.3", "angular-google-recaptcha": "^1.0.3",
"angular-l10n": "^5.0.0", "angular-l10n": "^5.0.0",
"angularx-qrcode": "^1.1.7", "angularx-qrcode": "^1.1.7",