adriano.andrade
/
projeto-hit
mirror of https://github.com/AdrianoRobson/projeto-hit.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correção de conflito do merge

pull/1/head
adriano 2022-02-22 17:43:09 -03:00
parent 22f3abf682 0db6e88477
commit 3da9f39a62
13 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/controllers/TicketController.ts
View File

@ -106,10 +106,7 @@ export const update = async (
const { farewellMessage } = whatsapp; const { farewellMessage } = whatsapp;
if (farewellMessage) { if (farewellMessage) {
await SendWhatsAppMessage({ await SendWhatsAppMessage({ body: farewellMessage, ticket });
body: farewellMessage,
ticket
});
} }
} }

4
backend/src/libs/wbot.ts
View File

@ -138,7 +138,7 @@ export const initWbot = async (whatsapp: Whatsapp): Promise<Session> => {
resolve(wbot); resolve(wbot);
}); });
} catch (err) { } catch (err) {
logger.error(err); logger.error(`${err}`);
} }
}); });
}; };
@ -160,6 +160,6 @@ export const removeWbot = (whatsappId: number): void => {
sessions.splice(sessionIndex, 1); sessions.splice(sessionIndex, 1);
} }
} catch (err) { } catch (err) {
logger.error(err); logger.error(`${err}`);
} }
}; };

3
backend/src/services/WbotServices/StartWhatsAppSession.ts
View File

@ -22,8 +22,7 @@ export const StartWhatsAppSession = async (
wbotMonitor(wbot, whatsapp); wbotMonitor(wbot, whatsapp);
} catch (err) { } catch (err) {
console.error(err ) logger.error(`${err}`);
logger.error(err);
} }
}; };

BIN
frontend/public/android-chrome-192x192.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 17 KiB

BIN
frontend/public/apple-touch-icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 17 KiB

BIN
frontend/public/favicon-16x16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 638 B

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
frontend/public/favicon-32x32.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
frontend/public/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

10
frontend/public/index.html
View File

@ -1,18 +1,18 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<title>GrupoHit</title> <title>OmniHit</title>
<link <link
rel="stylesheet" rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
/> />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/apple-touch-icon.png" /> <link rel="apple-touch-icon" href="%PUBLIC_URL%/apple-touch-icon.png" />
<!--<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />--> <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="icon" href="http://www.hittelco.com/images/favicon.png" /> <!--<link rel="icon" href="https://www.hittelco.com/images/favicon.png" />-->
<!--<link rel=”shortcut icon” href=”%PUBLIC_URL%/favicon.ico”>--> <link rel=”shortcut icon” href=”%PUBLIC_URL%/favicon.ico”>
<link rel="shortcut icon" href="http://www.hittelco.com/images/favicon.png" /> <!--<link rel="shortcut icon" href="http://www.hittelco.com/images/favicon.png" />-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" /> <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />

4
frontend/public/manifest.json
View File

@ -1,6 +1,6 @@
{ {
"short_name": "GrupoHit", "short_name": "OmniHit",
"name": "GrupoHit", "name": "OmniHit",
"icons": [ "icons": [
{ {
"src": "favicon.ico", "src": "favicon.ico",

2
frontend/src/components/TicketActionButtons/index.js
View File

@ -82,6 +82,7 @@ const TicketActionButtons = ({ ticket }) => {
> >
{i18n.t("messagesList.header.buttons.return")} {i18n.t("messagesList.header.buttons.return")}
</ButtonWithSpinner> </ButtonWithSpinner>
<ButtonWithSpinner <ButtonWithSpinner
loading={loading} loading={loading}
size="small" size="small"
@ -91,6 +92,7 @@ const TicketActionButtons = ({ ticket }) => {
> >
{i18n.t("messagesList.header.buttons.resolve")} {i18n.t("messagesList.header.buttons.resolve")}
</ButtonWithSpinner> </ButtonWithSpinner>
<IconButton onClick={handleOpenTicketOptionsMenu}> <IconButton onClick={handleOpenTicketOptionsMenu}>
<MoreVert /> <MoreVert />
</IconButton> </IconButton>

2
frontend/src/layout/index.js
View File

@ -220,7 +220,7 @@ const LoggedInLayout = ({ children }) => {
className={classes.title} className={classes.title}
> >
BETAGROUP OMNIHIT
</Typography> </Typography>
{user.id && <NotificationsPopOver />} {user.id && <NotificationsPopOver />}

2
frontend/src/pages/Login/index.js
View File

@ -143,7 +143,7 @@ const Login = () => {
component={RouterLink} component={RouterLink}
to="/signup" to="/signup"
> >
{i18n.t("login.buttons.register")} {/* {i18n.t("login.buttons.register")} */}
</Link> </Link>
</Grid> </Grid>