diff --git a/src/app/app.component.html b/src/app/app.component.html index 882c55f..5035e75 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -4,8 +4,9 @@
- +
diff --git a/src/app/app.component.ts b/src/app/app.component.ts index c407212..1bcccee 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -14,6 +14,7 @@ import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll"; import {ConnectHelper} from './openaireLibrary/connect/connectHelper'; import {ConfigurationService} from './openaireLibrary/utils/configuration/configuration.service'; import {StringUtils} from "./openaireLibrary/utils/string-utils.class"; +import {OpenaireEntities} from "./openaireLibrary/utils/properties/searchFields"; @Component({ selector: 'app-root', @@ -50,7 +51,7 @@ export class AppComponent implements OnInit { private subscriptions: any[] = []; headerLogoUrl: string; headerUrl: string; - + constructor(private route: ActivatedRoute, private communityService: CommunityService, private router: Router, @@ -192,7 +193,11 @@ export class AppComponent implements OnInit { this.userMenuItems.push(new MenuItem("exploreOptions", "Explore portal options", "", "/openaire/admin-tools/pages", false, [], [], {})); } - this.userMenuItems.push(new MenuItem("", "User information", "", "/user-info", false, [], [], {})); + if (this.community) { + this.userMenuItems.push(new MenuItem("", "User information", "", "/"+this.community.communityId+"/user-info", false, [], [], {})); + } else { + this.userMenuItems.push(new MenuItem("", "User information", "", "/user-info", false, [], [], {})); + } } if (this.community) { this.headerLogoUrl = StringUtils.getLogoUrl(this.community); @@ -200,10 +205,10 @@ export class AppComponent implements OnInit { this.menuHeader = { route: "/" + this.community.communityId, url: null, - title: 'Admin - ' + this.community.shortTitle, - logoUrl: null, - logoSmallUrl: null, - position: 'center', + title: this.community.shortTitle, + logoUrl: this.headerLogoUrl, + logoSmallUrl: this.headerLogoUrl, + position: 'left', badge: false, stickyAnimation: false }; @@ -215,13 +220,63 @@ export class AppComponent implements OnInit { this.sideBarItems.push(new MenuItem("mining", "Mining", "", "/" + this.community.communityId + "/mining/manage-profiles", false, [], [], {}, null, null, null, "/" + this.community.communityId + "/mining")); } this.specialSideBarMenuItem = new MenuItem("back", "Manage communities", "", "/", false, [], null, {}, {name: 'search', class: 'uk-text-secondary'}); + + this.menuItems = []; + this.menuItems.push({ + rootItem: new MenuItem("dashboard", "Dashboard", + "https://"+(properties.environment == "beta" ? "beta." : "")+this.community.communityId+".openaire.eu/", "", false, [], null, null + , null, null, null, null, "_self"), items: [] + }); + this.menuItems.push({ + rootItem: new MenuItem("deposit", "Deposit", "https://"+(properties.environment == "beta" ? "beta." : "")+this.community.communityId+".openaire.eu/participate/participate/deposit/learn-how", "", false, [], ['/participate/deposit/learn-how'], null, null, null, null, null, "_self"), + items: [] + }); + this.menuItems.push( + { + rootItem: new MenuItem("link", "Link", "https://"+(properties.environment == "beta" ? "beta." : "")+this.community.communityId+".openaire.eu/participate/claim", "", false, [], ['/participate/claim'], null, null, null, null, null, "_self"), + items: [ + new MenuItem("", "Start linking", "https://"+(properties.environment == "beta" ? "beta." : "")+this.community.communityId+".openaire.eu/participate/claim", "", false, [], ['/participate/claim'], null, null, null, null, null, "_self"), + new MenuItem("", "Learn more", this.properties.claimsInformationLink, "", false, [], [], null), + ] + }); + this.menuItems.push( + { + rootItem: new MenuItem("search", "Search", "https://"+(properties.environment == "beta" ? "beta." : "")+this.community.communityId+".openaire.eu/search/find", "", false, [], ["/search/find"], null, null, null, null, null, "_self"), + items: [ + new MenuItem("", OpenaireEntities.RESULTS, "https://"+(properties.environment == "beta" ? "beta." : "")+this.community.communityId+".openaire.eu/search/find/research-outcomes?resultbestaccessright=\"" + encodeURIComponent("Open Access") + '"', "", false, [], ["/search/find/research-outcomes"], null, null, null, null, null, "_self"), + new MenuItem("", OpenaireEntities.PROJECTS, "https://"+(properties.environment == "beta" ? "beta." : "")+this.community.communityId+".openaire.eu/search/find/projects", "", false, [], ["/search/find/projects"], null, null, null, null, null, "_self"), + new MenuItem("", OpenaireEntities.DATASOURCES, "https://"+(properties.environment == "beta" ? "beta." : "")+this.community.communityId+".openaire.eu/search/find/dataproviders", "", false, [], ["/search/find/dataproviders"], null, null, null, null, null, "_self") + ] + }); + this.menuItems.push( + { + rootItem: new MenuItem("about", "About", "", "", false, [], [], {}), + items: [ + new MenuItem("", "Supporting organizations", "https://"+(properties.environment == "beta" ? "beta." : "")+this.community.communityId+".openaire.eu/organizations", "", false, [], ["/organizations"], null, null, null, null, null, "_self"), + new MenuItem("", "Curators", "https://"+(properties.environment == "beta" ? "beta." : "")+this.community.communityId+".openaire.eu/curators", "", false, [], ["/organizations"], null, null, null, null, null, "_self"), + new MenuItem("", "Sources and methodology", "https://"+(properties.environment == "beta" ? "beta." : "")+this.community.communityId+".openaire.eu/content", "", false, [], ["/content"], null, null, null, null, null, "_self"), + new MenuItem("", "National Bulletins", "https://"+(properties.environment == "beta" ? "beta." : "")+this.community.communityId+".openaire.eu/national-bulletins", "", false, [], ["/national-bulletins"], null, null, null, null, null, "_self"), + new MenuItem("", "Subjects", "https://"+(properties.environment == "beta" ? "beta." : "")+this.community.communityId+".openaire.eu/subjects", "", false, [], ["/subjects"], null, null, null, null, null, "_self"), + new MenuItem("", "Projects and funding Opportunities", "https://"+(properties.environment == "beta" ? "beta." : "")+this.community.communityId+".openaire.eu/projects", "", false, [], ["/projects"], null, null, null, null, null, "_self") + ] + }); + // if (this.isManager) { + this.menuItems.push( + { + // rootItem: new MenuItem("manage", "Manage", "", "/"+this.community.communityId, false, [], [], {}), + // items: [] + rootItem: new MenuItem("manage", "Manage", + "", "/"+this.community.communityId, false, [], null, {} + , null, null, null, "/"+this.community.communityId), items: [] + }); + // } } else { this.headerLogoUrl = null; this.headerUrl = 'https://' + ((properties.environment !== 'production')?'beta.':'') + 'connect.openaire.eu'; this.menuHeader = { route: null, url: null, - title: 'Admin - Research Community Dashboard', + title: 'Research Community Dashboard', logoUrl: null, logoSmallUrl: null, position: 'center', diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index e76240a..213ee2a 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -20,7 +20,7 @@ const routes: Routes = [ { path: 'user-info', loadChildren: () => import('./login/libUser.module').then(m => m.LibUserModule), - data: {hasSidebar: false} + data: {hasSidebar: true} }, { path: 'error', pathMatch: 'full', diff --git a/src/app/pages/community-routing.module.ts b/src/app/pages/community-routing.module.ts index 23867e9..db7d597 100644 --- a/src/app/pages/community-routing.module.ts +++ b/src/app/pages/community-routing.module.ts @@ -31,7 +31,11 @@ import {ConnectRIGuard} from "../openaireLibrary/connect/communityGuard/connectR { path: 'customize-layout', loadChildren: () => import('./customization/customization.module').then(m => m.CustomizationModule), - } + }, + { + path: 'user-info', + loadChildren: () => import('../login/libUser.module').then(m => m.LibUserModule), + }, ])] }) export class CommunityRoutingModule {} diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 622a654..fd327ea 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -85,5 +85,6 @@ export let properties: EnvProperties = { lastIndexUpdate: "2020-05-06", indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/", admins: ["rcd@openaire.eu"], - adminPortalURL: "https://beta.admin.connect.openaire.eu" + adminPortalURL: "https://beta.admin.connect.openaire.eu", + errorLink: '/error' }; diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index afcfe95..00d8c0d 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -85,5 +85,6 @@ export let properties: EnvProperties = { lastIndexUpdate: "2020-12-17", indexInfoAPI: "https://services.openaire.eu/openaire/info/", admins: ["rcd@openaire.eu"], - adminPortalURL: "https://admin.connect.openaire.eu" + adminPortalURL: "https://admin.connect.openaire.eu", + errorLink: '/error' }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 71c1a70..3792903 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -90,5 +90,6 @@ export let properties: EnvProperties = { lastIndexUpdate: '2019-05-16', indexInfoAPI: 'http://beta.services.openaire.eu/openaire/info/', admins: ['kostis30fylloy@gmail.com'], - adminPortalURL: 'https://beta.admin.connect.openaire.eu' + adminPortalURL: 'https://beta.admin.connect.openaire.eu', + errorLink: '/error' };