Merge pull request #180 from btroncone/reorganize

Reorganize into core and material modules

Author: ashwin-sureshkumar

package.json

@@ -42,7 +42,6 @@
     "@types/hammerjs": "2.0.35",
     "core-js": "2.4.1",
     "hammerjs": "2.0.8",
-    "ngx-clipboard": "8.1.0",
     "rxjs": "5.5.2",
     "ts-loader": "3.1.1",
     "zone.js": "0.8.14"

src/app/app.component.spec.ts

@@ -2,9 +2,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { AppComponent } from './app.component';
-import { ToolbarModule } from './toolbar/toolbar.module';
 import { MatSidenavModule, MatListModule } from '@angular/material';
-import { SeoService } from './services/seo.service';
+import { CoreModule } from './core/core.module';
 
 describe('AppComponent', () => {
   let component: AppComponent;
@@ -16,12 +15,11 @@ describe('AppComponent', () => {
         imports: [
           RouterTestingModule,
           BrowserAnimationsModule,
-          ToolbarModule,
+          CoreModule.forRoot(),
           MatSidenavModule,
           MatListModule
         ],
-        declarations: [AppComponent],
-        providers: [SeoService]
+        declarations: [AppComponent]
       }).compileComponents();
     })
   );

src/app/app.component.ts

@@ -6,7 +6,7 @@ import {
   RouterEvent
 } from '@angular/router';
 import { filter, map, mergeMap } from 'rxjs/operators';
-import { SeoService, SeoData } from './services/seo.service';
+import { SeoService, SeoData } from './core/services/seo.service';
 
 interface Menu {
   title: string;

src/app/app.module.ts

@@ -1,24 +1,25 @@
-import { SeoService } from './services/seo.service';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
+import { MatSidenavModule, MatListModule } from '@angular/material';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { NgModule } from '@angular/core';
+import { FlexLayoutModule } from '@angular/flex-layout';
 
-import { AppComponent } from './app.component';
-import { ToolbarModule } from './toolbar/toolbar.module';
-import { MatSidenavModule, MatListModule } from '@angular/material';
+import { CoreModule } from '../app/core/core.module';
+import { MaterialModule } from './material/material.module';
 import { AppRoutingModule } from './app-routing.module';
 
+import { AppComponent } from './app.component';
+
 @NgModule({
   declarations: [AppComponent],
   imports: [
     BrowserModule,
     BrowserAnimationsModule,
-    ToolbarModule,
-    MatListModule,
-    MatSidenavModule,
-    AppRoutingModule
+    FlexLayoutModule,
+    MaterialModule,
+    AppRoutingModule,
+    CoreModule.forRoot()
   ],
-  providers: [SeoService],
   bootstrap: [AppComponent]
 })
 export class AppModule {}

src/app/companies/companies.module.ts

@@ -1,12 +1,9 @@
 import { NgModule } from '@angular/core';
-
 import { CompaniesComponent } from './companies.component';
 import { CompaniesRoutingModule } from './companies-routing.module';
-import { SharedModule } from '../shared.module';
-import { environment } from '../../environments/environment';
 
 @NgModule({
-  imports: [CompaniesRoutingModule, SharedModule],
+  imports: [CompaniesRoutingModule],
   declarations: [CompaniesComponent]
 })
 export class CompaniesModule {}

src/app/toolbar/toolbar.component.html renamed to src/app/core/components/toolbar/toolbar.component.html

@@ -0,0 +1,30 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
+
+import { ToolbarComponent } from './toolbar.component';
+import { MaterialModule } from '../../../material/material.module';
+
+describe('ToolbarComponent', () => {
+  let component: ToolbarComponent;
+  let fixture: ComponentFixture<ToolbarComponent>;
+
+  beforeEach(
+    async(() => {
+      TestBed.configureTestingModule({
+        imports: [MaterialModule, BrowserAnimationsModule, RouterTestingModule],
+        declarations: [ToolbarComponent]
+      }).compileComponents();
+    })
+  );
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ToolbarComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/toolbar/toolbar.component.scss renamed to src/app/core/components/toolbar/toolbar.component.scss

@@ -1,9 +1,9 @@
-import { Component, OnInit, Output, EventEmitter } from "@angular/core";
+import { Component, OnInit, Output, EventEmitter } from '@angular/core';
 
 @Component({
-  selector: "app-toolbar",
-  templateUrl: "./toolbar.component.html",
-  styleUrls: ["./toolbar.component.scss"]
+  selector: 'app-toolbar',
+  templateUrl: './toolbar.component.html',
+  styleUrls: ['./toolbar.component.scss']
 })
 export class ToolbarComponent implements OnInit {
   @Output() navToggle = new EventEmitter<boolean>();

src/app/core/components/toolbar/toolbar.component.spec.ts

@@ -0,0 +1,23 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { RouterModule } from '@angular/router';
+import { FlexLayoutModule } from '@angular/flex-layout';
+
+import { CopierService } from './services/copier.service';
+import { SeoService } from './services/seo.service';
+import { ToolbarComponent } from './components/toolbar/toolbar.component';
+import { MaterialModule } from '../material/material.module';
+
+@NgModule({
+  imports: [FlexLayoutModule, RouterModule, CommonModule, MaterialModule],
+  declarations: [ToolbarComponent],
+  exports: [ToolbarComponent]
+})
+export class CoreModule {
+  static forRoot() {
+    return {
+      ngModule: CoreModule,
+      providers: [CopierService, SeoService]
+    };
+  }
+}