diff --git a/src/app/app.component.ts b/src/app/app.component.ts index c7c59c7..cbd21b9 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,10 +1,6 @@ -import { - Component, - ViewEncapsulation, - OnInit, -} from '@angular/core'; +import { Component, ViewEncapsulation, OnInit } from '@angular/core'; -import { AuthService } from './shared'; +import { AuthService } from './core'; @Component({ selector: 'app-root', diff --git a/src/app/app.module.ts b/src/app/app.module.ts index ed28196..8bb17e2 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -6,15 +6,9 @@ import { AgmCoreModule } from '@agm/core'; import { AngularFireModule } from 'angularfire2'; import { environment } from '../environments/environment'; -import { - SharedModule, - AuthService, - UserService, - UserPrivateService, -} from './shared'; +import { SharedModule } from './shared'; +import { CoreModule } from './core/core.module'; import { AppRoutingModule } from './app-routing.module'; -import { NavbarModule } from './parts/navbar'; -import { SidenavModule } from './parts/sidenav'; import { AppComponent } from './app.component'; @NgModule({ @@ -27,18 +21,12 @@ import { AppComponent } from './app.component'; }), AngularFireModule.initializeApp(environment.firebase), SharedModule, - NavbarModule, - SidenavModule, + CoreModule, AppRoutingModule, ], declarations: [ AppComponent, ], - providers: [ - AuthService, - UserService, - UserPrivateService, - ], bootstrap: [AppComponent] }) export class AppModule { } diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts new file mode 100644 index 0000000..acb8549 --- /dev/null +++ b/src/app/core/core.module.ts @@ -0,0 +1,51 @@ +import { NgModule } from '@angular/core'; +import { DatePipe } from '@angular/common'; + +import { NavbarModule } from './navbar'; +import { SidenavModule } from './sidenav'; +import { + KmlService, + AuthGuard, + AuthService, + CastService, + CommentService, + FileService, + IdService, + JourneyService, + LocationService, + PwService, + StoryService, + UrlShortenerService, + UserPrivateService, + UserService, +} from './services'; + +@NgModule({ + imports: [ + NavbarModule, + SidenavModule, + ], + exports: [ + NavbarModule, + SidenavModule, + ], + declarations: [], + providers: [ + DatePipe, + KmlService, + AuthGuard, + AuthService, + CastService, + CommentService, + FileService, + IdService, + JourneyService, + LocationService, + PwService, + StoryService, + UrlShortenerService, + UserPrivateService, + UserService, + ], +}) +export class CoreModule { } diff --git a/src/app/core/index.ts b/src/app/core/index.ts new file mode 100644 index 0000000..e371345 --- /dev/null +++ b/src/app/core/index.ts @@ -0,0 +1 @@ +export * from './services'; diff --git a/src/app/parts/navbar/index.ts b/src/app/core/navbar/index.ts similarity index 100% rename from src/app/parts/navbar/index.ts rename to src/app/core/navbar/index.ts diff --git a/src/app/parts/navbar/navbar.component.html b/src/app/core/navbar/navbar.component.html similarity index 100% rename from src/app/parts/navbar/navbar.component.html rename to src/app/core/navbar/navbar.component.html diff --git a/src/app/parts/navbar/navbar.component.scss b/src/app/core/navbar/navbar.component.scss similarity index 100% rename from src/app/parts/navbar/navbar.component.scss rename to src/app/core/navbar/navbar.component.scss diff --git a/src/app/parts/navbar/navbar.component.ts b/src/app/core/navbar/navbar.component.ts similarity index 94% rename from src/app/parts/navbar/navbar.component.ts rename to src/app/core/navbar/navbar.component.ts index 3d47262..47a2823 100644 --- a/src/app/parts/navbar/navbar.component.ts +++ b/src/app/core/navbar/navbar.component.ts @@ -5,8 +5,12 @@ import { ReplaySubject } from 'rxjs/Rx'; import { LiquidGalaxyServer } from 'liquid-galaxy'; import { BehaviorSubject } from 'rxjs/Rx'; -import { AuthService, User, UserService } from '../../shared'; -import { CastService } from '../cast'; +import { User } from '../../shared'; +import { + AuthService, + UserService, + CastService, +} from '../services'; import { SidenavService } from '../sidenav/sidenav.service'; import { SigninComponent } from './signin.component'; diff --git a/src/app/parts/navbar/navbar.module.ts b/src/app/core/navbar/navbar.module.ts similarity index 94% rename from src/app/parts/navbar/navbar.module.ts rename to src/app/core/navbar/navbar.module.ts index e2a877d..8460028 100644 --- a/src/app/parts/navbar/navbar.module.ts +++ b/src/app/core/navbar/navbar.module.ts @@ -6,7 +6,7 @@ import { } from '@angular/material'; import { SharedModule } from '../../shared'; -import { CastModule } from '../cast'; +import { CastModule } from '../../parts/cast'; import { SidenavService } from '../sidenav/sidenav.service'; import { NavbarComponent } from './navbar.component'; import { SigninComponent } from './signin.component'; diff --git a/src/app/parts/navbar/signin.component.html b/src/app/core/navbar/signin.component.html similarity index 100% rename from src/app/parts/navbar/signin.component.html rename to src/app/core/navbar/signin.component.html diff --git a/src/app/parts/navbar/signin.component.scss b/src/app/core/navbar/signin.component.scss similarity index 100% rename from src/app/parts/navbar/signin.component.scss rename to src/app/core/navbar/signin.component.scss diff --git a/src/app/parts/navbar/signin.component.ts b/src/app/core/navbar/signin.component.ts similarity index 87% rename from src/app/parts/navbar/signin.component.ts rename to src/app/core/navbar/signin.component.ts index 7c7685b..282f041 100644 --- a/src/app/parts/navbar/signin.component.ts +++ b/src/app/core/navbar/signin.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { AuthService } from '../../shared'; +import { AuthService } from '../services'; @Component({ selector: 'app-signin', diff --git a/src/app/shared/services/auth-guard.service.ts b/src/app/core/services/auth-guard.service.ts similarity index 100% rename from src/app/shared/services/auth-guard.service.ts rename to src/app/core/services/auth-guard.service.ts diff --git a/src/app/shared/services/auth.service.ts b/src/app/core/services/auth.service.ts similarity index 96% rename from src/app/shared/services/auth.service.ts rename to src/app/core/services/auth.service.ts index 631e243..4e5c111 100644 --- a/src/app/shared/services/auth.service.ts +++ b/src/app/core/services/auth.service.ts @@ -3,7 +3,7 @@ import { Observable } from 'rxjs/Rx'; import { AngularFireAuth } from 'angularfire2/auth'; import * as firebase from 'firebase/app'; -import { User, UserPrivate } from '../models'; +import { User, UserPrivate } from '../../shared'; import { UserService } from './user.service'; import { UserPrivateService } from './user-private.service'; diff --git a/src/app/parts/cast/cast.service.ts b/src/app/core/services/cast.service.ts similarity index 96% rename from src/app/parts/cast/cast.service.ts rename to src/app/core/services/cast.service.ts index a706ecd..64dbe70 100644 --- a/src/app/parts/cast/cast.service.ts +++ b/src/app/core/services/cast.service.ts @@ -7,8 +7,6 @@ export class CastService { // The solo (or no) server that has a connection established. active: BehaviorSubject = new BehaviorSubject(undefined); - constructor() { } - setActive(server: LiquidGalaxyServer) { this.unsetActive(); this.active.next(server); diff --git a/src/app/shared/services/comment.service.ts b/src/app/core/services/comment.service.ts similarity index 95% rename from src/app/shared/services/comment.service.ts rename to src/app/core/services/comment.service.ts index 295d63a..a1ca15b 100644 --- a/src/app/shared/services/comment.service.ts +++ b/src/app/core/services/comment.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { AngularFireDatabase } from 'angularfire2/database'; -import { Comment } from '../models'; +import { Comment } from '../../shared'; @Injectable() export class CommentService { diff --git a/src/app/shared/services/file.service.ts b/src/app/core/services/file.service.ts similarity index 100% rename from src/app/shared/services/file.service.ts rename to src/app/core/services/file.service.ts diff --git a/src/app/shared/services/id.service.ts b/src/app/core/services/id.service.ts similarity index 100% rename from src/app/shared/services/id.service.ts rename to src/app/core/services/id.service.ts diff --git a/src/app/shared/services/index.ts b/src/app/core/services/index.ts similarity index 93% rename from src/app/shared/services/index.ts rename to src/app/core/services/index.ts index 7801e3c..35404a9 100644 --- a/src/app/shared/services/index.ts +++ b/src/app/core/services/index.ts @@ -1,6 +1,7 @@ export * from './kml'; export * from './auth-guard.service'; export * from './auth.service'; +export * from './cast.service'; export * from './comment.service'; export * from './id.service'; export * from './file.service'; diff --git a/src/app/shared/services/journey.service.spec.ts b/src/app/core/services/journey.service.spec.ts similarity index 97% rename from src/app/shared/services/journey.service.spec.ts rename to src/app/core/services/journey.service.spec.ts index 66e35a0..bf6e4b8 100644 --- a/src/app/shared/services/journey.service.spec.ts +++ b/src/app/core/services/journey.service.spec.ts @@ -9,7 +9,7 @@ import { JourneyService } from './journey.service'; import { StoryService } from './story.service'; import { FileService } from './file.service'; import { IdService } from './id.service'; -import { Journey } from '../models'; +import { Journey } from '../../shared'; class MockAngularFireDatabase { read = false; diff --git a/src/app/shared/services/journey.service.ts b/src/app/core/services/journey.service.ts similarity index 98% rename from src/app/shared/services/journey.service.ts rename to src/app/core/services/journey.service.ts index a44fc83..442e7a0 100644 --- a/src/app/shared/services/journey.service.ts +++ b/src/app/core/services/journey.service.ts @@ -3,7 +3,7 @@ import { Observable } from 'rxjs/Observable'; import { AngularFireDatabase } from 'angularfire2/database'; import * as firebase from 'firebase'; -import { Journey, Story } from '../models'; +import { Journey, Story } from '../../shared'; import { FileService } from './file.service'; import { StoryService } from './story.service'; import { IdService } from './id.service'; diff --git a/src/app/shared/services/kml/html-templates.ts b/src/app/core/services/kml/html-templates.ts similarity index 100% rename from src/app/shared/services/kml/html-templates.ts rename to src/app/core/services/kml/html-templates.ts diff --git a/src/app/shared/services/kml/index.ts b/src/app/core/services/kml/index.ts similarity index 100% rename from src/app/shared/services/kml/index.ts rename to src/app/core/services/kml/index.ts diff --git a/src/app/shared/services/kml/kml.service.ts b/src/app/core/services/kml/kml.service.ts similarity index 98% rename from src/app/shared/services/kml/kml.service.ts rename to src/app/core/services/kml/kml.service.ts index 2c70053..7f26eca 100644 --- a/src/app/shared/services/kml/kml.service.ts +++ b/src/app/core/services/kml/kml.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { DatePipe } from '@angular/common'; -import { Story, User } from '../../models'; +import { Story, User } from '../../../shared'; import html from './html-templates'; import xml from './xml-templates'; diff --git a/src/app/shared/services/kml/xml-templates.ts b/src/app/core/services/kml/xml-templates.ts similarity index 100% rename from src/app/shared/services/kml/xml-templates.ts rename to src/app/core/services/kml/xml-templates.ts diff --git a/src/app/shared/services/location.service.ts b/src/app/core/services/location.service.ts similarity index 100% rename from src/app/shared/services/location.service.ts rename to src/app/core/services/location.service.ts diff --git a/src/app/shared/services/pw.service.ts b/src/app/core/services/pw.service.ts similarity index 96% rename from src/app/shared/services/pw.service.ts rename to src/app/core/services/pw.service.ts index bda2bc7..78b2447 100644 --- a/src/app/shared/services/pw.service.ts +++ b/src/app/core/services/pw.service.ts @@ -4,7 +4,7 @@ import { AngularFireAuth } from 'angularfire2/auth'; import { AngularFireDatabase } from 'angularfire2/database'; import * as firebase from 'firebase'; -import { Pw } from '../models'; +import { Pw } from '../../shared'; @Injectable() export class PwService { diff --git a/src/app/shared/services/story.service.ts b/src/app/core/services/story.service.ts similarity index 98% rename from src/app/shared/services/story.service.ts rename to src/app/core/services/story.service.ts index f19d2f9..ba528a3 100644 --- a/src/app/shared/services/story.service.ts +++ b/src/app/core/services/story.service.ts @@ -3,7 +3,7 @@ import { Observable } from 'rxjs/Observable'; import { AngularFireDatabase } from 'angularfire2/database'; import * as firebase from 'firebase'; -import { Story } from '../models'; +import { Story } from '../../shared'; import { FileService } from './file.service'; import { IdService } from './id.service'; diff --git a/src/app/shared/services/url-shortener.service.ts b/src/app/core/services/url-shortener.service.ts similarity index 100% rename from src/app/shared/services/url-shortener.service.ts rename to src/app/core/services/url-shortener.service.ts diff --git a/src/app/shared/services/user-private.service.ts b/src/app/core/services/user-private.service.ts similarity index 94% rename from src/app/shared/services/user-private.service.ts rename to src/app/core/services/user-private.service.ts index f04e40a..1e8759c 100644 --- a/src/app/shared/services/user-private.service.ts +++ b/src/app/core/services/user-private.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Rx'; import { AngularFireDatabase } from 'angularfire2/database'; -import { UserPrivate } from '../models'; +import { UserPrivate } from '../../shared'; @Injectable() export class UserPrivateService { diff --git a/src/app/shared/services/user.service.ts b/src/app/core/services/user.service.ts similarity index 97% rename from src/app/shared/services/user.service.ts rename to src/app/core/services/user.service.ts index 0b9381c..9ee4285 100644 --- a/src/app/shared/services/user.service.ts +++ b/src/app/core/services/user.service.ts @@ -4,7 +4,7 @@ import { AngularFireAuth } from 'angularfire2/auth'; import { AngularFireDatabase } from 'angularfire2/database'; import * as firebase from 'firebase'; -import { User } from '../models'; +import { User } from '../../shared'; @Injectable() export class UserService { diff --git a/src/app/parts/sidenav/index.ts b/src/app/core/sidenav/index.ts similarity index 100% rename from src/app/parts/sidenav/index.ts rename to src/app/core/sidenav/index.ts diff --git a/src/app/parts/sidenav/sidenav-links.component.html b/src/app/core/sidenav/sidenav-links.component.html similarity index 100% rename from src/app/parts/sidenav/sidenav-links.component.html rename to src/app/core/sidenav/sidenav-links.component.html diff --git a/src/app/parts/sidenav/sidenav-links.component.scss b/src/app/core/sidenav/sidenav-links.component.scss similarity index 100% rename from src/app/parts/sidenav/sidenav-links.component.scss rename to src/app/core/sidenav/sidenav-links.component.scss diff --git a/src/app/parts/sidenav/sidenav-links.component.ts b/src/app/core/sidenav/sidenav-links.component.ts similarity index 100% rename from src/app/parts/sidenav/sidenav-links.component.ts rename to src/app/core/sidenav/sidenav-links.component.ts diff --git a/src/app/parts/sidenav/sidenav.component.html b/src/app/core/sidenav/sidenav.component.html similarity index 100% rename from src/app/parts/sidenav/sidenav.component.html rename to src/app/core/sidenav/sidenav.component.html diff --git a/src/app/parts/sidenav/sidenav.component.scss b/src/app/core/sidenav/sidenav.component.scss similarity index 100% rename from src/app/parts/sidenav/sidenav.component.scss rename to src/app/core/sidenav/sidenav.component.scss diff --git a/src/app/parts/sidenav/sidenav.component.ts b/src/app/core/sidenav/sidenav.component.ts similarity index 100% rename from src/app/parts/sidenav/sidenav.component.ts rename to src/app/core/sidenav/sidenav.component.ts diff --git a/src/app/parts/sidenav/sidenav.module.ts b/src/app/core/sidenav/sidenav.module.ts similarity index 100% rename from src/app/parts/sidenav/sidenav.module.ts rename to src/app/core/sidenav/sidenav.module.ts diff --git a/src/app/parts/sidenav/sidenav.service.ts b/src/app/core/sidenav/sidenav.service.ts similarity index 100% rename from src/app/parts/sidenav/sidenav.service.ts rename to src/app/core/sidenav/sidenav.service.ts diff --git a/src/app/journey/detail/journey-detail-cast.component.ts b/src/app/journey/detail/journey-detail-cast.component.ts index 8201466..27a1e51 100644 --- a/src/app/journey/detail/journey-detail-cast.component.ts +++ b/src/app/journey/detail/journey-detail-cast.component.ts @@ -5,9 +5,11 @@ import { LiquidGalaxyServer } from 'liquid-galaxy'; import { User, Story, - KmlService, } from '../../shared'; -import { CastService } from '../../parts/cast'; +import { + CastService, + KmlService, +} from '../../core'; @Component({ selector: 'app-journey-detail-cast', diff --git a/src/app/journey/detail/journey-detail.component.ts b/src/app/journey/detail/journey-detail.component.ts index 2ddf864..b2d722f 100644 --- a/src/app/journey/detail/journey-detail.component.ts +++ b/src/app/journey/detail/journey-detail.component.ts @@ -10,13 +10,15 @@ import { FormUtils, SafeStylePipe, User, - UserService, Journey, - JourneyService, Story, - StoryService, } from '../../shared'; -import { CastService } from '../../parts/cast'; +import { + UserService, + JourneyService, + StoryService, + CastService, +} from '../../core'; import { ConfirmComponent } from '../../parts/confirm'; @Component({ diff --git a/src/app/journey/journey-resolver.service.ts b/src/app/journey/journey-resolver.service.ts index a572c7c..2048c53 100644 --- a/src/app/journey/journey-resolver.service.ts +++ b/src/app/journey/journey-resolver.service.ts @@ -2,10 +2,8 @@ import { Injectable } from '@angular/core'; import { Resolve, Router, RouterStateSnapshot, ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs/Rx'; -import { - Journey, - JourneyService, -} from '../shared'; +import { Journey } from '../shared'; +import { JourneyService } from '../core'; @Injectable() export class JourneyResolver implements Resolve { diff --git a/src/app/journey/journey-routing.module.ts b/src/app/journey/journey-routing.module.ts index ae64f84..9faf5f9 100644 --- a/src/app/journey/journey-routing.module.ts +++ b/src/app/journey/journey-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { AuthGuard } from '../shared'; +import { AuthGuard } from '../core'; import { JourneyResolver } from './journey-resolver.service'; import { JourneyListComponent } from './list/journey-list.component'; import { JourneyNewComponent } from './new/journey-new.component'; diff --git a/src/app/journey/journey.module.ts b/src/app/journey/journey.module.ts index 901c0a6..4941c4d 100644 --- a/src/app/journey/journey.module.ts +++ b/src/app/journey/journey.module.ts @@ -14,12 +14,6 @@ import { import { SharedModule, SafeStylePipe, - AuthGuard, - JourneyService, - FileService, - StoryService, - IdService, - PwService, } from '../shared'; import { CastModule } from '../parts/cast'; import { ConfirmModule, ConfirmComponent } from '../parts/confirm'; @@ -63,14 +57,8 @@ import { JourneyRoutingModule } from './journey-routing.module'; ConfirmComponent, ], providers: [ - AuthGuard, JourneyResolver, - JourneyService, - FileService, - StoryService, - IdService, SafeStylePipe, - PwService, ], }) export class JourneyModule { } diff --git a/src/app/journey/list/journey-list-owner.component.ts b/src/app/journey/list/journey-list-owner.component.ts index a85f994..acde6d1 100644 --- a/src/app/journey/list/journey-list-owner.component.ts +++ b/src/app/journey/list/journey-list-owner.component.ts @@ -1,9 +1,7 @@ import { Component, OnInit, Input } from '@angular/core'; -import { - User, - UserService, -} from '../../shared'; +import { User } from '../../shared'; +import { UserService } from '../../core'; @Component({ selector: 'app-journey-list-owner', diff --git a/src/app/journey/list/journey-list.component.ts b/src/app/journey/list/journey-list.component.ts index 63f2131..6bb98f9 100644 --- a/src/app/journey/list/journey-list.component.ts +++ b/src/app/journey/list/journey-list.component.ts @@ -1,10 +1,8 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; import { ReplaySubject } from 'rxjs/Rx'; -import { - Journey, - JourneyService, -} from '../../shared'; +import { Journey } from '../../shared'; +import { JourneyService } from '../../core'; @Component({ selector: 'app-journey-list', diff --git a/src/app/journey/new/journey-new.component.ts b/src/app/journey/new/journey-new.component.ts index a9b31c6..6e130a0 100644 --- a/src/app/journey/new/journey-new.component.ts +++ b/src/app/journey/new/journey-new.component.ts @@ -8,8 +8,8 @@ import * as firebase from 'firebase'; import { FormUtils, Journey, - JourneyService, } from '../../shared'; +import { JourneyService } from '../../core'; @Component({ selector: 'app-journey-new', diff --git a/src/app/journey/story-new/story-new.component.ts b/src/app/journey/story-new/story-new.component.ts index cff173c..a1894b5 100644 --- a/src/app/journey/story-new/story-new.component.ts +++ b/src/app/journey/story-new/story-new.component.ts @@ -6,8 +6,8 @@ import * as firebase from 'firebase'; import { Journey, Story, - StoryService, } from '../../shared'; +import { StoryService } from '../../core'; @Component({ selector: 'app-story-new', diff --git a/src/app/parts/cast/cast-to.component.ts b/src/app/parts/cast/cast-to.component.ts index ef5fb73..8869173 100644 --- a/src/app/parts/cast/cast-to.component.ts +++ b/src/app/parts/cast/cast-to.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { BehaviorSubject } from 'rxjs/Rx'; import { LiquidGalaxy, LiquidGalaxyServer } from 'liquid-galaxy'; -import { CastService } from './cast.service'; +import { CastService } from '../../core'; @Component({ selector: 'app-cast-to', diff --git a/src/app/parts/cast/cast.component.ts b/src/app/parts/cast/cast.component.ts index 7054575..b696d43 100644 --- a/src/app/parts/cast/cast.component.ts +++ b/src/app/parts/cast/cast.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; import { MdDialog } from '@angular/material'; import { CastToComponent } from './cast-to.component'; @@ -7,12 +7,8 @@ import { CastToComponent } from './cast-to.component'; selector: 'app-cast', templateUrl: 'cast.component.html', }) -export class CastComponent implements OnInit { - constructor( - private dialog: MdDialog, - ) { } - - ngOnInit() { } +export class CastComponent { + constructor(private dialog: MdDialog) { } openCastToDialog() { this.dialog.open(CastToComponent); diff --git a/src/app/parts/cast/cast.module.ts b/src/app/parts/cast/cast.module.ts index 63b3fd9..de2079f 100644 --- a/src/app/parts/cast/cast.module.ts +++ b/src/app/parts/cast/cast.module.ts @@ -5,9 +5,8 @@ import { } from '@angular/material'; import { SharedModule } from '../../shared'; -import { CastService } from './cast.service'; import { CastComponent } from './cast.component'; -import { CastToComponent } from './cast-to.component'; +// import { CastToComponent } from './cast-to.component'; import { CastingComponent } from './casting.component'; @NgModule({ @@ -22,10 +21,9 @@ import { CastingComponent } from './casting.component'; ], declarations: [ CastComponent, - CastToComponent, + // CastToComponent, CastingComponent, ], - entryComponents: [CastToComponent], - providers: [CastService], + // entryComponents: [CastToComponent], }) export class CastModule { } diff --git a/src/app/parts/cast/casting.component.ts b/src/app/parts/cast/casting.component.ts index eca655f..30d73f8 100644 --- a/src/app/parts/cast/casting.component.ts +++ b/src/app/parts/cast/casting.component.ts @@ -2,7 +2,7 @@ import { Component, OnChanges, Input, Output, EventEmitter, SimpleChanges } from import { BehaviorSubject } from 'rxjs/Rx'; import { LiquidGalaxyServer } from 'liquid-galaxy'; -import { CastService } from './cast.service'; +import { CastService } from '../../core'; @Component({ selector: 'app-casting', diff --git a/src/app/parts/cast/index.ts b/src/app/parts/cast/index.ts index 31c1843..32b3b50 100644 --- a/src/app/parts/cast/index.ts +++ b/src/app/parts/cast/index.ts @@ -1,4 +1,3 @@ export * from './cast.component'; export * from './cast.module'; -export * from './cast.service'; export * from './casting.component'; diff --git a/src/app/parts/physical-web/pw-new-save.component.ts b/src/app/parts/physical-web/pw-new-save.component.ts index b5cff64..821df00 100644 --- a/src/app/parts/physical-web/pw-new-save.component.ts +++ b/src/app/parts/physical-web/pw-new-save.component.ts @@ -4,13 +4,13 @@ import { Observable } from 'rxjs/Rx'; import { Beacon, BeaconService } from 'eddystone-web-bluetooth'; import * as firebase from 'firebase'; +import { Pw } from '../../shared'; import { LocationService, FileService, UrlShortenerService, - Pw, PwService, -} from '../../shared'; +} from '../../core'; @Component({ selector: 'app-pw-new-save', diff --git a/src/app/parts/physical-web/pw.module.ts b/src/app/parts/physical-web/pw.module.ts index baeb6c4..8e9d18f 100644 --- a/src/app/parts/physical-web/pw.module.ts +++ b/src/app/parts/physical-web/pw.module.ts @@ -5,11 +5,7 @@ import { MdDialogModule, } from '@angular/material'; -import { - SharedModule, - LocationService, - UrlShortenerService, -} from '../../shared'; +import { SharedModule } from '../../shared'; import { PwNewComponent } from './pw-new.component'; import { PwNewScanComponent } from './pw-new-scan.component'; import { PwNewSaveComponent } from './pw-new-save.component'; @@ -37,9 +33,5 @@ import { PwNewDirective } from './pw-new.directive'; entryComponents: [ PwNewComponent, ], - providers: [ - LocationService, - UrlShortenerService, - ], }) export class PwModule { } diff --git a/src/app/physical-web/pw-list.component.ts b/src/app/physical-web/pw-list.component.ts index 349b33c..5c38822 100644 --- a/src/app/physical-web/pw-list.component.ts +++ b/src/app/physical-web/pw-list.component.ts @@ -2,10 +2,8 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; import { DataSource } from '@angular/cdk'; import { Observable, ReplaySubject } from 'rxjs/Rx'; -import { - Pw, - PwService, -} from '../shared'; +import { Pw } from '../shared'; +import { PwService } from '../core'; @Component({ selector: 'app-pw-list', diff --git a/src/app/physical-web/pw.module.ts b/src/app/physical-web/pw.module.ts index ffb9c46..5ec5d96 100644 --- a/src/app/physical-web/pw.module.ts +++ b/src/app/physical-web/pw.module.ts @@ -2,10 +2,8 @@ import { NgModule } from '@angular/core'; import { CdkTableModule } from '@angular/cdk'; import { MdTableModule } from '@angular/material'; -import { - SharedModule, - PwService, -} from '../shared'; +import { SharedModule } from '../shared'; +import { PwService } from '../core'; import { PwComponent } from './pw.component'; import { PwIntroComponent } from './pw-intro.component'; import { PwListComponent } from './pw-list.component'; diff --git a/src/app/shared/index.ts b/src/app/shared/index.ts index 758f07e..92933bd 100644 --- a/src/app/shared/index.ts +++ b/src/app/shared/index.ts @@ -1,6 +1,5 @@ export * from './directives'; export * from './models'; export * from './pipes'; -export * from './services'; export * from './utils'; export * from './shared.module'; diff --git a/src/app/story/detail/banner/story-detail-banner.component.ts b/src/app/story/detail/banner/story-detail-banner.component.ts index 88434ef..5b28aca 100644 --- a/src/app/story/detail/banner/story-detail-banner.component.ts +++ b/src/app/story/detail/banner/story-detail-banner.component.ts @@ -8,9 +8,9 @@ import { Observable } from 'rxjs/Rx'; import { FormUtils, - FileService, SafeStylePipe, } from '../../../shared'; +import { FileService } from '../../../core'; import { StoryDetailEditComponent } from '../story-detail-edit.component'; @Component({ diff --git a/src/app/story/detail/cast/story-detail-cast.component.ts b/src/app/story/detail/cast/story-detail-cast.component.ts index d54c534..59b50c9 100644 --- a/src/app/story/detail/cast/story-detail-cast.component.ts +++ b/src/app/story/detail/cast/story-detail-cast.component.ts @@ -5,10 +5,12 @@ import { LiquidGalaxyServer } from 'liquid-galaxy'; import { User, Story, +} from '../../../shared'; +import { StoryService, KmlService, -} from '../../../shared'; -import { CastService } from '../../../parts/cast'; +} from '../../../core'; +import { CastService } from '../../../core'; @Component({ selector: 'app-story-detail-cast', diff --git a/src/app/story/detail/comment/story-detail-comment-new.component.ts b/src/app/story/detail/comment/story-detail-comment-new.component.ts index a5be263..e986b87 100644 --- a/src/app/story/detail/comment/story-detail-comment-new.component.ts +++ b/src/app/story/detail/comment/story-detail-comment-new.component.ts @@ -6,11 +6,13 @@ import * as firebase from 'firebase'; import { User, - UserService, Story, Comment, - CommentService, } from '../../../shared'; +import { + UserService, + CommentService, +} from '../../../core'; @Component({ selector: 'app-story-detail-comment-new', diff --git a/src/app/story/detail/comment/story-detail-comment.component.ts b/src/app/story/detail/comment/story-detail-comment.component.ts index 05dc678..e738f6a 100644 --- a/src/app/story/detail/comment/story-detail-comment.component.ts +++ b/src/app/story/detail/comment/story-detail-comment.component.ts @@ -3,11 +3,13 @@ import { ReplaySubject } from 'rxjs/Rx'; import { User, - UserService, Story, Comment, - CommentService, } from '../../../shared'; +import { + UserService, + CommentService, +} from '../../../core'; @Component({ selector: 'app-story-detail-comment', diff --git a/src/app/story/detail/photo/story-detail-photo.component.ts b/src/app/story/detail/photo/story-detail-photo.component.ts index b55cc04..c148b71 100644 --- a/src/app/story/detail/photo/story-detail-photo.component.ts +++ b/src/app/story/detail/photo/story-detail-photo.component.ts @@ -9,9 +9,9 @@ import { Validators } from './validators'; import { FormUtils, - FileService, SafeUrlPipe, } from '../../../shared'; +import { FileService } from '../../../core'; import { StoryDetailEditComponent } from '../story-detail-edit.component'; import { StoryDetailGalleryComponent } from './story-detail-gallery.component'; import { MediaType } from './media-type'; diff --git a/src/app/story/detail/story-detail.component.ts b/src/app/story/detail/story-detail.component.ts index 36cdadd..887c7e1 100644 --- a/src/app/story/detail/story-detail.component.ts +++ b/src/app/story/detail/story-detail.component.ts @@ -10,11 +10,13 @@ import { LiquidGalaxyServer } from 'liquid-galaxy'; import { User, - UserService, Story, - StoryService, } from '../../shared'; -import { CastService } from '../../parts/cast'; +import { + UserService, + StoryService, + CastService, +} from '../../core'; import { ConfirmComponent } from '../../parts/confirm'; import { EditState } from './edit-state'; diff --git a/src/app/story/detail/story-detail.module.ts b/src/app/story/detail/story-detail.module.ts index 63d39c0..e5eeec8 100644 --- a/src/app/story/detail/story-detail.module.ts +++ b/src/app/story/detail/story-detail.module.ts @@ -16,11 +16,6 @@ import { SharedModule, SafeStylePipe, SafeUrlPipe, - FileService, - IdService, - StoryService, - CommentService, - PwService, } from '../../shared'; import { CastModule } from '../../parts/cast'; import { PwModule } from '../../parts/physical-web'; @@ -73,13 +68,8 @@ import { StoryDetailTitleComponent } from './title/story-detail-title.component' StoryDetailGalleryComponent, ], providers: [ - CommentService, SafeStylePipe, SafeUrlPipe, - FileService, - IdService, - StoryService, - PwService, ], }) export class StoryDetailModule { } diff --git a/src/app/story/story-resolver.service.ts b/src/app/story/story-resolver.service.ts index 5edf276..f37a662 100644 --- a/src/app/story/story-resolver.service.ts +++ b/src/app/story/story-resolver.service.ts @@ -2,10 +2,8 @@ import { Injectable } from '@angular/core'; import { Resolve, Router, RouterStateSnapshot, ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs/Rx'; -import { - Story, - StoryService, -} from '../shared'; +import { Story } from '../shared'; +import { StoryService } from '../core'; @Injectable() export class StoryResolver implements Resolve { diff --git a/src/app/user/detail/user-detail.component.ts b/src/app/user/detail/user-detail.component.ts index 03c19e6..baa42c7 100644 --- a/src/app/user/detail/user-detail.component.ts +++ b/src/app/user/detail/user-detail.component.ts @@ -4,12 +4,14 @@ import { ReplaySubject } from 'rxjs/Rx'; import { User, - UserService, UserPrivate, - UserPrivateService, Journey, - JourneyService, } from '../../shared'; +import { + UserService, + UserPrivateService, + JourneyService, +} from '../../core'; @Component({ selector: 'app-user-detail', diff --git a/src/app/user/list/user-list.component.ts b/src/app/user/list/user-list.component.ts index 0bb2a03..7af45a4 100644 --- a/src/app/user/list/user-list.component.ts +++ b/src/app/user/list/user-list.component.ts @@ -3,8 +3,10 @@ import { ReplaySubject } from 'rxjs/Rx'; import { User, - UserService, } from '../../shared'; +import { + UserService, +} from '../../core'; @Component({ selector: 'app-user-list', diff --git a/src/app/user/user-resolver.service.ts b/src/app/user/user-resolver.service.ts index b9050cb..099be9f 100644 --- a/src/app/user/user-resolver.service.ts +++ b/src/app/user/user-resolver.service.ts @@ -2,10 +2,8 @@ import { Injectable } from '@angular/core'; import { Resolve, Router, RouterStateSnapshot, ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs/Rx'; -import { - User, - UserService, -} from '../shared'; +import { User } from '../shared'; +import { UserService } from '../core'; @Injectable() export class UserResolver implements Resolve { diff --git a/src/app/user/user.module.ts b/src/app/user/user.module.ts index f2807f3..929d9ef 100644 --- a/src/app/user/user.module.ts +++ b/src/app/user/user.module.ts @@ -1,13 +1,7 @@ import { NgModule } from '@angular/core'; import { MdCardModule } from '@angular/material'; -import { - SharedModule, - JourneyService, - StoryService, - FileService, - IdService, -} from '../shared'; +import { SharedModule } from '../shared'; import { UserResolver } from './user-resolver.service'; import { UserListComponent } from './list/user-list.component'; import { UserDetailComponent } from './detail/user-detail.component'; @@ -25,10 +19,7 @@ import { UserRoutingModule } from './user-routing.module'; UserDetailComponent, ], providers: [ - JourneyService, - StoryService, - FileService, - IdService, + SharedModule, UserResolver, ], })