diff --git a/src/views/Chores/Sidepanel.jsx b/src/views/Chores/Sidepanel.jsx index 6bb292d..f9a5d0b 100644 --- a/src/views/Chores/Sidepanel.jsx +++ b/src/views/Chores/Sidepanel.jsx @@ -1,13 +1,20 @@ import { Box, Sheet } from '@mui/joy' import { useMediaQuery } from '@mui/material' import { useEffect, useState } from 'react' +import { useChoresHistory } from '../../queries/ChoreQueries' import { ChoresGrouper } from '../../utils/Chores' import CalendarView from '../components/CalendarView' +import ActivitiesCard from './ActivitesCard' import WelcomeCard from './WelcomeCard' const Sidepanel = ({ chores }) => { const isLargeScreen = useMediaQuery(theme => theme.breakpoints.up('md')) const [dueDatePieChartData, setDueDatePieChartData] = useState([]) + const { + data: choresHistory, + isChoresHistoryLoading, + handleLimitChange: refetchHistory, + } = useChoresHistory(7, true) useEffect(() => { setDueDatePieChartData(generateChoreDuePieChartData(chores)) @@ -33,6 +40,7 @@ const Sidepanel = ({ chores }) => { return ( + { boxShadow: 'sm', borderRadius: 20, height: '80vh', - width: '290px', + width: '315px', }} > diff --git a/src/views/Chores/WelcomeCard.jsx b/src/views/Chores/WelcomeCard.jsx index 323f794..54baff3 100644 --- a/src/views/Chores/WelcomeCard.jsx +++ b/src/views/Chores/WelcomeCard.jsx @@ -1,3 +1,4 @@ +import { Person } from '@mui/icons-material' import { Avatar, Box, Button, Sheet, Typography } from '@mui/joy' import { useContext, useEffect, useState } from 'react' @@ -5,18 +6,14 @@ import { useImpersonateUser } from '../../contexts/ImpersonateUserContext' import { UserContext } from '../../contexts/UserContext' import { useCircleMembers } from '../../queries/UserQueries' import UserModal from '../Modals/Inputs/UserModal' -const WelcomeCard = chores => { +const WelcomeCard = () => { const { impersonatedUser, setImpersonatedUser } = useImpersonateUser() const [isAdmin, setIsAdmin] = useState(false) const { userProfile } = useContext(UserContext) const [isModalOpen, setIsModalOpen] = useState(false) - const [summarytext, setSummaryText] = useState('') - const { - data: circleMembersData, - isLoading: isCircleMembersLoading, - handleRefetch: handleCircleMembersRefetch, - } = useCircleMembers() + const { data: circleMembersData, isLoading: isCircleMembersLoading } = + useCircleMembers() useEffect(() => { if (userProfile && userProfile?.id) { @@ -50,14 +47,28 @@ const WelcomeCard = chores => { justifyContent: 'space-between', boxShadow: 'sm', borderRadius: 20, - width: '290px', + width: '315px', mb: 1, }} > + {/* Header */} + + + + Current User + + - Who's checking in? + Who's checking in?