From c606e61728276f0cf008906ce40eac327d71a6d2 Mon Sep 17 00:00:00 2001 From: Argiro Kokogiannaki Date: Tue, 3 Dec 2019 11:10:05 +0000 Subject: [PATCH] [Monitor|Trunk] Home page: add numbers add browse of funders comment helptexts and add lorem ipsum texts About, contact us:comment helptexts and add lorem ipsum texts Funders Search: add mock funders, make changes to community search to work for funders add logo images git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor@57793 d315682c-612b-4755-9ff5-7f18f6832af3 --- src/app/app-routing.module.ts | 5 + src/app/app.component.ts | 55 +-- src/app/contact/contact.component.html | 32 +- src/app/funders/browse/browse.component.html | 92 ++++ src/app/funders/browse/browse.component.ts | 99 +++++ src/app/funders/browse/browse.module.ts | 29 ++ .../funders/searchFunders-routing.module.ts | 14 + src/app/funders/searchFunders.component.ts | 399 ++++++++++++++++++ src/app/funders/searchFunders.module.ts | 25 ++ src/app/home/home.component.html | 182 +++++++- src/app/home/home.component.ts | 167 +++++++- src/app/home/home.module.ts | 9 +- src/app/learn-how/learn-how.component.ts | 225 +++++----- src/app/services/stakeholder.service.ts | 5 + src/assets/funders.json | 43 ++ src/assets/funders2.json | 56 +++ src/assets/images/arc.png | Bin 0 -> 47194 bytes src/assets/images/arc1.gif | Bin 0 -> 69065 bytes src/assets/images/dashboard.png | Bin 0 -> 112959 bytes src/assets/images/ec.png | Bin 0 -> 19902 bytes src/assets/images/eu-flag.png | Bin 0 -> 1310 bytes src/assets/images/europe-map.png | Bin 0 -> 4120 bytes src/assets/images/fwf.png | Bin 0 -> 32961 bytes src/assets/images/fwf1.png | Bin 0 -> 27818 bytes src/assets/images/globe.png | Bin 0 -> 3450 bytes src/assets/images/piggy-bank.svg | 42 ++ src/assets/monitor-custom.css | 45 ++ src/index.html | 1 + 28 files changed, 1344 insertions(+), 181 deletions(-) create mode 100644 src/app/funders/browse/browse.component.html create mode 100644 src/app/funders/browse/browse.component.ts create mode 100644 src/app/funders/browse/browse.module.ts create mode 100644 src/app/funders/searchFunders-routing.module.ts create mode 100644 src/app/funders/searchFunders.component.ts create mode 100644 src/app/funders/searchFunders.module.ts create mode 100644 src/assets/funders.json create mode 100644 src/assets/funders2.json create mode 100644 src/assets/images/arc.png create mode 100644 src/assets/images/arc1.gif create mode 100644 src/assets/images/dashboard.png create mode 100644 src/assets/images/ec.png create mode 100644 src/assets/images/eu-flag.png create mode 100644 src/assets/images/europe-map.png create mode 100644 src/assets/images/fwf.png create mode 100644 src/assets/images/fwf1.png create mode 100644 src/assets/images/globe.png create mode 100644 src/assets/images/piggy-bank.svg diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 31220c3..6054e8d 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -13,6 +13,11 @@ const routes: Routes = [ loadChildren: './monitor/monitor.module#MonitorModule', resolve: {envSpecific: EnvironmentSpecificResolver} }, + { + path: 'search/find/funders', + loadChildren: './funders/searchFunders.module#SearchFundersModule', + resolve: {envSpecific: EnvironmentSpecificResolver} + }, {path: 'about', redirectTo: 'about/learn-how', pathMatch: 'full'}, { path: 'about/learn-how', diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 3c645ae..d9e742d 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -140,60 +140,7 @@ export class AppComponent { } - if (communityId && communityId != "" && com.communityId == communityId) { - community = com; - let isCommunityManager: boolean = false; - if (Session.isCommunityCurator(this.user) || Session.isPortalAdministrator(this.user)) { - isCommunityManager = true; - } else if (this.user && com.managers.indexOf(this.user.email) != -1) { - isCommunityManager = true; - } - this.community = { - id: community.communityId, - name: (community.shortTitle) ? community.shortTitle : community.title, - logoUrl: community.logoUrl - }; - this.menuItems = []; - this.menuItems.push( - { - rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find", "/search/find/publications", "/search/find/datasets", "/search/find/software", "/search/find/other", "/search/find/projects", "/search/find/dataproviders"], this.properties.environment != "development" ? {} : {communityId: community.communityId}), - items: [new MenuItem("", "Publications", "", "/search/find/publications", false, ["publication"], ["/search/find/publications"], this.properties.environment != "development" ? {} : {communityId: community.communityId}), - new MenuItem("", "Research Data", "", "/search/find/datasets", false, ["dataset"], ["/search/find/datasets"], this.properties.environment != "development" ? {} : {communityId: community.communityId}), - new MenuItem("", "Software", "", "/search/find/software", false, ["software"], ["/search/find/software"], this.properties.environment != "development" ? {} : {communityId: community.communityId}), - new MenuItem("", "Other Research Products", "", "/search/find/other", false, ["orp"], ["/search/find/other"], this.properties.environment != "development" ? {} : {communityId: community.communityId}), - new MenuItem("", "Projects", "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], this.properties.environment != "development" ? {} : {communityId: community.communityId}), - new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], this.properties.environment != "development" ? {} : {communityId: community.communityId}), - ] - }); - - this.menuItems.push({ - rootItem: new MenuItem("deposit", "Deposit", "", "/participate/deposit/learn-how", false, [], ["/participate/deposit/learn-how"], this.properties.environment != "development" ? {} : {communityId: community.communityId}), - items: [ - /* - new MenuItem("","Zenodo Communities","","/participate/share-zenodo",false,[],["/participate/share-zenodo"],this.properties.environment!="development"?{}:{communityId:community.communityId}), - new MenuItem("","Publications","","/participate/deposit-publications",false,["publication"],["/participate/deposit-publications"],this.properties.environment!="development"?{}:{communityId:community.communityId}), - new MenuItem("","Research Data","","/participate/deposit-datasets",false,["dataset"],["/participate/deposit-datasets"],this.properties.environment!="development"?{}:{communityId:community.communityId}) - */ - ] - }); - this.menuItems.push( - { - rootItem: new MenuItem("link", "Link", "", "/participate/claim", false, [], ["/participate/claim"], this.properties.environment != "development" ? {} : {communityId: community.communityId}), - items: [ - new MenuItem("", "Start linking", "", "/participate/claim", false, [], ["/participate/claim"], this.properties.environment != "development" ? {} : {communityId: community.communityId}), - new MenuItem("", "Learn more", this.properties.claimsInformationLink, "", false, [], [], {}) - ] - }); - if (isCommunityManager) { - this.menuItems.push( - { - rootItem: new MenuItem("manage", "Manage", 'https://beta.admin.connect.openaire.eu/dashboard?communityId=' + community.communityId, "", false, [], [], {}), - items: [] - }); - } - - } } if (community == null) { @@ -218,7 +165,7 @@ export class AppComponent { }); }*/ this.menuItems.push({ - rootItem: new MenuItem("communities", "Communities", "", "/search/find/communities", false, [], null, {}), + rootItem: new MenuItem("funders", "Funders", "", "/search/find/funders", false, [], null, {}), items: [] }); this.menuItems.push({ diff --git a/src/app/contact/contact.component.html b/src/app/contact/contact.component.html index 674f478..d84995b 100644 --- a/src/app/contact/contact.component.html +++ b/src/app/contact/contact.component.html @@ -1,17 +1,20 @@ - - + +
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit
-