Initial commit of production portal folder

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@52745 d315682c-612b-4755-9ff5-7f18f6832af3

production-portal/README.md

@@ -0,0 +1,54 @@
+# Angular Universal & Anguar-CLI minimal starter
+
+> This demo is built following the [Angular-CLI Wiki guide](https://github.com/angular/angular-cli/wiki/stories-universal-rendering)
+
+We're utilizing packages from the [Angular Universal @nguniversal](https://github.com/angular/universal) repo, such as [ng-module-map-ngfactory-loader](https://github.com/angular/universal/tree/master/modules/module-map-ngfactory-loader) to enable Lazy Loading.
+
+---
+
+## Static or Dynamic
+This repo demonstrates the use of 2 different forms of Server Side Rendering.
+
+**Static** Also known as "prerendering"
+* Happens at build time
+* Renders your application and replaces the dist index.html with a version rendered at the route `/`.
+
+**Dynamic**
+* Happens at runtime
+* Uses `ngExpressEngine` to render you application on the fly at the requested url.
+
+---
+
+## Installation
+* `npm install` or `yarn`
+
+---
+
+## Development (Client-side only rendering)
+* run `npm run start` which will start `ng serve` (project served at the standard: localhost:4200)
+
+---
+
+## Production 
+
+Depending on whether you're publishing dynamic or static prerendering, run the build command, and then serve up your dist folder assets.
+
+> **NOTE**: To deploy your **Static** site to a static hosting platform you will have to deploy the *`dist/browser`* folder, rather than the usual *`dist`*
+
+ie: `npm run build:dynamic` or `npm run build:static`. All of the files that need to be served will be found within the `/dist` folder.
+
+
+
+---
+
+## Testing Universal (dynamic or static) builds -Locally-
+
+**Dynamic** : **`npm run start:dynamic`**
+
+Compiles your application and spins up a Node Express to dynamically serve your Universal application on `http://localhost:4000`.
+
+**Static** : **`npm run start:static`**
+
+- Compiles your application and prerenders your applications files, spinning up a demo http-server so you can view it on `http://127.0.0.1:8080`
+
+

production-portal/explore-production-properties.json

@@ -0,0 +1,88 @@
+{
+  "enablePiwikTrack" : true,
+  "enableHelper" : true,
+  "useCache" : true,
+  "metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/",
+  "framesAPIURL" : "https://beta.openaire.eu/stats3/",
+  "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",
+  "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/",
+  "claimsAPIURL" : "https://beta.services.openaire.eu/claims/rest/claimsService/",
+  "searchAPIURLLAst"     : "https://beta.services.openaire.eu/search/v2/api/",
+  "searchResourcesAPIURL"     : "https://beta.services.openaire.eu/search/v2/api/resources",
+  "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/",
+  "pmidURL"    : "http://www.ncbi.nlm.nih.gov/pubmed/",
+  "doiURL"     : "https://dx.doi.org/",
+  "cordisURL"  : "http://cordis.europa.eu/projects/",
+  "pmcURL"     : "http://europepmc.org/articles/",
+  "handleURL"  : "http://hdl.handle.net/",
+  "zenodo"   : "https://zenodo.org/",
+  "openAccess" : "https://www.openaire.eu/support/faq#article-id-234",
+  "openAccessRepo" : "https://www.openaire.eu/support/faq#article-id-310",
+  "fp7Guidlines" : "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
+  "h2020Guidlines" : "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020",
+  "ercGuidlines" : "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf",
+  "helpdesk" : "https://www.openaire.eu/support/helpdesk",
+  "uploadService" : "https://demo.openaire.eu/upload/",
+
+  "vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/",
+
+  "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=",
+  "piwikSiteId" : "6",
+  "loginUrl" :"https://beta.services.openaire.eu/uoa-user-management/openid_connect_login",
+
+  "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
+
+  "logoutOpenaireUrl" :"http://dl067.madgik.di.uoa.gr/idp/profile/Logout",
+
+  "cookieDomain" :".openaire.eu",
+
+  "feedbackmail" :"openaire.test@gmail.com",
+
+  "helperPageUrl" :"http://scoobydoo.di.uoa.gr:16000/api/page/route",
+
+  "cacheUrl" :"https://demo.openaire.eu/cache/get?url=",
+
+  "datasourcesAPI": "https://beta.services.openaire.eu/openaire/ds/search/",
+
+  "adminToolsAPIURL" :"https://beta.services.openaire.eu/uoa-admin-tools/",
+
+  "adminToolsCommunity" :"openaire",
+  "contextsAPI":"https://beta.services.openaire.eu/openaire/context",
+  "communityAPI": "https://beta.services.openaire.eu/openaire/community/",
+
+  "csvLimit":  2000,
+  "pagingLimit":  20,
+  "resultsPerPage":  10,
+
+  "baseLink" : "https://beta.explore.openaire.eu",
+
+  "searchLinkToPublication" : "/search/publication?articleId=",
+  "searchLinkToProject" : "/search/project?projectId=",
+  "searchLinkToDataProvider" : "/search/dataprovider?datasourceId=",
+  "searchLinkToDataset" : "/search/dataset?datasetId=",
+  "searchLinkToOrganization" : "/search/organization?organizationId=",
+
+  "searchLinkToPublications" : "/search/find/publications",
+  "searchLinkToDataProviders" : "/search/find/dataproviders",
+  "searchLinkToProjects" : "/search/find/projects",
+  "searchLinkToDatasets" : "/search/find/datasets",
+  "searchLinkToSoftware" : "/search/find/software",
+  "searchLinkToOrganizations" : "/search/find/organizations",
+  "searchLinkToCompatibleDataProviders" : "/search/content-providers",
+  "searchLinkToCompatibleDataProvidersTable" : "/search/content-providers-table",
+  "searchLinkToEntityRegistriesDataProviders" : "/search/entity-registries",
+  "searchLinkToEntityRegistriesDataProvidersTable" : "/search/entity-registries-table",
+  "searchLinkToJournals" : "/search/journals",
+  "searchLinkToJournalsTable" : "/search/journals-table",
+
+  "searchLinkToAdvancedPublications" : "/search/advanced/publications",
+  "searchLinkToAdvancedProjects" : "/search/advanced/projects",
+  "searchLinkToAdvancedDatasets" : "/search/advanced/datasets",
+  "searchLinkToAdvancedSoftware" : "/search/advanced/software",
+  "searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders",
+  "searchLinkToAdvancedOrganizations" : "/search/advanced/organizations",
+  "searchLinkToAdvancedPeople" : "/search/advanced/people"
+}

production-portal/installOpenaireLib.sh

@@ -0,0 +1,3 @@
+rm -rf  node_modules/ng-openaire-library/;
+npm install /home/argirok/projects/openaire/uoa-services-library/trunk/ng-openaire-library/dist/ng-openaire-library-1.0.0.tgz;
+npm start;

production-portal/package.json

@@ -0,0 +1,63 @@
+{
+  "name": "openaire-search",
+  "version": "1.0.0",
+  "license": "Openaire",
+  "contributors": [
+    "Argiro Kokogiannaki <argirok@di.uoa.gr>",
+    "Konstantina Galouni <kgalouni@di.uoa.gr>"
+  ],
+  "scripts": {
+    "ng": "ng",
+    "start": "ng serve --disable-host-check --host 0.0.0.0",
+    "start:dynamic": "npm run build:dynamic && npm run serve:dynamic",
+    "start:static": "npm run build:static && npm run serve:static",
+    "build": "ng build",
+    "build:client-and-server-bundles": "ng build --prod -sm --stats-json && ng build --prod --app 1 --output-hashing=false",
+    "build:static": "npm run build:client-and-server-bundles && npm run webpack:server && npm run generate:static",
+    "build:dynamic": "npm run build:client-and-server-bundles  && npm run webpack:server",
+    "generate:static": "cd dist && node prerender",
+    "webpack:server": "webpack --config webpack.server.config.js --progress --colors",
+    "serve:static": "cd dist/browser && http-server",
+    "serve:dynamic": "node dist/server"
+  },
+  "private": true,
+  "dependencies": {
+    "@angular/animations": "^4.2.4",
+    "@angular/common": "^4.2.4",
+    "@angular/compiler": "^4.2.4",
+    "@angular/core": "^4.2.4",
+    "@angular/forms": "^4.2.4",
+    "@angular/http": "^4.2.4",
+    "@angular/platform-browser": "^4.2.4",
+    "@angular/platform-browser-dynamic": "^4.2.4",
+    "@angular/platform-server": "^4.2.4",
+    "@angular/router": "^4.2.4",
+    "@nguniversal/express-engine": "^1.0.0-beta.3",
+    "@nguniversal/module-map-ngfactory-loader": "^1.0.0-beta.3",
+    "angular-datatables": "^4.4.0",
+    "citation-js": "^0.3.4",
+    "clipboard": "^1.5.16",
+    "core-js": "^2.4.1",
+    "datatables.net": "^1.10.16",
+    "datatables.net-dt": "^1.10.16",
+    "jquery": "^3.2.1",
+    "ngx-json-ld": "0.1.6",
+    "rxjs": "^5.4.2",
+    "ts-md5": "^1.2.0",
+    "wikidata-sdk": "^5.2.9",
+    "zone.js": "^0.8.14"
+  },
+  "devDependencies": {
+    "@angular/cli": "^1.3.0",
+    "@angular/compiler-cli": "^4.2.4",
+    "@angular/language-service": "^4.2.4",
+    "@types/datatables.net": "^1.10.8",
+    "@types/jquery": "^3.2.17",
+    "@types/node": "^8.0.30",
+    "cpy-cli": "^1.0.1",
+    "http-server": "^0.10.0",
+    "reflect-metadata": "^0.1.10",
+    "ts-loader": "^2.3.7",
+    "typescript": "~2.3.3"
+  }
+}

production-portal/prepareDeploy.sh

@@ -0,0 +1,24 @@
+#ATTENTION
+#DON'T run it in svn folder - it REMOVES files
+#Copy project in another file "deploy-folder"
+#cd "deploy-folder"
+#run the script
+
+## uncommect from here-->
+# cp explore-production-properties.json src/assets/env-properties.json;
+# rm -rf src/assets/common-assets/.svn/;
+# rm -rf src/app/openaireLibrary/.svn/;
+# pico src/app/openaireLibrary/utils/properties/environment-specific.service.ts;
+# npm run build:dynamic;
+# rm -rf src node_modules  .idea/ connect-production-properties.json installOpenaireLib.sh;
+# echo 'Ready!';
+# echo 'Now copy to the server!'
+##<-- to here
+
+#copy "deploy-folder" in demo.openaire.eu
+#coppies of previous deployments exist in  "/home/argiro.kokogiannaki/uoa-portal/openaireYYYY-MM-DD"
+#run "npm i"
+#become nodejs user: "sudo su nodejs -s /bin/bash"
+#go to "cd /srv/www/portal"
+#cp files from "cp -r HOME_PATH/deploy-folder/* ."
+#restart portal "pm2 restart openaire"

production-portal/prerender.ts

@@ -0,0 +1,45 @@
+// Load zone.js for the server.
+import 'zone.js/dist/zone-node';
+import 'reflect-metadata';
+import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'fs';
+import { join } from 'path';
+
+import { enableProdMode } from '@angular/core';
+// Faster server renders w/ Prod mode (dev mode never needed)
+enableProdMode();
+
+// Express Engine
+import { ngExpressEngine } from '@nguniversal/express-engine';
+// Import module map for lazy loading
+import { provideModuleMap } from '@nguniversal/module-map-ngfactory-loader';
+import { renderModuleFactory } from '@angular/platform-server';
+import { ROUTES } from './static.paths';
+
+// * NOTE :: leave this as require() since this file is built Dynamically from webpack
+const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./dist/server/main.bundle');
+
+const BROWSER_FOLDER = join(process.cwd(), 'browser');
+
+// Load the index.html file containing referances to your application bundle.
+const index = readFileSync(join('browser', 'index.html'), 'utf8');
+
+let previousRender = Promise.resolve();
+
+// Iterate each route path
+ROUTES.forEach(route => {
+  var fullPath = join(BROWSER_FOLDER, route);
+
+  // Make sure the directory structure is there
+  if(!existsSync(fullPath)){
+    mkdirSync(fullPath);
+  }
+
+  // Writes rendered HTML to index.html, replacing the file if it already exists.
+  previousRender = previousRender.then(_ => renderModuleFactory(AppServerModuleNgFactory, {
+    document: index,
+    url: route,
+    extraProviders: [
+      provideModuleMap(LAZY_MODULE_MAP)
+    ]
+  })).then(html => writeFileSync(join(fullPath, 'index.html'), html));
+});

production-portal/server.ts

@@ -0,0 +1,58 @@
+import 'zone.js/dist/zone-node';
+import 'reflect-metadata';
+import { renderModuleFactory } from '@angular/platform-server';
+import { enableProdMode } from '@angular/core';
+
+import * as express from 'express';
+import { join } from 'path';
+import { readFileSync } from 'fs';
+
+// Faster server renders w/ Prod mode (dev mode never needed)
+enableProdMode();
+
+// Express server
+const app = express();
+
+const PORT = process.env.PORT || 4000;
+const DIST_FOLDER = join(process.cwd(), 'dist');
+
+// Our index.html we'll use as our template
+const template = readFileSync(join(DIST_FOLDER, 'browser', 'index.html')).toString();
+
+// * NOTE :: leave this as require() since this file is built Dynamically from webpack
+const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./dist/server/main.bundle');
+
+// Express Engine
+import { ngExpressEngine } from '@nguniversal/express-engine';
+// Import module map for lazy loading
+import { provideModuleMap } from '@nguniversal/module-map-ngfactory-loader';
+
+// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
+app.engine('html', ngExpressEngine({
+  bootstrap: AppServerModuleNgFactory,
+  providers: [
+    provideModuleMap(LAZY_MODULE_MAP)
+  ]
+}));
+
+app.set('view engine', 'html');
+app.set('views', join(DIST_FOLDER, 'browser'));
+
+/* - Example Express Rest API endpoints -
+  app.get('/api/**', (req, res) => { });
+*/
+
+// Server static files from /browser
+app.get('*.*', express.static(join(DIST_FOLDER, 'browser'), {
+  maxAge: '1y'
+}));
+
+// ALl regular routes use the Universal engine
+app.get('*', (req, res) => {
+  res.render('index', { req });
+});
+
+// Start up the Node server
+app.listen(PORT, () => {
+  console.log(`Node Express server listening on http://localhost:${PORT}`);
+});

production-portal/src/app/app-routing.module.ts

@@ -0,0 +1,60 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+
+import { EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver';
+import { EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
+
+import { OpenaireErrorPageComponent } from './error/errorPage.component';
+
+const routes: Routes = [
+  { path: '', loadChildren: './home/home.module#HomeModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'home', loadChildren: './home/home.module#HomeModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/publication', loadChildren: './landingPages/publication/libPublication.module#LibPublicationModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/dataset', loadChildren: './landingPages/dataset/libDataset.module#LibDatasetModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/software', loadChildren: './landingPages/software/libSoftware.module#LibSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/project', loadChildren: './landingPages/project/libProject.module#LibProjectModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/dataprovider', loadChildren: '././landingPages/dataProvider/libDataProvider.module#LibDataProviderModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/organization', loadChildren: './landingPages/organization/libOrganization.module#LibOrganizationModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'participate/deposit-datasets', loadChildren: './deposit/datasets/depositDatasets.module#LibDepositDatasetsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'participate/deposit-datasets-result', loadChildren: './deposit/datasets/depositDatasetsResults.module#LibDepositDatasetsResultsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'participate/deposit-subject-result', loadChildren: './deposit/datasets/depositBySubjectResults.module#LibDepositBySubjectResultsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'participate/deposit-publications', loadChildren: './deposit/publications/depositPublications.module#LibDepositPublicationsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'participate/deposit-publications-result', loadChildren: './deposit/publications/depositPublicationsResults.module#LibDepositPublicationsResultsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/find', loadChildren: './searchPages/find/libSearch.module#LibMainSearchModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/find/publications', loadChildren: './searchPages/simple/searchPublications.module#LibSearchPublicationsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/find/datasets', loadChildren: './searchPages/simple/searchDatasets.module#LibSearchDatasetsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/find/software', loadChildren: './searchPages/simple/searchSoftware.module#LibSearchSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/find/projects', loadChildren: './searchPages/simple/searchProjects.module#LibSearchProjectsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/find/dataproviders', loadChildren: './searchPages/simple/searchDataProviders.module#LibSearchDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/find/organizations', loadChildren: './searchPages/simple/searchOrganizations.module#LibSearchOrganizationsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/content-providers', loadChildren: './searchPages/dataProviders/compatibleDataProviders.module#LibCompatibleDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/content-providers-table', loadChildren: './searchPages/dataProviders/compatibleDataProvidersTable.module#LibCompatibleDataProvidersTableModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/entity-registries', loadChildren: './searchPages/dataProviders/entityRegistries.module#LibEntityRegistriesModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/entity-registries-table', loadChildren: './searchPages/dataProviders/entityRegistriesTable.module#LibEntityRegistriesTableModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/journals', loadChildren: './searchPages/dataProviders/journals.module#LibJournalsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/journals-table', loadChildren: './searchPages/dataProviders/journalsTable.module#LibJournalsTableModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/advanced/publications', loadChildren: './searchPages/advanced/advancedSearchPublications.module#LibAdvancedSearchPublicationsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/advanced/datasets', loadChildren: './searchPages/advanced/advancedSearchDatasets.module#LibAdvancedSearchDatasetsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/advanced/software', loadChildren: './searchPages/advanced/advancedSearchSoftware.module#LibAdvancedSearchSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/advanced/organizations', loadChildren: './searchPages/advanced/advancedSearchOrganizations.module#LibAdvancedSearchOrganizationsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/advanced/dataproviders', loadChildren: './searchPages/advanced/advancedSearchDataProviders.module#LibAdvancedSearchDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'search/advanced/projects', loadChildren: './searchPages/advanced/advancedSearchProjects.module#LibAdvancedSearchProjectsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'project-report', loadChildren: './landingPages/htmlProjectReport/libHtmlProjectReport.module#LibHtmlProjectReportModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'myclaims', loadChildren: './claims/myClaims/myClaims.module#LibMyClaimsModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'claims', loadChildren: './claims/claimsAdmin/claimsAdmin.module#LibClaimsAdminModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'participate/claim', loadChildren: './claims/linking/linkingGeneric.module#LibLinkingGenericModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'participate/direct-claim', loadChildren: './claims/directLinking/directLinking.module#LibDirectLinkingModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'claims-project-manager', loadChildren: './claims/claimsByToken/claimsByToken.module#LibClaimsByTokenModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'reload', loadChildren: './reload/libReload.module#LibReloadModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'user-info', loadChildren: './login/libUser.module#LibUserModule', resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: 'error', component: OpenaireErrorPageComponent, resolve: { envSpecific: EnvironmentSpecificResolver  }},
+  { path: '**',pathMatch: 'full',component: OpenaireErrorPageComponent, resolve: { envSpecific: EnvironmentSpecificResolver  }}
+];
+
+@NgModule({
+  imports: [RouterModule.forRoot(routes)],
+  exports: [RouterModule],
+  providers: [EnvironmentSpecificResolver, EnvironmentSpecificService]
+})
+export class AppRoutingModule { }

production-portal/src/app/app.component.ts

@@ -0,0 +1,110 @@
+import { Component, Directive, ElementRef, Renderer, ChangeDetectionStrategy, ViewEncapsulation } from '@angular/core';
+import {Observable}       from 'rxjs/Observable';
+import {ActivatedRoute} from '@angular/router';
+
+import { EnvProperties} from './openaireLibrary/utils/properties/env-properties';
+import{MenuItem, RootMenuItem} from './openaireLibrary/sharedComponents/menu';
+import { EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
+
+import {Session} from './openaireLibrary/login/utils/helper.class';
+
+@Component({
+  //changeDetection: ChangeDetectionStrategy.Default,
+  //encapsulation: ViewEncapsulation.Emulated,
+  selector: 'app-root',
+  styles: [`
+  `],
+  template: `
+
+        <navbar *ngIf= "properties" portal="explore" onlyTop=false [(communityId)]="properties.adminToolsCommunity"  [userMenuItems]=userMenuItems [menuItems]=menuItems
+        [(APIUrl)]="properties.adminToolsAPIURL" [(logInUrl)]="properties.loginUrl" [(logOutUrl)]="properties.logoutUrl"  [(cookieDomain)]="properties.cookieDomain"></navbar>
+                   <div class="custom-main-content"   >
+                      <main>
+                       <router-outlet></router-outlet>
+                     </main>
+                    </div>
+                  <feedback *ngIf= "isClient && properties" portalName="Explore" [feedbackmail]=feedbackmail></feedback>
+          <cookie-law *ngIf= "isClient" position="bottom">
+              OpenAIRE uses cookies in order to function properly.<br>
+              Cookies are small pieces of data that websites store in your browser to allow us to give you the best browsing experience possible.
+              By using the OpenAIRE portal you accept our use of cookies. <a href="//ec.europa.eu/ipg/basics/legal/cookies/index_en.htm" target="_blank"> Read more <span class="uk-icon">
+              <svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="chevron-right" ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg>
+              </span></a>
+          </cookie-law>
+           <bottom *ngIf= "isClient" [menuItems]=bottomMenuItems></bottom>
+
+`
+
+})
+export class AppComponent {
+   isClient:boolean = false;
+   clientLoad = 0;
+
+   userMenuItems:MenuItem[] =  [ new MenuItem("","My profile","","",false,[],[],{}),
+  new MenuItem("","My claims","","/myclaims",false,[],["/myclaims"],{}),
+  new MenuItem("","Manage all claims","","/claims",true,[],["/claims"],{})]
+
+
+  menuItems:RootMenuItem [] = [
+    {rootItem: new MenuItem("search","Search","","/search/find",false,[],["/search/find"],{}),
+      items: [new MenuItem("","Publications","","/search/find/publications",false,["publication"],["/search/find/publications"],{}),
+      new MenuItem("","Research Data","","/search/find/datasets",false,["dataset"],["/search/find/datasets"],{}),
+      new MenuItem("","Software","","/search/find/software",false,["software"],["/search/find/software"],{}),
+      new MenuItem("","Projects","","/search/find/projects/",false,["project"],["/search/find/projects"],{}),
+      new MenuItem("","Content Providers","","/search/find/dataproviders",false,["datasource"],["/search/find/dataproviders"],{}),
+      new MenuItem("","Organizations","","/search/find/organizations/",false,["organization"],["/search/find/organizations"],{})
+    ]},
+    {
+    rootItem: new MenuItem("share","Share","","",false,[],["/participate/deposit-publications","/participate/deposit-datasets"],{}),
+    items: [new MenuItem("","Publications","","/participate/deposit-publications",false,["publication"],["/participate/deposit-publications"],{}),
+    new MenuItem("","Research Data","","/participate/deposit-datasets",false,["dataset"],["/participate/deposit-datasets"],{})]
+    },
+    {
+    rootItem: new MenuItem("link","Link","","/participate/claim",false,[],["/participate/claim"],{}),
+    items: []
+    },
+    {
+    rootItem: new MenuItem("datasources","Content Providers","","",false,["datasource"],[],{}),
+    items: [new MenuItem("","Data Policies","https://beta.openaire.eu/oa-policies-mandates","",false,["datasource"],[""],{}),
+    new MenuItem("","Repositories","","/search/content-providers",false,["datasource"],["/search/content-providers"],{}),
+    new MenuItem("","Journals","","/search/journals",false,["datasource"],["/search/journals"],{}),
+    new MenuItem("","Registries","","/search/entity-registries",false,["datasource"],["/search/entity-registries"],{}),
+    new MenuItem("","Browse all","","/search/find/dataproviders",false,["datasource"],["/search/find/dataproviders"],{})]
+    }
+];
+bottomMenuItems =[
+                new MenuItem("","About","https://beta.openaire.eu/project-factsheets","",false,[],[],{}),
+                new MenuItem("","News - Events","https://beta.openaire.eu/news-events","",false,[],[],{}),
+                new MenuItem("","Blog","https://blogs.openaire.eu/","",false,[],[],{}),
+                new MenuItem("","Contact us","https://beta.openaire.eu/contact-us","",false,[],[],{})
+              ];
+  feedbackmail:string
+   properties:EnvProperties;
+   constructor(  private  route: ActivatedRoute, private propertiesService:EnvironmentSpecificService) {
+   }
+
+   ngOnInit() {
+
+     if (typeof document !== 'undefined') {
+       try{
+         this.isClient = true;
+         if(Session.isPortalAdministrator()){
+           this.userMenuItems.push(new MenuItem("","Administration","https://beta.admin.connect.openaire.eu/dashboard?communityId=openaire","",true,[],[],{}))
+         }
+       }catch (e) {
+       }
+
+     }
+     this.propertiesService.loadEnvironment()
+             .then(es => {
+                 this.propertiesService.setEnvProperties(es);
+                 this.properties = this.propertiesService.envSpecific;
+                 this.feedbackmail = this.properties.feedbackmail;
+                 console.log(this.properties.loginUrl);
+             }, error => {
+               console.log("App couldn't fetch properties");
+                 console.log(error);
+
+             });
+   }
+}

production-portal/src/app/app.module.ts

@@ -0,0 +1,43 @@
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { SharedModule } from './shared/shared.module';
+import { BrowserModule } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { APP_BASE_HREF, CommonModule } from '@angular/common';
+import { HttpModule } from '@angular/http';
+import { RouterModule } from '@angular/router';
+import { AppComponent } from './app.component';
+
+
+import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigationBar.module';
+import { CookieLawModule } from './openaireLibrary/sharedComponents/cookie-law/cookie-law.module';
+
+import {BottomModule} from './openaireLibrary/sharedComponents/bottom.module';
+import {FeedbackModule} from './openaireLibrary/sharedComponents/feedback/feedback.module';
+import { EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver';
+
+import { ErrorModule} from './openaireLibrary/error/error.module';
+
+import { OpenaireErrorPageComponent } from './error/errorPage.component';
+import { AppRoutingModule } from './app-routing.module';
+
+@NgModule({
+
+  imports: [
+    SharedModule,
+    NoopAnimationsModule,
+    CommonModule,
+    HttpModule,
+ErrorModule,
+NavigationBarModule, FeedbackModule, BottomModule,
+    CookieLawModule,
+    BrowserModule.withServerTransition({appId: 'my-app'}),
+    AppRoutingModule
+  ],
+  declarations: [ AppComponent, OpenaireErrorPageComponent],
+  exports: [ AppComponent ],
+ providers:[EnvironmentSpecificResolver ],
+ bootstrap: [AppComponent]
+})
+//
+export class AppModule {}

production-portal/src/app/app.server.module.ts

@@ -0,0 +1,20 @@
+import {NgModule} from '@angular/core';
+import {ServerModule} from '@angular/platform-server';
+import {ModuleMapLoaderModule} from '@nguniversal/module-map-ngfactory-loader';
+
+import {AppModule} from './app.module';
+import {AppComponent} from './app.component';
+
+@NgModule({
+  imports: [
+    // The AppServerModule should import your AppModule followed
+    // by the ServerModule from @angular/platform-server.
+    AppModule,
+    ServerModule,
+    ModuleMapLoaderModule,
+  ],
+  // Since the bootstrapped component is not inherited from your
+  // imported AppModule, it needs to be repeated here.
+  bootstrap: [AppComponent],
+})
+export class AppServerModule {}

production-portal/src/app/claims/claim.module.ts

@@ -0,0 +1,68 @@
+// import { NgModule}            from '@angular/core';
+// import { CommonModule }        from '@angular/common';
+// import { FormsModule }         from '@angular/forms';
+// //
+// import {UtilsModule} from '../utils/utils.module';
+// import {ServicesModule} from '../services/services.module';
+//
+// import { ClaimsService} from '../services/claims.service';
+// //main
+// import {ClaimComponent} from './claim/claim.component';
+// import {ClaimsAdminComponent} from './claims/claimsAdmin.component';
+// import {MyClaimsComponent} from './myClaims/myClaims.component';
+// import {LinkingHomeComponent} from './linking/linkingHome.component';
+// import {LinkingComponent} from './linking/linking.component';
+// import { BulkLinkingComponent } from './linking/bulkLinking.component';
+//
+// import {BulkClaimComponent} from './linking/bulkClaim/bulkClaim.component';
+// import {ClaimsComponent} from './claim-utils/claims.component';
+//
+// import {ClaimContextComponent} from './claim-utils/claimContext.component';
+// import {ClaimProjectsComponent} from './claim-utils/claimProject.component';
+// import {ClaimResultComponent} from './claim-utils/claimResult.component';
+// import {ClaimPublicationComponent} from './claim-utils/claimPublication.component';
+// import {ClaimDatasetComponent} from './claim-utils/claimDataset.component';
+//
+// import {ClaimInsertComponent} from './linking/insertClaim/insertClaim.component';
+//
+// import {ClaimSelectedContextsComponent} from './linking/selected/selectedContexts.component';
+// import {ClaimSelectedComponent} from './linking/selected/selected.component';
+// import {ClaimSelectedDatasetsComponent} from './linking/selected/selectedDatasets.component';
+// import {ClaimSelectedResultsComponent} from './linking/selected/selectedResults.component';
+// import {ClaimSelectedProjectsComponent} from './linking/selected/selectedProjects.component';
+// import {ClaimSelectedPublicationsComponent} from './linking/selected/selectedPublications.component';
+//
+// import {LinkingGenericComponent} from './linking/linkingGeneric.component';
+//
+// import {InlineClaimContextComponent} from './inlineClaims/inlineClaimContext.component';
+// import {InlineClaimProjectComponent} from './inlineClaims/inlineClaimProject.component';
+// import {InlineClaimResultComponent} from './inlineClaims/inlineClaimResult.component';
+// import {ClaimEntityFormatter} from '../utils/claimEntityFormatter.component';
+//
+// import { Claim } from '../utils/entities/claim';
+// //helpers
+//
+// import { ClaimRoutingModule } from './claim-routing.module';
+// @NgModule({
+//   imports: [
+//     CommonModule, FormsModule,
+//     UtilsModule,
+//     ServicesModule,
+//     ClaimRoutingModule
+//
+//   ],
+//   declarations: [
+//     ClaimsAdminComponent, MyClaimsComponent, ClaimComponent, ClaimsComponent,
+//     BulkLinkingComponent, LinkingComponent,  LinkingHomeComponent, LinkingGenericComponent,
+//     InlineClaimContextComponent, InlineClaimProjectComponent, InlineClaimResultComponent, ClaimSelectedComponent,
+//     ClaimContextComponent,  ClaimSelectedContextsComponent, ClaimInsertComponent, ClaimProjectsComponent, ClaimSelectedProjectsComponent,
+//     ClaimResultComponent,  ClaimSelectedPublicationsComponent, ClaimSelectedDatasetsComponent, ClaimSelectedResultsComponent,  ClaimPublicationComponent,
+//     ClaimDatasetComponent, BulkClaimComponent,
+//     ClaimEntityFormatter
+//   ],
+//   providers:    [ ClaimsService ],
+//   exports: [
+//     InlineClaimContextComponent, InlineClaimProjectComponent, InlineClaimResultComponent
+//   ]
+// })
+// export class ClaimModule { }

production-portal/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts

@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { OpenaireClaimsAdminComponent } from './claimsAdmin.component';
+import{  AdminLoginGuard} from '../../openaireLibrary/login/adminLoginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      { path: '', component: OpenaireClaimsAdminComponent, canActivate: [IsRouteEnabled, AdminLoginGuard],
+      data: {redirect: '/error',  community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}])
+  ]
+})
+export class ClaimsAdminRoutingModule { }

production-portal/src/app/claims/claimsAdmin/claimsAdmin.component.ts

@@ -0,0 +1,16 @@
+import {Component, ViewChild, Input} from '@angular/core';
+import {Location} from '@angular/common';
+import {Observable}       from 'rxjs/Observable';
+
+@Component({
+    selector: 'openaire-claims-admin',
+    template: `
+    <claims-admin>
+    </claims-admin>
+
+    `,
+
+})
+export class OpenaireClaimsAdminComponent {
+
+}

production-portal/src/app/claims/claimsAdmin/claimsAdmin.module.ts

@@ -0,0 +1,23 @@
+import { NgModule } from '@angular/core';
+
+import { SharedModule } from '../../shared/shared.module';
+import { OpenaireClaimsAdminComponent } from './claimsAdmin.component';
+import { ClaimsAdminRoutingModule } from './claimsAdmin-routing.module';
+import{ClaimsAdminModule } from '../../openaireLibrary/claims/claimsAdmin/claimsAdmin.module';
+import {AdminLoginGuard} from '../../openaireLibrary/login/adminLoginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+
+@NgModule({
+  imports: [
+    SharedModule,
+    ClaimsAdminRoutingModule,
+    ClaimsAdminModule
+  ],
+    providers:[AdminLoginGuard, PreviousRouteRecorder,IsRouteEnabled],
+  declarations: [
+    OpenaireClaimsAdminComponent
+  ]
+})
+export class LibClaimsAdminModule { }

production-portal/src/app/claims/claimsByToken/claimsByToken-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { OpenaireClaimsByTokenComponent } from './claimsByToken.component';
+import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      { path: '', component: OpenaireClaimsByTokenComponent, canActivate: [IsRouteEnabled, LoginGuard],
+      data: {redirect: '/error',  community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}])
+  ]
+})
+export class ClaimsByTokenRoutingModule { }

production-portal/src/app/claims/claimsByToken/claimsByToken.component.ts

@@ -0,0 +1,11 @@
+import {Component} from '@angular/core';
+
+@Component({
+    selector: 'openaire-claims-project-manager',
+    template: `
+      <claims-project-manager></claims-project-manager>
+    `,
+
+})
+export class OpenaireClaimsByTokenComponent {
+}

production-portal/src/app/claims/claimsByToken/claimsByToken.module.ts

@@ -0,0 +1,30 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { SharedModule } from '../../shared/shared.module';
+import { OpenaireClaimsByTokenComponent } from './claimsByToken.component';
+import {ClaimsByTokenModule} from '../../openaireLibrary/claims/claimsByToken/claimsByToken.module';
+import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+import { ClaimsByTokenRoutingModule } from './claimsByToken-routing.module';
+
+
+
+@NgModule({
+  imports: [
+    RouterModule,
+    SharedModule,
+    ClaimsByTokenModule,
+    ClaimsByTokenRoutingModule
+  ],
+  providers:[
+        LoginGuard, PreviousRouteRecorder, IsRouteEnabled
+  ],
+  declarations: [
+    OpenaireClaimsByTokenComponent
+  ],
+  exports: [
+      OpenaireClaimsByTokenComponent
+    ]
+})
+export class LibClaimsByTokenModule { }

production-portal/src/app/claims/directLinking/directLinking-routing.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { OpenaireDirectLinkingComponent } from './directLinking.component';
+import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      { path: '', component: OpenaireDirectLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard], data: {
+          redirect: '/error',  community : 'openaire'
+        }, canDeactivate: [PreviousRouteRecorder]},
+
+    ])
+  ]
+})
+export class DirectLinkingRoutingModule { }

production-portal/src/app/claims/directLinking/directLinking.component.ts

@@ -0,0 +1,8 @@
+import {Component, Input} from '@angular/core';
+
+@Component({
+    selector: 'openaire-directLinking',
+    template: `<directLinking></directLinking>`
+})
+export class OpenaireDirectLinkingComponent {
+}

production-portal/src/app/claims/directLinking/directLinking.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+
+import { SharedModule } from '../../shared/shared.module';
+import { OpenaireDirectLinkingComponent } from './directLinking.component';
+import{ DirectLinkingModule} from '../../openaireLibrary/claims/directLinking/directLinking.module';
+import {DirectLinkingRoutingModule} from './directLinking-routing.module';
+import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+@NgModule({
+  imports: [
+    SharedModule, DirectLinkingModule, DirectLinkingRoutingModule
+  ],
+  providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled],
+  declarations: [
+    OpenaireDirectLinkingComponent
+  ], exports:[OpenaireDirectLinkingComponent]
+})
+export class LibDirectLinkingModule { }

production-portal/src/app/claims/linking/linking-routing.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { OpenaireLinkingComponent } from './linkingGeneric.component';
+import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      { path: '', component: OpenaireLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard], data: {
+          redirect: '/error',  community : 'openaire'
+        }, canDeactivate: [PreviousRouteRecorder]},
+
+    ])
+  ]
+})
+export class LinkingRoutingModule { }

production-portal/src/app/claims/linking/linkingGeneric.component.ts

@@ -0,0 +1,12 @@
+import {Component, Input} from '@angular/core';
+import {Observable}       from 'rxjs/Observable';
+import {ActivatedRoute, Router} from '@angular/router';
+
+@Component({
+    selector: 'openaire-linking-generic',
+    template: `<linking-generic></linking-generic>`
+
+})
+export class OpenaireLinkingComponent {
+
+}

production-portal/src/app/claims/linking/linkingGeneric.module.ts

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+
+import { SharedModule } from '../../shared/shared.module';
+import {OpenaireLinkingComponent} from './linkingGeneric.component';
+import {LinkingRoutingModule} from './linking-routing.module';
+import{   LinkingGenericModule} from '../../openaireLibrary/claims/linking/linkingGeneric.module';
+import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+@NgModule({
+  imports: [
+    SharedModule, LinkingRoutingModule, LinkingGenericModule
+  ],
+  providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled],
+  declarations: [
+    OpenaireLinkingComponent
+   ], exports:[
+   OpenaireLinkingComponent ]
+})
+export class LibLinkingGenericModule { }

production-portal/src/app/claims/myClaims/myClaims-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import {OpenaireMyClaimsComponent } from './myClaims.component';
+import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      { path: '', component: OpenaireMyClaimsComponent, canActivate: [IsRouteEnabled, LoginGuard],
+      data: {redirect: '/error',  community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}])
+  ]
+})
+export class MyClaimsRoutingModule { }

production-portal/src/app/claims/myClaims/myClaims.component.ts

@@ -0,0 +1,21 @@
+import {Component, Input} from '@angular/core';
+import {Observable}       from 'rxjs/Observable';
+
+
+@Component({
+    selector: 'openaire-my-claims',
+    template: `
+    <my-claims>
+</my-claims>
+`
+
+})
+ export class OpenaireMyClaimsComponent {
+  constructor () {
+
+   }
+   ngOnInit() {
+
+  }
+
+}

production-portal/src/app/claims/myClaims/myClaims.module.ts

@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+
+import { SharedModule } from '../../shared/shared.module';
+import { OpenaireMyClaimsComponent } from './myClaims.component';
+import { MyClaimsRoutingModule } from './myClaims-routing.module';
+import{  MyClaimsModule} from '../../openaireLibrary/claims/myClaims/myClaims.module';
+import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+
+@NgModule({
+  imports: [
+    SharedModule,
+    MyClaimsRoutingModule,
+    MyClaimsModule
+
+  ],
+  providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled],
+  declarations: [
+    OpenaireMyClaimsComponent
+  ]
+})
+export class LibMyClaimsModule { }

production-portal/src/app/claims/myClaimsDemo.component.ts

@@ -0,0 +1,51 @@
+// import {Component, Input} from '@angular/core';
+// import {Observable}       from 'rxjs/Observable';
+// import { Router } from '@angular/router';
+//
+//
+//
+// @Component({
+//     selector: 'my-claims-demo',
+//     template: `
+//     <div *ngIf="user" class="container">
+//       <div class="page-header">
+//           <h1> My Claims Demo</h1>
+//       </div>
+//       <div>
+//         <div class=""><a  routerLink="/Linking">Linking</a></div>
+//         <div class=""><a  routerLink]="/MyClaims">MyClaims</a></div>
+//         <div class=""><a  routerLink="/Claims">Claims Admin</a></div>
+//         <p> Extra parameters for claims admin</p>
+//         <div class=""><a  href="claims?fetchBy=User&fetchId=amelie.baecker@uni-bielefeld.de">Claims By user</a></div>
+//         <div class=""><a  href="claims?fetchBy=Project&fetchId=corda_______::2c37878a0cede85dbbd1081bb9b4a2f8">Claims By project</a></div>
+//         <div class=""><a  href="claims?fetchBy=Context&fetchId=egi::country::gr">Claims By context</a></div>
+//
+// <!--        <p>Orcid
+//           <p>N.M.
+//           0000-0002-3477-3082
+//           </p>
+//         </p> -->
+//          <div class=""><a href="publication?articleId=od_______908::3a5b2885656a91307156325644e73b92"  >Publication od_______908::3a5b2885656a91307156325644e73b92</a></div>
+//          <!--<div class=""><a href="publication?articleId=od_______908::3a5b2885656a91307156325644e73b92"  >Publication od_______908::3a5b2885656a91307156325644e73b92</a></div>
+//          <div class=""><a href="publication?articleId=od_______908::3a5b2885656a91307156325644e73b92"  >Publication od_______908::3a5b2885656a91307156325644e73b92</a></div>-->
+//        </div>
+//     </div>
+//
+//
+//
+// `
+// //(click)="changeOrderby('target')"
+// //od_______908::3a5b2885656a91307156325644e73b92
+//
+// })
+//  export class MyClaimsDemoComponent {
+//   constructor ( private _router: Router  ) {
+//    }
+//   user:string="argirok@di.uoa.gr";
+//    ngOnInit() {
+//
+//   }
+//   goToPub(id: number){
+//     this._router.navigate( ['Publication', { articleId: id}] );
+//   }
+// }

production-portal/src/app/deposit/datasets/depositBySubject.component.ts

@@ -0,0 +1,17 @@
+// import {Component, Input} from '@angular/core';
+// import {Observable}       from 'rxjs/Observable';
+// import { Router } from '@angular/router';
+//
+//
+//
+// @Component({
+//     selector: 'openaire-deposit-by-subject',
+//     template: `
+//         <deposit-by-subject>
+//                        </deposit-by-subject>
+//     `
+// })
+//
+// export class OpenaireDepositBySubjectComponent {
+//
+// }

production-portal/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { OpenaireDepositBySubjectResultComponent } from './depositBySubjectResult.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+     	{ path: '', component: OpenaireDepositBySubjectResultComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+          redirect: '/error',  community : 'openaire'
+        },canDeactivate: [PreviousRouteRecorder]   }
+
+    ])
+  ]
+})
+export class DepositBySubjectResultsRoutingModule { }

production-portal/src/app/deposit/datasets/depositBySubjectResult.component.ts

@@ -0,0 +1,12 @@
+import {Component, Input} from '@angular/core';
+import {Observable}       from 'rxjs/Observable';
+ 
+
+@Component({
+    selector: 'openaire-deposit-by-subject-result',
+    template:`<deposit-by-subject-result></deposit-by-subject-result>`
+})
+
+export class OpenaireDepositBySubjectResultComponent {
+
+}

production-portal/src/app/deposit/datasets/depositBySubjectResults.module.ts

@@ -0,0 +1,29 @@
+import { NgModule }            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+
+import { OpenaireDepositBySubjectResultComponent } from './depositBySubjectResult.component';
+
+import {DepositBySubjectResultsRoutingModule} from './depositBySubjectResult-routing.module';
+import {DepositBySubjectResultsModule  } from '../../openaireLibrary/deposit/datasets/depositBySubjectResults.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+
+@NgModule({
+  imports: [
+    CommonModule, FormsModule,
+    DepositBySubjectResultsModule,
+    DepositBySubjectResultsRoutingModule
+  ],
+  declarations: [
+
+    OpenaireDepositBySubjectResultComponent
+
+  ],
+  exports: [
+    OpenaireDepositBySubjectResultComponent
+   ],
+  providers:    [FreeGuard,PreviousRouteRecorder, IsRouteEnabled]
+})
+export class LibDepositBySubjectResultsModule { }

production-portal/src/app/deposit/datasets/depositDatasets-routing.module.ts

@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { OpenaireDepositDatasetsComponent } from './depositDatasets.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+     	{ path: '', component: OpenaireDepositDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+          redirect: '/error',  community : 'openaire'
+        },canDeactivate: [PreviousRouteRecorder]  }
+
+    ])
+  ]
+})
+export class DepositDatasetsRoutingModule { }

production-portal/src/app/deposit/datasets/depositDatasets.component.ts

@@ -0,0 +1,14 @@
+import {Component} from '@angular/core';
+
+@Component({
+    selector: 'openaire-deposit-datasets',
+    template: `
+    <deposit-datasets>
+
+</deposit-datasets>
+    `
+})
+
+export class OpenaireDepositDatasetsComponent {
+
+}

production-portal/src/app/deposit/datasets/depositDatasets.module.ts

@@ -0,0 +1,27 @@
+import { NgModule }            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+
+import { OpenaireDepositDatasetsComponent } from './depositDatasets.component';
+ import {DepositDatasetsRoutingModule} from './depositDatasets-routing.module';
+import {DepositDatasetsModule} from '../../openaireLibrary/deposit/datasets/depositDatasets.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+@NgModule({
+  imports: [
+    CommonModule, FormsModule,
+    DepositDatasetsModule,
+    DepositDatasetsRoutingModule
+  ],
+  declarations: [
+
+    OpenaireDepositDatasetsComponent
+
+  ],
+  exports: [
+    OpenaireDepositDatasetsComponent
+   ],
+  providers:    [FreeGuard,PreviousRouteRecorder, IsRouteEnabled]
+})
+export class LibDepositDatasetsModule { }

production-portal/src/app/deposit/datasets/depositDatasetsResult.component.ts

@@ -0,0 +1,14 @@
+import {Component} from '@angular/core';
+
+@Component({
+    selector: 'openaire-deposit-datasets-result',
+    template: `
+        <deposit-datasets-result></deposit-datasets-result>
+
+
+    `
+})
+
+export class OpenaireDepositDatasetsResultComponent {
+
+}

production-portal/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts

@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { OpenaireDepositDatasetsResultComponent } from './depositDatasetsResult.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+     	{ path: '', component: OpenaireDepositDatasetsResultComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+          redirect: '/error',  community : 'openaire'
+        },canDeactivate: [PreviousRouteRecorder]  }
+
+    ])
+  ]
+})
+export class DepositDatasetsResultsRoutingModule { }

production-portal/src/app/deposit/datasets/depositDatasetsResults.module.ts

@@ -0,0 +1,29 @@
+import { NgModule }            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+
+import { OpenaireDepositDatasetsResultComponent } from './depositDatasetsResult.component';
+
+import {DepositDatasetsResultsRoutingModule} from './depositDatasetsResults-routing.module';
+import {DepositDatasetsResultsModule} from '../../openaireLibrary/deposit/datasets/depositDatasetsResults.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+
+@NgModule({
+  imports: [
+    CommonModule, FormsModule,
+    DepositDatasetsResultsModule,
+    DepositDatasetsResultsRoutingModule
+  ],
+  declarations: [
+
+    OpenaireDepositDatasetsResultComponent,
+
+  ],
+  exports: [
+    OpenaireDepositDatasetsResultComponent,
+   ],
+  providers:    [FreeGuard,PreviousRouteRecorder, IsRouteEnabled]
+})
+export class LibDepositDatasetsResultsModule { }

production-portal/src/app/deposit/publications/depositPublications-routing.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { OpenaireDepositPublicationsComponent } from './depositPublications.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      { path: '', component: OpenaireDepositPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+          redirect: '/error',  community : 'openaire'
+        }, canDeactivate: [PreviousRouteRecorder]   }
+
+    ])
+  ]
+})
+export class DepositPublicationsRoutingModule { }

production-portal/src/app/deposit/publications/depositPublications.component.ts

@@ -0,0 +1,11 @@
+import {Component} from '@angular/core';
+
+@Component({
+    selector: 'openaire-deposit-publications',
+    template: `
+    <deposit-publications></deposit-publications>
+    `
+})
+
+export class OpenaireDepositPublicationsComponent {
+ }

production-portal/src/app/deposit/publications/depositPublications.module.ts

@@ -0,0 +1,26 @@
+import { NgModule }            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+
+import { OpenaireDepositPublicationsComponent } from './depositPublications.component';
+
+import {DepositPublicationsRoutingModule} from './depositPublications-routing.module';
+import {DepositPublicationsModule} from '../../openaireLibrary/deposit/publications/depositPublications.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+@NgModule({
+  imports: [
+    CommonModule, FormsModule,
+    DepositPublicationsModule,
+    DepositPublicationsRoutingModule
+  ],
+  declarations: [
+    OpenaireDepositPublicationsComponent
+  ],
+  exports: [
+    OpenaireDepositPublicationsComponent,
+   ],
+  providers:    [FreeGuard,PreviousRouteRecorder, IsRouteEnabled]
+})
+export class LibDepositPublicationsModule { }

production-portal/src/app/deposit/publications/depositPublicationsResult-routing.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { OpenaireDepositPublicationsResultComponent } from './depositPublicationsResult.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      { path: '', component: OpenaireDepositPublicationsResultComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+          redirect: '/error',  community : 'openaire'
+        }, canDeactivate: [PreviousRouteRecorder] }
+
+    ])
+  ]
+})
+export class DepositPublicationsResultRoutingModule { }

production-portal/src/app/deposit/publications/depositPublicationsResult.component.ts

@@ -0,0 +1,12 @@
+import {Component} from '@angular/core';
+
+@Component({
+    selector: 'openaire-deposit-publications-result',
+    template: `
+        <deposit-publications-result></deposit-publications-result>
+    `
+})
+
+export class OpenaireDepositPublicationsResultComponent {
+
+}

production-portal/src/app/deposit/publications/depositPublicationsResults.module.ts

@@ -0,0 +1,26 @@
+import { NgModule }            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+
+import { OpenaireDepositPublicationsResultComponent } from './depositPublicationsResult.component';
+
+import {DepositPublicationsResultRoutingModule} from './depositPublicationsResult-routing.module';
+import {DepositPublicationsResultsModule} from '../../openaireLibrary/deposit/publications/depositPublicationsResults.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+@NgModule({
+  imports: [
+    CommonModule, FormsModule,
+    DepositPublicationsResultsModule,
+    DepositPublicationsResultRoutingModule
+  ],
+  declarations: [
+    OpenaireDepositPublicationsResultComponent
+  ],
+  exports: [
+    OpenaireDepositPublicationsResultComponent
+   ],
+  providers:    [FreeGuard,PreviousRouteRecorder, IsRouteEnabled]
+})
+export class LibDepositPublicationsResultsModule { }

production-portal/src/app/error/errorPage.component.ts

@@ -0,0 +1,13 @@
+import { Component, Input } from '@angular/core';
+import { Location } from '@angular/common';
+  
+@Component({
+    selector: 'openaire-error',
+    template: `
+    <error></error>
+    `
+})
+
+export class OpenaireErrorPageComponent {
+
+}

production-portal/src/app/home/home-routing.module.ts

@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import{HomeComponent} from './home.component';
+import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+     	{ path: '', component: HomeComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] }
+
+    ])
+  ]
+})
+export class HomeRoutingModule { }

production-portal/src/app/home/home.component.html

@@ -0,0 +1,477 @@
+
+
+<div class="image-front-topbar  uk-section-default uk-position-relative" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light">
+  <div uk-height-viewport="offset-top: true;offset-bottom: 20" style="box-sizing: border-box; min-height: calc(-77.8333px + 100vh);" class="mainPageSearchForm uk-background-norepeat uk-background-cover uk-background-bottom-center uk-section uk-padding-remove-bottom uk-flex uk-flex-middle uk-background-fixed">
+<!--div class="mainPageSearchForm uk-background-norepeat uk-background-cover uk-background-bottom-center uk-section uk-padding-remove-bottom uk-flex uk-flex-middle" uk-height-viewport="offset-top: true;offset-bottom: 20"-->
+<div class="uk-position-cover" style="background-color: rgba(255, 255, 255, 0.37);"></div>
+ <div class="uk-width-1-1">
+    <div class="uk-position-relative">
+       <div class="uk-container uk-margin-medium">
+          <div class="tm-header-placeholder uk-margin-medium" style="height: 84px;"></div>
+          <div class="search_box_bg uk-grid-large uk-flex-middle uk-grid uk-grid-stack" uk-grid="">
+             <div class="uk-width-1-1@m uk-first-column">
+                <div data-id="page#4">
+                <search-form   placeholderText="Search in OA scholarly works..." link=true></search-form>
+                </div>
+             </div>
+          </div>
+       </div>
+       <div class="uk-container uk-container-large uk-margin-medium explore-numbers">
+          <div class="search_box_bg uk-grid uk-grid-stack" uk-grid="">
+             <div class="uk-width-1-1@m uk-first-column">
+               <h1 id="page#7" class="firstPageNumbers uk-margin uk-margin-remove-bottom uk-width-xxlarge uk-margin-auto uk-text-center uk-h2 uk-text-primary uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="font-weight: 600 !important;">
+                 <span *ngIf="showPublications && publicationsSize" >{{publicationsSize.number}} {{publicationsSize.size}} publications{{((showDatasets && datasetsSize)?",":"")}} </span>
+                  <span *ngIf="showDatasets && datasetsSize">{{datasetsSize.number}} {{datasetsSize.size}} research data  </span>
+                  <span *ngIf="showDataProviders && datasourcesSize" > from {{datasourcesSize.number}} {{datasourcesSize.size}} content providers</span>
+                  <span  *ngIf="showProjects && fundersSize"> {{((showDataProviders && datasourcesSize)?" and ":" from ")}} {{fundersSize.number}} {{fundersSize.size}} funders</span>
+               </h1>
+               <h2 *ngIf = "showPublications || showDatasets || showProjects || showDataProviders" id="page#8" class="uk-margin-medium uk-width-xlarge uk-margin-auto uk-text-center uk-h2 uk-text-primary uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" >
+               ... linked together for an integrated research search
+              </h2>
+
+
+             </div>
+          </div>
+       </div>
+    </div>
+ </div>
+</div>
+</div>
+
+<div class="uk-section-muted uk-section uk-section-small uk-flex uk-flex-middle" style="background-color: rgb(34, 32, 127); box-sizing: border-box; min-height: 100vh;" uk-height-viewport="offset-top: true" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-slide-top-medium&quot;,&quot;delay&quot;:false}">
+   <div class="uk-width-1-1">
+      <div class="uk-container">
+         <div class="uk-margin-small uk-grid uk-grid-stack" uk-grid="">
+            <div class="uk-width-1-1@m uk-first-column">
+               <h6 id="page#12" class="uk-margin uk-text-center uk-h4 uk-text-muted uk-scrollspy-inview uk-animation-slide-top-medium" uk-scrollspy-class="" style="">
+                 Learn more on OpenAIRE discovery and sharing services
+               </h6>
+            </div>
+         </div>
+         <div class="uk-container uk-container-large uk-margin-large">
+            <div uk-grid="" class="uk-grid uk-grid-stack">
+               <div class="uk-width-1-1@m uk-first-column">
+                  <div class="uk-margin uk-grid-match uk-child-width-1-1 uk-child-width-1-1@s uk-child-width-1-3@m uk-child-width-1-3@l uk-child-width-1-3@xl uk-grid-parallax uk-grid uk-scrollspy-inview uk-animation-slide-top-medium" uk-scrollspy-class="" uk-grid-parallax="translate: " uk-lightbox="toggle: a[data-type]" style="margin-bottom: 0px;">
+                    <!-- Explore -->
+                    <div  class="uk-margin-bottom">
+                      <div class="uk-card uk-card-default">
+                        <a routerLinkActive="uk-link" routerLink="/search/find"  class="el-link  box-links">
+                          <div class="uk-card-header">
+
+                            <div class="uk-grid-small uk-flex-middle" uk-grid>
+                                <div class="uk-width-auto">
+                                    <img class="uk-border-circle" width="40" height="40" src="assets/explore.svg"   alt="Explore">
+                                </div>
+                                <div class="uk-width-expand">
+                                    <h3 class="uk-card-title uk-margin-remove-bottom" style="color: #f25f30 !important">Explore</h3>
+                                    <p class="uk-text-meta uk-margin-remove-top">Discover linked open research</p>
+                                </div>
+                            </div>
+                          </div>
+                        </a>
+                        <div class="uk-card-body">
+                            <p>Search for
+                               publications-data-software and other research artefacts. See how these
+                               are linked together and how they are linked to funding and
+                               organizations.</p>
+                               <p>View statistics on projects and institutions.</p>
+                        </div>
+                      </div>
+                    </div>
+                     <!--div class="uk-first-column">
+                        <div uk-scrollspy-class="" class="el-item uk-card uk-card-default uk-card-hover uk-scrollspy-inview uk-animation-slide-top-medium" style="">
+                           <a routerLinkActive="uk-link" routerLink="/search/find"  class="el-link uk-position-cover uk-position-z-index uk-margin-remove-adjacent" data-caption="&lt;h4 class='uk-margin-remove'&gt;Explore &lt;/h4&gt;&lt;div&gt;Search for publications-data-software and other research artefacts. See how these are linked together and how they are linked to funding and organizations.&lt;/div&gt;
+                              &lt;p&gt;View statistics on projects and institutions.&lt;/p&gt;"></a>
+                           <div class="uk-card-media-top">
+                             <img src="assets/explore.svg"   alt="Explore"></div>
+                           <div class="uk-card-body">
+                              <h3 class="el-title uk-margin uk-h2 uk-margin-remove-adjacent uk-margin-remove-bottom" style="color: #f25f30">
+                                 Explore
+                              </h3>
+                              <div class="el-meta uk-margin uk-text-meta">Discover linked open research</div>
+                              <div class="el-content uk-margin">
+                                 <div>Search for
+                                    publications-data-software and other research artefacts. See how these
+                                    are linked together and how they are linked to funding and
+                                    organizations.
+                                 </div>
+                                 <p>View statistics on projects and institutions.</p>
+                              </div>
+                           </div>
+                        </div>
+                     </div-->
+
+                     <!-- Share -->
+                     <div  class="uk-margin-bottom">
+                       <div class="uk-card uk-card-default">
+                         <a routerLinkActive="uk-link" routerLink="/participate/deposit-publications"  class="el-link  box-links">
+                           <div class="uk-card-header">
+
+                             <div class="uk-grid-small uk-flex-middle" uk-grid>
+                                 <div class="uk-width-auto">
+                                     <img class="uk-border-circle" width="40" height="40" src="assets/share.svg"   alt="Share">
+                                 </div>
+                                 <div class="uk-width-expand">
+                                     <h3 class="uk-card-title uk-margin-remove-bottom" style="color: #22207F !important">Share</h3>
+                                     <p class="uk-text-meta uk-margin-remove-top">Deposit in a repository of your choice</p>
+                                 </div>
+                             </div>
+                           </div>
+                         </a>
+                         <div class="uk-card-body">
+                             <p>Select an OpenAIRE compatible repository (2.0 +) so that your research is linked to your funding information.</p>
+                                <p>Use <a href="http://www.zenodo.org/" target="_blank" rel="noopener">ZENODO</a>, a catch-all repository hosted by CERN to deposit all your research results (publications, data, software, etc.)</p>
+                         </div>
+                       </div>
+                    </div>
+                     <!--div>
+                        <div uk-scrollspy-class="" class="el-item uk-card uk-card-default uk-card-hover uk-scrollspy-inview uk-animation-slide-top-medium" style="">
+                           <a routerLinkActive="uk-link" routerLink="/participate/deposit-publications"  class="el-link uk-position-cover uk-position-z-index uk-margin-remove-adjacent" data-caption="&lt;h4 class='uk-margin-remove'&gt;Share&lt;/h4&gt;&lt;div class=&quot;uk-margin-bottom&quot;&gt;Select an OpenAIRE compatible repository (2.0 +) so that your research is linked to your funding information.&lt;/div&gt;
+                              &lt;div&gt;Use &lt;a href=&quot;http://www.zenodo.org&quot; target=&quot;_blank&quot; rel=&quot;noopener&quot;&gt;ZENODO&lt;/a&gt;, a catch-all repository hosted by CERN to deposit all your research results (publications, data, software, etc.)&lt;/div&gt;"></a>
+                           <div class="uk-card-media-top">
+                             <img src="assets/share.svg"  alt="Share"  ></div>
+                           <div class="uk-card-body">
+                              <h3 class="el-title uk-margin uk-h2 uk-margin-remove-adjacent uk-margin-remove-bottom" style="color:#22207F">
+                                 Share
+                              </h3>
+                              <div class="el-meta uk-margin uk-text-meta">Deposit in a repository of your choice</div>
+                              <div class="el-content uk-margin">
+                                 <div class="uk-margin-bottom">Select an OpenAIRE compatible repository (2.0 +) so that your research is linked to your funding information.</div>
+                                 <div>Use <a href="http://www.zenodo.org/" target="_blank" rel="noopener">ZENODO</a>, a catch-all repository hosted by CERN to deposit all your research results (publications, data, software, etc.)</div>
+                              </div>
+                           </div>
+                        </div>
+                     </div-->
+                     <!-- Link -->
+                     <div  class="uk-margin-bottom">
+                       <div class="uk-card uk-card-default">
+                         <a routerLinkActive="uk-link" routerLink="/participate/claim"  class="el-link  box-links">
+                           <div class="uk-card-header">
+
+                             <div class="uk-grid-small uk-flex-middle" uk-grid>
+                                 <div class="uk-width-auto">
+                                     <img class="uk-border-circle" width="40" height="40" src="assets/link.svg"   alt="Link">
+                                 </div>
+                                 <div class="uk-width-expand">
+                                     <h3 class="uk-card-title uk-margin-remove-bottom" style="color: #4687E6 !important">Link</h3>
+                                     <p class="uk-text-meta uk-margin-remove-top">Connect all your research</p>
+                                 </div>
+                             </div>
+                           </div>
+                         </a>
+                         <div class="uk-card-body">
+                             <p>If you can't find your research results in OpenAIRE, don't worry!</p>
+                                <p>Use our <strong>LINK OUT service</strong>, that reaches out to many external sources via APIs, to connect your research results and <em>claim</em> them to your project.</p>
+                         </div>
+                       </div>
+                    </div>
+                     <!--div>
+                        <div uk-scrollspy-class="" class="el-item uk-card uk-card-default uk-card-hover uk-scrollspy-inview uk-animation-slide-top-medium" style="">
+                           <a  routerLinkActive="uk-link" routerLink="/participate/claim"  class="el-link uk-position-cover uk-position-z-index uk-margin-remove-adjacent" data-caption="&lt;h4 class='uk-margin-remove'&gt;Link&lt;/h4&gt;&lt;div class=&quot;uk-margin-bottom&quot;&gt;If you don't find your research results in OpenAIRE, don't worry!&lt;/div&gt;
+                              &lt;div&gt;Use our &lt;strong&gt;LINK OUT service&lt;/strong&gt;, that reaches out to many external sources via APIs, to connect your research results and &lt;em&gt;claim&lt;/em&gt; them to your project.&lt;/div&gt;"></a>
+                           <div class="uk-card-media-top">
+                             <img src="assets/link.svg"   alt="Link" ></div>
+                           <div class="uk-card-body">
+                              <h3 class="el-title uk-margin uk-h2 uk-margin-remove-adjacent uk-margin-remove-bottom" style="color:#4687E6">
+                                 Link
+                              </h3>
+                              <div class="el-meta uk-margin uk-text-meta">Connect all your research</div>
+                              <div class="el-content uk-margin">
+                                 <div class="uk-margin-bottom">If you don't find your research results in OpenAIRE, don't worry!</div>
+                                 <div>Use our <strong>LINK OUT service</strong>, that reaches out to many external sources via APIs, to connect your research results and <em>claim</em> them to your project.</div>
+                              </div>
+                           </div>
+                        </div>
+                     </div-->
+                  </div>
+               </div>
+            </div>
+         </div>
+      </div>
+   </div>
+</div>
+
+<div class="uk-section-default uk-section">
+   <div class="uk-container">
+      <div class="uk-grid-small uk-margin-medium uk-grid" uk-grid="">
+         <div class="uk-width-expand@m uk-first-column">
+            <h3 class="uk-margin-small uk-h3 uk-heading-line uk-text-primary">
+               <span>New content providers</span>
+            </h3>
+            <div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid="">
+              <!-- <errorMessages [status]="[fetchDataproviders.searchUtils.status]" [type]="'content providers'"></errorMessages>
+
+              <div *ngIf="fetchDataproviders.searchUtils.totalResults > 0">
+                  <ul [class]="'uk-list uk-list-divider  uk-margin '+custom_class">
+                     <li *ngFor="let result of fetchDataproviders.results" class="uk-animation-fade">
+                         <h4  [title] = result.title.accessMode >
+                             <a [queryParams]="routerHelper.createQueryParam(urlParam,result.id)" routerLinkActive="router-link-active" routerLink="/search/{{type}}">
+                               <p *ngIf="result['title'].name || result.acronym"><span *ngIf="result.acronym">{{result.acronym}}</span><span *ngIf="result.acronym && result['title'].name">-</span><span *ngIf="result['title'].name" [innerHTML]="result['title'].name"></span><span *ngIf="result.code">({{result.code}})</span></p>
+                               <p *ngIf="!result['title'].name && !result.acronym">[no title available]<span *ngIf="result.code">({{result.code}})</span></p>
+                             </a>
+                         </h4>
+                         <span *ngIf="result.types && result.types.length > 0" [class]="'uk-label custom-label label-blue label-'+result.entityType" title="Type">{{result.types.join(", ")}}</span>
+                         <span *ngIf="result.languages && result.languages.length > 0" class="uk-label custom-label  label-language " title="Language">{{result.languages.join(", ")}}</span>
+                         <span *ngIf="result.title && result.title.accessMode" [class]="'uk-label custom-label  label-'+ result.title.accessMode " title="Access Mode">{{result.title.accessMode}}</span>
+
+                         <span *ngIf="result['funderShortname']" class="uk-label custom-label label-funder " title="Funder">{{result['funderShortname']}}></span>
+                         <span *ngIf="result.openAccessMandate != undefined && result.openAccessMandate " class="uk-label custom-label label-openaccessmandate " title="Open Access mandate">Open Access mandate</span>
+
+                         <span *ngIf="result['type'] != undefined && result['type'] != ''" class="uk-label custom-label label-blue label-dataprovider" title="Type"> {{result['type']}}</span>
+                         <span *ngIf="result['compatibility'] != undefined && result['compatibility'] != ''" class="uk-label custom-label  label-compatibility" title="Compatibility">{{result.compatibility}}</span>
+
+                         <div *ngIf="showOrganizations && result['organizations'] != undefined && result['organizations'].length > 0">
+                             <span> Organization: </span>
+                             <span *ngFor="let organization of result['organizations'].slice(0,10) let i=index">
+                                 <a *ngIf="organization.id" [queryParams]="{organizationId: organization.id}" routerLinkActive="router-link-active" routerLink="/search/organization">
+                                         {{organization.name}}</a><span
+
+                                     *ngIf="!organization.id">
+                                         {{organization.name}}</span><span
+
+                                     *ngIf="(i < result['organizations'].length-1) && (i < 9)">,</span>
+                             </span>
+                             <span *ngIf="result['organizations'].length > 10">...</span>
+                         </div>
+
+                         <div *ngIf="result['countries'] && result['countries'].length > 0">
+                             Country: <span *ngFor="let country of  result['countries'].slice(0,10) let i = index">{{country}}{{(i < ( result['countries'].slice(0,10).length-1))?", ":""}}{{(i ==  result['countries'].slice(0,10).length-1 &&  result['countries'].length > 10)?"...":""}}</span>
+                         </div>
+                         <div *ngIf="result['websiteURL'] != undefined && result['websiteURL'] != ''">
+                             <span>Website URL: </span>
+                             <span>
+                                 <a href="{{result['websiteURL']}}" target="_blank" class="custom-external custom-icon">
+                                     {{result['websiteURL']}}
+                                 </a>
+                             </span>
+                         </div>
+                         <div *ngIf="result['OAIPMHURL'] != undefined && result['OAIPMHURL'] != ''">
+                             <span>OAI-PMH URL: </span>
+                             <span>
+                                 <a href="{{result['OAIPMHURL']}}" target="_blank" class="custom-external custom-icon">
+                                     {{result['OAIPMHURL']}}
+                                 </a>
+                             </span>
+                         </div>
+
+
+                     </li>
+                 </ul>
+
+              </div> -->
+               <div class="uk-first-column">
+                  <div class="el-item uk-panel">
+                     <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
+                        Aaltodoc Publication Archive
+                     </h6>
+                     <div class="el-meta uk-margin uk-text-meta">Aalto University</div>
+                     <div class="el-content uk-margin"><span class="uk-label">IR</span>&nbsp;<span class=" uk-label uk-label-danger">Data</span>&nbsp;<span class="uk-label uk-label-success">OpenAIRE 3.0</span><br>
+                        12469 datasets
+                     </div>
+                  </div>
+               </div>
+               <div class="uk-grid-margin uk-first-column">
+                  <div class="el-item uk-panel">
+                     <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
+                        Cambridge Server
+                     </h6>
+                     <div class="el-meta uk-margin uk-text-meta">Cambridge Uviversity</div>
+                     <div class="el-content uk-margin"><span class="uk-label">IR</span>&nbsp;<span class=" uk-label uk-label-warning">Literature</span>&nbsp;<span class="uk-label uk-label-success" style="background-color:orange!important">OpenAIRE 2.0</span><br>
+                        4567 publications
+                     </div>
+                  </div>
+               </div>
+            </div>
+            <hr>
+            <div class="uk-margin">
+               <a class="el-content uk-button uk-button-text"   routerLinkActive="uk-link" routerLink="/search/find/dataproviders" >
+               View all
+               </a>
+            </div>
+         </div>
+         <div class="uk-width-expand@m">
+            <h2 class="uk-h3 uk-heading-line uk-text-primary">
+               <span>New funders</span>
+            </h2>
+            <div class="uk-margin uk-text-meta">
+               Latest funding database incorporated in OpenAIRE
+            </div>
+            <div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid="">
+               <div class="uk-first-column">
+                  <div class="el-item uk-panel">
+                     <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
+                        Swiss National Science Foundation
+                     </h6>
+                     <div class="el-meta uk-margin uk-text-meta">Switzerland</div>
+                     <div class="el-content uk-margin"><span class="uk-label">OA mandate</span><br> 47.509 publications</div>
+                  </div>
+               </div>
+               <div class="uk-grid-margin uk-first-column">
+                  <div class="el-item uk-panel">
+                     <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
+                        Ministry of Education, Science and Technological Development of Republic of Serbia
+                     </h6>
+                     <div class="el-meta uk-margin uk-text-meta">Serbia</div>
+                     <div class="el-content uk-margin">7.942 publicatios</div>
+                  </div>
+               </div>
+            </div>
+         </div>
+         <div class="uk-width-expand@m uk-grid-item-match">
+
+
+            <div class="uk-tile-secondary uk-tile uk-tile-xsmall" style="background-color: #3870DF !important;">
+             <h4 class="uk-margin-remove-top uk-h4">
+                Our data policies
+             </h4>
+             <ul class="uk-margin-small uk-list uk-list-large">
+                <li class="el-item">
+                   <h3 class="el-title uk-h3 uk-margin-remove">Data acquisition</h3>
+                   <div class="el-content">
+                      <a href="/www.cnn.com">How we retrieve data, how often, what processes it goes through (aggregating cleaning, trasnforming, inferring, de-duplicating), what are the quality checks&nbsp;along all&nbsp; data processing stages.</a>
+                   </div>
+                </li>
+                <li class="el-item">
+                   <h3 class="el-title uk-h3 uk-margin-remove">Data usage</h3>
+                   <div class="el-content">
+                      <a href="/www.cnn.com">Who is able to retrieve our data, what are the licences, what about specific SLAs.</a>
+                   </div>
+                </li>
+             </ul>
+             <div class="uk-margin uk-margin-remove-bottom uk-text-left">
+                <a class="el-content uk-link-text" href="/www.cnn.com" target="_blank">
+                Learn more
+                </a>
+             </div>
+            </div>
+
+
+         </div>
+      </div>
+   </div>
+</div>
+<div class="uk-section-default" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}">
+  <div class="mainPageBottomInfo uk-background-norepeat uk-background-cover uk-background-center-center uk-section uk-section-small ">
+    <div class="uk-container">
+         <div class="uk-grid-divider uk-margin-remove-vertical uk-grid" uk-grid="">
+            <div class="uk-width-expand@m uk-width-1-2@s uk-dark uk-first-column">
+               <h4 class="uk-margin-medium uk-text-center uk-h4 uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
+                  A content provider?
+               </h4>
+               <div class=" uk-text-primary custom-uk-text-light uk-margin-medium uk-width-xlarge uk-margin-auto uk-text-center uk-text-lead uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
+                  Join OpenAIRE, use our tools and make your content more visible around the world.
+               </div>
+               <div id="page#37" class=" uk-margin-medium uk-text-center uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
+                  <a class="providelink el-content  uk-button uk-button-default uk-button-small" href="https://beta.provide.openaire.eu" target="_blank" style="">
+                  OpenAIRE.PROVIDE
+                  </a>
+               </div>
+            </div>
+            <div class="uk-width-expand@m uk-width-1-2@s uk-dark">
+               <h4 class="uk-margin-medium uk-text-center uk-h4 uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
+                  A research manager?
+               </h4>
+               <div class="uk-text-primary custom-uk-text-light uk-margin-medium uk-width-xlarge uk-margin-auto uk-text-center uk-text-lead uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
+                  Use our monitoring services and easily track all relevant research results.
+               </div>
+               <div id="page#41" class=" uk-margin-medium uk-text-center uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
+                  <a class="monitorlink el-content uk-button uk-button-default uk-button-small" href="https://monitor.openaire.eu" target="_blank">
+                  OpenAIRE.MONITOR
+                  </a>
+               </div>
+            </div>
+            <div class="uk-width-expand@m uk-width-1-2@s uk-dark">
+               <h4 class="uk-margin-medium uk-text-center uk-h4 uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
+                  A research community?
+               </h4>
+               <div class="uk-text-primary custom-uk-text-light uk-margin-medium uk-width-xlarge uk-margin-auto uk-text-center uk-text-lead uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
+                  Use a trusted partner to share, link, disseminate and monitor your research.
+               </div>
+               <div id="page#45" class="  uk-margin-medium uk-text-center uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
+                  <a class="connectlink el-content uk-button uk-button-default uk-button-small" href="https://beta.connect.openaire.eu" target="_blank">
+                  OpenAIRE.CONNECT
+                  </a>
+               </div>
+            </div>
+            <div class="uk-width-expand@m uk-width-1-2@s uk-dark">
+               <h4 class="uk-margin-medium uk-text-center uk-h4 uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
+                  A developer?
+               </h4>
+               <div id="page#48" class="uk-text-primary custom-uk-text-light uk-margin-medium uk-width-xlarge uk-margin-auto uk-text-center uk-text-lead uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
+                  Get access to OpenAIRE data and capitalize on Europe's open linked research.
+               </div>
+               <div id="page#49" class="  uk-margin-medium uk-text-center uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
+                  <a class="developlink el-content uk-button uk-button-default uk-button-small" href="https://develop.openaire.eu" target="_blank">
+                  OpenAIRE.DEVELOP
+                  </a>
+               </div>
+            </div>
+         </div>
+      </div>
+   </div>
+</div>
+
+
+
+<!--div class="image-front-topbar  uk-section-secondary uk-position-relative" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light">
+<div style="" class="mainPageSearchForm uk-background-norepeat uk-background-cover uk-background-fixed uk-section uk-padding-remove-bottom uk-flex uk-flex-middle" uk-height-viewport="offset-top: true;offset-bottom: ! +">
+  <div class="uk-position-cover"></div>
+  <div class="uk-width-1-1">
+     <div class="uk-position-relative">
+        <div class="uk-container uk-margin-medium">
+           <div class="tm-header-placeholder uk-margin-medium" style="height: 84px;"></div>
+           <div class="search_box_bg uk-grid-large uk-flex-middle uk-grid uk-grid-stack" uk-grid="">
+              <div class="uk-width-1-1@m uk-first-column">
+                 <div data-id="page#4">
+                 <search-form   placeholderText="Search in OpenAIRE information space" link=true></search-form>
+                 </div>
+              </div>
+           </div>
+        </div>
+        <div class="uk-container uk-container-large uk-margin-medium">
+           <div class="search_box_bg uk-grid uk-grid-stack" uk-grid="">
+              <div class="uk-width-1-1@m uk-first-column">
+                 <div class="search_box_bg uk-margin-large uk-margin-remove-bottom uk-text-center uk-grid-match uk-child-width-1-2 uk-child-width-1-2@s uk-child-width-1-4@m uk-child-width-1-4@l uk-child-width-1-4@xl uk-grid-collapse uk-grid-divider uk-grid uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" uk-grid="" data-id="page#7" style="">
+                    <div  *ngIf="showPublications && publicationsSize"  class="uk-first-column">
+                       <div uk-scrollspy-class="" class="uk-width-medium uk-margin-auto el-item uk-panel uk-scrollspy-inview uk-animation-fade" style="">
+                          <h2 class="el-title uk-margin uk-h2">
+                             <span>{{publicationsSize.number}} {{publicationsSize.size}} publications</span>
+                          </h2>
+                       </div>
+                    </div>
+                    <div  *ngIf="showDatasets && datasetsSize">
+                       <div uk-scrollspy-class="" class="uk-width-medium uk-margin-auto el-item uk-panel uk-scrollspy-inview uk-animation-fade" style="">
+                          <h2 class="el-title uk-margin uk-h2">
+                             <span>{{datasetsSize.number}} {{datasetsSize.size}} research data</span>
+                          </h2>
+                       </div>
+                    </div>
+                    <div  *ngIf="showDataProviders && datasourcesSize"  >
+                       <div uk-scrollspy-class="" class="uk-width-medium uk-margin-auto el-item uk-panel uk-scrollspy-inview uk-animation-fade" style="">
+                          <h2 class="el-title uk-margin uk-h2">
+                             <span>{{datasourcesSize.number}} {{datasourcesSize.size}} data sources</span>
+                          </h2>
+                       </div>
+                    </div>
+                    <div  *ngIf="showProjects && fundersSize">
+                       <div uk-scrollspy-class="" class="uk-width-medium uk-margin-auto el-item uk-panel uk-scrollspy-inview uk-animation-fade" style="">
+                          <h2 class="el-title uk-margin uk-h2">
+                             <span>{{fundersSize.number}} {{fundersSize.size}} funders</span>
+                          </h2>
+                       </div>
+                    </div>
+                 </div>
+                 <div *ngIf = "showPublications || showDatasets || showProjects || showDataProviders" class="uk-margin-large uk-margin-remove-bottom uk-text-center uk-text-meta uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" data-id="page#8" style="">
+                  <span style="color:#fff!important; font-size:30pt!important">all linked together</span>
+                 </div>
+              </div>
+           </div>
+        </div>
+     </div>
+  </div>
+</div>
+</div>
+
+<div class="tm-main uk-container" style="min-height:200px">
+<helper position="bottom"></helper>
+</div-->

production-portal/src/app/home/home.component.ts

@@ -0,0 +1,192 @@
+import {Component, Input, Output, EventEmitter, ViewChild, ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';
+import {Observable}       from 'rxjs/Observable';
+import {ActivatedRoute, Router} from '@angular/router';
+import {Location} from '@angular/common';
+import "rxjs/add/observable/zip";
+import {Title, Meta}                  from '@angular/platform-browser';
+import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
+import {  SearchPublicationsService} from '../openaireLibrary/services/searchPublications.service';
+import {  FetchDataproviders}             from '../openaireLibrary/utils/fetchEntitiesClasses/fetchDataproviders.class';
+import {  SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service';
+import {  SearchProjectsService} from '../openaireLibrary/services/searchProjects.service';
+import {  SearchDatasetsService} from '../openaireLibrary/services/searchDatasets.service';
+import {  SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service';
+import {  RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service';
+import {  SearchFields} from '../openaireLibrary/utils/properties/searchFields';
+import {  NumberUtils} from '../openaireLibrary/utils/number-utils.class';
+
+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';
+
+@Component({
+    selector: 'home',
+    templateUrl: 'home.component.html',
+})
+export class HomeComponent {
+  public piwiksub: any;
+  public subfunders: any;
+
+  public pageTitle = "OpenAIRE"
+  public keyword:string = "";
+
+  public searchFields:SearchFields = new SearchFields();
+  public errorCodes:ErrorCodes = new ErrorCodes();
+  public routerHelper:RouterHelper = new RouterHelper();
+
+  public publicationsSize:any = null;
+  public datasetsSize:any = null;
+  public fundersSize:any = null;
+  public projectsSize:any = null;
+  public datasourcesSize:any = null;
+
+  private numResults: number = 2;
+  public fetchDataproviders : FetchDataproviders;
+
+  showPublications:boolean= false;
+  showDatasets:boolean= false;
+  showProjects:boolean= false;
+  showDataProviders:boolean= false;
+  properties: EnvProperties;
+public subPub;public subData;public subProjects;public subOrg; public subDataPr;
+
+  constructor (
+    private route: ActivatedRoute,
+      private _router: Router,
+      private _searchPublicationsService: SearchPublicationsService,
+      private _searchDataprovidersService: SearchDataprovidersService,
+      private _searchProjectsService: SearchProjectsService,
+      private _searchDatasetsService: SearchDatasetsService,
+      private _searchOrganizationsService: SearchOrganizationsService,
+      private _refineFieldResultsService:RefineFieldResultsService,
+      private location: Location, private _piwikService:PiwikService,
+      private config: ConfigurationService, private _meta: Meta, private _title: Title
+    ) {
+
+          var description = "open access, research, scientific publication, European Commission, EC, FP7, ERC, Horizon 2020, H2020, search, projects ";
+
+          var title = "OpenAIRE";
+
+          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'");
+
+          //this.fetchDataproviders = new FetchDataproviders(this._searchDataprovidersService);
+  }
+
+  public ngOnInit() {
+    this.route.data
+     .subscribe((data: { envSpecific: EnvProperties }) => {
+        this.properties = data.envSpecific;
+        if(this.properties!=null){
+          var url = this.properties.baseLink+this._router.url;
+          this._meta.updateTag({content:url},"property='og:url'");
+          if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
+            this.piwiksub = this._piwikService.trackView(this.properties, "OpenAIRE").subscribe();
+          }
+
+          this.config.getCommunityInformation(this.properties.adminToolsAPIURL, this.properties.adminToolsCommunity ).subscribe(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.showProjects =   showEntity["project"];
+                  this.showDataProviders =   showEntity["datasource"];
+                  this.getNumbers();
+                  // if(this.showDataProviders) {
+                  //   this.fetchDataproviders.getResultsForHome(this.numResults, this.properties);
+                  // }
+               });
+            }
+       });
+
+  }
+  public ngOnDestroy() {
+    if(this.piwiksub){
+      this.piwiksub.unsubscribe();
+    }
+    if(this.subfunders){
+      this.subfunders.unsubscribe();
+    }
+        if(this.subPub){
+          this.subPub.unsubscribe();
+        }
+        if(this.subData){
+          this.subData.unsubscribe();
+        }
+    //     if(this.subProjects){
+    //       this.subProjects.unsubscribe();
+    //     }
+    //     if(this.subOrg){
+    //       this.subOrg.unsubscribe();
+    //     }
+        if(this.subDataPr){
+          this.subDataPr.unsubscribe();
+        }
+
+  }
+
+   private getNumbers() {
+     if(this.showPublications){
+       this.subPub = this._searchPublicationsService.numOfSearchPublications("", this.properties).subscribe(
+               data => {
+                  if(data && data != null && data > 0 ){
+                      this.publicationsSize = NumberUtils.roundNumber(data);
+
+                  }
+               },
+               err => {
+         		    console.log(err);
+          		 }
+        );
+      }
+      if(this.showDatasets){
+       this.subData = this._searchDatasetsService.numOfSearchDatasets("", this.properties).subscribe(
+             data => {
+               if(data && data != null && data > 0 ){
+                   this.datasetsSize = NumberUtils.roundNumber(data);
+               }
+             },
+             err => {
+                 console.log(err);
+               }
+         );
+       }
+       if(this.showProjects){
+         this.subfunders = this._refineFieldResultsService.getRefineFieldsResultsByEntityName(["funder"],"project", this.properties).subscribe(
+           data => {
+
+
+                if(data[0] && data[0] > 0 ){
+                  this.projectsSize = NumberUtils.roundNumber(data[0]);
+                }
+                if(data[1].length > 0 && data[1][0].filterId == "funder" && data[1][0].values ){
+                  this.fundersSize = NumberUtils.roundNumber(data[1][0].values.length);
+                }
+
+           },
+           err => {
+               console.log(err);
+        });
+      }
+      if(this.showDataProviders){
+        this.subDataPr = this._searchDataprovidersService.numOfSearchDataproviders("", this.properties).subscribe(
+           data => {
+             if(data && data != null && data > 0 ){
+                 this.datasourcesSize = NumberUtils.roundNumber(data);
+             }
+
+           },
+           err => {
+               console.log(err);
+
+           }
+       );
+     }
+   }
+}

production-portal/src/app/home/home.module.ts

@@ -0,0 +1,49 @@
+import { NgModule}            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+import { RouterModule } from '@angular/router';
+
+import{HomeRoutingModule} from './home-routing.module';
+import{HomeComponent} from './home.component';
+
+import {  DataProvidersServiceModule} from '../openaireLibrary/services/dataProvidersService.module';
+import {  DatasetsServiceModule} from '../openaireLibrary/services/datasetsService.module';
+import {  ProjectsServiceModule} from '../openaireLibrary/services/projectsService.module';
+import {  PublicationsServiceModule} from '../openaireLibrary/services/publicationsService.module';
+import {  OrganizationsServiceModule} from '../openaireLibrary/services/organizationsService.module';
+import { SearchFormModule} from '../openaireLibrary/searchPages/searchUtils/searchForm.module';
+import {PiwikServiceModule} from '../openaireLibrary/utils/piwik/piwikService.module';
+
+import {HelperModule} from '../openaireLibrary/utils/helper/helper.module';
+
+import {RefineFieldResultsServiceModule} from '../openaireLibrary/services/refineFieldResultsService.module';
+import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
+import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+
+import {ErrorMessagesModule} from '../openaireLibrary/utils/errorMessages.module';
+
+ @NgModule({
+  imports: [
+    CommonModule, FormsModule, RouterModule,
+     RefineFieldResultsServiceModule,
+    DataProvidersServiceModule, DatasetsServiceModule, ProjectsServiceModule,
+     PublicationsServiceModule,
+    OrganizationsServiceModule,
+     SearchFormModule,
+      PiwikServiceModule,
+      HomeRoutingModule,
+      HelperModule,
+      ErrorMessagesModule
+  ],
+  declarations: [
+    HomeComponent
+   ],
+  providers:[
+    FreeGuard, PreviousRouteRecorder, ConfigurationService
+    ],
+  exports: [
+    HomeComponent
+     ]
+})
+export class HomeModule { }

production-portal/src/app/landingPages/dataProvider/dataProvider-routing.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { OpenaireDataProviderComponent } from './dataProvider.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+
+
+@NgModule({
+ imports: [
+  RouterModule.forChild([
+    { path: '', component: OpenaireDataProviderComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+        redirect: '/error',  community : 'openaire'
+      },canDeactivate: [PreviousRouteRecorder] }
+  ])
+]
+})
+export class DataProviderRoutingModule { }

production-portal/src/app/landingPages/dataProvider/dataProvider.component.ts

@@ -0,0 +1,17 @@
+import {Component, ViewChild, ElementRef} from '@angular/core';
+
+@Component({
+    selector: 'openaire-dataprovider',
+    template: `<dataprovider></dataprovider>`,
+ })
+export class OpenaireDataProviderComponent{
+  constructor (  ) {
+
+  }
+
+  ngOnInit() {
+}
+
+
+
+}

production-portal/src/app/landingPages/dataProvider/libDataProvider.module.ts

@@ -0,0 +1,18 @@
+//import {MaterialModule} from '@angular/material';
+import { NgModule}            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+import { DataProviderModule } from '../../openaireLibrary/landingPages/dataProvider/dataProvider.module';
+import { OpenaireDataProviderComponent } from './dataProvider.component';
+import {DataProviderRoutingModule} from './dataProvider-routing.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+
+@NgModule({
+  imports: [DataProviderModule, DataProviderRoutingModule],
+  declarations:[OpenaireDataProviderComponent],
+  providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
+  exports:[OpenaireDataProviderComponent]
+})
+export class LibDataProviderModule { }

production-portal/src/app/landingPages/dataset/dataset-routing.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { OpenaireDatasetComponent } from './dataset.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+
+
+@NgModule({
+ imports: [
+  RouterModule.forChild([
+    { path: '', component: OpenaireDatasetComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+        redirect: '/error',  community : 'openaire'
+      },canDeactivate: [PreviousRouteRecorder] }
+  ])
+]
+})
+export class DatasetRoutingModule { }

production-portal/src/app/landingPages/dataset/dataset.component.ts

@@ -0,0 +1,17 @@
+import {Component, ViewChild, ElementRef} from '@angular/core';
+
+@Component({
+    selector: 'openaire-dataset',
+    template: `<dataset></dataset>`,
+ })
+export class OpenaireDatasetComponent{
+  constructor (  ) {
+
+  }
+
+  ngOnInit() {
+}
+
+
+
+}

production-portal/src/app/landingPages/dataset/libDataset.module.ts

@@ -0,0 +1,19 @@
+//import {MaterialModule} from '@angular/material';
+import { NgModule}            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+import { SharedModule } from '../../shared/shared.module';
+import { RouterModule } from '@angular/router';
+import { DatasetModule  } from '../../openaireLibrary/landingPages/dataset/dataset.module';
+import { OpenaireDatasetComponent } from './dataset.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+import {DatasetRoutingModule} from './dataset-routing.module';
+ @NgModule({
+  imports: [DatasetModule, DatasetRoutingModule],
+  declarations:[OpenaireDatasetComponent],
+  providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
+  exports:[OpenaireDatasetComponent]
+})
+export class LibDatasetModule { }

production-portal/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts

@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+@NgModule({
+ imports: [
+  RouterModule.forChild([
+    { path: '', component: OpenaireHtmlProjectReportComponent , canActivate: [FreeGuard, IsRouteEnabled],canDeactivate: [PreviousRouteRecorder]}
+  ])
+]
+})
+export class HtmlProjectReportRoutingModule { }

production-portal/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts

@@ -0,0 +1,17 @@
+import {Component, ViewChild, ElementRef} from '@angular/core';
+
+@Component({
+    selector: 'openaire-htmlProjectReport',
+    template: `<htmlProjectReport></htmlProjectReport>`,
+ })
+export class OpenaireHtmlProjectReportComponent{
+  constructor (  ) {
+
+  }
+
+  ngOnInit() {
+}
+
+
+
+}

production-portal/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts

@@ -0,0 +1,20 @@
+//import {MaterialModule} from '@angular/material';
+import { NgModule}            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+import { SharedModule } from '../../shared/shared.module';
+import { RouterModule } from '@angular/router';
+import { HtmlProjectReportModule  } from '../../openaireLibrary/landingPages/htmlProjectReport/htmlProjectReport.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component';
+import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module';
+
+@NgModule({
+  imports: [HtmlProjectReportModule, HtmlProjectReportRoutingModule],
+  declarations:[OpenaireHtmlProjectReportComponent],
+  providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
+  exports:[OpenaireHtmlProjectReportComponent]
+})
+export class LibHtmlProjectReportModule { }

production-portal/src/app/landingPages/organization/libOrganization.module.ts

@@ -0,0 +1,20 @@
+//import {MaterialModule} from '@angular/material';
+import { NgModule}            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+import { SharedModule } from '../../shared/shared.module';
+import { RouterModule } from '@angular/router';
+import { OrganizationModule } from '../../openaireLibrary/landingPages/organization/organization.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+import { OpenaireOrganizationComponent } from './organization.component';
+import {OrganizationRoutingModule} from './organization-routing.module';
+
+@NgModule({
+  imports: [OrganizationModule, OrganizationRoutingModule],
+  declarations:[OpenaireOrganizationComponent],
+  providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
+  exports:[OpenaireOrganizationComponent]
+})
+export class LibOrganizationModule { }

production-portal/src/app/landingPages/organization/organization-routing.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { OpenaireOrganizationComponent } from './organization.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+
+
+
+@NgModule({
+ imports: [
+  RouterModule.forChild([
+    { path: '', component: OpenaireOrganizationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+        redirect: '/error',  community : 'openaire'
+      },canDeactivate: [PreviousRouteRecorder] }
+  ])
+]
+})
+export class OrganizationRoutingModule { }

production-portal/src/app/landingPages/organization/organization.component.ts

@@ -0,0 +1,17 @@
+import {Component, ViewChild, ElementRef} from '@angular/core';
+
+@Component({
+    selector: 'openaire-organization',
+    template: `<organization></organization>`,
+ })
+export class OpenaireOrganizationComponent{
+  constructor (  ) {
+
+  }
+
+  ngOnInit() {
+}
+
+
+
+}

production-portal/src/app/landingPages/project/libProject.module.ts

@@ -0,0 +1,20 @@
+//import {MaterialModule} from '@angular/material';
+import { NgModule}            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+import { SharedModule } from '../../shared/shared.module';
+import { RouterModule } from '@angular/router';
+import { ProjectModule } from '../../openaireLibrary/landingPages/project/project.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+import { OpenaireProjectComponent } from './project.component';
+import {ProjectRoutingModule} from './project-routing.module';
+
+@NgModule({
+  imports: [ProjectModule, ProjectRoutingModule],
+  declarations:[OpenaireProjectComponent],
+  providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
+  exports:[OpenaireProjectComponent]
+})
+export class LibProjectModule { }

production-portal/src/app/landingPages/project/project-routing.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { OpenaireProjectComponent } from './project.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+
+
+@NgModule({
+ imports: [
+  RouterModule.forChild([
+    { path: '', component: OpenaireProjectComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+        redirect: '/error',  community : 'openaire'
+      },canDeactivate: [PreviousRouteRecorder]  }
+  ])
+ ]
+})
+export class ProjectRoutingModule { }

production-portal/src/app/landingPages/project/project.component.ts

@@ -0,0 +1,17 @@
+import {Component, ViewChild, ElementRef} from '@angular/core';
+
+@Component({
+    selector: 'openaire-project',
+    template: `<project></project>`,
+ })
+export class OpenaireProjectComponent{
+  constructor (  ) {
+
+  }
+
+  ngOnInit() {
+}
+
+
+
+}

production-portal/src/app/landingPages/publication/libPublication.module.ts

@@ -0,0 +1,20 @@
+//import {MaterialModule} from '@angular/material';
+import { NgModule}            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+import { SharedModule } from '../../shared/shared.module';
+import { RouterModule } from '@angular/router';
+import { PublicationModule } from '../../openaireLibrary/landingPages/publication/publication.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+import { OpenairePublicationComponent } from './publication.component';
+import {PublicationRoutingModule} from './publication-routing.module';
+
+@NgModule({
+  imports: [PublicationModule, PublicationRoutingModule],
+  declarations:[OpenairePublicationComponent],
+  providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
+  exports:[OpenairePublicationComponent]
+})
+export class LibPublicationModule { }

production-portal/src/app/landingPages/publication/publication-routing.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import {OpenairePublicationComponent } from './publication.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+
+
+@NgModule({
+ imports: [
+  RouterModule.forChild([
+    { path: '', component: OpenairePublicationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+        redirect: '/error',  community : 'openaire'
+      },canDeactivate: [PreviousRouteRecorder]  }
+  ])
+]
+})
+export class PublicationRoutingModule { }

production-portal/src/app/landingPages/publication/publication.component.ts

@@ -0,0 +1,17 @@
+import {Component, ViewChild, ElementRef} from '@angular/core';
+
+@Component({
+    selector: 'openaire-publication',
+    template: `<publication></publication>`,
+ })
+export class OpenairePublicationComponent{
+  constructor (  ) {
+
+  }
+
+  ngOnInit() {
+}
+
+
+
+}

production-portal/src/app/landingPages/software/libSoftware.module.ts

@@ -0,0 +1,19 @@
+//import {MaterialModule} from '@angular/material';
+import { NgModule}            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+
+import { RouterModule } from '@angular/router';
+import { SoftwareModule } from '../../openaireLibrary/landingPages/software/software.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+import { OpenaireSoftwareComponent } from './software.component';
+import {SoftwareRoutingModule} from './software-routing.module';
+@NgModule({
+  imports: [SoftwareModule, SoftwareRoutingModule],
+  declarations:[OpenaireSoftwareComponent],
+  providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
+  exports:[OpenaireSoftwareComponent]
+})
+export class LibSoftwareModule { }

production-portal/src/app/landingPages/software/software-routing.module.ts

@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import {OpenaireSoftwareComponent } from './software.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+
+@NgModule({
+ imports: [
+  RouterModule.forChild([
+    { path: '', component: OpenaireSoftwareComponent, canActivate: [FreeGuard, IsRouteEnabled],canDeactivate: [PreviousRouteRecorder]  }
+  ])
+]
+})
+export class SoftwareRoutingModule { }

production-portal/src/app/landingPages/software/software.component.ts

@@ -0,0 +1,17 @@
+import {Component, ViewChild, ElementRef} from '@angular/core';
+
+@Component({
+    selector: 'openaire-software',
+    template: `<software></software>`,
+ })
+export class OpenaireSoftwareComponent{
+  constructor (  ) {
+
+  }
+
+  ngOnInit() {
+}
+
+
+
+}

production-portal/src/app/login/libUser.module.ts

@@ -0,0 +1,23 @@
+import { NgModule}            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+
+import {OpenaireUserComponent } from './user.component';
+import { UserRoutingModule } from './user-routing.module';
+import { UserModule} from '../openaireLibrary/login/user.module';
+
+import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+
+@NgModule({
+  imports: [
+    CommonModule, FormsModule,
+    UserRoutingModule, UserModule
+
+  ],
+  providers:[PreviousRouteRecorder],
+  declarations: [
+OpenaireUserComponent
+
+]
+})
+export class LibUserModule { }

production-portal/src/app/login/user-routing.module.ts

@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import {OpenaireUserComponent } from './user.component';
+import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      { path: '', component: OpenaireUserComponent, canDeactivate: [PreviousRouteRecorder]},
+
+    ])
+  ]
+})
+export class UserRoutingModule { }

production-portal/src/app/login/user.component.ts

@@ -0,0 +1,11 @@
+import {Component, ElementRef} from '@angular/core';
+import {Observable}       from 'rxjs/Observable';
+
+@Component({
+    selector: 'openaire-user',
+    template: `<user></user>`
+  })
+
+export class OpenaireUserComponent {
+
+}

production-portal/src/app/reload/libReload.module.ts

@@ -0,0 +1,23 @@
+import { NgModule}            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+import { RouterModule } from '@angular/router';
+
+ import{ReloadModule} from '../openaireLibrary/reload/reload.module';
+
+
+@NgModule({
+  imports: [
+    CommonModule, FormsModule, RouterModule, ReloadModule
+  ],
+  declarations: [
+
+   ],
+  providers:[
+
+    ],
+  exports: [
+
+     ]
+})
+export class LibReloadModule { }

production-portal/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+     	{ path: '', component: OpenaireAdvancedSearchDataProvidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+          redirect: '/error',  community : 'openaire'
+        }, canDeactivate: [PreviousRouteRecorder] }
+
+    ])
+  ]
+})
+export class AdvancedSearchDataProvidersRoutingModule { }

production-portal/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts

@@ -0,0 +1,14 @@
+import {Component, Input, ViewChild} from '@angular/core';
+
+
+@Component({
+    selector: 'openaire-advanced-search-dataprovider',
+    template: `
+    <advanced-search-dataprovider>
+    </advanced-search-dataprovider>
+
+    `
+ })
+
+export class OpenaireAdvancedSearchDataProvidersComponent { 
+}

production-portal/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts

@@ -0,0 +1,28 @@
+import { NgModule}            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+
+import{ AdvancedSearchDataProvidersRoutingModule} from './advancedSearchDataProviders-routing.module';
+import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
+import {AdvancedSearchDataProvidersModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchDataProviders.module';
+
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+@NgModule({
+  imports: [
+    CommonModule, FormsModule,
+    AdvancedSearchDataProvidersRoutingModule,
+    AdvancedSearchDataProvidersModule
+
+  ],
+  declarations: [
+    OpenaireAdvancedSearchDataProvidersComponent
+   ],
+  providers:[FreeGuard, IsRouteEnabled],
+  exports: [
+    OpenaireAdvancedSearchDataProvidersComponent
+     ]
+})
+export class LibAdvancedSearchDataProvidersModule { }

production-portal/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import{OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+     	{ path: '', component: OpenaireAdvancedSearchDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+          redirect: '/error',  community : 'openaire'
+        }, canDeactivate: [PreviousRouteRecorder] }
+
+    ])
+  ]
+})
+export class AdvancedSearchDatasetsRoutingModule { }

production-portal/src/app/searchPages/advanced/advancedSearchDatasets.component.ts

@@ -0,0 +1,16 @@
+import {Component, Input, ViewChild} from '@angular/core';
+
+
+@Component({
+    selector: 'openaire-advanced-search-datasets',
+    template: `
+    <advanced-search-datasets>
+    </advanced-search-datasets>
+
+    `
+ })
+
+export class OpenaireAdvancedSearchDatasetsComponent { 
+
+
+}

production-portal/src/app/searchPages/advanced/advancedSearchDatasets.module.ts

@@ -0,0 +1,29 @@
+import { NgModule}            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+
+import{ AdvancedSearchDatasetsRoutingModule} from './advancedSearchDatasets-routing.module';
+import{OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component';
+
+
+ import {AdvancedSearchDatasetsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchDatasets.module';
+ import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+ import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+
+@NgModule({
+  imports: [
+    CommonModule, FormsModule,
+    AdvancedSearchDatasetsModule,
+   AdvancedSearchDatasetsRoutingModule
+
+  ],
+  declarations: [
+    OpenaireAdvancedSearchDatasetsComponent
+   ],
+  providers:[FreeGuard, IsRouteEnabled],
+  exports: [
+    OpenaireAdvancedSearchDatasetsComponent
+     ]
+})
+export class LibAdvancedSearchDatasetsModule { }

production-portal/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+     	{ path: '', component: OpenaireAdvancedSearchOrganizationsComponent , canActivate: [FreeGuard, IsRouteEnabled], data: {
+          redirect: '/error',  community : 'openaire'
+        },canDeactivate: [PreviousRouteRecorder]}
+
+    ])
+  ]
+})
+export class AdvancedSearchOrganizationsRoutingModule { }

production-portal/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts

@@ -0,0 +1,16 @@
+import {Component, Input, ViewChild} from '@angular/core';
+
+
+@Component({
+    selector: 'openaire-advanced-search-organizations',
+    template: `
+    <advanced-search-organizations>
+    </advanced-search-organizations>
+
+    `
+ })
+
+export class OpenaireAdvancedSearchOrganizationsComponent {
+
+
+}

production-portal/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts

@@ -0,0 +1,29 @@
+import { NgModule}            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+
+import{ AdvancedSearchOrganizationsRoutingModule} from './advancedSearchOrganizations-routing.module';
+import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
+
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+ import { AdvancedSearchOrganizationsModule} from '../../openaireLibrary/searchPages/advanced/advancedSearchOrganizations.module';
+
+@NgModule({
+  imports: [
+    CommonModule, FormsModule,
+    AdvancedSearchOrganizationsModule,
+   AdvancedSearchOrganizationsRoutingModule
+
+  ],
+  declarations: [
+    OpenaireAdvancedSearchOrganizationsComponent
+   ],
+  providers:[FreeGuard, IsRouteEnabled],
+  exports: [
+    OpenaireAdvancedSearchOrganizationsComponent
+     ]
+})
+export class LibAdvancedSearchOrganizationsModule { }

production-portal/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+     	{ path: '', component: OpenaireAdvancedSearchProjectsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+          redirect: '/error',  community : 'openaire'
+        }, canDeactivate: [PreviousRouteRecorder] }
+
+    ])
+  ]
+})
+export class AdvancedSearchProjectsRoutingModule { }

production-portal/src/app/searchPages/advanced/advancedSearchProjects.component.ts

@@ -0,0 +1,13 @@
+import {Component, Input, ViewChild} from '@angular/core';
+@Component({
+    selector: 'openaire-advanced-search-projects',
+    template: `
+    <advanced-search-projects>
+    </advanced-search-projects>
+
+    `
+ })
+
+export class OpenaireAdvancedSearchProjectsComponent { 
+
+}

production-portal/src/app/searchPages/advanced/advancedSearchProjects.module.ts

@@ -0,0 +1,29 @@
+import { NgModule}            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+
+import{ AdvancedSearchProjectsRoutingModule} from './advancedSearchProjects-routing.module';
+import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
+
+
+ import {AdvancedSearchProjectsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchProjects.module';
+ import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+ import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+@NgModule({
+  imports: [
+    CommonModule, FormsModule,
+    AdvancedSearchProjectsModule,
+   AdvancedSearchProjectsRoutingModule
+
+  ],
+  declarations: [
+    OpenaireAdvancedSearchProjectsComponent
+   ],
+  providers:[FreeGuard, IsRouteEnabled],
+  exports: [
+    OpenaireAdvancedSearchProjectsComponent
+     ]
+})
+export class LibAdvancedSearchProjectsModule { }

production-portal/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import{OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+     	{ path: '', component: OpenaireAdvancedSearchPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+          redirect: '/error',  community : 'openaire'
+        }, canDeactivate: [PreviousRouteRecorder] }
+
+    ])
+  ]
+})
+export class AdvancedSearchPublicationsRoutingModule { }

production-portal/src/app/searchPages/advanced/advancedSearchPublications.component.ts

@@ -0,0 +1,13 @@
+import {Component, Input, ViewChild} from '@angular/core';
+
+
+@Component({
+    selector: 'openaire-advanced-search-publications',
+    template: `
+    <advanced-search-publications>
+    </advanced-search-publications>
+    `
+ })
+
+export class OpenaireAdvancedSearchPublicationsComponent { 
+}

production-portal/src/app/searchPages/advanced/advancedSearchPublications.module.ts

@@ -0,0 +1,29 @@
+import { NgModule}            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+
+import{ AdvancedSearchPublicationsRoutingModule} from './advancedSearchPublications-routing.module';
+import{OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component';
+
+
+ import {AdvancedSearchPublicationsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchPublications.module';
+ import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+ import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+
+@NgModule({
+  imports: [
+    CommonModule, FormsModule,
+    AdvancedSearchPublicationsModule,
+   AdvancedSearchPublicationsRoutingModule
+
+  ],
+  declarations: [
+    OpenaireAdvancedSearchPublicationsComponent
+   ],
+  providers:[FreeGuard, IsRouteEnabled],
+  exports: [
+    OpenaireAdvancedSearchPublicationsComponent
+     ]
+})
+export class LibAdvancedSearchPublicationsModule { }

production-portal/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import{OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+     	{ path: '', component: OpenaireAdvancedSearchSoftwareComponent, canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder] }
+
+    ])
+  ]
+})
+export class AdvancedSearchSoftwareRoutingModule { }

production-portal/src/app/searchPages/advanced/advancedSearchSoftware.component.ts

@@ -0,0 +1,15 @@
+import {Component, Input, ViewChild} from '@angular/core';
+
+@Component({
+    selector: 'openaire-advanced-search-software',
+    template: `
+    <advanced-search-software>
+    </advanced-search-software>
+
+    `
+ })
+
+export class OpenaireAdvancedSearchSoftwareComponent {
+  
+
+}

production-portal/src/app/searchPages/advanced/advancedSearchSoftware.module.ts

@@ -0,0 +1,30 @@
+import { NgModule}            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+
+import{ AdvancedSearchSoftwareRoutingModule} from './advancedSearchSoftware-routing.module';
+import{OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component';
+
+
+ import {AdvancedSearchSoftwareModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchSoftware.module';
+ import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+ import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+
+@NgModule({
+  imports: [
+    CommonModule, FormsModule,
+    AdvancedSearchSoftwareModule,
+    AdvancedSearchSoftwareRoutingModule
+
+  ],
+  declarations: [
+    OpenaireAdvancedSearchSoftwareComponent
+   ],
+  providers:[FreeGuard
+    ],
+  exports: [
+    OpenaireAdvancedSearchSoftwareComponent
+     ]
+})
+export class LibAdvancedSearchSoftwareModule { }

production-portal/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+     	{ path: '', component: OpenaireSearchCompatibleDataprovidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+          redirect: '/error',  community : 'openaire'
+        }, canDeactivate: [PreviousRouteRecorder]  }
+
+    ])
+  ]
+})
+export class CompatibleDataProvidersRoutingModule { }

production-portal/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts

@@ -0,0 +1,16 @@
+import {Component, Input, ViewChild} from '@angular/core';
+import { ActivatedRoute} from '@angular/router';
+
+@Component({
+    selector: 'openaire-search-content-providers',
+    template: `
+
+    <search-content-providers>
+    </search-content-providers>
+
+    `
+
+})
+export class OpenaireSearchCompatibleDataprovidersComponent {
+
+}

production-portal/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts

@@ -0,0 +1,29 @@
+import { NgModule}            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+
+import{ CompatibleDataProvidersRoutingModule} from './compatibleDataProviders-routing.module';
+import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component';
+
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+import {  CompatibleDataProvidersModule} from '../../openaireLibrary/searchPages/dataProviders/compatibleDataProviders.module';
+
+@NgModule({
+  imports: [
+    CommonModule, FormsModule,
+    CompatibleDataProvidersModule,
+    CompatibleDataProvidersRoutingModule
+
+  ],
+  declarations: [
+    OpenaireSearchCompatibleDataprovidersComponent
+   ],
+  providers:[FreeGuard, IsRouteEnabled],
+  exports: [
+    OpenaireSearchCompatibleDataprovidersComponent
+     ]
+})
+export class LibCompatibleDataProvidersModule { }

production-portal/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import{OpenaireSearchCompatibleDataprovidersTableComponent} from './compatibleDataProvidersTable.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+     	{ path: '', component: OpenaireSearchCompatibleDataprovidersTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+          redirect: '/error',  community : 'openaire'
+        }, canDeactivate: [PreviousRouteRecorder] }
+
+    ])
+  ]
+})
+export class CompatibleDataProvidersTableRoutingModule { }

production-portal/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts

@@ -0,0 +1,14 @@
+import {Component, Input, ViewChild} from '@angular/core';
+
+
+@Component({
+    selector: 'openaire-search-content-providers-table',
+    template: `
+
+    <search-content-providers-table>
+    </search-content-providers-table>
+    `
+
+})
+export class OpenaireSearchCompatibleDataprovidersTableComponent { 
+}

production-portal/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts

@@ -0,0 +1,26 @@
+import { NgModule}            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+
+import{OpenaireSearchCompatibleDataprovidersTableComponent} from './compatibleDataProvidersTable.component';
+import {CompatibleDataProvidersTableRoutingModule} from './compatibleDataProvidersTable-routing.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+import {  CompatibleDataProvidersTableModule} from '../../openaireLibrary/searchPages/dataProviders/compatibleDataProvidersTable.module';
+
+@NgModule({
+  imports: [
+    CommonModule, FormsModule,
+    CompatibleDataProvidersTableModule,
+      CompatibleDataProvidersTableRoutingModule
+
+  ],  providers:[FreeGuard, IsRouteEnabled],
+  declarations: [
+    OpenaireSearchCompatibleDataprovidersTableComponent
+   ],
+  exports: [
+    OpenaireSearchCompatibleDataprovidersTableComponent
+     ]
+})
+export class LibCompatibleDataProvidersTableModule { }

production-portal/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+     	{ path: '', component: OpenaireSearchEntityRegistriesComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+          redirect: '/error',  community : 'openaire'
+        }, canDeactivate: [PreviousRouteRecorder]  }
+
+    ])
+  ]
+})
+export class EntityRegistriesRoutingModule { }

production-portal/src/app/searchPages/dataProviders/entityRegistries.component.ts

@@ -0,0 +1,16 @@
+import {Component, Input, ViewChild} from '@angular/core';
+import { ActivatedRoute} from '@angular/router';
+
+@Component({
+    selector: 'openaire-search-entity-registries',
+    template: `
+
+    <search-entity-registries>
+    </search-entity-registries>
+
+    `
+
+})
+export class OpenaireSearchEntityRegistriesComponent {
+
+}