setNewTicketModalOpen(false)}
+ />
+
+ setSelectedQueueIds(values)}
+ />
+ setOpenCount(val)}
+ style={applyPanelStyle("open")}
+ />
+ setPendingCount(val)}
+ style={applyPanelStyle("pending")}
+ />
+
+ >
+ );
+ }
+ return (
+
+ setNewTicketModalOpen(false)}
+ />
+
+
+ }
+ label={i18n.t("tickets.tabs.open.title")}
+ classes={{ root: classes.tab }}
+ />
+ }
+ label={i18n.t("tickets.tabs.closed.title")}
+ classes={{ root: classes.tab }}
+ />
+ }
+ label={i18n.t("tickets.tabs.search.title")}
+ classes={{ root: classes.tab }}
+ />
+
+
+
+ {tab === "search" ? (
+
+
+
+
+ ) : (
+ <>
+
+ (
+ setShowAllTickets((prevState) => !prevState)}
+ name="showAllTickets"
+ color="primary"
+ />
+ }
+ />
+ )}
+ />
+ >
+ )}
+ setSelectedQueueIds(values)}
+ />
+
+
+
+
+ {i18n.t("ticketsList.assignedHeader")}
+
+ }
+ value={"open"}
+ />
+
+ {i18n.t("ticketsList.pendingHeader")}
+
+ }
+ value={"pending"}
+ />
+
+
+ setOpenCount(val)}
+ style={applyPanelStyle("open")}
+ />
+ setPendingCount(val)}
+ style={applyPanelStyle("pending")}
+ />
+
+
+
+
+
+
+
+
+
+ );
+};
+
+export default TicketsManager;
diff --git a/frontend/src/components/TicketsManager/index.js b/frontend/src/components/TicketsManager/index.js
index 88e6ea0..7a2ed26 100644
--- a/frontend/src/components/TicketsManager/index.js
+++ b/frontend/src/components/TicketsManager/index.js
@@ -9,9 +9,9 @@ import Tab from "@material-ui/core/Tab";
import Badge from "@material-ui/core/Badge";
import MoveToInboxIcon from "@material-ui/icons/MoveToInbox";
import CheckBoxIcon from "@material-ui/icons/CheckBox";
-
import FormControlLabel from "@material-ui/core/FormControlLabel";
import Switch from "@material-ui/core/Switch";
+import { Button } from "@material-ui/core";
import NewTicketModal from "../NewTicketModal";
import TicketsList from "../TicketsList";
@@ -21,7 +21,6 @@ import { i18n } from "../../translate/i18n";
import { AuthContext } from "../../context/Auth/AuthContext";
import { Can } from "../Can";
import TicketsQueueSelect from "../TicketsQueueSelect";
-import { Button } from "@material-ui/core";
const useStyles = makeStyles((theme) => ({
ticketsWrapper: {
@@ -112,7 +111,6 @@ const TicketsManager = () => {
if (user.profile.toUpperCase() === "ADMIN") {
setShowAllTickets(true);
}
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
useEffect(() => {
diff --git a/frontend/src/components/TicketsQueueSelect/index.js b/frontend/src/components/TicketsQueueSelect/index.js
index 2d4d225..e3d1f09 100644
--- a/frontend/src/components/TicketsQueueSelect/index.js
+++ b/frontend/src/components/TicketsQueueSelect/index.js
@@ -6,55 +6,52 @@ import Select from "@material-ui/core/Select";
import { Checkbox, ListItemText } from "@material-ui/core";
import { i18n } from "../../translate/i18n";
-const TicketsQueueSelect = ({
- userQueues,
- selectedQueueIds = [],
- onChange,
-}) => {
- const handleChange = e => {
- onChange(e.target.value);
- };
+const TicketsQueueSelect = ({ userQueues, selectedQueueIds = [], onChange }) => {
+ const handleChange = (e) => {
+ onChange(e.target.value);
+ };
- return (
-
-
-
-
-
- );
+ return (
+
+
+
+
+
+ );
};
export default TicketsQueueSelect;
+
diff --git a/frontend/src/components/UserModal/UserModal.jsx b/frontend/src/components/UserModal/UserModal.jsx
index eb254c6..efa0c0f 100644
--- a/frontend/src/components/UserModal/UserModal.jsx
+++ b/frontend/src/components/UserModal/UserModal.jsx
@@ -13,12 +13,35 @@ import UserModalComponent from "./UserModalImg/UserModalComponent";
import UserImg from "../../assets/images/User/user.jpg";
-const UserModal = ({ modal, click }) => {
+const UserModal = ({ modal, click, userId }) => {
const { user } = React.useContext(AuthContext);
- const InitalState = { name: user.name, email: user.email, profile: user.profile };
- const [userData, setUserData] = React.useState(InitalState);
- console.log(user);
+ const InitalState = {
+ name: "",
+ email: "",
+ password: "",
+ profile: "",
+ };
+ const [userData, setUserData] = React.useState(InitalState);
+ const [selectedQueueIds, setSelectedQueueIds] = React.useState([]);
+
+ React.useEffect(() => {
+ // const fetchUser = async () => {
+ // if (!userId) return;
+ // try {
+ // const { data } = await api.get(`/users/${userId}`);
+ // setUserData((prevState) => {
+ // return console.log({ ...prevState, ...data });
+ // });
+ // const userQueueIds = data.queues?.map((queue) => queue.id);
+ // setSelectedQueueIds(userQueueIds);
+ // } catch (err) {
+ // alert(err);
+ // }
+ // };
+
+ // fetchUser();
+ }, [userId]);
return (
@@ -30,14 +53,14 @@ const UserModal = ({ modal, click }) => {
label="Nome"
type="text"
value={userData.name}
- onChange={(event) => setUserData({name:event.target.data})}
+ onChange={(event) => setUserData({ name: event.target.data })}
/>
setUserData({email:event.target.data})}
+ onChange={(event) => setUserData({ email: event.target.data })}
/>
@@ -63,3 +86,4 @@ name: "teste"
profile: "master"
queues: []
tokenVersion: 0 */
+
diff --git a/frontend/src/pages/Tickets/Tickets.jsx b/frontend/src/pages/Tickets/Tickets.jsx
new file mode 100644
index 0000000..fa7eb4c
--- /dev/null
+++ b/frontend/src/pages/Tickets/Tickets.jsx
@@ -0,0 +1,20 @@
+import React from "react";
+import { useParams } from "react-router-dom";
+
+import TicketsStyled from "./Tickets.style";
+
+import TicketsManager from "../../components/TicketsManager/TicketsManager";
+import Ticket from "../../components/Ticket/";
+
+const Tickets = () => {
+ const { ticketId } = useParams();
+ return (
+
+
+ {ticketId ? : Não tem nada
}
+
+ );
+};
+
+export default Tickets;
+
diff --git a/frontend/src/pages/Tickets/Tickets.style.jsx b/frontend/src/pages/Tickets/Tickets.style.jsx
new file mode 100644
index 0000000..c8c3ea7
--- /dev/null
+++ b/frontend/src/pages/Tickets/Tickets.style.jsx
@@ -0,0 +1,9 @@
+import styled from "styled-components";
+
+const TicketsStyled = styled.div`
+ display: flex;
+ flex-direction: row;
+ height: 86vh;
+`;
+
+export default TicketsStyled
\ No newline at end of file
diff --git a/frontend/src/routes/index.js b/frontend/src/routes/index.js
index 431140c..ac11b68 100644
--- a/frontend/src/routes/index.js
+++ b/frontend/src/routes/index.js
@@ -10,7 +10,7 @@ import SchedulesReminder from "../pages/SchedulesReminder/";
import Login from "../pages/Login/";
import Signup from "../pages/Signup/";
-import Tickets from "../pages/Tickets/";
+import Tickets from "../pages/Tickets/Tickets";
import Connections from "../pages/Connections/";
import Settings from "../pages/Settings/";
import Users from "../pages/Users";