From 895f709689ac45c74d24473555206ff67bb89fe6 Mon Sep 17 00:00:00 2001 From: Lukas Boehler Date: Fri, 16 Jun 2023 13:10:10 +0200 Subject: [PATCH] v11.0.0 --- demo/main.js | 6 +++--- package.json | 2 +- src/GleapFrameManager.js | 4 ++-- src/GleapNotificationManager.js | 24 ++++++++++++++++-------- src/UI.js | 27 +++++++++++++++++++++------ 5 files changed, 43 insertions(+), 20 deletions(-) diff --git a/demo/main.js b/demo/main.js index 408fb354..0f38c306 100755 --- a/demo/main.js +++ b/demo/main.js @@ -5,7 +5,7 @@ Gleap.setApiUrl("http://0.0.0.0:9000"); Gleap.setLanguage("de"); -Gleap.initialize("zhkMPoY1k41yhOus4BRwVKE7Qas5zbyA"); +Gleap.initialize("ogWhNhuiZcGWrva5nlDS8l7a78OfaLlV"); //Gleap.setEnvironment("dev"); /*Gleap.setUrlHandler((url, newTab) => { @@ -27,14 +27,14 @@ Gleap.attachCustomData({ }, }); -Gleap.identify("@testinglukasaa", { +/*Gleap.identify("@testinglukasaa", { name: "Max Doe", email: "lukas+atestaaa@gleap.io", value: 1234, phone: "+49123456789", testing: { "fun": 1123 }, luki: 19283 -}); +});*/ Gleap.log("Test log"); Gleap.log("Test log info", "INFO"); diff --git a/package.json b/package.json index 735fe714..ce51d3a9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gleap", - "version": "10.5.0", + "version": "11.0.0", "main": "build/index.js", "scripts": { "start": "webpack serve", diff --git a/src/GleapFrameManager.js b/src/GleapFrameManager.js index 9d2854d6..92cad8b4 100644 --- a/src/GleapFrameManager.js +++ b/src/GleapFrameManager.js @@ -20,7 +20,7 @@ import { widgetMaxHeight } from "./UI"; import { runFunctionWhenDomIsReady } from "./GleapHelper"; export default class GleapFrameManager { - frameUrl = "https://messenger.gleap.io"; + frameUrl = "https://messenger-app.gleap.io"; gleapFrameContainer = null; gleapFrame = null; injectedFrame = false; @@ -116,7 +116,7 @@ export default class GleapFrameManager { autoWhiteListCookieManager = () => { if (window && window.cmp_block_ignoredomains) { - window.cmp_block_ignoredomains.concat(["messenger.gleap.io"]); + window.cmp_block_ignoredomains.concat(["messenger-app.gleap.io"]); } }; diff --git a/src/GleapNotificationManager.js b/src/GleapNotificationManager.js index 207b0838..5a00893c 100644 --- a/src/GleapNotificationManager.js +++ b/src/GleapNotificationManager.js @@ -145,20 +145,28 @@ export default class GleapNotificationManager { }; if (notification.data.news) { + const renderDescription = () => { + if (notification.data.previewText && notification.data.previewText.length > 0) { + return `
${notification.data.previewText}
`; + } + + return `${notification.data.sender ? ` +
+ ${notification.data.sender.profileImageUrl && + `` + } ${notification.data.sender.name}
` + : "" + }`; + }; + // News preview elem.className = "gleap-notification-item-news"; elem.innerHTML = `
- ${notification.data.coverImageUrl ? `` : ''} + ${notification.data.coverImageUrl && notification.data.coverImageUrl !== "" && !notification.data.coverImageUrl.includes("NewsImagePlaceholder") ? `` : ''}
${content}
- ${notification.data.sender ? ` -
- ${notification.data.sender.profileImageUrl && - `` - } ${notification.data.sender.name}
` - : "" - } + ${renderDescription()}
`; } else { diff --git a/src/UI.js b/src/UI.js index e5dd1683..047cad95 100644 --- a/src/UI.js +++ b/src/UI.js @@ -340,24 +340,39 @@ export const injectStyledCSS = ( padding: 15px; } + .gleap-notification-item-news-preview { + color: ${subTextColor}; + font-size: 15px; + line-height: 21px; + font-weight: 400; + overflow-wrap: break-word; + word-break: break-word; + display: block; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; + } + .gleap-notification-item-news-sender { display: flex; align-items: center; color: ${subTextColor}; - font-size: 14px; + font-size: 15px; + line-height: 21px; font-weight: 400; } .gleap-notification-item-news-content-title { - font-size: 14px; + color: ${contrastBackgroundColor}; + font-size: 15px; font-weight: 500; - line-height: 18px; + line-height: 21px; margin-bottom: 6px; max-width: 100%; + -webkit-line-clamp: 3; + -webkit-box-orient: vertical; overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - color: ${contrastBackgroundColor}; } .gleap-notification-item-news-sender img {