diff --git a/backend/src/services/TicketServices/FindOrCreateTicketService.ts b/backend/src/services/TicketServices/FindOrCreateTicketService.ts index 431c6d6..6f7e84a 100644 --- a/backend/src/services/TicketServices/FindOrCreateTicketService.ts +++ b/backend/src/services/TicketServices/FindOrCreateTicketService.ts @@ -50,7 +50,7 @@ const FindOrCreateTicketService = async ( //[Op.between]: [+subHours(new Date(), 2), +new Date()] // Tempo osioso para a ura responder thuanny - [Op.between]: [+subMinutes(new Date(), 4), +new Date()] + [Op.between]: [+subMinutes(new Date(), 30), +new Date()] }, contactId: contact.id }, diff --git a/backend/src/services/WbotServices/wbotMessageListener.ts b/backend/src/services/WbotServices/wbotMessageListener.ts index db40a51..2c74edd 100644 --- a/backend/src/services/WbotServices/wbotMessageListener.ts +++ b/backend/src/services/WbotServices/wbotMessageListener.ts @@ -150,14 +150,16 @@ const verifyQueue = async ( }); return; } - - //const selectedOption = msg.body; - //const choosenQueue = queues[+selectedOption - 1]; - - //apagar essa gambiarra e ativar as 2 linhas acima - const selectedOption = 1; + + console.log('queues.lengthqueues.lengthqueues.lengthqueues.lengthqueues.length: ',queues.length) + + const selectedOption = msg.body; const choosenQueue = queues[+selectedOption - 1]; + //apagar essa gambiarra e ativar as 2 linhas acima thuanny + //const selectedOption = 1; + //const choosenQueue = queues[+selectedOption - 1]; + if (choosenQueue) { await UpdateTicketService({ diff --git a/frontend/src/App.js b/frontend/src/App.js index ff22dac..e37774e 100644 --- a/frontend/src/App.js +++ b/frontend/src/App.js @@ -17,11 +17,13 @@ const App = () => { }, "&::-webkit-scrollbar-thumb": { boxShadow: "inset 0 0 6px rgba(0, 0, 0, 0.3)", - backgroundColor: "#e8e8e8", + + backgroundColor: "#e8e8e8", }, }, palette: { - primary: { main: "#2576d2" }, + //primary: { main: "#2576d2" }, + primary: { main: "#ec5114" }, }, }, locale diff --git a/frontend/src/assets/logo.jpg b/frontend/src/assets/logo.jpg new file mode 100644 index 0000000..9760a02 Binary files /dev/null and b/frontend/src/assets/logo.jpg differ diff --git a/frontend/src/components/MainContainer/index.js b/frontend/src/components/MainContainer/index.js index 0045703..27dce78 100644 --- a/frontend/src/components/MainContainer/index.js +++ b/frontend/src/components/MainContainer/index.js @@ -2,6 +2,7 @@ import React from "react"; import { makeStyles } from "@material-ui/core/styles"; import Container from "@material-ui/core/Container"; +import { colors } from "@material-ui/core"; const useStyles = makeStyles((theme) => ({ mainContainer: { @@ -9,7 +10,7 @@ const useStyles = makeStyles((theme) => ({ // padding: theme.spacing(2), // height: `calc(100% - 48px)`, padding: 0, - height: "100%", + height: "100%", }, contentWrapper: { diff --git a/frontend/src/layout/index.js b/frontend/src/layout/index.js index faca1f5..e91ce89 100644 --- a/frontend/src/layout/index.js +++ b/frontend/src/layout/index.js @@ -25,6 +25,8 @@ import { AuthContext } from "../context/Auth/AuthContext"; import BackdropLoading from "../components/BackdropLoading"; import { i18n } from "../translate/i18n"; +import MailLogo from '../assets/logo.jpg'; + const drawerWidth = 240; const useStyles = makeStyles((theme) => ({ @@ -217,7 +219,9 @@ const LoggedInLayout = ({ children }) => { noWrap className={classes.title} > - GrupoHit + + GRUPO HIT + {user.id && } diff --git a/frontend/src/pages/Login/index.js b/frontend/src/pages/Login/index.js index 0d3f192..377650a 100644 --- a/frontend/src/pages/Login/index.js +++ b/frontend/src/pages/Login/index.js @@ -15,8 +15,8 @@ import { Link } from '@material-ui/core'; -import { LockOutlined, Visibility, VisibilityOff } from '@material-ui/icons'; - +import { /*LockOutlined,*/ PersonOutlineOutlined, Visibility, VisibilityOff } from '@material-ui/icons'; + import { makeStyles } from "@material-ui/core/styles"; import { i18n } from "../../translate/i18n"; @@ -76,10 +76,13 @@ const Login = () => { return ( -
- - - +
+ + + + + + {i18n.t("login.title")} diff --git a/frontend/src/pages/Signup/index.js b/frontend/src/pages/Signup/index.js index 0d36827..df05692 100644 --- a/frontend/src/pages/Signup/index.js +++ b/frontend/src/pages/Signup/index.js @@ -20,7 +20,7 @@ import { Link } from '@material-ui/core'; -import { LockOutlined, Visibility, VisibilityOff } from '@material-ui/icons'; +import { PersonOutlineOutlined, Visibility, VisibilityOff } from '@material-ui/icons'; import { makeStyles } from "@material-ui/core/styles"; @@ -93,8 +93,8 @@ const SignUp = () => {
- - + + {i18n.t("signup.title")}