From 857b0eec43a2b25b420e96bc94b3dd41cc590865 Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Tue, 31 Jul 2018 12:25:50 +0000 Subject: [PATCH] ignore node_modules file add missing .angular-cli.json file add ORPs pages and tabs Update sitemap Update properties file git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@52844 d315682c-612b-4755-9ff5-7f18f6832af3 --- production-portal/.angular-cli.json | 110 ++++++++++++++++++ .../explore-production-properties.json | 25 ++-- production-portal/prepareDeploy.sh | 4 +- .../src/app/app-routing.module.ts | 3 + production-portal/src/app/app.component.ts | 7 +- .../src/app/landingPages/orp/libOrp.module.ts | 19 +++ .../landingPages/orp/orp-routing.module.ts | 19 +++ .../src/app/landingPages/orp/orp.component.ts | 17 +++ .../advancedSearchOrps-routing.module.ts | 20 ++++ .../advanced/advancedSearchOrps.component.ts | 16 +++ .../advanced/advancedSearchOrps.module.ts | 29 +++++ .../simple/searchOrps-routing.module.ts | 23 ++++ .../simple/searchOrps.component.ts | 14 +++ .../searchPages/simple/searchOrps.module.ts | 28 +++++ .../src/assets/env-properties.json | 15 ++- production-portal/src/assets/sitemap.xml | 45 +++---- 16 files changed, 352 insertions(+), 42 deletions(-) create mode 100644 production-portal/.angular-cli.json create mode 100644 production-portal/src/app/landingPages/orp/libOrp.module.ts create mode 100644 production-portal/src/app/landingPages/orp/orp-routing.module.ts create mode 100644 production-portal/src/app/landingPages/orp/orp.component.ts create mode 100644 production-portal/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts create mode 100644 production-portal/src/app/searchPages/advanced/advancedSearchOrps.component.ts create mode 100644 production-portal/src/app/searchPages/advanced/advancedSearchOrps.module.ts create mode 100644 production-portal/src/app/searchPages/simple/searchOrps-routing.module.ts create mode 100644 production-portal/src/app/searchPages/simple/searchOrps.component.ts create mode 100644 production-portal/src/app/searchPages/simple/searchOrps.module.ts diff --git a/production-portal/.angular-cli.json b/production-portal/.angular-cli.json new file mode 100644 index 00000000..975ee350 --- /dev/null +++ b/production-portal/.angular-cli.json @@ -0,0 +1,110 @@ +{ + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "project": { + "name": "ng-universal-demo" + }, + "apps": [ + { + "root": "src", + "outDir": "dist/browser", + "assets": [ + "assets", + "favicon.ico" + ], + "index": "index.html", + "main": "main.ts", + "polyfills": "polyfills.ts", + "test": "test.ts", + "tsconfig": "tsconfig.app.json", + "testTsconfig": "tsconfig.spec.json", + "prefix": "app", + "styles": [ + "styles.css", + "../node_modules/datatables.net-dt/css/jquery.dataTables.css" + ], + "scripts": [ + "../node_modules/jquery/dist/jquery.js", + "../node_modules/datatables.net/js/jquery.dataTables.js" + ], + "environmentSource": "environments/environment.ts", + "environments": { + "dev": "environments/environment.ts", + "prod": "environments/environment.prod.ts" + } + }, + { + "platform": "server", + "root": "src", + "outDir": "dist/server", + "assets": [ + "assets", + "favicon.ico" + ], + "index": "index.html", + "main": "main.server.ts", + "test": "test.ts", + "tsconfig": "tsconfig.server.json", + "testTsconfig": "tsconfig.spec.json", + "prefix": "app", + "styles": [ + "styles.css" + ], + "scripts": [], + "environmentSource": "environments/environment.ts", + "environments": { + "dev": "environments/environment.ts", + "prod": "environments/environment.prod.ts" + } + } + ], + "e2e": { + "protractor": { + "config": "./protractor.conf.js" + } + }, + "lint": [ + { + "project": "src/tsconfig.app.json", + "exclude": "**/node_modules/**" + }, + { + "project": "src/tsconfig.spec.json", + "exclude": "**/node_modules/**" + }, + { + "project": "e2e/tsconfig.e2e.json", + "exclude": "**/node_modules/**" + } + ], + "test": { + "karma": { + "config": "./karma.conf.js" + } + }, + "defaults": { + "styleExt": "css", + "component": { + "spec": false, + "inlineStyle": true, + "inlineTemplate": true + }, + "directive": { + "spec": false + }, + "class": { + "spec": false + }, + "guard": { + "spec": false + }, + "module": { + "spec": false + }, + "pipe": { + "spec": false + }, + "service": { + "spec": false + } + } + } diff --git a/production-portal/explore-production-properties.json b/production-portal/explore-production-properties.json index 2078966e..5dcc0542 100644 --- a/production-portal/explore-production-properties.json +++ b/production-portal/explore-production-properties.json @@ -7,9 +7,9 @@ "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/", "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/", "claimsAPIURL" : "https://beta.services.openaire.eu/claims/rest/claimsService/", - "searchAPIURLLAst" : "https://beta.services.openaire.eu/search/v2/api/", - "searchResourcesAPIURL" : "https://beta.services.openaire.eu/search/v2/api/resources", - "csvAPIURL" : "https://beta.services.openaire.eu/search/v2/api/reports", + "searchAPIURLLAst" : "https://services.openaire.eu/search/v2/api/", + "searchResourcesAPIURL" : "https://services.openaire.eu/search/v2/api/resources", + "csvAPIURL" : "https://services.openaire.eu/search/v2/api/reports", "searchCrossrefAPIURL" : "https://api.crossref.org/works", "searchDataciteAPIURL" : "https://api.datacite.org/works", "searchOrcidURL" : "https://pub.orcid.org/v2.1/", @@ -25,12 +25,12 @@ "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", - "uploadService" : "https://demo.openaire.eu/upload/", + "uploadService" : "https://explore.openaire.eu/upload/", - "vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/", + "vocabulariesAPI" :"https://services.openaire.eu/provision/mvc/vocabularies/", "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=", - "piwikSiteId" : "6", + "piwikSiteId" : "109", "loginUrl" :"https://beta.services.openaire.eu/uoa-user-management/openid_connect_login", "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", @@ -43,26 +43,27 @@ "helperPageUrl" :"http://scoobydoo.di.uoa.gr:16000/api/page/route", - "cacheUrl" :"https://demo.openaire.eu/cache/get?url=", + "cacheUrl" :"https://explore.openaire.eu/cache/get?url=", - "datasourcesAPI": "https://beta.services.openaire.eu/openaire/ds/search/", + "datasourcesAPI": "https://services.openaire.eu/openaire/ds/search/", "adminToolsAPIURL" :"https://beta.services.openaire.eu/uoa-admin-tools/", "adminToolsCommunity" :"openaire", - "contextsAPI":"https://beta.services.openaire.eu/openaire/context", - "communityAPI": "https://beta.services.openaire.eu/openaire/community/", + "contextsAPI":"https://services.openaire.eu/openaire/context", + "communityAPI": "https://services.openaire.eu/openaire/community/", "csvLimit": 2000, "pagingLimit": 20, "resultsPerPage": 10, - "baseLink" : "https://beta.explore.openaire.eu", + "baseLink" : "https://explore.openaire.eu", "searchLinkToPublication" : "/search/publication?articleId=", "searchLinkToProject" : "/search/project?projectId=", "searchLinkToDataProvider" : "/search/dataprovider?datasourceId=", "searchLinkToDataset" : "/search/dataset?datasetId=", + "searchLinkToOrp" : "/search/other?orpId=", "searchLinkToOrganization" : "/search/organization?organizationId=", "searchLinkToPublications" : "/search/find/publications", @@ -70,6 +71,7 @@ "searchLinkToProjects" : "/search/find/projects", "searchLinkToDatasets" : "/search/find/datasets", "searchLinkToSoftware" : "/search/find/software", + "searchLinkToOrps" : "/search/find/other", "searchLinkToOrganizations" : "/search/find/organizations", "searchLinkToCompatibleDataProviders" : "/search/content-providers", "searchLinkToCompatibleDataProvidersTable" : "/search/content-providers-table", @@ -82,6 +84,7 @@ "searchLinkToAdvancedProjects" : "/search/advanced/projects", "searchLinkToAdvancedDatasets" : "/search/advanced/datasets", "searchLinkToAdvancedSoftware" : "/search/advanced/software", + "searchLinkToAdvancedOrps" : "/search/advanced/other", "searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders", "searchLinkToAdvancedOrganizations" : "/search/advanced/organizations", "searchLinkToAdvancedPeople" : "/search/advanced/people" diff --git a/production-portal/prepareDeploy.sh b/production-portal/prepareDeploy.sh index 5aee01b9..c10f29ea 100755 --- a/production-portal/prepareDeploy.sh +++ b/production-portal/prepareDeploy.sh @@ -15,8 +15,8 @@ # echo 'Now copy to the server!' ##<-- to here -#copy "deploy-folder" in demo.openaire.eu -#coppies of previous deployments exist in "/home/argiro.kokogiannaki/uoa-portal/openaireYYYY-MM-DD" +#copy "deploy-folder" in explore.openaire.eu +#coppies of previous deployments exist in "/home/argiro.kokogiannaki/portals/explore-YYYYMMDD" #run "npm i" #become nodejs user: "sudo su nodejs -s /bin/bash" #go to "cd /srv/www/portal" diff --git a/production-portal/src/app/app-routing.module.ts b/production-portal/src/app/app-routing.module.ts index a0146885..66287bec 100644 --- a/production-portal/src/app/app-routing.module.ts +++ b/production-portal/src/app/app-routing.module.ts @@ -13,6 +13,7 @@ const routes: Routes = [ { path: 'search/publication', loadChildren: './landingPages/publication/libPublication.module#LibPublicationModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/dataset', loadChildren: './landingPages/dataset/libDataset.module#LibDatasetModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/software', loadChildren: './landingPages/software/libSoftware.module#LibSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, + { path: 'search/other', loadChildren: './landingPages/orp/libOrp.module#LibOrpModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/project', loadChildren: './landingPages/project/libProject.module#LibProjectModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/dataprovider', loadChildren: '././landingPages/dataProvider/libDataProvider.module#LibDataProviderModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/organization', loadChildren: './landingPages/organization/libOrganization.module#LibOrganizationModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, @@ -25,6 +26,7 @@ const routes: Routes = [ { path: 'search/find/publications', loadChildren: './searchPages/simple/searchPublications.module#LibSearchPublicationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/find/datasets', loadChildren: './searchPages/simple/searchDatasets.module#LibSearchDatasetsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/find/software', loadChildren: './searchPages/simple/searchSoftware.module#LibSearchSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, + { path: 'search/find/other', loadChildren: './searchPages/simple/searchOrps.module#LibSearchOrpsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/find/projects', loadChildren: './searchPages/simple/searchProjects.module#LibSearchProjectsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/find/dataproviders', loadChildren: './searchPages/simple/searchDataProviders.module#LibSearchDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/find/organizations', loadChildren: './searchPages/simple/searchOrganizations.module#LibSearchOrganizationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, @@ -37,6 +39,7 @@ const routes: Routes = [ { path: 'search/advanced/publications', loadChildren: './searchPages/advanced/advancedSearchPublications.module#LibAdvancedSearchPublicationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/advanced/datasets', loadChildren: './searchPages/advanced/advancedSearchDatasets.module#LibAdvancedSearchDatasetsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/advanced/software', loadChildren: './searchPages/advanced/advancedSearchSoftware.module#LibAdvancedSearchSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, + { path: 'search/advanced/other', loadChildren: './searchPages/advanced/advancedSearchOrps.module#LibAdvancedSearchOrpsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/advanced/organizations', loadChildren: './searchPages/advanced/advancedSearchOrganizations.module#LibAdvancedSearchOrganizationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/advanced/dataproviders', loadChildren: './searchPages/advanced/advancedSearchDataProviders.module#LibAdvancedSearchDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/advanced/projects', loadChildren: './searchPages/advanced/advancedSearchProjects.module#LibAdvancedSearchProjectsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, diff --git a/production-portal/src/app/app.component.ts b/production-portal/src/app/app.component.ts index 32ce85f4..2c61f758 100644 --- a/production-portal/src/app/app.component.ts +++ b/production-portal/src/app/app.component.ts @@ -41,8 +41,8 @@ export class AppComponent { clientLoad = 0; userMenuItems:MenuItem[] = [ new MenuItem("","My profile","","",false,[],[],{}), - new MenuItem("","My claims","","/myclaims",false,[],["/myclaims"],{}), - new MenuItem("","Manage all claims","","/claims",true,[],["/claims"],{})] + new MenuItem("","My links","","/myclaims",false,[],["/myclaims"],{}), + new MenuItem("","Manage all links","","/claims",true,[],["/claims"],{})] menuItems:RootMenuItem [] = [ @@ -50,6 +50,7 @@ export class AppComponent { items: [new MenuItem("","Publications","","/search/find/publications",false,["publication"],["/search/find/publications"],{}), new MenuItem("","Research Data","","/search/find/datasets",false,["dataset"],["/search/find/datasets"],{}), new MenuItem("","Software","","/search/find/software",false,["software"],["/search/find/software"],{}), + new MenuItem("","Other Research Products","","/search/find/other",false,["orp"],["/search/find/other"],{}), new MenuItem("","Projects","","/search/find/projects/",false,["project"],["/search/find/projects"],{}), new MenuItem("","Content Providers","","/search/find/dataproviders",false,["datasource"],["/search/find/dataproviders"],{}), new MenuItem("","Organizations","","/search/find/organizations/",false,["organization"],["/search/find/organizations"],{}) @@ -89,7 +90,7 @@ bottomMenuItems =[ try{ this.isClient = true; if(Session.isPortalAdministrator()){ - this.userMenuItems.push(new MenuItem("","Administration","https://beta.admin.connect.openaire.eu/dashboard?communityId=openaire","",true,[],[],{})) + this.userMenuItems.push(new MenuItem("","Manage helptexts","https://beta.admin.connect.openaire.eu/dashboard?communityId=openaire","",true,[],[],{})) } }catch (e) { } diff --git a/production-portal/src/app/landingPages/orp/libOrp.module.ts b/production-portal/src/app/landingPages/orp/libOrp.module.ts new file mode 100644 index 00000000..813c5e6f --- /dev/null +++ b/production-portal/src/app/landingPages/orp/libOrp.module.ts @@ -0,0 +1,19 @@ +//import {MaterialModule} from '@angular/material'; +import { NgModule} from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { SharedModule } from '../../shared/shared.module'; +import { RouterModule } from '@angular/router'; +import { OrpModule } from '../../openaireLibrary/landingPages/orp/orp.module'; +import { OpenaireOrpComponent } from './orp.component'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; +import {OrpRoutingModule} from './orp-routing.module'; + @NgModule({ + imports: [OrpModule, OrpRoutingModule], + declarations:[OpenaireOrpComponent], + providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], + exports:[OpenaireOrpComponent] +}) +export class LibOrpModule { } diff --git a/production-portal/src/app/landingPages/orp/orp-routing.module.ts b/production-portal/src/app/landingPages/orp/orp-routing.module.ts new file mode 100644 index 00000000..8ac82b7b --- /dev/null +++ b/production-portal/src/app/landingPages/orp/orp-routing.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { OpenaireOrpComponent } from './orp.component'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' + + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: '', component: OpenaireOrpComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + redirect: '/error', community : 'openaire' + },canDeactivate: [PreviousRouteRecorder] } + ]) +] +}) +export class OrpRoutingModule { } diff --git a/production-portal/src/app/landingPages/orp/orp.component.ts b/production-portal/src/app/landingPages/orp/orp.component.ts new file mode 100644 index 00000000..a63b6fa2 --- /dev/null +++ b/production-portal/src/app/landingPages/orp/orp.component.ts @@ -0,0 +1,17 @@ +import {Component, ViewChild, ElementRef} from '@angular/core'; + +@Component({ + selector: 'openaire-orp', + template: ``, + }) +export class OpenaireOrpComponent{ + constructor ( ) { + + } + + ngOnInit() { +} + + + +} diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts b/production-portal/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts new file mode 100644 index 00000000..d131f70d --- /dev/null +++ b/production-portal/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import{OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' + + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: '', component: OpenaireAdvancedSearchOrpsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + redirect: '/error', community : 'openaire' + }, canDeactivate: [PreviousRouteRecorder] } + + ]) + ] +}) +export class AdvancedSearchOrpsRoutingModule { } diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchOrps.component.ts b/production-portal/src/app/searchPages/advanced/advancedSearchOrps.component.ts new file mode 100644 index 00000000..262ab1b1 --- /dev/null +++ b/production-portal/src/app/searchPages/advanced/advancedSearchOrps.component.ts @@ -0,0 +1,16 @@ +import {Component, Input, ViewChild} from '@angular/core'; + + +@Component({ + selector: 'openaire-advanced-search-orps', + template: ` + + + + ` + }) + +export class OpenaireAdvancedSearchOrpsComponent { + + +} diff --git a/production-portal/src/app/searchPages/advanced/advancedSearchOrps.module.ts b/production-portal/src/app/searchPages/advanced/advancedSearchOrps.module.ts new file mode 100644 index 00000000..8d8d3137 --- /dev/null +++ b/production-portal/src/app/searchPages/advanced/advancedSearchOrps.module.ts @@ -0,0 +1,29 @@ +import { NgModule} from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { AdvancedSearchOrpsRoutingModule} from './advancedSearchOrps-routing.module'; +import { OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component'; + + + import {AdvancedSearchOrpsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchOrps.module'; + import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; + import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; + import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' + +@NgModule({ + imports: [ + CommonModule, FormsModule, + AdvancedSearchOrpsModule, + AdvancedSearchOrpsRoutingModule + + ], + declarations: [ + OpenaireAdvancedSearchOrpsComponent + ], + providers:[FreeGuard, IsRouteEnabled], + exports: [ + OpenaireAdvancedSearchOrpsComponent + ] +}) +export class LibAdvancedSearchOrpsModule { } diff --git a/production-portal/src/app/searchPages/simple/searchOrps-routing.module.ts b/production-portal/src/app/searchPages/simple/searchOrps-routing.module.ts new file mode 100644 index 00000000..ff122a51 --- /dev/null +++ b/production-portal/src/app/searchPages/simple/searchOrps-routing.module.ts @@ -0,0 +1,23 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import{OpenaireSearchOrpsComponent} from './searchOrps.component'; +import { EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properties/environmentSpecificResolver'; + +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' + + + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: '', component: OpenaireSearchOrpsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: { + redirect: '/error', community : 'openaire' + }, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }}, + + ]) + ] +}) +export class SearchOrpsRoutingModule { } diff --git a/production-portal/src/app/searchPages/simple/searchOrps.component.ts b/production-portal/src/app/searchPages/simple/searchOrps.component.ts new file mode 100644 index 00000000..f9a21119 --- /dev/null +++ b/production-portal/src/app/searchPages/simple/searchOrps.component.ts @@ -0,0 +1,14 @@ +import {Component, Input, ViewChild} from '@angular/core'; + +@Component({ + selector: 'openaire-search-orps', + template: ` + + + + ` +}) + +export class OpenaireSearchOrpsComponent { + +} diff --git a/production-portal/src/app/searchPages/simple/searchOrps.module.ts b/production-portal/src/app/searchPages/simple/searchOrps.module.ts new file mode 100644 index 00000000..dcbdf007 --- /dev/null +++ b/production-portal/src/app/searchPages/simple/searchOrps.module.ts @@ -0,0 +1,28 @@ +import { NgModule} from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import{ SearchOrpsRoutingModule} from './searchOrps-routing.module'; +import{OpenaireSearchOrpsComponent} from './searchOrps.component'; + +import {SearchOrpsModule} from '../../openaireLibrary/searchPages/simple/searchOrps.module'; +import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' + + +@NgModule({ + imports: [ + CommonModule, FormsModule, + SearchOrpsModule , SearchOrpsRoutingModule + + ], + declarations: [ + OpenaireSearchOrpsComponent + ], + providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], + exports: [ + OpenaireSearchOrpsComponent + ] +}) +export class LibSearchOrpsModule { } diff --git a/production-portal/src/assets/env-properties.json b/production-portal/src/assets/env-properties.json index 5d661072..6474e75a 100644 --- a/production-portal/src/assets/env-properties.json +++ b/production-portal/src/assets/env-properties.json @@ -6,10 +6,10 @@ "framesAPIURL" : "https://beta.openaire.eu/stats3/", "statisticsAPIURL" : "http://vatopedi.di.uoa.gr:8080/stats/", "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/", - "claimsAPIURL" : "http://duffy.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/", - "searchAPIURLLAst" : "https://beta.services.openaire.eu/search/v2/api/", - "searchResourcesAPIURL" : "https://beta.services.openaire.eu/search/v2/api/resources", - "csvAPIURL" : "http://vatopedi.di.uoa.gr:8080/shadowSearch/rest/v2/api/reports", + "claimsAPIURL" : "http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/", + "searchAPIURLLAst" : "https://services.openaire.eu/search/v2/api/", + "searchResourcesAPIURL" : "https://services.openaire.eu/search/v2/api/resources", + "csvAPIURL" : "https://services.openaire.eu/search/v2/api/reports", "searchCrossrefAPIURL" : "https://api.crossref.org/works", "searchDataciteAPIURL" : "https://api.datacite.org/works", @@ -52,7 +52,7 @@ "adminToolsCommunity" :"openaire", - "datasourcesAPI": "https://beta.services.openaire.eu/openaire/ds/search/", + "datasourcesAPI": "https://services.openaire.eu/openaire/ds/search/", "contextsAPI":"https://dev-openaire.d4science.org/openaire/context", "communityAPI": "https://dev-openaire.d4science.org/openaire/community/", @@ -60,12 +60,13 @@ "pagingLimit": 20, "resultsPerPage": 10, - "baseLink" : "https://beta.explore.openaire.eu", + "baseLink" : "https://explore.openaire.eu", "searchLinkToPublication" : "/search/publication?articleId=", "searchLinkToProject" : "/search/project?projectId=", "searchLinkToDataProvider" : "/search/dataprovider?datasourceId=", "searchLinkToDataset" : "/search/dataset?datasetId=", + "searchLinkToOrp" : "/search/other?orpId=", "searchLinkToOrganization" : "/search/organization?organizationId=", "searchLinkToPublications" : "/search/find/publications", @@ -73,6 +74,7 @@ "searchLinkToProjects" : "/search/find/projects", "searchLinkToDatasets" : "/search/find/datasets", "searchLinkToSoftware" : "/search/find/software", + "searchLinkToOrps" : "/search/find/other", "searchLinkToOrganizations" : "/search/find/organizations", "searchLinkToCompatibleDataProviders" : "/search/content-providers", "searchLinkToCompatibleDataProvidersTable" : "/search/content-providers-table", @@ -85,6 +87,7 @@ "searchLinkToAdvancedProjects" : "/search/advanced/projects", "searchLinkToAdvancedDatasets" : "/search/advanced/datasets", "searchLinkToAdvancedSoftware" : "/search/advanced/software", + "searchLinkToAdvancedOrps" : "/search/advanced/other", "searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders", "searchLinkToAdvancedOrganizations" : "/search/advanced/organizations", "searchLinkToAdvancedPeople" : "/search/advanced/people" diff --git a/production-portal/src/assets/sitemap.xml b/production-portal/src/assets/sitemap.xml index 962d743c..5c3c578c 100644 --- a/production-portal/src/assets/sitemap.xml +++ b/production-portal/src/assets/sitemap.xml @@ -1,102 +1,107 @@ - + weekly 0.5 - + weekly 0.5 - + weekly 0.5 - + weekly 0.5 - + weekly 0.5 - + weekly 0.5 - + weekly 0.5 - + weekly 0.5 - + weekly 0.5 - + weekly 0.5 - + weekly 0.5 - + weekly 0.5 - + weekly 0.5 - + weekly 0.5 - + weekly 0.5 - + weekly 0.5 - + weekly 0.5 - + weekly 0.5 - ![CDATA[https://beta.explore.openaire.eu/participate/deposit-publications] + weekly 0.5 - ![CDATA[https://beta.explore.openaire.eu/participate/deposit-datasets] + ![CDATA[https://explore.openaire.eu/participate/deposit-publications] + weekly + 0.5 + + + ![CDATA[https://explore.openaire.eu/participate/deposit-datasets] weekly 0.5