diff --git a/src/app/communities/browseCommunity/browse-community.component.html b/src/app/communities/browseCommunity/browse-community.component.html index 4893ae3..7ea42a5 100644 --- a/src/app/communities/browseCommunity/browse-community.component.html +++ b/src/app/communities/browseCommunity/browse-community.component.html @@ -1,52 +1,76 @@ -
-
-
- Subscribed -
-
- Private -
-
-
- -
- {{(community.title)?community.title:community.shortTitle}} logo - - - + + + + + + + +
+
+
+ Subscribed
- - -
+ + + + +
+
+ + restricted +
+
+ + private +
+ -
-
- +
+
+ + + + + + + + + + + {{community.title.slice(0, thresholdTitle)}} ... @@ -55,38 +79,30 @@ {{community.shortTitle.slice(0, thresholdTitle)}} ... - - - - {{community.title.slice(0, thresholdTitle)}} - ... - - - {{community.shortTitle.slice(0, thresholdTitle)}} - ... - - -
-
- + + +
+ {{_formatDescription(community.description)}} - - + +
-
-
- - Visit - - - Visit - -
+ + + + + + + + + + + +
-
+ +
You will be navigated to a new tab. Are you sure that you want to proceed? diff --git a/src/app/communities/browseCommunity/browse-community.component.ts b/src/app/communities/browseCommunity/browse-community.component.ts index 15947ea..10de810 100644 --- a/src/app/communities/browseCommunity/browse-community.component.ts +++ b/src/app/communities/browseCommunity/browse-community.component.ts @@ -8,6 +8,7 @@ import {LocalStorageService} from "../../openaireLibrary/services/localStorage.s import {Subscriber} from "rxjs"; import {properties} from "../../../environments/environment"; import {StringUtils} from "../../openaireLibrary/utils/string-utils.class"; +import {Visibility} from "../../openaireLibrary/monitor/entities/stakeholder"; @Component({ selector: 'browse-community', @@ -23,11 +24,16 @@ export class BrowseCommunityComponent { public hiddenMessage: string = "Community is hidden to registered users. It is visible only to users that have privileges to manage community; delay: 100"; // cut title too // check title length, if is manager, if is private and cut description accordingly - public thresholdTitle: number = 50; + public thresholdTitle: number = 45; public thresholdDescription: number = 120; properties: EnvProperties; public directLink: boolean = true; + visibilityIcon: Map = new Map ([ + ["PRIVATE", 'lock'], + ["RESTRICTED", 'group'] + ]); + constructor(private route: ActivatedRoute, private router: Router, private location: Location, diff --git a/src/app/communities/browseCommunity/browse-community.module.ts b/src/app/communities/browseCommunity/browse-community.module.ts index 5838017..1ac93fb 100644 --- a/src/app/communities/browseCommunity/browse-community.module.ts +++ b/src/app/communities/browseCommunity/browse-community.module.ts @@ -10,11 +10,12 @@ import {ManageModule} from '../../openaireLibrary/utils/manage/manag import {AlertModalModule} from "../../openaireLibrary/utils/modal/alertModal.module"; import {UrlPrefixModule} from "../../openaireLibrary/utils/pipes/url-prefix.module"; import {LogoUrlPipeModule} from "../../openaireLibrary/utils/pipes/logoUrlPipe.module"; +import {IconsModule} from "../../openaireLibrary/utils/icons/icons.module"; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, - SearchFormModule, ManageModule, AlertModalModule, UrlPrefixModule, LogoUrlPipeModule + SearchFormModule, ManageModule, AlertModalModule, UrlPrefixModule, LogoUrlPipeModule, IconsModule ], declarations: [ BrowseCommunityComponent diff --git a/src/app/communities/communities.component.html b/src/app/communities/communities.component.html index e6a1ccb..36a5d2b 100644 --- a/src/app/communities/communities.component.html +++ b/src/app/communities/communities.component.html @@ -1,101 +1,155 @@ -
-
-
-
-
-

Build a Gateway for your Community. +
+ +
+
+
+
+

+ Build a Gateway +
for your
Community.

-
    +
    • Turn Open Science into Practice.
    • It takes your open and linked research outcomes.
    • A service customized to your needs.
    -
    LEARN - HOW
    -
-
+
+ LEARN MORE +
+ + + + + + + + +
-
-
- -
-
-
-

Community Gateways already in action

-
+
+ +
+
+

Community Gateways
already in action.

+
-
-
+ class="uk-visible@l uk-grid-match uk-grid-medium uk-flex-center uk-text-center" + uk-grid uk-height-match=".community-logo"> +
+
+ +
+
+
+ +
+
+
+
+ + + View All + + + +
-
- - - Browse All - - - + +
+ +
+
+
Benefits
+

Find the best
for your community.

+
+
+
+ +
+
+

+ Find a repository to deposit + your research outcome + . +

+

+ Link your research output + with your community, funding and other research products + . +

+

+ View community's + overview at a glance. +

+

+ Search & browse + your community's research products + . +

+

+ View statistics + for your community's research products + . +

+
+
-
-
-
-

Our mission for an Open and FAIR science

-
+ +
+
+

Our mission for an
Open and FAIR science.

+
-
-
-
+
+
+
-
+
-
A Virtual Research Environment
+
A Virtual Research Environment
An overlay platform making it easy to share, link, disseminate and monitor all your publications, data, software, methods. In one place.
-
    -
  • -
    - - - -
    +
      + + + + + + + +
    • + Access to OpenAIRE research graph
      • -
    • -
      - - - -
      +
    • + Moderated, front-end linking
      • -
    • -
      - - - -
      +
    • + Cross-platform search
    @@ -104,45 +158,31 @@
-
-
-
+
+
+
-
+
-
Open Science in action
+
Open Science in action
A time-saving bundle of services for researchers to effortlessly practice open science. An integral part of the European Open Science Cloud.
-
    -
  • -
    - - - -
    +
      +
    • + Use of OpenAIRE Guidelines
      • -
    • -
      - - - -
      +
    • + Publish and get DOIs with Zenodo
      • -
    • -
      - - - -
      +
    • + EOSC Single Sign-On
    @@ -151,46 +191,32 @@
-
-
-
+
+
+
-
+
-
Customized to your needs
+
Customized to your needs
A Gateway with your own brand, rules for aggregation, text & data mining, and presentation. Run by you via a simple, yet powerful backend administration tool.
-
    -
  • -
    - - - -
    +
      +
    • + Access control
      • -
    • -
      - - - -
      +
    • + Analytics: rich set of indicators
      • -
    • -
      - - - -
      +
    • + Look & feel to match your brand
    @@ -202,140 +228,130 @@
-
-
-
-
-
    -
  • -
    -
    - -
    -
    -
    -

    Find a repository to deposit your research outcome

    -
    This is OpenAIRE’s key service for research - communities, both established and emerging ones. Our service helps you reach out and engage all your - researchers to practice open science out-of-the-box. -
    -
    learn more
    -
    -
    -
    -
    • -
  • -
    -
    - -
    -
    -
    -

    Link your research output with your community, funding, and other research - products

    -
    This is OpenAIRE’s key service for research - communities, both established and emerging ones. Our service helps you reach out and engage all your - researchers to practice open science out-of-the-box. -
    -
    learn more
    -
    -
    -
    -
    • -
  • -
    -
    - -
    -
    -
    -

    View community's overview at a glance

    -
    This is OpenAIRE’s key service for research - communities, both established and emerging ones. Our service helps you reach out and engage all your - researchers to practice open science out-of-the-box. -
    -
    learn more
    -
    -
    -
    -
    • -
  • -
    -
    - -
    -
    -
    -

    Search & browse your community's research products.

    -
    This is OpenAIRE’s key service for research - communities, both established and emerging ones. Our service helps you reach out and engage all your - researchers to practice open science out-of-the-box. -
    -
    learn more
    -
    -
    -
    -
    • -
  • -
    -
    - -
    -
    -
    -

    View statistics for your community's research products.

    -
    This is OpenAIRE’s key service for research - communities, both established and emerging ones. Our service helps you reach out and engage all your - researchers to practice open science out-of-the-box. -
    -
    learn more
    -
    -
    -
    -
    • -
-
    - - - - - -
-
-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
-
- - - - -

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
- - -
-
-
-
- +
+

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

+ CONTACT US
+ + + + + diff --git a/src/app/communities/communities.component.ts b/src/app/communities/communities.component.ts index 08446ea..fcd23cf 100644 --- a/src/app/communities/communities.component.ts +++ b/src/app/communities/communities.component.ts @@ -14,6 +14,8 @@ import {HelperService} from "../openaireLibrary/utils/helper/helper.service"; import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service"; import {properties} from "../../environments/environment"; import {Subscriber} from "rxjs"; +import {Session, User} from "../openaireLibrary/login/utils/helper.class"; +import {UserManagementService} from "../openaireLibrary/services/user-management.service"; @Component({ selector: 'communities', @@ -22,6 +24,7 @@ import {Subscriber} from "rxjs"; export class CommunitiesComponent { private subscriptions = []; + private user: User; public pageTitle = "OpenAIRE" public researchCommunities: CommunityInfo[] = []; @@ -47,7 +50,8 @@ export class CommunitiesComponent { private _piwikService: PiwikService, private _communitiesService: CommunitiesService, private helper: HelperService, - private seoService: SEOService) { + private seoService: SEOService, + private userManagementService: UserManagementService) { var description = "OpenAIRE - Connect, Community Dashboard, research community"; var title = "OpenAIRE - Connect"; @@ -70,7 +74,13 @@ export class CommunitiesComponent { if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { this.subscriptions.push(this._piwikService.trackView(this.properties, "OpenAIRE Connect", this.properties.piwikSiteId).subscribe()); } - this.getCommunities(); + this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { + this.user = user; + this.getCommunities(); + }, + error => { + this.getCommunities(); + })); this.createGifs(); //this.getDivContents(); this.getPageContents(); @@ -97,6 +107,8 @@ export class CommunitiesComponent { this.subscriptions.push(this._communitiesService.getCommunitiesState().subscribe( communitiesResults => { + console.log("getCommunitiesState", communitiesResults); + if(!communitiesResults){ return; } @@ -107,6 +119,8 @@ export class CommunitiesComponent { this.sort(communitiesResults); communitiesResults.forEach((community, index) => { let showCommunity: boolean = true; + community.isSubscribed = Session.isSubscribedTo('community', community.communityId, this.user); + if (community['status'] == "hidden" || community['status'] == "manager") { showCommunity = false; } diff --git a/src/app/communities/communities.module.ts b/src/app/communities/communities.module.ts index bc81c64..7807f63 100644 --- a/src/app/communities/communities.module.ts +++ b/src/app/communities/communities.module.ts @@ -18,13 +18,15 @@ import {GifSliderModule} from "../openaireLibrary/utils/gif-slider/gif-slider.mo import {OtherPortalsModule} from "../openaireLibrary/sharedComponents/other-portals/other-portals.module"; import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module"; import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard"; +import {SectionScrollModule} from "../openaireLibrary/utils/section-scroll/section-scroll.module"; +import {IconsModule} from "../openaireLibrary/utils/icons/icons.module"; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, ManageModule, ErrorMessagesModule, SearchFormModule, BrowseCommunityModule, GifSliderModule, OtherPortalsModule, - HelperModule, SEOServiceModule + HelperModule, SEOServiceModule, SectionScrollModule, IconsModule ], declarations: [ CommunitiesComponent diff --git a/src/assets/connect-custom.css b/src/assets/connect-custom.css index 738d71f..061549e 100644 --- a/src/assets/connect-custom.css +++ b/src/assets/connect-custom.css @@ -8,6 +8,7 @@ Custom connect css --button-primary-background-image: none; --button-secondary-background: var(--secondary-color); --button-secondary-background-image: none; + --button-primary-color: var(--font-default-color); /*backgrounds*/ --primary-background: #2C2C2C; @@ -19,6 +20,21 @@ Custom connect css /*--secondary-background: var(--secondary-color);*/ } +.whiteBackground { + background-color: #fff; +} + +.homeBackgroundImage { + background-image: url(~src/assets/connect-assets/home/connect_long_image.png); +} + +.community-logo img { + max-height: 76px; + max-width: 100%; + height: auto; +} + + /*OLD css*/ /*:root {*/