From 9379c91e7e876861a94ccfbe36e1a8aa04bb0692 Mon Sep 17 00:00:00 2001 From: argirok Date: Mon, 1 Aug 2022 12:18:47 +0300 Subject: [PATCH] Customization: updates for buttons customization add property connectportalUrl - use it for preview and build css methods --- .../pages/customization/border.component.ts | 6 ++-- .../customization.component.html | 5 +++- .../customization/customization.component.ts | 6 ++-- .../customize-buttons.component.ts | 25 +++++++++------- .../quickLook-backgrounds.component.ts | 30 +++++++++---------- .../quickLook-buttons.component.ts | 9 +++--- src/environments/environment.beta.ts | 3 +- src/environments/environment.prod.ts | 3 +- src/environments/environment.ts | 3 +- 9 files changed, 50 insertions(+), 40 deletions(-) diff --git a/src/app/pages/customization/border.component.ts b/src/app/pages/customization/border.component.ts index 87ef2ab..fabfb42 100644 --- a/src/app/pages/customization/border.component.ts +++ b/src/app/pages/customization/border.component.ts @@ -16,7 +16,7 @@ import {Component, EventEmitter, Input, OnInit, Output,} from '@angular/core';
-
+
Border width (px)
-
+
` }) diff --git a/src/app/pages/customization/customization.component.html b/src/app/pages/customization/customization.component.html index e74fc7d..bdb763d 100644 --- a/src/app/pages/customization/customization.component.html +++ b/src/app/pages/customization/customization.component.html @@ -257,7 +257,10 @@ - +
style on
{ - this.subscriptions.push(this.layoutService.createCSS(this.communityId, this.publishedLayout.date.valueOf(), this.publishedLayout.layoutOptions).subscribe(data => { + this.subscriptions.push(this.layoutService.createCSS(this.communityId,this.properties.connectPortalUrl, this.publishedLayout.date.valueOf(), this.publishedLayout.layoutOptions).subscribe(data => { console.log(data) this.initializeCustomizationOptions(JSON.stringify(this.publishedCustomizationOptions) != this.previewCustomization); this.deleteOldImages(); @@ -236,7 +236,7 @@ sidebarItems = [{name:"Identity", id : "identity", icon: "desktop_windows" }, if(JSON.stringify(this.appliedCustomizationOptions) != this.previewCustomization){ let d = new Date(); let prefix = "-preview-" + d.valueOf(); - this.subscriptions.push(this.layoutService.createCSS(this.communityId, prefix, this.appliedCustomizationOptions).subscribe(data => { + this.subscriptions.push(this.layoutService.createCSS(this.communityId, this.properties.connectPortalUrl, prefix, this.appliedCustomizationOptions).subscribe(data => { this.previewUrl = this.getCommunityUrlSatinized(this.communityId + prefix); }, error => { @@ -322,7 +322,7 @@ sidebarItems = [{name:"Identity", id : "identity", icon: "desktop_windows" }, getCommunityUrl(prefix) { if(this.properties.environment == 'production' || this.properties.environment == 'beta') return 'https://'+ (this.properties.environment == 'production'?'':'beta.')+this.communityId+'.openaire.eu' + (prefix?("?previewLayout=" + prefix):""); - return "http://scoobydoo.di.uoa.gr:4200" + (prefix?("?previewLayout=" + prefix):""); + return this.properties.connectPortalUrl + (prefix?("?previewLayout=" + prefix):""); } diff --git a/src/app/pages/customization/customize-buttons.component.ts b/src/app/pages/customization/customize-buttons.component.ts index fe52d72..13c493d 100644 --- a/src/app/pages/customization/customize-buttons.component.ts +++ b/src/app/pages/customization/customize-buttons.component.ts @@ -7,17 +7,19 @@ import {ButtonsCustomization} from '../../openaireLibrary/connect/community/Cust template: `
- -
+
+ +
+
Colors -
Light background
+ [buttons]="buttonsOnLight" [border]="buttonsOnLight" > +
+
+
+
Dark background
+
+
+

Heading

+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent mollis velit ornare, auctor lectus at, rutrum magna. Aenean vehicula elementum lacinia.
+ Link +
+
diff --git a/src/app/pages/customization/quickLook-buttons.component.ts b/src/app/pages/customization/quickLook-buttons.component.ts index 5fa2e82..c4f6ffa 100644 --- a/src/app/pages/customization/quickLook-buttons.component.ts +++ b/src/app/pages/customization/quickLook-buttons.component.ts @@ -18,7 +18,7 @@ import {ButtonsCustomization} from '../../openaireLibrary/connect/community/Cust color: var(--color); background-color: var(--background-color); border-color: var(--border-color); - border-style: var(--border-style); + border-style: solid; border-width: var(--border-width); border-radius: var(--border-radius); } @@ -35,6 +35,7 @@ import {ButtonsCustomization} from '../../openaireLibrary/connect/community/Cust export class QuickLookButtonsComponent { @Input() buttons:ButtonsCustomization; + @Input() border:ButtonsCustomization; @HostBinding("attr.style") public get valueAsStyle(): any { @@ -42,9 +43,9 @@ export class QuickLookButtonsComponent { --color: ${this.buttons.color}; --background-color: ${this.buttons.backgroundColor}; --border-color: ${this.buttons.borderColor}; - --border-style: ${this.buttons.borderStyle}; - --border-width: ${this.buttons.borderWidth + 'px'}; - --border-radius: ${this.buttons.borderRadius + 'px'}; + --border-style: ${this.border.borderStyle}; + --border-width: ${this.border.borderWidth + 'px'}; + --border-radius: ${this.border.borderRadius + 'px'}; --color-hover: ${this.buttons.onHover.color}; --background-color-hover: ${this.buttons.onHover.backgroundColor}; --border-color-hover: ${this.buttons.onHover.borderColor}; diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index fd327ea..557021d 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -86,5 +86,6 @@ export let properties: EnvProperties = { indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/", admins: ["rcd@openaire.eu"], adminPortalURL: "https://beta.admin.connect.openaire.eu", - errorLink: '/error' + errorLink: '/error', + connectPortalUrl: 'https://beta.connect.openaire.eu' }; diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 00d8c0d..b9190f1 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -86,5 +86,6 @@ export let properties: EnvProperties = { indexInfoAPI: "https://services.openaire.eu/openaire/info/", admins: ["rcd@openaire.eu"], adminPortalURL: "https://admin.connect.openaire.eu", - errorLink: '/error' + errorLink: '/error', + connectPortalUrl: 'https://connect.openaire.eu' }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 7ddd81e..8365963 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -91,5 +91,6 @@ export let properties: EnvProperties = { indexInfoAPI: 'http://beta.services.openaire.eu/openaire/info/', admins: ['kostis30fylloy@gmail.com'], adminPortalURL: 'https://beta.admin.connect.openaire.eu', - errorLink: '/error' + errorLink: '/error', + connectPortalUrl: 'http://scoobydoo.di.uoa.gr:4200' };