diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 6176d41..fb5abb1 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -135,6 +135,7 @@ export class AppComponent { this.userMenuItems.push(new MenuItem("", "Manage profiles", this.properties.domain + properties.baseLink + "/dashboard/admin", "", false, [], [], {})) } + this.userMenuItems.push(new MenuItem("", "My Dashboards", "", "/my-dashboards", false, [], [], {})); this.userMenuItems.push(new MenuItem("", "User information", "", "/user-info", false, [], [], {})); } } diff --git a/src/app/browse-stakeholder/browse-stakeholder.component.html b/src/app/browse-stakeholder/browse-stakeholder.component.html index ae2ab0b..2a7d759 100644 --- a/src/app/browse-stakeholder/browse-stakeholder.component.html +++ b/src/app/browse-stakeholder/browse-stakeholder.component.html @@ -9,32 +9,23 @@
- + class="uk-position-top-right uk-margin-small-top uk-margin-small-right uk-flex uk-flex-column uk-flex-middle"> + {{stakeholder.visibility.toLowerCase()}}
-
-
- {{(community.title)?community.title:community.shortTitle}} logo +
+ +
+
+
{{mapType(stakeholder.type)}}
+
+

+ {{stakeholder.name}} +

-
-
-

- - {{community.title.slice(0, thresholdTitle)}} - ... - - - {{community.shortTitle.slice(0, thresholdTitle)}} - ... - - -

-
+
-
You will be navigated to a new tab. Are you sure that you want to proceed? diff --git a/src/app/browse-stakeholder/browse-stakeholder.component.ts b/src/app/browse-stakeholder/browse-stakeholder.component.ts index 5ba588d..cf46f8c 100644 --- a/src/app/browse-stakeholder/browse-stakeholder.component.ts +++ b/src/app/browse-stakeholder/browse-stakeholder.component.ts @@ -1,7 +1,7 @@ import {Component, Input, ViewChild} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {Location} from '@angular/common'; -import {Stakeholder, StakeholderInfo, Visibility} from "../openaireLibrary/monitor/entities/stakeholder"; +import {StakeholderInfo, Visibility} from "../openaireLibrary/monitor/entities/stakeholder"; import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties"; import {properties} from "../../environments/environment" import {LocalStorageService} from "../openaireLibrary/services/localStorage.service"; @@ -13,10 +13,7 @@ import {Subscriber} from "rxjs"; }) export class BrowseStakeholderComponent { @Input() public stakeholder: StakeholderInfo = null; - @Input() public showDescription: boolean = true; - @Input() public smallTitle: boolean = false; @ViewChild('AlertModal', { static: true }) modal; - public thresholdTitle: number = 45; public properties: EnvProperties = properties; public directLink: boolean = true; public visibilityIcon: Map = new Map ([ @@ -46,14 +43,17 @@ export class BrowseStakeholderComponent { } }); } - - - isProduction(): boolean { - return this.properties.environment != "development"; - } - - getProductionPrefix(id:string): string { - return (this.properties.environment == "production") ? "" : "beta."; + + mapType(type: string) { + if(type === 'ri') { + return 'Research Initiative'; + } else if(type === 'community') { + return 'Research Community' + } else if(type === 'organization') { + return 'Institution'; + } else { + return type; + } } public confirmModalOpen() { diff --git a/src/app/browse-stakeholder/browse-stakeholder.module.ts b/src/app/browse-stakeholder/browse-stakeholder.module.ts index ff9ba32..75a195d 100644 --- a/src/app/browse-stakeholder/browse-stakeholder.module.ts +++ b/src/app/browse-stakeholder/browse-stakeholder.module.ts @@ -1,18 +1,18 @@ -import {NgModule} from '@angular/core'; -import {CommonModule} from '@angular/common'; -import {FormsModule} from '@angular/forms'; -import {RouterModule} from '@angular/router'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {RouterModule} from '@angular/router'; import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module"; -import {UrlPrefixModule} from "../openaireLibrary/utils/pipes/url-prefix.module"; import {ManageModule} from "../openaireLibrary/utils/manage/manage.module"; import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module"; import {IconsModule} from "../openaireLibrary/utils/icons/icons.module"; import {BrowseStakeholderComponent} from "./browse-stakeholder.component"; +import {IconsService} from "../openaireLibrary/utils/icons/icons.service"; +import {incognito} from "../openaireLibrary/utils/icons/icons"; @NgModule({ imports: [ - CommonModule, FormsModule, RouterModule, - ManageModule, AlertModalModule, UrlPrefixModule, LogoUrlPipeModule, IconsModule + CommonModule, RouterModule, + ManageModule, AlertModalModule, LogoUrlPipeModule, IconsModule ], declarations: [ BrowseStakeholderComponent @@ -23,4 +23,8 @@ import {BrowseStakeholderComponent} from "./browse-stakeholder.component"; BrowseStakeholderComponent ] }) -export class BrowseStakeholderModule { } +export class BrowseStakeholderModule { + constructor(private iconsService: IconsService) { + this.iconsService.registerIcons([incognito]); + } +} diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 3936bc8..185d3c2 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -1,550 +1,248 @@
-
-
-
-
-

- A new era of
monitoring
research. -

-
+
+
+
+
+

+ A new era of
monitoring
research. +

+
Work together with us to view, understand and visualize
research statistics and indicators.
GET STARTED
-
-
-
-
- -
-
- Benefits -

Simplify open science
tracking & monitoring.

-
-
-
-
- img1 -
-
- img2 -
-
- img3 -
-
-
-
-
-

- Get a complete
picture. -

-

Track and discover your organization’s research output.
Use the OpenAIRE Research Graph to get a 360o view of
your publications-data-code.

-
-
-
-
-

- Monitor open science
compliance. -

-

Work with the open science expert community
for open and transparent metrics. Discover open
science trends for your organization and see how
you fare in EOSC.

-
-
-
-
-

- Turn research
results to insights. -

-

Understand your community. Measure impact,
discover trends, connections and collaborations
to improve and optimize your future actions.

-
-
-
- -
-

- Tap into the OpenAIRE
Research Graph. -

-
- -
- - - - - -
-
-
-
-
-
- Features -

Open data.
Open
methodologies.

- +
+
+
+
+ +
+
+ Benefits +

Simplify open science
tracking & monitoring.

+
+
+
+
+ img1 +
+
+ img2 +
+
+ img3 +
+
+
+
+
+

+ Get a complete
picture. +

+

Track and discover your organization’s research output.
Use the OpenAIRE Research + Graph to get a 360o view of
your publications-data-code.

+
+
+
+
+

+ Monitor open science
compliance. +

+

Work with the open science expert community
for open and transparent metrics. + Discover open
science trends for your organization and see how
you fare in EOSC.

+
+
+
+
+

+ Turn research
results to insights. +

+

Understand your community. Measure impact,
discover trends, connections and + collaborations
to improve and optimize your future actions.

+
+
+
+ +
+

+ Tap into the OpenAIRE
Research Graph. +

+
+
+ + +
+
+
{{(numberSize.number|number) + numberSize.size}}
+
{{name}}
+
+
+ + +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+
+
+ Features +

Open data.
Open
methodologies.

+ Learn More - -
-
-
-
- -
-
- Global outlook -
-
- Monitor is built on the OpenAIRE Research Graph. An interconnected scholarly communication shared data resource from open initiatives around the world, of global interest. -
-
-
-
- -
-
- Minimum effort to join -
-
- You only share some information with us to include in out backend aggregating and data mining, and we deliver a view of your world. As you see fit. -
-
-
-
- -
-
- Transparent methodology -
-
- We base our service on open science principles. We rely on open data sources, and document our algorithms for every metric and indicator we publish. -
-
-
-
- -
-
- Customised to your needs -
-
- Choose from a variety of pre-defined metrics. Select how to visualize them, and who to share with. Use our advanced tools and expertise add add your own metrics. -
-
-
-
-
-
-

Dashboards
in action.

-
- Short description of “what monitor members are”, sed diam nonumy eirmod
tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
voluptua. At vero eos et accusam et justo duo dolores et ea rebum. -
- + +
+
+
+
+ +
+
+ Global outlook +
+
+ Monitor is built on the OpenAIRE Research Graph. An interconnected scholarly communication shared data + resource from open initiatives around the world, of global interest. +
+
+
+
+ +
+
+ Minimum effort to join +
+
+ You only share some information with us to include in out backend aggregating and data mining, and we + deliver a view of your world. As you see fit. +
+
+
+
+ +
+
+ Transparent methodology +
+
+ We base our service on open science principles. We rely on open data sources, and document our algorithms + for every metric and indicator we publish. +
+
+
+
+ +
+
+ Customised to your needs +
+
+ Choose from a variety of pre-defined metrics. Select how to visualize them, and who to share with. Use our + advanced tools and expertise add add your own metrics. +
+
+
+
+
+
+

Dashboards
in action.

+
+ Short description of “what monitor members are”, sed diam nonumy eirmod
tempor invidunt ut labore et dolore + magna aliquyam erat, sed diam
voluptua. At vero eos et accusam et justo duo dolores et ea rebum. +
+ Browse them all - -
- - - - - - - - - - - - - - - - - -
-
    -
  • -
    -
    -
    -
    - {{stakeholder.name}} -
    -
    -
    -
    -
    • -
-
    -
    -     - -
    -
      -
    • -
      -
      -
      -
      - {{stakeholder.name}} -
      -
      -
      -
      -
      • -
    -
      -
      -       - -
      -
        -
      • -
        -
        -
        -
        - {{stakeholder.name}} -
        -
        -
        -
        -
        • -
      -
        -
        -         - -
        -
          -
        • -
          -
          -
          -
          - {{stakeholder.name}} -
          -
          -
          -
          -
          • -
        -
          -
          -           -
          -
          -
          -

          - Need more information?
          Get in touch and let us help you. -

          - Contact us -
          + +
          +
          + +
          + + + + + + + + + + + + + + + + + +
          +
            +
          • +
            +
            +
            +
            + +
            +
            +
            +
            +
            • +
          +
            +
            +             +
            +
            +
            +

            + Need more information?
            Get in touch and let us help you. +

            + Contact us +
            - diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index c944994..9522058 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -3,7 +3,6 @@ import {ActivatedRoute, Router} from '@angular/router'; import {Meta, Title} from '@angular/platform-browser'; import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties'; import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service'; -import {StringUtils} from '../openaireLibrary/utils/string-utils.class'; import {ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes'; import {ErrorMessagesComponent} from '../openaireLibrary/utils/errorMessages.component'; @@ -14,8 +13,8 @@ import {NumberUtils} from "../openaireLibrary/utils/number-utils.class"; import {SearchResearchResultsService} from "../openaireLibrary/services/searchResearchResults.service"; import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service"; import {LocalStorageService} from "../openaireLibrary/services/localStorage.service"; -import {Stakeholder, Visibility} from "../openaireLibrary/monitor/entities/stakeholder"; -import {Session, User} from "../openaireLibrary/login/utils/helper.class"; +import {Stakeholder, StakeholderInfo} from "../openaireLibrary/monitor/entities/stakeholder"; +import {User} from "../openaireLibrary/login/utils/helper.class"; import {UserManagementService} from "../openaireLibrary/services/user-management.service"; import {properties} from "../../environments/environment"; import {Subscriber} from "rxjs"; @@ -28,7 +27,7 @@ import {Subscriber} from "rxjs"; export class HomeComponent { public pageTitle = "OpenAIRE | Monitor"; public description = "OpenAIRE - Monitor, A new era of monitoring research. Open data. Open methodologies. Work together with us to view, understand and visualize research statistics and indicators."; - public stakeholders: Stakeholder[] = []; + public stakeholders: StakeholderInfo[] = []; public selected: Stakeholder = null; public pageContents = null; public divContents = null; @@ -48,11 +47,6 @@ export class HomeComponent { private errorMessages: ErrorMessagesComponent; private subscriptions = []; private user: User; - visibilityIcon: Map = new Map ([ - ["PUBLIC", 'earth'], - ["PRIVATE", 'lock'], - ["RESTRICTED", 'group'] - ]); constructor( private route: ActivatedRoute, @@ -83,12 +77,12 @@ export class HomeComponent { this.subscriptions.push(this._piwikService.trackView(this.properties, "OpenAIRE Monitor", this.properties.piwikSiteId).subscribe()); } this.getNumbers(); - this.getStakeholders(); this.subscriptions.push(this.localStorageService.get().subscribe(value => { this.directLink = value; })); this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { this.user = user; + this.getStakeholders(); })); } @@ -181,30 +175,9 @@ export class HomeComponent { if (!stakeholders || stakeholders.length == 0) { this.status = this.errorCodes.NONE; } else { - // compare function for alphabetical order based on the 'name' property - function compare (a, b) { - if(a.name < b.name) { - return -1; - } - if(a.name > b.name) { - return 1; - } - return 0; - } - let publicStakeholders = []; - let restrictedStakeholders = []; - stakeholders.forEach(stakeholder => { - if(stakeholder.visibility == "PUBLIC") { - publicStakeholders.push(stakeholder); - } else { - restrictedStakeholders.push(stakeholder); - } - }); - // actual sorting of the arrays - publicStakeholders.sort(compare); - restrictedStakeholders.sort(compare); - // joining the two arrays again - this.stakeholders = publicStakeholders.concat(restrictedStakeholders); + this.stakeholders = StakeholderInfo.toStakeholderInfo(stakeholders, this.user); + this.sort(this.stakeholders); + this.stakeholders = this.publicStakeholders.concat(this.privateStakeholders); } this.loading = false; }, @@ -215,16 +188,35 @@ export class HomeComponent { )); } - public sliderize(stakeholders: Stakeholder[]): Stakeholder[][] { + private sort(results: StakeholderInfo[]) { + results.sort((left, right): number => { + if (left.name > right.name) { + return 1; + } else if (left.name < right.name) { + return -1; + } else { + return 0; + } + }) + } + + public slider(stakeholders: StakeholderInfo[], size: number = 6): Stakeholder[][] { let slider: Stakeholder[][] = []; - let size = 6; for(let i = 0; i < (stakeholders.length/size); i++) { slider.push(stakeholders.slice(i*size, ((i+1)*size))); } return slider; } + + get publicStakeholders(): StakeholderInfo[] { + return this.stakeholders.filter(stakeholder => stakeholder.visibility === "PUBLIC"); + } - get funders(): Stakeholder[] { + get privateStakeholders(): StakeholderInfo[] { + return this.stakeholders.filter(stakeholder => stakeholder.visibility !== "PUBLIC"); + } + + get funders(): StakeholderInfo[] { if(this.stakeholders) { return this.stakeholders.filter(stakeholder => stakeholder.type === "funder"); } else { @@ -232,7 +224,7 @@ export class HomeComponent { } } - get researchInitiatives(): Stakeholder[] { + get researchInitiatives(): StakeholderInfo[] { if(this.stakeholders) { return this.stakeholders.filter(stakeholder => stakeholder.type === "ri"); } else { @@ -240,50 +232,13 @@ export class HomeComponent { } } - get researchInstitutions(): Stakeholder[] { + get organizations(): StakeholderInfo[] { if(this.stakeholders) { return this.stakeholders.filter(stakeholder => stakeholder.type === "organization"); } else { return []; } } - - private isManager(stakeholder: Stakeholder) { - return Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user) || Session.isManager(stakeholder.type, stakeholder.alias, this.user); - } - - private isMember(stakeholder: Stakeholder) { - return Session.isMember(stakeholder.type, stakeholder.alias, this.user); - } - - public confirmModalOpen(result: Stakeholder) { - this.selected = result; - this.modal.cancelButton = true; - this.modal.okButton = true; - this.modal.alertTitle = 'You are going to visit ' + result.name + ' Monitor Dashboard'; - this.modal.alertMessage = false; - this.modal.okButtonLeft = false; - this.modal.okButtonText = 'Yes'; - this.modal.cancelButtonText = 'No'; - this.modal.choice = true; - this.modal.open(); - } - - public getStakeholderPageUrl(stakeholder: Stakeholder) { - return this.properties.domain + this.properties.baseLink + '/dashboard/' + stakeholder.alias; - } - - public goToPage(data: any) { - if (data.value == true) { - let url = this.getStakeholderPageUrl(this.selected); - this.localStorageService.setCommunityDirectLink(data.choice); - window.open(url, '_blank'); - } - } - - public quote(param: string): string { - return StringUtils.quote(param); - } ngOnDestroy() { this.subscriptions.forEach(subscription => { @@ -293,14 +248,9 @@ export class HomeComponent { }); } - hasPermission(stakeholder: Stakeholder) { - return stakeholder.visibility === "PUBLIC" || this.isManager(stakeholder) || this.isMember(stakeholder); - } - private handleError(message: string, error): number { let code = ""; if (!error.status) { - error = error.json(); code = error.code; } else { code = error.status; diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index 007a8b2..1e26723 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -25,13 +25,14 @@ import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.modu import {SectionScrollModule} from '../openaireLibrary/utils/section-scroll/section-scroll.module'; import {TabsModule} from '../openaireLibrary/utils/tabs/tabs.module'; import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module"; +import {BrowseStakeholderModule} from "../browse-stakeholder/browse-stakeholder.module"; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, ErrorMessagesModule, OtherPortalsModule, HelperModule, Schema2jsonldModule, SEOServiceModule, HomeRoutingModule, SearchResearchResultsServiceModule, RefineFieldResultsServiceModule, AlertModalModule, IconsModule, UrlPrefixModule, LogoUrlPipeModule, SectionScrollModule, - TabsModule, LoadingModule + TabsModule, LoadingModule, BrowseStakeholderModule ], declarations: [ HomeComponent diff --git a/src/app/learn-how/learn-how.component.html b/src/app/learn-how/learn-how.component.html index 59c7d57..f105a48 100644 --- a/src/app/learn-how/learn-how.component.html +++ b/src/app/learn-how/learn-how.component.html @@ -100,107 +100,9 @@
            -
            Inclusion, transparency, quality, state of the art technology.
            +
            Inclusion, transparency, quality, state of the art technology.

            Simplify research
            tracking & monitoring.

            - - diff --git a/src/app/my-stakeholders/my-stakeholders.component.html b/src/app/my-stakeholders/my-stakeholders.component.html index 0dfeef6..98c4ece 100644 --- a/src/app/my-stakeholders/my-stakeholders.component.html +++ b/src/app/my-stakeholders/my-stakeholders.component.html @@ -16,30 +16,41 @@

            You are managing

            -
            - @@ -47,14 +58,14 @@

            You are member of

            -
            +
            - {{stakeholder.name}} +
            -
            +
            @@ -65,14 +76,14 @@
            -
            +
            - {{stakeholder.name}} +
            -
            +
            diff --git a/src/app/my-stakeholders/my-stakeholders.component.ts b/src/app/my-stakeholders/my-stakeholders.component.ts index 4e219a1..758ee6b 100644 --- a/src/app/my-stakeholders/my-stakeholders.component.ts +++ b/src/app/my-stakeholders/my-stakeholders.component.ts @@ -117,18 +117,12 @@ export class MyStakeholdersComponent { private sort(results: StakeholderInfo[]) { results.sort((left, right): number => { - if (!right.updateDate || left.updateDate > right.updateDate) { - return -1; - } else if (!left.updateDate || left.updateDate < right.updateDate) { + if (left.name > right.name) { return 1; + } else if (left.name < right.name) { + return -1; } else { - if (left.name > right.name) { - return 1; - } else if (left.name < right.name) { - return -1; - } else { - return 0; - } + return 0; } }) } diff --git a/src/app/my-stakeholders/my-stakeholders.module.ts b/src/app/my-stakeholders/my-stakeholders.module.ts index 32fc009..bf96949 100644 --- a/src/app/my-stakeholders/my-stakeholders.module.ts +++ b/src/app/my-stakeholders/my-stakeholders.module.ts @@ -16,12 +16,13 @@ import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumb import {MyStakeholdersRoutingModule} from "./my-stakeholders-routing.module"; import {MyStakeholdersComponent} from "./my-stakeholders.component"; import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module"; +import {BrowseStakeholderModule} from "../browse-stakeholder/browse-stakeholder.module"; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, HelperModule, ManageModule, ErrorMessagesModule, Schema2jsonldModule, SEOServiceModule, - MyStakeholdersRoutingModule, BreadcrumbsModule, LoadingModule + MyStakeholdersRoutingModule, BreadcrumbsModule, LoadingModule, BrowseStakeholderModule ], declarations: [ MyStakeholdersComponent diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index f15b8ef..5a69cb2 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit f15b8ef8fcdae5053c1c385a5f3126a2a7b327f7 +Subproject commit 5a69cb210178c77ef078eb3d5e35e527570e722e diff --git a/src/assets/common-assets b/src/assets/common-assets index 1723114..9224f3d 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 1723114f30208b0e85d5c580665af801fe9e6ef1 +Subproject commit 9224f3da593049aaa18bce81ff1e2d7d7597c22c diff --git a/src/assets/monitor-assets/about/arrows/1.svg b/src/assets/monitor-assets/about/arrows/1.svg deleted file mode 100644 index dc84bad..0000000 --- a/src/assets/monitor-assets/about/arrows/1.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/assets/monitor-assets/about/arrows/2.svg b/src/assets/monitor-assets/about/arrows/2.svg deleted file mode 100644 index 629dad6..0000000 --- a/src/assets/monitor-assets/about/arrows/2.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/assets/monitor-assets/about/arrows/3.svg b/src/assets/monitor-assets/about/arrows/3.svg deleted file mode 100644 index c02f612..0000000 --- a/src/assets/monitor-assets/about/arrows/3.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/assets/monitor-assets/about/arrows/4.svg b/src/assets/monitor-assets/about/arrows/4.svg deleted file mode 100644 index caf0954..0000000 --- a/src/assets/monitor-assets/about/arrows/4.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/assets/monitor-assets/about/arrows/5.svg b/src/assets/monitor-assets/about/arrows/5.svg deleted file mode 100644 index 979c9f5..0000000 --- a/src/assets/monitor-assets/about/arrows/5.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/assets/monitor-assets/about/hero-img.png b/src/assets/monitor-assets/about/hero-img.png deleted file mode 100644 index 86d5e83..0000000 Binary files a/src/assets/monitor-assets/about/hero-img.png and /dev/null differ diff --git a/src/assets/monitor-assets/about/process/0.png b/src/assets/monitor-assets/about/process/0.png deleted file mode 100644 index 875b9fa..0000000 Binary files a/src/assets/monitor-assets/about/process/0.png and /dev/null differ diff --git a/src/assets/monitor-assets/about/process/1.png b/src/assets/monitor-assets/about/process/1.png deleted file mode 100644 index ee3c0fa..0000000 Binary files a/src/assets/monitor-assets/about/process/1.png and /dev/null differ diff --git a/src/assets/monitor-assets/about/process/2.png b/src/assets/monitor-assets/about/process/2.png deleted file mode 100644 index e511307..0000000 Binary files a/src/assets/monitor-assets/about/process/2.png and /dev/null differ diff --git a/src/assets/monitor-assets/about/process/3.png b/src/assets/monitor-assets/about/process/3.png deleted file mode 100644 index 4d8ba68..0000000 Binary files a/src/assets/monitor-assets/about/process/3.png and /dev/null differ diff --git a/src/assets/monitor-assets/about/process/4.png b/src/assets/monitor-assets/about/process/4.png deleted file mode 100644 index fd1bcbb..0000000 Binary files a/src/assets/monitor-assets/about/process/4.png and /dev/null differ diff --git a/src/assets/monitor-assets/about/process/5.png b/src/assets/monitor-assets/about/process/5.png deleted file mode 100644 index be5e676..0000000 Binary files a/src/assets/monitor-assets/about/process/5.png and /dev/null differ diff --git a/src/assets/monitor-assets/home/dashboard-background.svg b/src/assets/monitor-assets/home/dashboard-background.svg deleted file mode 100644 index 87fd4c7..0000000 --- a/src/assets/monitor-assets/home/dashboard-background.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/assets/monitor-assets/home/dashboard.png b/src/assets/monitor-assets/home/dashboard.png deleted file mode 100644 index fcfc40b..0000000 Binary files a/src/assets/monitor-assets/home/dashboard.png and /dev/null differ diff --git a/src/assets/monitor-assets/home/girl.png b/src/assets/monitor-assets/home/girl.png deleted file mode 100644 index 535737f..0000000 Binary files a/src/assets/monitor-assets/home/girl.png and /dev/null differ diff --git a/src/assets/monitor-assets/home/graph-background.svg b/src/assets/monitor-assets/home/graph-background.svg deleted file mode 100644 index b10eddc..0000000 --- a/src/assets/monitor-assets/home/graph-background.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/assets/monitor-assets/home/hologram.png b/src/assets/monitor-assets/home/hologram.png deleted file mode 100644 index c74f473..0000000 Binary files a/src/assets/monitor-assets/home/hologram.png and /dev/null differ diff --git a/src/assets/monitor-custom.css b/src/assets/monitor-custom.css index 0b1bba8..07c3595 100644 --- a/src/assets/monitor-custom.css +++ b/src/assets/monitor-custom.css @@ -1,7 +1,7 @@ :root { /*buttons*/ --button-primary-background: transparent; - --button-primary-background-image: linear-gradient(110deg, var(--monitor-gradient-start) 0%, var(--monitor-gradient-end) 100%); + --button-primary-background-image: linear-gradient(110deg, var(--monitor-light-color) 0%, var(--monitor-dark-color) 100%); --button-secondary-background: var(--secondary-color); --button-secondary-background-image: none; @@ -12,8 +12,11 @@ /*fonts*/ --font-primary-color: var(--monitor-color); - --font-gradient-color: linear-gradient(110deg, var(--monitor-gradient-start) 0%, var(--monitor-gradient-end) 100%); - /*--secondary-background: var(--secondary-color);*/ + --font-gradient-color: linear-gradient(110deg, var(--monitor-light-color) 0%, var(--monitor-dark-color) 100%); + + /*slider*/ + --slider-dot-background: var(--monitor-light-color); + --slider-dot-active-background: var(--monitor-dark-color); } /*:root {*/ diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 9f0b25a..eb0b04c 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 9f0b25ae591095b9b9a31aa4cba7c98e3d012899 +Subproject commit eb0b04cb96b9ab92387d61cdafae21256a6da762