From 13034ee3689e9885483fc24df179790eccdd4695 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 13 Feb 2024 12:38:19 +0200 Subject: [PATCH] [develop]: Remove delete properties and their usage. Update uikit to 3.16.24 --- package.json | 2 +- src/app/app-routing.module.ts | 4 ---- src/app/claims/myClaims/myClaims.component.ts | 14 +------------- .../htmlProjectReport-routing.module.ts | 15 --------------- .../htmlProjectReport.component.ts | 9 --------- .../libHtmlProjectReport.module.ts | 14 -------------- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- src/environments/environment.beta.ts | 12 +----------- src/environments/environment.prod.ts | 12 +----------- src/environments/environment.ts | 11 +---------- 12 files changed, 8 insertions(+), 91 deletions(-) delete mode 100644 src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts delete mode 100644 src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts delete mode 100644 src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts diff --git a/package.json b/package.json index c2eb3e5..ee4984e 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "rxjs": "^6.5.1", "ts-md5": "^1.2.0", "tslib": "^2.0.0", - "uikit": "3.16.14", + "uikit": "3.16.24", "zone.js": "~0.13.1" }, "devDependencies": { diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index a85bfca..8245cd1 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -73,10 +73,6 @@ const routes: Routes = [ path: 'search/advanced/projects', loadChildren: () => import('./searchPages/advanced/advancedSearchProjects.module').then(m => m.LibAdvancedSearchProjectsModule) }, - { - path: 'project-report', - loadChildren: () => import('./landingPages/htmlProjectReport/libHtmlProjectReport.module').then(m => m.LibHtmlProjectReportModule) - }, { path: 'reload', loadChildren: () => import('./reload/libReload.module').then(m => m.LibReloadModule), diff --git a/src/app/claims/myClaims/myClaims.component.ts b/src/app/claims/myClaims/myClaims.component.ts index 2f24b26..69ab982 100644 --- a/src/app/claims/myClaims/myClaims.component.ts +++ b/src/app/claims/myClaims/myClaims.component.ts @@ -1,27 +1,15 @@ import {Component} from '@angular/core'; -import {ActivatedRoute} from '@angular/router'; -import {Subscriber} from "rxjs"; import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-my-claims', - template: `` + template: `` }) export class OpenaireMyClaimsComponent { claimsInfoURL:string; - userInfoURL: string; - sub; - constructor (private route: ActivatedRoute) { - } - ngOnDestroy() { - if (this.sub instanceof Subscriber) { - this.sub.unsubscribe(); - } - } public ngOnInit() { this.claimsInfoURL = properties.claimsInformationLink; - this.userInfoURL = properties.userInfoUrl; } } diff --git a/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts b/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts deleted file mode 100644 index b3003f1..0000000 --- a/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import {NgModule} from '@angular/core'; -import {RouterModule} from '@angular/router'; - -import {OpenaireHtmlProjectReportComponent} from './htmlProjectReport.component'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { path: '', component: OpenaireHtmlProjectReportComponent , canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder]} - ]) -] -}) -export class HtmlProjectReportRoutingModule { } diff --git a/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts b/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts deleted file mode 100644 index 772048c..0000000 --- a/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts +++ /dev/null @@ -1,9 +0,0 @@ -import {Component} from '@angular/core'; -import {properties} from "../../../environments/environment"; - -@Component({ - selector: 'openaire-htmlProjectReport', - template: ``, - }) -export class OpenaireHtmlProjectReportComponent{ -} diff --git a/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts b/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts deleted file mode 100644 index c779678..0000000 --- a/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts +++ /dev/null @@ -1,14 +0,0 @@ -import {NgModule} from '@angular/core'; -import {HtmlProjectReportModule} from '../../openaireLibrary/landingPages/htmlProjectReport/htmlProjectReport.module'; -import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; -import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {OpenaireHtmlProjectReportComponent} from './htmlProjectReport.component'; -import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module'; - -@NgModule({ - imports: [HtmlProjectReportModule, HtmlProjectReportRoutingModule], - declarations:[OpenaireHtmlProjectReportComponent], - providers:[FreeGuard, PreviousRouteRecorder], - exports:[OpenaireHtmlProjectReportComponent] -}) -export class LibHtmlProjectReportModule { } diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 5af67f7..5195306 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 5af67f738570647ee61fb4d9ccb211bfae2890ae +Subproject commit 5195306ee6dfd664b207c3536234f43adc39ad33 diff --git a/src/assets/common-assets b/src/assets/common-assets index 6bb1e61..6cef9eb 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 6bb1e61b059bef1bff3bfb0611b0df46f7840426 +Subproject commit 6cef9ebed0db7ecbcca023bae824239106907960 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 5e8c1ad..419d7e2 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 5e8c1addb1ebfa508aac8cb9540a755940c95b79 +Subproject commit 419d7e200b60639ebcb9660c0e77b06a02504caa diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 5699ebb..941b71e 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -9,7 +9,6 @@ let props: EnvProperties = { useCache: false, useLongCache: true, showAddThis: true, - framesAPIURL: "https://beta.openaire.eu/stats3/", statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", @@ -40,11 +39,6 @@ let props: EnvProperties = { sherpaURL: "http://sherpa.ac.uk/romeo/issn/", sherpaURLSuffix: "/", zenodo: "https://zenodo.org/", - openAccess: "https://www.openaire.eu/support/faq#article-id-234", - openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310", - fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", - h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020", - ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf", helpdesk: "https://www.openaire.eu/support/helpdesk", helpdeskEmail: "helpdesk@openaire.eu", utilsService: "https://demo.openaire.eu/utils-service", @@ -53,10 +47,6 @@ let props: EnvProperties = { piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", piwikSiteId: "553", - loginUrl: "https://beta.services.openaire.eu/login-service/openid_connect_login", - userInfoUrl: "https://beta.services.openaire.eu/login-service/userInfo", - logoutUrl: "https://beta.services.openaire.eu/login-service/openid_logout", - cookieDomain: ".openaire.eu", feedbackmail: "feedback@openaire.eu", @@ -131,4 +121,4 @@ let props: EnvProperties = { export let properties: EnvProperties = { ...props, ...common, ...commonBeta -} \ No newline at end of file +} diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index d1013e2..9bfe92d 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -9,7 +9,6 @@ let props: EnvProperties = { useCache: false, useLongCache: true, showAddThis: true, - framesAPIURL: "https://www.openaire.eu/stats3/", statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://www.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/", @@ -40,11 +39,6 @@ let props: EnvProperties = { sherpaURL: "http://sherpa.ac.uk/romeo/issn/", sherpaURLSuffix: "/", zenodo: "https://zenodo.org/", - openAccess: "https://www.openaire.eu/support/faq#article-id-234", - openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310", - fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", - h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020", - ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf", helpdesk: "https://www.openaire.eu/support/helpdesk", helpdeskEmail: "helpdesk@openaire.eu", utilsService: "https://explore.openaire.eu/utils-service", @@ -53,10 +47,6 @@ let props: EnvProperties = { piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", piwikSiteId: "553", - - loginUrl: "https://services.openaire.eu/login-service/openid_connect_login", - userInfoUrl: "https://services.openaire.eu/login-service/userInfo", - logoutUrl: "https://services.openaire.eu/login-service/openid_logout", cookieDomain: ".openaire.eu", feedbackmail: "feedback@openaire.eu", @@ -133,4 +123,4 @@ let props: EnvProperties = { export let properties: EnvProperties = { ...props, ...common, ...commonProd -} \ No newline at end of file +} diff --git a/src/environments/environment.ts b/src/environments/environment.ts index b6ee30c..4cb91c3 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -15,7 +15,6 @@ let props: EnvProperties = { useLongCache: false, showAddThis: true, enableEoscDataTransfer: true, - framesAPIURL: "https://beta.openaire.eu/stats3/", statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", @@ -46,11 +45,6 @@ let props: EnvProperties = { sherpaURL: "http://sherpa.ac.uk/romeo/issn/", sherpaURLSuffix: "/", zenodo: "https://zenodo.org/", - openAccess: "https://www.openaire.eu/support/faq#article-id-234", - openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310", - fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", - h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020", - ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf", helpdesk: "https://www.openaire.eu/support/helpdesk", helpdeskEmail: "helpdesk@openaire.eu", utilsService: "http://dl170.madgik.di.uoa.gr:8000", @@ -59,9 +53,6 @@ let props: EnvProperties = { piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", piwikSiteId: "6", - loginUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_connect_login", - userInfoUrl: "http://mpagasas.di.uoa.gr:19080/login-service/userInfo", - logoutUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_logout", cookieDomain: ".di.uoa.gr", @@ -135,4 +126,4 @@ let props: EnvProperties = { export let properties: EnvProperties = { ...props, ...common, ...commonDev -} \ No newline at end of file +}