From 8c9a6398de77a0fa962336299f6e598e7d75254e Mon Sep 17 00:00:00 2001 From: Kostis Trantzas Date: Tue, 7 Nov 2023 14:48:56 +0200 Subject: [PATCH] project's components renaming for ETSI --- Dockerfile | 2 +- angular.json | 18 +++++++++--------- e2e/src/app.e2e-spec.ts | 2 +- karma.conf.js | 2 +- package-lock.json | 4 ++-- package.json | 2 +- src/app/app.component.spec.ts | 6 +++--- src/app/app.component.ts | 2 +- .../components/footer/footer.component.html | 2 +- src/assets/config/config.prod.default.json | 2 +- src/assets/config/config.theming.default.json | 2 +- src/index.html | 2 +- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index 479477d..cc5b982 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,6 @@ # Stage 1, based on Nginx, to have only the compiled app, ready for production with Nginx FROM nginx:1.19.4 #Copy ci-dashboard-dist -COPY ./dist/io-openslice-portal-web/ /usr/share/nginx/html/services +COPY ./dist/org.etsi.osl.tmf.web/ /usr/share/nginx/html/services #Copy default nginx configuration COPY ./nginx-custom.conf /etc/nginx/conf.d/default.conf diff --git a/angular.json b/angular.json index 38a1a9e..b06494c 100644 --- a/angular.json +++ b/angular.json @@ -3,7 +3,7 @@ "version": 1, "newProjectRoot": "projects", "projects": { - "io-openslice-portal-web": { + "org.etsi.osl.tmf.web": { "projectType": "application", "schematics": { "@schematics/angular:component": { @@ -18,7 +18,7 @@ "builder": "@angular-devkit/build-angular:browser", "options": { "allowedCommonJsDependencies": ["jwt-decode"], - "outputPath": "dist/io-openslice-portal-web", + "outputPath": "dist/org.etsi.osl.tmf.web", "index": "src/index.html", "main": "src/main.ts", "polyfills": "src/polyfills.ts", @@ -91,21 +91,21 @@ "serve": { "builder": "@angular-devkit/build-angular:dev-server", "options": { - "browserTarget": "io-openslice-portal-web:build" + "browserTarget": "org.etsi.osl.tmf.web:build" }, "configurations": { "production": { - "browserTarget": "io-openslice-portal-web:build:production" + "browserTarget": "org.etsi.osl.tmf.web:build:production" }, "development": { - "browserTarget": "io-openslice-portal-web:build:development" + "browserTarget": "org.etsi.osl.tmf.web:build:development" } } }, "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "browserTarget": "io-openslice-portal-web:build" + "browserTarget": "org.etsi.osl.tmf.web:build" } }, "test": { @@ -143,16 +143,16 @@ "builder": "@angular-devkit/build-angular:protractor", "options": { "protractorConfig": "e2e/protractor.conf.js", - "devServerTarget": "io-openslice-portal-web:serve" + "devServerTarget": "org.etsi.osl.tmf.web:serve" }, "configurations": { "production": { - "devServerTarget": "io-openslice-portal-web:serve:production" + "devServerTarget": "org.etsi.osl.tmf.web:serve:production" } } } } } }, - "defaultProject": "io-openslice-portal-web" + "defaultProject": "org.etsi.osl.tmf.web" } \ No newline at end of file diff --git a/e2e/src/app.e2e-spec.ts b/e2e/src/app.e2e-spec.ts index a9b5cfe..9371e08 100644 --- a/e2e/src/app.e2e-spec.ts +++ b/e2e/src/app.e2e-spec.ts @@ -10,7 +10,7 @@ describe('workspace-project App', () => { it('should display welcome message', () => { page.navigateTo(); - expect(page.getTitleText()).toEqual('io-openslice-portal-web app is running!'); + expect(page.getTitleText()).toEqual('org.etsi.osl.tmf.web app is running!'); }); afterEach(async () => { diff --git a/karma.conf.js b/karma.conf.js index c6cb6cb..28f05fb 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -16,7 +16,7 @@ module.exports = function (config) { clearContext: false // leave Jasmine Spec Runner output visible in browser }, coverageIstanbulReporter: { - dir: require('path').join(__dirname, './coverage/io-openslice-portal-web'), + dir: require('path').join(__dirname, './coverage/org.etsi.osl.tmf.web'), reports: ['html', 'lcovonly', 'text-summary'], fixWebpackSourcePaths: true }, diff --git a/package-lock.json b/package-lock.json index d0520e4..f699a5a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "io-openslice-portal-web", + "name": "org.etsi.osl.tmf.web", "version": "0.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "io-openslice-portal-web", + "name": "org.etsi.osl.tmf.web", "version": "0.0.0", "dependencies": { "@angular/animations": "~13.3.11", diff --git a/package.json b/package.json index b9cfba4..fc2831e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "io-openslice-portal-web", + "name": "org.etsi.osl.tmf.web", "version": "0.0.0", "scripts": { "ng": "ng", diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index b9b8d29..2891e41 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -20,16 +20,16 @@ describe('AppComponent', () => { expect(app).toBeTruthy(); }); - it(`should have as title 'io-openslice-portal-web'`, () => { + it(`should have as title 'org.etsi.osl.tmf.web'`, () => { const fixture = TestBed.createComponent(AppComponent); const app = fixture.debugElement.componentInstance; - expect(app.title).toEqual('io-openslice-portal-web'); + expect(app.title).toEqual('org.etsi.osl.tmf.web'); }); it('should render title', () => { const fixture = TestBed.createComponent(AppComponent); fixture.detectChanges(); const compiled = fixture.debugElement.nativeElement; - expect(compiled.querySelector('.content span').textContent).toContain('io-openslice-portal-web app is running!'); + expect(compiled.querySelector('.content span').textContent).toContain('org.etsi.osl.tmf.web app is running!'); }); }); diff --git a/src/app/app.component.ts b/src/app/app.component.ts index cab1a0b..36a2fc8 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -16,7 +16,7 @@ import { IAppConfig } from './shared/models/app-config.model'; }) export class AppComponent { - title = 'io-openslice-portal-web'; + title = 'org.etsi.osl.tmf.web'; themeID = 'default' diff --git a/src/app/shared/components/footer/footer.component.html b/src/app/shared/components/footer/footer.component.html index a2e54a1..92101ff 100644 --- a/src/app/shared/components/footer/footer.component.html +++ b/src/app/shared/components/footer/footer.component.html @@ -3,7 +3,7 @@
-
openslice.io has received funding from
+
OpenSlice has received funding from
5GinFIRE | https://5ginfire.eu/ project from the European Horizon 2020 Programme for research, technological development and demonstration under grant agreement number 732497.
5G-VINNI project | https://5g-vinni.eu/ 5G-VINNI project has received funding diff --git a/src/assets/config/config.prod.default.json b/src/assets/config/config.prod.default.json index 462f41a..fabecc4 100644 --- a/src/assets/config/config.prod.default.json +++ b/src/assets/config/config.prod.default.json @@ -1,5 +1,5 @@ { - "TITLE": "Openslice demo", + "TITLE": "OpenSlice by ETSI", "PORTALVERSION":"2023-Q3 1.2.0-SNAPSHOT", "WIKI": "https://openslice.readthedocs.io/en/stable/", "BUGZILLA": "{BASEURL}/bugzilla/", diff --git a/src/assets/config/config.theming.default.json b/src/assets/config/config.theming.default.json index 988b411..77e0114 100644 --- a/src/assets/config/config.theming.default.json +++ b/src/assets/config/config.theming.default.json @@ -5,5 +5,5 @@ "FAVICON_PATH":"favicon.ico", "WHO_WE_ARE_HTML":"
openslice.io project | openslice.io
openslice.io an opensource OSS
Openslice demo | http://portal.openslice.io
A portal that allows 5G experimenters to deploy experiment descriptors towards the infrastructure.
Openslice demo wiki | https://openslice.readthedocs.io/en/stable/
A wiki containing project documentation.
Openslice demo Report Issues | http://portal.openslice.io/bugzilla/
Our issue tracking system.
", "CONNECT_WITH_US_HTML":"
", - "FOOTER_HTML":"
openslice.io has received funding from
5GinFIRE | https://5ginfire.eu/ project from the European Horizon 2020 Programme for research, technological development and demonstration under grant agreement number 732497.
5G-VINNI project | https://5g-vinni.eu/ 5G-VINNI project has received funding from the European Horizon 2020 Programme for research, technological development and demonstration under grant agreement number 815279
Openslice demo running openslice.io version 1.1.0-SNAPSHOT| Data Protection Declaration | © 2019-2021 on behalf of openslice.io
" + "FOOTER_HTML":"
OpenSlice has received funding from
5GinFIRE | https://5ginfire.eu/ project from the European Horizon 2020 Programme for research, technological development and demonstration under grant agreement number 732497.
5G-VINNI project | https://5g-vinni.eu/ 5G-VINNI project has received funding from the European Horizon 2020 Programme for research, technological development and demonstration under grant agreement number 815279
Openslice demo running openslice.io version 2023-Q3 1.2.0-SNAPSHOT | Data Protection Declaration | © 2019-2023 on behalf of openslice.io
" } \ No newline at end of file diff --git a/src/index.html b/src/index.html index fc188dd..c3377dd 100644 --- a/src/index.html +++ b/src/index.html @@ -5,7 +5,7 @@ - Openslice + OpenSlice by ETSI -- GitLab