v0.9.47 schedules redesign

This commit is contained in:
2026-03-17 10:05:51 -04:00
parent fed5e75122
commit 0e7a20e45b
6 changed files with 706 additions and 14 deletions

View File

@@ -15,7 +15,7 @@ import AboutModal from '../components/AboutModal.jsx';
import HelpModal from '../components/HelpModal.jsx';
import NavDrawer from '../components/NavDrawer.jsx';
import GroupManagerModal from '../components/GroupManagerModal.jsx';
import ScheduleManagerModal from '../components/ScheduleManagerModal.jsx';
import SchedulePage from '../components/SchedulePage.jsx';
import './Chat.css';
function urlBase64ToUint8Array(base64String) {
@@ -37,7 +37,8 @@ export default function Chat() {
const [activeGroupId, setActiveGroupId] = useState(null);
const [notifications, setNotifications] = useState([]);
const [unreadGroups, setUnreadGroups] = useState(new Map());
const [modal, setModal] = useState(null); // 'profile' | 'users' | 'settings' | 'newchat' | 'help' | 'groupmanager' | 'schedulemanager'
const [modal, setModal] = useState(null); // 'profile' | 'users' | 'settings' | 'newchat' | 'help' | 'groupmanager'
const [page, setPage] = useState('chat'); // 'chat' | 'schedule'
const [drawerOpen, setDrawerOpen] = useState(false);
const [features, setFeatures] = useState({ branding: false, groupManager: false, scheduleManager: false, appType: 'JAMA-Chat', teamToolManagers: [] });
const [helpDismissed, setHelpDismissed] = useState(true); // true until status loaded
@@ -328,6 +329,21 @@ export default function Chat() {
...(groups.privateGroups || [])
].find(g => g.id === activeGroupId);
const isToolManager = user?.role === 'admin' || (features.teamToolManagers || []).some(gid => (features.userGroupMemberships || []).includes(gid));
if (page === 'schedule') {
return (
<>
<SchedulePage
onBack={() => setPage('chat')}
isToolManager={isToolManager}
features={features}
/>
{modal === 'settings' && <SettingsModal onClose={() => setModal(null)} onFeaturesChanged={setFeatures} />}
</>
);
}
return (
<div className="chat-layout">
{/* Global top bar — spans full width on desktop, visible on mobile sidebar view */}
@@ -370,9 +386,9 @@ export default function Chat() {
<NavDrawer
open={drawerOpen}
onClose={() => setDrawerOpen(false)}
onMessages={() => { setDrawerOpen(false); }}
onGroupManager={() => { setDrawerOpen(false); setModal('groupmanager'); }}
onScheduleManager={() => { setDrawerOpen(false); setModal('schedulemanager'); }}
onScheduleManager={() => { setDrawerOpen(false); setPage('schedule'); }}
onMessages={() => { setDrawerOpen(false); setPage('chat'); }}
onBranding={() => { setDrawerOpen(false); setModal('branding'); }}
onSettings={() => { setDrawerOpen(false); setModal('settings'); }}
onUsers={() => { setDrawerOpen(false); setModal('users'); }}
@@ -383,12 +399,7 @@ export default function Chat() {
{modal === 'settings' && <SettingsModal onClose={() => setModal(null)} onFeaturesChanged={setFeatures} />}
{modal === 'branding' && <BrandingModal onClose={() => setModal(null)} />}
{modal === 'groupmanager' && <GroupManagerModal onClose={() => setModal(null)} />}
{modal === 'schedulemanager' && (
<ScheduleManagerModal
onClose={() => setModal(null)}
isToolManager={user?.role === 'admin' || (features.teamToolManagers || []).some(gid => (features.userGroupMemberships || []).includes(gid))}
/>
)}
{modal === 'newchat' && <NewChatModal onClose={() => setModal(null)} onCreated={(g) => { loadGroups(); setModal(null); setActiveGroupId(g.id); }} />}
{modal === 'about' && <AboutModal onClose={() => setModal(null)} />}
{modal === 'help' && <HelpModal onClose={() => setModal(null)} dismissed={helpDismissed} />}