fixed some bugs with the viewer that were causing console errors, even though is functioned properly
This commit is contained in:
parent
a6b463eea2
commit
84885dc163
1 changed files with 15 additions and 56 deletions
|
|
@ -2,7 +2,7 @@ import React, { useState } from "react";
|
|||
import { EventClickArg } from "@fullcalendar/core";
|
||||
import { DateClickArg } from "@fullcalendar/interaction";
|
||||
import { useGlobalState } from "providers";
|
||||
import { useMobile, useSnackbar, useThemeType } from "hooks";
|
||||
import { useMobile, useSnackbar } from "hooks";
|
||||
import { useTaskAPI } from "providers";
|
||||
import { useEffect, useCallback } from "react";
|
||||
import TaskCalendar from "./TaskCalendar";
|
||||
|
|
@ -12,7 +12,6 @@ import {
|
|||
Button,
|
||||
Fab,
|
||||
Grid2 as Grid,
|
||||
IconButton,
|
||||
LinearProgress,
|
||||
Theme,
|
||||
Typography
|
||||
|
|
@ -21,8 +20,6 @@ import { Task } from "models";
|
|||
import TaskSettings from "./TaskSettings";
|
||||
import { DayPicker } from "react-day-picker";
|
||||
import "react-day-picker/dist/style.css";
|
||||
import { CalendarToday } from "@mui/icons-material";
|
||||
import NotesIcon from "@mui/icons-material/Notes";
|
||||
import AddIcon from "@mui/icons-material/Add";
|
||||
import TaskDrawer from "./TaskDrawer";
|
||||
import moment from "moment";
|
||||
|
|
@ -42,17 +39,7 @@ interface TabPanelProps {
|
|||
}
|
||||
|
||||
const useStyles = makeStyles((theme: Theme) => {
|
||||
const themeType = useThemeType();
|
||||
|
||||
return ({
|
||||
avatar: {
|
||||
color: themeType === "light" ? theme.palette.common.black : theme.palette.common.white,
|
||||
backgroundColor: "transparent",
|
||||
width: theme.spacing(5),
|
||||
height: theme.spacing(5),
|
||||
border: "1px solid",
|
||||
borderColor: theme.palette.divider
|
||||
},
|
||||
active: {
|
||||
color: theme.palette.getContrastText(theme.palette.secondary.main),
|
||||
backgroundColor: theme.palette.secondary.main,
|
||||
|
|
@ -84,18 +71,18 @@ const useStyles = makeStyles((theme: Theme) => {
|
|||
|
||||
export default function TaskViewer(props: ViewProps) {
|
||||
const { objectKey, label, drawerView, loadKeys } = props;
|
||||
const [{ user }] = useGlobalState();
|
||||
const [{ as }] = useGlobalState();
|
||||
const [{ user, as }] = useGlobalState();
|
||||
//const [{ as }] = useGlobalState();
|
||||
const taskAPI = useTaskAPI();
|
||||
const { openSnack } = useSnackbar();
|
||||
const [tasks, setTasks] = useState<Map<string, Task>>(new Map<string, Task>());
|
||||
const [viewTask, setViewTask] = useState<Task>(Task.create());
|
||||
const [tasks, setTasks] = useState<Map<string, Task>>(new Map<string, Task>([]));
|
||||
const [viewTask, setViewTask] = useState<Task>();
|
||||
const [newTaskDialog, setNewTaskDialog] = useState(false);
|
||||
const [editTask, setEditTask] = useState<Task>();
|
||||
const [loaded, setLoaded] = useState(false);
|
||||
const [currentDate, setCurrentDate] = useState(new Date());
|
||||
const isMobile = useMobile();
|
||||
const [value, setValue] = React.useState(0);
|
||||
const [value, setValue] = useState(0);
|
||||
const classes = useStyles();
|
||||
const [expand, setExpand] = useState(false);
|
||||
const [hideCal, setHideCal] = useState(false);
|
||||
|
|
@ -216,33 +203,6 @@ export default function TaskViewer(props: ViewProps) {
|
|||
});
|
||||
};
|
||||
|
||||
const tabIcons = () => {
|
||||
return (
|
||||
<Box display="flex" justifyContent="left" alignItems="center" zIndex={5}>
|
||||
<IconButton
|
||||
className={value === 0 ? classes.active : classes.avatar}
|
||||
component="span"
|
||||
style={{
|
||||
marginBottom: "0.75rem",
|
||||
marginRight: "0.5rem"
|
||||
}}
|
||||
onClick={() => setValue(0)}>
|
||||
<CalendarToday />
|
||||
</IconButton>
|
||||
<IconButton
|
||||
className={value === 1 ? classes.active : classes.avatar}
|
||||
component="span"
|
||||
style={{
|
||||
marginBottom: "0.75rem",
|
||||
marginRight: "0.5rem"
|
||||
}}
|
||||
onClick={() => setValue(1)}>
|
||||
<NotesIcon />
|
||||
</IconButton>
|
||||
</Box>
|
||||
);
|
||||
};
|
||||
|
||||
function TabPanelMine(props: TabPanelProps) {
|
||||
const { children, value, index, ...other } = props;
|
||||
|
||||
|
|
@ -274,7 +234,6 @@ export default function TaskViewer(props: ViewProps) {
|
|||
size={isMobile ? "medium" : "large"}>
|
||||
<AddIcon />
|
||||
</Fab>
|
||||
{!drawerView && tabIcons()}
|
||||
<TabPanelMine value={value} index={0}>
|
||||
<Box paddingBottom={2}>
|
||||
<TaskCalendar
|
||||
|
|
@ -455,15 +414,15 @@ export default function TaskViewer(props: ViewProps) {
|
|||
setNewTaskDialog(false);
|
||||
}}
|
||||
/>
|
||||
{
|
||||
<TaskDrawer
|
||||
task={viewTask}
|
||||
open={openDrawer}
|
||||
closeCallback={() => setOpenDrawer(false)}
|
||||
completeTask={markComplete}
|
||||
deleteTask={deleteTask}
|
||||
editTask={setTaskToEdit}
|
||||
/>
|
||||
{viewTask &&
|
||||
<TaskDrawer
|
||||
task={viewTask}
|
||||
open={openDrawer}
|
||||
closeCallback={() => setOpenDrawer(false)}
|
||||
completeTask={markComplete}
|
||||
deleteTask={deleteTask}
|
||||
editTask={setTaskToEdit}
|
||||
/>
|
||||
}
|
||||
</Box>
|
||||
);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue