diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..0267301c --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,200 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/connect/community/CustomizationOptions.ts b/connect/community/CustomizationOptions.ts index 091178da..f1a318d6 100644 --- a/connect/community/CustomizationOptions.ts +++ b/connect/community/CustomizationOptions.ts @@ -1,86 +1,102 @@ import {properties} from "../../../../environments/environment"; export class Layout { - _id:string; - portalPid:string; - layoutOptions:CustomizationOptions; + _id: string; + portalPid: string; + layoutOptions: CustomizationOptions; date; - constructor(community, options:CustomizationOptions){ + + constructor(community, options: CustomizationOptions) { this.portalPid = community; this.layoutOptions = options; } public static getVariables(options: CustomizationOptions): {} | null { - if(options) { + if (options) { let variables = {}; - if(options.identity) { - variables['@global-primary-background'] = options.identity.mainColor; - variables['@global-secondary-background'] = options.identity.secondaryColor; + if (options.identity) { + variables['@global-primary-background'] = Layout.convertRGBAtoRGB(options.identity.mainColor); + variables['@global-secondary-background'] = Layout.convertRGBAtoRGB(options.identity.secondaryColor); } - if(options.backgrounds){ - variables['@general-search-form-background'] = options.backgrounds.form.color; - variables['@base-body-background'] = options.backgrounds.light.color; - variables['@hero-background-image'] = (options.backgrounds.form.imageFile?(this.getUrl(properties.utilsService + '/download/' +options.backgrounds.form.imageFile)): 'none') ; + if (options.backgrounds) { + variables['@general-search-form-background'] = Layout.convertRGBAtoRGB(options.backgrounds.form.color); + variables['@global-background'] = Layout.convertRGBAtoRGB(options.backgrounds.light.color); + variables['@hero-background-image'] = (options.backgrounds.form.imageFile ? (this.getUrl(properties.utilsService + '/download/' + options.backgrounds.form.imageFile)) : 'none'); variables['@hero-background-position'] = options.backgrounds.form.position; } - if(options.buttons){ + if (options.buttons) { //general variables['@button-border-width'] = options.buttons.lightBackground.borderWidth + "px"; variables['@button-border-radius'] = options.buttons.lightBackground.borderRadius + "px"; // default -> on dark background todo check again when we have sucj=h buttons - variables['@button-default-background'] = options.buttons.darkBackground.backgroundColor; - variables['@button-default-color'] = options.buttons.darkBackground.color; - variables['@button-default-border'] = options.buttons.darkBackground.borderColor; - variables['@button-default-hover-background'] = options.buttons.darkBackground.onHover.backgroundColor; - variables['@button-default-hover-color'] = options.buttons.darkBackground.onHover.color; - variables['@button-default-hover-border'] = options.buttons.darkBackground.onHover.borderColor; - variables['@button-default-active-background'] = options.buttons.darkBackground.onHover.backgroundColor; - variables['@button-default-active-color'] = options.buttons.darkBackground.onHover.color; - variables['@button-default-active-border'] = options.buttons.darkBackground.onHover.borderColor; + variables['@button-default-background'] = Layout.convertRGBAtoRGB(options.buttons.darkBackground.backgroundColor); + variables['@button-default-color'] = Layout.convertRGBAtoRGB(options.buttons.darkBackground.color); + variables['@button-default-border'] = Layout.convertRGBAtoRGB(options.buttons.darkBackground.borderColor); + variables['@button-default-hover-background'] = Layout.convertRGBAtoRGB(options.buttons.darkBackground.onHover.backgroundColor); + variables['@button-default-hover-color'] = Layout.convertRGBAtoRGB(options.buttons.darkBackground.onHover.color); + variables['@button-default-hover-border'] = Layout.convertRGBAtoRGB(options.buttons.darkBackground.onHover.borderColor); + variables['@button-default-active-background'] = Layout.convertRGBAtoRGB(options.buttons.darkBackground.onHover.backgroundColor); + variables['@button-default-active-color'] = Layout.convertRGBAtoRGB(options.buttons.darkBackground.onHover.color); + variables['@button-default-active-border'] = Layout.convertRGBAtoRGB(options.buttons.darkBackground.onHover.borderColor); // primary - variables['@button-primary-background'] = options.buttons.lightBackground.backgroundColor; - variables['@button-primary-color'] = options.buttons.lightBackground.color; - variables['@button-primary-border'] = options.buttons.lightBackground.borderColor; - variables['@button-primary-hover-background'] = options.buttons.lightBackground.onHover.backgroundColor; - variables['@button-primary-hover-color'] = options.buttons.lightBackground.onHover.color; - variables['@button-primary-hover-border'] = options.buttons.lightBackground.onHover.borderColor; - variables['@button-primary-active-background'] = options.buttons.lightBackground.onHover.backgroundColor; - variables['@button-primary-active-color'] = options.buttons.lightBackground.onHover.color; - variables['@button-primary-active-border'] = options.buttons.lightBackground.onHover.borderColor; + variables['@button-primary-background'] = Layout.convertRGBAtoRGB(options.buttons.lightBackground.backgroundColor); + variables['@button-primary-color'] = Layout.convertRGBAtoRGB(options.buttons.lightBackground.color); + variables['@button-primary-border'] = Layout.convertRGBAtoRGB(options.buttons.lightBackground.borderColor); + variables['@button-primary-hover-background'] = Layout.convertRGBAtoRGB(options.buttons.lightBackground.onHover.backgroundColor); + variables['@button-primary-hover-color'] = Layout.convertRGBAtoRGB(options.buttons.lightBackground.onHover.color); + variables['@button-primary-hover-border'] = Layout.convertRGBAtoRGB(options.buttons.lightBackground.onHover.borderColor); + variables['@button-primary-active-background'] = Layout.convertRGBAtoRGB(options.buttons.lightBackground.onHover.backgroundColor); + variables['@button-primary-active-color'] = Layout.convertRGBAtoRGB(options.buttons.lightBackground.onHover.color); + variables['@button-primary-active-border'] = Layout.convertRGBAtoRGB(options.buttons.lightBackground.onHover.borderColor); // secondary - variables['@button-secondary-background'] = options.buttons.lightBackground.color; - variables['@button-secondary-color'] = options.buttons.lightBackground.backgroundColor; - variables['@button-secondary-border'] = options.buttons.lightBackground.backgroundColor; - variables['@button-secondary-hover-background'] = options.buttons.lightBackground.backgroundColor; - variables['@button-secondary-hover-color'] = options.buttons.lightBackground.color; - variables['@button-secondary-hover-border'] = options.buttons.lightBackground.borderColor; - variables['@button-secondary-active-background'] = options.buttons.lightBackground.backgroundColor; - variables['@button-secondary-active-color'] = options.buttons.lightBackground.color; - variables['@button-secondary-active-border'] = options.buttons.lightBackground.borderColor; - + variables['@button-secondary-background'] = Layout.convertRGBAtoRGB(options.buttons.lightBackground.color); + variables['@button-secondary-color'] = Layout.convertRGBAtoRGB(options.buttons.lightBackground.backgroundColor); + variables['@button-secondary-border'] = Layout.convertRGBAtoRGB(options.buttons.lightBackground.backgroundColor); + variables['@button-secondary-hover-background'] = Layout.convertRGBAtoRGB(options.buttons.lightBackground.backgroundColor); + variables['@button-secondary-hover-color'] = Layout.convertRGBAtoRGB(options.buttons.lightBackground.color); + variables['@button-secondary-hover-border'] = Layout.convertRGBAtoRGB(options.buttons.lightBackground.borderColor); + variables['@button-secondary-active-background'] = Layout.convertRGBAtoRGB(options.buttons.lightBackground.backgroundColor); + variables['@button-secondary-active-color'] = Layout.convertRGBAtoRGB(options.buttons.lightBackground.color); + variables['@button-secondary-active-border'] = Layout.convertRGBAtoRGB(options.buttons.lightBackground.borderColor); + } return variables; } return null; } - public static getUrl(url){ + + public static getUrl(url) { return 'url("' + url + '")'; } - + + public static convertRGBAtoRGB(color: string): string { + if(color.includes('rgba')) { + const regexPattern = /rgba\((\d+),\s*(\d+),\s*(\d+),\s*([\d.]+)\)/; + const matches = color.match(regexPattern); + const [, r, g, b, a] = matches; + let R = parseInt(r)*parseFloat(a) + (1 - parseFloat(a))*255; + let G = parseInt(g)*parseFloat(a) + (1 - parseFloat(a))*255; + let B = parseInt(b)*parseFloat(a) + (1 - parseFloat(a))*255; + return 'rgb(' + R + ',' + G + ',' + B + ',' + ')'; + } else { + return color; + } + } } + export class CustomizationOptions { identity: { mainColor: string; secondaryColor: string; }; - identityIsCustom:boolean; - backgroundsIsCustom:boolean; - buttonsIsCustom:boolean; + identityIsCustom: boolean; + backgroundsIsCustom: boolean; + buttonsIsCustom: boolean; backgrounds: { dark: { - color: string; //background + color: string; //background } light: { color: string; //background @@ -89,41 +105,41 @@ export class CustomizationOptions { color: string; //background imageUrl: string; imageFile: string; - position:string; + position: string; } }; buttons: { darkBackground: ButtonsCustomization; lightBackground: ButtonsCustomization; }; - + constructor(mainColor: string = null, secondaryColor: string = null) { - this.identity= { + this.identity = { mainColor: mainColor ? mainColor : CustomizationOptions.getIdentity().mainColor, - secondaryColor : secondaryColor ? secondaryColor : CustomizationOptions.getIdentity().secondaryColor, + secondaryColor: secondaryColor ? secondaryColor : CustomizationOptions.getIdentity().secondaryColor, }; this.identityIsCustom = false; this.backgroundsIsCustom = false; this.buttonsIsCustom = false; - this.backgrounds={ - dark : { + this.backgrounds = { + dark: { color: this.identity.mainColor, }, - light : { + light: { color: "#f9f9f9" //CustomizationOptions.getRGBA(this.identity.mainColor,0.05), }, - form : { - color: CustomizationOptions.getRGBA(this.identity.mainColor,0.15), - imageUrl : null, - imageFile : null, + form: { + color: CustomizationOptions.getRGBA(this.identity.mainColor, 0.15), + imageUrl: null, + imageFile: null, position: null } }; - - + + this.buttons = { darkBackground: { - isDefault:true, + isDefault: true, backgroundColor: "#ffffff", color: "#000000", borderStyle: "solid", @@ -137,7 +153,7 @@ export class CustomizationOptions { } }, lightBackground: { - isDefault:true, + isDefault: true, backgroundColor: this.identity.mainColor, color: '#ffffff', borderStyle: "solid", @@ -150,15 +166,16 @@ export class CustomizationOptions { borderColor: this.identity.secondaryColor, } } - + }; } - public static checkForObsoleteVersion(current:CustomizationOptions, communityId:string){ - let defaultCO = new CustomizationOptions(CustomizationOptions.getIdentity(communityId).mainColor,CustomizationOptions.getIdentity(communityId).secondaryColor); + + public static checkForObsoleteVersion(current: CustomizationOptions, communityId: string) { + let defaultCO = new CustomizationOptions(CustomizationOptions.getIdentity(communityId).mainColor, CustomizationOptions.getIdentity(communityId).secondaryColor); let updated = Object.assign({}, defaultCO); - if(!current){ + if (!current) { current = Object.assign({}, defaultCO); - }else { + } else { if (current.identity && current.identity.mainColor && current.identity.secondaryColor) { updated = new CustomizationOptions(current.identity.mainColor, current.identity.secondaryColor); } @@ -195,53 +212,55 @@ export class CustomizationOptions { } } return current; - - + + } - public static getIdentity(community:string=null){ - let COLORS= { - default:{ - mainColor:'#4687E6', + + public static getIdentity(community: string = null) { + let COLORS = { + default: { + mainColor: '#4687E6', secondaryColor: '#2D72D6' }, - "covid-19":{ - mainColor:"#03ADEE", + "covid-19": { + mainColor: "#03ADEE", secondaryColor: "#F15157" } }; - if(community && COLORS[community]){ + if (community && COLORS[community]) { return COLORS[community]; } return COLORS.default; } - public static getRGBA(color, A){ - if(color.indexOf("#")!=-1){ - return 'rgba('+parseInt(color.substring(1,3),16)+','+parseInt(color.substring(3,5),16)+','+parseInt(color.substring(5,7),16)+','+A+')'; + + public static getRGBA(color, A) { + if (color.indexOf("#") != -1) { + return 'rgba(' + parseInt(color.substring(1, 3), 16) + ',' + parseInt(color.substring(3, 5), 16) + ',' + parseInt(color.substring(5, 7), 16) + ',' + A + ')'; } return color; } - - public static isForLightBackground(color:string){ + + public static isForLightBackground(color: string) { let L, r, g, b, a = 1; - if(color.length == 7 || color.length == 9) { + if (color.length == 7 || color.length == 9) { r = parseInt(color.substring(1, 3), 16); g = parseInt(color.substring(3, 5), 16); b = parseInt(color.substring(5, 7), 16); - if(color.length == 9) { - a = parseInt(color.substring(7, 9), 16); + if (color.length == 9) { + a = parseInt(color.substring(7, 9), 16); } - }else if(color.length > 9){ + } else if (color.length > 9) { let array = color.split("rgba(")[1].split(")")[0].split(","); r = parseInt(array[0]); g = parseInt(array[1]); b = parseInt(array[2]); a = +array[3]; - + } - const brightness = r* 0.299 + g * 0.587 + b * 0.114 + (1 - a) * 255; - + const brightness = r * 0.299 + g * 0.587 + b * 0.114 + (1 - a) * 255; + return (brightness < 186) - + // return !(r*0.299 + g*0.587 + b*0.114 > 186); /*for(let c of [r,g,b]){ c = c / 255.0; @@ -255,11 +274,12 @@ export class CustomizationOptions { return L > 0.179// (L + 0.05) / (0.05) > (1.0 + 0.05) / (L + 0.05); //use #000000 else use #ffffff */ } - - + + } -export class ButtonsCustomization{ - isDefault:boolean; + +export class ButtonsCustomization { + isDefault: boolean; backgroundColor: string; color: string; borderStyle: string; diff --git a/connect/community/community.service.ts b/connect/community/community.service.ts index acc3b749..d8fe6975 100644 --- a/connect/community/community.service.ts +++ b/connect/community/community.service.ts @@ -122,8 +122,8 @@ export class CommunityService { } else { community.fos = []; } - if (resData.advancedConstraint != null) { - community.selectionCriteria = resData.advancedConstraint; + if (resData.advancedConstraints != null) { + community.selectionCriteria = resData.advancedConstraints; } else { community.selectionCriteria = new SelectionCriteria(); } diff --git a/dashboard/divId/divIds.component.html b/dashboard/divId/divIds.component.html index 6631331e..7da6aa9a 100644 --- a/dashboard/divId/divIds.component.html +++ b/dashboard/divId/divIds.component.html @@ -1,11 +1,5 @@
-
-
-
Manage Classes
-

Super Admin

-
-