diff --git a/apps/red-ui/src/app/interceptor/api-path-interceptor.service.ts b/apps/red-ui/src/app/interceptor/api-path-interceptor.service.ts index ebb15d222..3eb5e1b99 100644 --- a/apps/red-ui/src/app/interceptor/api-path-interceptor.service.ts +++ b/apps/red-ui/src/app/interceptor/api-path-interceptor.service.ts @@ -1,7 +1,7 @@ import {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from '@angular/common/http'; import {Injectable} from '@angular/core'; import {Observable} from 'rxjs'; -import {AppConfigKey, AppConfigService} from "../app-config/app-config.service"; +import {AppConfigService} from "../app-config/app-config.service"; @Injectable() export class ApiPathInterceptorService implements HttpInterceptor { @@ -10,14 +10,6 @@ export class ApiPathInterceptorService implements HttpInterceptor { } intercept(req: HttpRequest, next: HttpHandler): Observable> { - - // if (!req.url.startsWith('/assets')) { - // const updatedRequest = req.clone({ - // url: this._appConfigService.getConfig(AppConfigKey.API_URL) + req.url - // }) - // return next.handle(updatedRequest); - // } else { - return next.handle(req); - // } + return next.handle(req); } } diff --git a/apps/red-ui/src/app/screens/base-screen/base-screen.component.scss b/apps/red-ui/src/app/screens/base-screen/base-screen.component.scss index 1e9c8802e..6b647b1ba 100644 --- a/apps/red-ui/src/app/screens/base-screen/base-screen.component.scss +++ b/apps/red-ui/src/app/screens/base-screen/base-screen.component.scss @@ -1,4 +1,4 @@ -@import "../../../../../../assets/styles/red-variables"; +@import "../../../assets/styles/red-variables"; .red-top-bar { height: 61px; diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-details-dialog/file-details-dialog.component.scss b/apps/red-ui/src/app/screens/file/file-preview-screen/file-details-dialog/file-details-dialog.component.scss index 0af2aaa06..708a031bc 100644 --- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-details-dialog/file-details-dialog.component.scss +++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-details-dialog/file-details-dialog.component.scss @@ -1,2 +1,2 @@ -@import "../../../../../../../../assets/styles/red-variables"; +@import "../../../../../assets/styles/red-variables"; diff --git a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.scss b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.scss index feae31111..4d5a5f1ee 100644 --- a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.scss +++ b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.scss @@ -1,2 +1,2 @@ -@import "../../../../../../assets/styles/red-mixins"; +@import "../../../assets/styles/red-mixins"; diff --git a/assets/styles/red-dialog.scss b/apps/red-ui/src/assets/styles/red-dialog.scss similarity index 100% rename from assets/styles/red-dialog.scss rename to apps/red-ui/src/assets/styles/red-dialog.scss diff --git a/assets/styles/red-input.scss b/apps/red-ui/src/assets/styles/red-input.scss similarity index 100% rename from assets/styles/red-input.scss rename to apps/red-ui/src/assets/styles/red-input.scss diff --git a/assets/styles/red-material-theme.scss b/apps/red-ui/src/assets/styles/red-material-theme.scss similarity index 100% rename from assets/styles/red-material-theme.scss rename to apps/red-ui/src/assets/styles/red-material-theme.scss diff --git a/assets/styles/red-media-queries.scss b/apps/red-ui/src/assets/styles/red-media-queries.scss similarity index 100% rename from assets/styles/red-media-queries.scss rename to apps/red-ui/src/assets/styles/red-media-queries.scss diff --git a/assets/styles/red-mixins.scss b/apps/red-ui/src/assets/styles/red-mixins.scss similarity index 100% rename from assets/styles/red-mixins.scss rename to apps/red-ui/src/assets/styles/red-mixins.scss diff --git a/assets/styles/page-layout.scss b/apps/red-ui/src/assets/styles/red-page-layout.scss similarity index 100% rename from assets/styles/page-layout.scss rename to apps/red-ui/src/assets/styles/red-page-layout.scss diff --git a/assets/styles/red-text-styles.scss b/apps/red-ui/src/assets/styles/red-text-styles.scss similarity index 100% rename from assets/styles/red-text-styles.scss rename to apps/red-ui/src/assets/styles/red-text-styles.scss diff --git a/assets/styles/red-theme.scss b/apps/red-ui/src/assets/styles/red-theme.scss similarity index 93% rename from assets/styles/red-theme.scss rename to apps/red-ui/src/assets/styles/red-theme.scss index b7e42e937..d457a323e 100644 --- a/assets/styles/red-theme.scss +++ b/apps/red-ui/src/assets/styles/red-theme.scss @@ -2,7 +2,7 @@ @import url('https://fonts.googleapis.com/css2?family=Inconsolata:wght@300;400;500;700&display=swap'); @import '~ngx-toastr/toastr'; @import "red-material-theme"; -@import "page-layout"; +@import "red-page-layout"; @import "red-text-styles"; @import "red-dialog"; @import "red-input"; diff --git a/assets/styles/red-variables.scss b/apps/red-ui/src/assets/styles/red-variables.scss similarity index 100% rename from assets/styles/red-variables.scss rename to apps/red-ui/src/assets/styles/red-variables.scss diff --git a/apps/red-ui/src/styles.scss b/apps/red-ui/src/styles.scss index 23f4a6862..0ee6c12d6 100644 --- a/apps/red-ui/src/styles.scss +++ b/apps/red-ui/src/styles.scss @@ -1,2 +1,2 @@ /* You can add global styles to this file, and also import other style files */ -@import "../../../assets/styles/red-theme"; +@import "./assets/styles/red-theme";