feat: add standard SharedModule and other cleanup

Author: NathanWalker

src/client/app/components/app.component.spec.ts

@@ -13,12 +13,13 @@ import { Angulartics2Module, Angulartics2Segment } from 'angulartics2';
 import { t } from '../modules/test/index';
 import { Config } from '../modules/core/index';
 import { TEST_CORE_PROVIDERS, TEST_HTTP_PROVIDERS } from '../modules/core/testing/index';
-import { NameListService, NavbarComponent, ToolbarComponent } from '../modules/sample/index';
+import { NameListService } from '../modules/sample/index';
+import { SharedModule } from '../modules/shared/index';
 import { MultilingualModule } from '../modules/i18n/multilingual.module';
 import { reducer, LanguageProviders } from '../modules/i18n/index';
 
 // module
-import { AppComponent } from './app.component';
+import { APP_COMPONENTS } from './index';
 import { HomeComponent } from './home/home.component';
 import { AboutComponent } from './about/about.component';
 
@@ -31,7 +32,7 @@ const config:Route[] = [
 const testModuleConfig = () => {
   TestBed.configureTestingModule({
     imports: [
-      FormsModule,
+      SharedModule,
       Angulartics2Module.forRoot([
         Angulartics2Segment
       ]),
@@ -40,9 +41,8 @@ const testModuleConfig = () => {
       RouterTestingModule.withRoutes(config)
     ],
     declarations: [
-      TestComponent, AppComponent,
-      HomeComponent, AboutComponent,
-      NavbarComponent, ToolbarComponent
+      TestComponent,
+      ...APP_COMPONENTS
     ],
     providers: [
       TEST_CORE_PROVIDERS(),

src/client/app/components/app.component.ts

@@ -5,8 +5,9 @@ import './operators';
 import { Component, OnInit } from '@angular/core';
 
 // app
-import { AnalyticsService } from '../modules/analytics/index';
-import { Config, LogService, AppService } from '../modules/core/index';
+import { AnalyticsService } from '../modules/analytics/services/index';
+import { LogService, AppService } from '../modules/core/services/index';
+import { Config } from '../modules/core/utils/index';
 
 /**
  * This class represents the main application component.

src/client/app/components/home/home.component.spec.ts

@@ -14,23 +14,25 @@ import { StoreModule } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
 
 import { t } from '../../modules/test/index';
-import { NameListService, NameListEffects, reducer } from '../../modules/sample/index';
+import { NameListService, SampleEffects, reducer } from '../../modules/sample/index';
 import { CoreModule } from '../../modules/core/core.module';
 import { AnalyticsModule } from '../../modules/analytics/analytics.module';
 import { MultilingualModule } from '../../modules/i18n/multilingual.module';
 import { LanguageProviders } from '../../modules/i18n/index';
+import { SharedModule } from '../../modules/shared/index';
 import { HomeComponent } from './home.component';
 
 // test module configuration for each test
 const testModuleConfig = () => {
   TestBed.configureTestingModule({
     imports: [
       CoreModule,
+      SharedModule,
       RouterTestingModule,
       AnalyticsModule,
       MultilingualModule,
       StoreModule.provideStore({ sample: reducer }),
-      EffectsModule.run(NameListEffects)
+      EffectsModule.run(SampleEffects)
     ],
     declarations: [HomeComponent, TestComponent],
     providers: [

src/client/app/modules/analytics/analytics.module.ts

@@ -1,29 +1,25 @@
 // angular
 import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { RouterModule } from '@angular/router';
-import { HttpModule } from '@angular/http';
 
 // lib
 import { Angulartics2Module, Angulartics2Segment } from 'angulartics2';
 
 // module
-import { ANALYTICS_PROVIDERS } from './index';
+import { ANALYTICS_PROVIDERS } from './services/index';
 
 /**
  * Do not specify providers for modules that might be imported by a lazy loaded module.
  */
 
 @NgModule({
   imports: [
-    CommonModule,
-    RouterModule,
-    HttpModule,
     Angulartics2Module.forRoot([
       Angulartics2Segment
     ])
   ],
-  providers: ANALYTICS_PROVIDERS
+  providers: [
+    ...ANALYTICS_PROVIDERS
+  ]
 })
 export class AnalyticsModule {
 

src/client/app/modules/analytics/index.ts

@@ -1,9 +1,2 @@
-// app
-import { AnalyticsService } from './services/analytics.service';
-
-export const ANALYTICS_PROVIDERS: Array<any> = [
-  AnalyticsService
-];
-
-// services
-export * from './services/analytics.service';
+export * from './services/index';
+export * from './analytics.module';

src/client/app/modules/analytics/services/analytics.service.spec.ts

@@ -9,7 +9,7 @@ import { Angulartics2Module, Angulartics2Segment } from 'angulartics2';
 import { t } from '../../test/index';
 
 // module
-import { AnalyticsService, Analytics } from '../index';
+import { AnalyticsService, Analytics } from './analytics.service';
 
 const testModuleConfig = () => {
   TestBed.configureTestingModule({

src/client/app/modules/analytics/services/index.ts

@@ -0,0 +1,9 @@
+// app
+import { AnalyticsService } from './analytics.service';
+
+export const ANALYTICS_PROVIDERS: Array<any> = [
+  AnalyticsService
+];
+
+// services
+export * from './analytics.service';

src/client/app/modules/core/core.module.ts

@@ -6,6 +6,7 @@ import { RouterModule } from '@angular/router';
 import { HttpModule } from '@angular/http';
 
 // module
+import { SharedModule } from '../shared/index';
 import { CORE_DIRECTIVES } from './directives/index';
 import { CORE_PROVIDERS } from './services/index';
 import { Config } from './utils/index';
@@ -21,22 +22,16 @@ interface ICoreModuleOptions {
 
 @NgModule({
   imports: [
-    CommonModule,
-    RouterModule,
-    HttpModule
+    SharedModule
   ],
   declarations: [
-    CORE_DIRECTIVES
+    ...CORE_DIRECTIVES
   ],
   exports: [
-    CommonModule,
-    FormsModule,
-    RouterModule,
-    HttpModule,
-    CORE_DIRECTIVES
+    ...CORE_DIRECTIVES
   ],
   providers: [
-    CORE_PROVIDERS
+    ...CORE_PROVIDERS,
   ]
 })
 export class CoreModule {

src/client/app/modules/core/index.ts

@@ -1,12 +1,5 @@
-// utilities
-// generally static helpers (non-injectables)
 export * from './utils/index';
-
-// interfaces
 export * from './interfaces/index';
-
-// services
 export * from './services/index';
-
-// directives
 export * from './directives/index';
+export * from './core.module';

src/client/app/modules/core/services/app.service.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core';
 
 // app
-import { AnalyticsService } from '../../../modules/analytics/index';
-import { LogService } from './logging/index';
+import { AnalyticsService } from '../../../modules/analytics/services/analytics.service';
+import { LogService } from './logging/log.service';
 import { Config } from '../utils/config';
 
 @Injectable()