diff --git a/Dockerfile b/Dockerfile index 479477d9163273f930bec128d331a97ca7f4bb9c..cc5b982f31c08d3a792522be32d072b9837fe0a3 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 38a1a9ebd7166e152eabe6b88e991a573f4d9f7f..b06494c10ef6032d69af2ff090f004028db3fa7b 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 a9b5cfe8f74c077016a80e8c1fdcd3343cb899e8..9371e08ee30613c8932ddfdec461f268786c1d7d 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 c6cb6cb3457edf3ee2767384897a3b7d94f1474f..28f05fbb85d969fe01209718b51f090e226ab641 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 d0520e48dd44eb5b5445c3e27fc1c254335b4a6f..f699a5af2034d60a3367c4ec1b2df0edcc52adcf 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 b9cfba4389d11daca2a8337936719ec443b66e1a..fc2831e00df7304c511f754a5dc0a7461e107ee7 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 b9b8d29d95e5ef6a9948adcc0557db4fac12f871..2891e41b46113cee9de034b71835dccef39bf627 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 cab1a0bbe7ff0b705b9ef2e01479152e14491e15..36a2fc8715a76dd5974324b42322b384b31afdd5 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 a2e54a134e01a8a6d649396afb3c4445a340e6fd..92101ffbdafc2c1552c8f8bef2a208fc671885a0 100644 --- a/src/app/shared/components/footer/footer.component.html +++ b/src/app/shared/components/footer/footer.component.html @@ -3,7 +3,7 @@ <div *ngIf="!customFooterHTML" class="container"> <div class='row align-items-center'> <div class='col-md-2'><img src='assets/images/eu-commission.png' /></div> - <div class='col-md-10 font-weight-light'>openslice.io has received funding from<div class='font-weight-light'> + <div class='col-md-10 font-weight-light'>OpenSlice has received funding from<div class='font-weight-light'> 5GinFIRE | https://5ginfire.eu/ project from the European Horizon 2020 Programme for research, technological development and demonstration under grant agreement number 732497.</div> <div class='font-weight-light'>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 462f41a7e422840015c1c3802beae5e0eaf9ebeb..fabecc4e4bef0f0c4a40c421c26844351e5fc2f2 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 988b4116d4a1f35071df714ef838d17eb2fe1371..77e01141965373930772a45113f33c56095ef292 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":"<address class='font-weight-light'><span class='font-weight-bold'>openslice.io project</span> | <a href='http://openslice.io/' class='text-white'>openslice.io</a><br>openslice.io an opensource OSS</address><address class='font-weight-light'><span class='font-weight-bold'>Openslice demo</span> | <a href='http://portal.openslice.io' class='text-white'>http://portal.openslice.io</a><br>A portal that allows 5G experimenters to deploy experiment descriptors towards the infrastructure.</address><address class='font-weight-light'><span class='font-weight-bold'>Openslice demo wiki</span> | <a href='https://openslice.readthedocs.io/en/stable/' class='text-white'>https://openslice.readthedocs.io/en/stable/</a><br>A wiki containing project documentation.</address><address class='font-weight-light'><span class='font-weight-bold'>Openslice demo Report Issues</span> | <a href='http://portal.openslice.io/bugzilla/' class='text-white'>http://portal.openslice.io/bugzilla/</a><br>Our issue tracking system.</address>", "CONNECT_WITH_US_HTML":"<div class='col-xs-12 col-sm-6 col-md-3'><div><a href='https://twitter.com/OpensliceOSS' class='font-weight-light text-white'><i class='fab fa-twitter mr-2'></i>Twitter</a></div></div><div class='col-xs-12 col-sm-6 col-md-3'><div><a href='https://openslice.slack.com/' class='font-weight-light text-white'><i class='fab fa-slack mr-2'></i>Slack</a></div></div>", - "FOOTER_HTML":"<div class='row align-items-center'><div class='col-md-2'><img src='assets/images/eu-commission.png' /></div><div class='col-md-10 font-weight-light'>openslice.io has received funding from<div class='font-weight-light'>5GinFIRE | https://5ginfire.eu/ project from the European Horizon 2020 Programme for research, technological development and demonstration under grant agreement number 732497.</div><div class='font-weight-light'>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</div><div class='font-weight-light'>Openslice demo running openslice.io version 1.1.0-SNAPSHOT| <a href='https://openslice.io/data-protection-declaration/' class='font-weight-light'>Data Protection Declaration</a> | © 2019-2021 on behalf of <a target='_blank' href='http://openslice.io/' title='openslice.io' class='font-weight-light'>openslice.io</a></div></div></div>" + "FOOTER_HTML":"<div class='row align-items-center'><div class='col-md-2'><img src='assets/images/eu-commission.png' /></div><div class='col-md-10 font-weight-light'>OpenSlice has received funding from<div class='font-weight-light'>5GinFIRE | https://5ginfire.eu/ project from the European Horizon 2020 Programme for research, technological development and demonstration under grant agreement number 732497.</div><div class='font-weight-light'>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</div><div class='font-weight-light'>Openslice demo running openslice.io version 2023-Q3 1.2.0-SNAPSHOT | <a href='https://openslice.io/data-protection-declaration/' class='font-weight-light'>Data Protection Declaration</a> | © 2019-2023 on behalf of <a target='_blank' href='http://openslice.io/' title='openslice.io' class='font-weight-light'>openslice.io</a></div></div></div>" } \ No newline at end of file diff --git a/src/index.html b/src/index.html index fc188dd98df805824405a2902df8a06b6369a252..c3377dd851eb5d16dbe6f34dfacecfb9479acd8d 100644 --- a/src/index.html +++ b/src/index.html @@ -5,7 +5,7 @@ <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400" rel="stylesheet"> - <title>Openslice</title> + <title>OpenSlice by ETSI</title> <base href="/"> <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="icon" id="appIcon" type="image/x-icon" href="favicon.ico">