diff --git a/portal-4cli-lib/.angular-cli.json b/portal-4cli-lib/.angular-cli.json
index 331842ff..74a90a80 100644
--- a/portal-4cli-lib/.angular-cli.json
+++ b/portal-4cli-lib/.angular-cli.json
@@ -9,7 +9,16 @@
"outDir": "dist/browser",
"assets": [
"assets",
- "robots.txt"
+ "robots.txt",
+ {"glob": "sitemap.xml", "input": "./sitemaps", "output": "./"},
+ {"glob": "sitemap.xml", "input": "./sitemaps", "output": "./assets"},
+ { "glob": "**/*", "input": "./sitemaps/publication", "output": "./" },
+ { "glob": "**/*", "input": "./sitemaps/dataset", "output": "./" },
+ { "glob": "**/*", "input": "./sitemaps/software", "output": "./" },
+ { "glob": "**/*", "input": "./sitemaps/other", "output": "./" },
+ { "glob": "**/*", "input": "./sitemaps/project", "output": "./" },
+ { "glob": "**/*", "input": "./sitemaps/organization", "output": "./" },
+ { "glob": "**/*", "input": "./sitemaps/dataprovider", "output": "./" }
],
"index": "index.html",
"main": "main.ts",
@@ -38,7 +47,16 @@
"outDir": "dist/server",
"assets": [
"assets",
- "robots.txt"
+ "robots.txt",
+ {"glob": "sitemap.xml", "input": "./sitemaps", "output": "./"},
+ {"glob": "sitemap.xml", "input": "./sitemaps", "output": "./assets"},
+ { "glob": "**/*", "input": "./sitemaps/publication", "output": "./" },
+ { "glob": "**/*", "input": "./sitemaps/dataset", "output": "./" },
+ { "glob": "**/*", "input": "./sitemaps/software", "output": "./" },
+ { "glob": "**/*", "input": "./sitemaps/other", "output": "./" },
+ { "glob": "**/*", "input": "./sitemaps/project", "output": "./" },
+ { "glob": "**/*", "input": "./sitemaps/organization", "output": "./" },
+ { "glob": "**/*", "input": "./sitemaps/dataprovider", "output": "./" }
],
"index": "index.html",
"main": "main.server.ts",
diff --git a/portal-4cli-lib/explore-production-properties.json b/portal-4cli-lib/deploy/beta-properties.json
similarity index 99%
rename from portal-4cli-lib/explore-production-properties.json
rename to portal-4cli-lib/deploy/beta-properties.json
index 9f1eecb3..10ae1563 100644
--- a/portal-4cli-lib/explore-production-properties.json
+++ b/portal-4cli-lib/deploy/beta-properties.json
@@ -1,5 +1,5 @@
{
- "productionMode" : false,
+ "environment" : "beta",
"enablePiwikTrack" : true,
"enableHelper" : true,
"useCache" : true,
diff --git a/portal-4cli-lib/deploy/prepareBuild.sh b/portal-4cli-lib/deploy/prepareBuild.sh
new file mode 100755
index 00000000..49cc5891
--- /dev/null
+++ b/portal-4cli-lib/deploy/prepareBuild.sh
@@ -0,0 +1,34 @@
+#ATTENTION
+#DON'T run it in svn folder - it REMOVES files
+#Copy project in another file "deploy-folder"
+#cd "deploy-folder"
+#run the script
+
+## cp the file according to the deploy environment
+
+# cp production-properties.json ../src/assets/env-properties.json;
+# cp test-properties.json ../src/assets/env-properties.json;
+# cp beta-properties.json ../src/assets/env-properties.json;
+
+## uncommect from here-->
+# echo -n 'Check properties service to have the url for the deployment environment!!';
+# echo -n "Press key:";
+# read -n1 ans
+# echo -n "Pressed";
+# pico ../src/app/openaireLibrary/utils/properties/environment-specific.service.ts;
+# echo 'For Production keep meta for bots';
+# echo -n 'Check index.html: For test keep meta for noindex, for production remove noindex and keep meta for Search engines verification';
+# echo -n "Press key:";
+# read -n1 ans
+# echo -n "Pressed";
+# pico ../src/index.html;
+# echo -n 'Check Robots.txt: For test and beta add "Diasallow /", for production remove it!';
+# echo -n "Press key:";
+# read -n1 ans
+# echo -n "Pressed";
+# pico ../src/robots.txt;
+# rm -rf ../src/assets/common-assets/.svn/;
+# rm -rf ../src/app/openaireLibrary/.svn/;
+# echo 'Run "cd ..; npm run build:dynamic; cd deploy;" ';
+# echo 'Then run prepary deploy script';
+##<-- to here
diff --git a/portal-4cli-lib/deploy/prepareDeploy.sh b/portal-4cli-lib/deploy/prepareDeploy.sh
new file mode 100755
index 00000000..c267dd72
--- /dev/null
+++ b/portal-4cli-lib/deploy/prepareDeploy.sh
@@ -0,0 +1,20 @@
+#ATTENTION
+#DON'T run it in svn folder - it REMOVES files
+#First you have to run prepareBuild Script!!!!!!!
+
+## uncommect from here-->
+
+# rm -rf ../src ../node_modules ../.idea/ ../installOpenaireLib.sh;
+# echo 'Now copy to the server!'
+#echo 'remove this deploy folder'
+
+##<-- to here
+
+#Deploy instructions!
+#copy "deploy-folder" in beta.explore.openaire.eu, test.openaire.eu or explore.openaire.eu depending which in environment want to deploy and properties selected
+#copies of previous deployments exist in "/home/argiro.kokogiannaki/deployments-folder/dashboardYYYY-MM-DD"
+#run "npm i"
+#become nodejs user: "sudo su nodejs -s /bin/bash"
+#go to "cd /srv/www/portal"
+#cp files from "cp -r HOME_PATH/deployments-folder/* ."
+#restart portal "pm2 restart openaire"
diff --git a/portal-4cli-lib/deploy/production-properties.json b/portal-4cli-lib/deploy/production-properties.json
new file mode 100644
index 00000000..15a7e65f
--- /dev/null
+++ b/portal-4cli-lib/deploy/production-properties.json
@@ -0,0 +1,93 @@
+{
+ "environment" : "production",
+ "enablePiwikTrack" : true,
+ "enableHelper" : true,
+ "useCache" : true,
+ "metricsAPIURL" : "https://services.openaire.eu/usagestats/",
+ "framesAPIURL" : "https://www.openaire.eu/stats3/",
+ "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",
+ "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",
+ "searchCrossrefAPIURL" : "https://api.crossref.org/works",
+ "searchDataciteAPIURL" : "https://api.datacite.org/works",
+ "searchOrcidURL" : "https://pub.orcid.org/v2.1/",
+ "pmidURL" : "http://www.ncbi.nlm.nih.gov/pubmed/",
+ "doiURL" : "https://dx.doi.org/",
+ "cordisURL" : "http://cordis.europa.eu/projects/",
+ "pmcURL" : "http://europepmc.org/articles/",
+ "handleURL" : "http://hdl.handle.net/",
+ "openDoarURL": "http://v2.sherpa.ac.uk/id/repository/",
+ "r3DataURL": "http://service.re3data.org/repository/",
+ "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",
+ "uploadService" : "https://explore.openaire.eu/upload/",
+
+ "vocabulariesAPI" :"https://services.openaire.eu/provision/mvc/vocabularies/",
+
+ "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=",
+ "piwikSiteId" : "109",
+ "loginUrl" :"https://services.openaire.eu/uoa-user-management/openid_connect_login",
+
+ "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
+
+ "cookieDomain" :".openaire.eu",
+
+ "feedbackmail" :"feedback@openaire.eu",
+
+ "cacheUrl" :"https://explore.openaire.eu/cache/get?url=",
+
+ "datasourcesAPI": "https://services.openaire.eu/openaire/ds/search/",
+
+ "adminToolsAPIURL" :"https://services.openaire.eu/uoa-admin-tools/",
+
+ "adminToolsCommunity" :"openaire",
+ "contextsAPI":"https://services.openaire.eu/openaire/context",
+ "communityAPI": "https://services.openaire.eu/openaire/community/",
+
+ "csvLimit": 2000,
+ "pagingLimit": 20,
+ "resultsPerPage": 10,
+
+ "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",
+ "searchLinkToDataProviders" : "/search/find/dataproviders",
+ "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",
+ "searchLinkToEntityRegistriesDataProviders" : "/search/entity-registries",
+ "searchLinkToEntityRegistriesDataProvidersTable" : "/search/entity-registries-table",
+ "searchLinkToJournals" : "/search/journals",
+ "searchLinkToJournalsTable" : "/search/journals-table",
+
+ "searchLinkToAdvancedPublications" : "/search/advanced/publications",
+ "searchLinkToAdvancedProjects" : "/search/advanced/projects",
+ "searchLinkToAdvancedDatasets" : "/search/advanced/datasets",
+ "searchLinkToAdvancedSoftware" : "/search/advanced/software",
+ "searchLinkToAdvancedOrps" : "/search/advanced/other",
+ "searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders",
+ "searchLinkToAdvancedOrganizations" : "/search/advanced/organizations",
+ "lastIndexInformationLink" : "https://www.openaire.eu/aggregation-and-content-provision-workflows",
+ "showLastIndexInformationLink" : true,
+ "widgetLink" : "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
+ "claimsInformationLink": "https://www.openaire.eu/linking"
+}
diff --git a/portal-4cli-lib/deploy/test-properties.json b/portal-4cli-lib/deploy/test-properties.json
new file mode 100644
index 00000000..4f21a21f
--- /dev/null
+++ b/portal-4cli-lib/deploy/test-properties.json
@@ -0,0 +1,93 @@
+{
+ "environment" : "test",
+ "enablePiwikTrack" : true,
+ "enableHelper" : true,
+ "useCache" : true,
+ "metricsAPIURL" : "https://services.openaire.eu/usagestats/",
+ "framesAPIURL" : "https://test.openaire.eu/stats3/",
+ "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",
+ "statisticsFrameAPIURL":"https://test.openaire.eu/stats/",
+ "claimsAPIURL" : "https://services.openaire.eu/claims/rest/claimsService/",
+ "searchAPIURLLAst" : "http://services.openaire.eu:8480/shadowSearch/rest/v2/api/",
+ "searchResourcesAPIURL" : "http://services.openaire.eu:8480/shadowSearch/rest/v2/api/resources",
+ "csvAPIURL" : "http://services.openaire.eu:8480/shadowSearch/rest/v2/api/reports",
+ "searchCrossrefAPIURL" : "https://api.crossref.org/works",
+ "searchDataciteAPIURL" : "https://api.datacite.org/works",
+ "searchOrcidURL" : "https://pub.orcid.org/v2.1/",
+ "pmidURL" : "http://www.ncbi.nlm.nih.gov/pubmed/",
+ "doiURL" : "https://dx.doi.org/",
+ "cordisURL" : "http://cordis.europa.eu/projects/",
+ "pmcURL" : "http://europepmc.org/articles/",
+ "handleURL" : "http://hdl.handle.net/",
+ "openDoarURL": "http://v2.sherpa.ac.uk/id/repository/",
+ "r3DataURL": "http://service.re3data.org/repository/",
+ "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",
+ "uploadService" : "https://explore.openaire.eu/upload/",
+
+ "vocabulariesAPI" :"https://services.openaire.eu/provision/mvc/vocabularies/",
+
+ "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=",
+ "piwikSiteId" : "109",
+ "loginUrl" :"https://services.openaire.eu/uoa-user-management/openid_connect_login",
+
+ "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
+
+ "cookieDomain" :".openaire.eu",
+
+ "feedbackmail" :"feedback@openaire.eu",
+
+ "cacheUrl" :"https://explore.openaire.eu/cache/get?url=",
+
+ "datasourcesAPI": "https://services.openaire.eu/openaire/ds/search/",
+
+ "adminToolsAPIURL" :"https://services.openaire.eu/uoa-admin-tools/",
+
+ "adminToolsCommunity" :"openaire",
+ "contextsAPI":"https://services.openaire.eu/openaire/context",
+ "communityAPI": "https://services.openaire.eu/openaire/community/",
+
+ "csvLimit": 2000,
+ "pagingLimit": 20,
+ "resultsPerPage": 10,
+
+ "baseLink" : "https://test.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",
+ "searchLinkToDataProviders" : "/search/find/dataproviders",
+ "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",
+ "searchLinkToEntityRegistriesDataProviders" : "/search/entity-registries",
+ "searchLinkToEntityRegistriesDataProvidersTable" : "/search/entity-registries-table",
+ "searchLinkToJournals" : "/search/journals",
+ "searchLinkToJournalsTable" : "/search/journals-table",
+
+ "searchLinkToAdvancedPublications" : "/search/advanced/publications",
+ "searchLinkToAdvancedProjects" : "/search/advanced/projects",
+ "searchLinkToAdvancedDatasets" : "/search/advanced/datasets",
+ "searchLinkToAdvancedSoftware" : "/search/advanced/software",
+ "searchLinkToAdvancedOrps" : "/search/advanced/other",
+ "searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders",
+ "searchLinkToAdvancedOrganizations" : "/search/advanced/organizations",
+ "lastIndexInformationLink" : "https://www.openaire.eu/aggregation-and-content-provision-workflows",
+ "showLastIndexInformationLink" : false,
+ "widgetLink" : "https://test.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
+ "claimsInformationLink": "https://www.openaire.eu/linking"
+}
diff --git a/portal-4cli-lib/prepareDeploy.sh b/portal-4cli-lib/prepareDeploy.sh
deleted file mode 100755
index 5aee01b9..00000000
--- a/portal-4cli-lib/prepareDeploy.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#ATTENTION
-#DON'T run it in svn folder - it REMOVES files
-#Copy project in another file "deploy-folder"
-#cd "deploy-folder"
-#run the script
-
-## uncommect from here-->
-# cp explore-production-properties.json src/assets/env-properties.json;
-# rm -rf src/assets/common-assets/.svn/;
-# rm -rf src/app/openaireLibrary/.svn/;
-# pico src/app/openaireLibrary/utils/properties/environment-specific.service.ts;
-# npm run build:dynamic;
-# rm -rf src node_modules .idea/ connect-production-properties.json installOpenaireLib.sh;
-# echo 'Ready!';
-# 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"
-#run "npm i"
-#become nodejs user: "sudo su nodejs -s /bin/bash"
-#go to "cd /srv/www/portal"
-#cp files from "cp -r HOME_PATH/deploy-folder/* ."
-#restart portal "pm2 restart openaire"
diff --git a/portal-4cli-lib/src/app/app.component.ts b/portal-4cli-lib/src/app/app.component.ts
index 9624b49f..780bbf73 100644
--- a/portal-4cli-lib/src/app/app.component.ts
+++ b/portal-4cli-lib/src/app/app.component.ts
@@ -16,7 +16,7 @@ import {Session} from './openaireLibrary/login/utils/helper.class';
`],
template: `
-
@@ -31,7 +31,7 @@ import {Session} from './openaireLibrary/login/utils/helper.class';
-
+
`
diff --git a/portal-4cli-lib/src/assets/env-properties.json b/portal-4cli-lib/src/assets/env-properties.json
index 322a59f7..df61f4c1 100644
--- a/portal-4cli-lib/src/assets/env-properties.json
+++ b/portal-4cli-lib/src/assets/env-properties.json
@@ -1,5 +1,5 @@
{
- "productionMode" : false,
+ "environment" : "production",
"enablePiwikTrack" : false,
"enableHelper" : true,
"useCache" : false,
@@ -91,11 +91,8 @@
"searchLinkToAdvancedOrps" : "/search/advanced/other",
"searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders",
"searchLinkToAdvancedOrganizations" : "/search/advanced/organizations",
- "searchLinkToAdvancedPeople" : "/search/advanced/people",
-
"lastIndexInformationLink" : "https://www.openaire.eu/aggregation-and-content-provision-workflows",
"showLastIndexInformationLink" : true,
-
"widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
"claimsInformationLink": "https://www.openaire.eu/linking-beta"
}
diff --git a/portal-4cli-lib/src/index.html b/portal-4cli-lib/src/index.html
index 951bd022..4ff14fbe 100644
--- a/portal-4cli-lib/src/index.html
+++ b/portal-4cli-lib/src/index.html
@@ -1,7 +1,6 @@
-
@@ -20,7 +19,10 @@
-
+
+
+
+
@@ -65,6 +67,7 @@ $(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/portal-4cli-lib/src/robots.txt b/portal-4cli-lib/src/robots.txt
index e44c1d47..386929df 100644
--- a/portal-4cli-lib/src/robots.txt
+++ b/portal-4cli-lib/src/robots.txt
@@ -1,4 +1,14 @@
User-Agent: *
Disallow: /cache
Disallow: /upload
-Disallow: /
+#Disallow: /
+
+
+Sitemap: https://explore.openaire.eu/sitemap.xml
+Sitemap: https://explore.openaire.eu/publicationSitemap.xml
+Sitemap: https://explore.openaire.eu/datasetSitemap.xml
+Sitemap: https://explore.openaire.eu/softwareSitemap.xml
+Sitemap: https://explore.openaire.eu/otherSitemap.xml
+Sitemap: https://explore.openaire.eu/projectSitemap.xml
+Sitemap: https://explore.openaire.eu/organizationSitemap.xml
+Sitemap: https://explore.openaire.eu/dataproviderSitemap.xml
diff --git a/portal-4cli-lib/src/sitemaps/sitemap.xml b/portal-4cli-lib/src/sitemaps/sitemap.xml
new file mode 100644
index 00000000..c9379c60
--- /dev/null
+++ b/portal-4cli-lib/src/sitemaps/sitemap.xml
@@ -0,0 +1,113 @@
+
+
+
+
+ weekly
+ 1
+
+
+
+ weekly
+ 0.9
+
+
+
+ weekly
+ 1
+
+
+
+ weekly
+ 0.9
+
+
+
+ weekly
+ 0.9
+
+
+
+ weekly
+ 0.9
+
+
+
+ weekly
+ 0.9
+
+
+
+ weekly
+ 0.9
+
+
+
+ weekly
+ 0.9
+
+
+
+ weekly
+ 0.9
+
+
+
+ weekly
+ 0.8
+
+
+
+ weekly
+ 0.8
+
+
+
+ weekly
+ 0.8
+
+
+
+ weekly
+ 0.8
+
+
+
+ weekly
+ 0.8
+
+
+
+ weekly
+ 0.8
+
+
+
+ weekly
+ 0.8
+
+
+
+ weekly
+ 0.7
+
+
+
+ weekly
+ 0.7
+
+
+
+ weekly
+ 0.7
+
+
+
+ weekly
+ 0.8
+
+
+
+ weekly
+ 0.8
+
+