diff --git a/angular.json b/angular.json index 4025e05..546d2b6 100644 --- a/angular.json +++ b/angular.json @@ -45,7 +45,8 @@ "src/assets" ], "styles": [ - "src/styles.css", + "src/styles.less", + "src/deprecated.css", "src/material.scss" ], "scripts": [ diff --git a/package.json b/package.json index 1f781fc..064ee1c 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "rxjs": "^6.5.1", "ts-md5": "^1.2.0", "tslib": "^2.0.0", + "uikit": "^3.12.0", "zone.js": "~0.10.2" }, "devDependencies": { @@ -51,11 +52,11 @@ "@angular/compiler-cli": "~11.2.14", "@angular/language-service": "~11.2.14", "@nguniversal/builders": "^11.2.1", - "@types/node": "^12.11.1", + "@types/compression": "^1.7.0", + "@types/express": "^4.17.0", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.3", - "@types/express": "^4.17.0", - "@types/compression": "^1.7.0", + "@types/node": "^12.11.1", "codelyzer": "^6.0.0", "jasmine-core": "~3.8.0", "jasmine-spec-reporter": "~5.0.0", diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 584bcd0..9a81e29 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -32,7 +32,7 @@ import {NotificationHandler} from "./openaireLibrary/utils/notification-handler" @Component({ selector: 'app-root', template: ` -
+
@@ -193,14 +193,6 @@ export class AppComponent implements OnInit, OnDestroy { private init() { let communityId: string = ConnectHelper.getCommunityFromDomain(this.properties.domain); this.showMenu = false; - if(typeof document !== "undefined") { - if(communityId) { - document.body.classList.add(communityId + 'App'); - document.body.classList.add('communityApp'); - } else { - document.body.classList.add('connectApp'); - } - } this.initAdminToolCommunity(communityId); this.buildMenu(communityId); // this.communityId = communityId; diff --git a/src/app/communities/browseCommunity/browse-community.component.html b/src/app/communities/browseCommunity/browse-community.component.html index 8b6a4fb..fc0ebf9 100644 --- a/src/app/communities/browseCommunity/browse-community.component.html +++ b/src/app/communities/browseCommunity/browse-community.component.html @@ -1,15 +1,15 @@ + class="uk-height-1-1 uk-link-reset"> + class="uk-height-1-1 uk-link-reset">
+ class="uk-text-background uk-text-small uk-position-top-left uk-padding-small uk-text-uppercase uk-text-bold"> Member
private
- -
- - - - - - - - - - - - - - -
{{(community.title)?community.title:community.shortTitle}} logo - - - - - - -
- -
-
-

- - - - - - - - - - - +

+
+

{{community.title.slice(0, thresholdTitle)}} ... @@ -74,32 +39,11 @@ {{community.shortTitle.slice(0, thresholdTitle)}} ... - -

-
- - {{_formatDescription(community.description)}} - - + +
+ {{_formatDescription(community.description)}} +
- - - - - - - - - - - - -
- - -
- 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 bcbdd82..106fd0f 100644 --- a/src/app/communities/browseCommunity/browse-community.component.ts +++ b/src/app/communities/browseCommunity/browse-community.component.ts @@ -9,6 +9,7 @@ import {Subscriber} from "rxjs"; import {properties} from "../../../environments/environment"; import {StringUtils} from "../../openaireLibrary/utils/string-utils.class"; import {Visibility} from "../../openaireLibrary/monitor/entities/stakeholder"; +import {AlertModal} from "../../openaireLibrary/utils/modal/alert"; @Component({ selector: 'browse-community', @@ -19,7 +20,7 @@ export class BrowseCommunityComponent { @Input() public community: CommunityInfo = null; @Input() public showDescription: boolean = true; @Input() public smallTitle: boolean = false; - @ViewChild('AlertModal', { static: true }) modal; + @ViewChild('alertModal', { static: true }) modal: AlertModal; 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 @@ -72,7 +73,7 @@ export class BrowseCommunityComponent { this.modal.okButton = true; this.modal.alertTitle = 'You are going to visit ' + ((this.community.title) ? this.community.title : this.community.shortTitle) + ' Gateway'; - this.modal.alertMessage = false; + this.modal.message = 'You will be navigated to a new tab. Are you sure that you want to proceed?' this.modal.okButtonLeft = false; this.modal.okButtonText = 'Yes'; this.modal.cancelButtonText = 'No'; diff --git a/src/app/communities/communities.component.html b/src/app/communities/communities.component.html index 8b709e0..7e4a3b7 100644 --- a/src/app/communities/communities.component.html +++ b/src/app/communities/communities.component.html @@ -5,12 +5,12 @@

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

Turn Open Science into Practice.
-
It takes your open and divnked research outcomes.
+
It takes your open and linked {{entities.RESULTS | lowercase}}.
A service customized to your needs.
@@ -29,37 +29,37 @@
-
+

- Find a repository to
deposit - your research
outcome + Find a repository to deposit + your {{entities.RESULT | lowercase}} .

- Link your research
output - with your
community, funding,
and other research
products + Link your {{entities.RESULT | lowercase}} + with your community, funding, and other {{entities.RESULTS | lowercase}} .

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

Search & browse - your
community's research
products + your community's {{entities.RESULTS | lowercase}} .

View statistics - for
your community's
research products + for your community's {{entities.RESULTS | lowercase}} .

@@ -111,7 +111,7 @@

- Our mission for an
Open and FAIR science. + Our mission for an Open and FAIR science.

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. +
An overlay platform making it easy to share, link, disseminate and monitor all your {{entities.PUBLICATIONS | lowercase}}, + {{entities.DATASETS | lowercase}}, {{entities.SOFTWARE | lowercase}}, methods. In one place.
@@ -230,12 +230,12 @@
-

Community Gateways
already in action.

+

Community Gateways already in action.

-
+
@@ -272,13 +272,12 @@
-
-

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

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

- CONTACT US + Contact us

diff --git a/src/app/communities/communities.component.ts b/src/app/communities/communities.component.ts index 84519cd..dc8445b 100644 --- a/src/app/communities/communities.component.ts +++ b/src/app/communities/communities.component.ts @@ -17,6 +17,8 @@ import {Subscriber} from "rxjs"; import {Session, User} from "../openaireLibrary/login/utils/helper.class"; import {UserManagementService} from "../openaireLibrary/services/user-management.service"; import {QuickContactService} from "../openaireLibrary/sharedComponents/quick-contact/quick-contact.service"; +import {StakeholderInfo} from "../openaireLibrary/monitor/entities/stakeholder"; +import {OpenaireEntities} from "../openaireLibrary/utils/properties/searchFields"; @Component({ selector: 'communities', @@ -27,10 +29,8 @@ import {QuickContactService} from "../openaireLibrary/sharedComponents/quick-con export class CommunitiesComponent implements OnInit, OnDestroy, AfterViewInit { private subscriptions = []; private user: User; - public pageTitle = "OpenAIRE" public researchCommunities: CommunityInfo[] = []; - public gifs: { "gif": string, "header": string, "text" }[] = []; public pageContents = null; public divContents = null; // Message variables @@ -42,7 +42,7 @@ export class CommunitiesComponent implements OnInit, OnDestroy, AfterViewInit { public showQuickContact: boolean = true; @ViewChildren('scrolling_element') elements: QueryList; @ViewChild('contact') contact: ElementRef; - + public entities = OpenaireEntities; public properties: EnvProperties = properties; public keyword: string = ""; public type: string = "all"; @@ -86,7 +86,6 @@ export class CommunitiesComponent implements OnInit, OnDestroy, AfterViewInit { error => { this.getCommunities(); })); - this.createGifs(); //this.getDivContents(); this.getPageContents(); } @@ -198,33 +197,9 @@ export class CommunitiesComponent implements OnInit, OnDestroy, AfterViewInit { } )); } - - private createGifs() { - this.gifs.push({ - gif: "assets/connect-assets/home/gifs/deposit.gif", - header: "Find a repository to deposit your research outcome", - text: "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." - }); - this.gifs.push({ - gif: "assets/connect-assets/home/gifs/link.gif", - header: "Link your research output with your community, funding, and other research products", - text: "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." - }); - this.gifs.push({ - gif: "assets/connect-assets/home/gifs/overview.gif", - header: "View community's overview at a glance", - text: "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." - }); - this.gifs.push({ - gif: "assets/connect-assets/home/gifs/results.gif", - header: "Search & browse your community's research products. ", - text: "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." - }); - this.gifs.push({ - gif: "assets/connect-assets/home/gifs/graph-analysis.gif", - header: "View statistics for your community's research products.", - text: "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." - }); + + hasPermission(communityInfo: CommunityInfo) { + return communityInfo.status === "all" || (communityInfo.status === "manager" && communityInfo.isManager); } private sort(results: CommunityInfo[]) { diff --git a/src/app/learn-how/learn-how.component.css b/src/app/learn-how/learn-how.component.css index 75c7388..af15b2a 100644 --- a/src/app/learn-how/learn-how.component.css +++ b/src/app/learn-how/learn-how.component.css @@ -3,4 +3,5 @@ background-size: auto; background-repeat: no-repeat; background-position: left 90%; + min-height: 100vh; } diff --git a/src/app/learn-how/learn-how.component.ts b/src/app/learn-how/learn-how.component.ts index b5e89a2..8fde2ed 100644 --- a/src/app/learn-how/learn-how.component.ts +++ b/src/app/learn-how/learn-how.component.ts @@ -95,7 +95,7 @@ import {properties} from "../../environments/environment";
Here are the most important questions that the OpenAIRE team will ask you, in order to understand your scope and goals:
-
    +
    • Do you want a gateway, where researchers can have access to all research products of a discipline? Do you want a gateway that gathers any research outcome, produced thanks to the funding and services of a given research infrastructure?
      • diff --git a/src/app/my-communities/my-communities.component.html b/src/app/my-communities/my-communities.component.html index 808f222..27de64f 100644 --- a/src/app/my-communities/my-communities.component.html +++ b/src/app/my-communities/my-communities.component.html @@ -21,7 +21,7 @@
      -
      +
      @@ -40,7 +40,7 @@
      -
      +
      @@ -68,7 +68,7 @@
      -
      +
      @@ -87,7 +87,7 @@
      -
      +
      @@ -123,7 +123,7 @@
      -
      +
      @@ -142,7 +142,7 @@
      -
      +
      diff --git a/src/app/my-communities/my-communities.component.ts b/src/app/my-communities/my-communities.component.ts index 2b6d02f..80fea74 100644 --- a/src/app/my-communities/my-communities.component.ts +++ b/src/app/my-communities/my-communities.component.ts @@ -98,6 +98,10 @@ export class MyCommunitiesComponent { })); } + hasPermission(communityInfo: CommunityInfo) { + return communityInfo.status === "all" || (communityInfo.status === "manager" && communityInfo.isManager); + } + public getCommunities() { this.loading = true; this.status = this.errorCodes.LOADING; diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 0bd6b3c..d42edec 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 0bd6b3cfb1b1d30c276693d06a2c7234f0df5d0b +Subproject commit d42edec5392ab58751f8e67b864cad7343666bd5 diff --git a/src/assets/common-assets b/src/assets/common-assets index b261d0f..7d090b0 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit b261d0f8459d21deddefc60765b3013815f1b865 +Subproject commit 7d090b046beccbf906ceedf8a876f29cd883ac17 diff --git a/src/assets/connect-custom.css b/src/assets/connect-custom.less similarity index 85% rename from src/assets/connect-custom.css rename to src/assets/connect-custom.less index bac4252..c22e46e 100644 --- a/src/assets/connect-custom.css +++ b/src/assets/connect-custom.less @@ -3,35 +3,34 @@ Define variables for connect Custom connect css */ .connectApp { - /*buttons*/ - --button-primary-background: var(--connect-color); - --button-primary-background-image: linear-gradient(110deg, var(--connect-light-color) 0%, var(--connect-dark-color) 100%); - --button-primary-color: var(--text-default-color); - --button-secondary-background: var(--light-color); - --button-secondary-background-image: none; - --button-secondary-border-color: var(--grey-color); - --button-secondary-color: var(--grey-color); - --button-secondary-background-hover: var(--secondary-color); - --button-secondary-border-color-hover: var(--secondary-color); - --button-secondary-background-image-hover: none; - --button-secondary-color-hover: var(--light-color); + /* Import OpenAIRE theme*/ + @import (multiple) "~src/assets/openaire-theme/less/_import"; - /*backgrounds*/ - --background-primary: var(--connect-color); - --background-primary-rgb: var(--connect-color-rgb); - --background-primary-image:none; - --background-secondary: var(--grey-color); - --background-secondary-image:none; + /** Global */ + @global-primary-gradient: linear-gradient(110deg, @connect-light-color 0%, @connect-dark-color 100%); - /*fonts*/ - --text-primary-color:var(--connect-color); - --text-gradient-color: linear-gradient(110deg, var(--connect-light-color) 0%, var(--connect-dark-color) 100%); - --text-secondary-color: var(--primary-color); -} + /** Background*/ + @background-primary-background: @connect-color; -.connectApp .search-form { - background-color: rgba(var(--secondary-color-rgb), 0.2); - background-image: none; + /** Buttons */ + @button-primary-background: @connect-color; + @button-primary-color: @global-color; + @button-secondary-border: @global-color; + @button-secondary-color: @global-color; + @button-secondary-hover-background: @global-secondary-background; + @button-secondary-hover-background-gradient: none; + @button-secondary-active-background: @global-secondary-background; + @button-secondary-active-background-gradient: none; + + /** Label */ + @label-secondary-color: @connect-color; + @label-secondary-border: @connect-color; + + /** Text */ + @text-primary-color: @connect-color; + @text-background-color: @connect-color; + @text-secondary-color: @primary-color; + @inverse-text-primary-color: @connect-color; } /*.whiteBackground { diff --git a/src/assets/customization.css b/src/assets/customization.less similarity index 100% rename from src/assets/customization.css rename to src/assets/customization.less diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index bd15bab..91ffc2c 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit bd15bab85dde4018155a631d9cf6ecdfe98ebe9a +Subproject commit 91ffc2ccce484309c2fd27508785172255783ae3 diff --git a/src/deprecated.css b/src/deprecated.css new file mode 100644 index 0000000..4a1b14d --- /dev/null +++ b/src/deprecated.css @@ -0,0 +1,8 @@ +@import "assets/openaire-theme/css/structure/variables.css"; +@import "assets/openaire-theme/css/openaire.css"; +@import "assets/common-assets/library.css"; + +.connectApp { + /* Search */ + --search-form-background: rgba(var(--secondary-color-rgb), 0.2); +} diff --git a/src/styles.css b/src/styles.css deleted file mode 100644 index b0ffc6b..0000000 --- a/src/styles.css +++ /dev/null @@ -1,5 +0,0 @@ -/* You can add global styles to this file, and also import other style files */ -@import "assets/openaire-theme/css/import.css"; -@import "assets/common-assets/library.css"; -@import "assets/common-assets/common/custom.css"; -@import "assets/connect-custom.css"; diff --git a/src/styles.less b/src/styles.less new file mode 100644 index 0000000..0326d04 --- /dev/null +++ b/src/styles.less @@ -0,0 +1,3 @@ +/* You can add global styles to this file, and also import other style files */ +@import "~src/assets/openaire-theme/less/_import"; +@import "assets/connect-custom";