jason/fabdash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fixes' (#2) from updates into main

Browse Source 
Reviewed-on: #2
This commit was merged in pull request #2.
This commit is contained in:
jason
2026-03-12 10:28:53 -05:00
parent 335879a4b7 1b8e0367f6
commit 0d0b71e749
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/Calendar/HeatmapDayPanel.jsx
View File

@@ -3,7 +3,6 @@ import { format, isToday } from 'date-fns'
import useProjectStore from '../../store/useProjectStore' import useProjectStore from '../../store/useProjectStore'
import useFocusStore from '../../store/useFocusStore' import useFocusStore from '../../store/useFocusStore'
import useUIStore from '../../store/useUIStore' import useUIStore from '../../store/useUIStore'
import { updateDeliverable as apiUpdate } from '../../api/deliverables'
import DeliverableModal from '../Deliverables/DeliverableModal' import DeliverableModal from '../Deliverables/DeliverableModal'
const STATUS_KEYS = ['overdue', 'in_progress', 'upcoming', 'completed'] const STATUS_KEYS = ['overdue', 'in_progress', 'upcoming', 'completed']
@@ -46,8 +45,7 @@ export default function HeatmapDayPanel({ date, onClose }) {
const next = STATUS_CYCLE[deliverable.status] || 'upcoming' const next = STATUS_CYCLE[deliverable.status] || 'upcoming'
setCycling(deliverable.id) setCycling(deliverable.id)
try { try {
const updated = await apiUpdate(deliverable.id, { status: next }) await storeUpdate(deliverable.id, { status: next })
storeUpdate(updated)
} finally { } finally {
setCycling(null) setCycling(null)
} }

3
frontend/src/components/Calendar/MainCalendar.jsx
View File

@@ -4,6 +4,9 @@ import dayGridPlugin from '@fullcalendar/daygrid'
import timeGridPlugin from '@fullcalendar/timegrid' import timeGridPlugin from '@fullcalendar/timegrid'
import interactionPlugin from '@fullcalendar/interaction' import interactionPlugin from '@fullcalendar/interaction'
import useProjectStore from '../../store/useProjectStore' import useProjectStore from '../../store/useProjectStore'
import useFocusStore from '../../store/useFocusStore'
import useUIStore from '../../store/useUIStore'
import useToastStore from '../../store/useToastStore'
import DeliverableModal from '../Deliverables/DeliverableModal' import DeliverableModal from '../Deliverables/DeliverableModal'
import ContextMenu from '../UI/ContextMenu' import ContextMenu from '../UI/ContextMenu'
import EventTooltip from './EventTooltip' import EventTooltip from './EventTooltip'

8
frontend/src/components/Projects/ProjectList.jsx
View File

@@ -4,8 +4,6 @@ import ProjectModal from './ProjectModal'
import Button from '../UI/Button' import Button from '../UI/Button'
import AgendaPanel from '../Calendar/AgendaPanel' import AgendaPanel from '../Calendar/AgendaPanel'
import useProjectStore from '../../store/useProjectStore' import useProjectStore from '../../store/useProjectStore'
import useUIStore from '../../store/useUIStore'
import { deleteProject, fetchProjects } from '../../api/projects'
const VIEW_OPTIONS = [ const VIEW_OPTIONS = [
{ key: 'active', label: 'Active' }, { key: 'active', label: 'Active' },
@@ -14,7 +12,7 @@ const VIEW_OPTIONS = [
] ]
export default function ProjectList({ onRegisterNewProject }) { export default function ProjectList({ onRegisterNewProject }) {
const { projects, removeProject, setProjects } = useProjectStore() const { projects, deleteProject, loadProjects } = useProjectStore()
const { sidebarTab, setSidebarTab } = useUIStore() const { sidebarTab, setSidebarTab } = useUIStore()
const [showModal, setShowModal] = useState(false) const [showModal, setShowModal] = useState(false)
const [editing, setEditing] = useState(null) const [editing, setEditing] = useState(null)
@@ -26,15 +24,13 @@ export default function ProjectList({ onRegisterNewProject }) {
}, [onRegisterNewProject]) }, [onRegisterNewProject])
const refreshProjects = async () => { const refreshProjects = async () => {
const data = await fetchProjects() await loadProjects()
setProjects(data)
} }
const handleEdit = (p) => { setEditing(p); setShowModal(true) } const handleEdit = (p) => { setEditing(p); setShowModal(true) }
const handleDelete = async (p) => { const handleDelete = async (p) => {
if (window.confirm(`Delete "${p.name}" and all its deliverables?`)) { if (window.confirm(`Delete "${p.name}" and all its deliverables?`)) {
await deleteProject(p.id) await deleteProject(p.id)
removeProject(p.id)
} }
} }
const handleClose = () => { setShowModal(false); setEditing(null) } const handleClose = () => { setShowModal(false); setEditing(null) }