First github Commit

frontend/src/components/Layout/MainDrawer.js

@@ -181,7 +181,7 @@ const MainDrawer = ({ appTitle, children }) => {
 						{appTitle}
 					</Typography>
 					<IconButton color="inherit">
-						<Badge badgeContent={4} color="secondary">
+						<Badge badgeContent={0} color="secondary">
 							<NotificationsIcon />
 						</Badge>
 					</IconButton>

frontend/src/components/Layout/MainListItems.js

@@ -12,7 +12,7 @@ import Collapse from "@material-ui/core/Collapse";
 import DashboardIcon from "@material-ui/icons/Dashboard";
 import WhatsAppIcon from "@material-ui/icons/WhatsApp";
 // import PeopleIcon from "@material-ui/icons/People";
-import BorderOuterIcon from "@material-ui/icons/BorderOuter";
+import SyncAltIcon from "@material-ui/icons/SyncAlt";
 import ChatIcon from "@material-ui/icons/Chat";
 import BarChartIcon from "@material-ui/icons/BarChart";
 import LayersIcon from "@material-ui/icons/Layers";
@@ -71,8 +71,8 @@ const MainListItems = () => {
 					<ListItemLink
 						className={classes.nested}
 						to="/whats-auth"
-						primary="Autenticação"
-						icon={<BorderOuterIcon />}
+						primary="Conexão"
+						icon={<SyncAltIcon />}
 					/>
 					<ListItemLink
 						className={classes.nested}

frontend/src/pages/Chat/Chat.js

@@ -1,4 +1,5 @@
-import React, { useState } from "react";
+import React from "react";
+import { useParams } from "react-router-dom";
 import Grid from "@material-ui/core/Grid";
 import Paper from "@material-ui/core/Paper";
 import { makeStyles } from "@material-ui/core/styles";
@@ -47,7 +48,7 @@ const useStyles = makeStyles(theme => ({
 
 const Chat = () => {
 	const classes = useStyles();
-	const [selectedContact, setSelectedContact] = useState(null);
+	const { contactId } = useParams();
 
 	return (
 		<div>
@@ -56,15 +57,12 @@ const Chat = () => {
 					<Paper square className={classes.chatPapper}>
 						<Grid container spacing={0}>
 							<Grid item xs={4} className={classes.contactsWrapper}>
-								<ContactsList
-									selectedContact={selectedContact}
-									setSelectedContact={setSelectedContact}
-								/>
+								<ContactsList />
 							</Grid>
 							<Grid item xs={8} className={classes.messagessWrapper}>
-								{selectedContact ? (
+								{contactId ? (
 									<>
-										<MessagesList selectedContact={selectedContact} />
+										<MessagesList />
 									</>
 								) : (
 									<Paper

frontend/src/pages/Chat/components/ContactsList/ContactsList.js

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from "react";
-import { useHistory } from "react-router-dom";
+import { useHistory, useParams } from "react-router-dom";
 import api from "../../../../util/api";
 import openSocket from "socket.io-client";
 import moment from "moment-timezone";
@@ -8,6 +8,7 @@ import profileDefaultPic from "../../../../Images/profile_default.png";
 
 import { makeStyles } from "@material-ui/core/styles";
 import { green } from "@material-ui/core/colors";
+import CircularProgress from "@material-ui/core/CircularProgress";
 import Paper from "@material-ui/core/Paper";
 import List from "@material-ui/core/List";
 import ListItem from "@material-ui/core/ListItem";
@@ -45,6 +46,7 @@ const useStyles = makeStyles(theme => ({
 	},
 
 	contactsList: {
+		position: "relative",
 		borderTopLeftRadius: 0,
 		borderTopRightRadius: 0,
 		borderBottomRightRadius: 0,
@@ -59,6 +61,7 @@ const useStyles = makeStyles(theme => ({
 		},
 	},
 	contactsSearchBox: {
+		position: "relative",
 		background: "#fafafa",
 		padding: "10px 13px",
 	},
@@ -106,14 +109,24 @@ const useStyles = makeStyles(theme => ({
 		color: "white",
 		backgroundColor: green[500],
 	},
+	circleLoading: {
+		color: green[500],
+		opacity: "70%",
+		position: "absolute",
+		top: 0,
+		left: "50%",
+		marginTop: 12,
+		// marginLeft: -12,
+	},
 }));
 
-const ContactsList = ({ selectedContact, setSelectedContact }) => {
+const ContactsList = () => {
 	const classes = useStyles();
 	const token = localStorage.getItem("token");
-
+	const { contactId } = useParams();
 	const [contacts, setContacts] = useState([]);
-	const [displayedContacts, setDisplayedContacts] = useState([]);
+	const [loading, setLoading] = useState();
+	const [searchParam, setSearchParam] = useState("");
 
 	const history = useHistory();
 
@@ -126,21 +139,23 @@ const ContactsList = ({ selectedContact, setSelectedContact }) => {
 	}, []);
 
 	useEffect(() => {
-		const fetchContacts = async () => {
-			try {
-				const res = await api.get("/contacts");
-				setContacts(res.data);
-				setDisplayedContacts(res.data);
-			} catch (err) {
-				if (err) {
+		setLoading(true);
+		const delayDebounceFn = setTimeout(() => {
+			const fetchContacts = async () => {
+				try {
+					const res = await api.get("/contacts", {
+						params: { searchParam },
+					});
+					setContacts(res.data);
+					setLoading(false);
+				} catch (err) {
 					console.log(err);
-					alert(err);
 				}
-				console.log(err);
-			}
-		};
-		fetchContacts();
-	}, [token, history]);
+			};
+			fetchContacts();
+		}, 1000);
+		return () => clearTimeout(delayDebounceFn);
+	}, [searchParam, token]);
 
 	useEffect(() => {
 		const socket = openSocket("http://localhost:8080");
@@ -154,60 +169,54 @@ const ContactsList = ({ selectedContact, setSelectedContact }) => {
 		});
 
 		socket.on("appMessage", data => {
-			if (
-				selectedContact &&
-				data.message.contactId === selectedContact.id &&
-				document.visibilityState === "visible"
-			) {
-				return;
+			if (data.action === "create") {
+				updateUnreadMessagesCount(data);
+				if (
+					contactId &&
+					data.message.contactId === +contactId &&
+					document.visibilityState === "visible"
+				)
+					return;
+				showDesktopNotification(data);
 			}
-
-			let contactImageUrl = profileDefaultPic;
-			let contactName = "Novo Contato";
-
-			const contactIndex = contacts.findIndex(
-				contact => contact.id === data.message.contactId
-			);
-
-			if (contactIndex !== -1) {
-				contactImageUrl = contacts[contactIndex].imageURL;
-				contactName = contacts[contactIndex].name;
-				setDisplayedContacts(prevState => {
-					let aux = [...prevState];
-					aux.unshift(aux.splice(contactIndex, 1)[0]);
-					return aux;
-				});
-				setContacts(prevState => {
-					let aux = [...prevState];
-					aux[contactIndex].unreadMessages++;
-					aux.unshift(aux.splice(contactIndex, 1)[0]);
-					return aux;
-				});
-			} else {
-				setContacts(prevState => [data.contact, ...prevState]);
-				setDisplayedContacts(prevState => [data.contact, ...prevState]);
-			}
-			showNotification(data, contactName, contactImageUrl);
 		});
 
 		return () => {
 			socket.disconnect();
 		};
-	}, [selectedContact, contacts]);
+	}, [contactId]);
 
-	const showNotification = (data, contactName, contactImageUrl) => {
+	const updateUnreadMessagesCount = data => {
+		setContacts(prevState => {
+			const contactIndex = prevState.findIndex(
+				contact => contact.id === data.message.contactId
+			);
+
+			if (contactIndex !== -1) {
+				let aux = [...prevState];
+				aux[contactIndex].unreadMessages++;
+				aux[contactIndex].lastMessage = data.message.messageBody;
+				aux.unshift(aux.splice(contactIndex, 1)[0]);
+				return aux;
+			} else {
+				return [data.contact, ...prevState];
+			}
+		});
+	};
+
+	const showDesktopNotification = data => {
 		const options = {
 			body: `${data.message.messageBody} - ${moment(new Date())
 				.tz("America/Sao_Paulo")
 				.format("DD/MM/YY - HH:mm")}`,
-			icon: contactImageUrl,
+			icon: data.contact.imageURL,
 		};
-		new Notification(`Mensagem de ${contactName}`, options);
+		new Notification(`Mensagem de ${data.contact.name}`, options);
 		document.getElementById("sound").play();
 	};
 
 	const resetUnreadMessages = contactId => {
-		setDisplayedContacts(prevState => {
+		setContacts(prevState => {
 			let aux = [...prevState];
 			let contactIndex = aux.findIndex(contact => contact.id === +contactId);
 			aux[contactIndex].unreadMessages = 0;
@@ -217,17 +226,12 @@ const ContactsList = ({ selectedContact, setSelectedContact }) => {
 	};
 
 	const handleSelectContact = (e, contact) => {
-		setSelectedContact(contact);
+		history.push(`/chat/${contact.id}`);
 	};
 
 	const handleSearchContact = e => {
-		let searchTerm = e.target.value.toLowerCase();
-
-		setDisplayedContacts(
-			contacts.filter(contact =>
-				contact.name.toLowerCase().includes(searchTerm)
-			)
-		);
+		// let searchTerm = e.target.value.toLowerCase();
+		setSearchParam(e.target.value.toLowerCase());
 	};
 
 	return (
@@ -246,12 +250,12 @@ const ContactsList = ({ selectedContact, setSelectedContact }) => {
 			</Paper>
 			<Paper variant="outlined" className={classes.contactsList}>
 				<List>
-					{displayedContacts.map((contact, index) => (
+					{contacts.map((contact, index) => (
 						<React.Fragment key={contact.id}>
 							<ListItem
 								button
 								onClick={e => handleSelectContact(e, contact)}
-								selected={selectedContact && selectedContact.id === contact.id}
+								selected={contactId && +contactId === contact.id}
 							>
 								<ListItemAvatar>
 									<Avatar
@@ -296,15 +300,13 @@ const ContactsList = ({ selectedContact, setSelectedContact }) => {
 											>
 												{contact.lastMessage || <br />}
 											</Typography>
-											{contact.unreadMessages > 0 && (
-												<Badge
-													className={classes.newMessagesCount}
-													badgeContent={contact.unreadMessages}
-													classes={{
-														badge: classes.badgeStyle,
-													}}
-												/>
-											)}
+											<Badge
+												className={classes.newMessagesCount}
+												badgeContent={contact.unreadMessages}
+												classes={{
+													badge: classes.badgeStyle,
+												}}
+											/>
 										</span>
 									}
 								/>
@@ -313,6 +315,11 @@ const ContactsList = ({ selectedContact, setSelectedContact }) => {
 						</React.Fragment>
 					))}
 				</List>
+				{loading ? (
+					<div>
+						<CircularProgress className={classes.circleLoading} />
+					</div>
+				) : null}
 			</Paper>
 			<audio id="sound" preload="auto">
 				<source src={require("../../../../util/sound.mp3")} type="audio/mpeg" />

frontend/src/pages/Chat/components/MessagesInput/MessagesInput.js

@@ -1,4 +1,5 @@
 import React, { useState, useEffect } from "react";
+import { useParams } from "react-router-dom";
 import api from "../../../../util/api";
 import "emoji-mart/css/emoji-mart.css";
 import { Picker } from "emoji-mart";
@@ -63,6 +64,7 @@ const useStyles = makeStyles(theme => ({
 
 	circleLoading: {
 		color: green[500],
+		opacity: "70%",
 		position: "absolute",
 		top: "20%",
 		left: "50%",
@@ -72,9 +74,9 @@ const useStyles = makeStyles(theme => ({
 	},
 }));
 
-const MessagesInput = ({ selectedContact, searchParam }) => {
+const MessagesInput = ({ searchParam }) => {
 	const classes = useStyles();
-	const contactId = selectedContact.id;
+	const { contactId } = useParams();
 	const userId = localStorage.getItem("userId");
 	const username = localStorage.getItem("username");
 
@@ -90,7 +92,7 @@ const MessagesInput = ({ selectedContact, searchParam }) => {
 			setShowEmoji(false);
 			setMedia({});
 		};
-	}, [selectedContact]);
+	}, [contactId]);
 
 	const handleChangeInput = e => {
 		setInputMessage(e.target.value);

frontend/src/pages/Chat/components/MessagesList/MessagesList.js

@@ -1,4 +1,5 @@
 import React, { useState, useEffect, useRef } from "react";
+import { useParams } from "react-router-dom";
 
 import { makeStyles } from "@material-ui/core/styles";
 import AccessTimeIcon from "@material-ui/icons/AccessTime";
@@ -92,6 +93,7 @@ const useStyles = makeStyles(theme => ({
 	circleLoading: {
 		color: green[500],
 		position: "absolute",
+		opacity: "70%",
 		top: 0,
 		left: "50%",
 		marginTop: 12,
@@ -193,13 +195,14 @@ const useStyles = makeStyles(theme => ({
 	},
 }));
 
-const MessagesList = ({ selectedContact }) => {
-	const contactId = selectedContact.id;
+const MessagesList = () => {
+	const { contactId } = useParams();
 	const classes = useStyles();
 
 	const token = localStorage.getItem("token");
 
 	const [loading, setLoading] = useState(true);
+	const [contact, setContact] = useState({});
 	const [messagesList, setMessagesList] = useState([]);
 	const [hasMore, setHasMore] = useState(false);
 	const [searchParam, setSearchParam] = useState("");
@@ -213,12 +216,12 @@ const MessagesList = ({ selectedContact }) => {
 	useEffect(() => {
 		setLoading(true);
 		const delayDebounceFn = setTimeout(() => {
-			console.log(searchParam);
 			const fetchMessages = async () => {
 				try {
 					const res = await api.get("/messages/" + contactId, {
 						params: { searchParam, pageNumber },
 					});
+					setContact(res.data.contact);
 					setMessagesList(prevMessages => {
 						return [...res.data.messages, ...prevMessages];
 					});
@@ -444,13 +447,24 @@ const MessagesList = ({ selectedContact }) => {
 	return (
 		<div className={classes.mainWrapper}>
 			<Card variant="outlined" square className={classes.messagesHeader}>
-				<CardHeader
-					titleTypographyProps={{ noWrap: true }}
-					subheaderTypographyProps={{ noWrap: true }}
-					avatar={<Avatar alt="contact_name" src={selectedContact.imageURL} />}
-					title={selectedContact.name}
-					subheader="Contacts Status"
-				/>
+				{!loading ? (
+					<CardHeader
+						titleTypographyProps={{ noWrap: true }}
+						subheaderTypographyProps={{ noWrap: true }}
+						avatar={<Avatar alt="contact_image" src={contact.imageURL} />}
+						title={contact.name}
+						subheader="Contact Status"
+					/>
+				) : (
+					<CardHeader
+						titleTypographyProps={{ noWrap: true }}
+						subheaderTypographyProps={{ noWrap: true }}
+						avatar={<Avatar alt="contact_image" />}
+						title=""
+						subheader=""
+					/>
+				)}
+
 				<div className={classes.messagesSearchInputWrapper}>
 					<SearchIcon className={classes.searchIcon} />
 					<InputBase
@@ -477,10 +491,7 @@ const MessagesList = ({ selectedContact }) => {
 				>
 					{messagesList.length > 0 ? renderMessages() : []}
 				</InfiniteScrollReverse>
-				<MessagesInput
-					selectedContact={selectedContact}
-					searchParam={searchParam}
-				/>
+				<MessagesInput searchParam={searchParam} />
 				{loading ? (
 					<div>
 						<CircularProgress className={classes.circleLoading} />

frontend/src/pages/WhatsAuth/WhatsAuth.js

@@ -1,12 +1,17 @@
-import React from "react";
+import React, { useState, useEffect } from "react";
+import { useHistory } from "react-router-dom";
+import api from "../../util/api";
 import clsx from "clsx";
 import MainDrawer from "../../components/Layout/MainDrawer";
+import openSocket from "socket.io-client";
 
 import { makeStyles } from "@material-ui/core/styles";
 
 import Container from "@material-ui/core/Container";
 import Grid from "@material-ui/core/Grid";
 import Paper from "@material-ui/core/Paper";
+import Bateryinfo from "./components/Bateryinfo";
+import Qrcode from "./components/Qrcode";
 
 const useStyles = makeStyles(theme => ({
 	root: {
@@ -41,6 +46,47 @@ const useStyles = makeStyles(theme => ({
 
 const WhatsAuth = () => {
 	const classes = useStyles();
+	const history = useHistory();
+
+	const [qrCode, setQrCode] = useState("");
+	const [session, setSession] = useState({});
+
+	useEffect(() => {
+		const fetchSession = async () => {
+			try {
+				const res = await api.get("/whatsapp/session");
+				setQrCode(res.data.qrcode);
+				setSession(res.data);
+			} catch (err) {
+				console.log(err);
+			}
+		};
+		fetchSession();
+	}, []);
+
+	useEffect(() => {
+		const socket = openSocket("http://localhost:8080");
+
+		socket.on("qrcode", data => {
+			if (data.action === "update") {
+				setQrCode(data.qr);
+			}
+		});
+
+		socket.on("whats_auth", data => {
+			if (data.action === "authentication") {
+				history.push("/chat");
+				setQrCode("");
+				setSession(data.session);
+			}
+		});
+
+		return () => {
+			socket.disconnect();
+		};
+	}, []);
+
+	console.log(session);
 
 	const fixedHeightPaper = clsx(classes.paper, classes.fixedHeight);
 
@@ -52,16 +98,20 @@ const WhatsAuth = () => {
 						<div className={classes.appBarSpacer} />
 						<Container maxWidth="lg" className={classes.container}>
 							<Grid container spacing={3}>
-								<Grid item xs={12}>
-									<Paper className={classes.paper}>
-										<h4>Status da conexão</h4>
-									</Paper>
-								</Grid>
-								<Grid item xs={12}>
-									<Paper className={fixedHeightPaper}>
-										<h1>QR Code</h1>
-									</Paper>
-								</Grid>
+								{session.status === "pending" ? (
+									<Grid item xs={6}>
+										<Paper className={classes.paper}>
+											<Qrcode qrCode={qrCode} />
+										</Paper>
+									</Grid>
+								) : (
+									<Grid item xs={6}>
+										<Paper className={classes.paper}>
+											<Bateryinfo sessio={session} />
+										</Paper>
+									</Grid>
+								)}
+
 								{/* <Grid item xs={12} md={4} lg={3}>
 									<Paper className={fixedHeightPaper}>
 										<h1>paper2</h1>

frontend/src/pages/WhatsAuth/components/Bateryinfo.js

@@ -0,0 +1,34 @@
+import React from "react";
+import Link from "@material-ui/core/Link";
+import { makeStyles } from "@material-ui/core/styles";
+import Typography from "@material-ui/core/Typography";
+
+const useStyles = makeStyles({
+	main: {
+		flex: 1,
+	},
+});
+
+const Bateryinfo = ({ session }) => {
+	const classes = useStyles();
+	return (
+		<React.Fragment>
+			<Typography component="h2" variant="h6" color="primary" gutterBottom>
+				Bateria
+			</Typography>
+			<Typography component="p" variant="h6">
+				{(session && session.baterry) || "Não disponível"}
+			</Typography>
+			<Typography color="textSecondary" className={classes.main}>
+				Carregando: {(session && session.plugged) || "Não disponível"}
+			</Typography>
+			<div>
+				<Link color="primary" href="#">
+					Verificar bateria
+				</Link>
+			</div>
+		</React.Fragment>
+	);
+};
+
+export default Bateryinfo;

frontend/src/pages/WhatsAuth/components/Qrcode.js

@@ -0,0 +1,25 @@
+import React from "react";
+import QRCode from "qrcode.react";
+import { makeStyles } from "@material-ui/core/styles";
+import Typography from "@material-ui/core/Typography";
+
+const useStyles = makeStyles({
+	main: {
+		flex: 1,
+	},
+});
+
+const Qrcode = ({ qrCode }) => {
+	const classes = useStyles();
+
+	return (
+		<div>
+			<Typography component="h2" variant="h6" color="primary" gutterBottom>
+				Leia o QrCode para iniciar a sessão
+			</Typography>
+			<QRCode value={qrCode} size={256} />
+		</div>
+	);
+};
+
+export default Qrcode;

frontend/src/routes.js

@@ -57,6 +57,7 @@ const Routes = () => {
 				<Switch>
 					<PrivateRoute exact path="/" component={Dashboard} />
 					<PrivateRoute exact path="/chat" component={Chat} />
+					<PrivateRoute exact path="/chat/:contactId" component={Chat} />
 					<PrivateRoute exact path="/profile" component={Profile} />
 					<PrivateRoute exact path="/whats-auth" component={WhatsAuth} />
 					<PublicRoute exact path="/login" component={Login} />