import { ActivatedRoute } from '@angular/router'
import { AccountService } from '@app/shared/account/account.service'
import { Account } from '@app/shared/account/account.model'
+import { RestExtractor } from '@app/shared'
+import { catchError } from 'rxjs/operators'
@Component({
templateUrl: './accounts.component.html',
constructor (
private route: ActivatedRoute,
- private accountService: AccountService
+ private accountService: AccountService,
+ private restExtractor: RestExtractor
) {}
ngOnInit () {
const accountId = this.route.snapshot.params['accountId']
this.accountService.getAccount(accountId)
+ .pipe(catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 404 ])))
.subscribe(account => this.account = account)
}
}
--- /dev/null
+import { NgModule } from '@angular/core'
+import { RouterModule, Routes } from '@angular/router'
+import { PageNotFoundComponent } from './page-not-found.component'
+
+const pageNotFoundRoutes: Routes = [
+ {
+ path: '',
+ component: PageNotFoundComponent,
+ }
+]
+
+@NgModule({
+ imports: [ RouterModule.forChild(pageNotFoundRoutes) ],
+ exports: [ RouterModule ]
+})
+export class PageNotFoundRoutingModule {}
--- /dev/null
+<div>
+ Sorry, but we couldn't find the page you were looking for.
+</div>
\ No newline at end of file
--- /dev/null
+div {
+ height: 100%;
+ width: 100%;
+ text-align: center;
+ margin-top: 50px;
+
+ font-size: 32px;
+}
\ No newline at end of file
--- /dev/null
+import { Component } from '@angular/core'
+
+@Component({
+ selector: 'my-page-not-found',
+ templateUrl: './page-not-found.component.html',
+ styleUrls: [ './page-not-found.component.scss' ]
+})
+export class PageNotFoundComponent {
+
+}
--- /dev/null
+import { NgModule } from '@angular/core'
+import { SharedModule } from '../shared'
+import { PageNotFoundComponent } from '@app/+page-not-found/page-not-found.component'
+import { PageNotFoundRoutingModule } from '@app/+page-not-found/page-not-found-routing.module'
+
+@NgModule({
+ imports: [
+ PageNotFoundRoutingModule,
+ SharedModule
+ ],
+
+ declarations: [
+ PageNotFoundComponent,
+ ],
+
+ exports: [
+ PageNotFoundComponent
+ ],
+
+ providers: []
+})
+export class PageNotFoundModule { }
import { ActivatedRoute } from '@angular/router'
import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
+import { RestExtractor } from '@app/shared'
+import { catchError } from 'rxjs/operators'
@Component({
templateUrl: './video-channels.component.html',
constructor (
private route: ActivatedRoute,
- private videoChannelService: VideoChannelService
+ private videoChannelService: VideoChannelService,
+ private restExtractor: RestExtractor
) {}
ngOnInit () {
const videoChannelId = this.route.snapshot.params['videoChannelId']
this.videoChannelService.getVideoChannel(videoChannelId)
+ .pipe(catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 404 ])))
.subscribe(videoChannel => this.videoChannel = videoChannel)
}
}
{
path: 'video-channels',
loadChildren: './+video-channels/video-channels.module#VideoChannelsModule'
+ },
+ {
+ path: '**',
+ loadChildren: './+page-not-found/page-not-found.module#PageNotFoundModule'
}
]
CoreModule,
SharedModule,
- AppRoutingModule,
-
CoreModule,
LoginModule,
ResetPasswordModule,
provide: MetaLoader,
useFactory: (metaFactory),
deps: [ ServerService ]
- })
+ }),
+
+ AppRoutingModule, // Put it after all the module because it has the 404 route
],
providers: [ ]
})
}
this.serverService.configLoaded
- .subscribe(() => {
- const defaultRouteConfig = this.serverService.getConfig().instance.defaultClientRoute
+ .subscribe(() => {
+ const defaultRouteConfig = this.serverService.getConfig().instance.defaultClientRoute
- if (defaultRouteConfig) {
- RedirectService.DEFAULT_ROUTE = defaultRouteConfig
- }
- })
+ if (defaultRouteConfig) {
+ RedirectService.DEFAULT_ROUTE = defaultRouteConfig
+ }
+ })
}
redirectToHomepage () {
console.log('Redirecting to %s...', RedirectService.DEFAULT_ROUTE)
this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { replaceUrl: true })
- .catch(() => {
- console.error(
- 'Cannot navigate to %s, resetting default route to %s.',
- RedirectService.DEFAULT_ROUTE,
- RedirectService.INIT_DEFAULT_ROUTE
- )
+ .catch(() => {
+ console.error(
+ 'Cannot navigate to %s, resetting default route to %s.',
+ RedirectService.DEFAULT_ROUTE,
+ RedirectService.INIT_DEFAULT_ROUTE
+ )
- RedirectService.DEFAULT_ROUTE = RedirectService.INIT_DEFAULT_ROUTE
- return this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { replaceUrl: true })
- })
+ RedirectService.DEFAULT_ROUTE = RedirectService.INIT_DEFAULT_ROUTE
+ return this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { replaceUrl: true })
+ })
}
-
}
-import { of, throwError as observableThrowError } from 'rxjs'
+import { throwError as observableThrowError } from 'rxjs'
import { Injectable } from '@angular/core'
import { dateToHuman } from '@app/shared/misc/utils'
import { ResultList } from '../../../../../shared'
+import { Router } from '@angular/router'
@Injectable()
export class RestExtractor {
+ constructor (private router: Router) {
+ // empty
+ }
+
extractDataBool () {
return true
}
return observableThrowError(errorObj)
}
+
+ redirectTo404IfNotFound (obj: { status: number }, status = [ 404 ]) {
+ if (obj && obj.status && status.indexOf(obj.status) !== -1) {
+ // Do not use redirectService to avoid circular dependencies
+ this.router.navigate([ '/404' ], { skipLocationChange: true })
+ }
+
+ return observableThrowError(obj)
+ }
}
+import { catchError } from 'rxjs/operators'
import { Component, ElementRef, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core'
import { ActivatedRoute, Router } from '@angular/router'
import { RedirectService } from '@app/core/routing/redirect.service'
import { UserVideoRateType, VideoRateType } from '../../../../../shared'
import '../../../assets/player/peertube-videojs-plugin'
import { AuthService, ConfirmService } from '../../core'
-import { VideoBlacklistService } from '../../shared'
+import { RestExtractor, VideoBlacklistService } from '../../shared'
import { VideoDetails } from '../../shared/video/video-details.model'
import { Video } from '../../shared/video/video.model'
import { VideoService } from '../../shared/video/video.service'
private metaService: MetaService,
private authService: AuthService,
private serverService: ServerService,
+ private restExtractor: RestExtractor,
private notificationsService: NotificationsService,
private markdownService: MarkdownService,
private zone: NgZone,
}
const uuid = routeParams['uuid']
+
// Video did not change
if (this.video && this.video.uuid === uuid) return
// Video did change
- this.videoService.getVideo(uuid).subscribe(
- video => {
- const startTime = this.route.snapshot.queryParams.start
- this.onVideoFetched(video, startTime)
- .catch(err => this.handleError(err))
- },
-
- error => {
- this.videoNotFound = true
- console.error(error)
- }
- )
+ this.videoService
+ .getVideo(uuid)
+ .pipe(catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 404 ])))
+ .subscribe(
+ video => {
+ const startTime = this.route.snapshot.queryParams.start
+ this.onVideoFetched(video, startTime)
+ .catch(err => this.handleError(err))
+ },
+
+ error => {
+ this.videoNotFound = true
+ console.error(error)
+ }
+ )
})
}
import { NgModule } from '@angular/core'
-import { RouterModule, Routes } from '@angular/router'
+import { RouterModule, Routes, UrlSegment } from '@angular/router'
import { VideoLocalComponent } from '@app/videos/video-list/video-local.component'
import { MetaGuard } from '@ngx-meta/core'
import { VideoSearchComponent } from './video-list'
}
}
},
- {
- path: ':uuid',
- pathMatch: 'full',
- redirectTo: 'watch/:uuid'
- },
{
path: 'watch/:uuid',
loadChildren: 'app/videos/+video-watch/video-watch.module#VideoWatchModule',
projects / github / Chocobozzz / PeerTube.git / commitdiff
