diff --git a/production-portal/explore-production-properties.json b/production-portal/explore-production-properties.json index 5dcc0542..7a9b03ba 100644 --- a/production-portal/explore-production-properties.json +++ b/production-portal/explore-production-properties.json @@ -2,11 +2,11 @@ "enablePiwikTrack" : true, "enableHelper" : true, "useCache" : true, - "metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/", - "framesAPIURL" : "https://beta.openaire.eu/stats3/", + "metricsAPIURL" : "https://services.openaire.eu/usagestats/", + "framesAPIURL" : "https://www.openaire.eu/stats3/", "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/", - "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/", - "claimsAPIURL" : "https://beta.services.openaire.eu/claims/rest/claimsService/", + "statisticsFrameAPIURL":"https://www.openaire.eu/stats/", + "claimsAPIURL" : "https://services.openaire.eu/claims/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", @@ -31,23 +31,19 @@ "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=", "piwikSiteId" : "109", - "loginUrl" :"https://beta.services.openaire.eu/uoa-user-management/openid_connect_login", + "loginUrl" :"https://services.openaire.eu/uoa-user-management/openid_connect_login", "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", - "logoutOpenaireUrl" :"http://dl067.madgik.di.uoa.gr/idp/profile/Logout", - "cookieDomain" :".openaire.eu", "feedbackmail" :"openaire.test@gmail.com", - "helperPageUrl" :"http://scoobydoo.di.uoa.gr:16000/api/page/route", - "cacheUrl" :"https://explore.openaire.eu/cache/get?url=", "datasourcesAPI": "https://services.openaire.eu/openaire/ds/search/", - "adminToolsAPIURL" :"https://beta.services.openaire.eu/uoa-admin-tools/", + "adminToolsAPIURL" :"https://services.openaire.eu/uoa-admin-tools/", "adminToolsCommunity" :"openaire", "contextsAPI":"https://services.openaire.eu/openaire/context", diff --git a/production-portal/src/app/app.component.ts b/production-portal/src/app/app.component.ts index 2c61f758..8d7646ac 100644 --- a/production-portal/src/app/app.component.ts +++ b/production-portal/src/app/app.component.ts @@ -66,7 +66,7 @@ export class AppComponent { }, { rootItem: new MenuItem("datasources","Content Providers","","",false,["datasource"],[],{}), - items: [new MenuItem("","Data Policies","https://beta.openaire.eu/oa-policies-mandates","",false,["datasource"],[""],{}), + items: [//new MenuItem("","Data Policies","https://openaire.eu/oa-policies-mandates","",false,["datasource"],[""],{}), new MenuItem("","Repositories","","/search/content-providers",false,["datasource"],["/search/content-providers"],{}), new MenuItem("","Journals","","/search/journals",false,["datasource"],["/search/journals"],{}), new MenuItem("","Registries","","/search/entity-registries",false,["datasource"],["/search/entity-registries"],{}), @@ -74,11 +74,15 @@ export class AppComponent { } ]; bottomMenuItems =[ - new MenuItem("","About","https://beta.openaire.eu/project-factsheets","",false,[],[],{}), - new MenuItem("","News - Events","https://beta.openaire.eu/news-events","",false,[],[],{}), - new MenuItem("","Blog","https://blogs.openaire.eu/","",false,[],[],{}), - new MenuItem("","Contact us","https://beta.openaire.eu/contact-us","",false,[],[],{}) - ]; + new MenuItem("","About","https://www.openaire.eu/about","",false,[],[],{}), + new MenuItem("","Services","http://catalogue.openaire.eu","",false,[],[],{}), + new MenuItem("","Support","https://www.openaire.eu/support","",false,[],[],{}), + new MenuItem("","News","https://www.openaire.eu/news","",false,[],[],{}), + new MenuItem("","Documents","https://www.openaire.eu/documents","",false,[],[],{}), + ]; + + + feedbackmail:string properties:EnvProperties; constructor( private route: ActivatedRoute, private propertiesService:EnvironmentSpecificService) { @@ -90,7 +94,7 @@ bottomMenuItems =[ try{ this.isClient = true; if(Session.isPortalAdministrator()){ - this.userMenuItems.push(new MenuItem("","Manage helptexts","https://beta.admin.connect.openaire.eu/dashboard?communityId=openaire","",true,[],[],{})) + this.userMenuItems.push(new MenuItem("","Manage helptexts","https://admin.explore.openaire.eu/dashboard?communityId=openaire","",true,[],[],{})) } }catch (e) { } diff --git a/production-portal/src/app/home/home.component.html b/production-portal/src/app/home/home.component.html index e9db3a27..041d80b8 100644 --- a/production-portal/src/app/home/home.component.html +++ b/production-portal/src/app/home/home.component.html @@ -71,7 +71,7 @@

Search for - publications-data-software and other research artefacts. See how these + publications, datasets, software and other research products. See how these are linked together and how they are linked to funding and organizations.

View statistics on projects and institutions.

@@ -191,14 +191,14 @@
-
+ -
+
@@ -362,7 +362,7 @@ Join OpenAIRE, use our tools and make your content more visible around the world.
- + OpenAIRE.PROVIDE
@@ -388,7 +388,7 @@ Use a trusted partner to share, link, disseminate and monitor your research.
- + OpenAIRE.CONNECT
diff --git a/production-portal/src/assets/env-properties.json b/production-portal/src/assets/env-properties.json index 6474e75a..c489f345 100644 --- a/production-portal/src/assets/env-properties.json +++ b/production-portal/src/assets/env-properties.json @@ -2,7 +2,7 @@ "enablePiwikTrack" : false, "enableHelper" : true, "useCache" : true, - "metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/", + "metricsAPIURL" : "https://services.openaire.eu/usagestats/", "framesAPIURL" : "https://beta.openaire.eu/stats3/", "statisticsAPIURL" : "http://vatopedi.di.uoa.gr:8080/stats/", "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/", @@ -29,7 +29,7 @@ "helpdesk" : "https://www.openaire.eu/support/helpdesk", "uploadService" : "http://scoobydoo.di.uoa.gr:8000/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", @@ -38,8 +38,6 @@ "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", - "logoutOpenaireUrl" :"http://dl067.madgik.di.uoa.gr/idp/profile/Logout", - "cookieDomain" :".di.uoa.gr", "feedbackmail" :"openaire.test@gmail.com", diff --git a/production-portal/src/assets/explore-custom.css b/production-portal/src/assets/explore-custom.css index a584c9e4..85e07a10 100644 --- a/production-portal/src/assets/explore-custom.css +++ b/production-portal/src/assets/explore-custom.css @@ -47,11 +47,13 @@ font-weight: 600; } .connectlink{ + text-transform: none !important; background-color: #ffc800 !important; font-weight: 600; color: #fff !important; } .monitorlink{ + text-transform: none !important; background-color: #8bcc00 !important; font-weight: 600; color: #fff !important; diff --git a/production-portal/src/assets/sitemap.xml b/production-portal/src/assets/sitemap.xml index 5c3c578c..d5be7fe7 100644 --- a/production-portal/src/assets/sitemap.xml +++ b/production-portal/src/assets/sitemap.xml @@ -25,7 +25,7 @@ weekly 0.5 - + weekly @@ -60,7 +60,7 @@ weekly 0.5 - + weekly @@ -96,12 +96,12 @@ 0.5 - ![CDATA[https://explore.openaire.eu/participate/deposit-publications] + weekly 0.5 - ![CDATA[https://explore.openaire.eu/participate/deposit-datasets] + weekly 0.5 diff --git a/production-portal/src/index.html b/production-portal/src/index.html index a44e35f0..49055b9a 100644 --- a/production-portal/src/index.html +++ b/production-portal/src/index.html @@ -20,7 +20,7 @@ - + @@ -64,29 +64,10 @@ $(document).ready(function(){ console.log("Is ready - load uikit ***") $.getScript("assets/common-assets/common/uikit.js"); $.getScript("assets/common-assets/common/uikit-icons-max.js"); + $.getScript("//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-559d24521cd8c080"); }); - - - diff --git a/production-portal/static.paths.ts b/production-portal/static.paths.ts index 0c21f94a..0dbbd240 100644 --- a/production-portal/static.paths.ts +++ b/production-portal/static.paths.ts @@ -1,15 +1,12 @@ export const ROUTES = [ '/', - '/lazy', - '/home', - '/search/publication','/search/project','/search/dataset','/search/dataprovider','/search/organization', - '/search/find', - '/search/person','/search/publication','/search/project','/search/dataset','/search/dataprovider','/search/organization', - '/search/find/people','/search/find/publications','/search/find/projects','/search/find/datasets','/search/find/dataproviders','/search/find/organizations', - '/search/advanced/people','/search/advanced/publications','/search/advanced/projects','/search/advanced/datasets','/search/advanced/dataproviders','/search/advanced/organizations', + '/search/find/publications','/search/find/projects','/search/find/datasets','/search/find/dataproviders','/search/find/organizations', + '/search/advanced/publications','/search/advanced/projects','/search/advanced/datasets','/search/advanced/dataproviders','/search/advanced/organizations', '/participate/deposit-publications','/participate/deposit-datasets','/participate/deposit-publications-result','/participate/deposit-datasets-result','/participate/deposit-subject-result', '/search/content-providers','/search/content-providers-table','/search/entity-registries','/search/entity-registries-table','/search/journals','/search/journals-table', '/project-report','/claims','/myclaims','/participate/claim','/participate/direct-claim','/claims-project-manager', '/test','/user-info', + '/search/publication','/search/project','/search/dataset','/search/dataprovider','/search/organization','search/other','search/software', + '/search/find', '/error', '/*path' ];