diff --git a/explore/deploy/beta-properties.json b/explore/deploy/beta-properties.json index 1028afab..520d9792 100644 --- a/explore/deploy/beta-properties.json +++ b/explore/deploy/beta-properties.json @@ -3,6 +3,7 @@ "dashboard" : "explore", "enablePiwikTrack" : true, "useCache" : true, + "showAddThis" : true, "metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/", "framesAPIURL" : "https://beta.openaire.eu/stats3/", "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/", @@ -81,6 +82,7 @@ "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", @@ -94,13 +96,13 @@ "searchLinkToAdvancedOrps" : "/search/advanced/other", "searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders", "searchLinkToAdvancedOrganizations" : "/search/advanced/organizations", - "searchLinkToAdvancedResults" : "/search/advanced/research-results", + "searchLinkToAdvancedResults" : "/search/advanced/research-outcomes", "lastIndexInformationLink" : "https://www.openaire.eu/aggregation-and-content-provision-workflows", "showLastIndexInformationLink" : false, "widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", "claimsInformationLink": "https://beta.openaire.eu/linking", - "lastIndexUpdate": "2019-11-01", + "lastIndexUpdate": "2020-03-26", "indexInfoAPI": "http://beta.services.openaire.eu/openaire/info/", "depositLearnHowPage": "/participate/deposit/learn-how", diff --git a/explore/deploy/production-properties.json b/explore/deploy/production-properties.json index b1513de6..652afcc0 100644 --- a/explore/deploy/production-properties.json +++ b/explore/deploy/production-properties.json @@ -3,6 +3,7 @@ "dashboard" : "explore", "enablePiwikTrack" : true, "useCache" : true, + "showAddThis" : false, "metricsAPIURL" : "https://services.openaire.eu/usagestats/", "framesAPIURL" : "https://www.openaire.eu/stats3/", "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/", @@ -82,6 +83,7 @@ "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", @@ -101,7 +103,7 @@ "showLastIndexInformationLink" : true, "widgetLink" : "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", "claimsInformationLink": "https://www.openaire.eu/linking", - "lastIndexUpdate": "2020-02-20", + "lastIndexUpdate": "2020-04-22", "indexInfoAPI": "http://services.openaire.eu/openaire/info/", "depositLearnHowPage": "/participate/deposit/learn-how", diff --git a/explore/deploy/test-properties.json b/explore/deploy/test-properties.json index 8902ec3a..0b31722e 100644 --- a/explore/deploy/test-properties.json +++ b/explore/deploy/test-properties.json @@ -4,6 +4,7 @@ "enablePiwikTrack" : false, "enableHelper" : true, "useCache" : true, + "showAddThis" : false, "metricsAPIURL" : "https://services.openaire.eu/usagestats/", "framesAPIURL" : "https://test.openaire.eu/stats3/", "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/", diff --git a/explore/server.ts b/explore/server.ts index a6ad1da7..c3ced980 100644 --- a/explore/server.ts +++ b/explore/server.ts @@ -12,7 +12,7 @@ enableProdMode(); // Express server const app = express(); -const PORT = process.env.PORT || 6000; +const PORT = process.env.PORT || 3000; const DIST_FOLDER = join(process.cwd(), 'dist'); // Our index.html we'll use as our template diff --git a/explore/src/assets/env-properties.json b/explore/src/assets/env-properties.json index 2bfc403c..244a8780 100644 --- a/explore/src/assets/env-properties.json +++ b/explore/src/assets/env-properties.json @@ -2,7 +2,8 @@ "environment" : "development", "dashboard" : "explore", "enablePiwikTrack" : false, - "useCache" : false, + "useCache" : true, + "showAddThis" : true, "metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/", "framesAPIURL" : "https://beta.openaire.eu/stats3/", "statisticsAPIURL" : "http://vatopedi.di.uoa.gr:8080/stats/", @@ -49,7 +50,7 @@ "feedbackmail" :"kostis30fylloy@gmail.com", - "cacheUrl" :"http://mpagasas.di.uoa.gr:3200/get?url=", + "cacheUrl" :"http://dl170.madgik.di.uoa.gr:3000/get?url=", "adminToolsAPIURL" :"http://dl170.madgik.di.uoa.gr:8080/uoa-admin-tools/", @@ -80,6 +81,7 @@ "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", @@ -99,7 +101,7 @@ "showLastIndexInformationLink" : true, "widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", "claimsInformationLink": "https://www.openaire.eu/linking-beta", - "lastIndexUpdate": "2019-05-16", + "lastIndexUpdate": "2019-11-01", "indexInfoAPI": "http://beta.services.openaire.eu/openaire/info/", "depositLearnHowPage": "/participate/deposit/learn-how", diff --git a/explore/src/assets/explore-custom.css b/explore/src/assets/explore-custom.css index 529018c4..a7950dcf 100644 --- a/explore/src/assets/explore-custom.css +++ b/explore/src/assets/explore-custom.css @@ -233,78 +233,3 @@ border: none; color: white; } - -.offcanvas-white { - background: white !important; - color: inherit !important; -} - -.offcanvas-white .uk-close, offcanvas-white .uk-close:hover, -.offcanvas-white a:not([class*="portal-link"]) { - color: inherit !important; -} - -.offcanvas-white a:not([class*="portal-link"]):hover { - color: #222080 !important;; -} - -.offcanvas-white h5 { - font-size: 18px !important;; - line-height: 1.4 !important;; - color: #1a1a1a !important;; - font-family: 'Open Sans', sans-serif !important;; -} - -.offcanvas-white .uk-text-muted { - color: #bfbfbf !important; -} - -.offcanvas-white .uk-input { - border-bottom: 1px solid #ededed !important; - background: #fff !important; - color: #666 !important; -} - -.offcanvas-white .uk-input::placeholder { - color: #bfbfbf !important; -} - -.offcanvas-white .uk-select:not([multiple]):not([size]) { - background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2224%22%20height%3D%2216%22%20viewBox%3D%220%200%2024%2016%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%20%20%3Cpolygon%20fill%3D%22%23666666%22%20points%3D%2212%201%209%206%2015%206%22%20%2F%3E%0A%20%20%20%20%3Cpolygon%20fill%3D%22%23666666%22%20points%3D%2212%2013%209%208%2015%208%22%20%2F%3E%0A%3C%2Fsvg%3E%0A") !important; - background-repeat: no-repeat !important; - background-position: 100% 50% !important; - border-bottom: 1px solid !important;; - border-color: #ededed !important; - color: #666 !important; -} - -.offcanvas-white .uk-input:focus, .offcanvas-white .uk-select:not([multiple]):not([size]):focus { - background-color: #fff !important; - color: #666 !important; - border-color: #222080 !important; -} - -.offcanvas-white .uk-radio:checked, .offcanvas-white input[type="radio"]:not([class*="uk-"]):checked { - background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%20%20%3Ccircle%20fill%3D%22%23fff%22%20cx%3D%228%22%20cy%3D%228%22%20r%3D%222%22%20%2F%3E%0A%3C%2Fsvg%3E") !important;; -} - -.offcanvas-white input[type="radio"]:not([class*="uk-"]):checked { - background-color: #222080 !important;; - border-color: transparent !important;; -} - -.offcanvas-white .uk-radio, .offcanvas-white input[type="radio"]:not([class*="uk-"]) { - border: 1px solid #d4d4d4 !important;; -} - -.offcanvas-white .uk-button-default { - background-color: #fff !important; - color: #222080 !important; - border: 1px solid #222080 !important; -} - -.offcanvas-white .uk-button-default:hover { - background-color: #222080 !important; - color: #fff !important; - border-color: #222080 !important; -} \ No newline at end of file diff --git a/explore/src/index.html b/explore/src/index.html index 0d58c217..5ed26552 100644 --- a/explore/src/index.html +++ b/explore/src/index.html @@ -48,8 +48,8 @@ // console.log(errorMsg + " __" + url + " __" + lineNumber + " __" + column + " __" + errorObj); if((errorMsg && errorMsg.indexOf("uikit.js") != -1) || url.indexOf("uikit.js") != -1 ){ console.log("********UIKIT Error ***********"); - $.getScript("assets/common-assets/common/uikit.min.js?v=1"); - $.getScript("assets/common-assets/common/uikit-icons.min.js?v=1"); + $.getScript("assets/common-assets/common/uikit.min.js?v=4"); + $.getScript("assets/common-assets/common/uikit-icons.min.js?v=4"); } } @@ -59,24 +59,24 @@ - - + + - - - - + + + +