diff --git a/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml b/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml index 61a18ca9..cd6ada56 100644 --- a/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml +++ b/src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml @@ -1,10 +1,8 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"> diff --git a/src/main/resources/config/liquibase/changelog/20170501195006_added_entity_Hero.xml b/src/main/resources/config/liquibase/changelog/20170501195006_added_entity_Hero.xml index 8c8a5bed..d1f2500f 100644 --- a/src/main/resources/config/liquibase/changelog/20170501195006_added_entity_Hero.xml +++ b/src/main/resources/config/liquibase/changelog/20170501195006_added_entity_Hero.xml @@ -1,10 +1,8 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"> @@ -27,6 +25,6 @@ - + diff --git a/src/main/resources/config/liquibase/changelog/20170501195007_added_entity_Crisis.xml b/src/main/resources/config/liquibase/changelog/20170501195007_added_entity_Crisis.xml index 24ca2b61..a805611f 100644 --- a/src/main/resources/config/liquibase/changelog/20170501195007_added_entity_Crisis.xml +++ b/src/main/resources/config/liquibase/changelog/20170501195007_added_entity_Crisis.xml @@ -1,10 +1,8 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"> @@ -27,6 +25,6 @@ - + diff --git a/src/main/resources/config/liquibase/changelog/20170501195008_added_entity_Claim.xml b/src/main/resources/config/liquibase/changelog/20170501195008_added_entity_Claim.xml index a4fe766b..c991b08d 100644 --- a/src/main/resources/config/liquibase/changelog/20170501195008_added_entity_Claim.xml +++ b/src/main/resources/config/liquibase/changelog/20170501195008_added_entity_Claim.xml @@ -1,10 +1,8 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"> diff --git a/src/main/resources/config/liquibase/changelog/20170501195009_added_entity_Contact.xml b/src/main/resources/config/liquibase/changelog/20170501195009_added_entity_Contact.xml index 4bdca664..21179d10 100644 --- a/src/main/resources/config/liquibase/changelog/20170501195009_added_entity_Contact.xml +++ b/src/main/resources/config/liquibase/changelog/20170501195009_added_entity_Contact.xml @@ -1,10 +1,8 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"> @@ -27,6 +25,6 @@ - + diff --git a/src/main/resources/config/liquibase/changelog/20170501195010_added_entity_Note.xml b/src/main/resources/config/liquibase/changelog/20170501195010_added_entity_Note.xml index fc049c87..5296900d 100644 --- a/src/main/resources/config/liquibase/changelog/20170501195010_added_entity_Note.xml +++ b/src/main/resources/config/liquibase/changelog/20170501195010_added_entity_Note.xml @@ -1,10 +1,8 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"> diff --git a/src/main/resources/config/liquibase/changelog/20170501195011_added_entity_Rebuttal.xml b/src/main/resources/config/liquibase/changelog/20170501195011_added_entity_Rebuttal.xml index fd5488fe..ccf7eba0 100644 --- a/src/main/resources/config/liquibase/changelog/20170501195011_added_entity_Rebuttal.xml +++ b/src/main/resources/config/liquibase/changelog/20170501195011_added_entity_Rebuttal.xml @@ -1,10 +1,8 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"> @@ -45,6 +43,6 @@ - + diff --git a/src/main/resources/config/liquibase/changelog/20170501195012_added_entity_ClaimRebuttal.xml b/src/main/resources/config/liquibase/changelog/20170501195012_added_entity_ClaimRebuttal.xml index 5d81a8d9..22bd8df4 100644 --- a/src/main/resources/config/liquibase/changelog/20170501195012_added_entity_ClaimRebuttal.xml +++ b/src/main/resources/config/liquibase/changelog/20170501195012_added_entity_ClaimRebuttal.xml @@ -1,10 +1,8 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"> diff --git a/src/main/resources/config/liquibase/changelog/20170501195013_added_entity_Blog.xml b/src/main/resources/config/liquibase/changelog/20170501195013_added_entity_Blog.xml index 28ce6ba7..2aa2a4c5 100644 --- a/src/main/resources/config/liquibase/changelog/20170501195013_added_entity_Blog.xml +++ b/src/main/resources/config/liquibase/changelog/20170501195013_added_entity_Blog.xml @@ -1,10 +1,8 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"> @@ -35,6 +33,6 @@ - + diff --git a/src/main/resources/config/liquibase/changelog/20170501195014_added_entity_Entry.xml b/src/main/resources/config/liquibase/changelog/20170501195014_added_entity_Entry.xml index 9afd37b8..9d84b6a1 100644 --- a/src/main/resources/config/liquibase/changelog/20170501195014_added_entity_Entry.xml +++ b/src/main/resources/config/liquibase/changelog/20170501195014_added_entity_Entry.xml @@ -1,10 +1,8 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"> diff --git a/src/main/resources/config/liquibase/changelog/20170501195015_added_entity_Tag.xml b/src/main/resources/config/liquibase/changelog/20170501195015_added_entity_Tag.xml index d9cd0dea..7d762e59 100644 --- a/src/main/resources/config/liquibase/changelog/20170501195015_added_entity_Tag.xml +++ b/src/main/resources/config/liquibase/changelog/20170501195015_added_entity_Tag.xml @@ -1,10 +1,8 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"> @@ -27,6 +25,6 @@ - + diff --git a/src/main/resources/config/liquibase/changelog/20170501195016_load_data_Seed.xml b/src/main/resources/config/liquibase/changelog/20170501195016_load_data_Seed.xml index 31d5135a..bff3ac8f 100644 --- a/src/main/resources/config/liquibase/changelog/20170501195016_load_data_Seed.xml +++ b/src/main/resources/config/liquibase/changelog/20170501195016_load_data_Seed.xml @@ -1,10 +1,8 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"> diff --git a/src/main/resources/config/liquibase/changelog/20170517190733_added_entity_Message.xml b/src/main/resources/config/liquibase/changelog/20170517190733_added_entity_Message.xml index b6d7dc10..d60ec475 100644 --- a/src/main/resources/config/liquibase/changelog/20170517190733_added_entity_Message.xml +++ b/src/main/resources/config/liquibase/changelog/20170517190733_added_entity_Message.xml @@ -1,10 +1,8 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"> diff --git a/src/main/resources/config/liquibase/changelog/20170725052218_added_entity_Talk.xml b/src/main/resources/config/liquibase/changelog/20170725052218_added_entity_Talk.xml index 387263a2..bd2edd7f 100644 --- a/src/main/resources/config/liquibase/changelog/20170725052218_added_entity_Talk.xml +++ b/src/main/resources/config/liquibase/changelog/20170725052218_added_entity_Talk.xml @@ -1,10 +1,8 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd"> @@ -43,6 +41,6 @@ - + diff --git a/src/main/webapp/app/account/account.module.ts b/src/main/webapp/app/account/account.module.ts index fbd54074..3e057e49 100644 --- a/src/main/webapp/app/account/account.module.ts +++ b/src/main/webapp/app/account/account.module.ts @@ -1,24 +1,24 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { GreatBigExampleApplicationSharedModule } from '../shared'; import { - Register, + accountState, + ActivateComponent, ActivateService, - PasswordService, - PasswordResetInitService, + PasswordComponent, + PasswordResetFinishComponent, PasswordResetFinishService, + PasswordResetInitComponent, + PasswordResetInitService, + PasswordService, PasswordStrengthBarComponent, + Register, RegisterComponent, - ActivateComponent, - PasswordComponent, - PasswordResetInitComponent, - PasswordResetFinishComponent, SettingsComponent, - SocialRegisterComponent, SocialAuthComponent, - accountState + SocialRegisterComponent } from './'; @NgModule({ diff --git a/src/main/webapp/app/account/account.route.ts b/src/main/webapp/app/account/account.route.ts index cf4aa47b..af81adfc 100644 --- a/src/main/webapp/app/account/account.route.ts +++ b/src/main/webapp/app/account/account.route.ts @@ -2,13 +2,13 @@ import { Routes } from '@angular/router'; import { activateRoute, - passwordRoute, passwordResetFinishRoute, passwordResetInitRoute, + passwordRoute, registerRoute, - socialRegisterRoute, + settingsRoute, socialAuthRoute, - settingsRoute + socialRegisterRoute } from './'; const ACCOUNT_ROUTES = [ diff --git a/src/main/webapp/app/account/activate/activate.component.spec.ts b/src/main/webapp/app/account/activate/activate.component.spec.ts index 6d4b2b29..40c1f3b6 100644 --- a/src/main/webapp/app/account/activate/activate.component.spec.ts +++ b/src/main/webapp/app/account/activate/activate.component.spec.ts @@ -1,4 +1,4 @@ -import { TestBed, async, tick, fakeAsync, inject } from '@angular/core/testing'; +import { async, fakeAsync, inject, TestBed, tick } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs/Observable'; import { GreatBigExampleApplicationTestModule } from '../../../mocks/test.module'; diff --git a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts index 4033f0ef..6d408aee 100644 --- a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts +++ b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts @@ -1,5 +1,5 @@ -import { ComponentFixture, TestBed, inject } from '@angular/core/testing'; -import { Renderer, ElementRef } from '@angular/core'; +import { ComponentFixture, inject, TestBed } from '@angular/core/testing'; +import { ElementRef, Renderer } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { LoginModalService } from '../../../shared'; import { GreatBigExampleApplicationTestModule } from '../../../../mocks/test.module'; diff --git a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts index f0b2b11b..4b795d18 100644 --- a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts +++ b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, AfterViewInit, Renderer, ElementRef } from '@angular/core'; +import { AfterViewInit, Component, ElementRef, OnInit, Renderer } from '@angular/core'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { ActivatedRoute } from '@angular/router'; diff --git a/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts b/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts index cc91eb37..df6521b9 100644 --- a/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts +++ b/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts @@ -1,5 +1,5 @@ -import { ComponentFixture, TestBed, inject } from '@angular/core/testing'; -import { Renderer, ElementRef } from '@angular/core'; +import { ComponentFixture, inject, TestBed } from '@angular/core/testing'; +import { ElementRef, Renderer } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { GreatBigExampleApplicationTestModule } from '../../../../mocks/test.module'; import { PasswordResetInitComponent } from './password-reset-init.component'; diff --git a/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts b/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts index dee8a3a8..a65051be 100644 --- a/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts +++ b/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, AfterViewInit, Renderer, ElementRef } from '@angular/core'; +import { AfterViewInit, Component, ElementRef, OnInit, Renderer } from '@angular/core'; import { PasswordResetInitService } from './password-reset-init.service'; diff --git a/src/main/webapp/app/account/password/password-strength-bar.component.spec.ts b/src/main/webapp/app/account/password/password-strength-bar.component.spec.ts index 063cafdb..867ad883 100644 --- a/src/main/webapp/app/account/password/password-strength-bar.component.spec.ts +++ b/src/main/webapp/app/account/password/password-strength-bar.component.spec.ts @@ -1,4 +1,4 @@ -import { ComponentFixture, TestBed, async } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { PasswordStrengthBarComponent } from './password-strength-bar.component'; diff --git a/src/main/webapp/app/account/password/password.component.spec.ts b/src/main/webapp/app/account/password/password.component.spec.ts index e4454568..607ceecb 100644 --- a/src/main/webapp/app/account/password/password.component.spec.ts +++ b/src/main/webapp/app/account/password/password.component.spec.ts @@ -1,4 +1,4 @@ -import { ComponentFixture, TestBed, async } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { Observable } from 'rxjs/Observable'; import { GreatBigExampleApplicationTestModule } from '../../../mocks/test.module'; import { PasswordComponent } from './password.component'; diff --git a/src/main/webapp/app/account/register/register.component.spec.ts b/src/main/webapp/app/account/register/register.component.spec.ts index d73f5af4..c729211d 100644 --- a/src/main/webapp/app/account/register/register.component.spec.ts +++ b/src/main/webapp/app/account/register/register.component.spec.ts @@ -1,5 +1,5 @@ -import { ComponentFixture, TestBed, async, inject, tick, fakeAsync } from '@angular/core/testing'; -import { Renderer, ElementRef } from '@angular/core'; +import { async, ComponentFixture, fakeAsync, inject, TestBed, tick } from '@angular/core/testing'; +import { ElementRef, Renderer } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { JhiLanguageService } from 'ng-jhipster'; import { MockLanguageService } from '../../../mocks/mock-language.service'; diff --git a/src/main/webapp/app/account/register/register.component.ts b/src/main/webapp/app/account/register/register.component.ts index f996910a..c21fd54a 100644 --- a/src/main/webapp/app/account/register/register.component.ts +++ b/src/main/webapp/app/account/register/register.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, AfterViewInit, Renderer, ElementRef } from '@angular/core'; +import { AfterViewInit, Component, ElementRef, OnInit, Renderer } from '@angular/core'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { JhiLanguageService } from 'ng-jhipster'; diff --git a/src/main/webapp/app/account/settings/settings.component.spec.ts b/src/main/webapp/app/account/settings/settings.component.spec.ts index dfe7de06..1bbf705b 100644 --- a/src/main/webapp/app/account/settings/settings.component.spec.ts +++ b/src/main/webapp/app/account/settings/settings.component.spec.ts @@ -1,8 +1,7 @@ -import { ComponentFixture, TestBed, async } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { Observable } from 'rxjs/Observable'; -import { JhiLanguageHelper } from '../../shared'; +import { AccountService, JhiLanguageHelper, Principal } from '../../shared'; import { GreatBigExampleApplicationTestModule } from '../../../mocks/test.module'; -import { Principal, AccountService } from '../../shared'; import { SettingsComponent } from './settings.component'; import { MockAccountService } from '../../../mocks/mock-account.service'; import { MockPrincipal } from '../../../mocks/mock-principal.service'; diff --git a/src/main/webapp/app/account/settings/settings.component.ts b/src/main/webapp/app/account/settings/settings.component.ts index 8f014205..de3f11b3 100644 --- a/src/main/webapp/app/account/settings/settings.component.ts +++ b/src/main/webapp/app/account/settings/settings.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { JhiLanguageService } from 'ng-jhipster'; -import { Principal, AccountService, JhiLanguageHelper } from '../../shared'; +import { AccountService, JhiLanguageHelper, Principal } from '../../shared'; @Component({ selector: 'jhi-settings', diff --git a/src/main/webapp/app/account/social/social-auth.component.ts b/src/main/webapp/app/account/social/social-auth.component.ts index e8e25e71..2321f69f 100644 --- a/src/main/webapp/app/account/social/social-auth.component.ts +++ b/src/main/webapp/app/account/social/social-auth.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Inject } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { LoginService } from '../../shared'; diff --git a/src/main/webapp/app/admin/admin.module.ts b/src/main/webapp/app/admin/admin.module.ts index fe9cd231..cdb2414f 100644 --- a/src/main/webapp/app/admin/admin.module.ts +++ b/src/main/webapp/app/admin/admin.module.ts @@ -1,37 +1,37 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { JhiTrackerService } from './../shared/tracker/tracker.service'; import { GreatBigExampleApplicationSharedModule } from '../shared'; -/* jhipster-needle-add-admin-module-import - JHipster will add admin modules imports here */ - import { adminState, AuditsComponent, - UserMgmtComponent, - UserDialogComponent, - UserDeleteDialogComponent, - UserMgmtDetailComponent, - UserMgmtDialogComponent, - UserMgmtDeleteDialogComponent, - LogsComponent, - JhiMetricsMonitoringModalComponent, - JhiMetricsMonitoringComponent, - JhiHealthModalComponent, - JhiHealthCheckComponent, - JhiConfigurationComponent, - JhiDocsComponent, AuditsService, + JhiConfigurationComponent, JhiConfigurationService, + JhiDocsComponent, + JhiHealthCheckComponent, + JhiHealthModalComponent, JhiHealthService, + JhiMetricsMonitoringComponent, + JhiMetricsMonitoringModalComponent, JhiMetricsService, JhiTrackerComponent, + LogsComponent, LogsService, - UserResolvePagingParams, + UserDeleteDialogComponent, + UserDialogComponent, + UserMgmtComponent, + UserMgmtDeleteDialogComponent, + UserMgmtDetailComponent, + UserMgmtDialogComponent, + UserModalService, UserResolve, - UserModalService + UserResolvePagingParams } from './'; +/* jhipster-needle-add-admin-module-import - JHipster will add admin modules imports here */ + @NgModule({ imports: [ GreatBigExampleApplicationSharedModule, diff --git a/src/main/webapp/app/admin/admin.route.ts b/src/main/webapp/app/admin/admin.route.ts index a907159b..bd529210 100644 --- a/src/main/webapp/app/admin/admin.route.ts +++ b/src/main/webapp/app/admin/admin.route.ts @@ -8,8 +8,8 @@ import { logsRoute, metricsRoute, trackerRoute, - userMgmtRoute, - userDialogRoute + userDialogRoute, + userMgmtRoute } from './'; import { UserRouteAccessService } from '../shared'; diff --git a/src/main/webapp/app/admin/audits/audits.component.spec.ts b/src/main/webapp/app/admin/audits/audits.component.spec.ts index da13db61..dd2bfe14 100644 --- a/src/main/webapp/app/admin/audits/audits.component.spec.ts +++ b/src/main/webapp/app/admin/audits/audits.component.spec.ts @@ -1,4 +1,4 @@ -import { ComponentFixture, TestBed, async } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { DatePipe } from '@angular/common'; import { NgbPaginationConfig } from '@ng-bootstrap/ng-bootstrap'; import { JhiParseLinks } from 'ng-jhipster'; diff --git a/src/main/webapp/app/admin/health/health.component.spec.ts b/src/main/webapp/app/admin/health/health.component.spec.ts index 07b77004..3c9286ea 100644 --- a/src/main/webapp/app/admin/health/health.component.spec.ts +++ b/src/main/webapp/app/admin/health/health.component.spec.ts @@ -1,4 +1,4 @@ -import { ComponentFixture, TestBed, async } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { GreatBigExampleApplicationTestModule } from '../../../mocks/test.module'; import { JhiHealthCheckComponent } from "../../admin/health/health.component"; diff --git a/src/main/webapp/app/admin/tracker/tracker.component.ts b/src/main/webapp/app/admin/tracker/tracker.component.ts index 713e7c34..179570e8 100644 --- a/src/main/webapp/app/admin/tracker/tracker.component.ts +++ b/src/main/webapp/app/admin/tracker/tracker.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { JhiTrackerService } from '../../shared'; diff --git a/src/main/webapp/app/admin/tracker/tracker.route.ts b/src/main/webapp/app/admin/tracker/tracker.route.ts index fcbd3c8e..f67989f8 100644 --- a/src/main/webapp/app/admin/tracker/tracker.route.ts +++ b/src/main/webapp/app/admin/tracker/tracker.route.ts @@ -1,8 +1,5 @@ import { Route } from '@angular/router'; - -import { UserRouteAccessService } from '../../shared'; import { JhiTrackerComponent } from './tracker.component'; -import { JhiTrackerService, Principal } from '../../shared'; export const trackerRoute: Route = { path: 'jhi-tracker', diff --git a/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts b/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts index 48d84bb5..251e4999 100644 --- a/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts +++ b/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { JhiEventManager } from 'ng-jhipster'; diff --git a/src/main/webapp/app/admin/user-management/user-management-detail.component.ts b/src/main/webapp/app/admin/user-management/user-management-detail.component.ts index 65485aae..52fd543d 100644 --- a/src/main/webapp/app/admin/user-management/user-management-detail.component.ts +++ b/src/main/webapp/app/admin/user-management/user-management-detail.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; diff --git a/src/main/webapp/app/admin/user-management/user-management-dialog.component.ts b/src/main/webapp/app/admin/user-management/user-management-dialog.component.ts index 4c2ef79f..268cdf67 100644 --- a/src/main/webapp/app/admin/user-management/user-management-dialog.component.ts +++ b/src/main/webapp/app/admin/user-management/user-management-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/main/webapp/app/admin/user-management/user-management.component.ts b/src/main/webapp/app/admin/user-management/user-management.component.ts index 8cf836ac..5d04ae2e 100644 --- a/src/main/webapp/app/admin/user-management/user-management.component.ts +++ b/src/main/webapp/app/admin/user-management/user-management.component.ts @@ -1,9 +1,8 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { Response } from '@angular/http'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { JhiEventManager, JhiPaginationUtil, JhiParseLinks, JhiAlertService } from 'ng-jhipster'; +import { JhiAlertService, JhiEventManager, JhiPaginationUtil, JhiParseLinks } from 'ng-jhipster'; -import { ITEMS_PER_PAGE, Principal, User, UserService, ResponseWrapper } from '../../shared'; +import { ITEMS_PER_PAGE, Principal, ResponseWrapper, User, UserService } from '../../shared'; import { PaginationConfig } from '../../core/config/uib-pagination.config'; @Component({ diff --git a/src/main/webapp/app/admin/user-management/user-management.route.ts b/src/main/webapp/app/admin/user-management/user-management.route.ts index 65b0d0a3..346521b9 100644 --- a/src/main/webapp/app/admin/user-management/user-management.route.ts +++ b/src/main/webapp/app/admin/user-management/user-management.route.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Resolve, ActivatedRouteSnapshot, RouterStateSnapshot, Routes, CanActivate } from '@angular/router'; +import { ActivatedRouteSnapshot, CanActivate, Resolve, RouterStateSnapshot, Routes } from '@angular/router'; import { JhiPaginationUtil } from 'ng-jhipster'; diff --git a/src/main/webapp/app/admin/user-management/user-modal.service.ts b/src/main/webapp/app/admin/user-management/user-modal.service.ts index 90ecf797..08f210c5 100644 --- a/src/main/webapp/app/admin/user-management/user-modal.service.ts +++ b/src/main/webapp/app/admin/user-management/user-modal.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Component } from '@angular/core'; +import { Component, Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/main/webapp/app/app.config.ts b/src/main/webapp/app/app.config.ts index 2bc91e25..241157e5 100644 --- a/src/main/webapp/app/app.config.ts +++ b/src/main/webapp/app/app.config.ts @@ -6,7 +6,7 @@ export class AppConfig { public readonly WS_SECURE = false; public readonly WS_HOST = 'localhost'; public readonly WS_PORT = 5552; -}; +} export const apiUrl = '/api'; export const API_URL = new OpaqueToken('restful-url'); diff --git a/src/main/webapp/app/app.module.ts b/src/main/webapp/app/app.module.ts index f366dbbd..b3c46971 100644 --- a/src/main/webapp/app/app.module.ts +++ b/src/main/webapp/app/app.module.ts @@ -15,7 +15,6 @@ import { GreatBigExampleApplicationHomeModule } from './features/home/home.modul import { TranslateModule } from '@ngx-translate/core'; import { EffectsModule } from '@ngrx/effects'; import { StoreRouterConnectingModule } from '@ngrx/router-store'; -import { StoreDevtoolsModule } from '@ngrx/store-devtools'; import { StoreModule } from '@ngrx/store'; import { customHttpProvider } from './core/interceptor/http.provider'; @@ -28,22 +27,12 @@ import { MealsModule } from './features/meals/meals.module'; // for the timer import { LayoutsModule } from './layouts/layouts.module'; import { schema } from './core/store/db'; -import { reducers, metaReducers, developmentReducerFactory } from './core/store'; - +import { metaReducers, reducers } from './core/store'; // jhipster-needle-angular-add-module-import JHipster will add new module here /** TODO: remove when work-around is not needed*/ import 'hammerjs'; -import { - JhiMainComponent, - // LayoutRoutingModule, - NavbarComponent, - FooterComponent, - ProfileService, - PageRibbonComponent, - ActiveMenuDirective, - ErrorComponent -} from './layouts'; +import { JhiMainComponent, ProfileService } from './layouts'; const imports = [ BrowserModule, diff --git a/src/main/webapp/app/core/api/api-interfaces.ts b/src/main/webapp/app/core/api/api-interfaces.ts index 5358d5e8..b2912623 100644 --- a/src/main/webapp/app/core/api/api-interfaces.ts +++ b/src/main/webapp/app/core/api/api-interfaces.ts @@ -1,7 +1,8 @@ /** * @module CoreModule - */ /** */ -import { Observable } from 'rxjs/Observable'; + */ + +/** */ /** * Interface for individual recipe items diff --git a/src/main/webapp/app/core/api/api.service.spec.ts b/src/main/webapp/app/core/api/api.service.spec.ts index d9e5136e..afcaaee6 100644 --- a/src/main/webapp/app/core/api/api.service.spec.ts +++ b/src/main/webapp/app/core/api/api.service.spec.ts @@ -1,8 +1,5 @@ /* tslint:disable:no-unused-variable */ -import { Injectable } from '@angular/core'; import { async, inject, TestBed } from '@angular/core/testing'; -import { Subject } from 'rxjs/Subject'; -import { Observable } from 'rxjs/Observable'; import { ApiService } from './api.service'; import { AngularFireOffline } from 'angularfire2-offline'; diff --git a/src/main/webapp/app/core/api/api.service.ts b/src/main/webapp/app/core/api/api.service.ts index 31f7c080..ea763e0b 100644 --- a/src/main/webapp/app/core/api/api.service.ts +++ b/src/main/webapp/app/core/api/api.service.ts @@ -1,13 +1,11 @@ /** * @module CoreModule - */ /** */ + */ +/** */ import { Injectable } from '@angular/core'; -import { - AngularFireOffline, - AfoListObservable, - AfoObjectObservable -} from 'angularfire2-offline'; +import { AfoListObservable, AfoObjectObservable, AngularFireOffline } from 'angularfire2-offline'; import { Observable } from 'rxjs/Observable'; + /** * @whatItDoes Reponsible for returning data from an API. * @consumers {@link HomeComponent}, {@link RecipeComponent}, {@link RecipeAdComponent} diff --git a/src/main/webapp/app/core/api/mock-api.service.spec.ts b/src/main/webapp/app/core/api/mock-api.service.spec.ts index 79dad716..879d4f8b 100644 --- a/src/main/webapp/app/core/api/mock-api.service.spec.ts +++ b/src/main/webapp/app/core/api/mock-api.service.spec.ts @@ -5,7 +5,7 @@ import { Subject } from 'rxjs/Subject'; import { ReplaySubject } from 'rxjs/ReplaySubject'; import { Recipe } from './api-interfaces'; -import { FilterOptions } from '../../features/meals/home/filter/filter-options'; // TODO: This file should be in the meals feature +import { FilterOptions } from '../../features/meals/home/filter/filter-options'; // TODO: This file should be in the meals feature @Injectable() export class MockApiService { diff --git a/src/main/webapp/app/core/commands/base.command.ts b/src/main/webapp/app/core/commands/base.command.ts index e1fa94ec..0a6ad133 100644 --- a/src/main/webapp/app/core/commands/base.command.ts +++ b/src/main/webapp/app/core/commands/base.command.ts @@ -7,7 +7,7 @@ export enum CommandState { IDLE, EXECUTING, INVOKED -}; +} export interface CommandResult { command: Command; diff --git a/src/main/webapp/app/core/config/uib-pagination.config.ts b/src/main/webapp/app/core/config/uib-pagination.config.ts index 245e1f6b..a1d3c90a 100644 --- a/src/main/webapp/app/core/config/uib-pagination.config.ts +++ b/src/main/webapp/app/core/config/uib-pagination.config.ts @@ -1,6 +1,6 @@ import { ITEMS_PER_PAGE } from '../../shared'; import { Injectable } from '@angular/core'; -import { NgbPaginationConfig} from '@ng-bootstrap/ng-bootstrap'; +import { NgbPaginationConfig } from '@ng-bootstrap/ng-bootstrap'; @Injectable() export class PaginationConfig { diff --git a/src/main/webapp/app/core/core.module.ts b/src/main/webapp/app/core/core.module.ts index 359444a6..2a26b9cd 100644 --- a/src/main/webapp/app/core/core.module.ts +++ b/src/main/webapp/app/core/core.module.ts @@ -1,4 +1,4 @@ -import { NgModule, ApplicationRef, Optional, SkipSelf } from '@angular/core'; +import { ApplicationRef, ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core'; // import { BrowserModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { CommonModule } from '@angular/common'; @@ -6,25 +6,17 @@ import { FormsModule } from '@angular/forms'; import { MaterialModule } from '@angular/material'; import { FlexLayoutModule } from '@angular/flex-layout'; import { RouterModule } from '@angular/router'; -import { removeNgStyles, createNewHosts, createInputTransfer } from '@angularclass/hmr'; +import { createInputTransfer, createNewHosts, removeNgStyles } from '@angularclass/hmr'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { TranslateModule, TranslateLoader, TranslateParser, MissingTranslationHandler } from '@ngx-translate/core'; -import { TranslateHttpLoader, } from '@ngx-translate/http-loader'; -import { translatePartialLoader, missingTranslationHandler } from 'ng-jhipster'; -import { Http } from '@angular/http'; import { NgaModule } from '../shared/nga.module'; - -import { ModuleWithProviders } from '@angular/core'; import { PushNotificationsModule } from 'angular2-notifications'; import { AngularFireModule } from 'angularfire2'; - /** * Import ngrx */ -import { Store, ActionReducer, combineReducers } from '@ngrx/store'; +import { Store } from '@ngrx/store'; // import { RouterStoreModule } from '@ngrx/router-store'; - /** * Import toplevel component/providers/directives/pipes */ @@ -34,16 +26,10 @@ import { SocketService } from './services/socket.service'; import { UserService } from './services/user.service'; import { customHttpProvider } from '../core/interceptor/http.provider'; -import { AppState, InternalStateType } from '../app.service'; -import { GlobalState } from '../global.state'; - import { firebaseConfig } from './firebase-config'; import { ApiService } from './api/api.service'; import { GlobalEventsService } from './global-events/global-events.service'; -import { StatusBarAwareDirective } from '../layouts/status-bar/status-bar-aware.directive'; -import { StatusBarComponent } from '../layouts/status-bar/status-bar.component'; import { StatusBarService } from '../layouts/status-bar/status-bar.service'; -import { SkipNavComponent } from '../layouts/skip-nav/skip-nav.component'; // Application wide providers // const APP_PROVIDERS = [ diff --git a/src/main/webapp/app/core/firebase-config.ts b/src/main/webapp/app/core/firebase-config.ts index 09535473..740bc4f2 100644 --- a/src/main/webapp/app/core/firebase-config.ts +++ b/src/main/webapp/app/core/firebase-config.ts @@ -1,7 +1,9 @@ /** * @module CoreModule - */ /** */ + */ +/** */ import { FirebaseAppConfig } from 'angularfire2'; + /** * @whatItDoes provides config info for initializing the AngularFireModule * @consumers {@link CoreModule} diff --git a/src/main/webapp/app/core/gateways/restful.gateway.ts b/src/main/webapp/app/core/gateways/restful.gateway.ts index 698395d1..187de586 100644 --- a/src/main/webapp/app/core/gateways/restful.gateway.ts +++ b/src/main/webapp/app/core/gateways/restful.gateway.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Http, Response, ResponseOptions } from '@angular/http'; +import { Http, Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { Observer } from 'rxjs/Observer'; diff --git a/src/main/webapp/app/core/gateways/websocket.gateway.ts b/src/main/webapp/app/core/gateways/websocket.gateway.ts index e2260286..79590010 100644 --- a/src/main/webapp/app/core/gateways/websocket.gateway.ts +++ b/src/main/webapp/app/core/gateways/websocket.gateway.ts @@ -1,4 +1,4 @@ -import { Injectable, Inject, OpaqueToken } from '@angular/core'; +import { Inject, Injectable, OpaqueToken } from '@angular/core'; import { Observable } from 'rxjs/Observable'; diff --git a/src/main/webapp/app/core/global-events/global-events.service.ts b/src/main/webapp/app/core/global-events/global-events.service.ts index 7ee61294..633975c5 100644 --- a/src/main/webapp/app/core/global-events/global-events.service.ts +++ b/src/main/webapp/app/core/global-events/global-events.service.ts @@ -1,8 +1,10 @@ /** * @module CoreModule - */ /** */ + */ +/** */ import { EventEmitter, Inject, Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; + /** * @whatItDoes Reponsible for handling and dispatching global events such as `window` resizing, * `body` scrolling, etc. diff --git a/src/main/webapp/app/core/interceptor/errorhandler.interceptor.ts b/src/main/webapp/app/core/interceptor/errorhandler.interceptor.ts index 09c396c1..3024afd3 100644 --- a/src/main/webapp/app/core/interceptor/errorhandler.interceptor.ts +++ b/src/main/webapp/app/core/interceptor/errorhandler.interceptor.ts @@ -1,4 +1,4 @@ -import { JhiHttpInterceptor, JhiEventManager } from 'ng-jhipster'; +import { JhiEventManager, JhiHttpInterceptor } from 'ng-jhipster'; import { RequestOptionsArgs, Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; diff --git a/src/main/webapp/app/core/interceptor/http.provider.ts b/src/main/webapp/app/core/interceptor/http.provider.ts index e7423069..991ff4f3 100644 --- a/src/main/webapp/app/core/interceptor/http.provider.ts +++ b/src/main/webapp/app/core/interceptor/http.provider.ts @@ -1,5 +1,5 @@ import { Injector } from '@angular/core'; -import { Http, XHRBackend, RequestOptions } from '@angular/http'; +import { Http, RequestOptions, XHRBackend } from '@angular/http'; import { JhiEventManager, JhiInterceptableHttp } from 'ng-jhipster'; import { AuthInterceptor } from './auth.interceptor'; @@ -27,8 +27,7 @@ export function interceptableFactory( new NotificationInterceptor(injector) ] ); -}; - +} export function customHttpProvider() { return { provide: Http, @@ -42,4 +41,4 @@ export function customHttpProvider() { JhiEventManager ] }; -}; +} diff --git a/src/main/webapp/app/core/services/in-memory-data.service.ts b/src/main/webapp/app/core/services/in-memory-data.service.ts index 7137d1f1..cbc07b30 100755 --- a/src/main/webapp/app/core/services/in-memory-data.service.ts +++ b/src/main/webapp/app/core/services/in-memory-data.service.ts @@ -1,4 +1,5 @@ import { InMemoryDbService } from 'angular-in-memory-web-api'; + export class InMemoryDataService implements InMemoryDbService { createDb() { const heroes = [ diff --git a/src/main/webapp/app/core/services/rest.service.spec.ts b/src/main/webapp/app/core/services/rest.service.spec.ts index 14a0eb89..fc76d99f 100755 --- a/src/main/webapp/app/core/services/rest.service.spec.ts +++ b/src/main/webapp/app/core/services/rest.service.spec.ts @@ -1,17 +1,8 @@ -import { - async, inject, TestBed -} from '@angular/core/testing'; +import { async, inject, TestBed } from '@angular/core/testing'; -import { - MockBackend, - MockConnection -} from '@angular/http/testing'; +import { MockBackend } from '@angular/http/testing'; -import { - HttpModule, Http, XHRBackend, Response, ResponseOptions -} from '@angular/http'; - -import { Observable } from 'rxjs/Observable'; +import { Http, HttpModule, Response, ResponseOptions, XHRBackend } from '@angular/http'; import { Hero } from '../store/hero/hero.model'; import { RESTService } from './rest.service'; import { AppConfig } from '../../app.config'; diff --git a/src/main/webapp/app/core/services/rest.service.ts b/src/main/webapp/app/core/services/rest.service.ts index ed0bb288..df3ef663 100644 --- a/src/main/webapp/app/core/services/rest.service.ts +++ b/src/main/webapp/app/core/services/rest.service.ts @@ -1,15 +1,6 @@ -import { Injectable, OnInit } from '@angular/core'; -import { Http, URLSearchParams, Response, Headers } from '@angular/http'; +import { Injectable } from '@angular/core'; +import { Http, Response, URLSearchParams } from '@angular/http'; import { Observable } from 'rxjs/Observable'; -import { Subject } from 'rxjs/Subject'; - -import { Claim } from '../store/claim/claim.model'; -import { ClaimRebuttal } from '../store/claim-rebuttal/claim-rebuttal.model'; -import { Contact } from '../store/contact/contact.model'; -import { Crisis } from '../store/crisis/crisis.model'; -import { Hero } from '../store/hero/hero.model'; -import { Note } from '../store/note/note.model'; -import { Rebuttal } from '../store/rebuttal/rebuttal.model'; import { AppConfig } from '../../app.config'; /** diff --git a/src/main/webapp/app/core/services/socket.service.ts b/src/main/webapp/app/core/services/socket.service.ts index 6110e14b..d1e1dee1 100644 --- a/src/main/webapp/app/core/services/socket.service.ts +++ b/src/main/webapp/app/core/services/socket.service.ts @@ -1,8 +1,8 @@ -import { Injectable, Inject } from '@angular/core'; -import { Router, NavigationEnd } from '@angular/router'; +import { Injectable } from '@angular/core'; +import { Router } from '@angular/router'; import { Observable } from 'rxjs/Observable'; import { Observer } from 'rxjs/Observer'; -import { Subscription } from 'rxjs/Subscription'; +import { Subscription } from 'rxjs/Subscription'; import { Store } from '@ngrx/store'; import * as SockJS from 'sockjs-client'; import * as Stomp from 'webstomp-client'; diff --git a/src/main/webapp/app/core/store/base/base.facade.ts b/src/main/webapp/app/core/store/base/base.facade.ts index 919f8e1a..0d9d5057 100644 --- a/src/main/webapp/app/core/store/base/base.facade.ts +++ b/src/main/webapp/app/core/store/base/base.facade.ts @@ -2,7 +2,6 @@ import { Observable } from 'rxjs/Observable'; import { Action } from '@ngrx/store'; - import { BaseAsyncService } from '../../services/base.async-service'; export abstract class BaseFacade { diff --git a/src/main/webapp/app/core/store/book/book.effects.ts b/src/main/webapp/app/core/store/book/book.effects.ts index ce5d0bdd..86f69f6e 100644 --- a/src/main/webapp/app/core/store/book/book.effects.ts +++ b/src/main/webapp/app/core/store/book/book.effects.ts @@ -1,5 +1,5 @@ -import { Injectable, InjectionToken, Optional, Inject } from '@angular/core'; -import { Effect, Actions } from '@ngrx/effects'; +import { Inject, Injectable, InjectionToken, Optional } from '@angular/core'; +import { Actions, Effect } from '@ngrx/effects'; import { GoogleBooksService } from '../../../features/books/services/google-books.service'; import { slices } from '../util'; diff --git a/src/main/webapp/app/core/store/book/book.reducer.ts b/src/main/webapp/app/core/store/book/book.reducer.ts index 9cd23fae..8f6f6ea8 100644 --- a/src/main/webapp/app/core/store/book/book.reducer.ts +++ b/src/main/webapp/app/core/store/book/book.reducer.ts @@ -2,11 +2,9 @@ import { createSelector } from 'reselect'; import { Book, initialBook } from './book.model'; import { Entities, initialEntities } from '../entity/entity.model'; -import { slices } from '../util'; +import { slices, typeFor } from '../util'; import * as functions from '../entity/entity.functions'; -import { typeFor } from '../util'; -import { actions } from '../entity/entity.actions'; -import { EntityAction } from '../entity/entity.actions'; +import { actions, EntityAction } from '../entity/entity.actions'; import { IDAction } from '../id/id.actions'; export function reducer(state: Entities = initialEntities({}, slices.BOOK, actions, initialBook), diff --git a/src/main/webapp/app/core/store/claim-rebuttal/claim-rebuttal.reducer.ts b/src/main/webapp/app/core/store/claim-rebuttal/claim-rebuttal.reducer.ts index 1256720f..44e44105 100644 --- a/src/main/webapp/app/core/store/claim-rebuttal/claim-rebuttal.reducer.ts +++ b/src/main/webapp/app/core/store/claim-rebuttal/claim-rebuttal.reducer.ts @@ -1,5 +1,3 @@ -import { Observable } from 'rxjs/Observable'; - import { ClaimRebuttal, initialClaimRebuttal } from './claim-rebuttal.model'; import { Entities, initialEntities } from '../entity/entity.model'; import * as entityFunctions from '../entity/entity.functions'; @@ -29,8 +27,7 @@ export function reducer(state: Entities = initialEntities) => state.entities; export const getIds = (state: Entities) => state.ids; diff --git a/src/main/webapp/app/core/store/claim/claim.model.ts b/src/main/webapp/app/core/store/claim/claim.model.ts index 7b070d70..90af066a 100644 --- a/src/main/webapp/app/core/store/claim/claim.model.ts +++ b/src/main/webapp/app/core/store/claim/claim.model.ts @@ -12,7 +12,7 @@ export interface Claim { // UI state rebuttalsReordered: boolean; expanded: boolean; -}; +} export const initialClaim: Claim = { id: null, diff --git a/src/main/webapp/app/core/store/claim/claim.reducer.ts b/src/main/webapp/app/core/store/claim/claim.reducer.ts index b19b4fcf..a5883b5e 100644 --- a/src/main/webapp/app/core/store/claim/claim.reducer.ts +++ b/src/main/webapp/app/core/store/claim/claim.reducer.ts @@ -4,8 +4,7 @@ import { SliceAction } from '../slice/slice.actions'; import { Entities, initialEntities } from '../entity/entity.model'; import * as entityFunctions from '../entity/entity.functions'; import * as sliceFunctions from '../slice/slice.functions'; -import { slices } from '../util'; -import { typeFor } from '../util'; +import { slices, typeFor } from '../util'; export function reducer(state = initialEntities({}, slices.CLAIM, actions, initialClaim), action: EntityAction): Entities { diff --git a/src/main/webapp/app/core/store/collection/collection.effects.ts b/src/main/webapp/app/core/store/collection/collection.effects.ts index 0000a35f..04a34a17 100644 --- a/src/main/webapp/app/core/store/collection/collection.effects.ts +++ b/src/main/webapp/app/core/store/collection/collection.effects.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Effect, Actions } from '@ngrx/effects'; +import { Actions, Effect } from '@ngrx/effects'; import { Database } from '@ngrx/db'; import { Observable } from 'rxjs/Observable'; import { defer } from 'rxjs/observable/defer'; diff --git a/src/main/webapp/app/core/store/collection/collection.reducer.ts b/src/main/webapp/app/core/store/collection/collection.reducer.ts index 293f8109..cee0eb40 100644 --- a/src/main/webapp/app/core/store/collection/collection.reducer.ts +++ b/src/main/webapp/app/core/store/collection/collection.reducer.ts @@ -1,9 +1,7 @@ -import { createSelector } from 'reselect'; import { IDs, initialIDs } from '../id/id.model'; import { slices, typeFor } from '../util'; import * as functions from '../id/id.functions'; -import { actions } from '../id/id.actions'; -import { IDAction } from '../id/id.actions'; +import { actions, IDAction } from '../id/id.actions'; export function reducer(state = initialIDs(), action: IDAction): IDs { diff --git a/src/main/webapp/app/core/store/contact/contact.reducer.ts b/src/main/webapp/app/core/store/contact/contact.reducer.ts index db89a113..1baa863e 100644 --- a/src/main/webapp/app/core/store/contact/contact.reducer.ts +++ b/src/main/webapp/app/core/store/contact/contact.reducer.ts @@ -2,9 +2,8 @@ import { createSelector } from 'reselect'; import { Contact, initialContact } from './contact.model'; import { Entities, initialEntities } from '../entity/entity.model'; -import { slices } from '../util'; +import { slices, typeFor } from '../util'; import * as functions from '../entity/entity.functions'; -import { typeFor } from '../util'; import { actions, EntityAction } from '../entity/entity.actions'; export function reducer(state: Entities = initialEntities({}, slices.CONTACT, actions, initialContact), @@ -30,8 +29,7 @@ export function reducer(state: Entities = initialEntities({}, default: return state; } -}; - +} export const getEntities = (state: Entities) => state.entities; export const getIds = (state: Entities) => state.ids; diff --git a/src/main/webapp/app/core/store/counter/counter.effects.ts b/src/main/webapp/app/core/store/counter/counter.effects.ts index 7b45fb94..6b5088ac 100644 --- a/src/main/webapp/app/core/store/counter/counter.effects.ts +++ b/src/main/webapp/app/core/store/counter/counter.effects.ts @@ -1,14 +1,13 @@ import { Injectable } from '@angular/core'; -import { Store, Action } from '@ngrx/store'; +import { Store } from '@ngrx/store'; import { Actions, Effect } from '@ngrx/effects'; import { empty } from 'rxjs/observable/empty'; import { Counter, initialCounter } from './counter.model'; import { RESTService } from '../../services/rest.service'; -import * as functions from '../entity/entity.functions'; -import { typeFor, slices } from '../util'; -import { actions, SliceAction } from '../slice/slice.actions'; +import { slices, typeFor } from '../util'; import * as SliceActions from '../slice/slice.actions'; +import { actions, SliceAction } from '../slice/slice.actions'; @Injectable() export class CounterEffects { diff --git a/src/main/webapp/app/core/store/counter/counter.model.ts b/src/main/webapp/app/core/store/counter/counter.model.ts index 1115ae46..83c86cbb 100644 --- a/src/main/webapp/app/core/store/counter/counter.model.ts +++ b/src/main/webapp/app/core/store/counter/counter.model.ts @@ -1,6 +1,6 @@ export interface Counter { value: number; -}; +} export const initialCounter: Counter = { value: 23, diff --git a/src/main/webapp/app/core/store/counter/counter.reducer.ts b/src/main/webapp/app/core/store/counter/counter.reducer.ts index cba5e88b..38f3e567 100644 --- a/src/main/webapp/app/core/store/counter/counter.reducer.ts +++ b/src/main/webapp/app/core/store/counter/counter.reducer.ts @@ -1,10 +1,7 @@ -import { Observable } from 'rxjs/Observable'; - import { Counter, initialCounter } from './counter.model'; -import { typeFor, slices } from '../util'; +import { slices, typeFor } from '../util'; import * as functions from '../slice/slice.functions'; import { actions, SliceAction } from '../slice/slice.actions'; -import * as SliceActions from '../slice/slice.actions'; export function reducer(state: Counter = initialCounter, action: SliceAction): Counter { switch (action.type) { diff --git a/src/main/webapp/app/core/store/crisis/crisis.reducer.ts b/src/main/webapp/app/core/store/crisis/crisis.reducer.ts index 2887c9e1..98da488d 100644 --- a/src/main/webapp/app/core/store/crisis/crisis.reducer.ts +++ b/src/main/webapp/app/core/store/crisis/crisis.reducer.ts @@ -2,9 +2,8 @@ import { createSelector } from 'reselect'; import { Crisis, initialCrisis } from './crisis.model'; import { Entities, initialEntities } from '../entity/entity.model'; -import { slices } from '../util'; +import { slices, typeFor } from '../util'; import * as functions from '../entity/entity.functions'; -import { typeFor } from '../util'; import { actions, EntityAction } from '../entity/entity.actions'; export function reducer(state: Entities = @@ -27,8 +26,7 @@ export function reducer(state: Entities = default: return state; } -}; - +} export const getEntities = (state: Entities) => state.entities; export const getIds = (state: Entities) => state.ids; diff --git a/src/main/webapp/app/core/store/entity/entity.actions.ts b/src/main/webapp/app/core/store/entity/entity.actions.ts index cfcd12e0..f166bf3e 100644 --- a/src/main/webapp/app/core/store/entity/entity.actions.ts +++ b/src/main/webapp/app/core/store/entity/entity.actions.ts @@ -1,6 +1,4 @@ -import { PayloadAction } from '../util'; - -import { typeFor } from '../util'; +import { PayloadAction, typeFor } from '../util'; export const actions = { ADD: 'ADD', diff --git a/src/main/webapp/app/core/store/entity/entity.functions.ts b/src/main/webapp/app/core/store/entity/entity.functions.ts index 7cd6e6f3..3378f97b 100644 --- a/src/main/webapp/app/core/store/entity/entity.functions.ts +++ b/src/main/webapp/app/core/store/entity/entity.functions.ts @@ -1,11 +1,11 @@ import { Observable } from 'rxjs/Observable'; -import { toPayload, Actions } from '@ngrx/effects'; +import { Actions } from '@ngrx/effects'; import { Action } from '@ngrx/store'; import { Entities } from './entity.model'; -import { typeFor, PayloadAction, PayloadActions } from '../util'; -import { actions, EntityAction } from './entity.actions'; +import { PayloadActions, typeFor } from '../util'; import * as EntityActions from './entity.actions'; +import { actions, EntityAction } from './entity.actions'; export function addToStore(state: Entities, action: EntityActions.Add | EntityActions.Load): Entities { const entities = Object.assign({}, state.entities); @@ -17,8 +17,7 @@ export function addToStore(state: Entities, action: EntityActions.Add | loaded: true, loading: false, }); -}; - +} /** * Called after response from an add request returns from the server */ @@ -34,7 +33,7 @@ export function addSuccess(state: Entities, action: EntityActions.AddTemp< loaded: true, loading: false, }); -}; +} /* * Delete the property from state.entities, the element from state.ids and * if the one being deleted is the selectedEntity, then select a different one. @@ -48,14 +47,13 @@ export function deleteEntity(state: Entities, action: EntityActions.Delete delete entities[id]; const idx = state.ids.indexOf(id); - const lastIdx = state.ids.length > 1 ? state.ids.length - 2 : null + const lastIdx = state.ids.length > 1 ? state.ids.length - 2 : null; const newIdx = idx > 0 ? idx - 1 : lastIdx; const selectedEntityId = idx === -1 ? state.selectedEntityId : state.ids[newIdx]; const i = state.ids.findIndex((findId) => findId === id); const ids = [...state.ids.slice(0, i), ...state.ids.slice(i + 1)]; return Object.assign({}, state, { entities, ids, selectedEntityId }); -}; - +} /** * Called from OnDestroy hooks to remove unsaved records with TEMP ID */ @@ -70,14 +68,12 @@ export function select(state: Entities, action: EntityActions.Select): return Object.assign({}, state, { selectedEntityId: action.payload.id || action.payload }); -}; - +} export function selectNext(state: Entities, action: EntityActions.SelectNext): Entities { let ix = 1 + state.ids.indexOf(state.selectedEntityId); if (ix >= state.ids.length) { ix = 0; } return Object.assign({}, state, { selectedEntityId: state.ids[ix] }); -}; - +} /** * Add entities in the action's payload into the state if they are not yet there * @@ -116,8 +112,7 @@ export function update(state: Entities, action: EntityActions.Update): ids: Object.keys(entities), entities }); -}; - +} /** * @whatItDoes updates a given slice with a new set of entities in one fell swoop * @@ -133,8 +128,7 @@ export function newEntities(state: Entities, action: EntityActions.Update< ids: Object.keys(entities), entities }); -}; - +} export function patchEach(state: Entities, action: any): Entities { const entities = Object.assign({}, state.entities); for (const id of Object.keys(entities)) { @@ -143,8 +137,7 @@ export function patchEach(state: Entities, action: any): Entities { return Object.assign({}, state, { entities }); -}; - +} function reduceOne(state: Entities, entity: T = null, action: EntityAction): T { // console.log('reduceOne entity:' + JSON.stringify(entity) + ' ' + action.type) switch (action.type) { @@ -175,8 +168,7 @@ function reduceOne(state: Entities, entity: T = null, action: EntityAction default: return entity; } -}; - +} /** * * Effects diff --git a/src/main/webapp/app/core/store/entity/entity.model.ts b/src/main/webapp/app/core/store/entity/entity.model.ts index c791fbe4..2067eda5 100644 --- a/src/main/webapp/app/core/store/entity/entity.model.ts +++ b/src/main/webapp/app/core/store/entity/entity.model.ts @@ -1,5 +1,3 @@ -import { EntityAction } from './entity.actions'; - export interface Entities { ids: string[]; entities: { [id: string]: T }; @@ -9,7 +7,7 @@ export interface Entities { slice: string; initialEntity: T; getData: Function; -}; +} export function initialEntities(vals: any = {}, slice: string, actionNames: any, initialEntity): Entities { @@ -22,4 +20,4 @@ export function initialEntities(vals: any = {}, slice: string, actionNames: a slice, initialEntity, }, vals); -}; +} diff --git a/src/main/webapp/app/core/store/game/game.action-creator.ts b/src/main/webapp/app/core/store/game/game.action-creator.ts index 21f4f13c..f122f220 100644 --- a/src/main/webapp/app/core/store/game/game.action-creator.ts +++ b/src/main/webapp/app/core/store/game/game.action-creator.ts @@ -1,9 +1,6 @@ -import { Action } from '@ngrx/store'; import { PayloadAction } from '../util'; -import { - COMPLETE_GAME, GAME_PROGRESS, INVALID_GAME, START_GAME -} from './game.actions'; +import { COMPLETE_GAME, GAME_PROGRESS, INVALID_GAME, START_GAME } from './game.actions'; export const GameActions = { completeGame(text: string, time: number): PayloadAction { diff --git a/src/main/webapp/app/core/store/game/game.facade.ts b/src/main/webapp/app/core/store/game/game.facade.ts index 7da43aca..8f865cce 100644 --- a/src/main/webapp/app/core/store/game/game.facade.ts +++ b/src/main/webapp/app/core/store/game/game.facade.ts @@ -1,7 +1,6 @@ import { Inject, Injectable, Optional } from '@angular/core'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs/Observable'; -import { fromJS, Map } from 'immutable'; import { BaseAsyncService } from '../../services/base.async-service'; import { BaseFacade } from '../base/base.facade'; diff --git a/src/main/webapp/app/core/store/game/game.reducer.ts b/src/main/webapp/app/core/store/game/game.reducer.ts index f208783d..e3309359 100644 --- a/src/main/webapp/app/core/store/game/game.reducer.ts +++ b/src/main/webapp/app/core/store/game/game.reducer.ts @@ -2,9 +2,10 @@ import { fromJS } from 'immutable'; import { PayloadAction } from '../util'; import { initialGame } from './game.model'; +import { COMPLETE_GAME, GAME_PROGRESS, INVALID_GAME, START_GAME } from './game.actions'; +import { PARTNER_COMPLETED, PARTNER_PROGRESS } from '../p2p-game/p2p-game.actions'; + export { initialGame } from './game.model'; -import { COMPLETE_GAME, INVALID_GAME, START_GAME, GAME_PROGRESS } from './game.actions'; -import { PARTNER_PROGRESS, PARTNER_COMPLETED } from '../p2p-game/p2p-game.actions'; export function gamesReducer(state: any = initialGame.get('games'), action: PayloadAction) { switch (action.type) { @@ -13,8 +14,7 @@ export function gamesReducer(state: any = initialGame.get('games'), action: Payl break; } return state; -}; - +} // Fixes error: Error encountered resolving symbol values statically. Function calls are not // supported. Consider replacing the function or lambda with a reference to an exported function // const initialGameValue = initialGame.get('game'); @@ -32,8 +32,7 @@ export function gameReducer(state: any = initialGame.get('game'), action: Payloa break; } return state; -}; - +} // Can't move to +multi-player yet because of `provideStore`. export function p2pGameReducer(state: any = initialGame.get('p2pGame'), action: PayloadAction) { switch (action.type) { @@ -48,4 +47,4 @@ export function p2pGameReducer(state: any = initialGame.get('p2pGame'), action: break; } return state; -}; +} diff --git a/src/main/webapp/app/core/store/hero/hero.reducer.ts b/src/main/webapp/app/core/store/hero/hero.reducer.ts index 5ab241b1..393ebf2a 100644 --- a/src/main/webapp/app/core/store/hero/hero.reducer.ts +++ b/src/main/webapp/app/core/store/hero/hero.reducer.ts @@ -2,9 +2,8 @@ import { createSelector } from 'reselect'; import { Hero, initialHero } from './hero.model'; import { Entities, initialEntities } from '../entity/entity.model'; -import { slices } from '../util'; +import { slices, typeFor } from '../util'; import * as functions from '../entity/entity.functions'; -import { typeFor } from '../util'; import { actions, EntityAction } from '../entity/entity.actions'; export function reducer(state: Entities = initialEntities({}, slices.HERO, actions, initialHero), @@ -29,8 +28,7 @@ export function reducer(state: Entities = initialEntities({}, slices default: return state; } -}; - +} export const getEntities = (state: Entities) => state.entities; export const getIds = (state: Entities) => state.ids.filter((id) => !state.entities[id].deleteMe); diff --git a/src/main/webapp/app/core/store/id/id.functions.ts b/src/main/webapp/app/core/store/id/id.functions.ts index 8571308b..d5483445 100644 --- a/src/main/webapp/app/core/store/id/id.functions.ts +++ b/src/main/webapp/app/core/store/id/id.functions.ts @@ -1,14 +1,12 @@ import { Observable } from 'rxjs/Observable'; -import { Scheduler } from 'rxjs/Scheduler'; import { async } from 'rxjs/scheduler/async'; -import { Effect, Actions, toPayload } from '@ngrx/effects'; +import { Actions, toPayload } from '@ngrx/effects'; import { IDs } from './id.model'; -import { typeFor } from '../util'; -import { actions, IDAction } from './id.actions'; +import { PayloadAction, typeFor } from '../util'; import * as IDActions from './id.actions'; -import { PayloadAction } from '../util'; +import { actions, IDAction } from './id.actions'; import { of } from 'rxjs/observable/of'; import { empty } from 'rxjs/observable/empty'; @@ -21,8 +19,7 @@ export function addLoadID(state: IDs, action: IDAction): IDs { return Object.assign({}, state, { loading: true, }); -}; - +} export function updateIDs(state: IDs, action: IDAction): IDs { const entities = action.payload; return Object.assign({}, state, { @@ -30,8 +27,7 @@ export function updateIDs(state: IDs, action: IDAction): IDs { loading: false, ids: entities.map((entity) => entity.id) }); -}; - +} export function addID(state: IDs, action: IDAction): IDs { const id = action.payload.id; if (state.ids.indexOf(id.id) > -1) { @@ -41,16 +37,14 @@ export function addID(state: IDs, action: IDAction): IDs { return Object.assign({}, state, { ids: [...state.ids, id] }); -}; - +} export function deleteID(state: IDs, action: IDAction): IDs { const entity = action.payload; return Object.assign({}, state, { ids: state.ids.filter((id) => id !== entity.id) }); -}; - +} /** * Effects */ diff --git a/src/main/webapp/app/core/store/id/id.model.ts b/src/main/webapp/app/core/store/id/id.model.ts index 29819994..72e57d90 100644 --- a/src/main/webapp/app/core/store/id/id.model.ts +++ b/src/main/webapp/app/core/store/id/id.model.ts @@ -1,11 +1,8 @@ -import * as commonActions from '../entity/entity.actions'; -import { IDAction } from './id.actions'; - export interface IDs { ids: string[]; loaded: boolean; loading: boolean; -}; +} export function initialIDs(vals: any = {}): IDs { return Object.assign({}, { @@ -13,4 +10,4 @@ export function initialIDs(vals: any = {}): IDs { loaded: false, loading: false }, vals); -}; +} diff --git a/src/main/webapp/app/core/store/index.ts b/src/main/webapp/app/core/store/index.ts index 2159bde4..45924ef8 100644 --- a/src/main/webapp/app/core/store/index.ts +++ b/src/main/webapp/app/core/store/index.ts @@ -1,4 +1,3 @@ -import { Observable } from 'rxjs/Observable'; import * as fromRouter from '@ngrx/router-store'; import { localStorageSync } from 'ngrx-store-localstorage'; @@ -12,29 +11,24 @@ import { Counter } from './counter/counter.model'; import { Hero } from './hero/hero.model'; import { Layout } from './layout/layout.model'; import { Note } from './note/note.model'; -import { Rebuttal, initialRebuttal } from './rebuttal/rebuttal.model'; +import { Rebuttal } from './rebuttal/rebuttal.model'; import { Session } from './session/session.model'; -import { User } from './user/user.model'; import { Talk } from './talk/talk.model'; import { - ActionReducerMap, - createSelector, - createFeatureSelector, - compose, - ActionReducer, - combineReducers, Action, + ActionReducer, ActionReducerFactory, + ActionReducerMap, + combineReducers, + compose, + createSelector, } from '@ngrx/store'; - /** * storeFreeze prevents state from being mutated. When mutation occurs, an * exception will be thrown. This is useful during development mode to * ensure that none of the reducers accidentally mutates the state. */ -import { storeFreeze } from 'ngrx-store-freeze'; - /** * Every reducer module's default export is the reducer function itself. In * addition, each module should export a type or interface that describes @@ -49,6 +43,7 @@ import * as fromContacts from './contact/contact.reducer'; import * as fromCounter from './counter/counter.reducer'; import * as fromCrises from './crisis/crisis.reducer'; import * as fromGames from './game/game.reducer'; +import { gamesReducer, p2pGameReducer } from './game/game.reducer'; import * as fromHeroes from './hero/hero.reducer'; import * as fromLayout from './layout/layout.reducer'; import * as fromMessages from './message/message.reducer'; @@ -57,7 +52,6 @@ import * as fromRebuttals from './rebuttal/rebuttal.reducer'; import * as fromSearch from './search/search.reducer'; import * as fromSession from './session/session.reducer'; import * as fromTalks from './talk/talk.reducer'; -import { gameReducer, gamesReducer, p2pGameReducer } from './game/game.reducer'; import { Entities } from './entity/entity.model'; import { IDs } from './id/id.model'; diff --git a/src/main/webapp/app/core/store/layout/layout.effects.ts b/src/main/webapp/app/core/store/layout/layout.effects.ts index 515dbc12..62a6983f 100644 --- a/src/main/webapp/app/core/store/layout/layout.effects.ts +++ b/src/main/webapp/app/core/store/layout/layout.effects.ts @@ -1,10 +1,7 @@ import { Injectable } from '@angular/core'; -import { Store } from '@ngrx/store'; import { Actions, Effect } from '@ngrx/effects'; -import { slices, PayloadAction } from '../util'; -import { actions } from '../slice/slice.actions'; -import * as SliceActions from '../slice/slice.actions'; +import { PayloadAction } from '../util'; import { WatchService } from '../../../features/talks/services/watch.service'; /** diff --git a/src/main/webapp/app/core/store/layout/layout.model.ts b/src/main/webapp/app/core/store/layout/layout.model.ts index 8d718fe6..8faae35d 100644 --- a/src/main/webapp/app/core/store/layout/layout.model.ts +++ b/src/main/webapp/app/core/store/layout/layout.model.ts @@ -1,7 +1,7 @@ import { BooksPageLayout, initialBooksPageLayout } from '../../../features/books/books.layout'; import { BerniePageLayout, initialBerniePageLayout } from '../../../features/bernie/bernie.layout'; import { HeroesDashboardLayout, initialHeroesDashboardPageLayout } from '../../../features/heroes/heroes.layout'; -import { TalksPageLayout, initialTalksPageLayout } from '../../../features/talks/talks.layout'; +import { initialTalksPageLayout, TalksPageLayout } from '../../../features/talks/talks.layout'; /** * Combination of everything diff --git a/src/main/webapp/app/core/store/layout/layout.reducer.ts b/src/main/webapp/app/core/store/layout/layout.reducer.ts index 8d8084bc..e53b9a3e 100644 --- a/src/main/webapp/app/core/store/layout/layout.reducer.ts +++ b/src/main/webapp/app/core/store/layout/layout.reducer.ts @@ -1,10 +1,8 @@ -import { SliceAction } from '../slice/slice.actions'; -import { Layout, initialLayout } from './layout.model'; -import * as functions from '../slice/slice.functions'; -import { typeFor, slices } from '../util'; -import { actions } from '../slice/slice.actions'; import * as SliceActions from '../slice/slice.actions'; -import { Contact } from '../contact/contact.model'; +import { actions, SliceAction } from '../slice/slice.actions'; +import { initialLayout, Layout } from './layout.model'; +import * as functions from '../slice/slice.functions'; +import { slices, typeFor } from '../util'; export function reducer(state: Layout = initialLayout(), action: SliceAction): Layout { diff --git a/src/main/webapp/app/core/store/message/message.reducer.ts b/src/main/webapp/app/core/store/message/message.reducer.ts index bbda0052..69ebbb3f 100644 --- a/src/main/webapp/app/core/store/message/message.reducer.ts +++ b/src/main/webapp/app/core/store/message/message.reducer.ts @@ -1,10 +1,9 @@ import { createSelector } from 'reselect'; -import { Message, initialMessage } from './message.model'; +import { initialMessage, Message } from './message.model'; import { Entities, initialEntities } from '../entity/entity.model'; -import { slices } from '../util'; +import { slices, typeFor } from '../util'; import * as functions from '../entity/entity.functions'; -import { typeFor } from '../util'; import { actions, EntityAction } from '../entity/entity.actions'; export function reducer(state: Entities = initialEntities({}, slices.MESSAGE, actions, initialMessage), @@ -30,8 +29,7 @@ export function reducer(state: Entities = initialEntities({}, default: return state; } -}; - +} export const getEntities = (state: Entities) => state.entities; export const getIds = (state: Entities) => state.ids; diff --git a/src/main/webapp/app/core/store/note/note.reducer.ts b/src/main/webapp/app/core/store/note/note.reducer.ts index 456f3bad..3338ae1d 100644 --- a/src/main/webapp/app/core/store/note/note.reducer.ts +++ b/src/main/webapp/app/core/store/note/note.reducer.ts @@ -1,10 +1,7 @@ -import { createSelector } from 'reselect'; - -import { Note, initialNote } from './note.model'; +import { initialNote, Note } from './note.model'; import { Entities, initialEntities } from '../entity/entity.model'; -import { slices } from '../util'; +import { slices, typeFor } from '../util'; import * as functions from '../entity/entity.functions'; -import { typeFor } from '../util'; import { actions, EntityAction } from '../entity/entity.actions'; export function reducer(state: Entities = initialEntities({}, slices.NOTE, actions, initialNote), @@ -29,8 +26,7 @@ export function reducer(state: Entities = initialEntities({}, slices default: return state; } -}; - +} export const getEntities = (state: Entities) => state.entities; export const getIds = (state: Entities) => state.ids.filter((id) => !state.entities[id].deleteMe); diff --git a/src/main/webapp/app/core/store/p2p-game/p2p-game.action-creators.ts b/src/main/webapp/app/core/store/p2p-game/p2p-game.action-creators.ts index 7797ca6f..31ba98a3 100644 --- a/src/main/webapp/app/core/store/p2p-game/p2p-game.action-creators.ts +++ b/src/main/webapp/app/core/store/p2p-game/p2p-game.action-creators.ts @@ -1,4 +1,4 @@ -import { PARTNER_PROGRESS, PARTNER_COMPLETED } from './p2p-game.actions'; +import { PARTNER_COMPLETED, PARTNER_PROGRESS } from './p2p-game.actions'; import { PayloadAction } from '../util'; export const P2PGameActions = { diff --git a/src/main/webapp/app/core/store/rebuttal/rebuttal.reducer.ts b/src/main/webapp/app/core/store/rebuttal/rebuttal.reducer.ts index 0c945ddf..2b128697 100644 --- a/src/main/webapp/app/core/store/rebuttal/rebuttal.reducer.ts +++ b/src/main/webapp/app/core/store/rebuttal/rebuttal.reducer.ts @@ -1,10 +1,7 @@ -import { Observable } from 'rxjs/Observable'; - -import { Rebuttal, initialRebuttal } from './rebuttal.model'; +import { initialRebuttal, Rebuttal } from './rebuttal.model'; import { Entities, initialEntities } from '../entity/entity.model'; -import { slices } from '../util'; +import { slices, typeFor } from '../util'; import * as functions from '../entity/entity.functions'; -import { typeFor } from '../util'; import { actions, EntityAction } from '../entity/entity.actions'; export function reducer(state: Entities = initialEntities({}, diff --git a/src/main/webapp/app/core/store/search/search.reducer.ts b/src/main/webapp/app/core/store/search/search.reducer.ts index cc268658..90ec8027 100644 --- a/src/main/webapp/app/core/store/search/search.reducer.ts +++ b/src/main/webapp/app/core/store/search/search.reducer.ts @@ -1,7 +1,6 @@ import { IDs, initialIDs } from '../id/id.model'; -import { slices } from '../util'; +import { slices, typeFor } from '../util'; import { actions, IDAction } from '../id/id.actions'; -import { typeFor } from '../util'; import * as functions from '../id/id.functions'; export function reducer(state = initialIDs(), action: IDAction): IDs { diff --git a/src/main/webapp/app/core/store/session/session.effects.ts b/src/main/webapp/app/core/store/session/session.effects.ts index 80ba74c5..adb9725a 100644 --- a/src/main/webapp/app/core/store/session/session.effects.ts +++ b/src/main/webapp/app/core/store/session/session.effects.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Effect, Actions } from '@ngrx/effects'; +import { Actions, Effect } from '@ngrx/effects'; import { RESTService } from '../../services/rest.service'; import * as functions from '../slice/slice.functions'; diff --git a/src/main/webapp/app/core/store/session/session.model.ts b/src/main/webapp/app/core/store/session/session.model.ts index 466e4b0b..72828378 100644 --- a/src/main/webapp/app/core/store/session/session.model.ts +++ b/src/main/webapp/app/core/store/session/session.model.ts @@ -10,7 +10,7 @@ export interface Session { user: User; hasError: boolean; loading: boolean; -}; +} export function initialSession(vals: any = {}): Session { return Object.assign({}, @@ -20,4 +20,4 @@ export function initialSession(vals: any = {}): Session { hasError: false, loading: false }, vals); -}; +} diff --git a/src/main/webapp/app/core/store/session/session.reducer.ts b/src/main/webapp/app/core/store/session/session.reducer.ts index 07ad6835..f3f60de0 100644 --- a/src/main/webapp/app/core/store/session/session.reducer.ts +++ b/src/main/webapp/app/core/store/session/session.reducer.ts @@ -1,6 +1,6 @@ -import { Session, initialSession } from './session.model'; +import { initialSession, Session } from './session.model'; import * as functions from '../slice/slice.functions'; -import { typeFor, slices } from '../util'; +import { slices, typeFor } from '../util'; import { actions, SliceAction } from '../slice/slice.actions'; export function reducer(state: Session = initialSession(), action: SliceAction): Session { diff --git a/src/main/webapp/app/core/store/slice/slice.functions.ts b/src/main/webapp/app/core/store/slice/slice.functions.ts index 1380a8fb..a1e6268d 100644 --- a/src/main/webapp/app/core/store/slice/slice.functions.ts +++ b/src/main/webapp/app/core/store/slice/slice.functions.ts @@ -3,11 +3,9 @@ import { Actions } from '@ngrx/effects'; import { Observable } from 'rxjs/Observable'; import { of } from 'rxjs/observable/of'; -import { SliceAction } from './slice.actions'; -import { typeFor } from '../util'; -import { actions } from './slice.actions'; import * as ActionClasses from './slice.actions'; -import { PayloadAction } from '../util'; +import { actions, SliceAction } from './slice.actions'; +import { PayloadAction, typeFor } from '../util'; const merge = require('lodash/merge'); @@ -17,8 +15,7 @@ export function load(state: {}, action: SliceAction): any { loaded: false, loading: true, }); -}; - +} export function loadFail(state): any { return merge({}, state, { hasError: true, diff --git a/src/main/webapp/app/core/store/store-and-router-connector.guard.ts b/src/main/webapp/app/core/store/store-and-router-connector.guard.ts index 30ef48db..fa830dfc 100644 --- a/src/main/webapp/app/core/store/store-and-router-connector.guard.ts +++ b/src/main/webapp/app/core/store/store-and-router-connector.guard.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; -import { RouterStateSnapshot, CanActivateChild, ActivatedRouteSnapshot, Routes } from '@angular/router'; +import { ActivatedRouteSnapshot, CanActivateChild, RouterStateSnapshot } from '@angular/router'; import { of } from 'rxjs/observable/of'; // Not sure about this guy import { Observable } from 'rxjs/Observable'; diff --git a/src/main/webapp/app/core/store/talk/talk.effects.ts b/src/main/webapp/app/core/store/talk/talk.effects.ts index 74e22517..d6516d6e 100644 --- a/src/main/webapp/app/core/store/talk/talk.effects.ts +++ b/src/main/webapp/app/core/store/talk/talk.effects.ts @@ -1,5 +1,5 @@ -import { RouterAction, ROUTER_NAVIGATION, RouterNavigationAction } from '@ngrx/router-store'; -import { Params, ActivatedRouteSnapshot } from '@angular/router'; +import { ROUTER_NAVIGATION, RouterNavigationAction } from '@ngrx/router-store'; +import { ActivatedRouteSnapshot, Params } from '@angular/router'; import { Actions, Effect } from '@ngrx/effects'; import { Injectable } from '@angular/core'; import { of } from 'rxjs/observable/of'; @@ -9,11 +9,9 @@ import { Observable } from 'rxjs/Observable'; import { WatchService } from '../../../features/talks/services/watch.service'; import { Filters } from '../../../features/talks/talks.layout'; import { RESTService } from '../../services/rest.service'; -import { Talk } from './talk.model'; import { RootState } from '../'; -import { slices, PayloadAction } from '../util'; +import { PayloadAction, slices, typeFor } from '../util'; import * as EntityActions from '../entity/entity.actions'; -import { typeFor } from '../util'; import { actions } from '../entity/entity.actions'; @Injectable() diff --git a/src/main/webapp/app/core/store/talk/talk.reducer.ts b/src/main/webapp/app/core/store/talk/talk.reducer.ts index 8e68aee2..25c9d2be 100644 --- a/src/main/webapp/app/core/store/talk/talk.reducer.ts +++ b/src/main/webapp/app/core/store/talk/talk.reducer.ts @@ -1,14 +1,6 @@ -import { Observable } from 'rxjs/Observable'; -import { Subject } from 'rxjs/Subject'; -import { Store } from '@ngrx/store'; -import { RouterStateSnapshot, Params } from '@angular/router'; -import { RouterAction } from '@ngrx/router-store'; - -import * as fromRoot from '../'; -import { typeFor, slices } from '../util'; +import { slices, typeFor } from '../util'; import { Entities, initialEntities } from '../entity/entity.model'; -import { Talk, initialTalk } from './talk.model'; -import { Filters } from '../../../features/talks/talks.layout'; +import { initialTalk, Talk } from './talk.model'; // import { TalksUpdated, TalkUpdated, Watch, TalkWatched, Rate, Unrate } from './talk.actions'; import * as functions from '../entity/entity.functions'; import { actions, EntityAction } from '../entity/entity.actions'; diff --git a/src/main/webapp/app/entities/blog/blog-delete-dialog.component.ts b/src/main/webapp/app/entities/blog/blog-delete-dialog.component.ts index 81f3cb91..51d518f9 100644 --- a/src/main/webapp/app/entities/blog/blog-delete-dialog.component.ts +++ b/src/main/webapp/app/entities/blog/blog-delete-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/main/webapp/app/entities/blog/blog-detail.component.spec.ts b/src/main/webapp/app/entities/blog/blog-detail.component.spec.ts index 64684c92..2acfdbb1 100644 --- a/src/main/webapp/app/entities/blog/blog-detail.component.spec.ts +++ b/src/main/webapp/app/entities/blog/blog-detail.component.spec.ts @@ -1,10 +1,10 @@ /* tslint:disable max-line-length */ -import { ComponentFixture, TestBed, async, inject } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { OnInit } from '@angular/core'; import { DatePipe } from '@angular/common'; import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs/Observable'; -import { JhiDateUtils, JhiDataUtils, JhiEventManager } from 'ng-jhipster'; +import { JhiDataUtils, JhiDateUtils, JhiEventManager } from 'ng-jhipster'; import { GreatBigExampleApplicationTestModule } from '../../../mocks/test.module'; import { MockActivatedRoute } from '../../../mocks/mock-route.service'; import { BlogDetailComponent } from './blog-detail.component'; diff --git a/src/main/webapp/app/entities/blog/blog-detail.component.ts b/src/main/webapp/app/entities/blog/blog-detail.component.ts index 2500701d..ccdf78ee 100644 --- a/src/main/webapp/app/entities/blog/blog-detail.component.ts +++ b/src/main/webapp/app/entities/blog/blog-detail.component.ts @@ -1,7 +1,7 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager } from 'ng-jhipster'; +import { JhiEventManager } from 'ng-jhipster'; import { Blog } from './blog.model'; import { BlogService } from './blog.service'; diff --git a/src/main/webapp/app/entities/blog/blog-dialog.component.ts b/src/main/webapp/app/entities/blog/blog-dialog.component.ts index be7700df..c5a57226 100644 --- a/src/main/webapp/app/entities/blog/blog-dialog.component.ts +++ b/src/main/webapp/app/entities/blog/blog-dialog.component.ts @@ -1,16 +1,15 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { JhiEventManager, JhiAlertService } from 'ng-jhipster'; +import { JhiAlertService, JhiEventManager } from 'ng-jhipster'; import { Blog } from './blog.model'; import { BlogPopupService } from './blog-popup.service'; import { BlogService } from './blog.service'; -import { User, UserService } from '../../shared'; -import { ResponseWrapper } from '../../shared'; +import { ResponseWrapper, User, UserService } from '../../shared'; @Component({ selector: 'jhi-blog-dialog', diff --git a/src/main/webapp/app/entities/blog/blog-popup.service.ts b/src/main/webapp/app/entities/blog/blog-popup.service.ts index 5771a67a..ac2fac10 100644 --- a/src/main/webapp/app/entities/blog/blog-popup.service.ts +++ b/src/main/webapp/app/entities/blog/blog-popup.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Component } from '@angular/core'; +import { Component, Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { Blog } from './blog.model'; diff --git a/src/main/webapp/app/entities/blog/blog.component.ts b/src/main/webapp/app/entities/blog/blog.component.ts index 63229edd..0ced7dc0 100644 --- a/src/main/webapp/app/entities/blog/blog.component.ts +++ b/src/main/webapp/app/entities/blog/blog.component.ts @@ -1,12 +1,11 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager, JhiParseLinks, JhiPaginationUtil, JhiLanguageService, JhiAlertService } from 'ng-jhipster'; +import { JhiAlertService, JhiEventManager } from 'ng-jhipster'; import { Blog } from './blog.model'; import { BlogService } from './blog.service'; -import { ITEMS_PER_PAGE, Principal, ResponseWrapper } from '../../shared'; -import { PaginationConfig } from '../../core/config/uib-pagination.config'; +import { Principal, ResponseWrapper } from '../../shared'; @Component({ selector: 'jhi-blog', diff --git a/src/main/webapp/app/entities/blog/blog.module.ts b/src/main/webapp/app/entities/blog/blog.module.ts index 3b02e271..e3add3ba 100644 --- a/src/main/webapp/app/entities/blog/blog.module.ts +++ b/src/main/webapp/app/entities/blog/blog.module.ts @@ -1,19 +1,19 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { GreatBigExampleApplicationSharedModule } from '../../shared'; import { GreatBigExampleApplicationAdminModule } from '../../admin/admin.module'; import { - BlogService, - BlogPopupService, BlogComponent, + BlogDeleteDialogComponent, + BlogDeletePopupComponent, BlogDetailComponent, BlogDialogComponent, BlogPopupComponent, - BlogDeletePopupComponent, - BlogDeleteDialogComponent, - blogRoute, blogPopupRoute, + BlogPopupService, + blogRoute, + BlogService, } from './'; const ENTITY_STATES = [ diff --git a/src/main/webapp/app/entities/blog/blog.route.ts b/src/main/webapp/app/entities/blog/blog.route.ts index 99715f0b..718d44cd 100644 --- a/src/main/webapp/app/entities/blog/blog.route.ts +++ b/src/main/webapp/app/entities/blog/blog.route.ts @@ -1,16 +1,12 @@ -import { Injectable } from '@angular/core'; -import { Resolve, ActivatedRouteSnapshot, RouterStateSnapshot, Routes, CanActivate } from '@angular/router'; +import { Routes } from '@angular/router'; import { UserRouteAccessService } from '../../shared'; -import { JhiPaginationUtil } from 'ng-jhipster'; import { BlogComponent } from './blog.component'; import { BlogDetailComponent } from './blog-detail.component'; import { BlogPopupComponent } from './blog-dialog.component'; import { BlogDeletePopupComponent } from './blog-delete-dialog.component'; -import { Principal } from '../../shared'; - export const blogRoute: Routes = [ { path: 'blog', diff --git a/src/main/webapp/app/entities/blog/blog.service.ts b/src/main/webapp/app/entities/blog/blog.service.ts index c72971ad..2b351257 100644 --- a/src/main/webapp/app/entities/blog/blog.service.ts +++ b/src/main/webapp/app/entities/blog/blog.service.ts @@ -3,7 +3,7 @@ import { Http, Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { Blog } from './blog.model'; -import { ResponseWrapper, createRequestOption } from '../../shared'; +import { createRequestOption, ResponseWrapper } from '../../shared'; @Injectable() export class BlogService { diff --git a/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal-delete-dialog.component.ts b/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal-delete-dialog.component.ts index f7f71939..d0249ce2 100644 --- a/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal-delete-dialog.component.ts +++ b/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal-delete-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal-detail.component.spec.ts b/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal-detail.component.spec.ts index 371c695e..cc701977 100644 --- a/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal-detail.component.spec.ts +++ b/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal-detail.component.spec.ts @@ -1,10 +1,10 @@ /* tslint:disable max-line-length */ -import { ComponentFixture, TestBed, async, inject } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { OnInit } from '@angular/core'; import { DatePipe } from '@angular/common'; import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs/Observable'; -import { JhiDateUtils, JhiDataUtils, JhiEventManager } from 'ng-jhipster'; +import { JhiDataUtils, JhiDateUtils, JhiEventManager } from 'ng-jhipster'; import { GreatBigExampleApplicationTestModule } from '../../../mocks/test.module'; import { MockActivatedRoute } from '../../../mocks/mock-route.service'; import { ClaimRebuttalDetailComponent } from './claim-rebuttal-detail.component'; diff --git a/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal-detail.component.ts b/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal-detail.component.ts index b4ef0b95..bdf3ff41 100644 --- a/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal-detail.component.ts +++ b/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal-detail.component.ts @@ -1,7 +1,7 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager } from 'ng-jhipster'; +import { JhiEventManager } from 'ng-jhipster'; import { ClaimRebuttal } from './claim-rebuttal.model'; import { ClaimRebuttalService } from './claim-rebuttal.service'; diff --git a/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal-dialog.component.ts b/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal-dialog.component.ts index 69cc822d..cb41e55d 100644 --- a/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal-dialog.component.ts +++ b/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal-dialog.component.ts @@ -1,10 +1,10 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { JhiEventManager, JhiAlertService } from 'ng-jhipster'; +import { JhiAlertService, JhiEventManager } from 'ng-jhipster'; import { ClaimRebuttal } from './claim-rebuttal.model'; import { ClaimRebuttalPopupService } from './claim-rebuttal-popup.service'; diff --git a/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal-popup.service.ts b/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal-popup.service.ts index 0a4bd2ad..f14cd43c 100644 --- a/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal-popup.service.ts +++ b/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal-popup.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Component } from '@angular/core'; +import { Component, Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { ClaimRebuttal } from './claim-rebuttal.model'; diff --git a/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal.component.ts b/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal.component.ts index d9ee6beb..7ef00560 100644 --- a/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal.component.ts +++ b/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal.component.ts @@ -1,12 +1,11 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager, JhiParseLinks, JhiPaginationUtil, JhiLanguageService, JhiAlertService } from 'ng-jhipster'; +import { JhiAlertService, JhiEventManager } from 'ng-jhipster'; import { ClaimRebuttal } from './claim-rebuttal.model'; import { ClaimRebuttalService } from './claim-rebuttal.service'; -import { ITEMS_PER_PAGE, Principal, ResponseWrapper } from '../../shared'; -import { PaginationConfig } from '../../core/config/uib-pagination.config'; +import { Principal, ResponseWrapper } from '../../shared'; @Component({ selector: 'jhi-claim-rebuttal', diff --git a/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal.module.ts b/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal.module.ts index b1c4c757..181ff2f4 100644 --- a/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal.module.ts +++ b/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal.module.ts @@ -1,18 +1,18 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { GreatBigExampleApplicationSharedModule } from '../../shared'; import { - ClaimRebuttalService, - ClaimRebuttalPopupService, - ClaimRebuttalComponent, - ClaimRebuttalDetailComponent, - ClaimRebuttalDialogComponent, - ClaimRebuttalPopupComponent, - ClaimRebuttalDeletePopupComponent, - ClaimRebuttalDeleteDialogComponent, - claimRebuttalRoute, - claimRebuttalPopupRoute, + ClaimRebuttalComponent, + ClaimRebuttalDeleteDialogComponent, + ClaimRebuttalDeletePopupComponent, + ClaimRebuttalDetailComponent, + ClaimRebuttalDialogComponent, + ClaimRebuttalPopupComponent, + claimRebuttalPopupRoute, + ClaimRebuttalPopupService, + claimRebuttalRoute, + ClaimRebuttalService, } from './'; const ENTITY_STATES = [ diff --git a/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal.route.ts b/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal.route.ts index 8404d405..39760d35 100644 --- a/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal.route.ts +++ b/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal.route.ts @@ -1,16 +1,12 @@ -import { Injectable } from '@angular/core'; -import { Resolve, ActivatedRouteSnapshot, RouterStateSnapshot, Routes, CanActivate } from '@angular/router'; +import { Routes } from '@angular/router'; import { UserRouteAccessService } from '../../shared'; -import { JhiPaginationUtil } from 'ng-jhipster'; import { ClaimRebuttalComponent } from './claim-rebuttal.component'; import { ClaimRebuttalDetailComponent } from './claim-rebuttal-detail.component'; import { ClaimRebuttalPopupComponent } from './claim-rebuttal-dialog.component'; import { ClaimRebuttalDeletePopupComponent } from './claim-rebuttal-delete-dialog.component'; -import { Principal } from '../../shared'; - export const claimRebuttalRoute: Routes = [ { path: 'claim-rebuttal', diff --git a/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal.service.ts b/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal.service.ts index a800b6ea..f93d4e23 100644 --- a/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal.service.ts +++ b/src/main/webapp/app/entities/claim-rebuttal/claim-rebuttal.service.ts @@ -3,7 +3,7 @@ import { Http, Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { ClaimRebuttal } from './claim-rebuttal.model'; -import { ResponseWrapper, createRequestOption } from '../../shared'; +import { createRequestOption, ResponseWrapper } from '../../shared'; @Injectable() export class ClaimRebuttalService { diff --git a/src/main/webapp/app/entities/claim/claim-delete-dialog.component.ts b/src/main/webapp/app/entities/claim/claim-delete-dialog.component.ts index 31d149a3..ae440e7c 100644 --- a/src/main/webapp/app/entities/claim/claim-delete-dialog.component.ts +++ b/src/main/webapp/app/entities/claim/claim-delete-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/main/webapp/app/entities/claim/claim-detail.component.spec.ts b/src/main/webapp/app/entities/claim/claim-detail.component.spec.ts index 621c61dd..c67b060f 100644 --- a/src/main/webapp/app/entities/claim/claim-detail.component.spec.ts +++ b/src/main/webapp/app/entities/claim/claim-detail.component.spec.ts @@ -1,10 +1,10 @@ /* tslint:disable max-line-length */ -import { ComponentFixture, TestBed, async, inject } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { OnInit } from '@angular/core'; import { DatePipe } from '@angular/common'; import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs/Observable'; -import { JhiDateUtils, JhiDataUtils, JhiEventManager } from 'ng-jhipster'; +import { JhiDataUtils, JhiDateUtils, JhiEventManager } from 'ng-jhipster'; import { GreatBigExampleApplicationTestModule } from '../../../mocks/test.module'; import { MockActivatedRoute } from '../../../mocks/mock-route.service'; import { ClaimDetailComponent } from './claim-detail.component'; diff --git a/src/main/webapp/app/entities/claim/claim-detail.component.ts b/src/main/webapp/app/entities/claim/claim-detail.component.ts index 92a44b0b..d52ea9f6 100644 --- a/src/main/webapp/app/entities/claim/claim-detail.component.ts +++ b/src/main/webapp/app/entities/claim/claim-detail.component.ts @@ -1,7 +1,7 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager } from 'ng-jhipster'; +import { JhiEventManager } from 'ng-jhipster'; import { Claim } from './claim.model'; import { ClaimService } from './claim.service'; diff --git a/src/main/webapp/app/entities/claim/claim-dialog.component.ts b/src/main/webapp/app/entities/claim/claim-dialog.component.ts index 4ac7ded8..0922508f 100644 --- a/src/main/webapp/app/entities/claim/claim-dialog.component.ts +++ b/src/main/webapp/app/entities/claim/claim-dialog.component.ts @@ -1,10 +1,10 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { JhiEventManager, JhiAlertService } from 'ng-jhipster'; +import { JhiAlertService, JhiEventManager } from 'ng-jhipster'; import { Claim } from './claim.model'; import { ClaimPopupService } from './claim-popup.service'; diff --git a/src/main/webapp/app/entities/claim/claim-popup.service.ts b/src/main/webapp/app/entities/claim/claim-popup.service.ts index 39c54729..60ffa303 100644 --- a/src/main/webapp/app/entities/claim/claim-popup.service.ts +++ b/src/main/webapp/app/entities/claim/claim-popup.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Component } from '@angular/core'; +import { Component, Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { Claim } from './claim.model'; diff --git a/src/main/webapp/app/entities/claim/claim.component.ts b/src/main/webapp/app/entities/claim/claim.component.ts index 9c28fb3b..ead5578f 100644 --- a/src/main/webapp/app/entities/claim/claim.component.ts +++ b/src/main/webapp/app/entities/claim/claim.component.ts @@ -1,12 +1,11 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager, JhiParseLinks, JhiPaginationUtil, JhiLanguageService, JhiAlertService } from 'ng-jhipster'; +import { JhiAlertService, JhiEventManager } from 'ng-jhipster'; import { Claim } from './claim.model'; import { ClaimService } from './claim.service'; -import { ITEMS_PER_PAGE, Principal, ResponseWrapper } from '../../shared'; -import { PaginationConfig } from '../../core/config/uib-pagination.config'; +import { Principal, ResponseWrapper } from '../../shared'; @Component({ selector: 'jhi-claim', diff --git a/src/main/webapp/app/entities/claim/claim.module.ts b/src/main/webapp/app/entities/claim/claim.module.ts index b5ab484a..ae320ecc 100644 --- a/src/main/webapp/app/entities/claim/claim.module.ts +++ b/src/main/webapp/app/entities/claim/claim.module.ts @@ -1,18 +1,18 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { GreatBigExampleApplicationSharedModule } from '../../shared'; import { - ClaimService, - ClaimPopupService, - ClaimComponent, - ClaimDetailComponent, - ClaimDialogComponent, - ClaimPopupComponent, - ClaimDeletePopupComponent, - ClaimDeleteDialogComponent, - claimRoute, - claimPopupRoute, + ClaimComponent, + ClaimDeleteDialogComponent, + ClaimDeletePopupComponent, + ClaimDetailComponent, + ClaimDialogComponent, + ClaimPopupComponent, + claimPopupRoute, + ClaimPopupService, + claimRoute, + ClaimService, } from './'; const ENTITY_STATES = [ diff --git a/src/main/webapp/app/entities/claim/claim.route.ts b/src/main/webapp/app/entities/claim/claim.route.ts index 76e0057b..3e9daec7 100644 --- a/src/main/webapp/app/entities/claim/claim.route.ts +++ b/src/main/webapp/app/entities/claim/claim.route.ts @@ -1,16 +1,12 @@ -import { Injectable } from '@angular/core'; -import { Resolve, ActivatedRouteSnapshot, RouterStateSnapshot, Routes, CanActivate } from '@angular/router'; +import { Routes } from '@angular/router'; import { UserRouteAccessService } from '../../shared'; -import { JhiPaginationUtil } from 'ng-jhipster'; import { ClaimComponent } from './claim.component'; import { ClaimDetailComponent } from './claim-detail.component'; import { ClaimPopupComponent } from './claim-dialog.component'; import { ClaimDeletePopupComponent } from './claim-delete-dialog.component'; -import { Principal } from '../../shared'; - export const claimRoute: Routes = [ { path: 'claim', diff --git a/src/main/webapp/app/entities/claim/claim.service.ts b/src/main/webapp/app/entities/claim/claim.service.ts index 95e8ccb7..45c8c199 100644 --- a/src/main/webapp/app/entities/claim/claim.service.ts +++ b/src/main/webapp/app/entities/claim/claim.service.ts @@ -3,7 +3,7 @@ import { Http, Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { Claim } from './claim.model'; -import { ResponseWrapper, createRequestOption } from '../../shared'; +import { createRequestOption, ResponseWrapper } from '../../shared'; @Injectable() export class ClaimService { diff --git a/src/main/webapp/app/entities/contact/contact-delete-dialog.component.ts b/src/main/webapp/app/entities/contact/contact-delete-dialog.component.ts index 02e6f90f..5d401e7d 100644 --- a/src/main/webapp/app/entities/contact/contact-delete-dialog.component.ts +++ b/src/main/webapp/app/entities/contact/contact-delete-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/main/webapp/app/entities/contact/contact-detail.component.spec.ts b/src/main/webapp/app/entities/contact/contact-detail.component.spec.ts index 0855433b..a2c7a843 100644 --- a/src/main/webapp/app/entities/contact/contact-detail.component.spec.ts +++ b/src/main/webapp/app/entities/contact/contact-detail.component.spec.ts @@ -1,10 +1,10 @@ /* tslint:disable max-line-length */ -import { ComponentFixture, TestBed, async, inject } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { OnInit } from '@angular/core'; import { DatePipe } from '@angular/common'; import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs/Observable'; -import { JhiDateUtils, JhiDataUtils, JhiEventManager } from 'ng-jhipster'; +import { JhiDataUtils, JhiDateUtils, JhiEventManager } from 'ng-jhipster'; import { GreatBigExampleApplicationTestModule } from '../../../mocks/test.module'; import { MockActivatedRoute } from '../../../mocks/mock-route.service'; import { ContactDetailComponent } from './contact-detail.component'; diff --git a/src/main/webapp/app/entities/contact/contact-detail.component.ts b/src/main/webapp/app/entities/contact/contact-detail.component.ts index 81285166..7a1da739 100644 --- a/src/main/webapp/app/entities/contact/contact-detail.component.ts +++ b/src/main/webapp/app/entities/contact/contact-detail.component.ts @@ -1,7 +1,7 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager } from 'ng-jhipster'; +import { JhiEventManager } from 'ng-jhipster'; import { Contact } from './contact.model'; import { ContactService } from './contact.service'; diff --git a/src/main/webapp/app/entities/contact/contact-dialog.component.ts b/src/main/webapp/app/entities/contact/contact-dialog.component.ts index 19b10b00..f3dec56c 100644 --- a/src/main/webapp/app/entities/contact/contact-dialog.component.ts +++ b/src/main/webapp/app/entities/contact/contact-dialog.component.ts @@ -1,10 +1,10 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { JhiEventManager, JhiAlertService } from 'ng-jhipster'; +import { JhiAlertService, JhiEventManager } from 'ng-jhipster'; import { Contact } from './contact.model'; import { ContactPopupService } from './contact-popup.service'; diff --git a/src/main/webapp/app/entities/contact/contact-popup.service.ts b/src/main/webapp/app/entities/contact/contact-popup.service.ts index 0c759c09..0616e64d 100644 --- a/src/main/webapp/app/entities/contact/contact-popup.service.ts +++ b/src/main/webapp/app/entities/contact/contact-popup.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Component } from '@angular/core'; +import { Component, Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { Contact } from './contact.model'; diff --git a/src/main/webapp/app/entities/contact/contact.component.ts b/src/main/webapp/app/entities/contact/contact.component.ts index b63843dd..aefd53c0 100644 --- a/src/main/webapp/app/entities/contact/contact.component.ts +++ b/src/main/webapp/app/entities/contact/contact.component.ts @@ -1,12 +1,11 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager, JhiParseLinks, JhiPaginationUtil, JhiLanguageService, JhiAlertService } from 'ng-jhipster'; +import { JhiAlertService, JhiEventManager } from 'ng-jhipster'; import { Contact } from './contact.model'; import { ContactService } from './contact.service'; -import { ITEMS_PER_PAGE, Principal, ResponseWrapper } from '../../shared'; -import { PaginationConfig } from '../../core/config/uib-pagination.config'; +import { Principal, ResponseWrapper } from '../../shared'; @Component({ selector: 'jhi-contact', diff --git a/src/main/webapp/app/entities/contact/contact.module.ts b/src/main/webapp/app/entities/contact/contact.module.ts index bb827ec2..27cb3da3 100644 --- a/src/main/webapp/app/entities/contact/contact.module.ts +++ b/src/main/webapp/app/entities/contact/contact.module.ts @@ -1,18 +1,18 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { GreatBigExampleApplicationSharedModule } from '../../shared'; import { - ContactService, - ContactPopupService, - ContactComponent, - ContactDetailComponent, - ContactDialogComponent, - ContactPopupComponent, - ContactDeletePopupComponent, - ContactDeleteDialogComponent, - contactRoute, - contactPopupRoute, + ContactComponent, + ContactDeleteDialogComponent, + ContactDeletePopupComponent, + ContactDetailComponent, + ContactDialogComponent, + ContactPopupComponent, + contactPopupRoute, + ContactPopupService, + contactRoute, + ContactService, } from './'; const ENTITY_STATES = [ diff --git a/src/main/webapp/app/entities/contact/contact.route.ts b/src/main/webapp/app/entities/contact/contact.route.ts index cbf19439..a68082cd 100644 --- a/src/main/webapp/app/entities/contact/contact.route.ts +++ b/src/main/webapp/app/entities/contact/contact.route.ts @@ -1,16 +1,12 @@ -import { Injectable } from '@angular/core'; -import { Resolve, ActivatedRouteSnapshot, RouterStateSnapshot, Routes, CanActivate } from '@angular/router'; +import { Routes } from '@angular/router'; import { UserRouteAccessService } from '../../shared'; -import { JhiPaginationUtil } from 'ng-jhipster'; import { ContactComponent } from './contact.component'; import { ContactDetailComponent } from './contact-detail.component'; import { ContactPopupComponent } from './contact-dialog.component'; import { ContactDeletePopupComponent } from './contact-delete-dialog.component'; -import { Principal } from '../../shared'; - export const contactRoute: Routes = [ { path: 'contact', diff --git a/src/main/webapp/app/entities/contact/contact.service.ts b/src/main/webapp/app/entities/contact/contact.service.ts index 5bd6e61f..7b177a15 100644 --- a/src/main/webapp/app/entities/contact/contact.service.ts +++ b/src/main/webapp/app/entities/contact/contact.service.ts @@ -3,7 +3,7 @@ import { Http, Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { Contact } from './contact.model'; -import { ResponseWrapper, createRequestOption } from '../../shared'; +import { createRequestOption, ResponseWrapper } from '../../shared'; @Injectable() export class ContactService { diff --git a/src/main/webapp/app/entities/crisis/crisis-delete-dialog.component.ts b/src/main/webapp/app/entities/crisis/crisis-delete-dialog.component.ts index 1361837b..853450e8 100644 --- a/src/main/webapp/app/entities/crisis/crisis-delete-dialog.component.ts +++ b/src/main/webapp/app/entities/crisis/crisis-delete-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/main/webapp/app/entities/crisis/crisis-detail.component.spec.ts b/src/main/webapp/app/entities/crisis/crisis-detail.component.spec.ts index 2374dab9..973c690c 100644 --- a/src/main/webapp/app/entities/crisis/crisis-detail.component.spec.ts +++ b/src/main/webapp/app/entities/crisis/crisis-detail.component.spec.ts @@ -1,10 +1,10 @@ /* tslint:disable max-line-length */ -import { ComponentFixture, TestBed, async, inject } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { OnInit } from '@angular/core'; import { DatePipe } from '@angular/common'; import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs/Observable'; -import { JhiDateUtils, JhiDataUtils, JhiEventManager } from 'ng-jhipster'; +import { JhiDataUtils, JhiDateUtils, JhiEventManager } from 'ng-jhipster'; import { GreatBigExampleApplicationTestModule } from '../../../mocks/test.module'; import { MockActivatedRoute } from '../../../mocks/mock-route.service'; import { CrisisDetailComponent } from './crisis-detail.component'; diff --git a/src/main/webapp/app/entities/crisis/crisis-detail.component.ts b/src/main/webapp/app/entities/crisis/crisis-detail.component.ts index 03a93ae8..94093c0d 100644 --- a/src/main/webapp/app/entities/crisis/crisis-detail.component.ts +++ b/src/main/webapp/app/entities/crisis/crisis-detail.component.ts @@ -1,7 +1,7 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager } from 'ng-jhipster'; +import { JhiEventManager } from 'ng-jhipster'; import { Crisis } from './crisis.model'; import { CrisisService } from './crisis.service'; diff --git a/src/main/webapp/app/entities/crisis/crisis-dialog.component.ts b/src/main/webapp/app/entities/crisis/crisis-dialog.component.ts index af21bbf5..68af2f6b 100644 --- a/src/main/webapp/app/entities/crisis/crisis-dialog.component.ts +++ b/src/main/webapp/app/entities/crisis/crisis-dialog.component.ts @@ -1,10 +1,10 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { JhiEventManager, JhiAlertService } from 'ng-jhipster'; +import { JhiAlertService, JhiEventManager } from 'ng-jhipster'; import { Crisis } from './crisis.model'; import { CrisisPopupService } from './crisis-popup.service'; diff --git a/src/main/webapp/app/entities/crisis/crisis-popup.service.ts b/src/main/webapp/app/entities/crisis/crisis-popup.service.ts index 574684d7..79b8de5d 100644 --- a/src/main/webapp/app/entities/crisis/crisis-popup.service.ts +++ b/src/main/webapp/app/entities/crisis/crisis-popup.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Component } from '@angular/core'; +import { Component, Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { Crisis } from './crisis.model'; diff --git a/src/main/webapp/app/entities/crisis/crisis.component.ts b/src/main/webapp/app/entities/crisis/crisis.component.ts index 83d37036..a0c605aa 100644 --- a/src/main/webapp/app/entities/crisis/crisis.component.ts +++ b/src/main/webapp/app/entities/crisis/crisis.component.ts @@ -1,12 +1,11 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager, JhiParseLinks, JhiPaginationUtil, JhiLanguageService, JhiAlertService } from 'ng-jhipster'; +import { JhiAlertService, JhiEventManager } from 'ng-jhipster'; import { Crisis } from './crisis.model'; import { CrisisService } from './crisis.service'; -import { ITEMS_PER_PAGE, Principal, ResponseWrapper } from '../../shared'; -import { PaginationConfig } from '../../core/config/uib-pagination.config'; +import { Principal, ResponseWrapper } from '../../shared'; @Component({ selector: 'jhi-crisis', diff --git a/src/main/webapp/app/entities/crisis/crisis.module.ts b/src/main/webapp/app/entities/crisis/crisis.module.ts index f858957a..c1198e5a 100644 --- a/src/main/webapp/app/entities/crisis/crisis.module.ts +++ b/src/main/webapp/app/entities/crisis/crisis.module.ts @@ -1,18 +1,18 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { GreatBigExampleApplicationSharedModule } from '../../shared'; import { - CrisisService, - CrisisPopupService, - CrisisComponent, - CrisisDetailComponent, - CrisisDialogComponent, - CrisisPopupComponent, - CrisisDeletePopupComponent, - CrisisDeleteDialogComponent, - crisisRoute, - crisisPopupRoute, + CrisisComponent, + CrisisDeleteDialogComponent, + CrisisDeletePopupComponent, + CrisisDetailComponent, + CrisisDialogComponent, + CrisisPopupComponent, + crisisPopupRoute, + CrisisPopupService, + crisisRoute, + CrisisService, } from './'; const ENTITY_STATES = [ diff --git a/src/main/webapp/app/entities/crisis/crisis.route.ts b/src/main/webapp/app/entities/crisis/crisis.route.ts index bb3d2223..b6cad769 100644 --- a/src/main/webapp/app/entities/crisis/crisis.route.ts +++ b/src/main/webapp/app/entities/crisis/crisis.route.ts @@ -1,16 +1,12 @@ -import { Injectable } from '@angular/core'; -import { Resolve, ActivatedRouteSnapshot, RouterStateSnapshot, Routes, CanActivate } from '@angular/router'; +import { Routes } from '@angular/router'; import { UserRouteAccessService } from '../../shared'; -import { JhiPaginationUtil } from 'ng-jhipster'; import { CrisisComponent } from './crisis.component'; import { CrisisDetailComponent } from './crisis-detail.component'; import { CrisisPopupComponent } from './crisis-dialog.component'; import { CrisisDeletePopupComponent } from './crisis-delete-dialog.component'; -import { Principal } from '../../shared'; - export const crisisRoute: Routes = [ { path: 'crisis', diff --git a/src/main/webapp/app/entities/crisis/crisis.service.ts b/src/main/webapp/app/entities/crisis/crisis.service.ts index 13fa5602..065b6ce7 100644 --- a/src/main/webapp/app/entities/crisis/crisis.service.ts +++ b/src/main/webapp/app/entities/crisis/crisis.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { Http, Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { Crisis } from './crisis.model'; -import { ResponseWrapper, createRequestOption } from '../../shared'; +import { createRequestOption, ResponseWrapper } from '../../shared'; @Injectable() export class CrisisService { diff --git a/src/main/webapp/app/entities/entity.module.ts b/src/main/webapp/app/entities/entity.module.ts index 44e298b7..65372cf7 100644 --- a/src/main/webapp/app/entities/entity.module.ts +++ b/src/main/webapp/app/entities/entity.module.ts @@ -1,4 +1,4 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { GreatBigExampleApplicationHeroModule } from './hero/hero.module'; import { GreatBigExampleApplicationCrisisModule } from './crisis/crisis.module'; @@ -12,6 +12,7 @@ import { GreatBigExampleApplicationTagModule } from './tag/tag.module'; import { GreatBigExampleApplicationEntryModule } from './entry/entry.module'; import { GreatBigExampleApplicationMessageModule } from './message/message.module'; import { GreatBigExampleApplicationTalkModule } from './talk/talk.module'; + /* jhipster-needle-add-entity-module-import - JHipster will add entity modules imports here */ @NgModule({ diff --git a/src/main/webapp/app/entities/entry/entry-delete-dialog.component.ts b/src/main/webapp/app/entities/entry/entry-delete-dialog.component.ts index 0bcda5a9..8290e5fc 100644 --- a/src/main/webapp/app/entities/entry/entry-delete-dialog.component.ts +++ b/src/main/webapp/app/entities/entry/entry-delete-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/main/webapp/app/entities/entry/entry-detail.component.spec.ts b/src/main/webapp/app/entities/entry/entry-detail.component.spec.ts index 54c62dc5..497cd1c8 100644 --- a/src/main/webapp/app/entities/entry/entry-detail.component.spec.ts +++ b/src/main/webapp/app/entities/entry/entry-detail.component.spec.ts @@ -1,10 +1,10 @@ /* tslint:disable max-line-length */ -import { ComponentFixture, TestBed, async, inject } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { OnInit } from '@angular/core'; import { DatePipe } from '@angular/common'; import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs/Observable'; -import { JhiDateUtils, JhiDataUtils, JhiEventManager } from 'ng-jhipster'; +import { JhiDataUtils, JhiDateUtils, JhiEventManager } from 'ng-jhipster'; import { GreatBigExampleApplicationTestModule } from '../../../mocks/test.module'; import { MockActivatedRoute } from '../../../mocks/mock-route.service'; import { EntryDetailComponent } from './entry-detail.component'; diff --git a/src/main/webapp/app/entities/entry/entry-detail.component.ts b/src/main/webapp/app/entities/entry/entry-detail.component.ts index 6fe4858a..e1d7224b 100644 --- a/src/main/webapp/app/entities/entry/entry-detail.component.ts +++ b/src/main/webapp/app/entities/entry/entry-detail.component.ts @@ -1,7 +1,7 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager , JhiDataUtils } from 'ng-jhipster'; +import { JhiDataUtils, JhiEventManager } from 'ng-jhipster'; import { Entry } from './entry.model'; import { EntryService } from './entry.service'; diff --git a/src/main/webapp/app/entities/entry/entry-dialog.component.ts b/src/main/webapp/app/entities/entry/entry-dialog.component.ts index ca1afe28..b400635b 100644 --- a/src/main/webapp/app/entities/entry/entry-dialog.component.ts +++ b/src/main/webapp/app/entities/entry/entry-dialog.component.ts @@ -1,10 +1,10 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { JhiEventManager, JhiAlertService, JhiDataUtils } from 'ng-jhipster'; +import { JhiAlertService, JhiDataUtils, JhiEventManager } from 'ng-jhipster'; import { Entry } from './entry.model'; import { EntryPopupService } from './entry-popup.service'; diff --git a/src/main/webapp/app/entities/entry/entry-popup.service.ts b/src/main/webapp/app/entities/entry/entry-popup.service.ts index d087c15c..f5bc1d0d 100644 --- a/src/main/webapp/app/entities/entry/entry-popup.service.ts +++ b/src/main/webapp/app/entities/entry/entry-popup.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Component } from '@angular/core'; +import { Component, Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { DatePipe } from '@angular/common'; diff --git a/src/main/webapp/app/entities/entry/entry.component.ts b/src/main/webapp/app/entities/entry/entry.component.ts index b0b9979d..c291d379 100644 --- a/src/main/webapp/app/entities/entry/entry.component.ts +++ b/src/main/webapp/app/entities/entry/entry.component.ts @@ -1,12 +1,11 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager, JhiParseLinks, JhiPaginationUtil, JhiLanguageService, JhiAlertService, JhiDataUtils } from 'ng-jhipster'; +import { JhiAlertService, JhiDataUtils, JhiEventManager, JhiParseLinks } from 'ng-jhipster'; import { Entry } from './entry.model'; import { EntryService } from './entry.service'; import { ITEMS_PER_PAGE, Principal, ResponseWrapper } from '../../shared'; -import { PaginationConfig } from '../../core/config/uib-pagination.config'; @Component({ selector: 'jhi-entry', diff --git a/src/main/webapp/app/entities/entry/entry.module.ts b/src/main/webapp/app/entities/entry/entry.module.ts index 45b13195..cb662a16 100644 --- a/src/main/webapp/app/entities/entry/entry.module.ts +++ b/src/main/webapp/app/entities/entry/entry.module.ts @@ -1,18 +1,18 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { GreatBigExampleApplicationSharedModule } from '../../shared'; import { - EntryService, - EntryPopupService, - EntryComponent, - EntryDetailComponent, - EntryDialogComponent, - EntryPopupComponent, - EntryDeletePopupComponent, - EntryDeleteDialogComponent, - entryRoute, - entryPopupRoute, + EntryComponent, + EntryDeleteDialogComponent, + EntryDeletePopupComponent, + EntryDetailComponent, + EntryDialogComponent, + EntryPopupComponent, + entryPopupRoute, + EntryPopupService, + entryRoute, + EntryService, } from './'; const ENTITY_STATES = [ diff --git a/src/main/webapp/app/entities/entry/entry.route.ts b/src/main/webapp/app/entities/entry/entry.route.ts index f5633d69..994b871c 100644 --- a/src/main/webapp/app/entities/entry/entry.route.ts +++ b/src/main/webapp/app/entities/entry/entry.route.ts @@ -1,16 +1,12 @@ -import { Injectable } from '@angular/core'; -import { Resolve, ActivatedRouteSnapshot, RouterStateSnapshot, Routes, CanActivate } from '@angular/router'; +import { Routes } from '@angular/router'; import { UserRouteAccessService } from '../../shared'; -import { JhiPaginationUtil } from 'ng-jhipster'; import { EntryComponent } from './entry.component'; import { EntryDetailComponent } from './entry-detail.component'; import { EntryPopupComponent } from './entry-dialog.component'; import { EntryDeletePopupComponent } from './entry-delete-dialog.component'; -import { Principal } from '../../shared'; - export const entryRoute: Routes = [ { path: 'entry', diff --git a/src/main/webapp/app/entities/entry/entry.service.ts b/src/main/webapp/app/entities/entry/entry.service.ts index 254dc512..b91e5f89 100644 --- a/src/main/webapp/app/entities/entry/entry.service.ts +++ b/src/main/webapp/app/entities/entry/entry.service.ts @@ -4,7 +4,7 @@ import { Observable } from 'rxjs/Observable'; import { JhiDateUtils } from 'ng-jhipster'; import { Entry } from './entry.model'; -import { ResponseWrapper, createRequestOption } from '../../shared'; +import { createRequestOption, ResponseWrapper } from '../../shared'; @Injectable() export class EntryService { diff --git a/src/main/webapp/app/entities/hero/hero-delete-dialog.component.ts b/src/main/webapp/app/entities/hero/hero-delete-dialog.component.ts index 073518a2..60be4a17 100644 --- a/src/main/webapp/app/entities/hero/hero-delete-dialog.component.ts +++ b/src/main/webapp/app/entities/hero/hero-delete-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/main/webapp/app/entities/hero/hero-detail.component.spec.ts b/src/main/webapp/app/entities/hero/hero-detail.component.spec.ts index e9e9a035..46831051 100644 --- a/src/main/webapp/app/entities/hero/hero-detail.component.spec.ts +++ b/src/main/webapp/app/entities/hero/hero-detail.component.spec.ts @@ -1,10 +1,10 @@ /* tslint:disable max-line-length */ -import { ComponentFixture, TestBed, async, inject } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { OnInit } from '@angular/core'; import { DatePipe } from '@angular/common'; import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs/Observable'; -import { JhiDateUtils, JhiDataUtils, JhiEventManager } from 'ng-jhipster'; +import { JhiDataUtils, JhiDateUtils, JhiEventManager } from 'ng-jhipster'; import { GreatBigExampleApplicationTestModule } from '../../../mocks/test.module'; import { MockActivatedRoute } from '../../../mocks/mock-route.service'; import { HeroDetailComponent } from './hero-detail.component'; diff --git a/src/main/webapp/app/entities/hero/hero-detail.component.ts b/src/main/webapp/app/entities/hero/hero-detail.component.ts index 184f1948..2476bfae 100644 --- a/src/main/webapp/app/entities/hero/hero-detail.component.ts +++ b/src/main/webapp/app/entities/hero/hero-detail.component.ts @@ -1,7 +1,7 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager } from 'ng-jhipster'; +import { JhiEventManager } from 'ng-jhipster'; import { Hero } from './hero.model'; import { HeroService } from './hero.service'; diff --git a/src/main/webapp/app/entities/hero/hero-dialog.component.ts b/src/main/webapp/app/entities/hero/hero-dialog.component.ts index c1df2878..25ce8f50 100644 --- a/src/main/webapp/app/entities/hero/hero-dialog.component.ts +++ b/src/main/webapp/app/entities/hero/hero-dialog.component.ts @@ -1,10 +1,10 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { JhiEventManager, JhiAlertService } from 'ng-jhipster'; +import { JhiAlertService, JhiEventManager } from 'ng-jhipster'; import { Hero } from './hero.model'; import { HeroPopupService } from './hero-popup.service'; diff --git a/src/main/webapp/app/entities/hero/hero-popup.service.ts b/src/main/webapp/app/entities/hero/hero-popup.service.ts index 5921ce15..a664d8fe 100644 --- a/src/main/webapp/app/entities/hero/hero-popup.service.ts +++ b/src/main/webapp/app/entities/hero/hero-popup.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Component } from '@angular/core'; +import { Component, Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { Hero } from './hero.model'; diff --git a/src/main/webapp/app/entities/hero/hero.component.ts b/src/main/webapp/app/entities/hero/hero.component.ts index 508538ff..68eeae32 100644 --- a/src/main/webapp/app/entities/hero/hero.component.ts +++ b/src/main/webapp/app/entities/hero/hero.component.ts @@ -1,12 +1,11 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager, JhiParseLinks, JhiPaginationUtil, JhiLanguageService, JhiAlertService } from 'ng-jhipster'; +import { JhiAlertService, JhiEventManager } from 'ng-jhipster'; import { Hero } from './hero.model'; import { HeroService } from './hero.service'; -import { ITEMS_PER_PAGE, Principal, ResponseWrapper } from '../../shared'; -import { PaginationConfig } from '../../core/config/uib-pagination.config'; +import { Principal, ResponseWrapper } from '../../shared'; @Component({ selector: 'jhi-hero', diff --git a/src/main/webapp/app/entities/hero/hero.module.ts b/src/main/webapp/app/entities/hero/hero.module.ts index cec2cd8c..691e3cea 100644 --- a/src/main/webapp/app/entities/hero/hero.module.ts +++ b/src/main/webapp/app/entities/hero/hero.module.ts @@ -1,18 +1,18 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { GreatBigExampleApplicationSharedModule } from '../../shared'; import { - HeroService, - HeroPopupService, HeroComponent, + HeroDeleteDialogComponent, + HeroDeletePopupComponent, HeroDetailComponent, HeroDialogComponent, HeroPopupComponent, - HeroDeletePopupComponent, - HeroDeleteDialogComponent, - heroRoute, heroPopupRoute, + HeroPopupService, + heroRoute, + HeroService, } from './'; const ENTITY_STATES = [ diff --git a/src/main/webapp/app/entities/hero/hero.route.ts b/src/main/webapp/app/entities/hero/hero.route.ts index 3f8d9e3f..23dba1da 100644 --- a/src/main/webapp/app/entities/hero/hero.route.ts +++ b/src/main/webapp/app/entities/hero/hero.route.ts @@ -1,16 +1,12 @@ -import { Injectable } from '@angular/core'; -import { Resolve, ActivatedRouteSnapshot, RouterStateSnapshot, Routes, CanActivate } from '@angular/router'; +import { Routes } from '@angular/router'; import { UserRouteAccessService } from '../../shared'; -import { JhiPaginationUtil } from 'ng-jhipster'; import { HeroComponent } from './hero.component'; import { HeroDetailComponent } from './hero-detail.component'; import { HeroPopupComponent } from './hero-dialog.component'; import { HeroDeletePopupComponent } from './hero-delete-dialog.component'; -import { Principal } from '../../shared'; - export const heroRoute: Routes = [ { path: 'hero', diff --git a/src/main/webapp/app/entities/hero/hero.service.ts b/src/main/webapp/app/entities/hero/hero.service.ts index 05ca5275..7d3d9ffe 100644 --- a/src/main/webapp/app/entities/hero/hero.service.ts +++ b/src/main/webapp/app/entities/hero/hero.service.ts @@ -3,7 +3,7 @@ import { Http, Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { Hero } from './hero.model'; -import { ResponseWrapper, createRequestOption } from '../../shared'; +import { createRequestOption, ResponseWrapper } from '../../shared'; @Injectable() export class HeroService { diff --git a/src/main/webapp/app/entities/message/message-delete-dialog.component.ts b/src/main/webapp/app/entities/message/message-delete-dialog.component.ts index 84784f3e..62b4db4b 100644 --- a/src/main/webapp/app/entities/message/message-delete-dialog.component.ts +++ b/src/main/webapp/app/entities/message/message-delete-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/main/webapp/app/entities/message/message-detail.component.spec.ts b/src/main/webapp/app/entities/message/message-detail.component.spec.ts index 7afcd9da..9366ac48 100644 --- a/src/main/webapp/app/entities/message/message-detail.component.spec.ts +++ b/src/main/webapp/app/entities/message/message-detail.component.spec.ts @@ -1,10 +1,10 @@ /* tslint:disable max-line-length */ -import { ComponentFixture, TestBed, async, inject } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { OnInit } from '@angular/core'; import { DatePipe } from '@angular/common'; import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs/Observable'; -import { JhiDateUtils, JhiDataUtils, JhiEventManager } from 'ng-jhipster'; +import { JhiDataUtils, JhiDateUtils, JhiEventManager } from 'ng-jhipster'; import { GreatBigExampleApplicationTestModule } from '../../../mocks/test.module'; import { MockActivatedRoute } from '../../../mocks/mock-route.service'; import { MessageDetailComponent } from './message-detail.component'; diff --git a/src/main/webapp/app/entities/message/message-detail.component.ts b/src/main/webapp/app/entities/message/message-detail.component.ts index 31437f13..63631678 100644 --- a/src/main/webapp/app/entities/message/message-detail.component.ts +++ b/src/main/webapp/app/entities/message/message-detail.component.ts @@ -1,7 +1,7 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager } from 'ng-jhipster'; +import { JhiEventManager } from 'ng-jhipster'; import { Message } from './message.model'; import { MessageService } from './message.service'; diff --git a/src/main/webapp/app/entities/message/message-dialog.component.ts b/src/main/webapp/app/entities/message/message-dialog.component.ts index bb85cee6..e740e6f7 100644 --- a/src/main/webapp/app/entities/message/message-dialog.component.ts +++ b/src/main/webapp/app/entities/message/message-dialog.component.ts @@ -1,10 +1,10 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { JhiEventManager, JhiAlertService } from 'ng-jhipster'; +import { JhiAlertService, JhiEventManager } from 'ng-jhipster'; import { Message } from './message.model'; import { MessagePopupService } from './message-popup.service'; diff --git a/src/main/webapp/app/entities/message/message-popup.service.ts b/src/main/webapp/app/entities/message/message-popup.service.ts index 0e0953e6..d64818cf 100644 --- a/src/main/webapp/app/entities/message/message-popup.service.ts +++ b/src/main/webapp/app/entities/message/message-popup.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Component } from '@angular/core'; +import { Component, Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { DatePipe } from '@angular/common'; diff --git a/src/main/webapp/app/entities/message/message.component.ts b/src/main/webapp/app/entities/message/message.component.ts index 44544469..d1764acc 100644 --- a/src/main/webapp/app/entities/message/message.component.ts +++ b/src/main/webapp/app/entities/message/message.component.ts @@ -1,12 +1,11 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager, JhiParseLinks, JhiPaginationUtil, JhiLanguageService, JhiAlertService } from 'ng-jhipster'; +import { JhiAlertService, JhiEventManager, JhiParseLinks } from 'ng-jhipster'; import { Message } from './message.model'; import { MessageService } from './message.service'; import { ITEMS_PER_PAGE, Principal, ResponseWrapper } from '../../shared'; -import { PaginationConfig } from '../../core/config/uib-pagination.config'; @Component({ selector: 'jhi-message', diff --git a/src/main/webapp/app/entities/message/message.module.ts b/src/main/webapp/app/entities/message/message.module.ts index f56156da..53907c68 100644 --- a/src/main/webapp/app/entities/message/message.module.ts +++ b/src/main/webapp/app/entities/message/message.module.ts @@ -1,18 +1,18 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { GreatBigExampleApplicationSharedModule } from '../../shared'; import { - MessageService, - MessagePopupService, - MessageComponent, - MessageDetailComponent, - MessageDialogComponent, - MessagePopupComponent, - MessageDeletePopupComponent, - MessageDeleteDialogComponent, - messageRoute, - messagePopupRoute, + MessageComponent, + MessageDeleteDialogComponent, + MessageDeletePopupComponent, + MessageDetailComponent, + MessageDialogComponent, + MessagePopupComponent, + messagePopupRoute, + MessagePopupService, + messageRoute, + MessageService, } from './'; const ENTITY_STATES = [ diff --git a/src/main/webapp/app/entities/message/message.route.ts b/src/main/webapp/app/entities/message/message.route.ts index 5c29bf57..e1546b2d 100644 --- a/src/main/webapp/app/entities/message/message.route.ts +++ b/src/main/webapp/app/entities/message/message.route.ts @@ -1,16 +1,12 @@ -import { Injectable } from '@angular/core'; -import { Resolve, ActivatedRouteSnapshot, RouterStateSnapshot, Routes, CanActivate } from '@angular/router'; +import { Routes } from '@angular/router'; import { UserRouteAccessService } from '../../shared'; -import { JhiPaginationUtil } from 'ng-jhipster'; import { MessageComponent } from './message.component'; import { MessageDetailComponent } from './message-detail.component'; import { MessagePopupComponent } from './message-dialog.component'; import { MessageDeletePopupComponent } from './message-delete-dialog.component'; -import { Principal } from '../../shared'; - export const messageRoute: Routes = [ { path: 'message', diff --git a/src/main/webapp/app/entities/message/message.service.ts b/src/main/webapp/app/entities/message/message.service.ts index 33c36678..bf26f075 100644 --- a/src/main/webapp/app/entities/message/message.service.ts +++ b/src/main/webapp/app/entities/message/message.service.ts @@ -4,7 +4,7 @@ import { Observable } from 'rxjs/Observable'; import { JhiDateUtils } from 'ng-jhipster'; import { Message } from './message.model'; -import { ResponseWrapper, createRequestOption } from '../../shared'; +import { createRequestOption, ResponseWrapper } from '../../shared'; @Injectable() export class MessageService { diff --git a/src/main/webapp/app/entities/note/note-delete-dialog.component.ts b/src/main/webapp/app/entities/note/note-delete-dialog.component.ts index c706d430..2bacd8d8 100644 --- a/src/main/webapp/app/entities/note/note-delete-dialog.component.ts +++ b/src/main/webapp/app/entities/note/note-delete-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/main/webapp/app/entities/note/note-detail.component.spec.ts b/src/main/webapp/app/entities/note/note-detail.component.spec.ts index d50df2d3..96ce35e4 100644 --- a/src/main/webapp/app/entities/note/note-detail.component.spec.ts +++ b/src/main/webapp/app/entities/note/note-detail.component.spec.ts @@ -1,10 +1,10 @@ /* tslint:disable max-line-length */ -import { ComponentFixture, TestBed, async, inject } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { OnInit } from '@angular/core'; import { DatePipe } from '@angular/common'; import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs/Observable'; -import { JhiDateUtils, JhiDataUtils, JhiEventManager } from 'ng-jhipster'; +import { JhiDataUtils, JhiDateUtils, JhiEventManager } from 'ng-jhipster'; import { GreatBigExampleApplicationTestModule } from '../../../mocks/test.module'; import { MockActivatedRoute } from '../../../mocks/mock-route.service'; import { NoteDetailComponent } from './note-detail.component'; diff --git a/src/main/webapp/app/entities/note/note-detail.component.ts b/src/main/webapp/app/entities/note/note-detail.component.ts index f0c84615..504f308a 100644 --- a/src/main/webapp/app/entities/note/note-detail.component.ts +++ b/src/main/webapp/app/entities/note/note-detail.component.ts @@ -1,7 +1,7 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager } from 'ng-jhipster'; +import { JhiEventManager } from 'ng-jhipster'; import { Note } from './note.model'; import { NoteService } from './note.service'; diff --git a/src/main/webapp/app/entities/note/note-dialog.component.ts b/src/main/webapp/app/entities/note/note-dialog.component.ts index 9240915c..43ccf0fe 100644 --- a/src/main/webapp/app/entities/note/note-dialog.component.ts +++ b/src/main/webapp/app/entities/note/note-dialog.component.ts @@ -1,10 +1,10 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { JhiEventManager, JhiAlertService } from 'ng-jhipster'; +import { JhiAlertService, JhiEventManager } from 'ng-jhipster'; import { Note } from './note.model'; import { NotePopupService } from './note-popup.service'; diff --git a/src/main/webapp/app/entities/note/note-popup.service.ts b/src/main/webapp/app/entities/note/note-popup.service.ts index 57943e50..c24fcf01 100644 --- a/src/main/webapp/app/entities/note/note-popup.service.ts +++ b/src/main/webapp/app/entities/note/note-popup.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Component } from '@angular/core'; +import { Component, Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { Note } from './note.model'; diff --git a/src/main/webapp/app/entities/note/note.component.ts b/src/main/webapp/app/entities/note/note.component.ts index 479da90a..9216345f 100644 --- a/src/main/webapp/app/entities/note/note.component.ts +++ b/src/main/webapp/app/entities/note/note.component.ts @@ -1,12 +1,11 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager, JhiParseLinks, JhiPaginationUtil, JhiLanguageService, JhiAlertService } from 'ng-jhipster'; +import { JhiAlertService, JhiEventManager } from 'ng-jhipster'; import { Note } from './note.model'; import { NoteService } from './note.service'; -import { ITEMS_PER_PAGE, Principal, ResponseWrapper } from '../../shared'; -import { PaginationConfig } from '../../core/config/uib-pagination.config'; +import { Principal, ResponseWrapper } from '../../shared'; @Component({ selector: 'jhi-note', diff --git a/src/main/webapp/app/entities/note/note.module.ts b/src/main/webapp/app/entities/note/note.module.ts index 397d7f65..90d70beb 100644 --- a/src/main/webapp/app/entities/note/note.module.ts +++ b/src/main/webapp/app/entities/note/note.module.ts @@ -1,18 +1,18 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { GreatBigExampleApplicationSharedModule } from '../../shared'; import { - NoteService, - NotePopupService, NoteComponent, + NoteDeleteDialogComponent, + NoteDeletePopupComponent, NoteDetailComponent, NoteDialogComponent, NotePopupComponent, - NoteDeletePopupComponent, - NoteDeleteDialogComponent, - noteRoute, notePopupRoute, + NotePopupService, + noteRoute, + NoteService, } from './'; const ENTITY_STATES = [ diff --git a/src/main/webapp/app/entities/note/note.route.ts b/src/main/webapp/app/entities/note/note.route.ts index 84335699..b64094ca 100644 --- a/src/main/webapp/app/entities/note/note.route.ts +++ b/src/main/webapp/app/entities/note/note.route.ts @@ -1,16 +1,12 @@ -import { Injectable } from '@angular/core'; -import { Resolve, ActivatedRouteSnapshot, RouterStateSnapshot, Routes, CanActivate } from '@angular/router'; +import { Routes } from '@angular/router'; import { UserRouteAccessService } from '../../shared'; -import { JhiPaginationUtil } from 'ng-jhipster'; import { NoteComponent } from './note.component'; import { NoteDetailComponent } from './note-detail.component'; import { NotePopupComponent } from './note-dialog.component'; import { NoteDeletePopupComponent } from './note-delete-dialog.component'; -import { Principal } from '../../shared'; - export const noteRoute: Routes = [ { path: 'note', diff --git a/src/main/webapp/app/entities/note/note.service.ts b/src/main/webapp/app/entities/note/note.service.ts index 0a121d79..f515a0f3 100644 --- a/src/main/webapp/app/entities/note/note.service.ts +++ b/src/main/webapp/app/entities/note/note.service.ts @@ -3,7 +3,7 @@ import { Http, Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { Note } from './note.model'; -import { ResponseWrapper, createRequestOption } from '../../shared'; +import { createRequestOption, ResponseWrapper } from '../../shared'; @Injectable() export class NoteService { diff --git a/src/main/webapp/app/entities/rebuttal/rebuttal-delete-dialog.component.ts b/src/main/webapp/app/entities/rebuttal/rebuttal-delete-dialog.component.ts index 0b7afb16..a05e62a2 100644 --- a/src/main/webapp/app/entities/rebuttal/rebuttal-delete-dialog.component.ts +++ b/src/main/webapp/app/entities/rebuttal/rebuttal-delete-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/main/webapp/app/entities/rebuttal/rebuttal-detail.component.spec.ts b/src/main/webapp/app/entities/rebuttal/rebuttal-detail.component.spec.ts index c93a00c1..78c5bf57 100644 --- a/src/main/webapp/app/entities/rebuttal/rebuttal-detail.component.spec.ts +++ b/src/main/webapp/app/entities/rebuttal/rebuttal-detail.component.spec.ts @@ -1,10 +1,10 @@ /* tslint:disable max-line-length */ -import { ComponentFixture, TestBed, async, inject } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { OnInit } from '@angular/core'; import { DatePipe } from '@angular/common'; import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs/Observable'; -import { JhiDateUtils, JhiDataUtils, JhiEventManager } from 'ng-jhipster'; +import { JhiDataUtils, JhiDateUtils, JhiEventManager } from 'ng-jhipster'; import { GreatBigExampleApplicationTestModule } from '../../../mocks/test.module'; import { MockActivatedRoute } from '../../../mocks/mock-route.service'; import { RebuttalDetailComponent } from './rebuttal-detail.component'; diff --git a/src/main/webapp/app/entities/rebuttal/rebuttal-detail.component.ts b/src/main/webapp/app/entities/rebuttal/rebuttal-detail.component.ts index 6226f5cf..6aef03b0 100644 --- a/src/main/webapp/app/entities/rebuttal/rebuttal-detail.component.ts +++ b/src/main/webapp/app/entities/rebuttal/rebuttal-detail.component.ts @@ -1,7 +1,7 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager } from 'ng-jhipster'; +import { JhiEventManager } from 'ng-jhipster'; import { Rebuttal } from './rebuttal.model'; import { RebuttalService } from './rebuttal.service'; diff --git a/src/main/webapp/app/entities/rebuttal/rebuttal-dialog.component.ts b/src/main/webapp/app/entities/rebuttal/rebuttal-dialog.component.ts index b3784dc7..8605285c 100644 --- a/src/main/webapp/app/entities/rebuttal/rebuttal-dialog.component.ts +++ b/src/main/webapp/app/entities/rebuttal/rebuttal-dialog.component.ts @@ -1,10 +1,10 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; - import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { JhiEventManager, JhiAlertService } from 'ng-jhipster'; +import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { JhiAlertService, JhiEventManager } from 'ng-jhipster'; import { Rebuttal } from './rebuttal.model'; import { RebuttalPopupService } from './rebuttal-popup.service'; diff --git a/src/main/webapp/app/entities/rebuttal/rebuttal-popup.service.ts b/src/main/webapp/app/entities/rebuttal/rebuttal-popup.service.ts index 11c12c64..6c91126b 100644 --- a/src/main/webapp/app/entities/rebuttal/rebuttal-popup.service.ts +++ b/src/main/webapp/app/entities/rebuttal/rebuttal-popup.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Component } from '@angular/core'; +import { Component, Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { DatePipe } from '@angular/common'; diff --git a/src/main/webapp/app/entities/rebuttal/rebuttal.component.ts b/src/main/webapp/app/entities/rebuttal/rebuttal.component.ts index 9eaa08db..4787bad1 100644 --- a/src/main/webapp/app/entities/rebuttal/rebuttal.component.ts +++ b/src/main/webapp/app/entities/rebuttal/rebuttal.component.ts @@ -1,12 +1,11 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager, JhiParseLinks, JhiPaginationUtil, JhiLanguageService, JhiAlertService } from 'ng-jhipster'; +import { JhiAlertService, JhiEventManager } from 'ng-jhipster'; import { Rebuttal } from './rebuttal.model'; import { RebuttalService } from './rebuttal.service'; -import { ITEMS_PER_PAGE, Principal, ResponseWrapper } from '../../shared'; -import { PaginationConfig } from '../../core/config/uib-pagination.config'; +import { Principal, ResponseWrapper } from '../../shared'; @Component({ selector: 'jhi-rebuttal', diff --git a/src/main/webapp/app/entities/rebuttal/rebuttal.module.ts b/src/main/webapp/app/entities/rebuttal/rebuttal.module.ts index 8e8c16c7..2b8df31d 100644 --- a/src/main/webapp/app/entities/rebuttal/rebuttal.module.ts +++ b/src/main/webapp/app/entities/rebuttal/rebuttal.module.ts @@ -1,18 +1,18 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { GreatBigExampleApplicationSharedModule } from '../../shared'; import { - RebuttalService, - RebuttalPopupService, - RebuttalComponent, - RebuttalDetailComponent, - RebuttalDialogComponent, - RebuttalPopupComponent, - RebuttalDeletePopupComponent, - RebuttalDeleteDialogComponent, - rebuttalRoute, - rebuttalPopupRoute, + RebuttalComponent, + RebuttalDeleteDialogComponent, + RebuttalDeletePopupComponent, + RebuttalDetailComponent, + RebuttalDialogComponent, + RebuttalPopupComponent, + rebuttalPopupRoute, + RebuttalPopupService, + rebuttalRoute, + RebuttalService, } from './'; const ENTITY_STATES = [ diff --git a/src/main/webapp/app/entities/rebuttal/rebuttal.route.ts b/src/main/webapp/app/entities/rebuttal/rebuttal.route.ts index 82f26df8..507a374d 100644 --- a/src/main/webapp/app/entities/rebuttal/rebuttal.route.ts +++ b/src/main/webapp/app/entities/rebuttal/rebuttal.route.ts @@ -1,16 +1,12 @@ -import { Injectable } from '@angular/core'; -import { Resolve, ActivatedRouteSnapshot, RouterStateSnapshot, Routes, CanActivate } from '@angular/router'; +import { Routes } from '@angular/router'; import { UserRouteAccessService } from '../../shared'; -import { JhiPaginationUtil } from 'ng-jhipster'; import { RebuttalComponent } from './rebuttal.component'; import { RebuttalDetailComponent } from './rebuttal-detail.component'; import { RebuttalPopupComponent } from './rebuttal-dialog.component'; import { RebuttalDeletePopupComponent } from './rebuttal-delete-dialog.component'; -import { Principal } from '../../shared'; - export const rebuttalRoute: Routes = [ { path: 'rebuttal', diff --git a/src/main/webapp/app/entities/rebuttal/rebuttal.service.ts b/src/main/webapp/app/entities/rebuttal/rebuttal.service.ts index c83b64c5..191bf0b5 100644 --- a/src/main/webapp/app/entities/rebuttal/rebuttal.service.ts +++ b/src/main/webapp/app/entities/rebuttal/rebuttal.service.ts @@ -4,7 +4,7 @@ import { Observable } from 'rxjs/Observable'; import { JhiDateUtils } from 'ng-jhipster'; import { Rebuttal } from './rebuttal.model'; -import { ResponseWrapper, createRequestOption } from '../../shared'; +import { createRequestOption, ResponseWrapper } from '../../shared'; @Injectable() export class RebuttalService { diff --git a/src/main/webapp/app/entities/tag/tag-delete-dialog.component.ts b/src/main/webapp/app/entities/tag/tag-delete-dialog.component.ts index 67bee778..8920aeba 100644 --- a/src/main/webapp/app/entities/tag/tag-delete-dialog.component.ts +++ b/src/main/webapp/app/entities/tag/tag-delete-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/main/webapp/app/entities/tag/tag-detail.component.spec.ts b/src/main/webapp/app/entities/tag/tag-detail.component.spec.ts index 3fdf3c7f..ae84ce78 100644 --- a/src/main/webapp/app/entities/tag/tag-detail.component.spec.ts +++ b/src/main/webapp/app/entities/tag/tag-detail.component.spec.ts @@ -1,10 +1,10 @@ /* tslint:disable max-line-length */ -import { ComponentFixture, TestBed, async, inject } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { OnInit } from '@angular/core'; import { DatePipe } from '@angular/common'; import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs/Observable'; -import { JhiDateUtils, JhiDataUtils, JhiEventManager } from 'ng-jhipster'; +import { JhiDataUtils, JhiDateUtils, JhiEventManager } from 'ng-jhipster'; import { GreatBigExampleApplicationTestModule } from '../../../mocks/test.module'; import { MockActivatedRoute } from '../../../mocks/mock-route.service'; import { TagDetailComponent } from './tag-detail.component'; diff --git a/src/main/webapp/app/entities/tag/tag-detail.component.ts b/src/main/webapp/app/entities/tag/tag-detail.component.ts index a677cf67..a0f9f3dc 100644 --- a/src/main/webapp/app/entities/tag/tag-detail.component.ts +++ b/src/main/webapp/app/entities/tag/tag-detail.component.ts @@ -1,7 +1,7 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager } from 'ng-jhipster'; +import { JhiEventManager } from 'ng-jhipster'; import { Tag } from './tag.model'; import { TagService } from './tag.service'; diff --git a/src/main/webapp/app/entities/tag/tag-dialog.component.ts b/src/main/webapp/app/entities/tag/tag-dialog.component.ts index 2a5a8a78..ac429a54 100644 --- a/src/main/webapp/app/entities/tag/tag-dialog.component.ts +++ b/src/main/webapp/app/entities/tag/tag-dialog.component.ts @@ -1,10 +1,10 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { JhiEventManager, JhiAlertService } from 'ng-jhipster'; +import { JhiAlertService, JhiEventManager } from 'ng-jhipster'; import { Tag } from './tag.model'; import { TagPopupService } from './tag-popup.service'; diff --git a/src/main/webapp/app/entities/tag/tag-popup.service.ts b/src/main/webapp/app/entities/tag/tag-popup.service.ts index d582336b..06449c61 100644 --- a/src/main/webapp/app/entities/tag/tag-popup.service.ts +++ b/src/main/webapp/app/entities/tag/tag-popup.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Component } from '@angular/core'; +import { Component, Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { Tag } from './tag.model'; diff --git a/src/main/webapp/app/entities/tag/tag.component.ts b/src/main/webapp/app/entities/tag/tag.component.ts index 42e89f80..5fbbfc1e 100644 --- a/src/main/webapp/app/entities/tag/tag.component.ts +++ b/src/main/webapp/app/entities/tag/tag.component.ts @@ -1,12 +1,11 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager, JhiParseLinks, JhiPaginationUtil, JhiLanguageService, JhiAlertService } from 'ng-jhipster'; +import { JhiAlertService, JhiEventManager, JhiParseLinks } from 'ng-jhipster'; import { Tag } from './tag.model'; import { TagService } from './tag.service'; import { ITEMS_PER_PAGE, Principal, ResponseWrapper } from '../../shared'; -import { PaginationConfig } from '../../core/config/uib-pagination.config'; @Component({ selector: 'jhi-tag', diff --git a/src/main/webapp/app/entities/tag/tag.module.ts b/src/main/webapp/app/entities/tag/tag.module.ts index 6c88989a..3c577aeb 100644 --- a/src/main/webapp/app/entities/tag/tag.module.ts +++ b/src/main/webapp/app/entities/tag/tag.module.ts @@ -1,18 +1,18 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { GreatBigExampleApplicationSharedModule } from '../../shared'; import { - TagService, - TagPopupService, - TagComponent, - TagDetailComponent, - TagDialogComponent, - TagPopupComponent, - TagDeletePopupComponent, - TagDeleteDialogComponent, - tagRoute, - tagPopupRoute, + TagComponent, + TagDeleteDialogComponent, + TagDeletePopupComponent, + TagDetailComponent, + TagDialogComponent, + TagPopupComponent, + tagPopupRoute, + TagPopupService, + tagRoute, + TagService, } from './'; const ENTITY_STATES = [ diff --git a/src/main/webapp/app/entities/tag/tag.route.ts b/src/main/webapp/app/entities/tag/tag.route.ts index 0b030290..772a4263 100644 --- a/src/main/webapp/app/entities/tag/tag.route.ts +++ b/src/main/webapp/app/entities/tag/tag.route.ts @@ -1,16 +1,12 @@ -import { Injectable } from '@angular/core'; -import { Resolve, ActivatedRouteSnapshot, RouterStateSnapshot, Routes, CanActivate } from '@angular/router'; +import { Routes } from '@angular/router'; import { UserRouteAccessService } from '../../shared'; -import { JhiPaginationUtil } from 'ng-jhipster'; import { TagComponent } from './tag.component'; import { TagDetailComponent } from './tag-detail.component'; import { TagPopupComponent } from './tag-dialog.component'; import { TagDeletePopupComponent } from './tag-delete-dialog.component'; -import { Principal } from '../../shared'; - export const tagRoute: Routes = [ { path: 'tag', diff --git a/src/main/webapp/app/entities/tag/tag.service.ts b/src/main/webapp/app/entities/tag/tag.service.ts index 82b2a3d7..113aaf86 100644 --- a/src/main/webapp/app/entities/tag/tag.service.ts +++ b/src/main/webapp/app/entities/tag/tag.service.ts @@ -3,7 +3,7 @@ import { Http, Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { Tag } from './tag.model'; -import { ResponseWrapper, createRequestOption } from '../../shared'; +import { createRequestOption, ResponseWrapper } from '../../shared'; @Injectable() export class TagService { diff --git a/src/main/webapp/app/entities/talk/talk-delete-dialog.component.ts b/src/main/webapp/app/entities/talk/talk-delete-dialog.component.ts index 5e954202..7ee743a1 100644 --- a/src/main/webapp/app/entities/talk/talk-delete-dialog.component.ts +++ b/src/main/webapp/app/entities/talk/talk-delete-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; diff --git a/src/main/webapp/app/entities/talk/talk-detail.component.spec.ts b/src/main/webapp/app/entities/talk/talk-detail.component.spec.ts index 1803c3c2..668b2a4d 100644 --- a/src/main/webapp/app/entities/talk/talk-detail.component.spec.ts +++ b/src/main/webapp/app/entities/talk/talk-detail.component.spec.ts @@ -1,10 +1,10 @@ /* tslint:disable max-line-length */ -import { ComponentFixture, TestBed, async, inject } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { OnInit } from '@angular/core'; import { DatePipe } from '@angular/common'; import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs/Observable'; -import { JhiDateUtils, JhiDataUtils, JhiEventManager } from 'ng-jhipster'; +import { JhiDataUtils, JhiDateUtils, JhiEventManager } from 'ng-jhipster'; import { GreatBigExampleApplicationTestModule } from '../../../mocks/test.module'; import { MockActivatedRoute } from '../../../mocks/mock-route.service'; import { TalkDetailComponent } from './talk-detail.component'; diff --git a/src/main/webapp/app/entities/talk/talk-detail.component.ts b/src/main/webapp/app/entities/talk/talk-detail.component.ts index 2aa7a26a..742bf101 100644 --- a/src/main/webapp/app/entities/talk/talk-detail.component.ts +++ b/src/main/webapp/app/entities/talk/talk-detail.component.ts @@ -1,7 +1,7 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager , JhiDataUtils } from 'ng-jhipster'; +import { JhiDataUtils, JhiEventManager } from 'ng-jhipster'; import { Talk } from './talk.model'; import { TalkService } from './talk.service'; diff --git a/src/main/webapp/app/entities/talk/talk-dialog.component.ts b/src/main/webapp/app/entities/talk/talk-dialog.component.ts index 1f421c55..15c49795 100644 --- a/src/main/webapp/app/entities/talk/talk-dialog.component.ts +++ b/src/main/webapp/app/entities/talk/talk-dialog.component.ts @@ -1,10 +1,10 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { NgbActiveModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { JhiEventManager, JhiAlertService, JhiDataUtils } from 'ng-jhipster'; +import { JhiAlertService, JhiDataUtils, JhiEventManager } from 'ng-jhipster'; import { Talk } from './talk.model'; import { TalkPopupService } from './talk-popup.service'; diff --git a/src/main/webapp/app/entities/talk/talk-popup.service.ts b/src/main/webapp/app/entities/talk/talk-popup.service.ts index 20a7e51b..10c1be7e 100644 --- a/src/main/webapp/app/entities/talk/talk-popup.service.ts +++ b/src/main/webapp/app/entities/talk/talk-popup.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Component } from '@angular/core'; +import { Component, Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { Talk } from './talk.model'; diff --git a/src/main/webapp/app/entities/talk/talk.component.ts b/src/main/webapp/app/entities/talk/talk.component.ts index 44227a89..ed9215f4 100644 --- a/src/main/webapp/app/entities/talk/talk.component.ts +++ b/src/main/webapp/app/entities/talk/talk.component.ts @@ -1,7 +1,7 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; -import { JhiEventManager, JhiParseLinks, JhiPaginationUtil, JhiLanguageService, JhiAlertService, JhiDataUtils } from 'ng-jhipster'; +import { JhiAlertService, JhiDataUtils, JhiEventManager, JhiPaginationUtil, JhiParseLinks } from 'ng-jhipster'; import { Talk } from './talk.model'; import { TalkService } from './talk.service'; diff --git a/src/main/webapp/app/entities/talk/talk.module.ts b/src/main/webapp/app/entities/talk/talk.module.ts index 6eff3dc2..98315507 100644 --- a/src/main/webapp/app/entities/talk/talk.module.ts +++ b/src/main/webapp/app/entities/talk/talk.module.ts @@ -1,19 +1,19 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { GreatBigExampleApplicationSharedModule } from '../../shared'; import { - TalkService, - TalkPopupService, - TalkComponent, - TalkDetailComponent, - TalkDialogComponent, - TalkPopupComponent, - TalkDeletePopupComponent, - TalkDeleteDialogComponent, - talkRoute, - talkPopupRoute, - TalkResolvePagingParams, + TalkComponent, + TalkDeleteDialogComponent, + TalkDeletePopupComponent, + TalkDetailComponent, + TalkDialogComponent, + TalkPopupComponent, + talkPopupRoute, + TalkPopupService, + TalkResolvePagingParams, + talkRoute, + TalkService, } from './'; const ENTITY_STATES = [ diff --git a/src/main/webapp/app/entities/talk/talk.route.ts b/src/main/webapp/app/entities/talk/talk.route.ts index 51c86e58..83a67fbb 100644 --- a/src/main/webapp/app/entities/talk/talk.route.ts +++ b/src/main/webapp/app/entities/talk/talk.route.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Resolve, ActivatedRouteSnapshot, RouterStateSnapshot, Routes, CanActivate } from '@angular/router'; +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot, Routes } from '@angular/router'; import { UserRouteAccessService } from '../../shared'; import { JhiPaginationUtil } from 'ng-jhipster'; @@ -9,8 +9,6 @@ import { TalkDetailComponent } from './talk-detail.component'; import { TalkPopupComponent } from './talk-dialog.component'; import { TalkDeletePopupComponent } from './talk-delete-dialog.component'; -import { Principal } from '../../shared'; - @Injectable() export class TalkResolvePagingParams implements Resolve { diff --git a/src/main/webapp/app/entities/talk/talk.service.ts b/src/main/webapp/app/entities/talk/talk.service.ts index 8ce2df94..b528c585 100644 --- a/src/main/webapp/app/entities/talk/talk.service.ts +++ b/src/main/webapp/app/entities/talk/talk.service.ts @@ -3,7 +3,7 @@ import { Http, Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { Talk } from './talk.model'; -import { ResponseWrapper, createRequestOption } from '../../shared'; +import { createRequestOption, ResponseWrapper } from '../../shared'; @Injectable() export class TalkService { diff --git a/src/main/webapp/app/features/about/about.component.spec.ts b/src/main/webapp/app/features/about/about.component.spec.ts index 1fdf8a40..459d1b8e 100644 --- a/src/main/webapp/app/features/about/about.component.spec.ts +++ b/src/main/webapp/app/features/about/about.component.spec.ts @@ -1,7 +1,6 @@ /* tslint:disable:no-unused-variable */ -import { DebugElement, EventEmitter, Injectable } from '@angular/core'; +import { EventEmitter, Injectable } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; import { AboutComponent } from './about.component'; import { ApiService } from '../../core/api/api.service'; diff --git a/src/main/webapp/app/features/about/about.component.ts b/src/main/webapp/app/features/about/about.component.ts index 08cf3926..bf186329 100644 --- a/src/main/webapp/app/features/about/about.component.ts +++ b/src/main/webapp/app/features/about/about.component.ts @@ -1,9 +1,11 @@ /** * @module AboutModule - */ /** */ + */ +/** */ import { Component } from '@angular/core'; import { ApiService } from '../../core/api/api.service'; + /** * @whatItDoes Returns the {@link AboutComponent} view. * @consumers {@link AboutModule}, {@link AboutRouting} diff --git a/src/main/webapp/app/features/about/about.module.ts b/src/main/webapp/app/features/about/about.module.ts index e122ab2f..cc5b0043 100644 --- a/src/main/webapp/app/features/about/about.module.ts +++ b/src/main/webapp/app/features/about/about.module.ts @@ -1,7 +1,8 @@ /** * @module AboutModule * @preferred - */ /** */ + */ +/** */ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; @@ -9,6 +10,7 @@ import { AboutComponent } from './about.component'; import { AboutRouting } from './about.routing'; import { GreatBigExampleApplicationSharedModule } from '../../shared/shared.module'; import { UiModule } from '../../shared/ui/ui.module'; + /** * @whatItDoes Lazy loaded feature module for the about page. * @consumers @consumers {@link AppRoutingModule} (on demand) diff --git a/src/main/webapp/app/features/about/about.routing.ts b/src/main/webapp/app/features/about/about.routing.ts index 72b912f7..5b3b62c2 100644 --- a/src/main/webapp/app/features/about/about.routing.ts +++ b/src/main/webapp/app/features/about/about.routing.ts @@ -1,10 +1,12 @@ /** * @module AboutModule - */ /** */ + */ +/** */ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AboutComponent } from './about.component'; + /** * Child routes for the lazy-loaded {@link AboutModule} */ diff --git a/src/main/webapp/app/features/bernie/bernie.layout.ts b/src/main/webapp/app/features/bernie/bernie.layout.ts index 82ad788c..5ee7eaf5 100644 --- a/src/main/webapp/app/features/bernie/bernie.layout.ts +++ b/src/main/webapp/app/features/bernie/bernie.layout.ts @@ -4,7 +4,7 @@ export interface BerniePageLayout { scrollY: number; bernieSearchTerm: string; // isTouched: Function; -}; +} export const initialBerniePageLayout: BerniePageLayout = { editable: false, diff --git a/src/main/webapp/app/features/bernie/bernie.module.ts b/src/main/webapp/app/features/bernie/bernie.module.ts index 3ea7f772..1e9d3101 100644 --- a/src/main/webapp/app/features/bernie/bernie.module.ts +++ b/src/main/webapp/app/features/bernie/bernie.module.ts @@ -1,7 +1,6 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { SortablejsModule } from 'angular-sortablejs'; -import { AsyncPipe } from '@angular/common'; import { EffectsModule } from '@ngrx/effects'; import { MaterialModule } from '@angular/material'; import { NgPipesModule } from 'ngx-pipes'; diff --git a/src/main/webapp/app/features/bernie/bernie.page.ts b/src/main/webapp/app/features/bernie/bernie.page.ts index c250668e..75c6d97c 100644 --- a/src/main/webapp/app/features/bernie/bernie.page.ts +++ b/src/main/webapp/app/features/bernie/bernie.page.ts @@ -1,15 +1,15 @@ -import { Component, ChangeDetectionStrategy, OnInit, OnDestroy, AfterViewChecked } from '@angular/core'; +import { AfterViewChecked, ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs/Observable'; import { SortablejsOptions } from 'angular-sortablejs'; import { Subscription } from 'rxjs/Subscription'; import { Subject } from 'rxjs/Subject'; -import { Router, ActivatedRoute } from '@angular/router'; +import { ActivatedRoute } from '@angular/router'; import * as fromRoot from '../../core/store'; import { BerniePageLayout } from './bernie.layout'; -import { Claim, initialClaim } from '../../core/store/claim/claim.model'; -import { Rebuttal, initialRebuttal } from '../../core/store/rebuttal/rebuttal.model'; +import { Claim } from '../../core/store/claim/claim.model'; +import { initialRebuttal, Rebuttal } from '../../core/store/rebuttal/rebuttal.model'; import { ClaimRebuttal, initialClaimRebuttal } from '../../core/store/claim-rebuttal/claim-rebuttal.model'; import { Entities } from '../../core/store/entity/entity.model'; import * as EntityActions from '../../core/store/entity/entity.actions'; @@ -156,7 +156,7 @@ export class BerniePage implements OnInit, OnDestroy, AfterViewChecked { const entities = Object.assign({}, this.claimEntities.entities); ids.map((id, index) => { entities[id].sortOrder = index; - }) + }); // combine entities and ids and other properties of claimEntities like selectedEntity into a new object and dispatch an update const newEntities = Object.assign({}, this.claimEntities, { entities, ids }); // this Object.assign isn't necessary. Merge in slice.functions too @@ -170,7 +170,7 @@ export class BerniePage implements OnInit, OnDestroy, AfterViewChecked { } ngAfterViewChecked() { - console.log('resolved') + console.log('resolved'); // this.scrollDistance = WrappedValue.wrap(0) // console.log("setting scrolly") this.store.dispatch(new SliceActions.Update(slices.LAYOUT, ['berniePage', 'scrollY'], 300)); diff --git a/src/main/webapp/app/features/bernie/bernie.routing.ts b/src/main/webapp/app/features/bernie/bernie.routing.ts index f5e7ab5a..880d89be 100644 --- a/src/main/webapp/app/features/bernie/bernie.routing.ts +++ b/src/main/webapp/app/features/bernie/bernie.routing.ts @@ -1,6 +1,5 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { Store } from '@ngrx/store'; import { BerniePage } from './bernie.page'; import { UserRouteAccessService } from '../../shared'; diff --git a/src/main/webapp/app/features/bernie/claim/claim.component.ts b/src/main/webapp/app/features/bernie/claim/claim.component.ts index 7f7bef91..8f4a1bcd 100644 --- a/src/main/webapp/app/features/bernie/claim/claim.component.ts +++ b/src/main/webapp/app/features/bernie/claim/claim.component.ts @@ -1,15 +1,7 @@ -import { - Component, Input, Output, - EventEmitter, ChangeDetectionStrategy -} from '@angular/core'; -import { Observable } from 'rxjs/Observable'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; import { SortablejsOptions } from 'angular-sortablejs'; import { Claim } from '../../../core/store/claim/claim.model'; -import { Rebuttal } from '../../../core/store/rebuttal/rebuttal.model'; -import { ClaimRebuttal } from '../../../core/store/claim-rebuttal/claim-rebuttal.model'; -import { RebuttalComponent } from '../rebuttal/rebuttal.component'; -import { getRebuttalEntities } from '../../../core/store'; @Component({ selector: 'jhi-bernie-claim', diff --git a/src/main/webapp/app/features/bernie/claims.resolver.ts b/src/main/webapp/app/features/bernie/claims.resolver.ts index 16904fd7..5a30db7e 100644 --- a/src/main/webapp/app/features/bernie/claims.resolver.ts +++ b/src/main/webapp/app/features/bernie/claims.resolver.ts @@ -1,6 +1,5 @@ import { Injectable } from '@angular/core'; -import { Resolve, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; +import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; import { Store } from '@ngrx/store'; import * as fromRoot from '../../core/store'; diff --git a/src/main/webapp/app/features/bernie/rebuttal/rebuttal.component.ts b/src/main/webapp/app/features/bernie/rebuttal/rebuttal.component.ts index 9b851776..e01eeeef 100644 --- a/src/main/webapp/app/features/bernie/rebuttal/rebuttal.component.ts +++ b/src/main/webapp/app/features/bernie/rebuttal/rebuttal.component.ts @@ -1,7 +1,4 @@ -import { - Component, Input, Output, EventEmitter, OnInit, - ChangeDetectionStrategy -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Claim } from '../../../core/store/claim/claim.model'; diff --git a/src/main/webapp/app/features/books/book-detail/book-detail.component.ts b/src/main/webapp/app/features/books/book-detail/book-detail.component.ts index 766ef0b7..503ed154 100644 --- a/src/main/webapp/app/features/books/book-detail/book-detail.component.ts +++ b/src/main/webapp/app/features/books/book-detail/book-detail.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, Output, EventEmitter } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { Book } from '../../../core/store/book/book.model'; @Component({ diff --git a/src/main/webapp/app/features/books/book-search/book-search.component.ts b/src/main/webapp/app/features/books/book-search/book-search.component.ts index d525794f..00c8b9aa 100644 --- a/src/main/webapp/app/features/books/book-search/book-search.component.ts +++ b/src/main/webapp/app/features/books/book-search/book-search.component.ts @@ -1,4 +1,4 @@ -import { Component, Output, Input, EventEmitter } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; @Component({ selector: 'jhi-book-search', diff --git a/src/main/webapp/app/features/books/books.layout.ts b/src/main/webapp/app/features/books/books.layout.ts index 3c0a5f6e..71926968 100644 --- a/src/main/webapp/app/features/books/books.layout.ts +++ b/src/main/webapp/app/features/books/books.layout.ts @@ -1,6 +1,6 @@ export interface BooksPageLayout { query: string; -}; +} export const initialBooksPageLayout = { query: '' diff --git a/src/main/webapp/app/features/books/books.routing.ts b/src/main/webapp/app/features/books/books.routing.ts index a5395b6f..a52597b7 100644 --- a/src/main/webapp/app/features/books/books.routing.ts +++ b/src/main/webapp/app/features/books/books.routing.ts @@ -50,4 +50,5 @@ const routes: Routes = [ SelectivePreloadingStrategy ] }) -export class BooksRouting { }; +export class BooksRouting { +} diff --git a/src/main/webapp/app/features/books/collection.page.spec.ts b/src/main/webapp/app/features/books/collection.page.spec.ts index 516ba652..a4f06592 100644 --- a/src/main/webapp/app/features/books/collection.page.spec.ts +++ b/src/main/webapp/app/features/books/collection.page.spec.ts @@ -2,14 +2,13 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { Store, StoreModule } from '@ngrx/store'; -import { By } from '@angular/platform-browser'; import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; import * as fromRoot from '../../core/store'; +import { metaReducers, reducers } from '../../core/store'; import { GreatBigExampleApplicationSharedModule } from '../../shared/shared.module'; import { CollectionPage } from './collection.page'; import { GreatBigExampleApplicationTestModule } from '../../../mocks/test.module'; -import { reducers, metaReducers, developmentReducerFactory } from '../../core/store'; describe('CollectionPage', () => { let component: CollectionPage; diff --git a/src/main/webapp/app/features/books/collection.page.ts b/src/main/webapp/app/features/books/collection.page.ts index c35b40a5..5cb8f3d2 100644 --- a/src/main/webapp/app/features/books/collection.page.ts +++ b/src/main/webapp/app/features/books/collection.page.ts @@ -1,4 +1,4 @@ -import { Component, ChangeDetectionStrategy } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs/Observable'; diff --git a/src/main/webapp/app/features/books/find-book.page.ts b/src/main/webapp/app/features/books/find-book.page.ts index f1cd1610..ede91b35 100644 --- a/src/main/webapp/app/features/books/find-book.page.ts +++ b/src/main/webapp/app/features/books/find-book.page.ts @@ -1,4 +1,4 @@ -import { Component, ChangeDetectionStrategy } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs/Observable'; diff --git a/src/main/webapp/app/features/books/selected-book.page.ts b/src/main/webapp/app/features/books/selected-book.page.ts index 8aa73d7f..828ff555 100644 --- a/src/main/webapp/app/features/books/selected-book.page.ts +++ b/src/main/webapp/app/features/books/selected-book.page.ts @@ -1,4 +1,4 @@ -import { Component, ChangeDetectionStrategy } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs/Observable'; diff --git a/src/main/webapp/app/features/books/services/book-exists.guard.ts b/src/main/webapp/app/features/books/services/book-exists.guard.ts index e0aa9aa0..c079dc70 100644 --- a/src/main/webapp/app/features/books/services/book-exists.guard.ts +++ b/src/main/webapp/app/features/books/services/book-exists.guard.ts @@ -3,7 +3,7 @@ import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; -import { Router, CanActivate, ActivatedRouteSnapshot } from '@angular/router'; +import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'; import { Observable } from 'rxjs/Observable'; import { of } from 'rxjs/observable/of'; import { GoogleBooksService } from './google-books.service'; diff --git a/src/main/webapp/app/features/books/view-book.page.ts b/src/main/webapp/app/features/books/view-book.page.ts index a5e46311..7ed639dd 100644 --- a/src/main/webapp/app/features/books/view-book.page.ts +++ b/src/main/webapp/app/features/books/view-book.page.ts @@ -1,4 +1,4 @@ -import { Component, OnDestroy, ChangeDetectionStrategy } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnDestroy } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Store } from '@ngrx/store'; import { Subscription } from 'rxjs/Subscription'; diff --git a/src/main/webapp/app/features/chat/chat.module.ts b/src/main/webapp/app/features/chat/chat.module.ts index f2e4250b..640a97cb 100644 --- a/src/main/webapp/app/features/chat/chat.module.ts +++ b/src/main/webapp/app/features/chat/chat.module.ts @@ -1,5 +1,4 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { GreatBigExampleApplicationSharedModule } from '../../shared/shared.module'; diff --git a/src/main/webapp/app/features/chat/chat.page.ts b/src/main/webapp/app/features/chat/chat.page.ts index e0fb6b5f..33b522dd 100644 --- a/src/main/webapp/app/features/chat/chat.page.ts +++ b/src/main/webapp/app/features/chat/chat.page.ts @@ -1,7 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { JhiEventManager } from 'ng-jhipster'; -import { Observable } from 'rxjs/Observable'; import { Store } from '@ngrx/store'; import * as fromRoot from '../../core/store'; diff --git a/src/main/webapp/app/features/chat/services/chat.service.ts b/src/main/webapp/app/features/chat/services/chat.service.ts index 1dac985c..d7913df6 100644 --- a/src/main/webapp/app/features/chat/services/chat.service.ts +++ b/src/main/webapp/app/features/chat/services/chat.service.ts @@ -1,5 +1,5 @@ -import { Injectable, Inject } from '@angular/core'; -import { Router, NavigationEnd } from '@angular/router'; +import { Injectable } from '@angular/core'; +import { Router } from '@angular/router'; import { Observable } from 'rxjs/Observable'; import { Observer } from 'rxjs/Observer'; import { Subscription } from 'rxjs/Subscription'; diff --git a/src/main/webapp/app/features/contact/contact.page.spec.ts b/src/main/webapp/app/features/contact/contact.page.spec.ts index 0660e0fb..43e8b67c 100644 --- a/src/main/webapp/app/features/contact/contact.page.spec.ts +++ b/src/main/webapp/app/features/contact/contact.page.spec.ts @@ -2,18 +2,16 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { Store, StoreModule } from '@ngrx/store'; -import { By } from '@angular/platform-browser'; import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { LocalStorageService, SessionStorageService } from 'ng2-webstorage'; import { GreatBigExampleApplicationTestModule } from '../../../mocks/test.module'; import * as fromRoot from '../../core/store'; +import { metaReducers, reducers } from '../../core/store'; import { GreatBigExampleApplicationSharedModule } from '../../shared/shared.module'; import { ContactPage } from './contact.page'; import { CoreModule } from '../../core/core.module'; -import { customHttpProvider } from '../../core/interceptor/http.provider'; -import { reducers, metaReducers, developmentReducerFactory } from '../../core/store'; describe('ContactPage', () => { let component: ContactPage; diff --git a/src/main/webapp/app/features/contact/contact.page.ts b/src/main/webapp/app/features/contact/contact.page.ts index 2a6671df..732bddd9 100755 --- a/src/main/webapp/app/features/contact/contact.page.ts +++ b/src/main/webapp/app/features/contact/contact.page.ts @@ -1,4 +1,4 @@ -import { Component, ChangeDetectionStrategy, OnInit, OnDestroy } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs/Observable'; import { Subscription } from 'rxjs/Subscription'; @@ -9,7 +9,6 @@ import { Contact } from '../../core/store/contact/contact.model'; import { User } from '../../core/store/user/user.model'; import * as EntityActions from '../../core/store/entity/entity.actions'; import { slices } from '../../core/store/util'; -import { Entities } from '../../core/store/entity/entity.model'; import { Account, Principal } from '../../shared'; @Component({ diff --git a/src/main/webapp/app/features/counter/counter.component.ts b/src/main/webapp/app/features/counter/counter.component.ts index d7e95327..9012f91b 100644 --- a/src/main/webapp/app/features/counter/counter.component.ts +++ b/src/main/webapp/app/features/counter/counter.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, Output, EventEmitter } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; @Component({ selector: 'jhi-counter', diff --git a/src/main/webapp/app/features/counter/counter.page.ts b/src/main/webapp/app/features/counter/counter.page.ts index 3174852f..b60df64f 100644 --- a/src/main/webapp/app/features/counter/counter.page.ts +++ b/src/main/webapp/app/features/counter/counter.page.ts @@ -1,9 +1,8 @@ -import { Component, ChangeDetectionStrategy } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs/Observable'; import * as fromRoot from '../../core/store'; -import { Counter } from '../../core/store/counter/counter.model'; import { slices } from '../../core/store/util'; import * as SliceActions from '../../core/store/slice/slice.actions'; diff --git a/src/main/webapp/app/features/dashboard/dashboard.module.ts b/src/main/webapp/app/features/dashboard/dashboard.module.ts index 61721a4d..c061fb6e 100644 --- a/src/main/webapp/app/features/dashboard/dashboard.module.ts +++ b/src/main/webapp/app/features/dashboard/dashboard.module.ts @@ -1,12 +1,7 @@ import { NgModule } from '@angular/core'; -import { Http } from '@angular/http'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { NgaModule } from '../../shared/nga.module'; -import { TranslateModule, TranslateLoader, TranslateParser, MissingTranslationHandler } from '@ngx-translate/core'; -import { TranslateHttpLoader, } from '@ngx-translate/http-loader'; -import { translatePartialLoader, missingTranslationHandler } from 'ng-jhipster'; -import { JhiConfigService } from 'ng-jhipster/src/config.service'; import { DashboardPage } from './dashboard.page'; import { DashboardRouting } from './dashboard.routing'; diff --git a/src/main/webapp/app/features/dashboard/pie-chart/pie-chart.component.ts b/src/main/webapp/app/features/dashboard/pie-chart/pie-chart.component.ts index 8b0c65b6..101dc897 100644 --- a/src/main/webapp/app/features/dashboard/pie-chart/pie-chart.component.ts +++ b/src/main/webapp/app/features/dashboard/pie-chart/pie-chart.component.ts @@ -1,4 +1,4 @@ -import { Component, AfterViewInit } from '@angular/core'; +import { AfterViewInit, Component } from '@angular/core'; import 'easy-pie-chart/dist/jquery.easypiechart.js'; import { PieChartService } from './pie-chart.service'; diff --git a/src/main/webapp/app/features/dashboard/pie-chart/pie-chart.service.ts b/src/main/webapp/app/features/dashboard/pie-chart/pie-chart.service.ts index a93ebf43..2b59020a 100644 --- a/src/main/webapp/app/features/dashboard/pie-chart/pie-chart.service.ts +++ b/src/main/webapp/app/features/dashboard/pie-chart/pie-chart.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { BaThemeConfigProvider, ColorHelper } from '../../../shared/theme'; +import { BaThemeConfigProvider } from '../../../shared/theme'; @Injectable() export class PieChartService { diff --git a/src/main/webapp/app/features/dashboard/todo/todo.service.ts b/src/main/webapp/app/features/dashboard/todo/todo.service.ts index b6b050f7..feab86c8 100644 --- a/src/main/webapp/app/features/dashboard/todo/todo.service.ts +++ b/src/main/webapp/app/features/dashboard/todo/todo.service.ts @@ -1,4 +1,4 @@ -import {Injectable} from '@angular/core'; +import { Injectable } from '@angular/core'; @Injectable() export class TodoService { diff --git a/src/main/webapp/app/features/dashboard/traffic-chart/traffic-chart.component.ts b/src/main/webapp/app/features/dashboard/traffic-chart/traffic-chart.component.ts index ab552ac4..73f58b3e 100644 --- a/src/main/webapp/app/features/dashboard/traffic-chart/traffic-chart.component.ts +++ b/src/main/webapp/app/features/dashboard/traffic-chart/traffic-chart.component.ts @@ -1,4 +1,4 @@ -import { Component, AfterViewInit } from '@angular/core'; +import { AfterViewInit, Component } from '@angular/core'; import { TrafficChartService } from './traffic-chart.service'; import * as Chart from 'chart.js'; diff --git a/src/main/webapp/app/features/features.component.ts b/src/main/webapp/app/features/features.component.ts index 61647c93..e8fe196d 100644 --- a/src/main/webapp/app/features/features.component.ts +++ b/src/main/webapp/app/features/features.component.ts @@ -1,21 +1,9 @@ -import { - Component, - OnInit, - OnDestroy, - AfterViewInit, - ViewChild, - Input, - ChangeDetectorRef, - Renderer, - ElementRef -} from '@angular/core'; +import { AfterViewInit, Component, ElementRef, OnDestroy, OnInit, Renderer, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { MdSidenav } from '@angular/material'; import { FeatureMeta, FeaturesService } from './features.service'; -import { Http, Response } from '@angular/http'; -import { Subscription } from 'rxjs/Subscription'; -import { Observable } from 'rxjs/Observable'; +import { Http } from '@angular/http'; @Component({ templateUrl: 'features.component.html', diff --git a/src/main/webapp/app/features/features.module.ts b/src/main/webapp/app/features/features.module.ts index b5c32254..6f92d6d5 100644 --- a/src/main/webapp/app/features/features.module.ts +++ b/src/main/webapp/app/features/features.module.ts @@ -1,13 +1,10 @@ -import { NgModule, ApplicationRef } from '@angular/core'; +import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { HttpModule } from '@angular/http'; -import { RouterModule } from '@angular/router'; import { MaterialModule } from '@angular/material'; import { FlexLayoutModule } from '@angular/flex-layout'; import { FeaturesRouting } from './features.routing'; import { FeaturesService } from './features.service'; -import { CoreModule } from '../core/core.module'; import { FeaturesComponent } from './features.component'; import { VersionService } from '../shared'; diff --git a/src/main/webapp/app/features/features.service.ts b/src/main/webapp/app/features/features.service.ts index 06a026db..8e917b95 100644 --- a/src/main/webapp/app/features/features.service.ts +++ b/src/main/webapp/app/features/features.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Http, Response } from '@angular/http'; import { features } from './features.meta'; export interface FeatureMeta { diff --git a/src/main/webapp/app/features/game/game.module.ts b/src/main/webapp/app/features/game/game.module.ts index a6763c3b..41fc22ca 100644 --- a/src/main/webapp/app/features/game/game.module.ts +++ b/src/main/webapp/app/features/game/game.module.ts @@ -1,11 +1,9 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { RouterModule } from '@angular/router'; import { APP_BASE_HREF, CommonModule } from '@angular/common'; import { NavbarComponent } from './navbar/navbar.component'; -import { TimerComponent } from './shared/timer/timer.component'; import { ToolbarComponent } from './toolbar/toolbar.component'; import { GameFacade } from '../../core/store/game/game.facade'; import { RestfulGateway } from '../../core/gateways/restful.gateway'; diff --git a/src/main/webapp/app/features/game/home/home.component.ts b/src/main/webapp/app/features/game/home/home.component.ts index 667826d9..7b41b744 100644 --- a/src/main/webapp/app/features/game/home/home.component.ts +++ b/src/main/webapp/app/features/game/home/home.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { Router, ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { GameFacade } from '../../../core/store/game/game.facade'; import { RoomConfig } from '../../../core/gateways/webrtc.gateway'; diff --git a/src/main/webapp/app/features/game/multi-player/multi-player.component.ts b/src/main/webapp/app/features/game/multi-player/multi-player.component.ts index b2613116..e3ce8e0e 100644 --- a/src/main/webapp/app/features/game/multi-player/multi-player.component.ts +++ b/src/main/webapp/app/features/game/multi-player/multi-player.component.ts @@ -1,13 +1,11 @@ /* tslint:disable:no-unused-variable */ -import { Component, Provider, ViewChild, NgZone } from '@angular/core'; +import { Component, NgZone, Provider, ViewChild } from '@angular/core'; import { BaseGateway } from '../../../core/gateways/base.gateway'; import { WebRTCGateway } from '../../../core/gateways/webrtc.gateway'; import { WebSocketGateway, WebSocketGatewayConfig, WS_CONFIG } from '../../../core/gateways/websocket.gateway'; import { GAME_TEXT } from '../config/config'; -import * as constants from '../../../app.constants'; import { GameComponent } from '../shared/game/game.component'; -import { AppConfig } from '../../../app.config'; import { BaseAsyncService } from '../../../core/services/base.async-service'; import { GameFacade } from '../../../core/store/game/game.facade'; import { P2PGameFacade } from '../../../core/store/p2p-game/p2p-game.facade'; diff --git a/src/main/webapp/app/features/game/multi-player/multi-player.module.ts b/src/main/webapp/app/features/game/multi-player/multi-player.module.ts index a0ae284c..43944e0a 100644 --- a/src/main/webapp/app/features/game/multi-player/multi-player.module.ts +++ b/src/main/webapp/app/features/game/multi-player/multi-player.module.ts @@ -3,11 +3,10 @@ import { NgModule } from '@angular/core'; import { MultiPlayerComponent } from './multi-player.component'; import { P2PGameFacade } from '../../../core/store/p2p-game/p2p-game.facade'; -import { WebRTCGateway } from '../../../core/gateways/webrtc.gateway'; +import { RoomConfig, WebRTCGateway } from '../../../core/gateways/webrtc.gateway'; import { WebSocketGateway } from '../../../core/gateways/websocket.gateway'; import { GameSharedModule } from '../shared/shared.module'; -import { RoomConfig } from '../../../core/gateways/webrtc.gateway'; @NgModule({ imports: [GameSharedModule], diff --git a/src/main/webapp/app/features/game/multi-player/services/command-builders/game-p2p.command-builder.ts b/src/main/webapp/app/features/game/multi-player/services/command-builders/game-p2p.command-builder.ts index a8c83b62..b9cd850a 100644 --- a/src/main/webapp/app/features/game/multi-player/services/command-builders/game-p2p.command-builder.ts +++ b/src/main/webapp/app/features/game/multi-player/services/command-builders/game-p2p.command-builder.ts @@ -1,4 +1,4 @@ -import { PROGRESS, COMPLETE } from './game-p2p.commands'; +import { COMPLETE, PROGRESS } from './game-p2p.commands'; import { RPCCommand } from '../../../../../core/commands/rpc.command'; export const gameProgress = (payload: any, baseCommand: RPCCommand) => { diff --git a/src/main/webapp/app/features/game/multi-player/services/game-p2p.async-service.ts b/src/main/webapp/app/features/game/multi-player/services/game-p2p.async-service.ts index 7994e4f9..4ab7885b 100644 --- a/src/main/webapp/app/features/game/multi-player/services/game-p2p.async-service.ts +++ b/src/main/webapp/app/features/game/multi-player/services/game-p2p.async-service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; -import { Store, Action } from '@ngrx/store'; +import { Action, Store } from '@ngrx/store'; import { Observable } from 'rxjs/Observable'; import { Observer } from 'rxjs/Observer'; import { buildP2PCommand } from './index'; -import { PROGRESS, COMPLETE } from './command-builders/game-p2p.commands'; +import { COMPLETE, PROGRESS } from './command-builders/game-p2p.commands'; import { WebRTCGateway } from '../../../../core/gateways/webrtc.gateway'; import { BaseAsyncService } from '../../../../core/services/base.async-service'; import { RPCCommand } from '../../../../core/commands/rpc.command'; diff --git a/src/main/webapp/app/features/game/multi-player/services/index.ts b/src/main/webapp/app/features/game/multi-player/services/index.ts index d3f93def..0725598c 100644 --- a/src/main/webapp/app/features/game/multi-player/services/index.ts +++ b/src/main/webapp/app/features/game/multi-player/services/index.ts @@ -1,8 +1,8 @@ import { PayloadAction } from '../../../../core/store/util'; -import { gameProgress, gameComplete } from './command-builders/game-p2p.command-builder'; +import { gameComplete, gameProgress } from './command-builders/game-p2p.command-builder'; import { RPCCommand } from '../../../../core/commands/rpc.command'; -import { GAME_PROGRESS, COMPLETE_GAME } from '../../../../core/store/game/game.actions'; +import { COMPLETE_GAME, GAME_PROGRESS } from '../../../../core/store/game/game.actions'; const builders = new Map(); diff --git a/src/main/webapp/app/features/game/shared/game/game.component.ts b/src/main/webapp/app/features/game/shared/game/game.component.ts index 6ddd1a11..cb127a57 100644 --- a/src/main/webapp/app/features/game/shared/game/game.component.ts +++ b/src/main/webapp/app/features/game/shared/game/game.component.ts @@ -1,7 +1,4 @@ -import { - Component, Renderer, Input, ViewChild, ElementRef, Output, EventEmitter, - AfterViewInit -} from '@angular/core'; +import { AfterViewInit, Component, ElementRef, EventEmitter, Input, Output, Renderer, ViewChild } from '@angular/core'; import { TimerComponent } from '../timer/timer.component'; import { GameFacade } from '../../../../core/store/game/game.facade'; diff --git a/src/main/webapp/app/features/heroes/crisis-center/crisis-detail/crisis-detail.component.ts b/src/main/webapp/app/features/heroes/crisis-center/crisis-detail/crisis-detail.component.ts index 072d9b5b..6c479ce7 100755 --- a/src/main/webapp/app/features/heroes/crisis-center/crisis-detail/crisis-detail.component.ts +++ b/src/main/webapp/app/features/heroes/crisis-center/crisis-detail/crisis-detail.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, HostBinding } from '@angular/core'; +import { Component, HostBinding, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { Store } from '@ngrx/store'; diff --git a/src/main/webapp/app/features/heroes/crisis-center/crisis-detail/crisis-detail.resolver.ts b/src/main/webapp/app/features/heroes/crisis-center/crisis-detail/crisis-detail.resolver.ts index 9c38496e..a5840904 100755 --- a/src/main/webapp/app/features/heroes/crisis-center/crisis-detail/crisis-detail.resolver.ts +++ b/src/main/webapp/app/features/heroes/crisis-center/crisis-detail/crisis-detail.resolver.ts @@ -1,12 +1,8 @@ import { Injectable } from '@angular/core'; -import { - Router, Resolve, RouterStateSnapshot, - ActivatedRouteSnapshot -} from '@angular/router'; +import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router'; import { RESTService } from '../../../../core/services/rest.service'; import { Crisis } from '../../../../core/store/crisis/crisis.model'; -import { slices } from '../../../../core/store/util'; @Injectable() export class CrisisDetailResolver implements Resolve { diff --git a/src/main/webapp/app/features/heroes/crisis-center/crisis-list/crisis-list.component.ts b/src/main/webapp/app/features/heroes/crisis-center/crisis-list/crisis-list.component.ts index 6f4b8298..5649321e 100755 --- a/src/main/webapp/app/features/heroes/crisis-center/crisis-list/crisis-list.component.ts +++ b/src/main/webapp/app/features/heroes/crisis-center/crisis-list/crisis-list.component.ts @@ -1,6 +1,5 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { Router, ActivatedRoute, Params } from '@angular/router'; -import { Location } from '@angular/common'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute, Params, Router } from '@angular/router'; import { Observable } from 'rxjs/Observable'; import { Subscription } from 'rxjs/Subscription'; import { Store } from '@ngrx/store'; diff --git a/src/main/webapp/app/features/heroes/dashboard/dashboard.component.ts b/src/main/webapp/app/features/heroes/dashboard/dashboard.component.ts index 23262e8a..4ede06a3 100755 --- a/src/main/webapp/app/features/heroes/dashboard/dashboard.component.ts +++ b/src/main/webapp/app/features/heroes/dashboard/dashboard.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { Observable } from 'rxjs/Observable'; import { Subscription } from 'rxjs/Subscription'; diff --git a/src/main/webapp/app/features/heroes/dashboard/dashboard.module.ts b/src/main/webapp/app/features/heroes/dashboard/dashboard.module.ts index cd54cb0d..b7bf7065 100755 --- a/src/main/webapp/app/features/heroes/dashboard/dashboard.module.ts +++ b/src/main/webapp/app/features/heroes/dashboard/dashboard.module.ts @@ -1,12 +1,9 @@ import { NgModule } from '@angular/core'; - // Imports for loading & configuring the in-memory web api -import { InMemoryWebApiModule } from 'angular-in-memory-web-api'; -import { InMemoryDataService } from '../../../core/services/in-memory-data.service'; import { HeroSearchComponent } from './hero-search/hero-search.component'; import { GreatBigExampleApplicationSharedModule } from '../../../shared/shared.module'; -import { routedComponents, DashboardRouting } from './dashboard.routing'; +import { DashboardRouting, routedComponents } from './dashboard.routing'; import { DashboardHeroComponent } from './dashboard-hero/dashboard-hero.component'; import { DashboardCrisisComponent } from './dashboard-crisis/dashboard-crisis.component'; diff --git a/src/main/webapp/app/features/heroes/dashboard/hero-search/hero-search.component.ts b/src/main/webapp/app/features/heroes/dashboard/hero-search/hero-search.component.ts index 394a055c..9a0df2c8 100755 --- a/src/main/webapp/app/features/heroes/dashboard/hero-search/hero-search.component.ts +++ b/src/main/webapp/app/features/heroes/dashboard/hero-search/hero-search.component.ts @@ -1,12 +1,10 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { Store } from '@ngrx/store'; -import { Observable } from 'rxjs/Observable'; import { Subject } from 'rxjs/Subject'; import { Subscription } from 'rxjs/Subscription'; - import { Hero } from '../../../../core/store/hero/hero.model'; import * as fromRoot from '../../../../core/store'; import { slices } from '../../../../core/store/util'; diff --git a/src/main/webapp/app/features/heroes/hero/hero-detail/hero-detail.component.ts b/src/main/webapp/app/features/heroes/hero/hero-detail/hero-detail.component.ts index 305ea1bc..620574a9 100755 --- a/src/main/webapp/app/features/heroes/hero/hero-detail/hero-detail.component.ts +++ b/src/main/webapp/app/features/heroes/hero/hero-detail/hero-detail.component.ts @@ -1,5 +1,5 @@ -import { Component, OnInit, HostBinding, OnDestroy } from '@angular/core'; -import { Router, ActivatedRoute, Params } from '@angular/router'; +import { Component, HostBinding, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute, Params, Router } from '@angular/router'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs/Observable'; import { Subscription } from 'rxjs/Subscription'; diff --git a/src/main/webapp/app/features/heroes/hero/hero-list/hero-list.component.ts b/src/main/webapp/app/features/heroes/hero/hero-list/hero-list.component.ts index d5e82e26..cbe27f72 100755 --- a/src/main/webapp/app/features/heroes/hero/hero-list/hero-list.component.ts +++ b/src/main/webapp/app/features/heroes/hero/hero-list/hero-list.component.ts @@ -1,5 +1,5 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { Router, ActivatedRoute, Params } from '@angular/router'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ActivatedRoute, Params, Router } from '@angular/router'; import { Location } from '@angular/common'; import { Observable } from 'rxjs/Observable'; import { Subscription } from 'rxjs/Subscription'; diff --git a/src/main/webapp/app/features/heroes/hero/hero.module.ts b/src/main/webapp/app/features/heroes/hero/hero.module.ts index 10aa2005..efc9e786 100755 --- a/src/main/webapp/app/features/heroes/hero/hero.module.ts +++ b/src/main/webapp/app/features/heroes/hero/hero.module.ts @@ -1,9 +1,8 @@ import { NgModule } from '@angular/core'; -import { EffectsModule } from '@ngrx/effects'; import { NgPipesModule } from 'ngx-pipes'; import { GreatBigExampleApplicationSharedModule } from '../../../shared/shared.module'; -import { routedComponents, HeroRouting } from './hero.routing'; +import { HeroRouting, routedComponents } from './hero.routing'; @NgModule({ imports: [ diff --git a/src/main/webapp/app/features/heroes/heroes.module.ts b/src/main/webapp/app/features/heroes/heroes.module.ts index 6cf20b56..5640480a 100644 --- a/src/main/webapp/app/features/heroes/heroes.module.ts +++ b/src/main/webapp/app/features/heroes/heroes.module.ts @@ -6,7 +6,6 @@ import { EffectsModule } from '@ngrx/effects'; import { GreatBigExampleApplicationSharedModule } from '../../shared/shared.module'; import { HeroesRouting } from './heroes.routing'; import { TwainService } from '../../shared/twain/twain.service'; -import { WelcomeComponent } from '../../shared/welcome/welcome.component'; import { UserService } from '../../core/services/user.service'; import { HeroesPage } from './heroes.page'; import { HeroModule } from './hero/hero.module'; diff --git a/src/main/webapp/app/features/heroes/heroes.page.ts b/src/main/webapp/app/features/heroes/heroes.page.ts index 50552e7e..30f02c1b 100644 --- a/src/main/webapp/app/features/heroes/heroes.page.ts +++ b/src/main/webapp/app/features/heroes/heroes.page.ts @@ -1,4 +1,5 @@ import { Component } from '@angular/core'; + @Component({ selector: 'jhi-heroes-page', styleUrls: ['./heroes.page.scss'], diff --git a/src/main/webapp/app/features/heroes/heroes.routing.ts b/src/main/webapp/app/features/heroes/heroes.routing.ts index 6d8ce827..46a2b2a4 100644 --- a/src/main/webapp/app/features/heroes/heroes.routing.ts +++ b/src/main/webapp/app/features/heroes/heroes.routing.ts @@ -1,6 +1,5 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; - // import { AuthGuard } from '../../core/services/auth.guard'; import { CanDeactivateGuard } from '../../shared/can-deactivate/can-deactivate.guard'; import { SelectivePreloadingStrategy } from '../../shared/selective-preloading-strategy'; diff --git a/src/main/webapp/app/features/home/home.module.ts b/src/main/webapp/app/features/home/home.module.ts index e85065e0..144c13bf 100644 --- a/src/main/webapp/app/features/home/home.module.ts +++ b/src/main/webapp/app/features/home/home.module.ts @@ -1,4 +1,4 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { GreatBigExampleApplicationSharedModule } from '../../shared'; diff --git a/src/main/webapp/app/features/legal/legal.component.spec.ts b/src/main/webapp/app/features/legal/legal.component.spec.ts index 8333864c..423d9448 100644 --- a/src/main/webapp/app/features/legal/legal.component.spec.ts +++ b/src/main/webapp/app/features/legal/legal.component.spec.ts @@ -1,7 +1,6 @@ /* tslint:disable:no-unused-variable */ -import { DebugElement, Injectable } from '@angular/core'; +import { Injectable } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; import { ActivatedRoute, Route } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; diff --git a/src/main/webapp/app/features/legal/legal.component.ts b/src/main/webapp/app/features/legal/legal.component.ts index 3a12aa56..30f2d541 100644 --- a/src/main/webapp/app/features/legal/legal.component.ts +++ b/src/main/webapp/app/features/legal/legal.component.ts @@ -1,8 +1,10 @@ /** * @module LegalModule - */ /** */ + */ +/** */ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; + /** * @whatItDoes Returns the {@link LegalComponent} view that provides basic legal information * such as terms of use, privacy policy, etc. diff --git a/src/main/webapp/app/features/legal/legal.module.ts b/src/main/webapp/app/features/legal/legal.module.ts index c0727b19..a08b3245 100644 --- a/src/main/webapp/app/features/legal/legal.module.ts +++ b/src/main/webapp/app/features/legal/legal.module.ts @@ -1,12 +1,14 @@ /** * @module LegalModule * @preferred - */ /** */ + */ +/** */ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { LegalComponent } from './legal.component'; import { LegalRouting } from './legal.routing'; + /** * @whatItDoes Lazy loaded feature module for legal pages. * @consumers @consumers {@link AppRoutingModule} (on demand) diff --git a/src/main/webapp/app/features/legal/legal.routing.ts b/src/main/webapp/app/features/legal/legal.routing.ts index 1a87bd98..261a52ec 100644 --- a/src/main/webapp/app/features/legal/legal.routing.ts +++ b/src/main/webapp/app/features/legal/legal.routing.ts @@ -1,10 +1,12 @@ /** * @module LegalModule - */ /** */ + */ +/** */ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { LegalComponent } from './legal.component'; + /** * Child routes for the lazy-loaded {@link LegalModule} */ diff --git a/src/main/webapp/app/features/meals/home/filter/filter-utilities.service.spec.ts b/src/main/webapp/app/features/meals/home/filter/filter-utilities.service.spec.ts index c72228f6..0aa55bd4 100644 --- a/src/main/webapp/app/features/meals/home/filter/filter-utilities.service.spec.ts +++ b/src/main/webapp/app/features/meals/home/filter/filter-utilities.service.spec.ts @@ -1,6 +1,6 @@ /* tslint:disable:no-unused-variable */ -import { TestBed, async, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { FilterUtilitiesService } from './filter-utilities.service'; describe('Service: FilterUtilities', () => { diff --git a/src/main/webapp/app/features/meals/home/filter/filter-utilities.service.ts b/src/main/webapp/app/features/meals/home/filter/filter-utilities.service.ts index e07661ef..26843772 100644 --- a/src/main/webapp/app/features/meals/home/filter/filter-utilities.service.ts +++ b/src/main/webapp/app/features/meals/home/filter/filter-utilities.service.ts @@ -1,7 +1,9 @@ /** * @module HomeModule - */ /** */ + */ +/** */ import { Injectable } from '@angular/core'; + /** * @whatItDoes Provides common utiliies for the {@link HomeModule} */ diff --git a/src/main/webapp/app/features/meals/home/filter/filter.component.spec.ts b/src/main/webapp/app/features/meals/home/filter/filter.component.spec.ts index 0b15817a..962a19be 100644 --- a/src/main/webapp/app/features/meals/home/filter/filter.component.spec.ts +++ b/src/main/webapp/app/features/meals/home/filter/filter.component.spec.ts @@ -1,8 +1,5 @@ /* tslint:disable:no-unused-variable */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement, Injectable } from '@angular/core'; -import { Subject } from 'rxjs/Subject'; import { FilterComponent } from './filter.component'; import { FilterUtilitiesService } from './filter-utilities.service'; diff --git a/src/main/webapp/app/features/meals/home/filter/filter.component.ts b/src/main/webapp/app/features/meals/home/filter/filter.component.ts index bb850208..cba5fa1b 100644 --- a/src/main/webapp/app/features/meals/home/filter/filter.component.ts +++ b/src/main/webapp/app/features/meals/home/filter/filter.component.ts @@ -1,6 +1,7 @@ /** * @module HomeModule - */ /** */ + */ +/** */ import { AfterViewInit, Component, @@ -17,6 +18,7 @@ import { Subscription } from 'rxjs/Subscription'; import { GlobalEventsService } from '../../../../core/global-events/global-events.service'; import { FilterItems } from './filter-options'; import { FilterUtilitiesService } from './filter-utilities.service'; + /** * @whatItDoes Returns a filter bar that filters recipes * @consumers {@link HomeComponent} diff --git a/src/main/webapp/app/features/meals/home/filter/filter.pipe.spec.ts b/src/main/webapp/app/features/meals/home/filter/filter.pipe.spec.ts index dbf0d4bc..30603fe5 100644 --- a/src/main/webapp/app/features/meals/home/filter/filter.pipe.spec.ts +++ b/src/main/webapp/app/features/meals/home/filter/filter.pipe.spec.ts @@ -1,12 +1,10 @@ /* tslint:disable:no-unused-variable */ -import { Component, Injectable, OnInit } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { FilterPipe } from './filter.pipe'; import { FilterUtilitiesService } from './filter-utilities.service'; import { MockApiData } from '../../../../core/api/mock-api-data.spec'; -import { GlobalEventsService } from '../../../../core/global-events/global-events.service'; -import { MockGlobalEventsService } from '../../../../core/global-events/mock-global-events.service.spec'; @Component({ template: `` diff --git a/src/main/webapp/app/features/meals/home/filter/filter.pipe.ts b/src/main/webapp/app/features/meals/home/filter/filter.pipe.ts index b7205421..f42faecf 100644 --- a/src/main/webapp/app/features/meals/home/filter/filter.pipe.ts +++ b/src/main/webapp/app/features/meals/home/filter/filter.pipe.ts @@ -1,10 +1,12 @@ /** * @module HomeModule - */ /** */ + */ +/** */ import { Pipe, PipeTransform } from '@angular/core'; import { FilterUtilitiesService } from './filter-utilities.service'; import { StopWords } from './stop-words'; + /** * Filters data */ diff --git a/src/main/webapp/app/features/meals/home/filter/remap.pipe.spec.broken.ts b/src/main/webapp/app/features/meals/home/filter/remap.pipe.spec.broken.ts index baaefe5f..ff816daf 100644 --- a/src/main/webapp/app/features/meals/home/filter/remap.pipe.spec.broken.ts +++ b/src/main/webapp/app/features/meals/home/filter/remap.pipe.spec.broken.ts @@ -1,6 +1,5 @@ /* tslint:disable:no-unused-variable */ -import { TestBed, async } from '@angular/core/testing'; import { RemapPipe } from './remap.pipe'; describe('Pipe: Remap', () => { diff --git a/src/main/webapp/app/features/meals/home/filter/remap.pipe.ts b/src/main/webapp/app/features/meals/home/filter/remap.pipe.ts index fba21c52..71c9909f 100644 --- a/src/main/webapp/app/features/meals/home/filter/remap.pipe.ts +++ b/src/main/webapp/app/features/meals/home/filter/remap.pipe.ts @@ -1,7 +1,9 @@ /** * @module HomeModule - */ /** */ + */ +/** */ import { Pipe, PipeTransform } from '@angular/core'; + /** * @whatItDoes Allows the reordering of an array in an `*ngFor` to effectively move the elements * into a different order without destroying and recreating the elements. diff --git a/src/main/webapp/app/features/meals/home/home.component.spec.ts b/src/main/webapp/app/features/meals/home/home.component.spec.ts index f91f0fa6..8d5b661b 100644 --- a/src/main/webapp/app/features/meals/home/home.component.spec.ts +++ b/src/main/webapp/app/features/meals/home/home.component.spec.ts @@ -1,13 +1,9 @@ /* tslint:disable:no-unused-variable */ -import { DebugElement, Injectable } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { Route, Router } from '@angular/router'; +import { Route } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { Subject } from 'rxjs/Subject'; -import { Observable } from 'rxjs/Observable'; -import { StoreModule, Store, StateObservable, combineReducers } from '@ngrx/store'; +import { StoreModule } from '@ngrx/store'; import { HomeComponent } from './home.component'; import { HomeModule } from './home.module'; diff --git a/src/main/webapp/app/features/meals/home/home.component.ts b/src/main/webapp/app/features/meals/home/home.component.ts index 2b694631..5e712592 100644 --- a/src/main/webapp/app/features/meals/home/home.component.ts +++ b/src/main/webapp/app/features/meals/home/home.component.ts @@ -1,12 +1,14 @@ /** * @module HomeModule - */ /** */ + */ +/** */ import { Component, ElementRef, Inject, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { Subscription } from 'rxjs/Subscription'; import { ApiService } from '../../../core/api/api.service'; import { StatusBarService } from '../../../layouts/status-bar/status-bar.service'; import { WatchHeightDirective } from '../shared/watch-height/watch-height.directive'; + /** * @whatItDoes Returns the {@link HomeComponent} view. * @consumers {@link HomeModule}, {@link HomeRouting} diff --git a/src/main/webapp/app/features/meals/home/home.module.ts b/src/main/webapp/app/features/meals/home/home.module.ts index 47ae7d6c..233e23f9 100644 --- a/src/main/webapp/app/features/meals/home/home.module.ts +++ b/src/main/webapp/app/features/meals/home/home.module.ts @@ -1,7 +1,8 @@ /** * @module HomeModule * @preferred - */ /** */ + */ +/** */ import { NgModule } from '@angular/core'; import { InfiniteScrollModule } from 'angular2-infinite-scroll'; @@ -15,6 +16,7 @@ import { LimitToPipe } from './limit-to.pipe'; import { RecipeAdComponent } from './recipe-ad/recipe-ad.component'; import { StickyScrollComponent } from './sticky-scroll/sticky-scroll.component'; import { MealsSharedModule } from '../shared/shared.module'; + /** * @whatItDoes Lazy loaded feature module for the home page. * @consumers {@link AppRoutingModule} (on demand) diff --git a/src/main/webapp/app/features/meals/home/home.routing.ts b/src/main/webapp/app/features/meals/home/home.routing.ts index 30a75612..091528b8 100644 --- a/src/main/webapp/app/features/meals/home/home.routing.ts +++ b/src/main/webapp/app/features/meals/home/home.routing.ts @@ -1,10 +1,12 @@ /** * @module HomeModule - */ /** */ + */ +/** */ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { HomeComponent } from './home.component'; + /** * Child routes for the lazy-loaded {@link HomeModule} */ diff --git a/src/main/webapp/app/features/meals/home/limit-to.pipe.spec.ts b/src/main/webapp/app/features/meals/home/limit-to.pipe.spec.ts index 70290dc4..ac5e0f85 100644 --- a/src/main/webapp/app/features/meals/home/limit-to.pipe.spec.ts +++ b/src/main/webapp/app/features/meals/home/limit-to.pipe.spec.ts @@ -1,6 +1,5 @@ /* tslint:disable:no-unused-variable */ -import { TestBed, async } from '@angular/core/testing'; import { LimitToPipe } from './limit-to.pipe'; describe('LimitToPipe', () => { diff --git a/src/main/webapp/app/features/meals/home/limit-to.pipe.ts b/src/main/webapp/app/features/meals/home/limit-to.pipe.ts index ec1785b1..fd5d7e28 100644 --- a/src/main/webapp/app/features/meals/home/limit-to.pipe.ts +++ b/src/main/webapp/app/features/meals/home/limit-to.pipe.ts @@ -1,7 +1,9 @@ /** * @module HomeModule - */ /** */ + */ +/** */ import { Pipe, PipeTransform } from '@angular/core'; + /** * @whatItDoes limits the given array to the first x items */ diff --git a/src/main/webapp/app/features/meals/home/recipe-ad/recipe-ad.component.ts b/src/main/webapp/app/features/meals/home/recipe-ad/recipe-ad.component.ts index 126b1a1f..aba71291 100644 --- a/src/main/webapp/app/features/meals/home/recipe-ad/recipe-ad.component.ts +++ b/src/main/webapp/app/features/meals/home/recipe-ad/recipe-ad.component.ts @@ -1,7 +1,9 @@ /** * @module HomeModule - */ /** */ + */ +/** */ import { Component, Input, OnInit } from '@angular/core'; + /** * @whatItDoes Displays a single recipe ad item. * @consumers {@link HomeModule} diff --git a/src/main/webapp/app/features/meals/home/sticky-scroll/sticky-scroll.component.spec.ts b/src/main/webapp/app/features/meals/home/sticky-scroll/sticky-scroll.component.spec.ts index bf71025b..08aa8db0 100644 --- a/src/main/webapp/app/features/meals/home/sticky-scroll/sticky-scroll.component.spec.ts +++ b/src/main/webapp/app/features/meals/home/sticky-scroll/sticky-scroll.component.spec.ts @@ -1,10 +1,8 @@ /* tslint:disable:no-unused-variable */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { Component, DebugElement, Injectable, ViewChild } from '@angular/core'; -import { Route, Router } from '@angular/router'; +import { Component, ViewChild } from '@angular/core'; +import { Route } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { Subject } from 'rxjs/Subject'; import { StickyScrollComponent } from './sticky-scroll.component'; import { GlobalEventsService } from '../../../../core/global-events/global-events.service'; diff --git a/src/main/webapp/app/features/meals/home/sticky-scroll/sticky-scroll.component.ts b/src/main/webapp/app/features/meals/home/sticky-scroll/sticky-scroll.component.ts index 012e1b05..c83770f4 100644 --- a/src/main/webapp/app/features/meals/home/sticky-scroll/sticky-scroll.component.ts +++ b/src/main/webapp/app/features/meals/home/sticky-scroll/sticky-scroll.component.ts @@ -1,6 +1,7 @@ /** * @module HomeModule - */ /** */ + */ +/** */ import { AfterViewInit, Component, @@ -15,6 +16,7 @@ import { import { StatusBarService } from '../../../../layouts/status-bar/status-bar.service'; import { GlobalEventsService } from '../../../../core/global-events/global-events.service'; + /** * @whatItDoes Sets the {@link positionContainer} fixed to top when it reaches the top while the * host {@link element} acts as a placeholder in the DOM diff --git a/src/main/webapp/app/features/meals/meals.module.ts b/src/main/webapp/app/features/meals/meals.module.ts index 46ea8326..5215c66d 100644 --- a/src/main/webapp/app/features/meals/meals.module.ts +++ b/src/main/webapp/app/features/meals/meals.module.ts @@ -1,9 +1,9 @@ /** * @module MealsModule * @preferred - */ /** */ + */ +/** */ import { NgModule } from '@angular/core'; -import { BrowserModule } from '@angular/platform-browser'; import { CommonModule } from '@angular/common'; import { MealsRouting } from './meals.routing'; diff --git a/src/main/webapp/app/features/meals/meals.routing.ts b/src/main/webapp/app/features/meals/meals.routing.ts index aacd0a7f..4e0ce719 100644 --- a/src/main/webapp/app/features/meals/meals.routing.ts +++ b/src/main/webapp/app/features/meals/meals.routing.ts @@ -1,8 +1,10 @@ /** * @module MealsModule - */ /** */ + */ +/** */ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; + /** * Parent routes for the {@link MealsRouting} */ diff --git a/src/main/webapp/app/features/meals/recipe/recipe.component.spec.broken.ts b/src/main/webapp/app/features/meals/recipe/recipe.component.spec.broken.ts index 3a259b58..a517e989 100644 --- a/src/main/webapp/app/features/meals/recipe/recipe.component.spec.broken.ts +++ b/src/main/webapp/app/features/meals/recipe/recipe.component.spec.broken.ts @@ -1,13 +1,10 @@ /* tslint:disable:no-unused-variable */ -import { Component, DebugElement, Injectable, Input } from '@angular/core'; +import { Injectable } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; import { MomentModule } from 'angular2-moment'; -import { Subject } from 'rxjs/Subject'; -import { Observable } from 'rxjs/Observable'; -import { StoreModule, Store, StateObservable, combineReducers } from '@ngrx/store'; +import { StoreModule } from '@ngrx/store'; import { RecipeComponent } from './recipe.component'; import { TimerButtonComponent } from '../recipe/timer-button/timer-button.component'; diff --git a/src/main/webapp/app/features/meals/recipe/recipe.component.ts b/src/main/webapp/app/features/meals/recipe/recipe.component.ts index b6537b20..26f821ca 100644 --- a/src/main/webapp/app/features/meals/recipe/recipe.component.ts +++ b/src/main/webapp/app/features/meals/recipe/recipe.component.ts @@ -1,6 +1,7 @@ /** * @module RecipeModule - */ /** */ + */ +/** */ import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; import { AfoObjectObservable } from 'angularfire2-offline'; @@ -8,6 +9,7 @@ import { Subscription } from 'rxjs/Subscription'; import { Recipe } from '../../../core/api/api-interfaces'; import { ApiService } from '../../../core/api/api.service'; + /** * @whatItDoes Returns the {@link RecipeComponent} view. * @consumers {@link RecipeModule}, {@link RecipeRouting} diff --git a/src/main/webapp/app/features/meals/recipe/recipe.module.ts b/src/main/webapp/app/features/meals/recipe/recipe.module.ts index fe366a43..2d24399e 100644 --- a/src/main/webapp/app/features/meals/recipe/recipe.module.ts +++ b/src/main/webapp/app/features/meals/recipe/recipe.module.ts @@ -1,7 +1,8 @@ /** * @module RecipeModule * @preferred - */ /** */ + */ +/** */ import { NgModule } from '@angular/core'; import { MomentModule } from 'angular2-moment'; @@ -9,6 +10,7 @@ import { RecipeComponent } from './recipe.component'; import { RecipeRouting } from './recipe.routing'; import { MealsSharedModule } from '../shared/shared.module'; import { TimerButtonComponent } from './timer-button/timer-button.component'; + /** * @whatItDoes Lazy loaded feature module for the recipe page. * @consumers {@link AppRoutingModule} (on demand) diff --git a/src/main/webapp/app/features/meals/recipe/recipe.routing.ts b/src/main/webapp/app/features/meals/recipe/recipe.routing.ts index 8c44b5dd..d4530208 100644 --- a/src/main/webapp/app/features/meals/recipe/recipe.routing.ts +++ b/src/main/webapp/app/features/meals/recipe/recipe.routing.ts @@ -1,10 +1,12 @@ /** * @module RecipeModule - */ /** */ + */ +/** */ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { RecipeComponent } from './recipe.component'; + /** * Child routes for the lazy-loaded {@link RecipeModule} */ diff --git a/src/main/webapp/app/features/meals/recipe/timer-button/timer-button.component.spec.ts b/src/main/webapp/app/features/meals/recipe/timer-button/timer-button.component.spec.ts index 16732e99..cba56774 100644 --- a/src/main/webapp/app/features/meals/recipe/timer-button/timer-button.component.spec.ts +++ b/src/main/webapp/app/features/meals/recipe/timer-button/timer-button.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; import { TimerButtonComponent } from './timer-button.component'; import { GreatBigExampleApplicationSharedModule } from '../../../../shared/shared.module'; diff --git a/src/main/webapp/app/features/meals/recipe/timer-button/timer-button.component.ts b/src/main/webapp/app/features/meals/recipe/timer-button/timer-button.component.ts index 0faef727..12b015aa 100644 --- a/src/main/webapp/app/features/meals/recipe/timer-button/timer-button.component.ts +++ b/src/main/webapp/app/features/meals/recipe/timer-button/timer-button.component.ts @@ -1,9 +1,11 @@ /** * @module RecipeModule - */ /** */ + */ +/** */ import { Component, Input, OnChanges, OnInit } from '@angular/core'; import { TimerService } from '../../timer/timer.service'; + /** * @whatItDoes creates a button to toggle the timer. */ diff --git a/src/main/webapp/app/features/meals/shared/ax-focus-fix/ax-focus-fix.directive.spec.ts b/src/main/webapp/app/features/meals/shared/ax-focus-fix/ax-focus-fix.directive.spec.ts index d63bbdbc..00a0e093 100644 --- a/src/main/webapp/app/features/meals/shared/ax-focus-fix/ax-focus-fix.directive.spec.ts +++ b/src/main/webapp/app/features/meals/shared/ax-focus-fix/ax-focus-fix.directive.spec.ts @@ -1,8 +1,7 @@ /* tslint:disable:no-unused-variable */ -import { Component, HostBinding, Injectable, ViewChild } from '@angular/core'; +import { Component, ViewChild } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { NavigationEnd, Router } from '@angular/router'; -import { Subject } from 'rxjs/Subject'; import { AxFocusFixDirective } from './ax-focus-fix.directive'; import { GlobalEventsService } from '../../../../core/global-events/global-events.service'; diff --git a/src/main/webapp/app/features/meals/shared/ax-focus-fix/ax-focus-fix.directive.ts b/src/main/webapp/app/features/meals/shared/ax-focus-fix/ax-focus-fix.directive.ts index e5b63ad7..6f96bf32 100644 --- a/src/main/webapp/app/features/meals/shared/ax-focus-fix/ax-focus-fix.directive.ts +++ b/src/main/webapp/app/features/meals/shared/ax-focus-fix/ax-focus-fix.directive.ts @@ -1,11 +1,13 @@ /** * @module SharedModule - */ /** */ + */ +/** */ import { Directive, ElementRef, HostBinding, Inject, OnDestroy, OnInit } from '@angular/core'; import { NavigationEnd, Router } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; import { GlobalEventsService } from '../../../../core/global-events/global-events.service'; + /** * @whatItDoes This makes the Chrome accesibility audit pass for * [AX_FOCUS_01](https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_focus_01). diff --git a/src/main/webapp/app/features/meals/shared/button-clear/button-clear.component.spec.ts b/src/main/webapp/app/features/meals/shared/button-clear/button-clear.component.spec.ts index a5e00886..711ba8f1 100644 --- a/src/main/webapp/app/features/meals/shared/button-clear/button-clear.component.spec.ts +++ b/src/main/webapp/app/features/meals/shared/button-clear/button-clear.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ -import { DebugElement } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; import { ButtonClearComponent } from '../../shared/button-clear/button-clear.component'; diff --git a/src/main/webapp/app/features/meals/shared/button-clear/button-clear.component.ts b/src/main/webapp/app/features/meals/shared/button-clear/button-clear.component.ts index 4c0ba25f..3525bd0a 100644 --- a/src/main/webapp/app/features/meals/shared/button-clear/button-clear.component.ts +++ b/src/main/webapp/app/features/meals/shared/button-clear/button-clear.component.ts @@ -1,7 +1,9 @@ /** * @module SharedModule - */ /** */ + */ +/** */ import { Component, Input } from '@angular/core'; + /** * @whatItDoes Wraps conntent in a `button` element with minimal styling. */ diff --git a/src/main/webapp/app/features/meals/shared/labels/labels.component.spec.ts b/src/main/webapp/app/features/meals/shared/labels/labels.component.spec.ts index 4ac5f805..7bea6337 100644 --- a/src/main/webapp/app/features/meals/shared/labels/labels.component.spec.ts +++ b/src/main/webapp/app/features/meals/shared/labels/labels.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; import { LabelsComponent } from '../../shared/labels/labels.component'; diff --git a/src/main/webapp/app/features/meals/shared/labels/labels.component.ts b/src/main/webapp/app/features/meals/shared/labels/labels.component.ts index 6fe8ace3..3ebd2099 100644 --- a/src/main/webapp/app/features/meals/shared/labels/labels.component.ts +++ b/src/main/webapp/app/features/meals/shared/labels/labels.component.ts @@ -1,7 +1,9 @@ /** * @module SharedModule - */ /** */ + */ +/** */ import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core'; + /** * @whatItDoes Creates up to 6 labels with a circular design. * @consumers {@link HomeModule} diff --git a/src/main/webapp/app/features/meals/shared/shared.module.ts b/src/main/webapp/app/features/meals/shared/shared.module.ts index bf336668..37c0e785 100644 --- a/src/main/webapp/app/features/meals/shared/shared.module.ts +++ b/src/main/webapp/app/features/meals/shared/shared.module.ts @@ -1,7 +1,8 @@ /** * @module SharedModule * @preferred - */ /** */ + */ +/** */ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; @@ -12,7 +13,6 @@ import { UiModule } from '../../../shared/ui/ui.module'; import { WatchHeightDirective } from './watch-height/watch-height.directive'; import { GreatBigExampleApplicationSharedModule } from '../../../shared/shared.module'; import { ImageCoverComponent } from '../../../shared/image-cover/image-cover.component'; -import { StatusBarComponent } from '../../../layouts/status-bar/status-bar.component'; /** * @whatItDoes {@link SharedModule} exists to hold the common components, directives, and pipes diff --git a/src/main/webapp/app/features/meals/shared/watch-height/watch-height.directive.spec.ts b/src/main/webapp/app/features/meals/shared/watch-height/watch-height.directive.spec.ts index 05d22c2f..e98e3ac9 100644 --- a/src/main/webapp/app/features/meals/shared/watch-height/watch-height.directive.spec.ts +++ b/src/main/webapp/app/features/meals/shared/watch-height/watch-height.directive.spec.ts @@ -1,7 +1,6 @@ /* tslint:disable:no-unused-variable */ -import { Component, Injectable } from '@angular/core'; +import { Component } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { Subject } from 'rxjs/Subject'; import { GlobalEventsService } from '../../../../core/global-events/global-events.service'; import { MockGlobalEventsService } from '../../../../core/global-events/mock-global-events.service.spec'; diff --git a/src/main/webapp/app/features/meals/shared/watch-height/watch-height.directive.ts b/src/main/webapp/app/features/meals/shared/watch-height/watch-height.directive.ts index 2c52b937..cd90fde1 100644 --- a/src/main/webapp/app/features/meals/shared/watch-height/watch-height.directive.ts +++ b/src/main/webapp/app/features/meals/shared/watch-height/watch-height.directive.ts @@ -1,18 +1,12 @@ /** * @module CoreModule - */ /** */ -import { - AfterViewInit, - Directive, - ElementRef, - EventEmitter, - OnDestroy, - OnInit, - Output -} from '@angular/core'; + */ +/** */ +import { AfterViewInit, Directive, ElementRef, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core'; import { Subscription } from 'rxjs/Subscription'; import { GlobalEventsService } from '../../../../core/global-events/global-events.service'; + /** * Emits the host's height `OnInit` and when the window resizes. */ diff --git a/src/main/webapp/app/features/meals/timer/timer.component.spec.ts b/src/main/webapp/app/features/meals/timer/timer.component.spec.ts index ab3d17a0..95e863c1 100644 --- a/src/main/webapp/app/features/meals/timer/timer.component.spec.ts +++ b/src/main/webapp/app/features/meals/timer/timer.component.spec.ts @@ -1,8 +1,6 @@ /* tslint:disable:no-unused-variable */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; -import { Route, Router } from '@angular/router'; +import { Route } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { TimerComponent } from './timer.component'; diff --git a/src/main/webapp/app/features/meals/timer/timer.component.ts b/src/main/webapp/app/features/meals/timer/timer.component.ts index 8dc2fd38..507dc2fa 100644 --- a/src/main/webapp/app/features/meals/timer/timer.component.ts +++ b/src/main/webapp/app/features/meals/timer/timer.component.ts @@ -1,9 +1,11 @@ /** * @module CoreModule - */ /** */ + */ +/** */ import { Component } from '@angular/core'; import { TimerService } from './timer.service'; + /** * @whatItDoes Provides a timer for the user to set when their current recipe item will complete. * diff --git a/src/main/webapp/app/features/meals/timer/timer.service.spec.ts b/src/main/webapp/app/features/meals/timer/timer.service.spec.ts index b997d684..e6bb16b3 100644 --- a/src/main/webapp/app/features/meals/timer/timer.service.spec.ts +++ b/src/main/webapp/app/features/meals/timer/timer.service.spec.ts @@ -1,6 +1,6 @@ /* tslint:disable:no-unused-variable */ -import { TestBed, async, inject } from '@angular/core/testing'; +import { inject, TestBed } from '@angular/core/testing'; import { PushNotificationsService } from 'angular2-notifications'; import { TimerService } from './timer.service'; diff --git a/src/main/webapp/app/features/meals/timer/timer.service.ts b/src/main/webapp/app/features/meals/timer/timer.service.ts index 3506add6..2c198c8c 100644 --- a/src/main/webapp/app/features/meals/timer/timer.service.ts +++ b/src/main/webapp/app/features/meals/timer/timer.service.ts @@ -1,10 +1,12 @@ /** * @module CoreModule - */ /** */ + */ +/** */ import { Injectable } from '@angular/core'; import { PushNotificationsService } from 'angular2-notifications'; import { StatusBarService } from '../../../layouts/status-bar/status-bar.service'; + /** * @whatItDoes tracks the current status of the time and pushes needed notifications of timer state * to timer related components. diff --git a/src/main/webapp/app/features/messages/messages.module.ts b/src/main/webapp/app/features/messages/messages.module.ts index f09d5a40..2c5be75a 100644 --- a/src/main/webapp/app/features/messages/messages.module.ts +++ b/src/main/webapp/app/features/messages/messages.module.ts @@ -1,7 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; -import { RouterModule } from '@angular/router'; import { MessagesRouting } from './messages.routing'; import { MaterialModule } from '@angular/material'; diff --git a/src/main/webapp/app/features/messages/messages.page.ts b/src/main/webapp/app/features/messages/messages.page.ts index cb04f65e..42b1538b 100644 --- a/src/main/webapp/app/features/messages/messages.page.ts +++ b/src/main/webapp/app/features/messages/messages.page.ts @@ -1,6 +1,5 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { Store } from '@ngrx/store'; -import { Observable } from 'rxjs/Observable'; import { Principal } from '../../shared'; import { SocketService } from '../../core/services/socket.service'; @@ -8,7 +7,6 @@ import { slices } from '../../core/store/util'; import * as EntityActions from '../../core/store/entity/entity.actions'; import { Message } from '../../core/store/message/message.model'; import * as fromRoot from '../../core/store'; -import * as SliceActions from '../../core/store/slice/slice.actions'; @Component({ selector: 'jhi-messages-page', @@ -59,9 +57,9 @@ export class MessagesPage implements OnInit, OnDestroy { this.editing[row.$$index + '-' + cell] = false; const message = this.messages[row.$$index]; const id = message.id; - let newObj = {} + let newObj = {}; newObj[cell] = event.target.value; - newObj = Object.assign({}, message, newObj) + newObj = Object.assign({}, message, newObj); this.store.dispatch(new EntityActions.Patch(slices.MESSAGE, newObj)); // this.messages[row.$$index][cell] = event.target.value; diff --git a/src/main/webapp/app/features/notes/note/note.component.ts b/src/main/webapp/app/features/notes/note/note.component.ts index 1c6788e4..7e73b6a7 100644 --- a/src/main/webapp/app/features/notes/note/note.component.ts +++ b/src/main/webapp/app/features/notes/note/note.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, Output, EventEmitter } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; @Component({ selector: 'jhi-note', diff --git a/src/main/webapp/app/features/notes/notes.page.ts b/src/main/webapp/app/features/notes/notes.page.ts index d2cc9b5d..aabbea33 100644 --- a/src/main/webapp/app/features/notes/notes.page.ts +++ b/src/main/webapp/app/features/notes/notes.page.ts @@ -1,6 +1,5 @@ -import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { Store } from '@ngrx/store'; -import { Observable } from 'rxjs/Observable'; import * as uuid from 'uuid/uuid'; import * as fromRoot from '../../core/store'; diff --git a/src/main/webapp/app/features/talks/filters/filters.component.ts b/src/main/webapp/app/features/talks/filters/filters.component.ts index ca67ce88..9654bb34 100644 --- a/src/main/webapp/app/features/talks/filters/filters.component.ts +++ b/src/main/webapp/app/features/talks/filters/filters.component.ts @@ -1,5 +1,5 @@ -import { Component, EventEmitter, Output, Inject, Input } from '@angular/core'; -import { FormGroup, FormControl } from '@angular/forms'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { FormControl, FormGroup } from '@angular/forms'; import { Filters } from '../talks.layout'; @Component({ diff --git a/src/main/webapp/app/features/talks/rate-button/rate-button.component.ts b/src/main/webapp/app/features/talks/rate-button/rate-button.component.ts index f09611e2..379c4045 100644 --- a/src/main/webapp/app/features/talks/rate-button/rate-button.component.ts +++ b/src/main/webapp/app/features/talks/rate-button/rate-button.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, EventEmitter, Output } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { Talk } from '../../../core/store/talk/talk.model'; @Component({ diff --git a/src/main/webapp/app/features/talks/talk-details/talk-details.component.ts b/src/main/webapp/app/features/talks/talk-details/talk-details.component.ts index 3a2e856d..35e1d5b5 100644 --- a/src/main/webapp/app/features/talks/talk-details/talk-details.component.ts +++ b/src/main/webapp/app/features/talks/talk-details/talk-details.component.ts @@ -1,13 +1,12 @@ -import { Component, Input, OnDestroy } from '@angular/core'; +import { Component, OnDestroy } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { WatchService } from '../services/watch.service'; import { Talk } from '../../../core/store/talk/talk.model'; +import * as fromRoot from '../../../core/store'; import { RootState } from '../../../core/store'; import { Store } from '@ngrx/store'; import { Subscription } from 'rxjs/Subscription'; import * as EntityActions from '../../../core/store/entity/entity.actions'; import { slices } from '../../../core/store/util'; -import * as fromRoot from '../../../core/store'; @Component({ selector: 'talk-details-cmp', diff --git a/src/main/webapp/app/features/talks/talks-and-filters/talks-and-filters.page.ts b/src/main/webapp/app/features/talks/talks-and-filters/talks-and-filters.page.ts index 89eaf544..e0018dab 100644 --- a/src/main/webapp/app/features/talks/talks-and-filters/talks-and-filters.page.ts +++ b/src/main/webapp/app/features/talks/talks-and-filters/talks-and-filters.page.ts @@ -1,5 +1,5 @@ -import { Component, Inject, OnInit } from '@angular/core'; -import { Router, Params } from '@angular/router'; +import { Component, OnInit } from '@angular/core'; +import { Params, Router } from '@angular/router'; import { Filters } from '../talks.layout'; import * as fromRoot from '../../../core/store'; import { Talk } from '../../../core/store/talk/talk.model'; diff --git a/src/main/webapp/app/features/talks/talks.layout.ts b/src/main/webapp/app/features/talks/talks.layout.ts index 9ae4bc64..37927103 100644 --- a/src/main/webapp/app/features/talks/talks.layout.ts +++ b/src/main/webapp/app/features/talks/talks.layout.ts @@ -1,5 +1,3 @@ -import { Talk } from '../../core/store/talk/talk.model'; - export type Filters = { speaker: string, title: string, minRating: number }; export type TalksPageLayout = { filters: Filters, watched: { [id: number]: boolean } }; export const initialTalksPageLayout: TalksPageLayout = { diff --git a/src/main/webapp/app/features/talks/talks.module.ts b/src/main/webapp/app/features/talks/talks.module.ts index 22a6265b..3369fa65 100644 --- a/src/main/webapp/app/features/talks/talks.module.ts +++ b/src/main/webapp/app/features/talks/talks.module.ts @@ -1,10 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { MaterialModule, MdInputModule, MdCheckboxModule } from '@angular/material'; +import { MaterialModule, MdCheckboxModule, MdInputModule } from '@angular/material'; import { ReactiveFormsModule } from '@angular/forms'; import { HttpModule } from '@angular/http'; -import { RouterModule } from '@angular/router'; -import { StoreModule, ActionReducer, combineReducers } from '@ngrx/store'; import { EffectsModule } from '@ngrx/effects'; import { TalksPage } from './talks.page'; @@ -19,7 +17,6 @@ import { FiltersComponent } from './filters/filters.component'; import { WatchService } from './services/watch.service'; import { TalkEffects } from '../../core/store/talk/talk.effects'; import { LayoutEffects } from '../../core/store/layout/layout.effects'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { TalksRouting } from './talks.routing'; import { customHttpProvider } from '../../core/interceptor/http.provider'; diff --git a/src/main/webapp/app/features/talks/talks.routing.ts b/src/main/webapp/app/features/talks/talks.routing.ts index 266380c2..8b3a590b 100644 --- a/src/main/webapp/app/features/talks/talks.routing.ts +++ b/src/main/webapp/app/features/talks/talks.routing.ts @@ -1,9 +1,5 @@ import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { Routes } from '@angular/router'; -import { Store } from '@ngrx/store'; - -import { StoreAndRouterConnectorGuard } from '../../core/store/store-and-router-connector.guard'; +import { RouterModule, Routes } from '@angular/router'; import { TalksPage } from './talks.page'; import { TalksAndFiltersPage } from './talks-and-filters/talks-and-filters.page'; import { TalkDetailsComponent } from './talk-details/talk-details.component'; diff --git a/src/main/webapp/app/features/talks/watch-button/watch-button.component.ts b/src/main/webapp/app/features/talks/watch-button/watch-button.component.ts index cb152d5f..40be25ed 100644 --- a/src/main/webapp/app/features/talks/watch-button/watch-button.component.ts +++ b/src/main/webapp/app/features/talks/watch-button/watch-button.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, EventEmitter, Output } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { Talk } from '../../../core/store/talk/talk.model'; @Component({ diff --git a/src/main/webapp/app/features/wiki/wiki.module.ts b/src/main/webapp/app/features/wiki/wiki.module.ts index c102deb2..c47490c2 100644 --- a/src/main/webapp/app/features/wiki/wiki.module.ts +++ b/src/main/webapp/app/features/wiki/wiki.module.ts @@ -2,7 +2,6 @@ // https://angular.io/docs/ts/latest/guide/style-guide.html#04-09 import { NgModule } from '@angular/core'; -import { Jsonp, URLSearchParams } from '@angular/http'; import { JsonpModule } from '@angular/http'; import { WikiComponent } from './wiki.component'; diff --git a/src/main/webapp/app/features/wiki/wiki.page.ts b/src/main/webapp/app/features/wiki/wiki.page.ts index 530b9996..56f6666c 100644 --- a/src/main/webapp/app/features/wiki/wiki.page.ts +++ b/src/main/webapp/app/features/wiki/wiki.page.ts @@ -1,4 +1,5 @@ import { Component } from '@angular/core'; + @Component({ selector: 'jhi-wiki-page', styleUrls: ['wiki.scss'], diff --git a/src/main/webapp/app/layouts/error/error.route.ts b/src/main/webapp/app/layouts/error/error.route.ts index cef16c15..b8cbfb5a 100644 --- a/src/main/webapp/app/layouts/error/error.route.ts +++ b/src/main/webapp/app/layouts/error/error.route.ts @@ -1,6 +1,4 @@ import { Routes } from '@angular/router'; - -import { UserRouteAccessService } from '../../shared'; import { ErrorComponent } from './error.component'; export const errorRoute: Routes = [ diff --git a/src/main/webapp/app/layouts/footer/footer.component.spec.ts b/src/main/webapp/app/layouts/footer/footer.component.spec.ts index 0766db9e..0e37a2f2 100644 --- a/src/main/webapp/app/layouts/footer/footer.component.spec.ts +++ b/src/main/webapp/app/layouts/footer/footer.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ -import { DebugElement } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; import { FooterComponent } from './footer.component'; diff --git a/src/main/webapp/app/layouts/footer/footer.component.ts b/src/main/webapp/app/layouts/footer/footer.component.ts index 12dea999..b92ec0d4 100644 --- a/src/main/webapp/app/layouts/footer/footer.component.ts +++ b/src/main/webapp/app/layouts/footer/footer.component.ts @@ -1,7 +1,9 @@ /** * @module CoreModule - */ /** */ + */ +/** */ import { Component } from '@angular/core'; + /** * @whatItDoes Returns the {@link FooterComponent} view * @consumers {@link LayoutComponent} diff --git a/src/main/webapp/app/layouts/layouts.module.ts b/src/main/webapp/app/layouts/layouts.module.ts index 774c467b..f073a46e 100644 --- a/src/main/webapp/app/layouts/layouts.module.ts +++ b/src/main/webapp/app/layouts/layouts.module.ts @@ -4,17 +4,16 @@ import { RouterModule } from '@angular/router'; import { GreatBigExampleApplicationSharedModule } from '../shared/shared.module'; import { - JhiMainComponent, - NavbarComponent, - FooterComponent, - ProfileService, - PageRibbonComponent, ActiveMenuDirective, ErrorComponent, + FooterComponent, + JhiMainComponent, MealsLayoutComponent, + NavbarComponent, + PageRibbonComponent, StandardLayoutComponent, - StatusBarComponent, - StatusBarAwareDirective + StatusBarAwareDirective, + StatusBarComponent } from './'; import { MealsModule } from '../features/meals/meals.module'; diff --git a/src/main/webapp/app/layouts/main/main.component.ts b/src/main/webapp/app/layouts/main/main.component.ts index 7a398150..86e8b1ee 100644 --- a/src/main/webapp/app/layouts/main/main.component.ts +++ b/src/main/webapp/app/layouts/main/main.component.ts @@ -1,13 +1,9 @@ -import { Component, OnInit, ViewContainerRef, AfterViewInit, ViewEncapsulation } from '@angular/core'; -import { Router, ActivatedRoute, ActivatedRouteSnapshot, NavigationEnd, RoutesRecognized } from '@angular/router'; - -import { JhiLanguageHelper, StateStorageService } from '../../shared'; -import * as $ from 'jquery'; +import { AfterViewInit, Component, OnInit } from '@angular/core'; +import { ActivatedRouteSnapshot, NavigationEnd, Router } from '@angular/router'; +import { JhiLanguageHelper } from '../../shared'; // import { GlobalState } from './global.state'; import { BaImageLoaderService, BaThemePreloader, BaThemeSpinner } from '../../shared/services'; -import { BaThemeConfig } from '../../shared/theme/theme.config'; -import { layoutPaths } from '../../shared/theme/theme.constants'; @Component({ selector: 'jhi-main', diff --git a/src/main/webapp/app/layouts/meals-layout/meals-layout.component.spec.broken.ts b/src/main/webapp/app/layouts/meals-layout/meals-layout.component.spec.broken.ts index 0f698f37..42327461 100644 --- a/src/main/webapp/app/layouts/meals-layout/meals-layout.component.spec.broken.ts +++ b/src/main/webapp/app/layouts/meals-layout/meals-layout.component.spec.broken.ts @@ -1,18 +1,13 @@ /* tslint:disable:no-unused-variable */ -import { Injectable } from '@angular/core'; import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; import { Location } from '@angular/common'; import { Route, Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { Subject } from 'rxjs/Subject'; -import { StoreModule, Store, StateObservable, combineReducers } from '@ngrx/store'; +import { StoreModule } from '@ngrx/store'; import { MealsLayoutComponent } from './meals-layout.component'; import { CoreModule } from '../../core/core.module'; -import { FooterComponent } from '../footer/footer.component'; import { GlobalEventsService } from '../../core/global-events/global-events.service'; -import { NavComponent } from '../nav/nav.component'; import { HomeComponent } from '../../features/home/home.component'; import { GreatBigExampleApplicationHomeModule } from '../../features/home/home.module'; import { ApiService } from '../../core/api/api.service'; diff --git a/src/main/webapp/app/layouts/meals-layout/meals-layout.component.ts b/src/main/webapp/app/layouts/meals-layout/meals-layout.component.ts index 1f719dde..2eceb28c 100644 --- a/src/main/webapp/app/layouts/meals-layout/meals-layout.component.ts +++ b/src/main/webapp/app/layouts/meals-layout/meals-layout.component.ts @@ -1,10 +1,12 @@ /** * @module CoreModule - */ /** */ + */ +/** */ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; import { StatusBarService } from '../status-bar/status-bar.service'; + /** * @whatItDoes Manages all layout functions for the {@link AppComponent}. * @purpose The goal for this component is to encapsulate all logic relating to how the app's layout diff --git a/src/main/webapp/app/layouts/nav/nav.component.spec.ts b/src/main/webapp/app/layouts/nav/nav.component.spec.ts index 0620fac2..1f99c161 100644 --- a/src/main/webapp/app/layouts/nav/nav.component.spec.ts +++ b/src/main/webapp/app/layouts/nav/nav.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ -import { DebugElement } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; import { RouterTestingModule } from '@angular/router/testing'; import { NavComponent } from './nav.component'; diff --git a/src/main/webapp/app/layouts/nav/nav.component.ts b/src/main/webapp/app/layouts/nav/nav.component.ts index ef712cc0..295d884d 100644 --- a/src/main/webapp/app/layouts/nav/nav.component.ts +++ b/src/main/webapp/app/layouts/nav/nav.component.ts @@ -1,7 +1,9 @@ /** * @module CoreModule - */ /** */ + */ +/** */ import { Component } from '@angular/core'; + /** * @whatItDoes Returns the {@link NavComponent} view * @consumers {@link LayoutComponent} diff --git a/src/main/webapp/app/layouts/navbar/active-menu.directive.ts b/src/main/webapp/app/layouts/navbar/active-menu.directive.ts index e3485b92..f2ebd3b5 100644 --- a/src/main/webapp/app/layouts/navbar/active-menu.directive.ts +++ b/src/main/webapp/app/layouts/navbar/active-menu.directive.ts @@ -1,5 +1,5 @@ -import { Directive, OnInit, ElementRef, Renderer, Input} from '@angular/core'; -import { TranslateService, LangChangeEvent } from '@ngx-translate/core'; +import { Directive, ElementRef, Input, OnInit, Renderer } from '@angular/core'; +import { LangChangeEvent, TranslateService } from '@ngx-translate/core'; @Directive({ selector: '[jhiActiveMenu]' diff --git a/src/main/webapp/app/layouts/navbar/navbar.component.ts b/src/main/webapp/app/layouts/navbar/navbar.component.ts index 4612ca85..da092d3a 100644 --- a/src/main/webapp/app/layouts/navbar/navbar.component.ts +++ b/src/main/webapp/app/layouts/navbar/navbar.component.ts @@ -4,9 +4,9 @@ import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { JhiLanguageService } from 'ng-jhipster'; import { ProfileService } from '../profiles/profile.service'; -import { JhiLanguageHelper, Principal, LoginModalService, LoginService } from '../../shared'; +import { JhiLanguageHelper, LoginModalService, LoginService, Principal } from '../../shared'; -import { VERSION, DEBUG_INFO_ENABLED } from '../../app.constants'; +import { VERSION } from '../../app.constants'; import { FeatureMeta, FeaturesService } from '../../features/features.service'; @Component({ diff --git a/src/main/webapp/app/layouts/skip-nav/skip-nav.component.spec.ts b/src/main/webapp/app/layouts/skip-nav/skip-nav.component.spec.ts index f6bfc587..8dc5cf94 100644 --- a/src/main/webapp/app/layouts/skip-nav/skip-nav.component.spec.ts +++ b/src/main/webapp/app/layouts/skip-nav/skip-nav.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; import { NavigationEnd, Router } from '@angular/router'; import { SkipNavComponent } from './skip-nav.component'; diff --git a/src/main/webapp/app/layouts/skip-nav/skip-nav.component.ts b/src/main/webapp/app/layouts/skip-nav/skip-nav.component.ts index bb5b2b9e..a2170055 100644 --- a/src/main/webapp/app/layouts/skip-nav/skip-nav.component.ts +++ b/src/main/webapp/app/layouts/skip-nav/skip-nav.component.ts @@ -1,8 +1,10 @@ /** * @module CoreModule - */ /** */ + */ +/** */ import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; -import { Router, NavigationEnd } from '@angular/router'; +import { NavigationEnd, Router } from '@angular/router'; + /** * @whatItDoes Provides a shortcut button to skip the main navigation for accessibility purposes. * diff --git a/src/main/webapp/app/layouts/standard-layout/standard-layout.component.ts b/src/main/webapp/app/layouts/standard-layout/standard-layout.component.ts index 828774f4..b85f9a9e 100644 --- a/src/main/webapp/app/layouts/standard-layout/standard-layout.component.ts +++ b/src/main/webapp/app/layouts/standard-layout/standard-layout.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { Router, ActivatedRouteSnapshot, NavigationEnd, RoutesRecognized } from '@angular/router'; +import { ActivatedRouteSnapshot, NavigationEnd, Router } from '@angular/router'; import { JhiLanguageHelper, StateStorageService } from '../../shared'; diff --git a/src/main/webapp/app/layouts/status-bar/status-bar-aware.directive.spec.ts b/src/main/webapp/app/layouts/status-bar/status-bar-aware.directive.spec.ts index a7fab3e6..d990f207 100644 --- a/src/main/webapp/app/layouts/status-bar/status-bar-aware.directive.spec.ts +++ b/src/main/webapp/app/layouts/status-bar/status-bar-aware.directive.spec.ts @@ -1,10 +1,6 @@ /* tslint:disable:no-unused-variable */ -import { Injectable } from '@angular/core'; -import { TestBed, async } from '@angular/core/testing'; import { StatusBarAwareDirective } from './status-bar-aware.directive'; - -import { StatusBarService } from './status-bar.service'; import { MockStatusBarService } from './mock-status-bar.service.spec'; describe('Directive: StatusBarAware', () => { diff --git a/src/main/webapp/app/layouts/status-bar/status-bar-aware.directive.ts b/src/main/webapp/app/layouts/status-bar/status-bar-aware.directive.ts index e3e9ba20..68f13e93 100644 --- a/src/main/webapp/app/layouts/status-bar/status-bar-aware.directive.ts +++ b/src/main/webapp/app/layouts/status-bar/status-bar-aware.directive.ts @@ -1,10 +1,12 @@ /** * @module CoreModule - */ /** */ + */ +/** */ import { Directive, HostBinding, Input, OnDestroy, OnInit } from '@angular/core'; import { Subscription } from '../../../../../../node_modules/rxjs/Subscription.d'; import { StatusBarService } from './status-bar.service'; + /** * @whatItDoes moves a fixed position host element with respect to the {@link StatusBarComponent}'s * position. diff --git a/src/main/webapp/app/layouts/status-bar/status-bar.component.spec.ts b/src/main/webapp/app/layouts/status-bar/status-bar.component.spec.ts index cdbc1c2a..f7d16320 100644 --- a/src/main/webapp/app/layouts/status-bar/status-bar.component.spec.ts +++ b/src/main/webapp/app/layouts/status-bar/status-bar.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; import { StatusBarComponent } from './status-bar.component'; import { StatusBarService } from './status-bar.service'; diff --git a/src/main/webapp/app/layouts/status-bar/status-bar.component.ts b/src/main/webapp/app/layouts/status-bar/status-bar.component.ts index 3067a12a..596d7fa8 100644 --- a/src/main/webapp/app/layouts/status-bar/status-bar.component.ts +++ b/src/main/webapp/app/layouts/status-bar/status-bar.component.ts @@ -1,9 +1,11 @@ /** * @module CoreModule - */ /** */ + */ +/** */ import { AfterViewInit, Component, ElementRef, HostBinding } from '@angular/core'; import { StatusBarService } from './status-bar.service'; + /** * @whatItDoes provides app status messages by pushing app content down from the top revealing * this component. diff --git a/src/main/webapp/app/layouts/status-bar/status-bar.service.spec.ts b/src/main/webapp/app/layouts/status-bar/status-bar.service.spec.ts index a253f533..38c5ef5e 100644 --- a/src/main/webapp/app/layouts/status-bar/status-bar.service.spec.ts +++ b/src/main/webapp/app/layouts/status-bar/status-bar.service.spec.ts @@ -1,6 +1,5 @@ /* tslint:disable:no-unused-variable */ -import { EventEmitter, Injectable } from '@angular/core'; -import { TestBed, async, inject } from '@angular/core/testing'; +import { async, inject, TestBed } from '@angular/core/testing'; import { NavigationEnd, Router } from '@angular/router'; import { StatusBarService } from './status-bar.service'; import { MockRouter } from '../../../mocks/mock-router.spec'; diff --git a/src/main/webapp/app/layouts/status-bar/status-bar.service.ts b/src/main/webapp/app/layouts/status-bar/status-bar.service.ts index c4d01f8c..01f01aa3 100644 --- a/src/main/webapp/app/layouts/status-bar/status-bar.service.ts +++ b/src/main/webapp/app/layouts/status-bar/status-bar.service.ts @@ -1,11 +1,13 @@ /** * @module CoreModule - */ /** */ + */ +/** */ import { Injectable } from '@angular/core'; import { NavigationEnd, Router } from '@angular/router'; import { ReplaySubject } from 'rxjs/ReplaySubject'; import { CurrentStatus } from './current-status.interface'; + /** * @whatItDoes tracks the status of the {@link StatusBarComponent} and notifies all components with * the {@link StatusBarAwareDirective} that a change has occurred. diff --git a/src/main/webapp/app/shared/alert/alert-error.component.ts b/src/main/webapp/app/shared/alert/alert-error.component.ts index 2d2dd82d..8003ef0a 100644 --- a/src/main/webapp/app/shared/alert/alert-error.component.ts +++ b/src/main/webapp/app/shared/alert/alert-error.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { JhiEventManager, JhiAlertService } from 'ng-jhipster'; +import { JhiAlertService, JhiEventManager } from 'ng-jhipster'; import { Subscription } from 'rxjs/Subscription'; @Component({ diff --git a/src/main/webapp/app/shared/auth/auth-jwt.service.ts b/src/main/webapp/app/shared/auth/auth-jwt.service.ts index aecd43d2..1b7bca81 100644 --- a/src/main/webapp/app/shared/auth/auth-jwt.service.ts +++ b/src/main/webapp/app/shared/auth/auth-jwt.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Http, Response, Headers, URLSearchParams } from '@angular/http'; +import { Http } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { LocalStorageService, SessionStorageService } from 'ng2-webstorage'; diff --git a/src/main/webapp/app/shared/ba/ba-am-chart/ba-am-chart.component.ts b/src/main/webapp/app/shared/ba/ba-am-chart/ba-am-chart.component.ts index 0e33cabc..1707ff87 100644 --- a/src/main/webapp/app/shared/ba/ba-am-chart/ba-am-chart.component.ts +++ b/src/main/webapp/app/shared/ba/ba-am-chart/ba-am-chart.component.ts @@ -1,4 +1,4 @@ -import { Component, ViewChild, Input, Output, ElementRef, EventEmitter, OnInit, AfterViewInit } from '@angular/core'; +import { AfterViewInit, Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { BaThemePreloader } from '../../../shared/services'; diff --git a/src/main/webapp/app/shared/ba/ba-back-top/ba-back-top.component.ts b/src/main/webapp/app/shared/ba/ba-back-top/ba-back-top.component.ts index 287b4646..ace8a2b8 100644 --- a/src/main/webapp/app/shared/ba/ba-back-top/ba-back-top.component.ts +++ b/src/main/webapp/app/shared/ba/ba-back-top/ba-back-top.component.ts @@ -1,4 +1,4 @@ -import { Component, ViewChild, HostListener, Input, ElementRef, AfterViewInit } from '@angular/core'; +import { AfterViewInit, Component, ElementRef, HostListener, Input, ViewChild } from '@angular/core'; @Component({ selector: 'ba-back-top', diff --git a/src/main/webapp/app/shared/ba/ba-card/ba-card-blur.directive.ts b/src/main/webapp/app/shared/ba/ba-card/ba-card-blur.directive.ts index 9b2709e6..cb718094 100644 --- a/src/main/webapp/app/shared/ba/ba-card/ba-card-blur.directive.ts +++ b/src/main/webapp/app/shared/ba/ba-card/ba-card-blur.directive.ts @@ -1,4 +1,4 @@ -import { Directive, ElementRef, HostListener, HostBinding } from '@angular/core'; +import { Directive, ElementRef, HostBinding, HostListener } from '@angular/core'; import { BaThemeConfigProvider } from '../../../shared/theme'; import { BaCardBlurHelper } from './ba-card-blur-helper.service'; diff --git a/src/main/webapp/app/shared/ba/ba-card/ba-card.component.ts b/src/main/webapp/app/shared/ba/ba-card/ba-card.component.ts index 092d5a23..11ea3623 100644 --- a/src/main/webapp/app/shared/ba/ba-card/ba-card.component.ts +++ b/src/main/webapp/app/shared/ba/ba-card/ba-card.component.ts @@ -1,5 +1,4 @@ import { Component, Input } from '@angular/core'; -import { JhiLanguageService } from 'ng-jhipster'; @Component({ selector: 'ba-card', diff --git a/src/main/webapp/app/shared/ba/ba-chartist-chart/ba-chartist-chart.component.ts b/src/main/webapp/app/shared/ba/ba-chartist-chart/ba-chartist-chart.component.ts index e10b35cb..b7d6cfb6 100644 --- a/src/main/webapp/app/shared/ba/ba-chartist-chart/ba-chartist-chart.component.ts +++ b/src/main/webapp/app/shared/ba/ba-chartist-chart/ba-chartist-chart.component.ts @@ -1,13 +1,13 @@ import { + AfterViewInit, Component, - ViewChild, - Input, - Output, ElementRef, EventEmitter, - AfterViewInit, + Input, OnChanges, - OnDestroy + OnDestroy, + Output, + ViewChild } from '@angular/core'; import * as Chartist from 'chartist'; diff --git a/src/main/webapp/app/shared/ba/ba-full-calendar/ba-full-calendar.component.ts b/src/main/webapp/app/shared/ba/ba-full-calendar/ba-full-calendar.component.ts index 6003979f..d0841a64 100644 --- a/src/main/webapp/app/shared/ba/ba-full-calendar/ba-full-calendar.component.ts +++ b/src/main/webapp/app/shared/ba/ba-full-calendar/ba-full-calendar.component.ts @@ -1,4 +1,4 @@ -import { Component, ViewChild, Input, Output, ElementRef, EventEmitter, AfterViewInit } from '@angular/core'; +import { AfterViewInit, Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core'; import 'fullcalendar/dist/fullcalendar.js'; import * as jQuery from 'jquery'; diff --git a/src/main/webapp/app/shared/ba/ba-menu/ba-menu.component.ts b/src/main/webapp/app/shared/ba/ba-menu/ba-menu.component.ts index 7c307bd9..a0179e18 100644 --- a/src/main/webapp/app/shared/ba/ba-menu/ba-menu.component.ts +++ b/src/main/webapp/app/shared/ba/ba-menu/ba-menu.component.ts @@ -1,5 +1,5 @@ -import { Component, Input, Output, EventEmitter, OnInit, OnDestroy } from '@angular/core'; -import { Router, NavigationEnd } from '@angular/router'; +import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; +import { NavigationEnd, Router } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; import { BaMenuService } from '../../services'; diff --git a/src/main/webapp/app/shared/ba/ba-menu/components/ba-menu-item/ba-menu-item.component.ts b/src/main/webapp/app/shared/ba/ba-menu/components/ba-menu-item/ba-menu-item.component.ts index 647734e9..8b4844cb 100644 --- a/src/main/webapp/app/shared/ba/ba-menu/components/ba-menu-item/ba-menu-item.component.ts +++ b/src/main/webapp/app/shared/ba/ba-menu/components/ba-menu-item/ba-menu-item.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, Output, EventEmitter } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; @Component({ selector: 'ba-menu-item', diff --git a/src/main/webapp/app/shared/ba/ba-scroll-position/ba-scroll-position.directive.ts b/src/main/webapp/app/shared/ba/ba-scroll-position/ba-scroll-position.directive.ts index 28564d80..538156ba 100644 --- a/src/main/webapp/app/shared/ba/ba-scroll-position/ba-scroll-position.directive.ts +++ b/src/main/webapp/app/shared/ba/ba-scroll-position/ba-scroll-position.directive.ts @@ -1,4 +1,4 @@ -import { Directive, Input, Output, EventEmitter, HostListener, OnInit } from '@angular/core'; +import { Directive, EventEmitter, HostListener, Input, OnInit, Output } from '@angular/core'; @Directive({ selector: '[baScrollPosition]' diff --git a/src/main/webapp/app/shared/ba/ba-sidebar/ba-sidebar.component.ts b/src/main/webapp/app/shared/ba/ba-sidebar/ba-sidebar.component.ts index 0526c382..43808226 100644 --- a/src/main/webapp/app/shared/ba/ba-sidebar/ba-sidebar.component.ts +++ b/src/main/webapp/app/shared/ba/ba-sidebar/ba-sidebar.component.ts @@ -1,4 +1,4 @@ -import { Component, ElementRef, HostListener, OnInit, AfterViewInit } from '@angular/core'; +import { AfterViewInit, Component, ElementRef, HostListener, OnInit } from '@angular/core'; import { GlobalState } from '../../../global.state'; import { layoutSizes } from '../../../shared/theme'; diff --git a/src/main/webapp/app/shared/ba/ba-slim-scroll/ba-slim-scroll.directive.ts b/src/main/webapp/app/shared/ba/ba-slim-scroll/ba-slim-scroll.directive.ts index 7198a3db..ab86af71 100644 --- a/src/main/webapp/app/shared/ba/ba-slim-scroll/ba-slim-scroll.directive.ts +++ b/src/main/webapp/app/shared/ba/ba-slim-scroll/ba-slim-scroll.directive.ts @@ -1,4 +1,4 @@ -import { Directive, Input, Output, ElementRef, EventEmitter, OnChanges } from '@angular/core'; +import { Directive, ElementRef, Input, OnChanges } from '@angular/core'; // import 'jquery-slimscroll'; diff --git a/src/main/webapp/app/shared/button/button.component.ts b/src/main/webapp/app/shared/button/button.component.ts index 5de84eeb..f81d5c6f 100644 --- a/src/main/webapp/app/shared/button/button.component.ts +++ b/src/main/webapp/app/shared/button/button.component.ts @@ -24,4 +24,4 @@ export class ButtonComponent { handleClick(event) { this.onClick.emit(event); } -}; +} diff --git a/src/main/webapp/app/shared/container/container.component.ts b/src/main/webapp/app/shared/container/container.component.ts index c70c42d1..8963ba24 100644 --- a/src/main/webapp/app/shared/container/container.component.ts +++ b/src/main/webapp/app/shared/container/container.component.ts @@ -21,4 +21,4 @@ export class ContainerComponent { @Input() size = 1; @Input() center = false; @Input() testid: string; -}; +} diff --git a/src/main/webapp/app/shared/dialog/dialog.service.ts b/src/main/webapp/app/shared/dialog/dialog.service.ts index 1c5bf2cf..7f9b125b 100755 --- a/src/main/webapp/app/shared/dialog/dialog.service.ts +++ b/src/main/webapp/app/shared/dialog/dialog.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; + /** * Async modal dialog service * DialogService makes this app easier to test by faking this service. diff --git a/src/main/webapp/app/shared/draggable/draggable.directive.ts b/src/main/webapp/app/shared/draggable/draggable.directive.ts index ae8bcd5f..5a51cfde 100644 --- a/src/main/webapp/app/shared/draggable/draggable.directive.ts +++ b/src/main/webapp/app/shared/draggable/draggable.directive.ts @@ -1,4 +1,4 @@ -import { Directive, Output, EventEmitter, ElementRef, HostListener } from '@angular/core'; +import { Directive, ElementRef, EventEmitter, HostListener, Output } from '@angular/core'; @Directive({ selector: '[jhiDraggable]' diff --git a/src/main/webapp/app/shared/image-cover/image-cover.component.spec.ts b/src/main/webapp/app/shared/image-cover/image-cover.component.spec.ts index ab565949..33099ad1 100644 --- a/src/main/webapp/app/shared/image-cover/image-cover.component.spec.ts +++ b/src/main/webapp/app/shared/image-cover/image-cover.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; import { ImageCoverComponent } from './image-cover.component'; import { LoadingComponent } from '../ui/loading/loading.component'; diff --git a/src/main/webapp/app/shared/image-cover/image-cover.component.ts b/src/main/webapp/app/shared/image-cover/image-cover.component.ts index 8ad633c6..8cac4be4 100644 --- a/src/main/webapp/app/shared/image-cover/image-cover.component.ts +++ b/src/main/webapp/app/shared/image-cover/image-cover.component.ts @@ -1,15 +1,9 @@ /** * @module SharedModule - */ /** */ -import { - AfterViewInit, - Component, - ElementRef, - Input, - OnChanges, - OnInit, - Renderer -} from '@angular/core'; + */ +/** */ +import { AfterViewInit, Component, ElementRef, Input, OnChanges, OnInit, Renderer } from '@angular/core'; + /** * @whatItDoes Creates an image that covers the element. * @consumers {@link HomeModule} diff --git a/src/main/webapp/app/shared/language/language.helper.ts b/src/main/webapp/app/shared/language/language.helper.ts index 55f68e9a..3f2eda01 100644 --- a/src/main/webapp/app/shared/language/language.helper.ts +++ b/src/main/webapp/app/shared/language/language.helper.ts @@ -1,7 +1,7 @@ -import { Injectable, RendererFactory2, Renderer2 } from '@angular/core'; +import { Injectable, Renderer2, RendererFactory2 } from '@angular/core'; import { Title } from '@angular/platform-browser'; -import { Router, ActivatedRouteSnapshot } from '@angular/router'; -import { TranslateService, LangChangeEvent } from '@ngx-translate/core'; +import { ActivatedRouteSnapshot, Router } from '@angular/router'; +import { LangChangeEvent, TranslateService } from '@ngx-translate/core'; import { LANGUAGES } from './language.constants'; diff --git a/src/main/webapp/app/shared/login/login.component.ts b/src/main/webapp/app/shared/login/login.component.ts index b7ba7336..6a444c39 100644 --- a/src/main/webapp/app/shared/login/login.component.ts +++ b/src/main/webapp/app/shared/login/login.component.ts @@ -1,4 +1,4 @@ -import { Component, AfterViewInit, Renderer, ElementRef } from '@angular/core'; +import { AfterViewInit, Component, ElementRef, Renderer } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { Router } from '@angular/router'; import { JhiEventManager } from 'ng-jhipster'; diff --git a/src/main/webapp/app/shared/model/base-entity.ts b/src/main/webapp/app/shared/model/base-entity.ts index b3000741..3fbd4eee 100644 --- a/src/main/webapp/app/shared/model/base-entity.ts +++ b/src/main/webapp/app/shared/model/base-entity.ts @@ -1,4 +1,4 @@ export interface BaseEntity { // using type any to avoid methods complaining of invalid type id?: any; -}; +} diff --git a/src/main/webapp/app/shared/model/request-util.ts b/src/main/webapp/app/shared/model/request-util.ts index d5a788af..72acd5c7 100644 --- a/src/main/webapp/app/shared/model/request-util.ts +++ b/src/main/webapp/app/shared/model/request-util.ts @@ -1,4 +1,4 @@ -import { URLSearchParams, BaseRequestOptions } from '@angular/http'; +import { BaseRequestOptions, URLSearchParams } from '@angular/http'; export const createRequestOption = (req?: any): BaseRequestOptions => { const options: BaseRequestOptions = new BaseRequestOptions(); diff --git a/src/main/webapp/app/shared/nga.module.ts b/src/main/webapp/app/shared/nga.module.ts index 57542cb8..9850eb3a 100644 --- a/src/main/webapp/app/shared/nga.module.ts +++ b/src/main/webapp/app/shared/nga.module.ts @@ -1,54 +1,42 @@ -import { NgModule, ModuleWithProviders } from '@angular/core'; +import { ModuleWithProviders, NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { ReactiveFormsModule, FormsModule } from '@angular/forms'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; import { NgUploaderModule } from 'ngx-uploader'; import { GreatBigExampleApplicationSharedModule } from '../shared'; import { TranslateModule } from '@ngx-translate/core'; -import { - BaThemeConfig -} from './theme/theme.config'; +import { BaThemeConfig } from './theme/theme.config'; -import { - BaThemeConfigProvider -} from './theme/theme.config-provider'; +import { BaThemeConfigProvider } from './theme/theme.config-provider'; import { BaAmChart, + BaAppPicturePipe, BaBackTop, BaCard, BaChartistChart, BaCheckbox, BaContentTop, BaFullCalendar, - BaMenuItem, + BaKameleonPicturePipe, BaMenu, + BaMenuItem, BaMsgCenter, BaMultiCheckbox, BaPageTop, - BaSidebar, + BaProfilePicturePipe, BaScrollPositionDirective, + BaSidebar, BaSlimScrollDirective, - BaThemeRunDirective, - BaAppPicturePipe, - BaKameleonPicturePipe, - BaProfilePicturePipe + BaThemeRunDirective } from './ba'; import { BaCardBlurDirective } from './ba/ba-card/ba-card-blur.directive'; -import { - BaImageLoaderService, - BaMenuService, - BaThemePreloader, - BaThemeSpinner -} from './services'; +import { BaImageLoaderService, BaMenuService, BaThemePreloader, BaThemeSpinner } from './services'; -import { - EmailValidator, - EqualPasswordsValidator -} from './validators'; +import { EmailValidator, EqualPasswordsValidator } from './validators'; const NGA_COMPONENTS = [ BaAmChart, diff --git a/src/main/webapp/app/shared/services/ba-image-loader/ba-image-loader.service.ts b/src/main/webapp/app/shared/services/ba-image-loader/ba-image-loader.service.ts index b2d1b0b0..06ac5db8 100644 --- a/src/main/webapp/app/shared/services/ba-image-loader/ba-image-loader.service.ts +++ b/src/main/webapp/app/shared/services/ba-image-loader/ba-image-loader.service.ts @@ -1,4 +1,4 @@ -import {Injectable} from '@angular/core'; +import { Injectable } from '@angular/core'; @Injectable() export class BaImageLoaderService { diff --git a/src/main/webapp/app/shared/services/ba-theme-preloader/ba-theme-preloader.service.ts b/src/main/webapp/app/shared/services/ba-theme-preloader/ba-theme-preloader.service.ts index e94d025b..bce19d5c 100644 --- a/src/main/webapp/app/shared/services/ba-theme-preloader/ba-theme-preloader.service.ts +++ b/src/main/webapp/app/shared/services/ba-theme-preloader/ba-theme-preloader.service.ts @@ -1,4 +1,4 @@ -import {Injectable} from '@angular/core'; +import { Injectable } from '@angular/core'; @Injectable() export class BaThemePreloader { diff --git a/src/main/webapp/app/shared/services/ba-theme-spinner/ba-theme-spinner.service.ts b/src/main/webapp/app/shared/services/ba-theme-spinner/ba-theme-spinner.service.ts index 65e5606f..96800e38 100644 --- a/src/main/webapp/app/shared/services/ba-theme-spinner/ba-theme-spinner.service.ts +++ b/src/main/webapp/app/shared/services/ba-theme-spinner/ba-theme-spinner.service.ts @@ -1,4 +1,4 @@ -import {Injectable} from '@angular/core'; +import { Injectable } from '@angular/core'; @Injectable() export class BaThemeSpinner { diff --git a/src/main/webapp/app/shared/shared-common.module.ts b/src/main/webapp/app/shared/shared-common.module.ts index b65216a1..27fd2d4b 100644 --- a/src/main/webapp/app/shared/shared-common.module.ts +++ b/src/main/webapp/app/shared/shared-common.module.ts @@ -3,11 +3,11 @@ import { Title } from '@angular/platform-browser'; import { WindowRef } from './services/window.service'; import { - GreatBigExampleApplicationSharedLibsModule, - JhiLanguageHelper, FindLanguageFromKeyPipe, + GreatBigExampleApplicationSharedLibsModule, JhiAlertComponent, - JhiAlertErrorComponent + JhiAlertErrorComponent, + JhiLanguageHelper } from './'; @NgModule({ diff --git a/src/main/webapp/app/shared/shared.module.ts b/src/main/webapp/app/shared/shared.module.ts index f55d9fb2..1fbff402 100644 --- a/src/main/webapp/app/shared/shared.module.ts +++ b/src/main/webapp/app/shared/shared.module.ts @@ -1,4 +1,4 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA, ModuleWithProviders } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, ModuleWithProviders, NgModule } from '@angular/core'; import { DatePipe } from '@angular/common'; import { RouterModule } from '@angular/router'; @@ -6,8 +6,8 @@ import { AccountService, AuthServerProvider, CSRFService, - GreatBigExampleApplicationSharedLibsModule, GreatBigExampleApplicationSharedCommonModule, + GreatBigExampleApplicationSharedLibsModule, HasAnyAuthorityDirective, JhiLoginModalComponent, JhiSocialComponent, @@ -36,12 +36,10 @@ import { TwainService } from './twain/twain.service'; import { WelcomeComponent } from './welcome/welcome.component'; // import { GameComponent } from '../features/game/game.component'; // import { TimerComponent } from '../features/game/timer/timer.component'; -import { LayoutsModule } from '../layouts/layouts.module'; // import { StatusBarComponent } from '../layouts/status-bar/status-bar.component'; import { NavComponent } from '../layouts/nav/nav.component'; import { SkipNavComponent } from '../layouts/skip-nav/skip-nav.component'; import { UiModule } from './ui/ui.module'; -import { MealsLayoutComponent } from '../layouts/meals-layout/meals-layout.component'; import { ImageCoverComponent } from './image-cover/image-cover.component'; export const components = [ diff --git a/src/main/webapp/app/shared/theme/theme.config.ts b/src/main/webapp/app/shared/theme/theme.config.ts index 2386d4cf..e4e29f72 100644 --- a/src/main/webapp/app/shared/theme/theme.config.ts +++ b/src/main/webapp/app/shared/theme/theme.config.ts @@ -1,7 +1,6 @@ import { Injectable } from '@angular/core'; import { BaThemeConfigProvider } from './theme.config-provider'; -import { ColorHelper } from './theme.constants'; @Injectable() export class BaThemeConfig { diff --git a/src/main/webapp/app/shared/tracker/tracker.service.ts b/src/main/webapp/app/shared/tracker/tracker.service.ts index 3fd5d941..fef5c46b 100644 --- a/src/main/webapp/app/shared/tracker/tracker.service.ts +++ b/src/main/webapp/app/shared/tracker/tracker.service.ts @@ -1,5 +1,5 @@ -import { Injectable, Inject } from '@angular/core'; -import { Router, NavigationEnd } from '@angular/router'; +import { Injectable } from '@angular/core'; +import { NavigationEnd, Router } from '@angular/router'; import { CSRFService } from '../auth/csrf.service'; @@ -8,9 +8,9 @@ import { AuthServerProvider } from '../auth/auth-jwt.service'; import * as SockJS from 'sockjs-client'; import * as Stomp from 'webstomp-client'; -import {Observable} from 'rxjs/Observable'; -import {Observer} from 'rxjs/Observer'; -import {Subscription} from 'rxjs/Subscription'; +import { Observable } from 'rxjs/Observable'; +import { Observer } from 'rxjs/Observer'; +import { Subscription } from 'rxjs/Subscription'; @Injectable() export class JhiTrackerService { diff --git a/src/main/webapp/app/shared/twain/twain.component.spec.ts b/src/main/webapp/app/shared/twain/twain.component.spec.ts index 804afa1f..0d839137 100755 --- a/src/main/webapp/app/shared/twain/twain.component.spec.ts +++ b/src/main/webapp/app/shared/twain/twain.component.spec.ts @@ -1,4 +1,4 @@ -import { async, fakeAsync, ComponentFixture, TestBed, tick } from '@angular/core/testing'; +import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { DebugElement } from '@angular/core'; diff --git a/src/main/webapp/app/shared/ui/icons/icon-arrow-down/icon-arrow-down.component.html b/src/main/webapp/app/shared/ui/icons/icon-arrow-down/icon-arrow-down.component.html index 2d137cd7..0e0a43d5 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-arrow-down/icon-arrow-down.component.html +++ b/src/main/webapp/app/shared/ui/icons/icon-arrow-down/icon-arrow-down.component.html @@ -1,3 +1,3 @@ - + - \ No newline at end of file + diff --git a/src/main/webapp/app/shared/ui/icons/icon-arrow-down/icon-arrow-down.component.spec.ts b/src/main/webapp/app/shared/ui/icons/icon-arrow-down/icon-arrow-down.component.spec.ts index f0440fef..02169412 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-arrow-down/icon-arrow-down.component.spec.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-arrow-down/icon-arrow-down.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; import { IconArrowDownComponent } from './icon-arrow-down.component'; diff --git a/src/main/webapp/app/shared/ui/icons/icon-arrow-down/icon-arrow-down.component.ts b/src/main/webapp/app/shared/ui/icons/icon-arrow-down/icon-arrow-down.component.ts index a6f72b3e..417b965f 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-arrow-down/icon-arrow-down.component.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-arrow-down/icon-arrow-down.component.ts @@ -1,7 +1,9 @@ /** * @module UiModule - */ /** */ + */ +/** */ import { Component, HostBinding } from '@angular/core'; + /** * Search icon from [Ionicons](http://ionicons.com/). * [Source](https://github.com/driftyco/ionicons/blob/master/src/ios-arrow-down.svg) diff --git a/src/main/webapp/app/shared/ui/icons/icon-facebook/icon-facebook.component.html b/src/main/webapp/app/shared/ui/icons/icon-facebook/icon-facebook.component.html index 458a355e..d9474da9 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-facebook/icon-facebook.component.html +++ b/src/main/webapp/app/shared/ui/icons/icon-facebook/icon-facebook.component.html @@ -1,5 +1,5 @@ - - \ No newline at end of file + diff --git a/src/main/webapp/app/shared/ui/icons/icon-facebook/icon-facebook.component.spec.ts b/src/main/webapp/app/shared/ui/icons/icon-facebook/icon-facebook.component.spec.ts index c09aafb9..272fdea0 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-facebook/icon-facebook.component.spec.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-facebook/icon-facebook.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; import { IconFacebookComponent } from './icon-facebook.component'; diff --git a/src/main/webapp/app/shared/ui/icons/icon-facebook/icon-facebook.component.ts b/src/main/webapp/app/shared/ui/icons/icon-facebook/icon-facebook.component.ts index 9ab79fca..635fb6ad 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-facebook/icon-facebook.component.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-facebook/icon-facebook.component.ts @@ -1,7 +1,9 @@ /** * @module SharedModule - */ /** */ + */ +/** */ import { Component, HostBinding } from '@angular/core'; + /** * Search icon from [Ionicons](http://ionicons.com/). * [Source](https://github.com/driftyco/ionicons/blob/master/src/social-facebook.svg) diff --git a/src/main/webapp/app/shared/ui/icons/icon-heart/icon-heart.component.html b/src/main/webapp/app/shared/ui/icons/icon-heart/icon-heart.component.html index 6900351c..406da62c 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-heart/icon-heart.component.html +++ b/src/main/webapp/app/shared/ui/icons/icon-heart/icon-heart.component.html @@ -1,7 +1,7 @@ - - \ No newline at end of file + diff --git a/src/main/webapp/app/shared/ui/icons/icon-heart/icon-heart.component.spec.ts b/src/main/webapp/app/shared/ui/icons/icon-heart/icon-heart.component.spec.ts index 65239cac..248c5b19 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-heart/icon-heart.component.spec.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-heart/icon-heart.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ -import { DebugElement } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; import { IconHeartComponent } from './icon-heart.component'; diff --git a/src/main/webapp/app/shared/ui/icons/icon-heart/icon-heart.component.ts b/src/main/webapp/app/shared/ui/icons/icon-heart/icon-heart.component.ts index cb9fe2ed..d414beb6 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-heart/icon-heart.component.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-heart/icon-heart.component.ts @@ -1,7 +1,9 @@ /** * @module UiModule - */ /** */ + */ +/** */ import { Component, HostBinding } from '@angular/core'; + /** * Search icon from [Ionicons](http://ionicons.com/). * [Source](https://github.com/driftyco/ionicons/blob/master/src/heart.svg) diff --git a/src/main/webapp/app/shared/ui/icons/icon-instagram/icon-instagram.component.html b/src/main/webapp/app/shared/ui/icons/icon-instagram/icon-instagram.component.html index 2a6f0487..11cb5088 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-instagram/icon-instagram.component.html +++ b/src/main/webapp/app/shared/ui/icons/icon-instagram/icon-instagram.component.html @@ -1,4 +1,4 @@ - - \ No newline at end of file + diff --git a/src/main/webapp/app/shared/ui/icons/icon-instagram/icon-instagram.component.spec.ts b/src/main/webapp/app/shared/ui/icons/icon-instagram/icon-instagram.component.spec.ts index 810c88ac..e12ea0f7 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-instagram/icon-instagram.component.spec.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-instagram/icon-instagram.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; import { IconInstagramComponent } from './icon-instagram.component'; diff --git a/src/main/webapp/app/shared/ui/icons/icon-instagram/icon-instagram.component.ts b/src/main/webapp/app/shared/ui/icons/icon-instagram/icon-instagram.component.ts index 7f5af5c1..0e62fd60 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-instagram/icon-instagram.component.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-instagram/icon-instagram.component.ts @@ -1,7 +1,9 @@ /** * @module SharedModule - */ /** */ + */ +/** */ import { Component, HostBinding } from '@angular/core'; + /** * Search icon from [Ionicons](http://ionicons.com/). * [Source](https://github.com/driftyco/ionicons/blob/master/src/social-instagram-outline.svg) diff --git a/src/main/webapp/app/shared/ui/icons/icon-minus/icon-minus.component.html b/src/main/webapp/app/shared/ui/icons/icon-minus/icon-minus.component.html index 3890a0de..577f5f48 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-minus/icon-minus.component.html +++ b/src/main/webapp/app/shared/ui/icons/icon-minus/icon-minus.component.html @@ -1,6 +1,6 @@ - - \ No newline at end of file + diff --git a/src/main/webapp/app/shared/ui/icons/icon-minus/icon-minus.component.spec.ts b/src/main/webapp/app/shared/ui/icons/icon-minus/icon-minus.component.spec.ts index 7a0ff519..73936b5e 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-minus/icon-minus.component.spec.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-minus/icon-minus.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; import { IconMinusComponent } from './icon-minus.component'; diff --git a/src/main/webapp/app/shared/ui/icons/icon-minus/icon-minus.component.ts b/src/main/webapp/app/shared/ui/icons/icon-minus/icon-minus.component.ts index 51a33827..7091ae72 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-minus/icon-minus.component.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-minus/icon-minus.component.ts @@ -1,7 +1,9 @@ /** * @module UiModule - */ /** */ + */ +/** */ import { Component, HostBinding } from '@angular/core'; + /** * Minus icon from [Ionicons](http://ionicons.com/). * [Source](https://github.com/driftyco/ionicons/blob/master/src/ios-minus-empty.svg) diff --git a/src/main/webapp/app/shared/ui/icons/icon-nav/icon-nav.component.html b/src/main/webapp/app/shared/ui/icons/icon-nav/icon-nav.component.html index 611b174d..125552cb 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-nav/icon-nav.component.html +++ b/src/main/webapp/app/shared/ui/icons/icon-nav/icon-nav.component.html @@ -1,8 +1,8 @@ - - \ No newline at end of file + diff --git a/src/main/webapp/app/shared/ui/icons/icon-nav/icon-nav.component.spec.ts b/src/main/webapp/app/shared/ui/icons/icon-nav/icon-nav.component.spec.ts index 7c0a0e2b..eb3f6ff6 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-nav/icon-nav.component.spec.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-nav/icon-nav.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; import { IconNavComponent } from './icon-nav.component'; diff --git a/src/main/webapp/app/shared/ui/icons/icon-nav/icon-nav.component.ts b/src/main/webapp/app/shared/ui/icons/icon-nav/icon-nav.component.ts index fd10fb0c..e73f8a94 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-nav/icon-nav.component.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-nav/icon-nav.component.ts @@ -1,7 +1,9 @@ /** * @module UiModule - */ /** */ + */ +/** */ import { Component, HostBinding } from '@angular/core'; + /** * Minus icon from [Ionicons](http://ionicons.com/). * [Source](https://github.com/driftyco/ionicons/blob/master/src/navicon.svg) diff --git a/src/main/webapp/app/shared/ui/icons/icon-pinterest/icon-pinterest.component.html b/src/main/webapp/app/shared/ui/icons/icon-pinterest/icon-pinterest.component.html index fbdfddf2..a927af8b 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-pinterest/icon-pinterest.component.html +++ b/src/main/webapp/app/shared/ui/icons/icon-pinterest/icon-pinterest.component.html @@ -1,4 +1,4 @@ - - \ No newline at end of file + diff --git a/src/main/webapp/app/shared/ui/icons/icon-pinterest/icon-pinterest.component.spec.ts b/src/main/webapp/app/shared/ui/icons/icon-pinterest/icon-pinterest.component.spec.ts index 4d1251ef..8eccdaef 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-pinterest/icon-pinterest.component.spec.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-pinterest/icon-pinterest.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; import { IconPinterestComponent } from './icon-pinterest.component'; diff --git a/src/main/webapp/app/shared/ui/icons/icon-pinterest/icon-pinterest.component.ts b/src/main/webapp/app/shared/ui/icons/icon-pinterest/icon-pinterest.component.ts index c630fd73..b7448b6c 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-pinterest/icon-pinterest.component.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-pinterest/icon-pinterest.component.ts @@ -1,7 +1,9 @@ /** * @module SharedModule - */ /** */ + */ +/** */ import { Component, HostBinding } from '@angular/core'; + /** * Search icon from [Ionicons](http://ionicons.com/). * [Source](https://github.com/driftyco/ionicons/blob/master/src/social-pinterest-outline.svg) diff --git a/src/main/webapp/app/shared/ui/icons/icon-plus/icon-plus.component.html b/src/main/webapp/app/shared/ui/icons/icon-plus/icon-plus.component.html index 594506b5..3781ad60 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-plus/icon-plus.component.html +++ b/src/main/webapp/app/shared/ui/icons/icon-plus/icon-plus.component.html @@ -1,6 +1,6 @@ - - \ No newline at end of file + diff --git a/src/main/webapp/app/shared/ui/icons/icon-plus/icon-plus.component.spec.ts b/src/main/webapp/app/shared/ui/icons/icon-plus/icon-plus.component.spec.ts index 380ceb7c..dd92919c 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-plus/icon-plus.component.spec.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-plus/icon-plus.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; import { IconPlusComponent } from './icon-plus.component'; diff --git a/src/main/webapp/app/shared/ui/icons/icon-plus/icon-plus.component.ts b/src/main/webapp/app/shared/ui/icons/icon-plus/icon-plus.component.ts index f03758de..3055ce94 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-plus/icon-plus.component.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-plus/icon-plus.component.ts @@ -1,7 +1,9 @@ /** * @module UiModule - */ /** */ + */ +/** */ import { Component, HostBinding } from '@angular/core'; + /** * Plus icon from [Ionicons](http://ionicons.com/). * [Source](https://github.com/driftyco/ionicons/blob/master/src/ios-plus-empty.svg) diff --git a/src/main/webapp/app/shared/ui/icons/icon-reset/icon-reset.component.html b/src/main/webapp/app/shared/ui/icons/icon-reset/icon-reset.component.html index 81ddf710..84bacc1d 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-reset/icon-reset.component.html +++ b/src/main/webapp/app/shared/ui/icons/icon-reset/icon-reset.component.html @@ -1,8 +1,8 @@ - - \ No newline at end of file + diff --git a/src/main/webapp/app/shared/ui/icons/icon-reset/icon-reset.component.spec.ts b/src/main/webapp/app/shared/ui/icons/icon-reset/icon-reset.component.spec.ts index 53437bb5..0654f937 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-reset/icon-reset.component.spec.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-reset/icon-reset.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; import { IconResetComponent } from './icon-reset.component'; diff --git a/src/main/webapp/app/shared/ui/icons/icon-reset/icon-reset.component.ts b/src/main/webapp/app/shared/ui/icons/icon-reset/icon-reset.component.ts index 74361d35..8796ce0e 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-reset/icon-reset.component.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-reset/icon-reset.component.ts @@ -1,7 +1,9 @@ /** * @module SharedModule - */ /** */ + */ +/** */ import { Component, HostBinding } from '@angular/core'; + /** * Reset icon from [Ionicons](http://ionicons.com/). * [Source](https://github.com/driftyco/ionicons/blob/master/src/ios-reload.svg) diff --git a/src/main/webapp/app/shared/ui/icons/icon-search/icon-search.component.html b/src/main/webapp/app/shared/ui/icons/icon-search/icon-search.component.html index 36a6c009..1b651259 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-search/icon-search.component.html +++ b/src/main/webapp/app/shared/ui/icons/icon-search/icon-search.component.html @@ -1,7 +1,7 @@ - - \ No newline at end of file + diff --git a/src/main/webapp/app/shared/ui/icons/icon-search/icon-search.component.spec.ts b/src/main/webapp/app/shared/ui/icons/icon-search/icon-search.component.spec.ts index eb7c903d..2954c3ad 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-search/icon-search.component.spec.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-search/icon-search.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; import { IconSearchComponent } from './icon-search.component'; diff --git a/src/main/webapp/app/shared/ui/icons/icon-search/icon-search.component.ts b/src/main/webapp/app/shared/ui/icons/icon-search/icon-search.component.ts index e98b0dd8..588219ec 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-search/icon-search.component.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-search/icon-search.component.ts @@ -1,7 +1,9 @@ /** * @module UiModule - */ /** */ + */ +/** */ import { Component, HostBinding } from '@angular/core'; + /** * Search icon from [Ionicons](http://ionicons.com/). * [Source](https://github.com/driftyco/ionicons/blob/master/src/ios-search-strong.svg) diff --git a/src/main/webapp/app/shared/ui/icons/icon-time/icon-time.component.html b/src/main/webapp/app/shared/ui/icons/icon-time/icon-time.component.html index 05bd65b2..ca6061b8 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-time/icon-time.component.html +++ b/src/main/webapp/app/shared/ui/icons/icon-time/icon-time.component.html @@ -1,4 +1,4 @@ - - \ No newline at end of file + diff --git a/src/main/webapp/app/shared/ui/icons/icon-time/icon-time.component.spec.ts b/src/main/webapp/app/shared/ui/icons/icon-time/icon-time.component.spec.ts index dae48939..572a996c 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-time/icon-time.component.spec.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-time/icon-time.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; import { IconTimeComponent } from './icon-time.component'; diff --git a/src/main/webapp/app/shared/ui/icons/icon-time/icon-time.component.ts b/src/main/webapp/app/shared/ui/icons/icon-time/icon-time.component.ts index b87dc3d8..ac04665e 100644 --- a/src/main/webapp/app/shared/ui/icons/icon-time/icon-time.component.ts +++ b/src/main/webapp/app/shared/ui/icons/icon-time/icon-time.component.ts @@ -1,7 +1,9 @@ /** * @module UiModule - */ /** */ + */ +/** */ import { Component, HostBinding } from '@angular/core'; + /** * Timer icon from [Ionicons](http://ionicons.com/). * [Source](https://github.com/driftyco/ionicons/blob/master/src/ios-stopwatch-outline.svg) diff --git a/src/main/webapp/app/shared/ui/input/input.component.spec.ts b/src/main/webapp/app/shared/ui/input/input.component.spec.ts index 6b230330..ee11188f 100644 --- a/src/main/webapp/app/shared/ui/input/input.component.spec.ts +++ b/src/main/webapp/app/shared/ui/input/input.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; import { InputComponent } from './input.component'; import { IconSearchComponent } from '../icons/icon-search/icon-search.component'; diff --git a/src/main/webapp/app/shared/ui/input/input.component.ts b/src/main/webapp/app/shared/ui/input/input.component.ts index 33c85edb..b5cd39bf 100644 --- a/src/main/webapp/app/shared/ui/input/input.component.ts +++ b/src/main/webapp/app/shared/ui/input/input.component.ts @@ -1,13 +1,9 @@ /** * @module UiModule - */ /** */ -import { - Component, - ElementRef, - EventEmitter, - Input, - Output, - ViewChild } from '@angular/core'; + */ +/** */ +import { Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core'; + /** * @whatItDoes Returns a simple ui component as defined in the {@link UiModule}. */ diff --git a/src/main/webapp/app/shared/ui/loading/loading.component.spec.ts b/src/main/webapp/app/shared/ui/loading/loading.component.spec.ts index 2c9be6a5..68a1e82b 100644 --- a/src/main/webapp/app/shared/ui/loading/loading.component.spec.ts +++ b/src/main/webapp/app/shared/ui/loading/loading.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; import { LoadingComponent } from './loading.component'; diff --git a/src/main/webapp/app/shared/ui/loading/loading.component.ts b/src/main/webapp/app/shared/ui/loading/loading.component.ts index 41e7cbff..c32144ee 100644 --- a/src/main/webapp/app/shared/ui/loading/loading.component.ts +++ b/src/main/webapp/app/shared/ui/loading/loading.component.ts @@ -1,7 +1,9 @@ /** * @module UiModule - */ /** */ + */ +/** */ import { Component, HostBinding } from '@angular/core'; + /** * @whatItDoes Returns a loading ui component with accessibility attributes. */ diff --git a/src/main/webapp/app/shared/ui/select/select.component.spec.ts b/src/main/webapp/app/shared/ui/select/select.component.spec.ts index 3a701135..05f61282 100644 --- a/src/main/webapp/app/shared/ui/select/select.component.spec.ts +++ b/src/main/webapp/app/shared/ui/select/select.component.spec.ts @@ -1,7 +1,5 @@ /* tslint:disable:no-unused-variable */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; import { IconArrowDownComponent } from '../../../shared/ui/icons/icon-arrow-down/icon-arrow-down.component'; import { SelectComponent } from '../../../shared/ui/select/select.component'; diff --git a/src/main/webapp/app/shared/ui/select/select.component.ts b/src/main/webapp/app/shared/ui/select/select.component.ts index c11467a3..6cccbb04 100644 --- a/src/main/webapp/app/shared/ui/select/select.component.ts +++ b/src/main/webapp/app/shared/ui/select/select.component.ts @@ -1,13 +1,9 @@ /** * @module UiModule - */ /** */ -import { - Component, - ElementRef, - EventEmitter, - Input, - Output, - ViewChild } from '@angular/core'; + */ +/** */ +import { Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core'; + /** * @whatItDoes Returns a simple ui component as defined in the {@link UiModule}. */ diff --git a/src/main/webapp/app/shared/ui/ui.module.ts b/src/main/webapp/app/shared/ui/ui.module.ts index 2cead334..4807db46 100644 --- a/src/main/webapp/app/shared/ui/ui.module.ts +++ b/src/main/webapp/app/shared/ui/ui.module.ts @@ -1,7 +1,8 @@ /** * @module UiModule * @preferred - */ /** */ + */ +/** */ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; @@ -19,6 +20,7 @@ import { IconTimeComponent } from './icons/icon-time/icon-time.component'; import { LoadingComponent } from './loading/loading.component'; import { InputComponent } from './input/input.component'; import { SelectComponent } from './select/select.component'; + /** * @whatItDoes {@link UiModule} exists to hold the common user interface methods that offers a * consistant look and api to the rest of the app. diff --git a/src/main/webapp/app/shared/validators/email.validator.ts b/src/main/webapp/app/shared/validators/email.validator.ts index e7982ad9..45e30c27 100644 --- a/src/main/webapp/app/shared/validators/email.validator.ts +++ b/src/main/webapp/app/shared/validators/email.validator.ts @@ -1,4 +1,4 @@ -import {AbstractControl} from '@angular/forms'; +import { AbstractControl } from '@angular/forms'; export class EmailValidator { diff --git a/src/main/webapp/content/fonts/socicon.svg b/src/main/webapp/content/fonts/socicon.svg index 32477bf2..a6a954b1 100644 --- a/src/main/webapp/content/fonts/socicon.svg +++ b/src/main/webapp/content/fonts/socicon.svg @@ -1,6 +1,6 @@ - + @@ -119,4 +119,4 @@ - \ No newline at end of file + diff --git a/src/main/webapp/content/images/feed-video.svg b/src/main/webapp/content/images/feed-video.svg index 0e78d4b0..efb708e7 100644 --- a/src/main/webapp/content/images/feed-video.svg +++ b/src/main/webapp/content/images/feed-video.svg @@ -1,5 +1,5 @@ - + diff --git a/src/main/webapp/content/img/app/browsers/chrome.svg b/src/main/webapp/content/img/app/browsers/chrome.svg index f71c2e32..4bed9602 100644 --- a/src/main/webapp/content/img/app/browsers/chrome.svg +++ b/src/main/webapp/content/img/app/browsers/chrome.svg @@ -1 +1,2 @@ - \ No newline at end of file + + diff --git a/src/main/webapp/content/img/app/browsers/ie.svg b/src/main/webapp/content/img/app/browsers/ie.svg index 48e34f08..0aece892 100644 --- a/src/main/webapp/content/img/app/browsers/ie.svg +++ b/src/main/webapp/content/img/app/browsers/ie.svg @@ -1 +1,2 @@ - \ No newline at end of file + + diff --git a/src/main/webapp/content/img/app/browsers/opera.svg b/src/main/webapp/content/img/app/browsers/opera.svg index 57d4347b..a0c58391 100644 --- a/src/main/webapp/content/img/app/browsers/opera.svg +++ b/src/main/webapp/content/img/app/browsers/opera.svg @@ -1 +1,2 @@ - \ No newline at end of file + + diff --git a/src/main/webapp/content/img/arrow-green-up.svg b/src/main/webapp/content/img/arrow-green-up.svg index 8432c6da..8f2b7599 100644 --- a/src/main/webapp/content/img/arrow-green-up.svg +++ b/src/main/webapp/content/img/arrow-green-up.svg @@ -1,7 +1,7 @@ - diff --git a/src/main/webapp/content/img/arrow-red-down.svg b/src/main/webapp/content/img/arrow-red-down.svg index 3afde83c..b5a68226 100644 --- a/src/main/webapp/content/img/arrow-red-down.svg +++ b/src/main/webapp/content/img/arrow-red-down.svg @@ -1,7 +1,7 @@ - diff --git a/src/main/webapp/content/img/comments.svg b/src/main/webapp/content/img/comments.svg index 1b254018..7db42517 100644 --- a/src/main/webapp/content/img/comments.svg +++ b/src/main/webapp/content/img/comments.svg @@ -1,7 +1,7 @@ - diff --git a/src/main/webapp/content/img/shopping-cart.svg b/src/main/webapp/content/img/shopping-cart.svg index 2ffe9c03..f308f985 100644 --- a/src/main/webapp/content/img/shopping-cart.svg +++ b/src/main/webapp/content/img/shopping-cart.svg @@ -1,6 +1,6 @@ - diff --git a/src/main/webapp/content/img/theme/icon/feed/feed-image.svg b/src/main/webapp/content/img/theme/icon/feed/feed-image.svg index 5bb98bc5..abd94b0d 100644 --- a/src/main/webapp/content/img/theme/icon/feed/feed-image.svg +++ b/src/main/webapp/content/img/theme/icon/feed/feed-image.svg @@ -1,7 +1,7 @@ - diff --git a/src/main/webapp/content/img/theme/icon/feed/feed-location.svg b/src/main/webapp/content/img/theme/icon/feed/feed-location.svg index 226f4c15..c5f2571a 100644 --- a/src/main/webapp/content/img/theme/icon/feed/feed-location.svg +++ b/src/main/webapp/content/img/theme/icon/feed/feed-location.svg @@ -1,7 +1,7 @@ - diff --git a/src/main/webapp/content/img/theme/icon/feed/feed-video.svg b/src/main/webapp/content/img/theme/icon/feed/feed-video.svg index 0e78d4b0..efb708e7 100644 --- a/src/main/webapp/content/img/theme/icon/feed/feed-video.svg +++ b/src/main/webapp/content/img/theme/icon/feed/feed-video.svg @@ -1,5 +1,5 @@ - + diff --git a/src/main/webapp/content/img/theme/icon/kameleon/Alien.svg b/src/main/webapp/content/img/theme/icon/kameleon/Alien.svg index f9a3ef0c..683f6974 100644 --- a/src/main/webapp/content/img/theme/icon/kameleon/Alien.svg +++ b/src/main/webapp/content/img/theme/icon/kameleon/Alien.svg @@ -1,7 +1,7 @@ - @@ -704,7 +704,7 @@ - @@ -743,7 +743,7 @@ - @@ -809,7 +809,7 @@ - @@ -848,7 +848,7 @@ - @@ -917,7 +917,7 @@ - @@ -956,7 +956,7 @@ - diff --git a/src/main/webapp/content/img/theme/icon/kameleon/Music-Equalizer.svg b/src/main/webapp/content/img/theme/icon/kameleon/Music-Equalizer.svg index 02fe4bfd..72f92a16 100644 --- a/src/main/webapp/content/img/theme/icon/kameleon/Music-Equalizer.svg +++ b/src/main/webapp/content/img/theme/icon/kameleon/Music-Equalizer.svg @@ -1,7 +1,7 @@ - - - @@ -532,13 +532,13 @@ - - @@ -629,13 +629,13 @@ - - @@ -727,13 +727,13 @@ - - @@ -824,13 +824,13 @@ - - @@ -922,13 +922,13 @@ - - diff --git a/src/main/webapp/content/img/theme/icon/kameleon/Phone-Booth.svg b/src/main/webapp/content/img/theme/icon/kameleon/Phone-Booth.svg index da868c72..4261135e 100644 --- a/src/main/webapp/content/img/theme/icon/kameleon/Phone-Booth.svg +++ b/src/main/webapp/content/img/theme/icon/kameleon/Phone-Booth.svg @@ -1,7 +1,7 @@ -