From 4b27f01385c3f8e2fb19a650a2b9885a8c9ef575 Mon Sep 17 00:00:00 2001 From: Jason Thomas Date: Mon, 30 Oct 2023 14:41:40 +0000 Subject: [PATCH 1/3] change the base-href to / in the src and specify /ui/ in the build commands --- ui/package.json | 6 +++--- ui/src/index.html | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/package.json b/ui/package.json index 8e12d215f..1972dc98c 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,12 +1,12 @@ { - "name": "gateway", + "name": "ui", "version": "0.0.0", "scripts": { "ng": "ng", "start": "ng serve --disable-host-check --host 0.0.0.0", "start_ssl": "ng serve --disable-host-check --host 0.0.0.0 --ssl", - "build": "ng build --base-href ./", - "watch": "ng build --base-href ./ --watch --configuration development", + "build": "ng build --base-href='/ui/'", + "watch": "ng build --base-href='/ui/' --watch --configuration development", "test": "ng test" }, "private": true, diff --git a/ui/src/index.html b/ui/src/index.html index 91d49286c..80ecbe8d6 100644 --- a/ui/src/index.html +++ b/ui/src/index.html @@ -2,8 +2,8 @@ - Gateway - + ui + From ec68cf8c3c22711805f14ed465ef5a490d9fb67b Mon Sep 17 00:00:00 2001 From: Jason Thomas Date: Mon, 30 Oct 2023 14:45:33 +0000 Subject: [PATCH 2/3] Change paths and titles from gateway to ui --- ui/angular.json | 12 ++++++------ ui/karma.conf.js | 2 +- ui/package-lock.json | 4 ++-- ui/src/app/app.component.spec.ts | 4 ++-- ui/src/app/app.component.ts | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ui/angular.json b/ui/angular.json index 25cd7255a..ded5ced47 100644 --- a/ui/angular.json +++ b/ui/angular.json @@ -3,7 +3,7 @@ "version": 1, "newProjectRoot": "projects", "projects": { - "gateway": { + "ui": { "projectType": "application", "schematics": { "@schematics/angular:component": { @@ -17,7 +17,7 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { - "outputPath": "dist/gateway", + "outputPath": "dist/ui", "index": "src/index.html", "main": "src/main.ts", "polyfills": "src/polyfills.ts", @@ -69,15 +69,15 @@ "serve": { "builder": "@angular-devkit/build-angular:dev-server", "options": { - "browserTarget": "gateway:build", + "browserTarget": "ui:build", "proxyConfig": "src/proxy.conf.json" }, "configurations": { "production": { - "browserTarget": "gateway:build:production" + "browserTarget": "ui:build:production" }, "development": { - "browserTarget": "gateway:build:development" + "browserTarget": "ui:build:development" } }, "defaultConfiguration": "development" @@ -85,7 +85,7 @@ "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "browserTarget": "gateway:build" + "browserTarget": "ui:build" } }, "test": { diff --git a/ui/karma.conf.js b/ui/karma.conf.js index e4f96d35d..0cd435757 100644 --- a/ui/karma.conf.js +++ b/ui/karma.conf.js @@ -25,7 +25,7 @@ module.exports = function (config) { suppressAll: true // removes the duplicated traces }, coverageReporter: { - dir: require('path').join(__dirname, './coverage/gateway'), + dir: require('path').join(__dirname, './coverage/ui'), subdir: '.', reporters: [ { type: 'html' }, diff --git a/ui/package-lock.json b/ui/package-lock.json index 6c3874553..8d4a42cc2 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -1,11 +1,11 @@ { - "name": "gateway", + "name": "ui", "version": "0.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "gateway", + "name": "ui", "version": "0.0.0", "dependencies": { "@angular/animations": "^16.2.9", diff --git a/ui/src/app/app.component.spec.ts b/ui/src/app/app.component.spec.ts index 2f0ba86ee..c27c5baf3 100644 --- a/ui/src/app/app.component.spec.ts +++ b/ui/src/app/app.component.spec.ts @@ -22,10 +22,10 @@ describe('AppComponent', () => { expect(app).toBeTruthy(); }); - it(`should have as title 'gateway'`, () => { + it(`should have as title 'ui'`, () => { const fixture = TestBed.createComponent(AppComponent); const app = fixture.componentInstance; - expect(app.title).toEqual('gateway'); + expect(app.title).toEqual('ui'); }); diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts index 14be6de6a..707777495 100644 --- a/ui/src/app/app.component.ts +++ b/ui/src/app/app.component.ts @@ -7,7 +7,7 @@ import { HttpClient } from '@angular/common/http'; styleUrls: ['./app.component.scss'] }) export class AppComponent { - title = 'gateway'; + title = 'ui'; constructor( private http: HttpClient From 877b6f6ed4e85b24b05c947680e645cb80c57b33 Mon Sep 17 00:00:00 2001 From: jthomas-orcid <138114493+jthomas-orcid@users.noreply.github.com> Date: Mon, 30 Oct 2023 15:07:20 +0000 Subject: [PATCH 3/3] typo fix --- ui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/package.json b/ui/package.json index 19fb285cb..1aa605da5 100644 --- a/ui/package.json +++ b/ui/package.json @@ -7,7 +7,7 @@ "start_ssl": "ng serve --disable-host-check --host 0.0.0.0 --ssl", "build": "ng build --base-href='/ui/'", "watch": "ng build --base-href='/ui/' --watch --configuration development", - "test": "ng test" + "test": "ng test", "lint": "ng lint", "format:cli": "ng lint && npx prettier .", "format": "ng lint --fix && npx prettier --write ."