From 4ef28e7326d04253650c33e91855725eb721181b Mon Sep 17 00:00:00 2001 From: adriano Date: Tue, 18 Jan 2022 21:12:21 -0300 Subject: [PATCH] =?UTF-8?q?Altera=C3=A7=C3=A3o=20das=20cores=20dos=20bot?= =?UTF-8?q?=C3=B5es=20do=20layout=20e=20de=20alguns=20icones=20para=20cor?= =?UTF-8?q?=20para=20laranja?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TicketServices/FindOrCreateTicketService.ts | 2 +- .../services/WbotServices/wbotMessageListener.ts | 14 ++++++++------ frontend/src/App.js | 6 ++++-- frontend/src/assets/logo.jpg | Bin 0 -> 2778 bytes frontend/src/components/MainContainer/index.js | 3 ++- frontend/src/layout/index.js | 6 +++++- frontend/src/pages/Login/index.js | 15 +++++++++------ frontend/src/pages/Signup/index.js | 6 +++--- 8 files changed, 32 insertions(+), 20 deletions(-) create mode 100644 frontend/src/assets/logo.jpg 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 0000000000000000000000000000000000000000..9760a02d36b1d31343bd17e98a014c99fc12dd96 GIT binary patch literal 2778 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 Xfro3wjQ?J;b4oq)w>7m+`p5qP1%v4+ literal 0 HcmV?d00001 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")}