Client: move menu component in core module

diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 555f412e7c44f41a6ce994994a22f73dbe54050e..e9bb800f4f2dfb2a5b793e82afa7e01147e997f8 100644 (file)
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -16,8 +16,6 @@ import { LoginModule } from './login';
 import { SharedModule } from './shared';
 import { VideosModule } from './videos';
 
-import { MenuComponent } from './menu.component';
-
 const metaConfig: MetaConfig = {
   //Append a title suffix such as a site name to all titles
   //Defaults to false
@@ -35,8 +33,7 @@ const APP_PROVIDERS = [
 @NgModule({
   bootstrap: [ AppComponent ],
   declarations: [
-    AppComponent,
-    MenuComponent
+    AppComponent
   ],
   imports: [
     BrowserModule,

diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts
index be29b88daea9204f19a948c9931b3d411fcda766..27e6ee1fb765b2d73aa5e392db9f7001a79bcfc9 100644 (file)
--- a/client/src/app/core/core.module.ts
+++ b/client/src/app/core/core.module.ts
@@ -1,17 +1,20 @@
 import { NgModule, Optional, SkipSelf } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { HttpModule } from '@angular/http';
+import { RouterModule } from '@angular/router';
 
 import { AuthService } from './auth';
+import { MenuComponent } from './menu';
 import { throwIfAlreadyLoaded } from './module-import-guard';
 
 @NgModule({
   imports: [
     CommonModule,
-    HttpModule
+    HttpModule,
+    RouterModule
   ],
-  declarations: [ ],
-  exports: [ ],
+  declarations: [ MenuComponent ],
+  exports: [ MenuComponent ],
   providers: [ AuthService ]
 })
 export class CoreModule {

diff --git a/client/src/app/core/menu/index.ts b/client/src/app/core/menu/index.ts
new file mode 100644 (file)
index 0000000..d07a114
--- /dev/null
+++ b/client/src/app/core/menu/index.ts
@@ -0,0 +1 @@
+export * from './menu.component';

diff --git a/client/src/app/menu.component.html b/client/src/app/core/menu/menu.component.html
similarity index 100%
rename from client/src/app/menu.component.html
rename to client/src/app/core/menu/menu.component.html

diff --git a/client/src/app/menu.component.ts b/client/src/app/core/menu/menu.component.ts
similarity index 92%
rename from client/src/app/menu.component.ts
rename to client/src/app/core/menu/menu.component.ts
index d1a1d51e7ddc76195e558751f0ddaf6aedd3fbad..f1bf6966d63a37a79db5f83dfa9f696d46d3c246 100644 (file)
--- a/client/src/app/menu.component.ts
+++ b/client/src/app/core/menu/menu.component.ts
@@ -1,8 +1,8 @@
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 
-import { AuthService } from './core';
-import { AuthStatus } from './shared';
+import { AuthService } from '../auth';
+import { AuthStatus } from '../../shared';
 
 @Component({
   selector: 'my-menu',