diff --git a/src/views/Chores/ChoreListView.jsx b/src/views/Chores/ChoreListView.jsx index bdfdebf..0fdf1ff 100644 --- a/src/views/Chores/ChoreListView.jsx +++ b/src/views/Chores/ChoreListView.jsx @@ -89,7 +89,7 @@ const ChoreListView = ({ alignItems: 'center', justifyContent: 'center', bgcolor: 'danger.softBg', - color: 'danger.600', + color: 'danger.700', px: 3, height: '100%', }} @@ -108,7 +108,8 @@ const ChoreListView = ({ flexDirection: 'column', alignItems: 'center', justifyContent: 'center', - bgcolor: 'var(--joy-palette-neutral-100)', + bgcolor: 'neutral.softBg', + color: 'neutral.700', px: 3, height: '100%', opacity: 0.5, @@ -138,7 +139,7 @@ const ChoreListView = ({ alignItems: 'center', justifyContent: 'center', bgcolor: 'success.softBg', - color: 'success.600', + color: 'success.700', px: 3, height: '100%', }} @@ -165,7 +166,7 @@ const ChoreListView = ({ alignItems: 'center', justifyContent: 'center', bgcolor: 'warning.softBg', - color: 'warning.600', + color: 'warning.700', px: 3, height: '100%', }} @@ -184,7 +185,8 @@ const ChoreListView = ({ flexDirection: 'column', alignItems: 'center', justifyContent: 'center', - bgcolor: 'var(--joy-palette-neutral-100)', + bgcolor: 'neutral.softBg', + color: 'neutral.700', px: 3, height: '100%', }} @@ -205,7 +207,7 @@ const ChoreListView = ({ alignItems: 'center', justifyContent: 'center', bgcolor: 'warning.softBg', - color: 'warning.600', + color: 'warning.700', px: 3, height: '100%', }} @@ -226,7 +228,7 @@ const ChoreListView = ({ alignItems: 'center', justifyContent: 'center', bgcolor: 'danger.softBg', - color: 'danger.600', + color: 'danger.700', px: 3, height: '100%', }} diff --git a/src/views/Filters/FilterView.jsx b/src/views/Filters/FilterView.jsx index 7c7505d..dd1a1c0 100644 --- a/src/views/Filters/FilterView.jsx +++ b/src/views/Filters/FilterView.jsx @@ -438,7 +438,7 @@ const FilterView = () => { alignItems: 'center', justifyContent: 'center', bgcolor: 'warning.softBg', - color: 'warning.600', + color: 'warning.700', px: 3, height: '100%', }} @@ -460,7 +460,8 @@ const FilterView = () => { flexDirection: 'column', alignItems: 'center', justifyContent: 'center', - bgcolor: 'var(--joy-palette-neutral-100)', + bgcolor: 'neutral.softBg', + color: 'neutral.700', px: 3, height: '100%', }} @@ -481,7 +482,7 @@ const FilterView = () => { alignItems: 'center', justifyContent: 'center', bgcolor: 'danger.softBg', - color: 'danger.600', + color: 'danger.700', px: 3, height: '100%', }} diff --git a/src/views/History/ChoreHistory.jsx b/src/views/History/ChoreHistory.jsx index de8d02b..c89bf52 100644 --- a/src/views/History/ChoreHistory.jsx +++ b/src/views/History/ChoreHistory.jsx @@ -1,12 +1,12 @@ import { - Analytics, - Checklist, - EventBusy, - Group, - History, - Star, - Timelapse, - TrendingUp, + Analytics, + Checklist, + EventBusy, + Group, + History, + Star, + Timelapse, + TrendingUp, } from '@mui/icons-material' import DeleteIcon from '@mui/icons-material/Delete' import EditIcon from '@mui/icons-material/Edit' @@ -15,18 +15,18 @@ import moment from 'moment' import { useEffect, useState } from 'react' import { Link, useParams } from 'react-router-dom' import { - Type as ListType, - SwipeableList, - SwipeableListItem, - SwipeAction, - TrailingActions, + Type as ListType, + SwipeableList, + SwipeableListItem, + SwipeAction, + TrailingActions, } from 'react-swipeable-list' import 'react-swipeable-list/dist/styles.css' import useConfirmationModal from '../../hooks/useConfirmationModal' import { - useChoreHistory, - useDeleteChoreHistory, - useUpdateChoreHistory, + useChoreHistory, + useDeleteChoreHistory, + useUpdateChoreHistory, } from '../../queries/ChoreQueries' import { useCircleMembers } from '../../queries/UserQueries' import { ChoreHistoryStatus } from '../../utils/Chores' @@ -314,7 +314,8 @@ const ChoreHistory = () => { flexDirection: 'column', alignItems: 'center', justifyContent: 'center', - bgcolor: 'var(--joy-palette-neutral-100)', + bgcolor: 'neutral.softBg', + color: 'neutral.700', px: 3, height: '100%', width: '100%', @@ -334,7 +335,7 @@ const ChoreHistory = () => { alignItems: 'center', justifyContent: 'center', bgcolor: 'danger.softBg', - color: 'danger.600', + color: 'danger.700', px: 3, height: '100%', }} diff --git a/src/views/Labels/LabelView.jsx b/src/views/Labels/LabelView.jsx index 2986dc5..875414a 100644 --- a/src/views/Labels/LabelView.jsx +++ b/src/views/Labels/LabelView.jsx @@ -1,14 +1,14 @@ import DeleteIcon from '@mui/icons-material/Delete' import EditIcon from '@mui/icons-material/Edit' import { - Avatar, - Box, - Chip, - CircularProgress, - Container, - IconButton, - Stack, - Typography, + Avatar, + Box, + Chip, + CircularProgress, + Container, + IconButton, + Stack, + Typography, } from '@mui/joy' import { useEffect, useState } from 'react' import LabelModal from '../Modals/Inputs/LabelModal' @@ -16,11 +16,11 @@ import LabelModal from '../Modals/Inputs/LabelModal' import { Add } from '@mui/icons-material' import { useQueryClient } from '@tanstack/react-query' import { - Type as ListType, - SwipeableList, - SwipeableListItem, - SwipeAction, - TrailingActions, + Type as ListType, + SwipeableList, + SwipeableListItem, + SwipeAction, + TrailingActions, } from 'react-swipeable-list' import 'react-swipeable-list/dist/styles.css' import { useUserProfile } from '../../queries/UserQueries' @@ -276,7 +276,8 @@ const LabelView = () => { flexDirection: 'column', alignItems: 'center', justifyContent: 'center', - bgcolor: 'var(--joy-palette-neutral-100)', + bgcolor: 'neutral.softBg', + color: 'neutral.700', px: 3, height: '100%', }} @@ -295,7 +296,7 @@ const LabelView = () => { alignItems: 'center', justifyContent: 'center', bgcolor: 'danger.softBg', - color: 'danger.600', + color: 'danger.700', px: 3, height: '100%', }} diff --git a/src/views/Projects/ProjectView.jsx b/src/views/Projects/ProjectView.jsx index 3c27ba9..8d4da1d 100644 --- a/src/views/Projects/ProjectView.jsx +++ b/src/views/Projects/ProjectView.jsx @@ -1,14 +1,14 @@ import DeleteIcon from '@mui/icons-material/Delete' import EditIcon from '@mui/icons-material/Edit' import { - Avatar, - Box, - Chip, - CircularProgress, - Container, - IconButton, - Stack, - Typography, + Avatar, + Box, + Chip, + CircularProgress, + Container, + IconButton, + Stack, + Typography, } from '@mui/joy' import { useEffect, useState } from 'react' import { useNavigate } from 'react-router-dom' @@ -17,11 +17,11 @@ import ProjectModal from '../Modals/Inputs/ProjectModal' import { Add, Task } from '@mui/icons-material' import { useQueryClient } from '@tanstack/react-query' import { - Type as ListType, - SwipeableList, - SwipeableListItem, - SwipeAction, - TrailingActions, + Type as ListType, + SwipeableList, + SwipeableListItem, + SwipeAction, + TrailingActions, } from 'react-swipeable-list' import 'react-swipeable-list/dist/styles.css' import { useChores } from '../../queries/ChoreQueries' @@ -389,7 +389,8 @@ const ProjectView = () => { flexDirection: 'column', alignItems: 'center', justifyContent: 'center', - bgcolor: 'var(--joy-palette-neutral-100)', + bgcolor: 'neutral.softBg', + color: 'neutral.700', px: 3, height: '100%', }} @@ -410,7 +411,7 @@ const ProjectView = () => { alignItems: 'center', justifyContent: 'center', bgcolor: 'danger.softBg', - color: 'danger.600', + color: 'danger.700', px: 3, height: '100%', }} diff --git a/src/views/Things/ThingsView.jsx b/src/views/Things/ThingsView.jsx index 9f7b08a..0384ed2 100644 --- a/src/views/Things/ThingsView.jsx +++ b/src/views/Things/ThingsView.jsx @@ -1,39 +1,39 @@ import { - Add, - Delete, - Edit, - Flip, - PlusOne, - ToggleOff, - ToggleOn, - Widgets, + Add, + Delete, + Edit, + Flip, + PlusOne, + ToggleOff, + ToggleOn, + Widgets, } from '@mui/icons-material' import { - Avatar, - Box, - Chip, - Container, - IconButton, - Stack, - Typography, + Avatar, + Box, + Chip, + Container, + IconButton, + Stack, + Typography, } from '@mui/joy' import { useEffect, useState } from 'react' import { useNavigate } from 'react-router-dom' import { - Type as ListType, - SwipeableList, - SwipeableListItem, - SwipeAction, - TrailingActions, + Type as ListType, + SwipeableList, + SwipeableListItem, + SwipeAction, + TrailingActions, } from 'react-swipeable-list' import 'react-swipeable-list/dist/styles.css' import { useNotification } from '../../service/NotificationProvider' import { - CreateThing, - DeleteThing, - GetThings, - SaveThing, - UpdateThingState, + CreateThing, + DeleteThing, + GetThings, + SaveThing, + UpdateThingState, } from '../../utils/Fetcher' import { getSafeBottomStyles } from '../../utils/SafeAreaUtils' import ConfirmationModal from '../Modals/Inputs/ConfirmationModal' @@ -413,7 +413,7 @@ const ThingsView = () => { alignItems: 'center', justifyContent: 'center', bgcolor: 'success.softBg', - color: 'success.600', + color: 'success.700', px: 3, height: '100%', }} @@ -439,7 +439,8 @@ const ThingsView = () => { flexDirection: 'column', alignItems: 'center', justifyContent: 'center', - bgcolor: 'var(--joy-palette-neutral-100)', + bgcolor: 'neutral.softBg', + color: 'neutral.700', px: 3, height: '100%', }} @@ -458,7 +459,7 @@ const ThingsView = () => { alignItems: 'center', justifyContent: 'center', bgcolor: 'danger.softBg', - color: 'danger.600', + color: 'danger.700', px: 3, height: '100%', }} diff --git a/src/views/Timer/TimerDetails.jsx b/src/views/Timer/TimerDetails.jsx index bd886a5..d162ba4 100644 --- a/src/views/Timer/TimerDetails.jsx +++ b/src/views/Timer/TimerDetails.jsx @@ -1,47 +1,47 @@ import { - AccessTime, - Add, - BrowseGallery, - Delete, - Edit, - PauseCircle, - Person, - PlayArrow, + AccessTime, + Add, + BrowseGallery, + Delete, + Edit, + PauseCircle, + Person, + PlayArrow, } from '@mui/icons-material' import DeleteIcon from '@mui/icons-material/Delete' import EditIcon from '@mui/icons-material/Edit' import { - Alert, - Avatar, - Box, - Button, - Card, - CardContent, - Chip, - Container, - FormControl, - FormHelperText, - Grid, - IconButton, - Input, - Typography, + Alert, + Avatar, + Box, + Button, + Card, + CardContent, + Chip, + Container, + FormControl, + FormHelperText, + Grid, + IconButton, + Input, + Typography, } from '@mui/joy' import moment from 'moment' import { useEffect, useState } from 'react' import { useParams } from 'react-router-dom' import { - Type as ListType, - SwipeableList, - SwipeableListItem, - SwipeAction, - TrailingActions, + Type as ListType, + SwipeableList, + SwipeableListItem, + SwipeAction, + TrailingActions, } from 'react-swipeable-list' import 'react-swipeable-list/dist/styles.css' import { - useChoreTimer, - usePauseChore, - useStartChore, - useUpdateTimeSession, + useChoreTimer, + usePauseChore, + useStartChore, + useUpdateTimeSession, } from '../../queries/TimeQueries' import { useCircleMembers } from '../../queries/UserQueries' import { useNotification } from '../../service/NotificationProvider' @@ -959,8 +959,8 @@ const TimerDetails = () => { flexDirection: 'column', alignItems: 'center', justifyContent: 'center', - bgcolor: - 'var(--joy-palette-neutral-100)', + bgcolor: 'neutral.softBg', + color: 'neutral.700', px: 3, height: '100%', }} @@ -986,7 +986,7 @@ const TimerDetails = () => { alignItems: 'center', justifyContent: 'center', bgcolor: 'danger.softBg', - color: 'danger.600', + color: 'danger.700', px: 3, height: '100%', }}