Merge remote-tracking branch 'origin/develop'

Reviewed-on: #6

.gitignore

@@ -1,3 +1,4 @@
+.angular/
 node_modules/
 dist/
 .idea/

CHANGELOG.md

@@ -1,11 +1,109 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+*For each release, use the following sub-sections:*
+
+- *Added (for new features)*
+- *Changed (for changes in existing functionality)*
+- *Deprecated (for soon-to-be removed features)*
+- *Removed (for now removed features)*
+- *Fixed (for any bug fixes)*
+- *Security (in case of vulnerabilities)*
+
+## [4.0.1] - 12/12/2023
+### Changed
+* Updated links (to the Marketplace) for Compatible EOSC Services (eosc interoperability framework (eoscif) guidelines)
+
+## [4.0.0] - 29/11/2023
+### Added
+* Research product detailed page: Updated parsing of measures - views/downloads per data source if available
+### Changed
+* Angular 16 upgrade
+* Uikit version to 3.16.24
+* Data source detailed page: Get number of collected fulltexts by new stats API
+
+## [3.1.0] - 11/09/2023
+### Added
+* Impact-based indicators - Citations, Popularity, Influence, Impulse 
+### Changed
+* Smaller window for the Data Transfer Service - not full screen
+* Disabled overwrite params when submitting a job to EOSC Data transfer API
+* NEW user interface & structure of the detailed page & specific user interface for small devices i.e. mobiles
+* Updated access right icons
+* Include Subjects as a new tab
+### Fixed
+* Too much recursion error in validating destination path of Data transfer - updated check 
+
+## [3.0.0] - 13/06/2023
+### Changed
+* Upgraded uikit version to 3.13.10
+* NEW user interface & API calls to Data Transfer Service
+
+## [2.0.2] - 01/06/2023
+### Added
+* Expose EOSC::Data Cube subject and link it with Compatible EOSC Services.
+* Added LICENSE.txt file (Apache 2.0 license)
+### Changed
+* Updated "Go to search" link: Expected url parameters are "return_path" and "search_params"
+* Changed EGI Check-in environment for the EGI login client from DEV to DEMO
+### Fixed
+* Updated links to Compatible EOSC Services (according to eosc interoperability framework guidelines)
+
+## [2.0.1] - 21/04/2023
+### Changed
+* Updated "Go to search" link: Redirect to the previous page of marketplace
+  * Combine referrer and new url parameter "pv"
+* Updated Uikit version
+### Fixed
+* Result Detailed page: Renamed "Providers" to "Data sources"
+* Added font-family "Inter" to align with Marketplace and set default font to 'Inter', sans-serif
+
+## [2.0.0]
+### Added
+* Added top bar to go "back" to eosc search.
+### Changed
+* Redirect to eosc search portal from any page except landing.
+* * In landing pages used Graph badge to acknowledge OpenAIRE Graph.
+### Fixed
+* Updated favicon to show the eosc logo, not OpenAIRE. 
+* Updated colors (synched with all eosc portals).
+
+## [1.1.0]
+Angular 14 upgrade
+
+## [1.0.3]
+### Changed
+* Updated styles according to new view in EOSC Marketplace  & new Search
+  * Blue banner
+  * White logo 
+  * Search form rounded and aligned to the center 
+  * Fonts adjusted
+  * Grey background on page & white background on results
+* Detailed page: Display of EOSC subjects updated
+### Fixed
+* [Bug fix] In description of research products' versions
+* Strip html tags from titles & descriptions
+
+## [1.0.2]
+### Fixed
+* Fixes and updates in advanced search form and data transfer functionality. 
+
+## [1.0.1]
+### Added
+* Data Transfer: NEW Browse functionality
+* EOSC Subjects: NEW field eoscifguidelines
+* Filter "Type" in search services: NEW field eoscdatasourcetype
+### Changed
+* Production search
+
 ## [1.0.0] 
 Initial release of EOSC Explore Portal.
 
 It contists of the search pages and the landing pages for the content of the BETA OpenAIRE Graph.
 
-For datasets there is the demo funtionality of Datatransfer service, using zenodo as source and EDI demo dcache as destination.
+For datasets there is the demo functionality of Data Transfer service, using zenodo as source and EGI demo dcache as destination.
 There is link to EOSC marketplace (beta) for results connected to EOSC services.
-

LICENSE.txt

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,6 +1,6 @@
-# Aggregator
+# EOSC EXPLORE
 
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.10 and has been updated to 11.2.14.
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.10 and has been updated to 14.2.3.
 
 ## Install packages
 
@@ -37,3 +37,15 @@ Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.
 ## Running end-to-end tests
 
 Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+
+## System Architecture
+![](./src/assets/architecture.png)
+
+Users can access the EOSC EXPLORE portal via the EOSC Marketplace portal when searching for Publications, Data, Software and Other Research Products.
+
+The EOSC EXPLORE portal serves detailed pages for specific research products, providing an overview of all the metadata available in OpenAIRE Graph and the relationships among the entities of the graph, such as related research, supplementary research, funding projects, related organizations and data sources. Users can navigate through the different entities of OpenAIRE Graph by following the relationships.
+
+In the detailed pages of research data users can transfer files found in Zenodo and other sources in their own data storage, such as dcache or s3  using the Data Transfer Service.
+Metrics, indicators and charts, calculated by OpenAIRE or external tools, are also available in the detailed pages of EOSC EXPLORE.
+
+The detailed pages share the same navigation bar with EOSC Marketplace for easy and quick navigation and users can be redirected easily back to the search page of EOSC Marketplace from which they entered EOSC EXPLORE.

angular.json

@@ -61,7 +61,14 @@
           },
           "configurations": {
             "development": {
-              "optimization": true,
+              "optimization": {
+                "scripts": true,
+                "styles": {
+                  "minify": true,
+                  "inlineCritical": false
+                },
+                "fonts": true
+              },
               "outputHashing": "all",
               "sourceMap": false,
               "namedChunks": false,
@@ -99,7 +106,14 @@
                   "with": "src/environments/environment.beta.ts"
                 }
               ],
-              "optimization": true,
+              "optimization": {
+                "scripts": true,
+                "styles": {
+                  "minify": true,
+                  "inlineCritical": false
+                },
+                "fonts": true
+              },
               "outputHashing": "all",
               "sourceMap": false,
               "namedChunks": false,
@@ -137,7 +151,14 @@
                   "with": "src/environments/environment.prod.ts"
                 }
               ],
-              "optimization": true,
+              "optimization": {
+                "scripts": true,
+                "styles": {
+                  "minify": true,
+                  "inlineCritical": false
+                },
+                "fonts": true
+              },
               "outputHashing": "all",
               "sourceMap": false,
               "namedChunks": false,
@@ -192,18 +213,6 @@
             ]
           }
         },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
-        },
         "server": {
           "builder": "@angular-devkit/build-angular:server",
           "options": {
@@ -211,13 +220,16 @@
             "main": "server.ts",
             "tsConfig": "src/tsconfig.server.json",
             "sourceMap": true,
-            "optimization": false
+            "optimization": false,
+            "buildOptimizer": false
           },
           "configurations": {
             "development": {
               "outputHashing": "media",
               "sourceMap": false,
-              "optimization": true
+              "optimization": true,
+              "vendorChunk": true,
+              "buildOptimizer": true
             },
             "beta": {
               "outputHashing": "media",
@@ -228,7 +240,8 @@
                 }
               ],
               "sourceMap": false,
-              "optimization": true
+              "optimization": true,
+              "buildOptimizer": true
             },
             "production": {
               "outputHashing": "media",
@@ -239,7 +252,8 @@
                 }
               ],
               "sourceMap": false,
-              "optimization": true
+              "optimization": true,
+              "buildOptimizer": true
             }
           },
           "defaultConfiguration": ""
@@ -288,18 +302,8 @@
               "devServerTarget": "eosc:serve:production"
             }
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
-            ]
         }
       }
     }
   }
-  },
-  "defaultProject": "eosc"
 }

package.json

@@ -1,6 +1,7 @@
 {
   "name": "eosc",
-  "version": "1.0.0",
+  "version": "4.0.1",
+  "license": "Apache-2.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --disable-host-check --host 0.0.0.0 --port 4400",
@@ -17,44 +18,44 @@
     "build:ssr-beta": "npm run build-beta && ng run eosc:server:beta",
     "build:ssr-prod": "npm run build-prod && ng run eosc:server:production",
     "prerender": "ng run eosc:prerender",
-    "after-build-clean": "rm -rf dist/eosc/browser/assets/common-assets/.git/ src/app/openaireLibrary/.git node_modules .git*"
+    "after-build-clean": "rm -rf dist/eosc/browser/assets/common-assets/.git/ src/app/openaireLibrary/.git node_modules .angular .git*"
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~12.2.16",
+    "@angular/animations": "^16.1.8",
-    "@angular/cdk": "^12.2.13",
+    "@angular/cdk": "^16.1.7",
-    "@angular/common": "~12.2.16",
+    "@angular/common": "^16.1.8",
-    "@angular/compiler": "~12.2.16",
+    "@angular/compiler": "^16.1.8",
-    "@angular/core": "~12.2.16",
+    "@angular/core": "^16.1.8",
-    "@angular/forms": "~12.2.16",
+    "@angular/forms": "^16.1.8",
-    "@angular/localize": "^12.2.16",
+    "@angular/localize": "^16.1.8",
-    "@angular/material": "^12.2.13",
+    "@angular/material": "^16.1.7",
-    "@angular/platform-browser": "~12.2.16",
+    "@angular/platform-browser": "^16.1.8",
-    "@angular/platform-browser-dynamic": "~12.2.16",
+    "@angular/platform-browser-dynamic": "^16.1.8",
-    "@angular/platform-server": "~12.2.16",
+    "@angular/platform-server": "^16.1.8",
-    "@angular/router": "~12.2.16",
+    "@angular/router": "^16.1.8",
-    "@nguniversal/express-engine": "^12.1.3",
+    "@nguniversal/express-engine": "^16.1.1",
     "clipboard": "^1.5.16",
     "core-js": "^2.5.4",
     "express": "^4.15.2",
     "jquery": "^3.4.1",
-    "ng-recaptcha": "^7.0.1",
+    "ng-recaptcha": "^12.0.2",
     "prom-client": "^11.3.0",
     "rxjs": "^6.5.1",
     "ts-md5": "^1.2.0",
     "tslib": "^2.0.0",
-    "uikit": "3.12.0",
+    "uikit": "3.16.24",
-    "zone.js": "~0.11.4"
+    "zone.js": "~0.13.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~12.2.18",
+    "@angular-devkit/build-angular": "^16.1.7",
-    "@angular/cli": "~12.2.18",
+    "@angular/cli": "^16.1.7",
-    "@angular/compiler-cli": "~12.2.16",
+    "@angular/compiler-cli": "^16.1.8",
-    "@angular/language-service": "~12.2.16",
+    "@angular/language-service": "^16.1.8",
-    "@nguniversal/builders": "^12.1.3",
+    "@nguniversal/builders": "^16.1.1",
     "@types/express": "^4.17.0",
     "@types/compression": "^1.7.0",
-    "@types/node": "^12.11.1",
+    "@types/node": "^16.18.50",
     "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.3",
     "codelyzer": "^6.0.0",
@@ -67,6 +68,6 @@
     "karma-jasmine-html-reporter": "^1.6.0",
     "protractor": "~7.0.0",
     "ts-node": "~7.0.0",
-    "typescript": "~4.3.5"
+    "typescript": "~4.9.5"
   }
 }

server.ts

@@ -24,6 +24,7 @@ export function app() {
   // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
   server.engine('html', ngExpressEngine({
     bootstrap: AppServerModule,
+    inlineCriticalCss: false
   }));
 
   server.set('view engine', 'html');

src/app/app-routing.module.ts

@@ -43,51 +43,58 @@ const routes: Routes = [
   },
   {
     path: 'search/find',
-    loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule)
+    redirectTo: ''
+    // loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule)
   },
   {
     path: 'search/find/research-outcomes',
-    loadChildren: () => import('./searchPages/simple/searchResearchResults.module').then(m => m.OpenaireSearchResearchResultsModule)
+    redirectTo: ''
+    // loadChildren: () => import('./searchPages/simple/searchResearchResults.module').then(m => m.OpenaireSearchResearchResultsModule)
   },
   {
     path: 'search/find/projects',
-    loadChildren: () => import('./searchPages/simple/searchProjects.module').then(m => m.LibSearchProjectsModule)
+    redirectTo: ''
+    // loadChildren: () => import('./searchPages/simple/searchProjects.module').then(m => m.LibSearchProjectsModule)
   },
   {
     path: 'search/find/dataproviders',
-    loadChildren: () => import('./searchPages/simple/searchDataProviders.module').then(m => m.LibSearchDataProvidersModule)
+    redirectTo: ''
+    // loadChildren: () => import('./searchPages/simple/searchDataProviders.module').then(m => m.LibSearchDataProvidersModule)
   },
   {
     path: 'search/find/services',
-    loadChildren: () => import('./searchPages/simple/searchServices.module').then(m => m.LibSearchServicesModule)
+    redirectTo: ''
+    // loadChildren: () => import('./searchPages/simple/searchServices.module').then(m => m.LibSearchServicesModule)
   },
   {
     path: 'search/find/organizations',
-    loadChildren: () => import('./searchPages/simple/searchOrganizations.module').then(m => m.LibSearchOrganizationsModule)
+    redirectTo: ''
+    // loadChildren: () => import('./searchPages/simple/searchOrganizations.module').then(m => m.LibSearchOrganizationsModule)
   },
   {
     path: 'search/advanced/research-outcomes',
-    loadChildren: () => import('./searchPages/advanced/searchResearchResults.module').then(m => m.OpenaireAdvancedSearchResearchResultsModule)
+    redirectTo: ''
+    // loadChildren: () => import('./searchPages/advanced/searchResearchResults.module').then(m => m.OpenaireAdvancedSearchResearchResultsModule)
   },
   {
     path: 'search/advanced/organizations',
-    loadChildren: () => import('./searchPages/advanced/advancedSearchOrganizations.module').then(m => m.LibAdvancedSearchOrganizationsModule)
+    redirectTo: ''
+    // loadChildren: () => import('./searchPages/advanced/advancedSearchOrganizations.module').then(m => m.LibAdvancedSearchOrganizationsModule)
   },
   {
     path: 'search/advanced/dataproviders',
-    loadChildren: () => import('./searchPages/advanced/advancedSearchDataProviders.module').then(m => m.LibAdvancedSearchDataProvidersModule)
+    redirectTo: ''
+    // loadChildren: () => import('./searchPages/advanced/advancedSearchDataProviders.module').then(m => m.LibAdvancedSearchDataProvidersModule)
   },
   {
     path: 'search/advanced/services',
-    loadChildren: () => import('./searchPages/advanced/advancedSearchServices.module').then(m => m.LibAdvancedSearchServicesModule)
+    redirectTo: ''
+    // loadChildren: () => import('./searchPages/advanced/advancedSearchServices.module').then(m => m.LibAdvancedSearchServicesModule)
   },
   {
     path: 'search/advanced/projects',
-    loadChildren: () => import('./searchPages/advanced/advancedSearchProjects.module').then(m => m.LibAdvancedSearchProjectsModule)
+    redirectTo: ''
-  },
+    // loadChildren: () => import('./searchPages/advanced/advancedSearchProjects.module').then(m => m.LibAdvancedSearchProjectsModule)
-  {
-    path: 'project-report',
-    loadChildren: () => import('./landingPages/htmlProjectReport/libHtmlProjectReport.module').then(m => m.LibHtmlProjectReportModule)
   },
   {
     path: 'reload',
@@ -113,43 +120,17 @@ export class AppRoutingModule {
     }
   }
   constructor( private config: ConfigurationService, private router: Router){
-    this.subs.push(this.config.communityInformationState.subscribe(data => {
+    this.subs.push(this.config.portalAsObservable.subscribe(data => {
         if (data) {
           if (data['pages']) {
             for (var i = 0; i < data['pages'].length; i++) {
               this.enabledRoutes[data['pages'][i]['route']] = data['pages'][i]['isEnabled'];
             }
           }
-          this.getOptionalRoutes();
         }
       },
       error => {
         // this.handleError('Error getting community information (e.g. pages,entities) for community with id: ' + this.communityId, error);
       }));
   }
-  getOptionalRoutes(){
-    let optionalRoutes = [
-      // Deposit Pages
-    { path: 'participate/deposit-datasets',  redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
-    { path: 'participate/deposit-datasets-result',  redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
-    { path: 'participate/deposit-subject-result',  redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
-    { path: 'participate/deposit-publications',  redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
-    { path: 'participate/deposit-publications-result',  redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
-    
-    { path: 'participate/deposit/learn-how', loadChildren: () => import('./deposit/deposit.module').then(m => m.LibDepositModule)},
-    { path: 'participate/deposit/search', loadChildren: () => import('./deposit/searchDataprovidersToDeposit.module').then(m => m.LibSearchDataprovidersToDepositModule)},
-    // Linking Pages
-    { path: 'myclaims', loadChildren: () => import('./claims/myClaims/myClaims.module').then(m => m.LibMyClaimsModule)},
-    { path: 'participate/claim', loadChildren: () => import('./claims/linking/linkingGeneric.module').then(m => m.LibLinkingGenericModule)},
-    { path: 'participate/direct-claim', loadChildren: () => import('./claims/directLinking/directLinking.module').then(m => m.LibDirectLinkingModule)},
-    {path: 'develop', loadChildren: () => import('./develop/develop.module').then(m => m.DevelopModule)}
-    ];
-    for (var i = 0; i <optionalRoutes.length; i++) {
-      if(this.enabledRoutes[("/"+optionalRoutes[i].path)]){
-        this.router.config.push(optionalRoutes[i]);
-      }
-    }
-    this.router.config.push({path: '**', pathMatch: 'full', component: OpenaireErrorPageComponent});
-    return routes;
-  }
 }

src/app/app.component.ts

@@ -20,10 +20,10 @@ import {OpenaireEntities} from "./openaireLibrary/utils/properties/searchFields"
   template: `
     <div id="modal-container"></div>
     <div *ngIf="agg">
-      <navbar *ngIf="properties && loginCheck && header && showHeader" portal="eosc" [properties]=properties [onlyTop]=false
+<!--      <navbar *ngIf="properties && loginCheck && header && showHeader" portal="eosc" [properties]=properties [onlyTop]=false-->
-              [user]="user" [userMenuItems]="userMenuItems"
+<!--              [user]="user" [userMenuItems]="userMenuItems"-->
-              [communityId]="properties.adminToolsCommunity" [menuItems]=menuItems
+<!--              [communityId]="properties.adminToolsCommunity" [menuItems]=menuItems-->
-              [userMenu]="agg.enableLogin" [header]="header"></navbar>
+<!--              [userMenu]="agg.enableLogin" [header]="header"></navbar>-->
       <div class="custom-main-content">
         <main>
           <router-outlet></router-outlet>
@@ -51,7 +51,7 @@ export class AppComponent {
               @Inject(DOCUMENT) private document, private rendererFactory: RendererFactory2,  private router: Router, private route: ActivatedRoute) {
     this.agg = PortalAggregators.eoscInfo;
     this.setStyles();
-    this.configurationService.initStaticCommunityInformation(PortalAggregators.getCommunityInfo());
+    this.configurationService.initStaticPortal(PortalAggregators.getCommunityInfo());
     this.showHeader = this.agg.showHeaderAlways;
   }
 
@@ -78,7 +78,8 @@ export class AppComponent {
         logoSmallUrl: this.agg.logoUrl,
         position:  'center',
         menuPosition: 'center',
-        badge: false
+        badge: false,
+        darkBg: true
       };
       this.buildMenu();
     }

src/app/app.module.ts

@@ -1,6 +1,6 @@
-import {NgModule} from '@angular/core';
+import {APP_ID, NgModule} from '@angular/core';
 import {SharedModule} from './shared/shared.module';
-import {BrowserModule, BrowserTransferStateModule} from '@angular/platform-browser';
+import {BrowserModule} from '@angular/platform-browser';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {CommonModule} from '@angular/common';
 import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http';
@@ -27,14 +27,14 @@ import {ConfigurationService} from "./openaireLibrary/utils/configuration/config
     NavigationBarModule, FeedbackModule, BottomModule,
     CookieLawModule,
     BrowserAnimationsModule,
-    BrowserTransferStateModule,
+    BrowserModule,
-    BrowserModule.withServerTransition({appId: 'eosc'}),
     AppRoutingModule
   ],
   declarations: [AppComponent, OpenaireErrorPageComponent],
   exports: [AppComponent],
   providers: [
     ConfigurationService,
+    {provide: APP_ID, useValue: 'eosc'},
     {
       provide: HTTP_INTERCEPTORS,
       useClass: HttpInterceptorService,

src/app/app.server.module.ts

@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import {ServerModule, ServerTransferStateModule} from '@angular/platform-server';
+import {ServerModule} from '@angular/platform-server';
 
 import { AppModule } from './app.module';
 import { AppComponent } from './app.component';
@@ -7,8 +7,7 @@ import { AppComponent } from './app.component';
 @NgModule({
   imports: [
     AppModule,
-    ServerModule,
+    ServerModule
-    ServerTransferStateModule
   ],
   bootstrap: [AppComponent],
 })

src/app/claims/directLinking/directLinking.component.ts

@@ -4,9 +4,7 @@ import {properties} from "../../../environments/environment";
 @Component({
   selector: 'openaire-directLinking',
   template: `
-    <directLinking [piwikSiteId]="piwikSiteId"></directLinking>`
+    <directLinking></directLinking>`
 })
 export class OpenaireDirectLinkingComponent {
-  piwikSiteId = properties.piwikSiteId;
-
 }

src/app/claims/linking/linkingGeneric.component.ts

@@ -3,11 +3,8 @@ import {properties} from "../../../environments/environment";
 
 @Component({
     selector: 'openaire-linking-generic',
-    template: `<linking-generic pageTitle="Linking" [piwikSiteId]="piwikSiteId"></linking-generic>`
+    template: `<linking-generic pageTitle="Linking"></linking-generic>`
 
 })
 export class OpenaireLinkingComponent {
-    piwikSiteId = properties.piwikSiteId;
-
-
 }

src/app/claims/myClaims/myClaims.component.ts

@@ -9,7 +9,7 @@ import {properties} from "../../../environments/environment";
 @Component({
     selector: 'openaire-my-claims',
     template: `
-    <my-claims *ngIf="userInfoURL && claimsInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL" [piwikSiteId]="piwikSiteId">
+    <my-claims *ngIf="userInfoURL && claimsInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL">
 </my-claims>
 `
 
@@ -18,7 +18,6 @@ import {properties} from "../../../environments/environment";
   claimsInfoURL:string;
   userInfoURL: string;
   sub;
-  piwikSiteId = properties.piwikSiteId;
 
   constructor (private route: ActivatedRoute) {
   }

src/app/deposit/deposit.component.ts

@@ -1,18 +1,12 @@
 import {Component} from '@angular/core';
-import {properties} from "../../environments/environment";
 
 @Component({
   selector: 'openaire-deposit',
   template: `    
-    <deposit-first-page [piwikSiteId]="piwikSiteId"></deposit-first-page>
+    <deposit-first-page></deposit-first-page>
     `
 })
 
 export class OpenaireDepositComponent {
-  piwikSiteId = properties.piwikSiteId;
-    constructor() {
-  }
-
-  public ngOnInit() {}
 }
 

src/app/deposit/searchDataprovidersToDeposit.component.ts

@@ -1,18 +1,12 @@
 import {Component} from '@angular/core';
-import {properties} from "../../environments/environment";
 
 @Component({
   selector: 'openaire-search-deposit',
   template: `
-    <deposit-search-dataproviders [piwikSiteId]="piwikSiteId"></deposit-search-dataproviders>
+    <deposit-search-dataproviders></deposit-search-dataproviders>
     `
 })
 
 export class OpenaireSearchDataprovidersToDepositComponent {
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor() {}
-
-  public ngOnInit() {}
 }
 

src/app/develop/develop.component.ts

@@ -119,10 +119,7 @@ export class DevelopComponent implements OnInit {
         this._meta.updateTag({content: description}, "property='og:description'");
         this._meta.updateTag({content: title}, "property='og:title'");
         this._title.setTitle(title);
-        if(properties.enablePiwikTrack && (typeof document !== 'undefined')){
         this.subs.push(this._piwikService.trackView(properties, "OpenAIRE").subscribe());
-        }
-
       }else {
         this.navigateToError();
       }

src/app/home/home.component.html

@@ -1,126 +1,131 @@
-<div class="image-front-topbar">
+<!--<div class="image-front-topbar">-->
-  <div class="uk-section uk-margin-large-left uk-padding-remove-bottom uk-grd uk-flex uk-overflow-hidden home-background">
+<!--  <div class="uk-section uk-section-small home-background">-->
-    <div class="uk-grid uk-width-1-1 uk-margin-bottom uk-height-medium">
+<!--    <div id="searchForm" class="uk-container uk-container-large uk-section uk-section-xsmall uk-padding-remove-bottom">-->
-      <div class="uk-width-1-1 uk-width-auto@m uk-margin-medium-top"><div id="searchImage"></div></div>
+<!--      <div class="uk-grid  uk-flex uk-flex-center uk-margin-small-top">-->
-      <div class="uk-width-expand search_box_bg" uk-scrollspy="target: [uk-scrollspy-class]; cls: uk-animation-slide-bottom-medium; delay: 200">
+<!--        <div class="uk-width-1-1 uk-width-auto@m uk-first-column"><div id="searchImage"></div></div>-->
+<!--        <div  class="uk-width-expand uk-padding-remove-vertical search_box_bg" uk-scrollspy="target: [uk-scrollspy-class]; cls: uk-animation-slide-bottom-medium; delay: 200">-->
+<!--          <div class="uk-flex uk-flex-center uk-flex-wrap">-->
+<!--            <div class="uk-width-xlarge@l uk-width-large">-->
+<!--              <div class="uk-flex uk-flex-center uk-child-width-1-1">-->
+<!--                <div [class.uk-invisible]="disableSelect" uk-scrollspy-class>-->
+<!--                  <advanced-search-input (searchEmitter)="goTo(true)">-->
+<!--                    <entities-selection #entities [simpleView]="true" currentEntity="all" [selectedEntity]="selectedEntity"-->
+<!--                                        (selectionChange)="entityChanged($event)" (disableSelectEmitter)="disableSelectChange($event)"-->
+<!--                                        [onChangeNavigate]="false" class="uk-width-2-5"></entities-selection>-->
+<!--                    <div class="uk-width-expand" input placeholder="Scholary works" [hint]="'Search in OpenAIRE'"-->
+<!--                         [(value)]="keyword" tooltip="true"></div>-->
+<!--                  </advanced-search-input>-->
+<!--                  <div *ngIf="selectedEntity === 'result' && !entities.input.focused" class="uk-dropdown uk-display-block uk-margin-top uk-width-auto">-->
+<!--                    <div class="uk-padding-small">-->
+<!--                      <quick-selections [resultTypes]="resultTypes" [quickFilter]="resultsQuickFilter"></quick-selections>-->
+<!--                    </div>-->
+<!--                  </div>-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--    </div>-->
+<!--  </div>-->
+<!--</div>-->
+<!--<div class="uk-section uk-container uk-container-large">-->
+<!--  <div class="contentbox uk-grid uk-child-width-1-1@s uk-flex-row-reverse">-->
+<!--    <div class="uk-width-medium@m uk-width-large@l uk-width-xlarge@xl uk-width-1-1 uk-flex uk-flex-middle uk-padding-remove-horizontal">-->
+<!--      <img src="https://marketplace.eosc-portal.eu/packs/media/images/gfx_whole_illustation_desktop-fc94d4f7e15455d1785ef4793e1573fb.png">-->
+<!--    </div>-->
+<!--    <div class="uk-width-expand">-->
+<!--      <div class="">-->
+<!--        <div class=" ">-->
+<!--          <h1 class=" uk-h2 uk-text-normal">Welcome to  EOSC Explore</h1>-->
+<!--          <h2 class="uk-h5 uk-text-normal uk-text-italics"><br>-->
+<!--            <i>The in-context research discovery portal over the EOSC Exchange and the global map of science.</i>-->
+<!--          </h2>-->
+<!--        </div>-->
+<!--        <div class="uk-margin-large-top uk-text-large uk-text-light">The EOSC Explore supports discovery of research products and services onboarded in the EOSC Exchange in the wider context of scientific research outcomes, research funding, and research organization. The EOSC Research Graph, powered by the OpenAIRE Research Graph, provides links from products and services to funders, projects, organizations, and authors, collects and infers SDGs subjects, communities, many more. The portal exploits the EOSC Interoperability Framework to identify relationships between research products in the graph and EOSC Services in the EOSC Marketplace, to facilitate and enable composability of resources.  </div>-->
+<!--      </div>-->
+<!--    </div>-->
+<!--  &lt;!&ndash;  <aside><img src="https://marketplace.eosc-portal.eu/packs/media/images/gfx_whole_illustation_desktop-fc94d4f7e15455d1785ef4793e1573fb.png"></aside>&ndash;&gt;-->
+<!--      </div>-->
+<!--<div class="uk-section graph-background" *ngIf="aggregator.graphSectionText && aggregator.graphSectionTitle">-->
+<!--  <div class="uk-container">-->
+<!--    <div class="uk-flex uk-flex-top uk-child-width-1-1 uk-child-width-1-2@m" uk-grid>-->
+<!--      <div class="uk-flex-last@m">-->
+<!--        <div [class.lines-10]="!readMore" class="uk-margin-bottom multi-line-ellipsis">-->
+<!--          <div class="uk-h3">{{aggregator.graphSectionTitle}}</div>-->
+<!--          <p [innerHtml]="aggregator.graphSectionText">-->
+<!--          </p>-->
+<!--        </div>-->
+<!--        <div *ngIf="aggregator.graphSectionText">-->
+<!--          <div *ngIf="!readMore" class="uk-text-center clickable" (click)="readMore = true">-->
+<!--            <span>Read more<span class="space" uk-icon="chevron-down"></span></span>-->
+<!--          </div>-->
+<!--          <div *ngIf="readMore" class="uk-text-center clickable" (click)="readMore = false">-->
+<!--            <span>Read less<span class="space" uk-icon="chevron-up"></span></span>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--      <div class="uk-flex uk-flex-bottom">-->
+<!--        <div class="uk-width-1-3 uk-width-1-2@m">-->
+<!--          <img src="assets/graph.svg">-->
+<!--        </div>-->
+<!--        <div class="uk-padding uk-width-1-2">-->
+<!--          <img src="assets/common-assets/logo-large-graph.png">-->
+<!--        </div>-->
+<!--      </div>-->
+<!--    </div>-->
+<!--  </div>-->
+<!--</div>-->
+<!--<div class="uk-section" *ngIf="isRouteAvailable('participate/deposit/learn-how') || isRouteAvailable('participate/claim')">-->
+<!--  <div class="uk-padding uk-padding-remove-horizontal">-->
+<!--    <div class="uk-container uk-container-small">-->
+<!--      <div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">-->
+<!--        <div class="uk-width-1-1@m uk-first-column">-->
+<!--          <div-->
+<!--              class="uk-margin uk-text-center uk-child-width-1-1 uk-grid-match uk-child-width-1-1@s uk-child-width-1-2@m uk-child-width-1-2@l uk-grid"-->
+<!--              id="page#8" uk-grid="" uk-height-match="target: .target">-->
+<!--            <div class="uk-first-column" *ngIf="isRouteAvailable('participate/deposit/learn-how')">-->
+<!--              <div class="el-item uk-card uk-card-default uk-card-medium uk-card-body">-->
+<!--                <div class="uk-text-center target"><img alt="Share" class="uk-width-1-3@m uk-width-small"-->
+<!--                                                        src="assets/share.svg"></div>-->
 
-          <div [class.uk-invisible]="disableSelect" class="uk-margin-medium-top uk-width-3-5@m" uk-scrollspy-class>
+<!--                <div class="el-content uk-margin uk-text-large"><span class="uk-text-bold">Deposit</span> your research-->
-            <advanced-search-input (searchEmitter)="goTo(true)">
+<!--                </div>-->
-              <entities-selection #entities [simpleView]="true" currentEntity="all" [selectedEntity]="selectedEntity"
-                                  (selectionChange)="entityChanged($event)" (disableSelectEmitter)="disableSelect = $event"
-                                  [onChangeNavigate]="false"></entities-selection>
-              <div input placeholder="Scholary works" [hint]="'Search in OpenAIRE'" [(value)]="keyword"></div>
-            </advanced-search-input>
 
-            <div *ngIf="selectedEntity === 'result' && !entities.input.focused" class="uk-dropdown uk-display-block uk-margin-top uk-width-auto">
+<!--                <div class="uk-margin-small-top uk-text-left card-text uk-flex uk-flex-center">-->
-              <div class="uk-padding-small">
+<!--                  <div class="uk-margin-left uk-margin-right">Deposit in a repository of your choice.<br>-->
-                <quick-selections [resultTypes]="resultTypes" [quickFilter]="resultsQuickFilter"></quick-selections>
+<!--                    Select an OpenAIRE compatible<br>-->
-              </div>
+<!--                    repository (2.0 +) so that your research is linked to your funding information. Use Zenodo, a-->
-            </div>
+<!--                    catch-all repository hosted by CERN to deposit all your research results (publications, data,-->
-          </div>
+<!--                    software, etc.)-->
-        </div>
+<!--                  </div>-->
-        </div>
+<!--                </div>-->
+<!--                <a class="uk-button portal-button uk-padding uk-padding-remove-vertical uk-margin-small-left ng-star-inserted uk-margin uk-margin-bottom uk-width-1-2"-->
+<!--                   href="/participate/deposit/learn-how" type="submit">Deposit </a></div>-->
+<!--            </div>-->
 
-  </div>
+<!--            <div *ngIf=" isRouteAvailable('participate/claim')">-->
-</div>
+<!--              <div class="el-item uk-card uk-card-default uk-card-medium uk-card-body">-->
-<div class="uk-grid  uk-child-width-1-1@s">
+<!--                <div class="uk-text-center target"><img alt="Share" class="uk-width-1-3@m uk-width-small"-->
-  <div class="uk-width-expand">
+<!--                                                        src="assets/link.svg"></div>-->
-    <div class="uk-margin-large-left">
-      <div class=" ">
-        <span class=" uk-h1">Welcome to  EOSC Explore
-      </span>
-      <i class=" uk-h5 uk-text-italics"><br>
-        The in-context research discovery portal over the EOSC Exchange and the global map of science.
-      </i>
-      </div>
-      <div class="uk-margin-large-top uk-text-large">The EOSC Explore supports discovery of research products and services onboarded in the EOSC Exchange in the wider context of scientific research outcomes, research funding, and research organization. The EOSC Research Graph, powered by the OpenAIRE Research Graph, provides links from products and services to funders, projects, organizations, and authors, collects and infers SDGs subjects, communities, many more. The portal exploits the EOSC Interoperability Framework to identify relationships between research products in the graph and EOSC Services in the EOSC Marketplace, to facilitate and enable composability of resources.  </div>
-    </div>
-  </div>
-  <img
-    class="uk-width-large@m uk-width-1-1@s" 
-    src="https://marketplace.eosc-portal.eu/packs/media/images/gfx_whole_illustation_desktop-fc94d4f7e15455d1785ef4793e1573fb.png">
 
+<!--                <div class="el-content uk-margin uk-text-large"><span class="uk-text-bold">Link</span> your work</div>-->
 
-</div>
+<!--                <div class="uk-margin-small-top uk-text-left card-text uk-flex uk-flex-center">-->
-<div class="uk-section graph-background" *ngIf="aggregator.graphSectionText && aggregator.graphSectionTitle">
+<!--                  <div class="uk-margin-left uk-margin-right">Connect all your research.<br>-->
-  <div class="uk-container">
+<!--                    If you can't find your research results in OpenAIRE, don't worry! Use our Link Out service , that-->
-    <div class="uk-flex uk-flex-top uk-child-width-1-1 uk-child-width-1-2@m" uk-grid>
+<!--                    reaches out to many<br>-->
-      <div class="uk-flex-last@m">
+<!--                    external sources via APIs, to connect<br>-->
-        <div [class.lines-10]="!readMore" class="uk-margin-bottom multi-line-ellipsis">
+<!--                    your research results and claim them to your project.-->
-          <div class="uk-h3">{{aggregator.graphSectionTitle}}</div>
+<!--                  </div>-->
-          <p [innerHtml]="aggregator.graphSectionText">
+<!--                </div>-->
-          </p>
+<!--                <a class="uk-button portal-button uk-padding uk-padding-remove-vertical uk-margin-small-left ng-star-inserted uk-margin uk-margin-bottom uk-width-1-2"-->
-        </div>
+<!--                   href="/participate/claim" type="submit">Link </a></div>-->
-        <div *ngIf="aggregator.graphSectionText">
+<!--            </div>-->
-          <div *ngIf="!readMore" class="uk-text-center clickable" (click)="readMore = true">
+<!--          </div>-->
-            <span>Read more<span class="space" uk-icon="chevron-down"></span></span>
+<!--        </div>-->
-          </div>
+<!--      </div>-->
-          <div *ngIf="readMore" class="uk-text-center clickable" (click)="readMore = false">
+<!--    </div>-->
-            <span>Read less<span class="space" uk-icon="chevron-up"></span></span>
+<!--  </div>-->
-          </div>
+<!--</div>-->
-        </div>
+<!--</div>-->
-      </div>
-      <div class="uk-flex uk-flex-bottom">
-        <div class="uk-width-1-3 uk-width-1-2@m">
-          <img src="assets/graph.svg">
-        </div>
-        <div class="uk-padding uk-width-1-2">
-          <img src="assets/common-assets/logo-large-graph.png">
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-<div class="uk-section" *ngIf="isRouteAvailable('participate/deposit/learn-how') || isRouteAvailable('participate/claim')">
-  <div class="uk-padding uk-padding-remove-horizontal">
-    <div class="uk-container uk-container-small">
-      <div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
-        <div class="uk-width-1-1@m uk-first-column">
-          <div
-              class="uk-margin uk-text-center uk-child-width-1-1 uk-grid-match uk-child-width-1-1@s uk-child-width-1-2@m uk-child-width-1-2@l uk-grid"
-              id="page#8" uk-grid="" uk-height-match="target: .target">
-            <div class="uk-first-column" *ngIf="isRouteAvailable('participate/deposit/learn-how')">
-              <div class="el-item uk-card uk-card-default uk-card-medium uk-card-body">
-                <div class="uk-text-center target"><img alt="Share" class="uk-width-1-3@m uk-width-small"
-                                                        src="assets/share.svg"></div>
-
-                <div class="el-content uk-margin uk-text-large"><span class="uk-text-bold">Deposit</span> your research
-                </div>
-
-                <div class="uk-margin-small-top uk-text-left card-text uk-flex uk-flex-center">
-                  <div class="uk-margin-left uk-margin-right">Deposit in a repository of your choice.<br>
-                    Select an OpenAIRE compatible<br>
-                    repository (2.0 +) so that your research is linked to your funding information. Use Zenodo, a
-                    catch-all repository hosted by CERN to deposit all your research results (publications, data,
-                    software, etc.)
-                  </div>
-                </div>
-                <a class="uk-button portal-button uk-padding uk-padding-remove-vertical uk-margin-small-left ng-star-inserted uk-margin uk-margin-bottom uk-width-1-2"
-                   href="/participate/deposit/learn-how" type="submit">Deposit </a></div>
-            </div>
-
-            <div *ngIf=" isRouteAvailable('participate/claim')">
-              <div class="el-item uk-card uk-card-default uk-card-medium uk-card-body">
-                <div class="uk-text-center target"><img alt="Share" class="uk-width-1-3@m uk-width-small"
-                                                        src="assets/link.svg"></div>
-
-                <div class="el-content uk-margin uk-text-large"><span class="uk-text-bold">Link</span> your work</div>
-
-                <div class="uk-margin-small-top uk-text-left card-text uk-flex uk-flex-center">
-                  <div class="uk-margin-left uk-margin-right">Connect all your research.<br>
-                    If you can't find your research results in OpenAIRE, don't worry! Use our Link Out service , that
-                    reaches out to many<br>
-                    external sources via APIs, to connect<br>
-                    your research results and claim them to your project.
-                  </div>
-                </div>
-                <a class="uk-button portal-button uk-padding uk-padding-remove-vertical uk-margin-small-left ng-star-inserted uk-margin uk-margin-bottom uk-width-1-2"
-                   href="/participate/claim" type="submit">Link </a></div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-

src/app/home/home.component.ts

@@ -1,294 +1,268 @@
-import {Component, ViewChild} from '@angular/core';
+import {Component, Inject} from "@angular/core";
-import {Subscription, zip} from 'rxjs';
+import {DOCUMENT} from "@angular/common";
-import {ActivatedRoute, Router} from '@angular/router';
+import {Meta, Title} from "@angular/platform-browser";
-import {Location} from '@angular/common';
-import {Meta, Title} from '@angular/platform-browser';
-import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
-import {SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service';
-import {SearchProjectsService} from '../openaireLibrary/services/searchProjects.service';
-import {SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service';
-import {RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service';
-import {OpenaireEntities, SearchFields} from '../openaireLibrary/utils/properties/searchFields';
-
-import {RouterHelper} from '../openaireLibrary/utils/routerHelper.class';
-import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
-import {ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes';
-import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
-import {SEOService} from '../openaireLibrary/sharedComponents/SEO/SEO.service';
-import {SearchResearchResultsService} from "../openaireLibrary/services/searchResearchResults.service";
-import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
-import {Filter} from "../openaireLibrary/searchPages/searchUtils/searchHelperClasses.class";
-import {AggregatorInfo, PortalAggregators} from "../utils/aggregators";
-import {SearchCustomFilter} from "../openaireLibrary/searchPages/searchUtils/searchUtils.class";
 import {properties} from "../../environments/environment";
-import {portalProperties} from "../../environments/environment-aggregator";
-import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
-import {ConnectHelper} from "../openaireLibrary/connect/connectHelper";
-import {NumbersComponent} from "../openaireLibrary/sharedComponents/numbers/numbers.component";
 
 @Component({
   selector: 'home',
   templateUrl: 'home.component.html',
 })
 export class HomeComponent {
-  public keyword:string = "";
 
-  public searchFields:SearchFields = new SearchFields();
+  constructor(@Inject(DOCUMENT) readonly document: Document, private _meta: Meta, private _title: Title) {
-  public errorCodes:ErrorCodes = new ErrorCodes();
+    let title = "EOSC Explore";
-  public routerHelper:RouterHelper = new RouterHelper();
-  showPublications: boolean = portalProperties.entities.publication.isEnabled;
-  showDatasets: boolean = portalProperties.entities.dataset.isEnabled;
-  showSoftware: boolean = portalProperties.entities.software.isEnabled;
-  showOrp: boolean = portalProperties.entities.other.isEnabled;
-  showOrganizations: boolean = portalProperties.entities.organization.isEnabled;
-  showProjects: boolean = portalProperties.entities.project.isEnabled;
-  showDataProviders: boolean = portalProperties.entities.datasource.isEnabled;
-  properties: EnvProperties = properties;
-  public readMore: boolean = false;
-
-	private noOfFunders = 3;
-	public funders = [];
-
-  subs: Subscription[] = [];
-
-  resultsQuickFilter: { filter: Filter, selected: boolean, filterId: string, value: string } = {
-    filter: null,
-    selected: true,
-    filterId: "resultbestaccessright",
-    value: "Open Access"
-  };
-  selectedEntity = "all";
-  disableSelect;
-  selectedEntitySimpleUrl;
-  selectedEntityAdvancedUrl;
-  resultTypes:Filter = {values:[],filterId:"type", countSelectedValues: 0, filterType: 'checkbox', originalFilterId: "", valueIsExact: true, title: "Result Types",filterOperator:"or"};
-  public pageContents = null;
-  customFilter:SearchCustomFilter= null;
-  aggregator:AggregatorInfo;
-  @ViewChild('numbersComponent', { static: true }) numbersComponent: NumbersComponent;
-  
-  constructor (
-    private route: ActivatedRoute,
-    private _router: Router,
-    private _searchResearchResultsService: SearchResearchResultsService,
-    private _searchDataprovidersService: SearchDataprovidersService,
-    private _searchProjectsService: SearchProjectsService,
-    private _searchOrganizationsService: SearchOrganizationsService,
-    private _refineFieldResultsService:RefineFieldResultsService,
-    private location: Location, private _piwikService:PiwikService,
-    private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService,
-    private helper: HelperService
-  ) {
-    this.aggregator =  PortalAggregators.eoscInfo;
-    this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator();
-    let description = "OpenAIRE Explore: Over 100M of research deduplicated, 170K research software, 11M research data. One of the largest open scholarly records collection worldwide.";
-    let title = "OpenAIRE - Explore| " +this.aggregator.title;
 
     this._title.setTitle(title);
-    this._meta.updateTag({content:description},"name='description'");
-    this._meta.updateTag({content:description},"property='og:description'");
     this._meta.updateTag({content:title},"property='og:title'");
-
-
   }
 
-  private getPageContents() {
+  /** The Window object from Document defaultView */
-    this.subs.push(this.helper.getPageHelpContents(this.properties, 'openaire', this._router.url).subscribe(contents => {
+  get window(): Window {
-      this.pageContents = contents;
+    return this.document.defaultView;
-    }));
   }
 
-  public ceil(num: number) {
+  ngOnInit() {
-    return Math.ceil(num);
+    // this.window.location.href = '...';
+    if (typeof document !== 'undefined') {
+      this.window.open('https://'+(properties.environment == "beta" ? "beta." : "")+'search.marketplace.eosc-portal.eu/search/all?q=*', "_self");
     }
-
-  public ngOnInit() {
-    this.seoService.createLinkForCanonicalURL(this.properties.domain + this.properties.baseLink+this._router.url, false);
-    this.getPageContents();
-    if(this.properties!=null){
-      var url = this.properties.domain + this.properties.baseLink+this._router.url;
-      this._meta.updateTag({content:url},"property='og:url'");
-      if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
-        this.subs.push(this._piwikService.trackView(this.properties, "OpenAIRE").subscribe());
-      }
-
-      //this.config.getCommunityInformation(this.properties, this.properties.adminToolsCommunity ).subscribe(data => {
-      this.subs.push(this.config.communityInformationState.subscribe(data => {
-          if(data) {
-            var showEntity = {};
-            for (var i = 0; i < data['entities'].length; i++) {
-
-              showEntity["" + data['entities'][i]["pid"] + ""] = data['entities'][i]["isEnabled"];
-            }
-            this.showPublications = !!showEntity["publication"];
-            this.showDatasets = !!showEntity["dataset"];
-            this.showSoftware = !!showEntity["software"];
-            this.showOrp = !!showEntity["orp"];
-            this.showProjects = !!showEntity["project"];
-            this.showDataProviders = !!showEntity["datasource"];
-            this.showOrganizations = !!showEntity["organization"];
-            if(this.showPublications){
-              this.resultTypes.values.push({name: OpenaireEntities.PUBLICATIONS , id:"publications",selected:false, number:0});
-            }
-            if(this.showDatasets){
-              this.resultTypes.values.push({name: OpenaireEntities.DATASETS , id:"datasets",selected:false, number:0});
-            }
-            if(this.showSoftware){
-              this.resultTypes.values.push({name: OpenaireEntities.SOFTWARE , id:"software",selected:false, number:0});
-            }
-            if(this.showOrp){
-              this.resultTypes.values.push({name: OpenaireEntities.OTHER , id:"other",selected:false, number:0});
-            }
-            if(this.numbersComponent) {
-              this.numbersComponent.init(false, false, this.showPublications, this.showDatasets,
-                this.showSoftware, this.showOrp, this.showProjects, this.showDataProviders, this.customFilter ?
-                  StringUtils.URIEncode(this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId))) : '');
-            }
-						this.getFunders();
-          }
-        },
-        error => {
-          this.handleError("Error getting community information", error);
-        }
-      ));
-    }
-
-  }
-  public ngOnDestroy() {
-    for (let sub of this.subs) {
-      sub.unsubscribe();
   }
 }
 
-  private handleError(message: string, error) {
-    console.error("Home Page: "+message, error);
-  }
-  entityChanged($event){
-    this.selectedEntity = $event.entity;
-    this.selectedEntitySimpleUrl = $event.simpleUrl;
-    this.selectedEntityAdvancedUrl = $event.advancedUrl;
-  }
-  goTo(simple:boolean){
-    let url = (simple)?this.selectedEntitySimpleUrl:this.selectedEntityAdvancedUrl;
-    let parameterNames = [];
-    let parameterValues = [];
-    if (this.selectedEntity == "result") {
-      if (this.resultTypes) {
-        let values = [];
-        for(let value of this.resultTypes.values){
-          if (value.selected) {
-            values.push(value.id);
-          }
-        }
-        if (values.length > 0 && values.length !=4) {
-          parameterNames.push("type");
-          parameterValues.push(values.join(","));
-        }
-        if (this.resultsQuickFilter) {
-          parameterNames.push("qf");
-          parameterValues.push("" + this.resultsQuickFilter.selected);
-        }
-      }
-    }else if(this.selectedEntity == "all"){
-      if (this.resultsQuickFilter) {
-        parameterNames.push("qf");
-        parameterValues.push("true");
-      }
-    }
-    if(this.keyword.length > 0) {
-      parameterNames.push("fv0");
-      parameterValues.push(this.keyword);
-      parameterNames.push("f0");
-      parameterValues.push("q");
-    }
-    if(this.customFilter){
-      parameterNames.push(this.customFilter.queryFieldName);
-      parameterValues.push(this.customFilter.valueId);
-      parameterNames.push("cf");
-      parameterValues.push("true");
-    }
-    this._router.navigate([url], {queryParams: this.routerHelper.createQueryParams(parameterNames, parameterValues)});
-  }
-  getQueryParamsForAdvancedSearch(entity){
-    let params = {};
-    if (entity == "result") {
-      if (this.resultsQuickFilter) {
-        params["qf"] = "" + this.resultsQuickFilter.selected;
-      }
-    }
-    if(this.keyword.length > 0) {
-      params["fv0"] = "" + this.keyword;
-      params["f0"] = "q";
-    }
-    if(this.customFilter){
-     params = this.customFilter.getParameters(params);
-    }
-    return params;
-  }
 
-	getFunders() {
-		let refineParams1 = '&fq=country%20exact%20%22CA%22';
-		let refineParams2 = '&fq=resultbestaccessright%20exact%20%22Open%20Access%22&fq=country%20exact%20%22CA%22%20';
-		this.subs.push(zip(
-			this._refineFieldResultsService.getRefineFieldsResultsByEntityName(['relfunder'], 'result', this.properties, refineParams1),
-			this._refineFieldResultsService.getRefineFieldsResultsByEntityName(['relfunder'], 'result', this.properties, refineParams2)
-		).subscribe((data: any[]) => {
-			let queriedFunders1 = data[0][1][0].values;
-			queriedFunders1.forEach(queriedFunder => {
-				if(queriedFunder.id.includes('nserc')) {
-					this.funders.push({
-						"id": queriedFunder.id,
-						"name": queriedFunder.name,
-						"publications": queriedFunder.number,
-						"openAccessPublications": null,
-						"logo": 'assets/nserc_logo.png',
-						"params": {
-							relfunder: '"'+encodeURIComponent(queriedFunder.id)+'"'
-						}
-					});
-				} else if(queriedFunder.id.includes('cihr')) {
-					this.funders.push({
-						"id": queriedFunder.id,
-						"name": queriedFunder.name,
-						"publications": queriedFunder.number,
-						"openAccessPublications": null,
-						"logo": 'assets/cihr_logo.png',
-						"params": {
-							relfunder: '"'+encodeURIComponent(queriedFunder.id)+'"'
-						}
-					});
-				} else if(queriedFunder.id.includes('sshrc')) {
-					this.funders.push({
-						"id": queriedFunder.id,
-						"name": queriedFunder.name,
-						"publications": queriedFunder.number,
-						"openAccessPublications": null,
-						"logo": 'assets/sshrc_logo.png',
-						"params": {
-							relfunder: '"'+encodeURIComponent(queriedFunder.id)+'"'
-						}
-					});
-				}
-			});
-			let queriedFunders2 = data[1][1][0].values;
-			queriedFunders2.forEach(queriedFunder => {
-				for(let funder of this.funders) {
-					if(queriedFunder.id == funder.id) {
-						funder.openAccessPublications = queriedFunder.number;
-					}
-				}
-			});
-			// console.log(this.funders);
-		}));
-	}
 
-  isRouteAvailable(routeToCheck: string) {
+
-    for (let i = 0; i < this._router.config.length; i++) {
+// import {ChangeDetectorRef, Component, Inject, ViewChild} from '@angular/core';
-      let routePath: string = this._router.config[i].path;
+// import {Subscription, zip} from 'rxjs';
-      if (routePath == routeToCheck) {
+// import {ActivatedRoute, Router} from '@angular/router';
-        return true;
+// import {DOCUMENT, Location} from '@angular/common';
-      }
+// import {Meta, Title} from '@angular/platform-browser';
-    }
+// import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
-    return false;
+// import {SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service';
-  }
+// import {SearchProjectsService} from '../openaireLibrary/services/searchProjects.service';
-}
+// import {SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service';
+// import {RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service';
+// import {OpenaireEntities, SearchFields} from '../openaireLibrary/utils/properties/searchFields';
+//
+// import {RouterHelper} from '../openaireLibrary/utils/routerHelper.class';
+// import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
+// import {ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes';
+// import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
+// import {SEOService} from '../openaireLibrary/sharedComponents/SEO/SEO.service';
+// import {SearchResearchResultsService} from "../openaireLibrary/services/searchResearchResults.service";
+// import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
+// import {Filter} from "../openaireLibrary/searchPages/searchUtils/searchHelperClasses.class";
+// import {AggregatorInfo, PortalAggregators} from "../utils/aggregators";
+// import {SearchCustomFilter} from "../openaireLibrary/searchPages/searchUtils/searchUtils.class";
+// import {properties} from "../../environments/environment";
+// import {portalProperties} from "../../environments/environment-aggregator";
+//
+// @Component({
+//   selector: 'home',
+//   templateUrl: 'home.component.html',
+// })
+// export class HomeComponent {
+//   public keyword:string = "";
+//
+//   public searchFields:SearchFields = new SearchFields();
+//   public errorCodes:ErrorCodes = new ErrorCodes();
+//   public routerHelper:RouterHelper = new RouterHelper();
+//   showPublications: boolean = portalProperties.entities.publication.isEnabled;
+//   showDatasets: boolean = portalProperties.entities.dataset.isEnabled;
+//   showSoftware: boolean = portalProperties.entities.software.isEnabled;
+//   showOrp: boolean = portalProperties.entities.other.isEnabled;
+//   showOrganizations: boolean = portalProperties.entities.organization.isEnabled;
+//   showProjects: boolean = portalProperties.entities.project.isEnabled;
+//   showDataProviders: boolean = portalProperties.entities.datasource.isEnabled;
+//   properties: EnvProperties = properties;
+//   public readMore: boolean = false;
+//
+// 	private noOfFunders = 3;
+// 	public funders = [];
+//
+//   subs: Subscription[] = [];
+//
+//   resultsQuickFilter: { filter: Filter, selected: boolean, filterId: string, value: string } = {
+//     filter: null,
+//     selected: true,
+//     filterId: "resultbestaccessright",
+//     value: "Open Access"
+//   };
+//   selectedEntity = "all";
+//   disableSelect: boolean = true;
+//   selectedEntitySimpleUrl;
+//   selectedEntityAdvancedUrl;
+//   resultTypes:Filter = {values:[],filterId:"type", countSelectedValues: 0, filterType: 'checkbox', originalFilterId: "", valueIsExact: true, title: "Result Types",filterOperator:"or"};
+//   public pageContents = null;
+//   customFilter:SearchCustomFilter= null;
+//   aggregator:AggregatorInfo;
+//
+//   constructor (
+//     private route: ActivatedRoute,
+//     private _router: Router,
+//     private _searchResearchResultsService: SearchResearchResultsService,
+//     private _searchDataprovidersService: SearchDataprovidersService,
+//     private _searchProjectsService: SearchProjectsService,
+//     private _searchOrganizationsService: SearchOrganizationsService,
+//     private _refineFieldResultsService:RefineFieldResultsService,
+//     private location: Location, private _piwikService:PiwikService,
+//     private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService,
+//     private helper: HelperService, private cdr: ChangeDetectorRef
+//   ) {
+//     this.aggregator =  PortalAggregators.eoscInfo;
+//     this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator();
+//     let description = "OpenAIRE Explore: Over 100M of research deduplicated, 170K research software, 11M research data. One of the largest open scholarly records collection worldwide.";
+//     let title = "OpenAIRE - Explore| " +this.aggregator.title;
+//
+//     this._title.setTitle(title);
+//     this._meta.updateTag({content:description},"name='description'");
+//     this._meta.updateTag({content:description},"property='og:description'");
+//     this._meta.updateTag({content:title},"property='og:title'");
+//
+//
+//   }
+//
+//   private getPageContents() {
+//     this.subs.push(this.helper.getPageHelpContents(this.properties, 'openaire', this._router.url).subscribe(contents => {
+//       this.pageContents = contents;
+//     }));
+//   }
+//
+//   public ceil(num: number) {
+//     return Math.ceil(num);
+//   }
+//
+//   public ngOnInit() {
+//     this.seoService.createLinkForCanonicalURL(this.properties.domain + this.properties.baseLink+this._router.url, false);
+//     this.getPageContents();
+//     if(this.properties!=null){
+//       var url = this.properties.domain + this.properties.baseLink+this._router.url;
+//       this._meta.updateTag({content:url},"property='og:url'");
+//       if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
+//         this.subs.push(this._piwikService.trackView(this.properties, "OpenAIRE").subscribe());
+//       }
+//
+//       //this.config.getCommunityInformation(this.properties, this.properties.adminToolsCommunity ).subscribe(data => {
+//       this.subs.push(this.config.communityInformationState.subscribe(data => {
+//           if(data) {
+//             var showEntity = {};
+//             for (var i = 0; i < data['entities'].length; i++) {
+//
+//               showEntity["" + data['entities'][i]["pid"] + ""] = data['entities'][i]["isEnabled"];
+//             }
+//             this.showPublications = !!showEntity["publication"];
+//             this.showDatasets = !!showEntity["dataset"];
+//             this.showSoftware = !!showEntity["software"];
+//             this.showOrp = !!showEntity["orp"];
+//             this.showProjects = !!showEntity["project"];
+//             this.showDataProviders = !!showEntity["datasource"];
+//             this.showOrganizations = !!showEntity["organization"];
+//             if(this.showPublications){
+//               this.resultTypes.values.push({name: OpenaireEntities.PUBLICATIONS , id:"publications",selected:false, number:0});
+//             }
+//             if(this.showDatasets){
+//               this.resultTypes.values.push({name: OpenaireEntities.DATASETS , id:"datasets",selected:false, number:0});
+//             }
+//             if(this.showSoftware){
+//               this.resultTypes.values.push({name: OpenaireEntities.SOFTWARE , id:"software",selected:false, number:0});
+//             }
+//             if(this.showOrp){
+//               this.resultTypes.values.push({name: OpenaireEntities.OTHER , id:"other",selected:false, number:0});
+//             }
+//           }
+//         },
+//         error => {
+//           this.handleError("Error getting community information", error);
+//         }
+//       ));
+//     }
+//
+//   }
+//   public ngOnDestroy() {
+//     for (let sub of this.subs) {
+//       sub.unsubscribe();
+//     }
+//   }
+//
+//   private handleError(message: string, error) {
+//     console.error("Home Page: "+message, error);
+//   }
+//   entityChanged($event){
+//     this.selectedEntity = $event.entity;
+//     this.selectedEntitySimpleUrl = $event.simpleUrl;
+//     this.selectedEntityAdvancedUrl = $event.advancedUrl;
+//   }
+//   goTo(simple:boolean){
+//     let url = (simple)?this.selectedEntitySimpleUrl:this.selectedEntityAdvancedUrl;
+//     let parameterNames = [];
+//     let parameterValues = [];
+//     if (this.selectedEntity == "result") {
+//       if (this.resultTypes) {
+//         let values = [];
+//         for(let value of this.resultTypes.values){
+//           if (value.selected) {
+//             values.push(value.id);
+//           }
+//         }
+//         if (values.length > 0 && values.length !=4) {
+//           parameterNames.push("type");
+//           parameterValues.push(values.join(","));
+//         }
+//         if (this.resultsQuickFilter) {
+//           parameterNames.push("qf");
+//           parameterValues.push("" + this.resultsQuickFilter.selected);
+//         }
+//       }
+//     }else if(this.selectedEntity == "all"){
+//       if (this.resultsQuickFilter) {
+//         parameterNames.push("qf");
+//         parameterValues.push("true");
+//       }
+//     }
+//     if(this.keyword.length > 0) {
+//       parameterNames.push("fv0");
+//       parameterValues.push(this.keyword);
+//       parameterNames.push("f0");
+//       parameterValues.push("q");
+//     }
+//     if(this.customFilter){
+//       parameterNames.push(this.customFilter.queryFieldName);
+//       parameterValues.push(this.customFilter.valueId);
+//       parameterNames.push("cf");
+//       parameterValues.push("true");
+//     }
+//     this._router.navigate([url], {queryParams: this.routerHelper.createQueryParams(parameterNames, parameterValues)});
+//   }
+//   getQueryParamsForAdvancedSearch(entity){
+//     let params = {};
+//     if (entity == "result") {
+//       if (this.resultsQuickFilter) {
+//         params["qf"] = "" + this.resultsQuickFilter.selected;
+//       }
+//     }
+//     if(this.keyword.length > 0) {
+//       params["fv0"] = "" + this.keyword;
+//       params["f0"] = "q";
+//     }
+//     if(this.customFilter){
+//      params = this.customFilter.getParameters(params);
+//     }
+//     return params;
+//   }
+//
+//
+//   isRouteAvailable(routeToCheck: string) {
+//     for (let i = 0; i < this._router.config.length; i++) {
+//       let routePath: string = this._router.config[i].path;
+//       if (routePath == routeToCheck) {
+//         return true;
+//       }
+//     }
+//     return false;
+//   }
+//
+//   disableSelectChange(event: boolean) {
+//     this.disableSelect = event;
+//     this.cdr.detectChanges();
+//   }
+// }

src/app/home/home.module.ts

@@ -24,7 +24,7 @@ import {EntitiesSelectionModule} from "../openaireLibrary/searchPages/searchUtil
 import {QuickSelectionsModule} from "../openaireLibrary/searchPages/searchUtils/quick-selections.module";
 import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
 import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
-import {arrow_right, book, cog, database, earth} from "../openaireLibrary/utils/icons/icons";
+import {book, cog, database, earth} from "../openaireLibrary/utils/icons/icons";
 import {NumbersModule} from "../openaireLibrary/sharedComponents/numbers/numbers.module";
 import {AdvancedSearchInputModule} from "../openaireLibrary/sharedComponents/advanced-search-input/advanced-search-input.module";
 import {InputModule} from "../openaireLibrary/sharedComponents/input/input.module";
@@ -54,6 +54,6 @@ import {InputModule} from "../openaireLibrary/sharedComponents/input/input.modul
 })
 export class HomeModule {
   constructor(private iconsService: IconsService) {
-    this.iconsService.registerIcons([arrow_right, book, earth, cog, database]);
+    this.iconsService.registerIcons([book, earth, cog, database]);
   }
 }

src/app/landingPages/dataProvider/dataProvider.component.ts

@@ -1,20 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 
 @Component({
     selector: 'openaire-dataprovider',
-    template: `<dataprovider [piwikSiteId]="piwikSiteId"></dataprovider>`,
+    template: `<dataprovider></dataprovider>`,
  })
 export class OpenaireDataProviderComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
 }

src/app/landingPages/dataset/dataset.component.ts

@@ -1,20 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 
 @Component({
     selector: 'openaire-dataset',
-    template: `<result-landing type="dataset" [piwikSiteId]="piwikSiteId"></result-landing>`,
+    template: `<result-landing type="dataset"></result-landing>`,
  })
 export class OpenaireDatasetComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
 }

src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts

@@ -1,20 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 
 @Component({
     selector: 'openaire-htmlProjectReport',
-    template: `<htmlProjectReport [piwikSiteId]=""></htmlProjectReport>`,
+    template: `<htmlProjectReport></htmlProjectReport>`,
  })
 export class OpenaireHtmlProjectReportComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
 }

src/app/landingPages/organization/organization.component.ts

@@ -1,20 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 
 @Component({
     selector: 'openaire-organization',
-    template: `<organization [piwikSiteId]="piwikSiteId"></organization>`,
+    template: `<organization ></organization>`,
  })
 export class OpenaireOrganizationComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
 }

src/app/landingPages/orp/orp.component.ts

@@ -1,20 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 
 @Component({
     selector: 'openaire-orp',
-    template: `<result-landing type="orp" [piwikSiteId]="piwikSiteId"></result-landing>`,
+    template: `<result-landing type="orp"></result-landing>`,
  })
 export class OpenaireOrpComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
 }

src/app/landingPages/project/project.component.ts

@@ -1,20 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 
 @Component({
     selector: 'openaire-project',
-    template: `<project [piwikSiteId]="piwikSiteId"></project>`,
+    template: `<project></project>`,
  })
 export class OpenaireProjectComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
 }

src/app/landingPages/publication/publication.component.ts

@@ -1,19 +1,9 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 
 @Component({
   selector: 'openaire-publication',
   template: `
-    <result-landing type="publication" [piwikSiteId]="piwikSiteId"></result-landing>`,
+    <result-landing type="publication"></result-landing>`,
 })
 export class OpenairePublicationComponent {
-  piwikSiteId = properties.piwikSiteId;
-
-
-  constructor() {}
-
-  ngOnInit() {
-  }
-
-
 }

src/app/landingPages/result/result.component.ts

@@ -1,11 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 
 @Component({
     selector: 'openaire-publication',
-    template: `<result-landing type="result" [piwikSiteId]="piwikSiteId"></result-landing>`,
+    template: `<result-landing type="result"></result-landing>`,
  })
 export class OpenaireResultComponent{
-  piwikSiteId = properties.piwikSiteId;
-
 }

src/app/landingPages/service/service.component.ts

@@ -1,20 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 
 @Component({
     selector: 'openaire-dataprovider',
-    template: `<dataprovider type="service" [piwikSiteId]="piwikSiteId"></dataprovider>`,
+    template: `<dataprovider type="service"></dataprovider>`,
  })
 export class OpenaireServiceComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
 }

src/app/landingPages/software/software.component.ts

@@ -1,19 +1,8 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 
 @Component({
     selector: 'openaire-software',
-    template: `<result-landing type="software" [piwikSiteId]="piwikSiteId"></result-landing>`,
+    template: `<result-landing type="software"></result-landing>`,
  })
 export class OpenaireSoftwareComponent{
-  piwikSiteId = properties.piwikSiteId;
-
-  constructor (  ) {
-  }
-
-  ngOnInit() {
-}
-
-
-
 }

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit 6b28663496f07ea12bd3b7d998b8255c39becc88
+Subproject commit c12cadf0f160b965ae91679f72ae8c9743c402cc

src/app/searchPages/advanced/advancedSearchDataProviders.component.ts

@@ -8,7 +8,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
   selector: 'openaire-advanced-search-dataprovider',
   template: `
     <search-dataproviders [simpleView]="false" 
-                          [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
+                          [hasPrefix]="false" [searchForm]="searchForm">
     </search-dataproviders>
 
   `
@@ -16,7 +16,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
 
 export class OpenaireAdvancedSearchDataProvidersComponent {
   properties: EnvProperties;
-  public searchForm: SearchForm = {class: 'search-form', dark: false};
+  public searchForm: SearchForm = {class: 'search-form', dark: true};
   constructor ( ) {}
   ngOnInit() {
     this.properties = properties;

src/app/searchPages/advanced/advancedSearchOrganizations.component.ts

@@ -7,8 +7,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
 @Component({
   selector: 'openaire-advanced-search-organizations',
   template: `
-    <search-organizations  [simpleView]="false" 
+    <search-organizations  [simpleView]="false" [hasPrefix]="false" [searchForm]="searchForm">
-                           [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
     </search-organizations>
 
   `
@@ -16,7 +15,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
 
 export class OpenaireAdvancedSearchOrganizationsComponent {
   properties: EnvProperties;
-  public searchForm: SearchForm = {class: 'search-form', dark: false};
+  public searchForm: SearchForm = {class: 'search-form', dark: true};
   constructor ( ) {}
   ngOnInit() {
     this.properties = properties;

src/app/searchPages/advanced/advancedSearchProjects.component.ts

@@ -6,8 +6,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
 @Component({
     selector: 'openaire-advanced-search-projects',
     template: `
-    <search-projects [simpleView]="false"
+    <search-projects [simpleView]="false" [hasPrefix]="false" [searchForm]="searchForm">
-                     [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
     </search-projects>
 
     `
@@ -15,7 +14,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
 
 export class OpenaireAdvancedSearchProjectsComponent {
   properties: EnvProperties;
-  public searchForm: SearchForm = {class: 'search-form', dark: false};
+  public searchForm: SearchForm = {class: 'search-form', dark: true};
   constructor ( ) {}
   ngOnInit() {
     this.properties = properties;

src/app/searchPages/advanced/advancedSearchServices.component.ts

@@ -8,8 +8,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
 @Component({
   selector: 'openaire-advanced-search-service',
   template: `
-    <search-dataproviders [simpleView]="false" 
+    <search-dataproviders [simpleView]="false" [hasPrefix]="false"
-                          [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false"
                           type="services" entityType="service" [typeName]="openaireEntities.SERVICES" 
                           [searchForm]="searchForm">
     </search-dataproviders>
@@ -19,7 +18,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
 export class OpenaireAdvancedSearchServicesComponent {
   properties: EnvProperties;
   public openaireEntities = OpenaireEntities;
-  public searchForm: SearchForm = {class: 'search-form', dark: false};
+  public searchForm: SearchForm = {class: 'search-form', dark: true};
   constructor ( ) {}
   ngOnInit() {
     this.properties = properties;

src/app/searchPages/advanced/searchResearchResults.component.ts

@@ -7,14 +7,14 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
   selector: 'openaire-search-results',
   template: `
     <search-research-results resultType="result" [simpleView]="false"
-                             [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
+                             [hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
   `
 
 })
 export class OpenaireSearchResearchResultsComponent {
   @Input() searchLink: string = "/search/advanced/research-results";
   properties: EnvProperties;
-  public searchForm: SearchForm = {class: 'search-form', dark: false};
+  public searchForm: SearchForm = {class: 'search-form', dark: true};
   constructor ( ) {}
     ngOnInit() {
         this.properties = properties;

src/app/searchPages/find/search.component.ts

@@ -1,17 +1,13 @@
 import {Component} from '@angular/core';
-import {properties} from "../../../environments/environment";
 import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
 
 @Component({
   selector: 'openaire-search-find',
   template: `
-    <search-all logoURL="/assets/common-assets/logo-small-aggregator.png" name="OpenAIRE" [piwikSiteId]="piwikSiteId" 
+    <search-all logoURL="/assets/common-assets/logo-small-aggregator.png" name="OpenAIRE"
                 [searchForm]="searchForm"></search-all>
   `,
  })
 export class OpenaireSearchComponent{
-  piwikSiteId = properties.piwikSiteId;
+  public searchForm: SearchForm = {class: 'search-form', dark: true};
-  public searchForm: SearchForm = {class: 'search-form', dark: false};
-  constructor ( ) {}
-  ngOnInit() {}
 }

src/app/searchPages/simple/searchDataproviders.component.ts

@@ -6,12 +6,12 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
 @Component({
   selector: 'openaire-search-dataproviders',
   template: `
-    <search-dataproviders [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm"></search-dataproviders>
+    <search-dataproviders [hasPrefix]="false" [searchForm]="searchForm"></search-dataproviders>
   `
 })
 export class OpenaireSearchDataprovidersComponent {
   properties: EnvProperties;
-  public searchForm: SearchForm = {class: 'search-form', dark: false};
+  public searchForm: SearchForm = {class: 'search-form', dark: true};
   constructor ( ) {}
   ngOnInit() {
     this.properties = properties;

src/app/searchPages/simple/searchOrganizations.component.ts

@@ -6,12 +6,12 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
 @Component({
   selector: 'openaire-search-organizations',
   template: `
-    <search-organizations [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm"></search-organizations>
+    <search-organizations [hasPrefix]="false" [searchForm]="searchForm"></search-organizations>
   `
 })
 export class OpenaireSearchOrganizationsComponent {
   properties: EnvProperties;
-  public searchForm: SearchForm = {class: 'search-form', dark: false};
+  public searchForm: SearchForm = {class: 'search-form', dark: true};
   constructor ( ) {}
     ngOnInit() {
         this.properties = properties;

src/app/searchPages/simple/searchProjects.component.ts

@@ -6,12 +6,12 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
 @Component({
   selector: 'openaire-search-projects',
   template: `
-    <search-projects [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm"></search-projects>
+    <search-projects [hasPrefix]="false" [searchForm]="searchForm"></search-projects>
   `
 })
 export class OpenaireSearchProjectsComponent {
   properties: EnvProperties;
-  public searchForm: SearchForm = {class: 'search-form', dark: false};
+  public searchForm: SearchForm = {class: 'search-form', dark: true};
   constructor ( ) {}
     ngOnInit() {
         this.properties = properties;

src/app/searchPages/simple/searchResearchResults.component.ts

@@ -7,13 +7,13 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
   selector: 'openaire-search-results',
   template: `
     <search-research-results resultType="result" [stickyForm]="false"
-                             [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
+                             [hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
   `
 })
 export class OpenaireSearchResearchResultsComponent {
   @Input() searchLink: string = "/search/research-results";
   properties: EnvProperties;
-  public searchForm: SearchForm = {class: 'search-form', dark: false};
+  public searchForm: SearchForm = {class: 'search-form', dark: true};
   constructor ( ) {}
   ngOnInit() {
     this.properties = properties;

src/app/searchPages/simple/searchServices.component.ts

@@ -7,7 +7,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
 @Component({
   selector: 'openaire-search-services',
   template: `
-    <search-dataproviders [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false"
+    <search-dataproviders [hasPrefix]="false"
                           type="services" entityType="service" [typeName]="openaireEntities.SERVICES" 
                           [searchForm]="searchForm">
     </search-dataproviders>
@@ -16,7 +16,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
 export class OpenaireSearchServicesComponent {
   properties: EnvProperties;
   public openaireEntities = OpenaireEntities;
-  public searchForm: SearchForm = {class: 'search-form', dark: false};
+  public searchForm: SearchForm = {class: 'search-form', dark: true};
   constructor ( ) {}
   ngOnInit() {
     this.properties = properties;

src/app/utils/aggregators.ts

@@ -34,115 +34,10 @@ export class AggregatorInfo {
 
 export class PortalAggregators {
   static eoscInfo: AggregatorInfo =
-    new AggregatorInfo("eosc", "Eosc Explore", "https://providers.eosc-portal.eu/assets/images/EOSC_Portal_Logo.png",
+    new AggregatorInfo("eosc", "Eosc Explore", "https://marketplace.eosc-portal.eu/packs/media/images/eosc-logo-mono-65a4962b88cf1caa9e35838e33022ca8.png",
        null, null, null,    null,null,null ,false,false,
       `
- :root {
-  --primary-color: #3540b6;
-  --primary-dark-color: #233d4c;
-  --search-form-background: transparent;
  
-  }        
-  .search-input {
-    --search-input-border-radius: 0px;
-  }
-  .input-wrapper.advanced-search {
-    --input-border-radius: 0px;
-  }
-  .input-wrapper {
-  --input-border-radius: 0px;
-  }
-  a, .uk-link, a.uk-link-heading{
-  color: #3540b6;
-  }
-  a:hover, .uk-link:hover, a.uk-link-heading:hover{
-  color: #233d4c;
- text-decoration: none;
-  }
-  .uk-link-text a:hover, .uk-link-toggle:hover .uk-link-text, a.uk-link-text:hover{
-  color:#0c2bd5;
-  }
-.search_box_bg {
-  /*background: url(//marketplace.eosc-portal.eu/packs/media/images/home-bg-89b63b3d579f3530ec6283f51e1648bc.png) no-repeat;*/
-    /* background-position-x: 0%;*/
-    /* background-position-y: 0%;*/
-  /* background-position: 50% -120px;*/
-  z-index: 3;
-}
-#searchImage{
-background: url('https://marketplace.eosc-portal.eu/packs/media/images/eosc-logo-color-883f208671ef77b15b9cd067ecdc369b.png') no-repeat center left;
-width: 250px;
-height: 80px;
-background-size: 250px 80px;
-/*margin-left: 80px;*/
-}
-#searchForm advanced-search-form{
-float:right;
-}
-#searchForm{
-/*padding:0;*/
- /*width:100%;*/
-  /*max-width:100%;*/
-}
-search-filter h6::after{
-border-bottom: 1px solid gray;
-}
-search-filter h6{
-text-transform: uppercase !important;
-font-size: 12px;
-}
-
-search-filter .tm-child-list-divider > ul > li:nth-child(n+2), .uk-list-divider > li:nth-child(n+2){
-border: none;
-}
-
-.filterHeader{
-border-bottom:1px solid #ced4da;
-}
-.matSelection.mat-select {
-
-    padding: 4px;
-    border: 1px solid #ced4da;
-
-}
-
-.search-results .uk-card-default.uk-card-hover:hover{
-    box-shadow: none;
-}
-.search-results .uk-card-default {
-    border: 1px solid #ced4da;
-    box-shadow:none;
-}
-
-
-.uk-pagination > .uk-active > *, .uk-pagination > .uk-active > :hover {
-
-   border-radius: 0px;
- 
-
-}
-    .uk-button-primary:not(.uk-icon-button), .portal-button:not(.uk-icon-button) {
-      color: #fff !important;
-      background-color: #0c2bd5 !important;
-      background-image: linear-gradient(135deg,#05cae7,#0c2bd5) !important;
-      border:none !important;
-     }
-     
-   .uk-button-primary:hover, .portal-button:hover:not(.uk-icon-button) {
-       background: #0c2bd5 !important;
-        border:none !important;
-    }
-
-       .search_box_bg .uk-button, #searchForm .uk-button:not(.uk-button-text):not(.uk-button-link), .search_box_bg .uk-button:hover, #searchForm .uk-button:hover:not(.uk-button-text):not(.uk-button-link) {
-      border-radius: 0px;
-      margin-left: 0px !important;
-      color: rgb(102, 102, 102) !important;
-      background-color: #0c2bd5 !important;
-      background-color: rgba(255, 255, 255, 1.0) !important;
-      border: 1px solid rgba(0, 0, 0, 0.40) !important;
-      background-image: none !important;
-      padding: 10px;
-    }
  
       `);
   static disabled = {
@@ -162,7 +57,7 @@ border-bottom:1px solid #ced4da;
   }
 
   public static getCommunityInfo(): any {
-    return Portal.getMockCommunityInfo(PortalAggregators.eoscInfo.menuId, PortalAggregators.disabled.entities,PortalAggregators.disabled.pages);
+    return Portal.getMockCommunityInfo(PortalAggregators.eoscInfo.menuId, PortalAggregators.eoscInfo.title, PortalAggregators.disabled.entities,PortalAggregators.disabled.pages);
   }
 }
 

src/assets/arrow.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
+    <polyline fill="none" stroke="#EAEAEA" points="10 5 20 9.5 10 14"></polyline>
+    <line fill="none" stroke="#EAEAEA" x1="0" y1="9.5" x2="20" y2="9.5"></line></svg>

src/assets/ask-explore.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 70.876 70.876"><defs><style>.a{fill:#fff;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-width:3px;}.a,.b{stroke:#d95f2d;}.b{fill:#d95f2d;stroke-width:2px;}</style></defs><g transform="translate(-1000.9 -961.038)"><g transform="translate(1002.4 962.538)"><path class="a" d="M1036.338,1914.9a33.938,33.938,0,1,1-33.938,33.938A33.923,33.923,0,0,1,1036.338,1914.9Z" transform="translate(-1002.4 -1914.9)"/></g><path class="b" d="M1033.929,975.9a10.839,10.839,0,0,0-10.829,10.829.839.839,0,0,0,1.675.112h0a9.154,9.154,0,1,1,18.308,0,10.223,10.223,0,0,1-3.238,7.256,58.886,58.886,0,0,1-6.475,5.359.8.8,0,0,0-.335.67v6.587a.839.839,0,1,0,1.674.112h0v-6.252a53.715,53.715,0,0,0,6.252-5.247,12.159,12.159,0,0,0,3.684-8.373A10.66,10.66,0,0,0,1033.929,975.9Z" transform="translate(2.409 0.327)"/><circle class="b" cx="1.675" cy="1.675" r="1.675" transform="translate(1034.663 1013.514)"/></g></svg>

src/assets/common-assets

@@ -1 +1 @@
-Subproject commit d105b019317aaeced29f0a5856ee111d6632ae55
+Subproject commit 1ec5cb00b5f197db17a5219c9fcf55484ee0bca1

src/assets/eosc-custom.less

@@ -0,0 +1,173 @@
+/* EOSC */
+//@eosc-color: #3D4DB6;
+//@eosc-light-color: #E80000;
+//@eosc-dark-color: #AD0000;
+//@eosc-secondary-color: #AD0000;
+//@eosc-default-background: #F2F2F2;
+//
+////@global-primary-gradient: linear-gradient(104deg, @eosc-dark-color 0%, @eosc-light-color 100%);
+//@global-primary-gradient: @eosc-light-color;
+//
+///* Button */
+//@button-primary-background: @eosc-color;
+//@inverse-button-primary-background: @eosc-color;
+//@button-primary-hover-background: @eosc-secondary-color;
+//@button-primary-active-background: @eosc-secondary-color;
+//
+///* Background */
+//@background-primary-background: @eosc-color;
+//@background-primary-background-gradient: none;
+//
+///* Text */
+//@text-primary-color: @eosc-color;
+//
+///* Label */
+//@label-secondary-color: @eosc-color;
+//
+///* General */
+//@general-tab-featured-tab: @eosc-color;
+//
+///* Landing */
+//@landing-portal-color: @eosc-color;
+//
+//.search-form {
+//  background-color: rgba(61,77, 182);
+//}
+
+@font-url: e("/assets/media/fonts/inter/static/");
+
+/* Inter */
+
+@font-face {  font-family: "inter";  font-style: normal;  font-weight: 100;    src: url("@{font-url}Inter-Thin-thin.ttf") format('truetype');  font-display: swap}
+@font-face {  font-family: "inter";  font-style: normal;  font-weight: 300;   src: url("@{font-url}Inter-Light.ttf") format('truetype');  font-display: swap}
+@font-face {  font-family: "inter";  font-style: normal;  font-weight: 400;   src: url("@{font-url}Inter-Regular.ttf") format('truetype');  font-display: swap}
+@font-face {  font-family: "inter";  font-style: normal;  font-weight: 600;   src: url("@{font-url}Inter-SemiBold.ttf") format('truetype');  font-display: swap}
+@font-face {  font-family: "inter";  font-style: normal;  font-weight: 700;   src: url("@{font-url}Inter-Bold.ttf") format('truetype');  font-display: swap}
+@font-face {  font-family: "inter";  font-style: normal;  font-weight: 900;   src: url("@{font-url}Inter-Black.ttf") format('truetype');  font-display: swap}
+
+
+@global-font-family: 'Inter', sans-serif;
+
+@eosc-color: #010F87;
+@eosc-light-color: #3D4DB6;
+@eosc-dark-color: #000745;
+//@eosc-secondary-color: #2255A4;
+@eosc-secondary-color: #000745;
+@eosc-default-background: #F2F2F2;
+
+@primary-color: @eosc-color;
+@primary-light-color: @eosc-light-color;
+@primary-dark-color: @eosc-dark-color;
+@secondary-color: @eosc-secondary-color;
+
+@global-link-color: @eosc-color;
+
+@global-primary-background: @eosc-color;
+@global-secondary-background: @eosc-secondary-color;
+
+@general-search-form-background: @eosc-color;
+@base-body-background: @eosc-default-background;
+//@global-header-height: 120px;
+//.hook-search-misc() {
+//  .search-input {
+//    --search-input-border-radius: 8px;
+//    --search-input-icon-padding-vertical: 5px;
+//    --search-input-icon-color: @global-primary-background;
+//  }
+//}
+//.input-wrapper {
+//  &.search {
+//    --input-padding-vertical: 5px !important;
+//  }
+//}
+
+//.image-front-topbar, .search-form, #main-menu .uk-navbar-container, #main-menu-small .uk-navbar-container {
+.eosc-explore-back-search-bar {
+  //background: @global-primary-background;
+  //background: #000 url(https://search.marketplace.eosc-portal.eu/top-bar-bg.d5173dd5fee84543.jpg) no-repeat !important;
+  background: #000 url(top-bar.svg) no-repeat !important;
+  position: relative;
+  height: 60px;
+}
+
+#searchImage{
+  background: url('https://marketplace.eosc-portal.eu/packs/media/images/eosc-logo-mono-65a4962b88cf1caa9e35838e33022ca8.png') no-repeat center left;
+  width: 203px;
+  height: 69px;
+  background-size: 203px 79px;
+}
+
+.search-results-container {
+  background-color: white;
+  border-radius: 25px;
+}
+
+.uk-button-primary {
+  background-image: none;
+}
+//
+//.contentbox {
+//  display: block;
+//  position: relative;
+//}
+//
+//.contentbox > div {
+//  width: 58%;
+//  display: flex;
+//  flex-direction: column;
+//  justify-content: center;
+//}
+//
+//.contentbox > div > div {
+//  width: 90%;
+//}
+//
+//aside {
+//  background: transparent;
+//  position: absolute;
+//  top: -25px;
+//  right: -100px;
+//  width: 68%;
+//
+//  display: block;
+//}
+//
+//.contentbox img {
+//  max-width: 100%;
+//  min-width: 45%;
+//  height: auto;
+//}
+//
+//@media (max-width: 576px) {
+//  .contentbox {
+//    display: flex;
+//    flex-direction: column-reverse;
+//  }
+//}
+//
+//@media (max-width: 991px) {
+//  .contentbox {
+//    flex-direction: column;
+//    align-items: normal;
+//  }
+//}
+//
+//@media (max-width: 1120px) {
+//  .contentbox > div {
+//    width: 100%;
+//  }
+//}
+//
+//@media (max-width: 576px) {
+//  .contentbox > div > div {
+//    width: 100%;
+//  }
+//}
+//
+//@media (max-width: 576px) {
+//  .contentbox aside {
+//    position: relative;
+//    width: 100%;
+//    right: auto;
+//  }
+//}

src/assets/explore.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 72.3 64.727"><defs><style>.a{fill:#fff;}.a,.b{stroke:#d95f2d;stroke-linecap:round;stroke-miterlimit:10;stroke-width:3px;}.b{fill:none;}</style></defs><g transform="translate(1 1)"><circle class="a" cx="14.574" cy="14.574" r="14.574" transform="translate(0.5 33.078)"/><circle class="a" cx="14.574" cy="14.574" r="14.574" transform="translate(40.508 33.078)"/><line class="b" x2="10.717" transform="translate(29.792 47.653)"/><path class="b" d="M51.788,47.653V9.788L42.5.5" transform="translate(18.012)"/><path class="b" d="M.5,48.081V9.788L9.788.5"/></g></svg>

src/assets/lock.svg

@@ -1 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg  width="20px" height="20px" id="els2_x5F_basic" style="enable-background:new 0 0 40 40;" version="1.1" viewBox="0 0 40 40"  xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M29.688,17H10.294c-1.817,0-3.3,1.482-3.3,3.298  v12.381c0,1.817,1.482,3.299,3.3,3.299h19.395c1.817,0,3.3-1.482,3.3-3.299V20.298C32.988,18.482,31.506,17,29.688,17z" style="fill:none;stroke:#999999;stroke-width:1.33;stroke-miterlimit:10;"/><path d="M28,17v-6.094C28,6.558,24.4,3,20,3  s-8,3.558-8,7.906V17" style="fill:none;stroke:#999999;stroke-width:1.33;stroke-miterlimit:10;"/><line style="fill:none;stroke:#999999;stroke-width:1.33;stroke-linecap:round;stroke-miterlimit:10;" x1="20" x2="20" y1="23" y2="30"/></svg>

src/assets/media/fonts/inter/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

src/assets/media/fonts/inter/README.txt

@@ -0,0 +1,72 @@
+Inter Variable Font
+===================
+
+This download contains Inter as both a variable font and static fonts.
+
+Inter is a variable font with these axes:
+  slnt
+  wght
+
+This means all the styles are contained in a single file:
+  Inter-VariableFont_slnt,wght.ttf
+
+If your app fully supports variable fonts, you can now pick intermediate styles
+that aren’t available as static fonts. Not all apps support variable fonts, and
+in those cases you can use the static font files for Inter:
+  static/Inter-Thin.ttf
+  static/Inter-ExtraLight.ttf
+  static/Inter-Light.ttf
+  static/Inter-Regular.ttf
+  static/Inter-Medium.ttf
+  static/Inter-SemiBold.ttf
+  static/Inter-Bold.ttf
+  static/Inter-ExtraBold.ttf
+  static/Inter-Black.ttf
+
+Get started
+-----------
+
+1. Install the font files you want to use
+
+2. Use your app's font picker to view the font family and all the
+available styles
+
+Learn more about variable fonts
+-------------------------------
+
+  https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
+  https://variablefonts.typenetwork.com
+  https://medium.com/variable-fonts
+
+In desktop apps
+
+  https://theblog.adobe.com/can-variable-fonts-illustrator-cc
+  https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
+
+Online
+
+  https://developers.google.com/fonts/docs/getting_started
+  https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
+  https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
+
+Installing fonts
+
+  MacOS: https://support.apple.com/en-us/HT201749
+  Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
+  Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
+
+Android Apps
+
+  https://developers.google.com/fonts/docs/android
+  https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
+
+License
+-------
+Please read the full license text (OFL.txt) to understand the permissions,
+restrictions and requirements for usage, redistribution, and modification.
+
+You can use them in your products & projects – print or digital,
+commercial or otherwise.
+
+This isn't legal advice, please consider consulting a lawyer and see the full
+license for all details.

src/assets/openaire-theme

@@ -1 +1 @@
-Subproject commit 8bb758b340d05b50b65da48863ff7ed69fdc122b
+Subproject commit f77eefe72c494c11161cfa7e3821f6d408302d8d

src/beta/index.html

@@ -20,20 +20,22 @@
   <meta property="og:image:type" content="image/png" />
   <meta property="og:image:width" content="360" />
   <meta property="og:image:height" content="359" />
-  <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">-->
-  <link rel="apple-touch-icon" sizes="76x76" href="assets/common-assets/logo/apple-icon-76x76.png">
+<!--  <link rel="apple-touch-icon" sizes="76x76" href="assets/common-assets/logo/apple-icon-76x76.png">-->
-  <link rel="apple-touch-icon" sizes="114x114" href="assets/common-assets/logo/apple-icon-114x114.png">
+<!--  <link rel="apple-touch-icon" sizes="114x114" href="assets/common-assets/logo/apple-icon-114x114.png">-->
-  <link rel="apple-touch-icon" sizes="120x120" href="assets/common-assets/logo/apple-icon-120x120.png">
+<!--  <link rel="apple-touch-icon" sizes="120x120" href="assets/common-assets/logo/apple-icon-120x120.png">-->
-  <link rel="apple-touch-icon" sizes="144x144" href="assets/common-assets/logo/apple-icon-144x144.png">
+<!--  <link rel="apple-touch-icon" sizes="144x144" href="assets/common-assets/logo/apple-icon-144x144.png">-->
-  <link rel="apple-touch-icon" sizes="152x152" href="assets/common-assets/logo/apple-icon-152x152.png">
+<!--  <link rel="apple-touch-icon" sizes="152x152" href="assets/common-assets/logo/apple-icon-152x152.png">-->
-  <link rel="apple-touch-icon" sizes="180x180" href="assets/common-assets/logo/apple-icon-180x180.png">
+<!--  <link rel="apple-touch-icon" sizes="180x180" href="assets/common-assets/logo/apple-icon-180x180.png">-->
-  <link rel="icon" type="image/png" sizes="192x192"  href="assets/common-assets/logo/android-icon-192x192.png">
+<!--  <link rel="icon" type="image/png" sizes="192x192"  href="assets/common-assets/logo/android-icon-192x192.png">-->
-  <link rel="icon" type="image/png" sizes="32x32" href="assets/common-assets/logo/favicon-32x32.png">
+<!--  <link rel="icon" type="image/png" sizes="32x32" href="assets/common-assets/logo/favicon-32x32.png">-->
-  <link rel="icon" type="image/png" sizes="96x96" href="assets/common-assets/logo/favicon-96x96.png">
+<!--  <link rel="icon" type="image/png" sizes="96x96" href="assets/common-assets/logo/favicon-96x96.png">-->
-  <link rel="icon" type="image/png" sizes="16x16" href="assets/common-assets/logo/favicon-16x16.png">
+<!--  <link rel="icon" type="image/png" sizes="16x16" href="assets/common-assets/logo/favicon-16x16.png">-->
-  <link href="assets/common-assets/logo/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
+<!--  <link href="assets/common-assets/logo/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />-->
+  <link rel="apple-touch-icon" type="image/png" href="https://marketplace.eosc-portal.eu/packs/media/images/favicon-180x180-2c72cd50b79427645002ab6ffcc58aea.png">
+  <link rel="shortcut icon" type="image/x-icon" href="https://marketplace.eosc-portal.eu/packs/media/images/favicon-408cd9bf3d8f02d4e8d461097e5cf50d.ico">
   <link rel="manifest" href="assets/common-assets/logo/manifest.json">
   <meta name="msapplication-TileColor" content="#ffffff">
   <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
@@ -42,7 +44,7 @@
   <title>EOSC Explore</title>
 </head>
 <body>
-<div class="uk-badge" style="border: 0px; border-radius: 0px; background: #bc2300 !important;   position: absolute; z-index: 1000;">Beta instance</div>
+<div style="border: 0px; border-radius: 0px; background: rgba(255,255,255,.7) !important; color: crimson !important;  position: absolute; z-index: 1000;opacity: 0.2;font-size: 14px;font-weight: 900;padding: 0 15px;">DEMO INSTANCE</div>
 <div class="uk-offcanvas-content uk-height-viewport">
   <eosc-common-main-header></eosc-common-main-header>
 

src/environments/environment.beta.ts

@@ -4,8 +4,9 @@
 // The eoscInfo of which env maps to which file can be found in `.angular-cli.json`.
 
 import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
+import {common, commonBeta} from "../app/openaireLibrary/utils/properties/environments/environment";
 
-export let properties: EnvProperties = {
+let props: EnvProperties = {
   environment: "beta",
   adminToolsPortalType: "eosc",
   dashboard: "eosc",
@@ -14,47 +15,14 @@ export let properties: EnvProperties = {
   useLongCache: true,
   showAddThis: true,
   enableEoscDataTransfer: true,
-  framesAPIURL: "https://beta.openaire.eu/stats3/",
+  statisticsAPIURL: "https://services.openaire.eu/stats-api/",
-  statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
+  statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/",
-  statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
+  searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/",
-  statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/",
+  searchResourcesAPIURL: "https://services.openaire.eu/search/v2/api/resources",
-  useNewStatistisTool: true,
-  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",
-  openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
   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/",
-  orcidURL: "https://orcid.org/",
-  doiURL: "https://doi.org/",
-  pmcURL: "http://europepmc.org/articles/",
-  pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
-  handleURL: "http://hdl.handle.net/",
-  cordisURL: "http://cordis.europa.eu/projects/",
-  openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
-  r3DataURL: "http://service.re3data.org/repository/",
-  fairSharingURL: "https://fairsharing.org/",
-  eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/",
-  sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
-  sherpaURLSuffix: "/",
-  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",
-  helpdeskEmail: "helpdesk@openaire.eu",
   utilsService: "https://explore.openaire.eu/utils-service",
   vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/",
-  piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
   piwikSiteId: "594",
-  loginUrl: "https://services.openaire.eu/login-service/openid_connect_login",
-  userInfoUrl: "https://services.openaire.eu/login-service/userInfo",
-  logoutUrl: "https://services.openaire.eu/login-service/openid_logout",
-  cookieDomain: ".openaire.eu",
   feedbackmail: "feedback@openaire.eu",
   cacheUrl: "https://explore.openaire.eu/cache/get?url=",
   datasourcesAPI: "https://services.openaire.eu/openaire/ds/search/",
@@ -63,51 +31,23 @@ export let properties: EnvProperties = {
   useHelpTexts: false,
   contextsAPI: "https://services.openaire.eu/openaire/context",
   communityAPI: "https://services.openaire.eu/openaire/community/",
-  csvLimit: 2000,
+  domain: "https://explore.eosc-portal.eu",
-  pagingLimit: 20,
+  lastIndexInformationLink: "https://openaire.eu/aggregation-and-content-provision-workflows",
-  resultsPerPage: 10,
+  widgetLink: "https://openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
-  "baseLink": "/",
-  "domain": "https://explore.eosc-portal.eu",
-  searchLinkToResult: "/search/result?id=",
-  searchLinkToPublication: "/search/publication?articleId=",
-  searchLinkToProject: "/search/project?projectId=",
-  searchLinkToDataProvider: "/search/dataprovider?datasourceId=",
-  searchLinkToService: "/search/service?serviceId=",
-  searchLinkToDataset: "/search/dataset?datasetId=",
-  searchLinkToSoftwareLanding: "/search/software?softwareId=",
-  searchLinkToOrp: "/search/other?orpId=",
-  searchLinkToOrganization: "/search/organization?organizationId=",
-  searchLinkToPublications: "/search/find/publications",
-  searchLinkToDataProviders: "/search/find/dataproviders",
-  searchLinkToServices: "/search/find/services",
-  searchLinkToProjects: "/search/find/projects",
-  searchLinkToDatasets: "/search/find/datasets",
-  searchLinkToSoftware: "/search/find/software",
-  searchLinkToOrps: "/search/find/other",
-  searchLinkToOrganizations: "/search/find/organizations",
-  searchLinkToCompatibleDataProviders: "/search/content-providers",
-  searchLinkToEntityRegistriesDataProviders: "/search/entity-registries",
-  searchLinkToJournals: "/search/journals",
-  searchLinkToResults: "/search/find/research-outcomes",
-  searchLinkToAdvancedPublications: "/search/advanced/publications",
-  searchLinkToAdvancedProjects: "/search/advanced/projects",
-  searchLinkToAdvancedDatasets: "/search/advanced/datasets",
-  searchLinkToAdvancedSoftware: "/search/advanced/software",
-  searchLinkToAdvancedOrps: "/search/advanced/other",
-  searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders",
-  searchLinkToAdvancedServices: "/search/advanced/services",
-  searchLinkToAdvancedOrganizations: "/search/advanced/organizations",
-  searchLinkToAdvancedResults: "/search/advanced/research-outcomes",
-  errorLink: "/error",
-  lastIndexInformationLink: "https://beta.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",
-  lastIndexUpdate: "2020-06-15",
+  indexInfoAPI: "https://services.openaire.eu/openaire/info/",
-  indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/",
-  depositLearnHowPage: "/participate/deposit/learn-how",
-  depositSearchPage: "/participate/deposit/search",
-  altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
   reCaptchaSiteKey: null,
-  footerGrantText: ""
+  footerGrantText: "",
+  eoscDataTransferAPI : "https://eosc-data-transfer.vm.fedcloud.eu",
+  eoscDataTransferLoginUrl:"https://explore.eosc-portal.eu/egi-login-service/openid_connect_login",
+  eoscDataTransferDestinations : [
+    {label: "EGI dCache (dcache-demo.desy.de)", value:
+        {label : "EGI dCache (dcache-demo.desy.de)", url: "https://dcache-demo.desy.de:2443", id: "dcache",
+          webpage : "https://dcache-demo.desy.de", defaultFolder: "/", hasBrowse: true,
+          loginUrl : "https://explore.eosc-portal.eu/egi-login-service/openid_connect_login", cookieName: "EGIAccessToken"}
+    }]
 };
+
+export let properties: EnvProperties = {
+  ...common, ...commonBeta, ...props
+}

src/environments/environment.prod.ts

@@ -4,8 +4,9 @@
 // The eoscInfo of which env maps to which file can be found in `.angular-cli.json`.
 
 import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
+import {common, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment";
 
-export let properties: EnvProperties = {
+let props: EnvProperties = {
   environment: "production",
   adminToolsPortalType: "eosc",
   dashboard: "eosc",
@@ -14,100 +15,29 @@ export let properties: EnvProperties = {
   useLongCache: true,
   showAddThis: true,
   enableEoscDataTransfer: true,
-  framesAPIURL: "https://www.openaire.eu/stats3/",
-  statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
-  statisticsFrameAPIURL: "https://www.openaire.eu/stats/",
   statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/",
   useNewStatistisTool: true,
-  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",
-  openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
-  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/",
-  orcidURL: "https://orcid.org/",
-  doiURL: "https://doi.org/",
-  pmcURL: "http://europepmc.org/articles/",
-  pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
-  handleURL: "http://hdl.handle.net/",
-  cordisURL: "http://cordis.europa.eu/projects/",
-  openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
-  r3DataURL: "http://service.re3data.org/repository/",
-  fairSharingURL: "https://fairsharing.org/",
-  eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/",
-  sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
-  sherpaURLSuffix: "/",
-  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",
-  helpdeskEmail: "helpdesk@openaire.eu",
-  utilsService: "https://explore.openaire.eu/utils-service",
-  vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/",
-  piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
   piwikSiteId: "594",
-  loginUrl: "https://services.openaire.eu/login-service/openid_connect_login",
-  userInfoUrl: "https://services.openaire.eu/login-service/userInfo",
-  logoutUrl: "https://services.openaire.eu/login-service/openid_logout",
-  cookieDomain: ".openaire.eu",
-  feedbackmail: "feedback@openaire.eu",
-  cacheUrl: "https://explore.openaire.eu/cache/get?url=",
-  datasourcesAPI: "https://services.openaire.eu/openaire/ds/search/",
   adminToolsCommunity: "eosc",
-  adminToolsAPIURL: "https://services.openaire.eu/uoa-admin-tools/",
   useHelpTexts:false,
-  contextsAPI: "https://services.openaire.eu/openaire/context",
+  domain: "https://explore.eosc-portal.eu",
-  communityAPI: "https://services.openaire.eu/openaire/community/",
-  csvLimit: 2000,
-  pagingLimit: 20,
-  resultsPerPage: 10,
-  "baseLink" : "/",
-  "domain": "https://explore.eosc-portal.eu",
-  searchLinkToResult: "/search/result?id=",
-  searchLinkToPublication: "/search/publication?articleId=",
-  searchLinkToProject: "/search/project?projectId=",
-  searchLinkToDataProvider: "/search/dataprovider?datasourceId=",
-  searchLinkToService: "/search/service?serviceId=",
-  searchLinkToDataset: "/search/dataset?datasetId=",
-  searchLinkToSoftwareLanding: "/search/software?softwareId=",
-  searchLinkToOrp: "/search/other?orpId=",
-  searchLinkToOrganization: "/search/organization?organizationId=",
-  searchLinkToPublications: "/search/find/publications",
-  searchLinkToDataProviders: "/search/find/dataproviders",
-  searchLinkToServices: "/search/find/services",
-  searchLinkToProjects: "/search/find/projects",
-  searchLinkToDatasets: "/search/find/datasets",
-  searchLinkToSoftware: "/search/find/software",
-  searchLinkToOrps: "/search/find/other",
-  searchLinkToOrganizations: "/search/find/organizations",
-  searchLinkToCompatibleDataProviders: "/search/content-providers",
-  searchLinkToEntityRegistriesDataProviders: "/search/entity-registries",
-  searchLinkToJournals: "/search/journals",
-  searchLinkToResults: "/search/find/research-outcomes",
-  searchLinkToAdvancedPublications: "/search/advanced/publications",
-  searchLinkToAdvancedProjects: "/search/advanced/projects",
-  searchLinkToAdvancedDatasets: "/search/advanced/datasets",
-  searchLinkToAdvancedSoftware: "/search/advanced/software",
-  searchLinkToAdvancedOrps: "/search/advanced/other",
-  searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders",
-  searchLinkToAdvancedServices: "/search/advanced/services",
-  searchLinkToAdvancedOrganizations: "/search/advanced/organizations",
-  searchLinkToAdvancedResults: "/search/advanced/research-outcomes",
-  errorLink: "/error",
-  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",
-  lastIndexUpdate: "2020-06-15",
-  indexInfoAPI: "https://services.openaire.eu/openaire/info/",
-  depositLearnHowPage: "/participate/deposit/learn-how",
-  depositSearchPage: "/participate/deposit/search",
-  altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
   reCaptchaSiteKey: null,
-  footerGrantText : ""
+  footerGrantText : "",
+  eoscDataTransferAPI : "https://eosc-data-transfer.vm.fedcloud.eu",
+  eoscDataTransferLoginUrl:"https://explore.eosc-portal.eu/egi-login-service/openid_connect_login",
+  eoscDataTransferDestinations : [
+    {label: "dcache", value:
+        {label : "EGI dCache",   id: "dcache",
+          defaultFolder: "/", auth: "token"}
+    },
+    {label: "FTP", value:
+        {label : "FTP",  id: "ftp", auth: "password"}
+    },
+    {label: "S3", value:
+        {label : "S3",  id: "s3",  auth: "keys"}
+    }]
 };
+
+export let properties: EnvProperties = {
+  ...common, ...commonProd, ...props
+}

src/environments/environment.ts

@@ -4,9 +4,9 @@
 // The eoscInfo of which env maps to which file can be found in `.angular-cli.json`.
 
 import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
+import {common, commonDev} from "../app/openaireLibrary/utils/properties/environments/environment";
 
-export let properties: EnvProperties = {
+let props: EnvProperties = {
-  environment: "development",
   adminToolsPortalType: "eosc",
   dashboard: "eosc",
   enablePiwikTrack: false,
@@ -14,100 +14,53 @@ export let properties: EnvProperties = {
   useLongCache: false,
   showAddThis: true,
   enableEoscDataTransfer: true,
-  framesAPIURL: "https://beta.openaire.eu/stats3/",
+  statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/",
-  statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
-  statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
-  statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/",
-  useNewStatistisTool: true,
-  claimsAPIURL: "http://dl170.madgik.di.uoa.gr:8180/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/",
   searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/",
-  searchResourcesAPIURL: "http://beta.services.openaire.eu/search/v2/api/resources",
+  searchResourcesAPIURL: "http://services.openaire.eu/search/v2/api/resources",
-  openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
+  csvAPIURL: "https://services.openaire.eu/search/v2/api/reports",
-  csvAPIURL: "https://beta.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/",
-  orcidURL: "https://orcid.org/",
-  doiURL: "https://dx.doi.org/",
-  pmcURL: "http://europepmc.org/articles/",
-  pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
-  handleURL: "http://hdl.handle.net/",
-  cordisURL: "http://cordis.europa.eu/projects/",
-  openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
-  r3DataURL: "http://service.re3data.org/repository/",
-  fairSharingURL: "https://fairsharing.org/",
-  eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/",
-  sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
-  sherpaURLSuffix: "/",
-  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",
-  helpdeskEmail: "helpdesk@openaire.eu",
   utilsService: "http://dl170.madgik.di.uoa.gr:8000",
   vocabulariesAPI: "https://dev-openaire.d4science.org/provision/mvc/vocabularies/",
-  piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
+  piwikSiteId: "594",
-  piwikSiteId: "6",
-  loginUrl: "http://mpagasas.di.uoa.gr:8080/login-service/openid_connect_login",
-  userInfoUrl: "http://mpagasas.di.uoa.gr:8080/login-service/userInfo",
-  logoutUrl: "http://mpagasas.di.uoa.gr:8080/login-service/openid_logout",
-  cookieDomain: ".di.uoa.gr",
-  feedbackmail: "kostis30fylloy@gmail.com",
   cacheUrl: "http://dl170.madgik.di.uoa.gr:3000/get?url=",
-  adminToolsCommunity: "aggregator",
+  adminToolsCommunity: "eosc",
-  adminToolsAPIURL: "http://duffy.di.uoa.gr:8080/uoa-admin-tools/",
+  adminToolsAPIURL: "http://duffy.di.uoa.gr:19280/uoa-admin-tools/",
   useHelpTexts: false,
   datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",
   contextsAPI: "https://dev-openaire.d4science.org/openaire/context",
   communityAPI: "https://dev-openaire.d4science.org/openaire/community/",
-  csvLimit: 2000,
+  domain:"https://explore.eosc-portal.eu",
-  pagingLimit: 20,
-  resultsPerPage: 10,
-  "baseLink" : "",
-  "domain":"https://explore.eosc-portal.eu",
-  searchLinkToResult: "/search/result?id=",
-  searchLinkToPublication: "/search/publication?articleId=",
-  searchLinkToProject: "/search/project?projectId=",
-  searchLinkToDataProvider: "/search/dataprovider?datasourceId=",
-  searchLinkToService: "/search/service?serviceId=",
-  searchLinkToDataset: "/search/dataset?datasetId=",
-  searchLinkToSoftwareLanding: "/search/software?softwareId=",
-  searchLinkToOrp: "/search/other?orpId=",
-  searchLinkToOrganization: "/search/organization?organizationId=",
-  searchLinkToPublications: "/search/find/publications",
-  searchLinkToDataProviders: "/search/find/dataproviders",
-  searchLinkToServices: "/search/find/services",
-  searchLinkToProjects: "/search/find/projects",
-  searchLinkToDatasets: "/search/find/datasets",
-  searchLinkToSoftware: "/search/find/software",
-  searchLinkToOrps: "/search/find/other",
-  searchLinkToOrganizations: "/search/find/organizations",
-  searchLinkToCompatibleDataProviders: "/search/content-providers",
-  searchLinkToEntityRegistriesDataProviders: "/search/entity-registries",
-  searchLinkToJournals: "/search/journals",
-  searchLinkToResults: "/search/find/research-outcomes",
-  searchLinkToAdvancedPublications: "/search/advanced/publications",
-  searchLinkToAdvancedProjects: "/search/advanced/projects",
-  searchLinkToAdvancedDatasets: "/search/advanced/datasets",
-  searchLinkToAdvancedSoftware: "/search/advanced/software",
-  searchLinkToAdvancedOrps: "/search/advanced/other",
-  searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders",
-  searchLinkToAdvancedServices: "/search/advanced/services",
-  searchLinkToAdvancedOrganizations: "/search/advanced/organizations",
-  searchLinkToAdvancedResults: "/search/advanced/research-outcomes",
-  errorLink: "/error",
   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",
-  lastIndexUpdate: "2019-11-01",
   indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/",
-  depositLearnHowPage: "/participate/deposit/learn-how",
-  depositSearchPage: "/participate/deposit/search",
-  altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
   reCaptchaSiteKey: null,
-  footerGrantText : "This OpenAIRE gateway is part of a project that has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452"
+  footerGrantText : "This OpenAIRE gateway is part of a project that has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452",
+  eoscDataTransferAPI : "https://eosc-data-transfer.test.fedcloud.eu",
+  eoscDataTransferLoginUrl:"http://rudie.di.uoa.gr:8580/openid_connect_login",
+  eoscDataTransferDestinations : [
+    {
+      "kind": "StorageInfo",
+      "destination": "dcache",
+      // "id": "dcache", //
+      "description": "EGI dCache",
+      // "label": "EGI dCache", //
+      "authType": "token",
+      "canBrowse": true,
+      "transferWith": "EGI Data Transfer"
+    },
+    {
+      "kind": "StorageInfo",
+      "destination": "s3",
+      // "id": "s3", //
+      "description": "Amazon S3 compatible object storage",
+      // "label": "Amazon S3 compatible object storage", //
+      "authType": "keys",
+      "canBrowse": true,
+      "transferWith": "EGI Data Transfer"
+    }
+  ]
 };
+
+export let properties: EnvProperties = {
+  ...common, ...commonDev, ...props
+}

src/index.html

@@ -21,29 +21,31 @@
       <meta property="og:image:width" content="360" />
       <meta property="og:image:height" content="359" />
       <meta name="robots" content="noindex">
-      <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">-->
-      <link rel="apple-touch-icon" sizes="76x76" href="assets/common-assets/logo/apple-icon-76x76.png">
+<!--      <link rel="apple-touch-icon" sizes="76x76" href="assets/common-assets/logo/apple-icon-76x76.png">-->
-      <link rel="apple-touch-icon" sizes="114x114" href="assets/common-assets/logo/apple-icon-114x114.png">
+<!--      <link rel="apple-touch-icon" sizes="114x114" href="assets/common-assets/logo/apple-icon-114x114.png">-->
-      <link rel="apple-touch-icon" sizes="120x120" href="assets/common-assets/logo/apple-icon-120x120.png">
+<!--      <link rel="apple-touch-icon" sizes="120x120" href="assets/common-assets/logo/apple-icon-120x120.png">-->
-      <link rel="apple-touch-icon" sizes="144x144" href="assets/common-assets/logo/apple-icon-144x144.png">
+<!--      <link rel="apple-touch-icon" sizes="144x144" href="assets/common-assets/logo/apple-icon-144x144.png">-->
-      <link rel="apple-touch-icon" sizes="152x152" href="assets/common-assets/logo/apple-icon-152x152.png">
+<!--      <link rel="apple-touch-icon" sizes="152x152" href="assets/common-assets/logo/apple-icon-152x152.png">-->
-      <link rel="apple-touch-icon" sizes="180x180" href="assets/common-assets/logo/apple-icon-180x180.png">
+<!--      <link rel="apple-touch-icon" sizes="180x180" href="assets/common-assets/logo/apple-icon-180x180.png">-->
-      <link rel="icon" type="image/png" sizes="192x192"  href="assets/common-assets/logo/android-icon-192x192.png">
+<!--      <link rel="icon" type="image/png" sizes="192x192"  href="assets/common-assets/logo/android-icon-192x192.png">-->
-      <link rel="icon" type="image/png" sizes="32x32" href="assets/common-assets/logo/favicon-32x32.png">
+<!--      <link rel="icon" type="image/png" sizes="32x32" href="assets/common-assets/logo/favicon-32x32.png">-->
-      <link rel="icon" type="image/png" sizes="96x96" href="assets/common-assets/logo/favicon-96x96.png">
+<!--      <link rel="icon" type="image/png" sizes="96x96" href="assets/common-assets/logo/favicon-96x96.png">-->
-      <link rel="icon" type="image/png" sizes="16x16" href="assets/common-assets/logo/favicon-16x16.png">
+<!--      <link rel="icon" type="image/png" sizes="16x16" href="assets/common-assets/logo/favicon-16x16.png">-->
-      <link href="assets/common-assets/logo/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
+<!--      <link href="assets/common-assets/logo/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />-->
+      <link rel="apple-touch-icon" type="image/png" href="https://marketplace.eosc-portal.eu/packs/media/images/favicon-180x180-2c72cd50b79427645002ab6ffcc58aea.png">
+      <link rel="shortcut icon" type="image/x-icon" href="https://marketplace.eosc-portal.eu/packs/media/images/favicon-408cd9bf3d8f02d4e8d461097e5cf50d.ico">
       <link rel="manifest" href="assets/common-assets/logo/manifest.json">
       <meta name="msapplication-TileColor" content="#ffffff">
       <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
       <meta name="theme-color" content="#ffffff">
       <link id="customCss" rel="stylesheet" href="">
-      <title>Search OpenAIRE</title>
+      <title>Search EOSC</title>
    </head>
     <body>
-    <div class="uk-badge" style="border: 0px; border-radius: 0px; background: #bc2300 !important;   position: absolute; z-index: 1000;">Beta instance</div>
+<!--    <div class="uk-badge" style="border: 0px; border-radius: 0px; background: #bc2300 !important;   position: absolute; z-index: 1000;">Beta instance</div>-->
       <div class="uk-offcanvas-content uk-height-viewport">
         <eosc-common-main-header></eosc-common-main-header>
            <app-root></app-root>

src/main.server.ts

@@ -12,4 +12,4 @@ if (properties.environment !== "development") {
 }
 
 export { AppServerModule } from './app/app.server.module';
-export { renderModule, renderModuleFactory } from '@angular/platform-server';
+

src/polyfills.ts

@@ -22,16 +22,6 @@ import '@angular/localize/init';
  * BROWSER POLYFILLS
  */
 
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
-// import 'classlist.js';  // Run `npm install --save classlist.js`.
-
-/**
- * Web Animations `@angular/platform-browser/animations`
- * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
- * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
- */
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
-
 /**
  * By default, zone.js will patch all possible macroTask and DomEvents
  * user can disable parts of macroTask/DomEvents patch by setting following flags

src/prod/index.html

@@ -20,20 +20,22 @@
   <meta property="og:image:type" content="image/png" />
   <meta property="og:image:width" content="360" />
   <meta property="og:image:height" content="359" />
-  <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">-->
-  <link rel="apple-touch-icon" sizes="76x76" href="assets/common-assets/logo/apple-icon-76x76.png">
+<!--  <link rel="apple-touch-icon" sizes="76x76" href="assets/common-assets/logo/apple-icon-76x76.png">-->
-  <link rel="apple-touch-icon" sizes="114x114" href="assets/common-assets/logo/apple-icon-114x114.png">
+<!--  <link rel="apple-touch-icon" sizes="114x114" href="assets/common-assets/logo/apple-icon-114x114.png">-->
-  <link rel="apple-touch-icon" sizes="120x120" href="assets/common-assets/logo/apple-icon-120x120.png">
+<!--  <link rel="apple-touch-icon" sizes="120x120" href="assets/common-assets/logo/apple-icon-120x120.png">-->
-  <link rel="apple-touch-icon" sizes="144x144" href="assets/common-assets/logo/apple-icon-144x144.png">
+<!--  <link rel="apple-touch-icon" sizes="144x144" href="assets/common-assets/logo/apple-icon-144x144.png">-->
-  <link rel="apple-touch-icon" sizes="152x152" href="assets/common-assets/logo/apple-icon-152x152.png">
+<!--  <link rel="apple-touch-icon" sizes="152x152" href="assets/common-assets/logo/apple-icon-152x152.png">-->
-  <link rel="apple-touch-icon" sizes="180x180" href="assets/common-assets/logo/apple-icon-180x180.png">
+<!--  <link rel="apple-touch-icon" sizes="180x180" href="assets/common-assets/logo/apple-icon-180x180.png">-->
-  <link rel="icon" type="image/png" sizes="192x192"  href="assets/common-assets/logo/android-icon-192x192.png">
+<!--  <link rel="icon" type="image/png" sizes="192x192"  href="assets/common-assets/logo/android-icon-192x192.png">-->
-  <link rel="icon" type="image/png" sizes="32x32" href="assets/common-assets/logo/favicon-32x32.png">
+<!--  <link rel="icon" type="image/png" sizes="32x32" href="assets/common-assets/logo/favicon-32x32.png">-->
-  <link rel="icon" type="image/png" sizes="96x96" href="assets/common-assets/logo/favicon-96x96.png">
+<!--  <link rel="icon" type="image/png" sizes="96x96" href="assets/common-assets/logo/favicon-96x96.png">-->
-  <link rel="icon" type="image/png" sizes="16x16" href="assets/common-assets/logo/favicon-16x16.png">
+<!--  <link rel="icon" type="image/png" sizes="16x16" href="assets/common-assets/logo/favicon-16x16.png">-->
-  <link href="assets/common-assets/logo/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
+<!--  <link href="assets/common-assets/logo/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />-->
+  <link rel="apple-touch-icon" type="image/png" href="https://marketplace.eosc-portal.eu/packs/media/images/favicon-180x180-2c72cd50b79427645002ab6ffcc58aea.png">
+  <link rel="shortcut icon" type="image/x-icon" href="https://marketplace.eosc-portal.eu/packs/media/images/favicon-408cd9bf3d8f02d4e8d461097e5cf50d.ico">
   <link rel="manifest" href="assets/common-assets/logo/manifest.json">
   <meta name="msapplication-TileColor" content="#ffffff">
   <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">

src/styles.less

@@ -9,4 +9,5 @@
 @import "~src/assets/common-assets/less/user";
 @import "~src/assets/common-assets/less/linking";
 @import "~src/assets/common-assets/less/landing";
-@import "assets/portal-custom.css";
+//@import "assets/portal-custom.css";
+@import "assets/eosc-custom";

src/test.ts

@@ -7,14 +7,10 @@ import {
   platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
 
-declare const require: any;
-
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(), {
+    teardown: { destroyAfterEach: false }
+}
 );
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);

src/tsconfig.server.json

@@ -2,7 +2,6 @@
   "extends": "./tsconfig.app.json",
   "compilerOptions": {
     "outDir": "../out-tsc/app-server",
-    "target": "es2016",
     "types": [
       "node"
     ]

tsconfig.json

@@ -10,13 +10,14 @@
     "moduleResolution": "node",
     "experimentalDecorators": true,
     "importHelpers": true,
-    "target": "es2015",
+    "target": "ES2022",
     "typeRoots": [
       "node_modules/@types"
     ],
     "lib": [
       "es2018",
       "dom"
-    ]
+    ],
+    "useDefineForClassFields": false
   }
 }