diff --git a/modules/rmeets/components/folk-jitsi-room.ts b/modules/rmeets/components/folk-jitsi-room.ts index 117fb46d..6017522d 100644 --- a/modules/rmeets/components/folk-jitsi-room.ts +++ b/modules/rmeets/components/folk-jitsi-room.ts @@ -143,12 +143,13 @@ class FolkJitsiRoom extends HTMLElement { hideConferenceSubject: false, disableVirtualBackground: false, disableProfile: false, + notifications: ['chat'], toolbarButtons: [ "camera", "microphone", "desktop", "hangup", "raisehand", "tileview", "toggle-camera", "fullscreen", "chat", "settings", "participants-pane", "select-background", - "sharedvideo", + "sharedvideo", "recording", ], // Hide panels that add stray close (×) buttons disableChat: false, @@ -160,6 +161,7 @@ class FolkJitsiRoom extends HTMLElement { SHOW_BRAND_WATERMARK: false, CLOSE_PAGE_GUEST_HINT: false, SHOW_PROMOTIONAL_CLOSE_PAGE: false, + CHAT_PANEL_POSITION: 'right', SETTINGS_SECTIONS: ['devices', 'language', 'moderator', 'profile', 'sounds', 'more'], }, }); diff --git a/modules/rmeets/mod.ts b/modules/rmeets/mod.ts index c8413518..d2d382c8 100644 --- a/modules/rmeets/mod.ts +++ b/modules/rmeets/mod.ts @@ -750,12 +750,13 @@ routes.get("/:room", (c) => { enableClosePage: false, disableVirtualBackground: false, disableProfile: false, + notifications: ['chat'], toolbarButtons: [ "microphone","camera","desktop","hangup", "raisehand","tileview","toggle-camera", "fullscreen","chat","settings", "participants-pane","select-background", - "sharedvideo","shareaudio", + "sharedvideo","shareaudio","recording", ], }, customToolbarButtons: [ @@ -768,6 +769,7 @@ routes.get("/:room", (c) => { MOBILE_APP_PROMO: false, HIDE_DEEP_LINKING_LOGO: true, DISABLE_JOIN_LEAVE_NOTIFICATIONS: false, + CHAT_PANEL_POSITION: 'right', SETTINGS_SECTIONS: ['devices', 'language', 'moderator', 'profile', 'sounds', 'more'], }, }); @@ -784,7 +786,8 @@ routes.get("/:room", (c) => { try { window.close(); } catch(e) {} document.getElementById("jitsi-container").innerHTML = '
Meeting ended' - + 'Back to rMeets
'; + + 'View Transcript & Summary' + + 'Back to rMeets'; }); } catch(e) { document.getElementById("jitsi-container").innerHTML = diff --git a/modules/rtime/components/folk-timebank-app.ts b/modules/rtime/components/folk-timebank-app.ts index 8c8c9c72..45304fba 100644 --- a/modules/rtime/components/folk-timebank-app.ts +++ b/modules/rtime/components/folk-timebank-app.ts @@ -287,7 +287,7 @@ class FolkTimebankApp extends HTMLElement { private poolPointerId: number | null = null; private poolPointerStart: { x: number; y: number; cx: number; cy: number } | null = null; private poolPanelCollapsed = false; - private _panelSplitPct = 35; + private _panelSplitPct = 50; private _dividerDragging = false; private _dividerDragStartX = 0; private _dividerDragStartPct = 0; @@ -375,12 +375,14 @@ class FolkTimebankApp extends HTMLElement { this._history.push(view); this.currentView = view; const canvasView = this.shadow.getElementById('canvas-view'); + const weaveView = this.shadow.getElementById('weave-view'); const collabView = this.shadow.getElementById('collaborate-view'); const dashView = this.shadow.getElementById('dashboard-view'); if (canvasView) canvasView.style.display = view === 'canvas' ? 'flex' : 'none'; + if (weaveView) weaveView.style.display = 'none'; if (collabView) collabView.style.display = view === 'collaborate' ? 'flex' : 'none'; if (dashView) dashView.style.display = view === 'dashboard' ? 'flex' : 'none'; - if (view === 'canvas') { this.resizePoolCanvas(); this.rebuildSidebar(); } + if (view === 'canvas') { this.resizePoolCanvas(); this.rebuildSidebar(); this.renderCommitmentsList(); } if (view === 'collaborate') this.refreshCollaborate(); if (view === 'dashboard') this.refreshDashboard(); } @@ -395,7 +397,7 @@ class FolkTimebankApp extends HTMLElement { else this.currentView = 'canvas'; this.dpr = window.devicePixelRatio || 1; this._theme = (localStorage.getItem('rtime-theme') as 'dark' | 'light') || 'dark'; - this._panelSplitPct = parseFloat(localStorage.getItem('rtime-split-pct') || '35'); + this._panelSplitPct = parseFloat(localStorage.getItem('rtime-split-pct') || '50'); this.render(); this.applyTheme(); this.setupPoolPanel(); @@ -524,6 +526,7 @@ class FolkTimebankApp extends HTMLElement { this.buildOrbs(); this.updateStats(); + this.renderCommitmentsList(); this.rebuildSidebar(); this.applyRestoredConnections(); @@ -544,13 +547,52 @@ class FolkTimebankApp extends HTMLElement {
- + +
+
+ Pledge Time + +
+
+
+ + +
+
+ + +
+
+
+ + +
+
+
+ + +
+ +
+
+ Commitments + 0 +
+
+
+ +
+
Commitment Pool - drag orb to weave \u2192 - - +
@@ -570,22 +612,17 @@ class FolkTimebankApp extends HTMLElement {
-
-
- -
-
-
- -
- +
+ +