diff --git a/helm-charts/code-editor/templates/ingress.yaml b/helm-charts/code-editor/templates/ingress.yaml index c4c48df..acc191c 100644 --- a/helm-charts/code-editor/templates/ingress.yaml +++ b/helm-charts/code-editor/templates/ingress.yaml @@ -9,6 +9,15 @@ spec: --- apiVersion: traefik.containo.us/v1alpha1 kind: Middleware +metadata: + name: strip-prefix-console +spec: + stripPrefix: + prefixes: + - "/code-editor/console" +--- +apiVersion: traefik.containo.us/v1alpha1 +kind: Middleware metadata: name: headers-manage spec: @@ -104,9 +113,11 @@ spec: - websecure {{- end }} routes: - - match: Host(`{{ $.Values.domain }}`) + - match: Host(`{{ $.Values.domain }}`) && PathPrefix(`/code-editor/console`) kind: Rule services: - name: {{ .Release.Name }}-console port: 8083 + middlewares: + - name: strip-prefix-console {{- end }} diff --git a/src/console/angular.json b/src/console/angular.json index 16a6bf0..eda50a2 100644 --- a/src/console/angular.json +++ b/src/console/angular.json @@ -20,6 +20,7 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { + "baseHref": "/code-editor/console/", "outputPath": "dist/console", "index": "src/index.html", "main": "src/main.ts", @@ -27,7 +28,7 @@ "tsConfig": "tsconfig.app.json", "assets": [ "src/favicon.ico", - "src/assets" + { "glob": "**/*", "input": "src/assets", "output": "code-editor/console/assets" } ], "styles": [ "./node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css", @@ -37,6 +38,11 @@ }, "configurations": { "production": { + "baseHref": "/code-editor/console/", + "assets": [ + "src/favicon.ico", + { "glob": "**/*", "input": "src/assets", "output": "code-editor/console/assets" } + ], "budgets": [ { "type": "initial", @@ -63,7 +69,8 @@ "vendorChunk": true, "extractLicenses": false, "sourceMap": true, - "namedChunks": true + "namedChunks": true, + "baseHref": "/" }, "local": { "buildOptimizer": false, diff --git a/src/console/src/app/app.module.ts b/src/console/src/app/app.module.ts index 4bdc559..1cf8f22 100644 --- a/src/console/src/app/app.module.ts +++ b/src/console/src/app/app.module.ts @@ -36,7 +36,7 @@ import { ProfileDialogComponent } from './components/dialogs/profile-dialog/prof // Required during AOT compilation export function httpTranslateLoaderFactory(http: HttpClient) { - return new TranslateHttpLoader(http); + return new TranslateHttpLoader(http, './code-editor/console/assets/i18n/'); } @NgModule({