From 714e4c81ee4d4458aea762e25e9a5a8bdfdea838 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Fri, 15 Oct 2021 08:15:24 +0100 Subject: [PATCH] revert: :rewind: Revert "refactor: :recycle: Upgraded to Angular 12" This reverts commit 72eb873ddbafff6a344288c023810b64ac0e0f62. --- src/Ombi/ClientApp/package.json | 1 + .../src/app/auth/unauthorized.interceptor.ts | 7 +- .../src/app/my-nav/my-nav.component.html | 2 +- .../src/app/my-nav/my-nav.component.scss | 6 - src/Ombi/ClientApp/src/index.html | 4 + src/Ombi/ClientApp/yarn.lock | 2554 +++++++++++------ 6 files changed, 1615 insertions(+), 959 deletions(-) diff --git a/src/Ombi/ClientApp/package.json b/src/Ombi/ClientApp/package.json index 77e664558..1348535ce 100644 --- a/src/Ombi/ClientApp/package.json +++ b/src/Ombi/ClientApp/package.json @@ -77,6 +77,7 @@ "typescript": "~4.1.5" }, "optionalDependencies": { + "node-sass": "^4.12.0", "protractor": "~5.4.0", "ts-node": "~5.0.1", "tslint": "^5.12.0" diff --git a/src/Ombi/ClientApp/src/app/auth/unauthorized.interceptor.ts b/src/Ombi/ClientApp/src/app/auth/unauthorized.interceptor.ts index 86c212ad6..c70b649be 100644 --- a/src/Ombi/ClientApp/src/app/auth/unauthorized.interceptor.ts +++ b/src/Ombi/ClientApp/src/app/auth/unauthorized.interceptor.ts @@ -1,9 +1,8 @@ -import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { HttpRequest, HttpHandler, HttpEvent, HttpInterceptor, HttpErrorResponse } from '@angular/common/http'; import { Observable, Subject, throwError } from 'rxjs'; import { catchError, throttleTime } from 'rxjs/operators'; - import { AuthService } from './auth.service'; -import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; @Injectable() @@ -21,7 +20,7 @@ export class UnauthorizedInterceptor implements HttpInterceptor { return next.handle(request).pipe( catchError((response: HttpErrorResponse) => { if (response.status === 401) { - this.throttleLogout.next(request.url); + this.throttleLogout.next(); } return throwError(response); } diff --git a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html index 85abdbf0a..7a59be582 100644 --- a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html +++ b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html @@ -57,7 +57,7 @@ - +