aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-07-06 17:43:58 +0200
committerChocobozzz <florian.bigard@gmail.com>2017-07-06 17:43:58 +0200
commit8b13c289f8db1666a3970882797d42f6cfd6128b (patch)
tree4e6183936260e01ed5a0cbd366ddc58f76c1a12b /client/src/app
parent4e1b09735de70dabc5987b8258a01aac8063ae26 (diff)
downloadPeerTube-8b13c289f8db1666a3970882797d42f6cfd6128b.tar.gz
PeerTube-8b13c289f8db1666a3970882797d42f6cfd6128b.tar.zst
PeerTube-8b13c289f8db1666a3970882797d42f6cfd6128b.zip
Fix page titles
Diffstat (limited to 'client/src/app')
-rw-r--r--client/src/app/+admin/admin-routing.module.ts3
-rw-r--r--client/src/app/account/account-routing.module.ts3
-rw-r--r--client/src/app/app.module.ts2
-rw-r--r--client/src/app/login/login-routing.module.ts3
-rw-r--r--client/src/app/signup/signup-routing.module.ts3
-rw-r--r--client/src/app/videos/video-watch/video-watch.component.ts2
-rw-r--r--client/src/app/videos/videos-routing.module.ts3
-rw-r--r--client/src/app/videos/videos.module.ts2
8 files changed, 18 insertions, 3 deletions
diff --git a/client/src/app/+admin/admin-routing.module.ts b/client/src/app/+admin/admin-routing.module.ts
index bcc94a9f3..03782c258 100644
--- a/client/src/app/+admin/admin-routing.module.ts
+++ b/client/src/app/+admin/admin-routing.module.ts
@@ -1,6 +1,8 @@
1import { NgModule } from '@angular/core' 1import { NgModule } from '@angular/core'
2import { RouterModule, Routes } from '@angular/router' 2import { RouterModule, Routes } from '@angular/router'
3 3
4import { MetaGuard } from '@ngx-meta/core'
5
4import { AdminComponent } from './admin.component' 6import { AdminComponent } from './admin.component'
5import { FriendsRoutes } from './friends' 7import { FriendsRoutes } from './friends'
6import { RequestSchedulersRoutes } from './request-schedulers' 8import { RequestSchedulersRoutes } from './request-schedulers'
@@ -11,6 +13,7 @@ const adminRoutes: Routes = [
11 { 13 {
12 path: '', 14 path: '',
13 component: AdminComponent, 15 component: AdminComponent,
16 canActivateChild: [ MetaGuard ],
14 children: [ 17 children: [
15 { 18 {
16 path: '', 19 path: '',
diff --git a/client/src/app/account/account-routing.module.ts b/client/src/app/account/account-routing.module.ts
index e9b8f7031..029d97788 100644
--- a/client/src/app/account/account-routing.module.ts
+++ b/client/src/app/account/account-routing.module.ts
@@ -1,12 +1,15 @@
1import { NgModule } from '@angular/core' 1import { NgModule } from '@angular/core'
2import { RouterModule, Routes } from '@angular/router' 2import { RouterModule, Routes } from '@angular/router'
3 3
4import { MetaGuard } from '@ngx-meta/core'
5
4import { AccountComponent } from './account.component' 6import { AccountComponent } from './account.component'
5 7
6const accountRoutes: Routes = [ 8const accountRoutes: Routes = [
7 { 9 {
8 path: 'account', 10 path: 'account',
9 component: AccountComponent, 11 component: AccountComponent,
12 canActivate: [ MetaGuard ],
10 data: { 13 data: {
11 meta: { 14 meta: {
12 title: 'My account' 15 title: 'My account'
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index d7c9f6548..804a7a71e 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -6,7 +6,7 @@ import {
6 createInputTransfer 6 createInputTransfer
7} from '@angularclass/hmr' 7} from '@angularclass/hmr'
8 8
9import { MetaModule, MetaLoader, MetaStaticLoader, PageTitlePositioning } from '@nglibs/meta' 9import { MetaModule, MetaLoader, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
10// TODO: remove, we need this to avoid error in ng2-smart-table 10// TODO: remove, we need this to avoid error in ng2-smart-table
11import 'rxjs/add/operator/toPromise' 11import 'rxjs/add/operator/toPromise'
12import 'bootstrap-loader' 12import 'bootstrap-loader'
diff --git a/client/src/app/login/login-routing.module.ts b/client/src/app/login/login-routing.module.ts
index 1a91677c0..4d8913041 100644
--- a/client/src/app/login/login-routing.module.ts
+++ b/client/src/app/login/login-routing.module.ts
@@ -1,12 +1,15 @@
1import { NgModule } from '@angular/core' 1import { NgModule } from '@angular/core'
2import { RouterModule, Routes } from '@angular/router' 2import { RouterModule, Routes } from '@angular/router'
3 3
4import { MetaGuard } from '@ngx-meta/core'
5
4import { LoginComponent } from './login.component' 6import { LoginComponent } from './login.component'
5 7
6const loginRoutes: Routes = [ 8const loginRoutes: Routes = [
7 { 9 {
8 path: 'login', 10 path: 'login',
9 component: LoginComponent, 11 component: LoginComponent,
12 canActivate: [ MetaGuard ],
10 data: { 13 data: {
11 meta: { 14 meta: {
12 title: 'Login' 15 title: 'Login'
diff --git a/client/src/app/signup/signup-routing.module.ts b/client/src/app/signup/signup-routing.module.ts
index 122d6c976..b7ac69b53 100644
--- a/client/src/app/signup/signup-routing.module.ts
+++ b/client/src/app/signup/signup-routing.module.ts
@@ -1,12 +1,15 @@
1import { NgModule } from '@angular/core' 1import { NgModule } from '@angular/core'
2import { RouterModule, Routes } from '@angular/router' 2import { RouterModule, Routes } from '@angular/router'
3 3
4import { MetaGuard } from '@ngx-meta/core'
5
4import { SignupComponent } from './signup.component' 6import { SignupComponent } from './signup.component'
5 7
6const signupRoutes: Routes = [ 8const signupRoutes: Routes = [
7 { 9 {
8 path: 'signup', 10 path: 'signup',
9 component: SignupComponent, 11 component: SignupComponent,
12 canActivate: [ MetaGuard ],
10 data: { 13 data: {
11 meta: { 14 meta: {
12 title: 'Signup' 15 title: 'Signup'
diff --git a/client/src/app/videos/video-watch/video-watch.component.ts b/client/src/app/videos/video-watch/video-watch.component.ts
index 1284aa033..12ddf3eef 100644
--- a/client/src/app/videos/video-watch/video-watch.component.ts
+++ b/client/src/app/videos/video-watch/video-watch.component.ts
@@ -4,7 +4,7 @@ import { Observable } from 'rxjs/Observable'
4import { Subscription } from 'rxjs/Subscription' 4import { Subscription } from 'rxjs/Subscription'
5 5
6import videojs from 'video.js' 6import videojs from 'video.js'
7import { MetaService } from '@nglibs/meta' 7import { MetaService } from '@ngx-meta/core'
8import { NotificationsService } from 'angular2-notifications' 8import { NotificationsService } from 'angular2-notifications'
9 9
10import { AuthService, ConfirmService } from '../../core' 10import { AuthService, ConfirmService } from '../../core'
diff --git a/client/src/app/videos/videos-routing.module.ts b/client/src/app/videos/videos-routing.module.ts
index 7d002abde..e18c1cec0 100644
--- a/client/src/app/videos/videos-routing.module.ts
+++ b/client/src/app/videos/videos-routing.module.ts
@@ -1,6 +1,8 @@
1import { NgModule } from '@angular/core' 1import { NgModule } from '@angular/core'
2import { RouterModule, Routes } from '@angular/router' 2import { RouterModule, Routes } from '@angular/router'
3 3
4import { MetaGuard } from '@ngx-meta/core'
5
4import { VideoAddComponent, VideoUpdateComponent } from './video-edit' 6import { VideoAddComponent, VideoUpdateComponent } from './video-edit'
5import { VideoListComponent } from './video-list' 7import { VideoListComponent } from './video-list'
6import { VideosComponent } from './videos.component' 8import { VideosComponent } from './videos.component'
@@ -10,6 +12,7 @@ const videosRoutes: Routes = [
10 { 12 {
11 path: 'videos', 13 path: 'videos',
12 component: VideosComponent, 14 component: VideosComponent,
15 canActivateChild: [ MetaGuard ],
13 children: [ 16 children: [
14 { 17 {
15 path: 'list', 18 path: 'list',
diff --git a/client/src/app/videos/videos.module.ts b/client/src/app/videos/videos.module.ts
index 75a8dd24f..7d2451de7 100644
--- a/client/src/app/videos/videos.module.ts
+++ b/client/src/app/videos/videos.module.ts
@@ -1,6 +1,6 @@
1import { NgModule } from '@angular/core' 1import { NgModule } from '@angular/core'
2 2
3import { TagInputModule } from 'ng2-tag-input' 3import { TagInputModule } from 'ngx-chips'
4 4
5import { VideosRoutingModule } from './videos-routing.module' 5import { VideosRoutingModule } from './videos-routing.module'
6import { VideosComponent } from './videos.component' 6import { VideosComponent } from './videos.component'