From 79876e1750e5ac12b2ad933a833987a0024fa07a Mon Sep 17 00:00:00 2001 From: John Livingston Date: Mon, 6 Dec 2021 14:47:34 +0100 Subject: [PATCH] ConverseJS 9.0.0: first attempt to integrate. --- conversejs/builtin.ts | 1 + .../{sass => shared/styles}/_peertubetheme.scss | 0 .../custom/{sass => shared/styles}/_variables.scss | 11 +++++++---- .../custom/{sass => shared/styles}/livechat.scss | 2 +- conversejs/custom/templates/background_logo.js | 2 +- conversejs/custom/webpack.livechat.js | 4 ++-- vendor/converse.js | 2 +- 7 files changed, 13 insertions(+), 9 deletions(-) rename conversejs/custom/{sass => shared/styles}/_peertubetheme.scss (100%) rename conversejs/custom/{sass => shared/styles}/_variables.scss (96%) rename conversejs/custom/{sass => shared/styles}/livechat.scss (94%) diff --git a/conversejs/builtin.ts b/conversejs/builtin.ts index 2af79be3..129a09b7 100644 --- a/conversejs/builtin.ts +++ b/conversejs/builtin.ts @@ -150,6 +150,7 @@ window.initConverse = async function initConverse ({ theme: theme || 'peertube', persistent_store: 'sessionStorage', show_images_inline: false, // for security reason, and to avoid bugs when image is larger that iframe + render_media: false, // for security reason, and to avoid bugs when image is larger that iframe whitelisted_plugins: ['livechatWindowTitlePlugin'] } diff --git a/conversejs/custom/sass/_peertubetheme.scss b/conversejs/custom/shared/styles/_peertubetheme.scss similarity index 100% rename from conversejs/custom/sass/_peertubetheme.scss rename to conversejs/custom/shared/styles/_peertubetheme.scss diff --git a/conversejs/custom/sass/_variables.scss b/conversejs/custom/shared/styles/_variables.scss similarity index 96% rename from conversejs/custom/sass/_variables.scss rename to conversejs/custom/shared/styles/_variables.scss index 98745026..0f19804b 100644 --- a/conversejs/custom/sass/_variables.scss +++ b/conversejs/custom/shared/styles/_variables.scss @@ -13,9 +13,10 @@ --peertube-link-hover: #000; } -#conversejs.theme-peertube, +.conversejs.theme-peertube, +.conversejs-bg.theme-peertube, #conversejs-bg.theme-peertube, -.converse-fullscreen.theme-peertube { +body.converse-fullscreen.theme-peertube { --subdued-color: #a8aba1; --green: #3aa569; // only in this file --redder-orange: #e77051; // only in this file @@ -41,8 +42,10 @@ --message-text-color: var(--peertube-main-foreground); --message-receipt-color: var(--green); --save-button-color: var(--green); + --button-text-color: white; --message-avatar-width: 36px; --message-avatar-height: 36px; + --chat-background-color: white; --chat-textarea-color: var(--peertube-input-foreground); --chat-textarea-background-color: var(--peertube-input-background); --chat-textarea-height: 60px; @@ -58,6 +61,7 @@ --chat-head-text-color: var(--peertube-main-foreground); --chat-toolbar-btn-color: var(--peertube-button-background); --chat-toolbar-btn-disabled-color: var(--peertube-grey-background); + --toolbar-btn-text-color: white; --chat-content-background-color: var(--peertube-main-background); --chat-info-color: var(--peertube-grey-foreground); // FIXME: dont know if it is used, and what it is. --highlight-color: var(--peertube-grey-foreground); // FIXME: dont know if it is used, and what it is. @@ -94,6 +98,7 @@ --branding-font: "Source Sans Pro", sans-serif; --heading-display: inline; --heading-color: #9b4d; + --chatroom-color: var(--redder-orange); --chatroom-badge-color: var(--peertube-button-background); --chatroom-badge-hover-color: var(--peertube-button-background); --chatroom-correcting-color: var(--peertube-grey-background); @@ -137,8 +142,6 @@ --occupants-border-bottom: 1px solid var(--peertube-grey-foreground); --embedded-emoji-picker-height: 300px; --avatar-border-radius: 10%; - --avatar-border: 0; - --avatar-background-color: none; --fullpage-chat-height: calc(var(--vh, 1vh) * 100); --fullpage-chat-width: 100%; --fullpage-emoji-picker-height: 300px; diff --git a/conversejs/custom/sass/livechat.scss b/conversejs/custom/shared/styles/livechat.scss similarity index 94% rename from conversejs/custom/sass/livechat.scss rename to conversejs/custom/shared/styles/livechat.scss index 53e2c8a9..fd718f7e 100644 --- a/conversejs/custom/sass/livechat.scss +++ b/conversejs/custom/shared/styles/livechat.scss @@ -1,5 +1,5 @@ @import "./variables"; -@import "sass/converse"; +@import "shared/styles/index"; @import "./peertubetheme"; body.livechat-iframe #conversejs .chat-head { diff --git a/conversejs/custom/templates/background_logo.js b/conversejs/custom/templates/background_logo.js index 305882fb..4ceb4220 100644 --- a/conversejs/custom/templates/background_logo.js +++ b/conversejs/custom/templates/background_logo.js @@ -1,5 +1,5 @@ import { html } from 'lit-html' -import { api } from '@converse/headless/converse-core' +import { api } from '@converse/headless/core.js' export default () => html`
diff --git a/conversejs/custom/webpack.livechat.js b/conversejs/custom/webpack.livechat.js index 6ba7e927..6f34ba31 100644 --- a/conversejs/custom/webpack.livechat.js +++ b/conversejs/custom/webpack.livechat.js @@ -9,8 +9,8 @@ module.exports = merge(prod, { alias: { // To override a template, use this syntax: // 'templates/muc_sidebar.js': path.resolve(__dirname, 'custom/templates/muc_sidebar.js') - 'templates/background_logo.js': path.resolve(__dirname, 'custom/templates/background_logo.js'), - '../sass/converse.scss': path.resolve(__dirname, 'custom/sass/livechat.scss') + '../../templates/background_logo.js$': path.resolve(__dirname, 'custom/templates/background_logo.js'), + './styles/index.scss$': path.resolve(__dirname, 'custom/shared/styles/livechat.scss') } } }) diff --git a/vendor/converse.js b/vendor/converse.js index e9967882..07716252 160000 --- a/vendor/converse.js +++ b/vendor/converse.js @@ -1 +1 @@ -Subproject commit e9967882a94ee48667d6d1aac33118dd32edebbb +Subproject commit 077162529d7074253167640c753c6a7c2c9d6e1d