Shared services into core

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',

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 { }

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 { }

src/app/core/index.ts

@@ -0,0 +1 @@
+export * from './services';

src/app/parts/navbar/navbar.component.ts → 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';
 

src/app/parts/navbar/navbar.module.ts → 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';

src/app/parts/navbar/signin.component.ts → 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',

src/app/shared/services/auth.service.ts → 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';
 

src/app/parts/cast/cast.service.ts → 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<LiquidGalaxyServer> = new BehaviorSubject(undefined);
 
-  constructor() { }
-
   setActive(server: LiquidGalaxyServer) {
     this.unsetActive();
     this.active.next(server);

src/app/shared/services/comment.service.ts → 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 {

src/app/shared/services/index.ts → 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';

src/app/shared/services/journey.service.spec.ts → 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;

src/app/shared/services/journey.service.ts → 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';

src/app/shared/services/kml/kml.service.ts → 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';
 

src/app/shared/services/pw.service.ts → 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 {

src/app/shared/services/story.service.ts → 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';
 

src/app/shared/services/user-private.service.ts → 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 {

src/app/shared/services/user.service.ts → 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 {

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',

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({

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<Journey> {

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';

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 { }

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',

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',

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',

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',

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',

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);