aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2016-11-29 21:41:11 +0100
committerChocobozzz <florian.bigard@gmail.com>2016-11-29 21:41:11 +0100
commit50b0c262fd446e9f57630aa5775e1b4708bdf4cb (patch)
tree8e7a899cb886b2f741546bd8fc2e7084c12deb1e
parentf81bb2853cedd7e65859756a5941d5c7e8b3ca2d (diff)
downloadPeerTube-50b0c262fd446e9f57630aa5775e1b4708bdf4cb.tar.gz
PeerTube-50b0c262fd446e9f57630aa5775e1b4708bdf4cb.tar.zst
PeerTube-50b0c262fd446e9f57630aa5775e1b4708bdf4cb.zip
Client: move menu component in core module
-rw-r--r--client/src/app/app.module.ts5
-rw-r--r--client/src/app/core/core.module.ts9
-rw-r--r--client/src/app/core/menu/index.ts1
-rw-r--r--client/src/app/core/menu/menu.component.html (renamed from client/src/app/menu.component.html)0
-rw-r--r--client/src/app/core/menu/menu.component.ts (renamed from client/src/app/menu.component.ts)4
5 files changed, 10 insertions, 9 deletions
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 555f412e7..e9bb800f4 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -16,8 +16,6 @@ import { LoginModule } from './login';
16import { SharedModule } from './shared'; 16import { SharedModule } from './shared';
17import { VideosModule } from './videos'; 17import { VideosModule } from './videos';
18 18
19import { MenuComponent } from './menu.component';
20
21const metaConfig: MetaConfig = { 19const metaConfig: MetaConfig = {
22 //Append a title suffix such as a site name to all titles 20 //Append a title suffix such as a site name to all titles
23 //Defaults to false 21 //Defaults to false
@@ -35,8 +33,7 @@ const APP_PROVIDERS = [
35@NgModule({ 33@NgModule({
36 bootstrap: [ AppComponent ], 34 bootstrap: [ AppComponent ],
37 declarations: [ 35 declarations: [
38 AppComponent, 36 AppComponent
39 MenuComponent
40 ], 37 ],
41 imports: [ 38 imports: [
42 BrowserModule, 39 BrowserModule,
diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts
index be29b88da..27e6ee1fb 100644
--- a/client/src/app/core/core.module.ts
+++ b/client/src/app/core/core.module.ts
@@ -1,17 +1,20 @@
1import { NgModule, Optional, SkipSelf } from '@angular/core'; 1import { NgModule, Optional, SkipSelf } from '@angular/core';
2import { CommonModule } from '@angular/common'; 2import { CommonModule } from '@angular/common';
3import { HttpModule } from '@angular/http'; 3import { HttpModule } from '@angular/http';
4import { RouterModule } from '@angular/router';
4 5
5import { AuthService } from './auth'; 6import { AuthService } from './auth';
7import { MenuComponent } from './menu';
6import { throwIfAlreadyLoaded } from './module-import-guard'; 8import { throwIfAlreadyLoaded } from './module-import-guard';
7 9
8@NgModule({ 10@NgModule({
9 imports: [ 11 imports: [
10 CommonModule, 12 CommonModule,
11 HttpModule 13 HttpModule,
14 RouterModule
12 ], 15 ],
13 declarations: [ ], 16 declarations: [ MenuComponent ],
14 exports: [ ], 17 exports: [ MenuComponent ],
15 providers: [ AuthService ] 18 providers: [ AuthService ]
16}) 19})
17export class CoreModule { 20export class CoreModule {
diff --git a/client/src/app/core/menu/index.ts b/client/src/app/core/menu/index.ts
new file mode 100644
index 000000000..d07a1144c
--- /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
index 1e9a53246..1e9a53246 100644
--- a/client/src/app/menu.component.html
+++ b/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
index d1a1d51e7..f1bf6966d 100644
--- a/client/src/app/menu.component.ts
+++ b/client/src/app/core/menu/menu.component.ts
@@ -1,8 +1,8 @@
1import { Component, OnInit } from '@angular/core'; 1import { Component, OnInit } from '@angular/core';
2import { Router } from '@angular/router'; 2import { Router } from '@angular/router';
3 3
4import { AuthService } from './core'; 4import { AuthService } from '../auth';
5import { AuthStatus } from './shared'; 5import { AuthStatus } from '../../shared';
6 6
7@Component({ 7@Component({
8 selector: 'my-menu', 8 selector: 'my-menu',