diff options
author | Chocobozzz <me@florianbigard.com> | 2021-05-14 16:12:45 +0200 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2021-05-27 16:00:13 +0200 |
commit | 0f01a8bacddf6c502e6470e34fdac7750bb76e89 (patch) | |
tree | c0eb33e4b74f955979f2cb9ee747dfc81d7ff4fb /client/src/app/+videos | |
parent | 05ded92ed16bc83a33e71ecccf0f3ee9751fd7b0 (diff) | |
download | PeerTube-0f01a8bacddf6c502e6470e34fdac7750bb76e89.tar.gz PeerTube-0f01a8bacddf6c502e6470e34fdac7750bb76e89.tar.zst PeerTube-0f01a8bacddf6c502e6470e34fdac7750bb76e89.zip |
Remove ngx-meta
Unmaintained
Diffstat (limited to 'client/src/app/+videos')
5 files changed, 5 insertions, 12 deletions
diff --git a/client/src/app/+videos/+video-edit/video-add-routing.module.ts b/client/src/app/+videos/+video-edit/video-add-routing.module.ts index 9ff66bea0..3b9a5ab3a 100644 --- a/client/src/app/+videos/+video-edit/video-add-routing.module.ts +++ b/client/src/app/+videos/+video-edit/video-add-routing.module.ts | |||
@@ -1,14 +1,13 @@ | |||
1 | import { NgModule } from '@angular/core' | 1 | import { NgModule } from '@angular/core' |
2 | import { RouterModule, Routes } from '@angular/router' | 2 | import { RouterModule, Routes } from '@angular/router' |
3 | import { CanDeactivateGuard, LoginGuard } from '@app/core' | 3 | import { CanDeactivateGuard, LoginGuard } from '@app/core' |
4 | import { MetaGuard } from '@ngx-meta/core' | ||
5 | import { VideoAddComponent } from './video-add.component' | 4 | import { VideoAddComponent } from './video-add.component' |
6 | 5 | ||
7 | const videoAddRoutes: Routes = [ | 6 | const videoAddRoutes: Routes = [ |
8 | { | 7 | { |
9 | path: '', | 8 | path: '', |
10 | component: VideoAddComponent, | 9 | component: VideoAddComponent, |
11 | canActivate: [ MetaGuard, LoginGuard ], | 10 | canActivate: [ LoginGuard ], |
12 | canDeactivate: [ CanDeactivateGuard ] | 11 | canDeactivate: [ CanDeactivateGuard ] |
13 | } | 12 | } |
14 | ] | 13 | ] |
diff --git a/client/src/app/+videos/+video-edit/video-update-routing.module.ts b/client/src/app/+videos/+video-edit/video-update-routing.module.ts index a04351b05..ba9167dd0 100644 --- a/client/src/app/+videos/+video-edit/video-update-routing.module.ts +++ b/client/src/app/+videos/+video-edit/video-update-routing.module.ts | |||
@@ -1,7 +1,6 @@ | |||
1 | import { NgModule } from '@angular/core' | 1 | import { NgModule } from '@angular/core' |
2 | import { RouterModule, Routes } from '@angular/router' | 2 | import { RouterModule, Routes } from '@angular/router' |
3 | import { CanDeactivateGuard, LoginGuard } from '@app/core' | 3 | import { CanDeactivateGuard, LoginGuard } from '@app/core' |
4 | import { MetaGuard } from '@ngx-meta/core' | ||
5 | import { VideoUpdateComponent } from './video-update.component' | 4 | import { VideoUpdateComponent } from './video-update.component' |
6 | import { VideoUpdateResolver } from './video-update.resolver' | 5 | import { VideoUpdateResolver } from './video-update.resolver' |
7 | 6 | ||
@@ -9,7 +8,7 @@ const videoUpdateRoutes: Routes = [ | |||
9 | { | 8 | { |
10 | path: '', | 9 | path: '', |
11 | component: VideoUpdateComponent, | 10 | component: VideoUpdateComponent, |
12 | canActivate: [ MetaGuard, LoginGuard ], | 11 | canActivate: [ LoginGuard ], |
13 | canDeactivate: [ CanDeactivateGuard ], | 12 | canDeactivate: [ CanDeactivateGuard ], |
14 | resolve: { | 13 | resolve: { |
15 | videoData: VideoUpdateResolver | 14 | videoData: VideoUpdateResolver |
diff --git a/client/src/app/+videos/+video-watch/video-watch-routing.module.ts b/client/src/app/+videos/+video-watch/video-watch-routing.module.ts index d8fecb87d..cb77685c0 100644 --- a/client/src/app/+videos/+video-watch/video-watch-routing.module.ts +++ b/client/src/app/+videos/+video-watch/video-watch-routing.module.ts | |||
@@ -1,13 +1,11 @@ | |||
1 | import { NgModule } from '@angular/core' | 1 | import { NgModule } from '@angular/core' |
2 | import { RouterModule, Routes } from '@angular/router' | 2 | import { RouterModule, Routes } from '@angular/router' |
3 | import { MetaGuard } from '@ngx-meta/core' | ||
4 | import { VideoWatchComponent } from './video-watch.component' | 3 | import { VideoWatchComponent } from './video-watch.component' |
5 | 4 | ||
6 | const videoWatchRoutes: Routes = [ | 5 | const videoWatchRoutes: Routes = [ |
7 | { | 6 | { |
8 | path: 'playlist/:playlistId', | 7 | path: 'playlist/:playlistId', |
9 | component: VideoWatchComponent, | 8 | component: VideoWatchComponent |
10 | canActivate: [ MetaGuard ] | ||
11 | }, | 9 | }, |
12 | { | 10 | { |
13 | path: ':videoId/comments/:commentId', | 11 | path: ':videoId/comments/:commentId', |
@@ -15,8 +13,7 @@ const videoWatchRoutes: Routes = [ | |||
15 | }, | 13 | }, |
16 | { | 14 | { |
17 | path: ':videoId', | 15 | path: ':videoId', |
18 | component: VideoWatchComponent, | 16 | component: VideoWatchComponent |
19 | canActivate: [ MetaGuard ] | ||
20 | } | 17 | } |
21 | ] | 18 | ] |
22 | 19 | ||
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 77405d149..88c5cef52 100644 --- a/client/src/app/+videos/+video-watch/video-watch.component.ts +++ b/client/src/app/+videos/+video-watch/video-watch.component.ts | |||
@@ -9,6 +9,7 @@ import { | |||
9 | AuthUser, | 9 | AuthUser, |
10 | ConfirmService, | 10 | ConfirmService, |
11 | MarkdownService, | 11 | MarkdownService, |
12 | MetaService, | ||
12 | Notifier, | 13 | Notifier, |
13 | PeerTubeSocket, | 14 | PeerTubeSocket, |
14 | RestExtractor, | 15 | RestExtractor, |
@@ -25,7 +26,6 @@ import { SupportModalComponent } from '@app/shared/shared-support-modal' | |||
25 | import { SubscribeButtonComponent } from '@app/shared/shared-user-subscription' | 26 | import { SubscribeButtonComponent } from '@app/shared/shared-user-subscription' |
26 | import { VideoActionsDisplayType, VideoDownloadComponent } from '@app/shared/shared-video-miniature' | 27 | import { VideoActionsDisplayType, VideoDownloadComponent } from '@app/shared/shared-video-miniature' |
27 | import { VideoPlaylist, VideoPlaylistService } from '@app/shared/shared-video-playlist' | 28 | import { VideoPlaylist, VideoPlaylistService } from '@app/shared/shared-video-playlist' |
28 | import { MetaService } from '@ngx-meta/core' | ||
29 | import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage' | 29 | import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage' |
30 | import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes' | 30 | import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes' |
31 | import { ServerConfig, ServerErrorCode, UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '@shared/models' | 31 | import { ServerConfig, ServerErrorCode, UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '@shared/models' |
diff --git a/client/src/app/+videos/videos-routing.module.ts b/client/src/app/+videos/videos-routing.module.ts index 16e3b9bb2..f9f476b18 100644 --- a/client/src/app/+videos/videos-routing.module.ts +++ b/client/src/app/+videos/videos-routing.module.ts | |||
@@ -1,7 +1,6 @@ | |||
1 | import { NgModule } from '@angular/core' | 1 | import { NgModule } from '@angular/core' |
2 | import { RouterModule, Routes } from '@angular/router' | 2 | import { RouterModule, Routes } from '@angular/router' |
3 | import { LoginGuard } from '@app/core' | 3 | import { LoginGuard } from '@app/core' |
4 | import { MetaGuard } from '@ngx-meta/core' | ||
5 | import { VideoTrendingComponent } from './video-list' | 4 | import { VideoTrendingComponent } from './video-list' |
6 | import { VideoOverviewComponent } from './video-list/overview/video-overview.component' | 5 | import { VideoOverviewComponent } from './video-list/overview/video-overview.component' |
7 | import { VideoLocalComponent } from './video-list/video-local.component' | 6 | import { VideoLocalComponent } from './video-list/video-local.component' |
@@ -13,7 +12,6 @@ const videosRoutes: Routes = [ | |||
13 | { | 12 | { |
14 | path: '', | 13 | path: '', |
15 | component: VideosComponent, | 14 | component: VideosComponent, |
16 | canActivateChild: [ MetaGuard ], | ||
17 | children: [ | 15 | children: [ |
18 | { | 16 | { |
19 | path: 'overview', | 17 | path: 'overview', |