From 660458a8abc5debb9425d297ef47fbae2a882b48 Mon Sep 17 00:00:00 2001 From: canove Date: Sat, 25 Jul 2020 10:49:39 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=82Better=20folder=20structure=20on=20?= =?UTF-8?q?frontend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/Images/profile_default.png | Bin 4955 -> 0 bytes frontend/src/{util => assets}/sound.mp3 | Bin frontend/src/{util => assets}/sound.ogg | Bin .../src/{Images => assets}/wa-background.png | Bin .../{ConfirmationModal.js => index.js} | 0 .../ContactModal/index.js} | 2 +- .../ContactsSekeleton/index.js} | 0 .../{Layout => MainDrawer}/MainListItems.js | 0 .../MainDrawer.js => MainDrawer/index.js} | 2 +- .../MessageInput}/RecordingTimer.js | 0 .../MessageInput/index.js} | 6 +++--- .../MessagesList/index.js} | 10 +++++----- .../PaginationActions/index.js} | 0 .../Qrcode.js => components/Qrcode/index.js} | 0 .../SessionInfo/index.js} | 4 ++-- .../components/TicketsList/TicketSkeleton.js | 0 .../TicketsList/index.js} | 8 ++++---- .../{Context => context}/Auth/AuthContext.js | 0 .../src/{Context => context}/Auth/useAuth.js | 2 +- frontend/src/pages/Chat/{Chat.js => index.js} | 4 ++-- .../Contacts/{ContactsList.js => index.js} | 11 +++++------ .../{Home/Dashboard.js => Dashboard/index.js} | 0 .../pages/Home/Notifications_button_24.png | Bin 325 -> 0 bytes .../src/pages/Login/{Login.js => index.js} | 2 +- frontend/src/pages/Profile/Profile.js | 0 .../src/pages/Signup/{Signup.js => index.js} | 2 +- frontend/src/pages/WhatsAuth/WhatsAuth.js | 8 ++++---- frontend/src/routes.js | 18 ++++++++---------- frontend/src/{util => services}/api.js | 0 29 files changed, 38 insertions(+), 41 deletions(-) delete mode 100644 frontend/src/Images/profile_default.png rename frontend/src/{util => assets}/sound.mp3 (100%) rename frontend/src/{util => assets}/sound.ogg (100%) rename frontend/src/{Images => assets}/wa-background.png (100%) rename frontend/src/components/ConfirmationModal/{ConfirmationModal.js => index.js} (100%) rename frontend/src/{pages/Contacts/ContactModal.js => components/ContactModal/index.js} (95%) rename frontend/src/{pages/Contacts/ContactsSekeleton.js => components/ContactsSekeleton/index.js} (100%) rename frontend/src/components/{Layout => MainDrawer}/MainListItems.js (100%) rename frontend/src/components/{Layout/MainDrawer.js => MainDrawer/index.js} (94%) rename frontend/src/{pages/Chat/components/MessagesInput => components/MessageInput}/RecordingTimer.js (100%) rename frontend/src/{pages/Chat/components/MessagesInput/MessagesInput.js => components/MessageInput/index.js} (94%) rename frontend/src/{pages/Chat/components/MessagesList/MessagesList.js => components/MessagesList/index.js} (94%) rename frontend/src/{pages/Contacts/PaginationActions.js => components/PaginationActions/index.js} (100%) rename frontend/src/{pages/WhatsAuth/components/Qrcode.js => components/Qrcode/index.js} (100%) rename frontend/src/{pages/WhatsAuth/components/Bateryinfo.js => components/SessionInfo/index.js} (88%) rename frontend/src/{pages/Chat => }/components/TicketsList/TicketSkeleton.js (100%) rename frontend/src/{pages/Chat/components/TicketsList/TicketsList.js => components/TicketsList/index.js} (94%) rename frontend/src/{Context => context}/Auth/AuthContext.js (100%) rename frontend/src/{Context => context}/Auth/useAuth.js (94%) rename frontend/src/pages/Chat/{Chat.js => index.js} (88%) rename frontend/src/pages/Contacts/{ContactsList.js => index.js} (97%) rename frontend/src/pages/{Home/Dashboard.js => Dashboard/index.js} (100%) delete mode 100644 frontend/src/pages/Home/Notifications_button_24.png rename frontend/src/pages/Login/{Login.js => index.js} (94%) delete mode 100644 frontend/src/pages/Profile/Profile.js rename frontend/src/pages/Signup/{Signup.js => index.js} (95%) rename frontend/src/{util => services}/api.js (100%) diff --git a/frontend/src/Images/profile_default.png b/frontend/src/Images/profile_default.png deleted file mode 100644 index dceff987003d6d5a5af1a29542aee13b7e7f4cd2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4955 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 ({ root: { diff --git a/frontend/src/pages/Contacts/ContactsSekeleton.js b/frontend/src/components/ContactsSekeleton/index.js similarity index 100% rename from frontend/src/pages/Contacts/ContactsSekeleton.js rename to frontend/src/components/ContactsSekeleton/index.js diff --git a/frontend/src/components/Layout/MainListItems.js b/frontend/src/components/MainDrawer/MainListItems.js similarity index 100% rename from frontend/src/components/Layout/MainListItems.js rename to frontend/src/components/MainDrawer/MainListItems.js diff --git a/frontend/src/components/Layout/MainDrawer.js b/frontend/src/components/MainDrawer/index.js similarity index 94% rename from frontend/src/components/Layout/MainDrawer.js rename to frontend/src/components/MainDrawer/index.js index 184ba8b..067e85a 100644 --- a/frontend/src/components/Layout/MainDrawer.js +++ b/frontend/src/components/MainDrawer/index.js @@ -21,7 +21,7 @@ import AccountCircle from "@material-ui/icons/AccountCircle"; import MenuItem from "@material-ui/core/MenuItem"; import Menu from "@material-ui/core/Menu"; -import { AuthContext } from "../../Context/Auth/AuthContext"; +import { AuthContext } from "../../context/Auth/AuthContext"; const drawerWidth = 240; diff --git a/frontend/src/pages/Chat/components/MessagesInput/RecordingTimer.js b/frontend/src/components/MessageInput/RecordingTimer.js similarity index 100% rename from frontend/src/pages/Chat/components/MessagesInput/RecordingTimer.js rename to frontend/src/components/MessageInput/RecordingTimer.js diff --git a/frontend/src/pages/Chat/components/MessagesInput/MessagesInput.js b/frontend/src/components/MessageInput/index.js similarity index 94% rename from frontend/src/pages/Chat/components/MessagesInput/MessagesInput.js rename to frontend/src/components/MessageInput/index.js index 2cae4b3..6e93c54 100644 --- a/frontend/src/pages/Chat/components/MessagesInput/MessagesInput.js +++ b/frontend/src/components/MessageInput/index.js @@ -18,7 +18,7 @@ import MicIcon from "@material-ui/icons/Mic"; import CheckCircleOutlineIcon from "@material-ui/icons/CheckCircleOutline"; import HighlightOffIcon from "@material-ui/icons/HighlightOff"; -import api from "../../../../util/api"; +import api from "../../services/api"; import RecordingTimer from "./RecordingTimer"; const Mp3Recorder = new MicRecorder({ bitRate: 128 }); @@ -102,7 +102,7 @@ const useStyles = makeStyles(theme => ({ }, })); -const MessagesInput = ({ searchParam }) => { +const MessageInput = ({ searchParam }) => { const classes = useStyles(); const { ticketId } = useParams(); const userId = localStorage.getItem("userId"); @@ -378,4 +378,4 @@ const MessagesInput = ({ searchParam }) => { } }; -export default MessagesInput; +export default MessageInput; diff --git a/frontend/src/pages/Chat/components/MessagesList/MessagesList.js b/frontend/src/components/MessagesList/index.js similarity index 94% rename from frontend/src/pages/Chat/components/MessagesList/MessagesList.js rename to frontend/src/components/MessagesList/index.js index 9875c1b..60209e1 100644 --- a/frontend/src/pages/Chat/components/MessagesList/MessagesList.js +++ b/frontend/src/components/MessagesList/index.js @@ -27,12 +27,12 @@ import Skeleton from "@material-ui/lab/Skeleton"; import Drawer from "@material-ui/core/Drawer"; -import whatsBackground from "../../../../Images/wa-background.png"; +import whatsBackground from "../../assets/wa-background.png"; -import LinkifyWithTargetBlank from "../../../../components/LinkifyWithTargetBlank"; -import api from "../../../../util/api"; +import LinkifyWithTargetBlank from "../LinkifyWithTargetBlank"; +import api from "../../services/api"; -import MessagesInput from "../MessagesInput/MessagesInput"; +import MessageInput from "../MessageInput/"; const drawerWidth = 320; @@ -593,7 +593,7 @@ const MessagesList = () => { > {messagesList.length > 0 ? renderMessages() : []} - + {loading ? (
diff --git a/frontend/src/pages/Contacts/PaginationActions.js b/frontend/src/components/PaginationActions/index.js similarity index 100% rename from frontend/src/pages/Contacts/PaginationActions.js rename to frontend/src/components/PaginationActions/index.js diff --git a/frontend/src/pages/WhatsAuth/components/Qrcode.js b/frontend/src/components/Qrcode/index.js similarity index 100% rename from frontend/src/pages/WhatsAuth/components/Qrcode.js rename to frontend/src/components/Qrcode/index.js diff --git a/frontend/src/pages/WhatsAuth/components/Bateryinfo.js b/frontend/src/components/SessionInfo/index.js similarity index 88% rename from frontend/src/pages/WhatsAuth/components/Bateryinfo.js rename to frontend/src/components/SessionInfo/index.js index 69a912b..a749dd3 100644 --- a/frontend/src/pages/WhatsAuth/components/Bateryinfo.js +++ b/frontend/src/components/SessionInfo/index.js @@ -9,7 +9,7 @@ const useStyles = makeStyles({ }, }); -const Bateryinfo = ({ session }) => { +const SessionInfo = ({ session }) => { const classes = useStyles(); return ( @@ -31,4 +31,4 @@ const Bateryinfo = ({ session }) => { ); }; -export default Bateryinfo; +export default SessionInfo; diff --git a/frontend/src/pages/Chat/components/TicketsList/TicketSkeleton.js b/frontend/src/components/TicketsList/TicketSkeleton.js similarity index 100% rename from frontend/src/pages/Chat/components/TicketsList/TicketSkeleton.js rename to frontend/src/components/TicketsList/TicketSkeleton.js diff --git a/frontend/src/pages/Chat/components/TicketsList/TicketsList.js b/frontend/src/components/TicketsList/index.js similarity index 94% rename from frontend/src/pages/Chat/components/TicketsList/TicketsList.js rename to frontend/src/components/TicketsList/index.js index 2f8ef0b..964d947 100644 --- a/frontend/src/pages/Chat/components/TicketsList/TicketsList.js +++ b/frontend/src/components/TicketsList/index.js @@ -1,6 +1,5 @@ import React, { useState, useEffect } from "react"; import { useHistory, useParams } from "react-router-dom"; -import api from "../../../../util/api"; import openSocket from "socket.io-client"; import { parseISO, format } from "date-fns"; @@ -24,9 +23,10 @@ import Tabs from "@material-ui/core/Tabs"; import Tab from "@material-ui/core/Tab"; import MoveToInboxIcon from "@material-ui/icons/MoveToInbox"; import CheckCircleOutlineIcon from "@material-ui/icons/CheckCircleOutline"; - import TicketSkeleton from "./TicketSkeleton"; +import api from "../../services/api"; + const useStyles = makeStyles(theme => ({ contactsWrapper: { position: "relative", @@ -533,8 +533,8 @@ const TicketsList = () => { )} diff --git a/frontend/src/Context/Auth/AuthContext.js b/frontend/src/context/Auth/AuthContext.js similarity index 100% rename from frontend/src/Context/Auth/AuthContext.js rename to frontend/src/context/Auth/AuthContext.js diff --git a/frontend/src/Context/Auth/useAuth.js b/frontend/src/context/Auth/useAuth.js similarity index 94% rename from frontend/src/Context/Auth/useAuth.js rename to frontend/src/context/Auth/useAuth.js index a185687..c33e1ec 100644 --- a/frontend/src/Context/Auth/useAuth.js +++ b/frontend/src/context/Auth/useAuth.js @@ -1,7 +1,7 @@ import { useState, useEffect } from "react"; import { useHistory } from "react-router-dom"; -import api from "../../util/api"; +import api from "../../services/api"; const useAuth = () => { const history = useHistory(); diff --git a/frontend/src/pages/Chat/Chat.js b/frontend/src/pages/Chat/index.js similarity index 88% rename from frontend/src/pages/Chat/Chat.js rename to frontend/src/pages/Chat/index.js index 1160193..b627231 100644 --- a/frontend/src/pages/Chat/Chat.js +++ b/frontend/src/pages/Chat/index.js @@ -4,8 +4,8 @@ import Grid from "@material-ui/core/Grid"; import Paper from "@material-ui/core/Paper"; import { makeStyles } from "@material-ui/core/styles"; -import TicketsList from "./components/TicketsList/TicketsList"; -import MessagesList from "./components/MessagesList/MessagesList"; +import TicketsList from "../../components/TicketsList/"; +import MessagesList from "../../components/MessagesList/"; const useStyles = makeStyles(theme => ({ chatContainer: { diff --git a/frontend/src/pages/Contacts/ContactsList.js b/frontend/src/pages/Contacts/index.js similarity index 97% rename from frontend/src/pages/Contacts/ContactsList.js rename to frontend/src/pages/Contacts/index.js index 2f1149e..2abc08b 100644 --- a/frontend/src/pages/Contacts/ContactsList.js +++ b/frontend/src/pages/Contacts/index.js @@ -22,12 +22,11 @@ import IconButton from "@material-ui/core/IconButton"; import DeleteOutlineIcon from "@material-ui/icons/DeleteOutline"; import EditIcon from "@material-ui/icons/Edit"; -import PaginationActions from "./PaginationActions"; -import api from "../../util/api"; -import ContactModal from "./ContactModal"; -import ContactsSekeleton from "./ContactsSekeleton"; - -import ConfirmationModal from "../../components/ConfirmationModal/ConfirmationModal"; +import PaginationActions from "../../components/PaginationActions"; +import api from "../../services/api"; +import ContactsSekeleton from "../../components/ContactsSekeleton"; +import ContactModal from "../../components/ContactModal"; +import ConfirmationModal from "../../components/ConfirmationModal/"; const useStyles = makeStyles(theme => ({ mainContainer: { diff --git a/frontend/src/pages/Home/Dashboard.js b/frontend/src/pages/Dashboard/index.js similarity index 100% rename from frontend/src/pages/Home/Dashboard.js rename to frontend/src/pages/Dashboard/index.js diff --git a/frontend/src/pages/Home/Notifications_button_24.png b/frontend/src/pages/Home/Notifications_button_24.png deleted file mode 100644 index 7409b4008b30e506f1624d5600c285611dfd0da9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 325 zcmV-L0lNN)P)0Q@#OA7nB{@Hd*^CfR- zvJCb$25=Gc6@a&8Yi2PLn+JfY+&=-#EPJhhfke+NxEMXN$Tf%tpu=NBw9IPXBv%t) zBhGtDlpledV|H}_>U-DH58lrKFr(6{15n$3B7l2_7QoUg$3#Z);jjLtSO(N`o$6Wa zPXKlrz_0gIPUU>WGUx!M7Sc%+R+*`a*eOS;_33rlNz*y_=a4zS^s#jh{zq=Zc?IGC zzjRMc#iF}904Emvf18Vn { return ( diff --git a/frontend/src/pages/Profile/Profile.js b/frontend/src/pages/Profile/Profile.js deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/src/pages/Signup/Signup.js b/frontend/src/pages/Signup/index.js similarity index 95% rename from frontend/src/pages/Signup/Signup.js rename to frontend/src/pages/Signup/index.js index 7e6438f..c18a985 100644 --- a/frontend/src/pages/Signup/Signup.js +++ b/frontend/src/pages/Signup/index.js @@ -1,7 +1,7 @@ import React, { useState } from "react"; import { useHistory } from "react-router-dom"; -import api from "../../util/api"; +import api from "../../services/api"; import { Link as RouterLink } from "react-router-dom"; import Avatar from "@material-ui/core/Avatar"; diff --git a/frontend/src/pages/WhatsAuth/WhatsAuth.js b/frontend/src/pages/WhatsAuth/WhatsAuth.js index 8a11220..3d63eb2 100644 --- a/frontend/src/pages/WhatsAuth/WhatsAuth.js +++ b/frontend/src/pages/WhatsAuth/WhatsAuth.js @@ -1,14 +1,14 @@ import React, { useState, useEffect } from "react"; import { useHistory } from "react-router-dom"; -import api from "../../util/api"; +import api from "../../services/api"; import openSocket from "socket.io-client"; import { makeStyles } from "@material-ui/core/styles"; import Grid from "@material-ui/core/Grid"; import Paper from "@material-ui/core/Paper"; -import Bateryinfo from "./components/Bateryinfo"; -import Qrcode from "./components/Qrcode"; +import SessionInfo from "../../components/SessionInfo"; +import Qrcode from "../../components/Qrcode"; const useStyles = makeStyles(theme => ({ root: { @@ -88,7 +88,7 @@ const WhatsAuth = () => { ) : ( - + )} diff --git a/frontend/src/routes.js b/frontend/src/routes.js index 5c16fd5..18cd1e1 100644 --- a/frontend/src/routes.js +++ b/frontend/src/routes.js @@ -5,15 +5,14 @@ import Backdrop from "@material-ui/core/Backdrop"; import CircularProgress from "@material-ui/core/CircularProgress"; import { makeStyles } from "@material-ui/core/styles"; -import MainDrawer from "./components/Layout/MainDrawer"; -import Dashboard from "./pages/Home/Dashboard"; -import Chat from "./pages/Chat/Chat"; -import Profile from "./pages/Profile/Profile"; -import Signup from "./pages/Signup/Signup"; -import Login from "./pages/Login/Login"; +import MainDrawer from "./components/MainDrawer"; +import Dashboard from "./pages/Dashboard/"; +import Chat from "./pages/Chat/"; +import Signup from "./pages/Signup/"; +import Login from "./pages/Login/"; import WhatsAuth from "./pages/WhatsAuth/WhatsAuth"; -import ContactsList from "./pages/Contacts/ContactsList"; -import { AuthContext, AuthProvider } from "./Context/Auth/AuthContext"; +import Contacts from "./pages/Contacts/"; +import { AuthContext, AuthProvider } from "./context/Auth/AuthContext"; const useStyles = makeStyles(theme => ({ backdrop: { @@ -84,9 +83,8 @@ const Routes = () => { - - + diff --git a/frontend/src/util/api.js b/frontend/src/services/api.js similarity index 100% rename from frontend/src/util/api.js rename to frontend/src/services/api.js