Rename not fount page to error page
This commit is contained in:
parent
c482d2b7a6
commit
c0e3d9ff90
|
@ -1,12 +1,12 @@
|
||||||
import { NgModule } from '@angular/core'
|
import { NgModule } from '@angular/core'
|
||||||
import { RouterModule, Routes } from '@angular/router'
|
import { RouterModule, Routes } from '@angular/router'
|
||||||
import { PageNotFoundComponent } from './page-not-found.component'
|
import { ErrorPageComponent } from './error-page.component'
|
||||||
import { MenuGuards } from '@app/core'
|
import { MenuGuards } from '@app/core'
|
||||||
|
|
||||||
const pageNotFoundRoutes: Routes = [
|
const errorPageRoutes: Routes = [
|
||||||
{
|
{
|
||||||
path: '',
|
path: '',
|
||||||
component: PageNotFoundComponent,
|
component: ErrorPageComponent,
|
||||||
canActivate: [ MenuGuards.close(true) ],
|
canActivate: [ MenuGuards.close(true) ],
|
||||||
canDeactivate: [ MenuGuards.open(true) ],
|
canDeactivate: [ MenuGuards.open(true) ],
|
||||||
data: {
|
data: {
|
||||||
|
@ -18,7 +18,7 @@ const pageNotFoundRoutes: Routes = [
|
||||||
]
|
]
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [ RouterModule.forChild(pageNotFoundRoutes) ],
|
imports: [ RouterModule.forChild(errorPageRoutes) ],
|
||||||
exports: [ RouterModule ]
|
exports: [ RouterModule ]
|
||||||
})
|
})
|
||||||
export class PageNotFoundRoutingModule {}
|
export class ErrorPageRoutingModule {}
|
|
@ -31,7 +31,7 @@
|
||||||
<ng-container *ngIf="type !== 'video'" i18n>You might need to login to see the resource.</ng-container>
|
<ng-container *ngIf="type !== 'video'" i18n>You might need to login to see the resource.</ng-container>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<a class="peertube-button-link orange-button mt-5" i18n routerLink="/login">
|
<a class="peertube-button-big-link orange-button mt-5" i18n routerLink="/login">
|
||||||
Login
|
Login
|
||||||
</a>
|
</a>
|
||||||
|
|
|
@ -35,18 +35,6 @@
|
||||||
width: 400px;
|
width: 400px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (min-width: #{breakpoint(lg)}) {
|
|
||||||
width: 600px;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media screen and (min-width: #{breakpoint(xl)}) {
|
|
||||||
width: 700px;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media screen and (min-width: #{breakpoint(xxl)}) {
|
|
||||||
width: 800px;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media screen and (max-height: 600px) {
|
@media screen and (max-height: 600px) {
|
||||||
padding-top: 50px;
|
padding-top: 50px;
|
||||||
|
|
|
@ -4,11 +4,11 @@ import { Router } from '@angular/router'
|
||||||
import { HttpStatusCode } from '@shared/models'
|
import { HttpStatusCode } from '@shared/models'
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'my-page-not-found',
|
selector: 'my-error-page',
|
||||||
templateUrl: './page-not-found.component.html',
|
templateUrl: './error-page.component.html',
|
||||||
styleUrls: [ './page-not-found.component.scss' ]
|
styleUrls: [ './error-page.component.scss' ]
|
||||||
})
|
})
|
||||||
export class PageNotFoundComponent implements OnInit {
|
export class ErrorPageComponent implements OnInit {
|
||||||
status = HttpStatusCode.NOT_FOUND_404
|
status = HttpStatusCode.NOT_FOUND_404
|
||||||
type: 'video' | 'other' = 'other'
|
type: 'video' | 'other' = 'other'
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
import { CommonModule } from '@angular/common'
|
||||||
|
import { NgModule } from '@angular/core'
|
||||||
|
import { ErrorPageRoutingModule } from './error-page-routing.module'
|
||||||
|
import { ErrorPageComponent } from './error-page.component'
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [
|
||||||
|
CommonModule,
|
||||||
|
|
||||||
|
ErrorPageRoutingModule
|
||||||
|
],
|
||||||
|
|
||||||
|
declarations: [
|
||||||
|
ErrorPageComponent
|
||||||
|
],
|
||||||
|
|
||||||
|
exports: [
|
||||||
|
ErrorPageComponent
|
||||||
|
],
|
||||||
|
|
||||||
|
providers: []
|
||||||
|
})
|
||||||
|
export class ErrorPageModule { }
|
|
@ -1,23 +0,0 @@
|
||||||
import { CommonModule } from '@angular/common'
|
|
||||||
import { NgModule } from '@angular/core'
|
|
||||||
import { PageNotFoundRoutingModule } from './page-not-found-routing.module'
|
|
||||||
import { PageNotFoundComponent } from './page-not-found.component'
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule,
|
|
||||||
|
|
||||||
PageNotFoundRoutingModule
|
|
||||||
],
|
|
||||||
|
|
||||||
declarations: [
|
|
||||||
PageNotFoundComponent
|
|
||||||
],
|
|
||||||
|
|
||||||
exports: [
|
|
||||||
PageNotFoundComponent
|
|
||||||
],
|
|
||||||
|
|
||||||
providers: []
|
|
||||||
})
|
|
||||||
export class PageNotFoundModule { }
|
|
|
@ -194,7 +194,7 @@ for (const locale of POSSIBLE_LOCALES) {
|
||||||
|
|
||||||
routes.push({
|
routes.push({
|
||||||
path: '**',
|
path: '**',
|
||||||
loadChildren: () => import('./+page-not-found/page-not-found.module').then(m => m.PageNotFoundModule)
|
loadChildren: () => import('./+error-page/error-page.module').then(m => m.ErrorPageModule)
|
||||||
})
|
})
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
|
|
|
@ -46,7 +46,7 @@ export class RedirectService {
|
||||||
this.currentUrl = this.router.url
|
this.currentUrl = this.router.url
|
||||||
router.events.subscribe(event => {
|
router.events.subscribe(event => {
|
||||||
if (event instanceof NavigationEnd || event instanceof NavigationCancel) {
|
if (event instanceof NavigationEnd || event instanceof NavigationCancel) {
|
||||||
if (event.url === '/404') return
|
if ([ '/401', '/404' ].includes(event.url)) return
|
||||||
|
|
||||||
this.previousUrl = this.currentUrl
|
this.previousUrl = this.currentUrl
|
||||||
this.currentUrl = event.url
|
this.currentUrl = event.url
|
||||||
|
|
|
@ -62,7 +62,7 @@ export class AuthInterceptor implements HttpInterceptor {
|
||||||
}
|
}
|
||||||
|
|
||||||
private handleNotAuthenticated (err: HttpErrorResponse): Observable<any> {
|
private handleNotAuthenticated (err: HttpErrorResponse): Observable<any> {
|
||||||
this.router.navigate([ '/404' ], { state: { obj: err }, skipLocationChange: true })
|
this.router.navigate([ '/401' ], { state: { obj: err }, skipLocationChange: true })
|
||||||
return of(err.message)
|
return of(err.message)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,10 +27,18 @@
|
||||||
@include peertube-button;
|
@include peertube-button;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.peertube-button-big {
|
||||||
|
@include peertube-button-big;
|
||||||
|
}
|
||||||
|
|
||||||
.peertube-button-link {
|
.peertube-button-link {
|
||||||
@include peertube-button-link;
|
@include peertube-button-link;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.peertube-button-big-link {
|
||||||
|
@include peertube-button-big-link;
|
||||||
|
}
|
||||||
|
|
||||||
.orange-button {
|
.orange-button {
|
||||||
@include orange-button;
|
@include orange-button;
|
||||||
}
|
}
|
||||||
|
|
|
@ -284,6 +284,13 @@
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@mixin peertube-button-big-link {
|
||||||
|
@include disable-default-a-behaviour;
|
||||||
|
@include peertube-button-big;
|
||||||
|
|
||||||
|
display: inline-block;
|
||||||
|
}
|
||||||
|
|
||||||
@mixin peertube-button-outline {
|
@mixin peertube-button-outline {
|
||||||
@include disable-default-a-behaviour;
|
@include disable-default-a-behaviour;
|
||||||
@include peertube-button;
|
@include peertube-button;
|
||||||
|
|
Loading…
Reference in New Issue