MaDgIK
/
explore-services
13
0
Fork 0
Code Issues Pull Requests Projects Releases 22 Wiki Activity

Use production API urls 

Use production urls in main menu and links in home page
Add google verification code
Correct sitemap (also comment orp/software)




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@53259 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2018-09-25 12:43:59 +00:00
parent e769af7356
commit 478262ef50
8 changed files with 42 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
production-portal/explore-production-properties.json
View File

@ -2,11 +2,11 @@
"enablePiwikTrack" : true, "enablePiwikTrack" : true,
"enableHelper" : true, "enableHelper" : true,
"useCache" : true, "useCache" : true,
"metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/", "metricsAPIURL" : "https://services.openaire.eu/usagestats/",
"framesAPIURL" : "https://beta.openaire.eu/stats3/", "framesAPIURL" : "https://www.openaire.eu/stats3/",
"statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/", "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",
"statisticsFrameAPIURL":"https://beta.openaire.eu/stats/", "statisticsFrameAPIURL":"https://www.openaire.eu/stats/",
"claimsAPIURL" : "https://beta.services.openaire.eu/claims/rest/claimsService/", "claimsAPIURL" : "https://services.openaire.eu/claims/rest/claimsService/",
"searchAPIURLLAst" : "https://services.openaire.eu/search/v2/api/", "searchAPIURLLAst" : "https://services.openaire.eu/search/v2/api/",
"searchResourcesAPIURL" : "https://services.openaire.eu/search/v2/api/resources", "searchResourcesAPIURL" : "https://services.openaire.eu/search/v2/api/resources",
"csvAPIURL" : "https://services.openaire.eu/search/v2/api/reports", "csvAPIURL" : "https://services.openaire.eu/search/v2/api/reports",
@ -31,23 +31,19 @@
"piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=", "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=",
"piwikSiteId" : "109", "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=", "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
"logoutOpenaireUrl" :"http://dl067.madgik.di.uoa.gr/idp/profile/Logout",
"cookieDomain" :".openaire.eu", "cookieDomain" :".openaire.eu",
"feedbackmail" :"openaire.test@gmail.com", "feedbackmail" :"openaire.test@gmail.com",
"helperPageUrl" :"http://scoobydoo.di.uoa.gr:16000/api/page/route",
"cacheUrl" :"https://explore.openaire.eu/cache/get?url=", "cacheUrl" :"https://explore.openaire.eu/cache/get?url=",
"datasourcesAPI": "https://services.openaire.eu/openaire/ds/search/", "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", "adminToolsCommunity" :"openaire",
"contextsAPI":"https://services.openaire.eu/openaire/context", "contextsAPI":"https://services.openaire.eu/openaire/context",

18
production-portal/src/app/app.component.ts
View File

@ -66,7 +66,7 @@ export class AppComponent {
}, },
{ {
rootItem: new MenuItem("datasources","Content Providers","","",false,["datasource"],[],{}), 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("","Repositories","","/search/content-providers",false,["datasource"],["/search/content-providers"],{}),
new MenuItem("","Journals","","/search/journals",false,["datasource"],["/search/journals"],{}), new MenuItem("","Journals","","/search/journals",false,["datasource"],["/search/journals"],{}),
new MenuItem("","Registries","","/search/entity-registries",false,["datasource"],["/search/entity-registries"],{}), new MenuItem("","Registries","","/search/entity-registries",false,["datasource"],["/search/entity-registries"],{}),
@ -74,11 +74,15 @@ export class AppComponent {
} }
]; ];
bottomMenuItems =[ bottomMenuItems =[
new MenuItem("","About","https://beta.openaire.eu/project-factsheets","",false,[],[],{}), new MenuItem("","About","https://www.openaire.eu/about","",false,[],[],{}),
new MenuItem("","News - Events","https://beta.openaire.eu/news-events","",false,[],[],{}), new MenuItem("","Services","http://catalogue.openaire.eu","",false,[],[],{}),
new MenuItem("","Blog","https://blogs.openaire.eu/","",false,[],[],{}), new MenuItem("","Support","https://www.openaire.eu/support","",false,[],[],{}),
new MenuItem("","Contact us","https://beta.openaire.eu/contact-us","",false,[],[],{}) new MenuItem("","News","https://www.openaire.eu/news","",false,[],[],{}),
]; new MenuItem("","Documents","https://www.openaire.eu/documents","",false,[],[],{}),
];
feedbackmail:string feedbackmail:string
properties:EnvProperties; properties:EnvProperties;
constructor( private route: ActivatedRoute, private propertiesService:EnvironmentSpecificService) { constructor( private route: ActivatedRoute, private propertiesService:EnvironmentSpecificService) {
@ -90,7 +94,7 @@ bottomMenuItems =[
try{ try{
this.isClient = true; this.isClient = true;
if(Session.isPortalAdministrator()){ 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) { }catch (e) {
} }

18
production-portal/src/app/home/home.component.html
View File

@ -71,7 +71,7 @@
</a> </a>
<div class="uk-card-body"> <div class="uk-card-body">
<p>Search for <p>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 are linked together and how they are linked to funding and
organizations.</p> organizations.</p>
<p>View statistics on projects and institutions.</p> <p>View statistics on projects and institutions.</p>
@ -191,14 +191,14 @@
</div> </div>
</div> </div>
<div class="uk-section-default uk-section"> <!--div class="uk-section-default uk-section">
<div class="uk-container"> <div class="uk-container">
<div class="uk-grid-small uk-margin-medium uk-grid" uk-grid=""> <div class="uk-grid-small uk-margin-medium uk-grid" uk-grid="">
<div class="uk-width-expand@m uk-first-column"> <div class="uk-width-expand@m uk-first-column">
<h3 class="uk-margin-small uk-h3 uk-heading-line uk-text-primary"> <h3 class="uk-margin-small uk-h3 uk-heading-line uk-text-primary">
<span>New content providers</span> <span>New content providers</span>
</h3> </h3>
<div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid=""> <div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid=""-->
<!-- <errorMessages [status]="[fetchDataproviders.searchUtils.status]" [type]="'content providers'"></errorMessages> <!-- <errorMessages [status]="[fetchDataproviders.searchUtils.status]" [type]="'content providers'"></errorMessages>
<div *ngIf="fetchDataproviders.searchUtils.totalResults > 0"> <div *ngIf="fetchDataproviders.searchUtils.totalResults > 0">
@ -259,7 +259,7 @@
</ul> </ul>
</div> --> </div> -->
<div class="uk-first-column"> <!--div class="uk-first-column">
<div class="el-item uk-panel"> <div class="el-item uk-panel">
<h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom"> <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
Aaltodoc Publication Archive Aaltodoc Publication Archive
@ -312,7 +312,7 @@
Ministry of Education, Science and Technological Development of Republic of Serbia Ministry of Education, Science and Technological Development of Republic of Serbia
</h6> </h6>
<div class="el-meta uk-margin uk-text-meta">Serbia</div> <div class="el-meta uk-margin uk-text-meta">Serbia</div>
<div class="el-content uk-margin">7.942 publicatios</div> <div class="el-content uk-margin">7.942 publications</div>
</div> </div>
</div> </div>
</div> </div>
@ -328,7 +328,7 @@
<li class="el-item"> <li class="el-item">
<h3 class="el-title uk-h3 uk-margin-remove">Data acquisition</h3> <h3 class="el-title uk-h3 uk-margin-remove">Data acquisition</h3>
<div class="el-content"> <div class="el-content">
<a href="/www.cnn.com">How we retrieve data, how often, what processes it goes through (aggregating cleaning, trasnforming, inferring, de-duplicating), what are the quality checks&nbsp;along all&nbsp; data processing stages.</a> <a href="/www.cnn.com">How we retrieve data, how often, what processes it goes through (aggregating cleaning, transforming, inferring, de-duplicating), what are the quality checks&nbsp;along all&nbsp; data processing stages.</a>
</div> </div>
</li> </li>
<li class="el-item"> <li class="el-item">
@ -349,7 +349,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div-->
<div class="uk-section-default" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}"> <div class="uk-section-default" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}">
<div class="mainPageBottomInfo uk-background-norepeat uk-background-cover uk-background-center-center uk-section uk-section-small "> <div class="mainPageBottomInfo uk-background-norepeat uk-background-cover uk-background-center-center uk-section uk-section-small ">
<div class="uk-container"> <div class="uk-container">
@ -362,7 +362,7 @@
Join OpenAIRE, use our tools and make your content more visible around the world. Join OpenAIRE, use our tools and make your content more visible around the world.
</div> </div>
<div id="page#37" class=" uk-margin-medium uk-text-center uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style=""> <div id="page#37" class=" uk-margin-medium uk-text-center uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
<a class="providelink el-content uk-button uk-button-default uk-button-small" href="https://beta.provide.openaire.eu" target="_blank" style=""> <a class="providelink el-content uk-button uk-button-default uk-button-small" href="https://provide.openaire.eu" target="_blank" style="">
OpenAIRE.PROVIDE OpenAIRE.PROVIDE
</a> </a>
</div> </div>
@ -388,7 +388,7 @@
Use a trusted partner to share, link, disseminate and monitor your research. Use a trusted partner to share, link, disseminate and monitor your research.
</div> </div>
<div id="page#45" class=" uk-margin-medium uk-text-center uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style=""> <div id="page#45" class=" uk-margin-medium uk-text-center uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
<a class="connectlink el-content uk-button uk-button-default uk-button-small" href="https://beta.connect.openaire.eu" target="_blank"> <a class="connectlink el-content uk-button uk-button-default uk-button-small" href="https://connect.openaire.eu" target="_blank">
OpenAIRE.CONNECT OpenAIRE.CONNECT
</a> </a>
</div> </div>

6
production-portal/src/assets/env-properties.json
View File

@ -2,7 +2,7 @@
"enablePiwikTrack" : false, "enablePiwikTrack" : false,
"enableHelper" : true, "enableHelper" : true,
"useCache" : true, "useCache" : true,
"metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/", "metricsAPIURL" : "https://services.openaire.eu/usagestats/",
"framesAPIURL" : "https://beta.openaire.eu/stats3/", "framesAPIURL" : "https://beta.openaire.eu/stats3/",
"statisticsAPIURL" : "http://vatopedi.di.uoa.gr:8080/stats/", "statisticsAPIURL" : "http://vatopedi.di.uoa.gr:8080/stats/",
"statisticsFrameAPIURL":"https://beta.openaire.eu/stats/", "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/",
@ -29,7 +29,7 @@
"helpdesk" : "https://www.openaire.eu/support/helpdesk", "helpdesk" : "https://www.openaire.eu/support/helpdesk",
"uploadService" : "http://scoobydoo.di.uoa.gr:8000/upload", "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=", "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=",
"piwikSiteId" : "6", "piwikSiteId" : "6",
@ -38,8 +38,6 @@
"logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", "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", "cookieDomain" :".di.uoa.gr",
"feedbackmail" :"openaire.test@gmail.com", "feedbackmail" :"openaire.test@gmail.com",

2
production-portal/src/assets/explore-custom.css
View File

@ -47,11 +47,13 @@
font-weight: 600; font-weight: 600;
} }
.connectlink{ .connectlink{
text-transform: none !important;
background-color: #ffc800 !important; background-color: #ffc800 !important;
font-weight: 600; font-weight: 600;
color: #fff !important; color: #fff !important;
} }
.monitorlink{ .monitorlink{
text-transform: none !important;
background-color: #8bcc00 !important; background-color: #8bcc00 !important;
font-weight: 600; font-weight: 600;
color: #fff !important; color: #fff !important;

12
production-portal/src/assets/sitemap.xml
View File

@ -25,7 +25,7 @@
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <!--url>
<loc><![CDATA[https://explore.openaire.eu/search/find/software]]></loc> <loc><![CDATA[https://explore.openaire.eu/search/find/software]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
@ -34,7 +34,7 @@
<loc><![CDATA[https://explore.openaire.eu/search/find/other]]></loc> <loc><![CDATA[https://explore.openaire.eu/search/find/other]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url-->
<url> <url>
<loc><![CDATA[https://explore.openaire.eu/search/find/projects]]></loc> <loc><![CDATA[https://explore.openaire.eu/search/find/projects]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
@ -60,7 +60,7 @@
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <!--url>
<loc><![CDATA[https://explore.openaire.eu/search/advanced/software]]></loc> <loc><![CDATA[https://explore.openaire.eu/search/advanced/software]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
@ -69,7 +69,7 @@
<loc><![CDATA[https://explore.openaire.eu/search/advanced/other]]></loc> <loc><![CDATA[https://explore.openaire.eu/search/advanced/other]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url-->
<url> <url>
<loc><![CDATA[https://explore.openaire.eu/search/advanced/projects]]></loc> <loc><![CDATA[https://explore.openaire.eu/search/advanced/projects]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
@ -96,12 +96,12 @@
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc>![CDATA[https://explore.openaire.eu/participate/deposit-publications]</loc> <loc><![CDATA[https://explore.openaire.eu/participate/deposit-publications]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc>![CDATA[https://explore.openaire.eu/participate/deposit-datasets]</loc> <loc><![CDATA[https://explore.openaire.eu/participate/deposit-datasets]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>

23
production-portal/src/index.html
View File

@ -20,7 +20,7 @@
<meta property="og:image:type" content="image/png" /> <meta property="og:image:type" content="image/png" />
<meta property="og:image:width" content="360" /> <meta property="og:image:width" content="360" />
<meta property="og:image:height" content="359" /> <meta property="og:image:height" content="359" />
<meta name="google-site-verification" content="rZ-58gIX8IqzBte6Qv4J5yY9aSiDP15Dfc1Yr9yezqE" />
<link rel="apple-touch-icon" sizes="57x57" href="assets/common-assets/logo/apple-icon-57x57.png"> <link rel="apple-touch-icon" sizes="57x57" href="assets/common-assets/logo/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="assets/common-assets/logo/apple-icon-60x60.png"> <link rel="apple-touch-icon" sizes="60x60" href="assets/common-assets/logo/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="assets/common-assets/logo/apple-icon-72x72.png"> <link rel="apple-touch-icon" sizes="72x72" href="assets/common-assets/logo/apple-icon-72x72.png">
@ -64,29 +64,10 @@ $(document).ready(function(){
console.log("Is ready - load uikit ***") console.log("Is ready - load uikit ***")
$.getScript("assets/common-assets/common/uikit.js"); $.getScript("assets/common-assets/common/uikit.js");
$.getScript("assets/common-assets/common/uikit-icons-max.js"); $.getScript("assets/common-assets/common/uikit-icons-max.js");
$.getScript("//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-559d24521cd8c080");
}); });
</script> </script>
<script>
var logoutClicked = function(){
console.log("jqery logout!");
// no
// $("#logout1").load("https://dl067.madgik.di.uoa.gr/idp/profile/Logout");
//yes
// window.open('https://dl067.madgik.di.uoa.gr/idp/profile/Logout','_blank','toolbar=no,status=no,menubar=no,scrollbars=no,resizable=no,visible=none', '');
// no
var xmlHttp = null;
xmlHttp = new XMLHttpRequest();
xmlHttp.open( "GET", "https://dl067.madgik.di.uoa.gr/idp/profile/Logout", true );
xmlHttp.send( null );
};
</script>
<!-- <script src="assets/common-assets/common/uikit.js"></script> -->
<!-- <script src="assets/common-assets/common/uikit-icons-max.js"></script> -->
<link rel="stylesheet" href="assets/common-assets/common/theme.css"> <link rel="stylesheet" href="assets/common-assets/common/theme.css">

11
production-portal/static.paths.ts
View File

@ -1,15 +1,12 @@
export const ROUTES = [ export const ROUTES = [
'/', '/',
'/lazy', '/search/find/publications','/search/find/projects','/search/find/datasets','/search/find/dataproviders','/search/find/organizations',
'/home', '/search/advanced/publications','/search/advanced/projects','/search/advanced/datasets','/search/advanced/dataproviders','/search/advanced/organizations',
'/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',
'/participate/deposit-publications','/participate/deposit-datasets','/participate/deposit-publications-result','/participate/deposit-datasets-result','/participate/deposit-subject-result', '/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', '/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', '/project-report','/claims','/myclaims','/participate/claim','/participate/direct-claim','/claims-project-manager',
'/test','/user-info', '/test','/user-info',
'/search/publication','/search/project','/search/dataset','/search/dataprovider','/search/organization','search/other','search/software',
'/search/find',
'/error', '/*path' '/error', '/*path'
]; ];