diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 16b23ed..0dc7ed4 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -8,8 +8,8 @@ import { OpenaireErrorPageComponent } from './error/errorPage.component'; const routes: Routes = [ { path: '', loadChildren: './communitywrapper/communityWrapper.module#CommunityWrapperModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'learn-how', loadChildren: './learn-how/learn-how.module#LearnHowModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'contact', loadChildren: './contact/contact.module#ContactModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, + { path: 'about', loadChildren: './learn-how/learn-how.module#LearnHowModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, + { path: 'contact-us', loadChildren: './contact/contact.module#ContactModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'invite', loadChildren: './utils/subscribe/invite/invite.module#InviteModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'about', loadChildren: './htmlPages/about/aboutPage.module#AboutPageModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'content', loadChildren: './content/contentPage.module#ContentPageModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 8db2b3d..b5ff699 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -21,9 +21,9 @@ import {HelperFunctions} from "./openaireLibrary/utils/HelperFunctions.class"; template: `
+ [showMenu]=showMenu [properties]="properties" [showHomeMenuItem]="true"> + [community]=community [showMenu]=showMenu [properties]="properties" [enableSearch]="true" [showHomeMenuItem]="true">
@@ -86,153 +86,7 @@ export class AppComponent { communityId = ConnectHelper.getCommunityFromDomain(this.properties.domain); this.buildMenu(communityId); } -/* - this.route.queryParams.subscribe(data => { - var community = null; - this.community = null; - this.showMenu = false; - this._communitiesService.getCommunities(this.properties, this.properties.communitiesAPI).subscribe ( - communities => { - for(var com of communities){ - if( ( - ((data['communityId'] && data['communityId']!="" && com.communityId == data['communityId']) - || (ConnectHelper.getCommunityFromDomain(this.properties.domain) == com.communityId )) - && community !=null) || - ( - !((data['communityId'] && data['communityId']!="" && com.communityId == data['communityId']) - || (ConnectHelper.getCommunityFromDomain(this.properties.domain) == com.communityId )) - && - this.managerOfCommunities && this.subscriberOfCommunities)){ - break; - } - if(Session.isLoggedIn() && com['status'] != "hidden"){ - if(Session.isCommunityCurator() || Session.isPortalAdministrator()){ - this.managerOfCommunities = true; - }else if(com.managers.indexOf(Session.getUserEmail())!=-1){ - this.managerOfCommunities = true; - } - // else if(!this.subscriberOfCommunities){ - // // check if subscriber - // this._subscribeService.isSubscribedToCommunity(com.communityId, Session.getUserEmail(), this.properties.adminToolsAPIURL).subscribe ( - // isSubscriber => { - // if(isSubscriber) { - // this.subscriberOfCommunities = true; - // } - // }, - // error => { - // console.error("Error fetching your subscribed communities") - // }); - // - // } - } - - - - if((data['communityId'] && data['communityId']!="" && com.communityId == data['communityId']) - || (ConnectHelper.getCommunityFromDomain(this.properties.domain) == com.communityId ) ){ - community = com; - // this._layoutService.getLayout(com.communityId, - // this.properties.adminToolsAPIURL + '/').subscribe ( - // layout => { - // this.layout = layout; - // document.documentElement.style.setProperty('--portal-main-color', this.layout.color); - // } - // ); - this.community = {id: community.communityId, name: (community.shortTitle)?community.shortTitle:community.title, logoUrl:community.logoUrl}; - this.menuItems= [ - {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}), - ]}, - { - rootItem: new MenuItem("monitor","Monitor","","/monitor",false,[],["/monitor"],this.properties.environment!="development"?{}:{communityId:community.communityId}), - items: [] - }, - { - rootItem: new MenuItem("share","Share","","",false,[],["/participate/deposit-publications","/participate/deposit-datasets","/participate/share-zenodo"],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})] - }, - { - rootItem: new MenuItem("link","Link","","/participate/claim",false,[],["/participate/claim"],this.properties.environment!="development"?{}:{communityId:community.communityId}), - items: [] - } - ]; - - } - - } - if(community == null){ - this.menuItems= []; - var myCommunities = []; - if(this.managerOfCommunities){ - myCommunities.push( new MenuItem("","Managing communities","","/search/find/communities",false,[],[],{role:"%22manager%22"})) - } - if(Session.isLoggedIn()){ - this._subscribeService.getCommunitiesSubscribedTo(Session.getUserEmail(), this.properties.adminToolsAPIURL).subscribe ( - pids => { - if(pids.length > 0 ) { - myCommunities.push( new MenuItem("","Subscribed to communities","","/search/find/communities",false,[],[],{status:"%22subscribed%22"})) - } - }, - error => { - console.error("Error fetching your subscribed communities") - }); - } - // if(this.subscriberOfCommunities){ - // myCommunities.push( new MenuItem("","Subscribed to communities","","/search/find/communities",false,[],[],{status:"%22subscribed%22"})) - // } - - this.menuItems.push({rootItem: new MenuItem("communities","Communities","","/search/find/communities",false,[],null,{}), items: []}); - if(this.managerOfCommunities || this.subscriberOfCommunities){ - this.menuItems.push({rootItem: new MenuItem("myCommunities","My Communities","","",false,[],[],{}), items: myCommunities}); - } - this.menuItems.push({rootItem: new MenuItem("howto","Create Community","","/how-to-create-community",false,[],null,{}), items: []}); - - - - this.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,[],[],{}) - ]; - // if(this.properties.showContent){ - // this.bottomMenuItems.push(new MenuItem("","Content Policy","","/content",false,[],[],{})); - // } - this.userMenuItems =[ - // new MenuItem("","My links","","/myclaims",false,[],["/myclaims"],(data['communityId'] && typeof document !== 'undefined' && ConnectHelper.isProduction(document.location.hostname))?{}:{communityId:data['communityId']}), - ]; - - }else{ - this.bottomMenuItems = [ - new MenuItem("","About","","/about",false,[],["/about"],this.properties.environment!="development"?{}:{communityId:community.communityId}), - new MenuItem("","Organizations","","/organizations",false,[],["/organizations"],this.properties.environment!="development"?{}:{communityId:community.communityId}) - ]; - if(this.properties.showContent){ - this.bottomMenuItems.push(new MenuItem("","Content Policy","","/content",false,[],[],{})); - } - this.userMenuItems =[ new MenuItem("","My profile","","",false,[],[],{}), - new MenuItem("","My links","","/myclaims",false,[],["/myclaims"],this.properties.environment!="development"?{}:{communityId:community.communityId}), - new MenuItem("","Invite users","","/invite",false,[],[],this.properties.environment!="development"?{}:{communityId:community.communityId}), - ]; - if(this.managerOfCommunities ){ - this.userMenuItems.push(new MenuItem("","Support","https://openaire-connect.d4science.org/group/openaire-connect-gateway/explore?siteId=172366611","",false,[],[],{})) - } - } - this.showMenu = true; - }); - - - }); -*/ if (typeof document !== 'undefined') { try{ this.isClient = true; @@ -266,19 +120,7 @@ export class AppComponent { this.managerOfCommunities = true; }else if(com.managers.indexOf(Session.getUserEmail())!=-1){ this.managerOfCommunities = true; - }/*else if(!this.subscriberOfCommunities){ - // check if subscriber - this._subscribeService.isSubscribedToCommunity(com.communityId, Session.getUserEmail(), this.properties.adminToolsAPIURL).subscribe ( - isSubscriber => { - if(isSubscriber) { - this.subscriberOfCommunities = true; - } - }, - error => { - console.error("Error fetching your subscribed communities") - }); - - }*/ + } } @@ -294,21 +136,15 @@ export class AppComponent { // document.documentElement.style.setProperty('--portal-main-color', this.layout.color); // } // ); - let iSommunitymanager: boolean = false; + let isCommunityManager: boolean = false; if(Session.isCommunityCurator() || Session.isPortalAdministrator()){ - iSommunitymanager = true; + isCommunityManager = true; }else if(com.managers.indexOf(Session.getUserEmail())!=-1){ - iSommunitymanager = true; + isCommunityManager = true; } this.community = {id: community.communityId, name: (community.shortTitle)?community.shortTitle:community.title, logoUrl:community.logoUrl}; this.menuItems= []; - if(iSommunitymanager){ - this.menuItems.push( - { - rootItem: new MenuItem("manage","Manage",'https://beta.admin.connect.openaire.eu/dashboard?communityId='+community.communityId,"",false,[],[],{}), - items: [] - }); - } + 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}), @@ -331,13 +167,20 @@ export class AppComponent { rootItem: new MenuItem("link","Link","","/participate/claim",false,[],["/participate/claim"],this.properties.environment!="development"?{}:{communityId:community.communityId}), items: [] }); - + 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){ this.menuItems= []; + this.menuItems.push({rootItem: new MenuItem("about","About","","/about",false,[],null,{}), items: []}); var myCommunities = []; if(this.managerOfCommunities){ myCommunities.push( new MenuItem("","Managing communities","","/search/find/communities",false,[],[],{role:"%22manager%22"})) @@ -354,10 +197,13 @@ export class AppComponent { }); } this.menuItems.push({rootItem: new MenuItem("communities","Communities","","/search/find/communities",false,[],null,{}), items: []}); + this.menuItems.push({rootItem: new MenuItem("join","Join","","/contact-us",false,[],null,{}), items: []}); if(this.managerOfCommunities || this.subscriberOfCommunities){ - this.menuItems.push({rootItem: new MenuItem("myCommunities","My Communities","","",false,[],[],{}), items: myCommunities}); + let myCommunitiesMenu = new MenuItem("myCommunities","My Communities","","",false,[],[],{}); + myCommunitiesMenu.setMarkAsActive(false); + this.menuItems.push({rootItem: myCommunitiesMenu, items: myCommunities}); } - this.menuItems.push({rootItem: new MenuItem("howto","Create Community","","/how-to-create-community",false,[],null,{}), items: []}); + diff --git a/src/app/communities/communities.component.html b/src/app/communities/communities.component.html index 3c31b9e..4b0da64 100644 --- a/src/app/communities/communities.component.html +++ b/src/app/communities/communities.component.html @@ -61,7 +61,8 @@
Turn Open Science into Practice. It takes your open and linked research outcomes. A service customized to your needs.
- LEARN HOW + LEARN + HOW
@@ -177,7 +178,7 @@
- +
@@ -221,7 +222,8 @@

Let us Help you Develop a Collaborative Science Gateway. It is fast. It is reliable.

Get in touch with our team to find out how.
- CONTACT US + CONTACT + US
diff --git a/src/app/community/community.component.html b/src/app/community/community.component.html index 166dd26..926214c 100644 --- a/src/app/community/community.component.html +++ b/src/app/community/community.component.html @@ -174,9 +174,14 @@ let-allowedCharts="allowedCharts" let-chartsInfoMap="chartsInfoMap" let-showChartTitle="showChartTitle" let-showIn="showIn"> - -
+ No graphs available +
+
@@ -230,7 +235,6 @@ {{entityName}}
-
+
- @@ -310,12 +314,10 @@
- -
-
-
+
-
-
+
-
-
+
-
-
+
- Zenodo communities - {{zenodoCommunityIdS.length + ((masterZenodoCommunity) ? 1 : 0)}}{{" "}} - + Related Zenodo communities + {{zenodoCommunityIdS.length + ((masterZenodoCommunity) ? 1 : 0)}} + + + {{" "}} + -
diff --git a/src/app/createCommunity/community-creation-instructions.component.ts b/src/app/createCommunity/community-creation-instructions.component.ts index c2e7325..bbde140 100644 --- a/src/app/createCommunity/community-creation-instructions.component.ts +++ b/src/app/createCommunity/community-creation-instructions.component.ts @@ -23,7 +23,7 @@ declare var UIkit: any; - + @@ -32,7 +32,7 @@ declare var UIkit: any;
Contact OpenAIRE team, in order to create your community page
- CONTACT US + CONTACT US
@@ -137,7 +137,7 @@ declare var UIkit: any;

Contact OpenAIRE team, in order to create your community page

- CONTACT US + CONTACT US
diff --git a/src/app/deposit/zenodo/shareInZenodo.component.html b/src/app/deposit/zenodo/shareInZenodo.component.html index 54998f4..5be7222 100644 --- a/src/app/deposit/zenodo/shareInZenodo.component.html +++ b/src/app/deposit/zenodo/shareInZenodo.component.html @@ -38,7 +38,7 @@
-
+

@@ -85,7 +85,7 @@
-
+

diff --git a/src/app/learn-how/learn-how.component.ts b/src/app/learn-how/learn-how.component.ts index 171e6a7..8504726 100644 --- a/src/app/learn-how/learn-how.component.ts +++ b/src/app/learn-how/learn-how.component.ts @@ -32,7 +32,7 @@ import {FAQ} from "../openaireLibrary/utils/entities/FAQ";

We look forward to working together and helping you unlock the full potential of your research community through open science.

Get in touch with our team to find out how.
- CONTACT US + CONTACT US