aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/package.json4
-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
-rw-r--r--client/yarn.lock26
10 files changed, 33 insertions, 18 deletions
diff --git a/client/package.json b/client/package.json
index fbfe5ae26..a922fe107 100644
--- a/client/package.json
+++ b/client/package.json
@@ -32,7 +32,7 @@
32 "@angular/router": "~4.2.0", 32 "@angular/router": "~4.2.0",
33 "@angularclass/hmr": "^2.1.0", 33 "@angularclass/hmr": "^2.1.0",
34 "@angularclass/hmr-loader": "^3.0.2", 34 "@angularclass/hmr-loader": "^3.0.2",
35 "@nglibs/meta": "^0.4.0-rc.1", 35 "@ngx-meta/core": "^0.4.0-rc.2",
36 "@types/core-js": "^0.9.28", 36 "@types/core-js": "^0.9.28",
37 "@types/node": "^6.0.38", 37 "@types/node": "^6.0.38",
38 "@types/source-map": "^0.1.26", 38 "@types/source-map": "^0.1.26",
@@ -63,9 +63,9 @@
63 "ng-router-loader": "^2.0.0", 63 "ng-router-loader": "^2.0.0",
64 "ng2-file-upload": "^1.1.4-2", 64 "ng2-file-upload": "^1.1.4-2",
65 "ng2-smart-table": "1.2.1", 65 "ng2-smart-table": "1.2.1",
66 "ng2-tag-input": "1.3.3",
67 "ngc-webpack": "3.0.0", 66 "ngc-webpack": "3.0.0",
68 "ngx-bootstrap": "1.6.6", 67 "ngx-bootstrap": "1.6.6",
68 "ngx-chips": "1.4.5-beta",
69 "node-sass": "^4.1.1", 69 "node-sass": "^4.1.1",
70 "normalize.css": "^7.0.0", 70 "normalize.css": "^7.0.0",
71 "optimize-js-plugin": "0.0.4", 71 "optimize-js-plugin": "0.0.4",
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'
diff --git a/client/yarn.lock b/client/yarn.lock
index 3b1184f58..b953fcb21 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -80,19 +80,19 @@
80 version "2.1.1" 80 version "2.1.1"
81 resolved "https://registry.yarnpkg.com/@angularclass/hmr/-/hmr-2.1.1.tgz#2a797f5d282ec0513b8a2c29ac9e316376c563ef" 81 resolved "https://registry.yarnpkg.com/@angularclass/hmr/-/hmr-2.1.1.tgz#2a797f5d282ec0513b8a2c29ac9e316376c563ef"
82 82
83"@nglibs/meta@^0.4.0-rc.1": 83"@ngx-meta/core@^0.4.0-rc.2":
84 version "0.4.0-rc.1" 84 version "0.4.0-rc.2"
85 resolved "https://registry.yarnpkg.com/@nglibs/meta/-/meta-0.4.0-rc.1.tgz#d084fcf1f39344087ea2d16e728cfa5f2fd0468a" 85 resolved "https://registry.yarnpkg.com/@ngx-meta/core/-/core-0.4.0-rc.2.tgz#1bd793103a1a5d463ba773db9f56d3eb8575c2c8"
86 dependencies: 86 dependencies:
87 tslib "^1.6.0" 87 tslib "^1.7.0"
88 88
89"@types/core-js@^0.9.28": 89"@types/core-js@^0.9.28":
90 version "0.9.42" 90 version "0.9.42"
91 resolved "https://registry.yarnpkg.com/@types/core-js/-/core-js-0.9.42.tgz#dd6da92cd7d5ab5ca0b4477524537c3e633b6bce" 91 resolved "https://registry.yarnpkg.com/@types/core-js/-/core-js-0.9.42.tgz#dd6da92cd7d5ab5ca0b4477524537c3e633b6bce"
92 92
93"@types/node@*": 93"@types/node@*":
94 version "8.0.7" 94 version "8.0.8"
95 resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.7.tgz#fb0ad04b5b6f6eabe0372a32a8f1fbba5c130cae" 95 resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.8.tgz#0dc4ca2c6f6fc69baee16c5e928c4a627f517ada"
96 96
97"@types/node@^6.0.38": 97"@types/node@^6.0.38":
98 version "6.0.79" 98 version "6.0.79"
@@ -4086,12 +4086,6 @@ ng2-smart-table@1.2.1:
4086 lodash "^4.17.4" 4086 lodash "^4.17.4"
4087 ng2-completer "^1.2.2" 4087 ng2-completer "^1.2.2"
4088 4088
4089ng2-tag-input@1.3.3:
4090 version "1.3.3"
4091 resolved "https://registry.yarnpkg.com/ng2-tag-input/-/ng2-tag-input-1.3.3.tgz#612b12b244dfd1efdb9659fd99caafa16762ff56"
4092 dependencies:
4093 ng2-material-dropdown "0.7.7"
4094
4095ngc-webpack@3.0.0: 4089ngc-webpack@3.0.0:
4096 version "3.0.0" 4090 version "3.0.0"
4097 resolved "https://registry.yarnpkg.com/ngc-webpack/-/ngc-webpack-3.0.0.tgz#b7caf724e367c22c10f100c5b460f266a0189b63" 4091 resolved "https://registry.yarnpkg.com/ngc-webpack/-/ngc-webpack-3.0.0.tgz#b7caf724e367c22c10f100c5b460f266a0189b63"
@@ -4106,6 +4100,12 @@ ngx-bootstrap@1.6.6:
4106 dependencies: 4100 dependencies:
4107 moment "2.18.1" 4101 moment "2.18.1"
4108 4102
4103ngx-chips@1.4.5-beta:
4104 version "1.4.5-beta"
4105 resolved "https://registry.yarnpkg.com/ngx-chips/-/ngx-chips-1.4.5-beta.tgz#62d11fb900778ac4aa07674d9cefd8d28dd7ec85"
4106 dependencies:
4107 ng2-material-dropdown "0.7.7"
4108
4109no-case@^2.2.0: 4109no-case@^2.2.0:
4110 version "2.3.1" 4110 version "2.3.1"
4111 resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.1.tgz#7aeba1c73a52184265554b7dc03baf720df80081" 4111 resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.1.tgz#7aeba1c73a52184265554b7dc03baf720df80081"
@@ -6126,7 +6126,7 @@ tsickle@^0.21.0:
6126 source-map "^0.5.6" 6126 source-map "^0.5.6"
6127 source-map-support "^0.4.2" 6127 source-map-support "^0.4.2"
6128 6128
6129tslib@^1.0.0, tslib@^1.5.0, tslib@^1.6.0, tslib@^1.7.1: 6129tslib@^1.0.0, tslib@^1.5.0, tslib@^1.7.0, tslib@^1.7.1:
6130 version "1.7.1" 6130 version "1.7.1"
6131 resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec" 6131 resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec"
6132 6132