rebranding para ticketz e relicenciamento sob AGPL

ticketz-oss · Jan 9, 2024 · 8ccf7c7 · 8ccf7c7
1 parent b81c9f0
commit 8ccf7c7
Show file tree

Hide file tree

Showing 22 changed files with 959 additions and 55 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# Whaticket SAAS Open
+# Sobre o projeto
 
-Whaticket é um comunicador com recursos de CRM e helpdesk que utiliza
+Ticketz é um comunicador com recursos de CRM e helpdesk que utiliza
 Whatsapp como meio de comunicação com os clientes.
 
 ## Autoria original
@@ -10,12 +10,25 @@ sob a licença permissiva MIT, e recebeu diversas melhorias por autores não ide
 comercializado como produto "White Label" e de acordo com informações [deste
 vídeo acabou em algum momento sendo vazado e publicado abertamente](https://www.youtube.com/watch?v=SX_cGD5RLkQ)
 
-É praticamente impossível identificar e creditas os autores das melhorias, [o
+É praticamente impossível identificar e creditar os autores das melhorias, [o
 código publicado pelo canal Vem Fazer](https://github.com/vemfazer/whaticket-versao-03-12-canal-vem-fazer)
 não menciona licença alguma portanto estou presumindo que todos os autores
 estão tranquilos em manter estas alterações sob a mesma licença do projeto
 original (MIT)
 
+## Relicenciamento
+
+Como estou fazendo estas alterações e disponibilizando sem custo algum, desejo que
+elas estejam disponíveis a todos, por isso estou optando por relicenciar sob a
+AGPL, que exige que todo usuário que tenha acesso ao sistema possa obter o
+código fonte.
+
+Por isso, se você utilizar diretamente esta versão, é
+**muito importante manter o link na tela "Ajuda", que dá acesso ao repositório**.
+
+Caso você faça alterações no código você deve alterar o link para um
+repositório ou outra forma de obter o código das suas alterações.
+
 ## Objetivo
 
 Este projeto tem por objetivo melhorar e manter abertas as atualizações sobre o Whaticket SAAS publicado.
@@ -29,5 +42,17 @@ Por melhor esforço, procurarei sempre listar aqui as contribuições incorporad
 autorias, porém o melhor local para observar o que foi feito é o histórico
 do repositório.
 
-* [83f6713](https://github.com/allgood/whaticket-saas-open/commit/83f67132c234f528c13540b3de529ccb54cc3e6a) Aceita documento anexado com legenda -- @allgood)
-* [e8f4d32](https://github.com/allgood/whaticket-saas-open/commit/e8f4d325f46133a2ea828dfe8ca7470f44243bf5) Aceita mensagens editadas -- cherry pick de @Vinicius-Marques6 canove/whaticket-community#605
+* [83f6713](https://github.com/allgood/ticketz/commit/83f67132c234f528c13540b3de529ccb54cc3e6a) Aceita documento anexado com legenda -- @allgood)
+* [e8f4d32](https://github.com/allgood/ticketz/commit/e8f4d325f46133a2ea828dfe8ca7470f44243bf5) Aceita mensagens editadas -- cherry pick de @Vinicius-Marques6 canove/whaticket-community#605
+* [60455d9](https://github.com/allgood/ticketz/commit/60455d9416975a0d1806968815d28f5195d15e64) Mantém aberto e utiliza apenas um websocket com o backend
+* [30526b6](https://github.com/allgood/ticketz/commit/30526b6cd6d92e3204e97ff194ef57b7def69979) Um ticket novo ao invés de reabrir ticket fechado
+
+
+Facilitou sua vida?
+-------------------
+
+Se este projeto ajudou você em uma tarefa complexa, considere fazer uma doação ao autor pelo PIX abaixo.
+
+![image](https://user-images.githubusercontent.com/6070736/116247400-317e3680-a741-11eb-9434-9f226eec39b5.png)
+
+Chave Pix: 80fd8916-1131-4844-917e-2732eaa2ba74
diff --git a/frontend/public/android-chrome-192x192.png b/frontend/public/android-chrome-192x192.png
diff --git a/frontend/public/apple-touch-icon.png b/frontend/public/apple-touch-icon.png
diff --git a/frontend/public/favicon-16x16.png b/frontend/public/favicon-16x16.png
diff --git a/frontend/public/favicon-32x32.png b/frontend/public/favicon-32x32.png
diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico
diff --git a/frontend/public/favicon.png b/frontend/public/favicon.png
diff --git a/frontend/public/index.html b/frontend/public/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 	<head>
-		<title>Equipechat</title>
+		<title>ticketz</title>
 		<link
 			rel="stylesheet"
 			href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"

diff --git a/frontend/public/mstile-150x150.png b/frontend/public/mstile-150x150.png
diff --git a/frontend/src/assets/logo.png b/frontend/src/assets/logo.png
diff --git a/frontend/src/assets/logologin.png b/frontend/src/assets/logologin.png
diff --git a/frontend/src/assets/vector/favicon.svg b/frontend/src/assets/vector/favicon.svg
diff --git a/frontend/src/assets/vector/logo.svg b/frontend/src/assets/vector/logo.svg
diff --git a/frontend/src/layout/MainListItems.js b/frontend/src/layout/MainListItems.js
@@ -19,6 +19,7 @@ import CalendarToday from "@material-ui/icons/CalendarToday";
 import HelpOutlineIcon from "@material-ui/icons/HelpOutline";
 import CodeRoundedIcon from "@material-ui/icons/CodeRounded";
 import EventIcon from "@material-ui/icons/Event";
+import InfoIcon from "@material-ui/icons/Info";
 import DarkMode from "../components/DarkMode";
 
 import LocalOfferIcon from "@material-ui/icons/LocalOffer";
@@ -355,6 +356,11 @@ const MainListItems = (props) => {
               primary={i18n.t("mainDrawer.listItems.helps")}
               icon={<HelpOutlineIcon />}
             />
+            <ListItemLink
+              to="/about"
+              primary={i18n.t("mainDrawer.listItems.about")}
+              icon={<InfoIcon />}
+            />
           </>
         </>
         )}

diff --git a/frontend/src/layout/index.js b/frontend/src/layout/index.js
@@ -32,7 +32,7 @@ import { i18n } from "../translate/i18n";
 import toastError from "../errors/toastError";
 import AnnouncementsPopover from "../components/AnnouncementsPopover";
 
-import logo from "../assets/logo.png";
+import logo from "../assets/vector/logo.svg";
 import { SocketContext } from "../context/Socket/SocketContext";
 import ChatPopover from "../pages/Chat/ChatPopover";
 
@@ -48,9 +48,6 @@ const useStyles = makeStyles((theme) => ({
   root: {
     display: "flex",
     height: "100vh",
-    [theme.breakpoints.down("sm")]: {
-      height: "calc(100vh - 56px)",
-    },
     backgroundColor: theme.palette.fancyBackground,
     '& .MuiButton-outlinedPrimary': {
       color: theme.mode === 'light' ? '#0000FF' : '#FFF',
@@ -72,11 +69,7 @@ const useStyles = makeStyles((theme) => ({
     display: "flex",
     alignItems: "center",
     justifyContent: "space-between",
-    padding: "0 8px",
     minHeight: "48px",
-    [theme.breakpoints.down("sm")]: {
-      height: "48px"
-    }
   },
   appBar: {
     zIndex: theme.zIndex.drawer + 1,
@@ -115,9 +108,6 @@ const useStyles = makeStyles((theme) => ({
       easing: theme.transitions.easing.sharp,
       duration: theme.transitions.duration.enteringScreen,
     }),
-    [theme.breakpoints.down("sm")]: {
-      width: "100%"
-    },
     ...theme.scrollbarStylesSoft
   },
   drawerPaperClose: {
@@ -130,9 +120,6 @@ const useStyles = makeStyles((theme) => ({
     [theme.breakpoints.up("sm")]: {
       width: theme.spacing(9),
     },
-    [theme.breakpoints.down("sm")]: {
-      width: "100%"
-    }
   },
   appBarSpacer: {
     minHeight: "48px",
@@ -161,16 +148,12 @@ const useStyles = makeStyles((theme) => ({
     // color: theme.barraSuperior.secondary.main,
   },
   logo: {
-    width: "80%",
-    height: "auto",
-    maxWidth: 180,
-    [theme.breakpoints.down("sm")]: {
-      width: "auto",
-      height: "80%",
-      maxWidth: 180,
-    },
-    logo: theme.logo
+    maxWidth: 192,
+    logo: theme.logo,
   },
+  hideLogo: {
+	display: "none",
+  }
 }));
 
 const LoggedInLayout = ({ children, themeToggle }) => {
@@ -344,7 +327,7 @@ const LoggedInLayout = ({ children, themeToggle }) => {
         open={drawerOpen}
       >
         <div className={classes.toolbarIcon}>
-          <img src={logo} className={classes.logo} alt="logo" />
+          <img src={logo} className={drawerOpen ? classes.logo : classes.hideLogo } alt="logo" />
           <IconButton onClick={() => setDrawerOpen(!drawerOpen)}>
             <ChevronLeftIcon />
           </IconButton>

diff --git a/frontend/src/pages/About/index.js b/frontend/src/pages/About/index.js
@@ -0,0 +1,62 @@
+import React from "react";
+
+import {
+	makeStyles,
+	Paper
+} from "@material-ui/core";
+
+import MainContainer from "../../components/MainContainer";
+import MainHeader from "../../components/MainHeader";
+import MainHeaderButtonsWrapper from "../../components/MainHeaderButtonsWrapper";
+import Title from "../../components/Title";
+import { i18n } from "../../translate/i18n";
+
+import Typography from '@material-ui/core/Typography';
+import Link from '@material-ui/core/Link';
+
+const useStyles = makeStyles(theme => ({
+	mainPaper: {
+		width: '100%',
+		minHeight: '200px',
+		overflowY: "scroll",
+		...theme.scrollbarStyles,
+	},
+	heading: {
+	  fontSize: theme.typography.pxToRem(20),
+	  flexBasis: '33.33%',
+	  flexShrink: 0,
+	},
+	secondaryHeading: {
+	  fontSize: theme.typography.pxToRem(15),
+	  color: theme.palette.text.secondary,
+	}
+}));
+
+const About = () => {
+	const classes = useStyles();
+
+	return (
+		<MainContainer>
+			<MainHeader>
+				<Title>{i18n.t("about.title")}</Title>
+				<MainHeaderButtonsWrapper>
+				</MainHeaderButtonsWrapper>
+			</MainHeader>
+			<Paper className={classes.mainPaper} variant="outlined">
+				<Typography variant="h4">{i18n.t("about.abouttitle")}</Typography>
+				<Typography variant="body1">{i18n.t("about.aboutdetail")}</Typography>
+				<Typography><Link href="https://todobom.com">{i18n.t("about.aboutauthorsite")}</Link></Typography>
+				<Typography><Link href="https://github.com/canove/whaticket-community">{i18n.t("about.aboutwhaticketsite")}</Link></Typography>
+				<Typography><Link href="https://github.com/vemfazer">{i18n.t("about.aboutvemfazersite")}</Link></Typography>
+			</Paper>
+			<Paper className={classes.mainPaper} variant="outlined">
+				<Typography variant="h4">{i18n.t("about.licenseheading")}</Typography>
+				<Typography variant="body1">{i18n.t("about.licensedetail")}</Typography>
+				<Typography><Link href="https://github.com/allgood/ticketz/LICENSE.md">{i18n.t("about.licensefulltext")}</Link></Typography>
+				<Typography><Link href="https://github.com/allgood/ticketz">{i18n.t("about.licensesourcecode")}</Link></Typography>
+			</Paper>
+		</MainContainer>
+	);
+};
+
+export default About;
diff --git a/frontend/src/pages/Login/index.js b/frontend/src/pages/Login/index.js
@@ -14,7 +14,7 @@ import Container from "@material-ui/core/Container";
 import { i18n } from "../../translate/i18n";
 
 import { AuthContext } from "../../context/Auth/AuthContext";
-import logo from "../../assets/logo.png";
+import logo from "../../assets/vector/logo.svg";
 
 
 const Copyright = () => {
@@ -34,8 +34,7 @@ const useStyles = makeStyles(theme => ({
 	root: {
 		width: "100vw",
 		height: "100vh",
-		//background: "linear-gradient(to right, #76EE00 , #76EE00 , #458B00)",
-		backgroundImage: "url(https://equipechat.com/imagens/equipechat.jpg)",
+		background: "linear-gradient(to right, #ffffff , #cfcfff , #0000ff)",
 		backgroundRepeat: "no-repeat",
 		backgroundSize: "100% 100%",
 		backgroundPosition: "center",

diff --git a/frontend/src/pages/Signup/index.js b/frontend/src/pages/Signup/index.js
@@ -24,7 +24,7 @@ import LockOutlinedIcon from "@material-ui/icons/LockOutlined";
 import Typography from "@material-ui/core/Typography";
 import { makeStyles } from "@material-ui/core/styles";
 import Container from "@material-ui/core/Container";
-import logo from "../../assets/logo.png";
+import logo from "../../assets/vector/logo.svg";
 import { i18n } from "../../translate/i18n";
 
 import { openApi } from "../../services/api";

diff --git a/frontend/src/routes/index.js b/frontend/src/routes/index.js
@@ -16,6 +16,7 @@ import Queues from "../pages/Queues/";
 import Tags from "../pages/Tags/";
 import MessagesAPI from "../pages/MessagesAPI/";
 import Helps from "../pages/Helps/";
+import About from "../pages/About/";
 import ContactLists from "../pages/ContactLists/";
 import ContactListItems from "../pages/ContactListItems/";
 // import Companies from "../pages/Companies/";
@@ -90,6 +91,7 @@ const Routes = () => {
                 <Route exact path="/tags" component={Tags} isPrivate />
                 <Route exact path="/contacts" component={Contacts} isPrivate />
                 <Route exact path="/helps" component={Helps} isPrivate />
+                <Route exact path="/about" component={About} isPrivate />
                 <Route exact path="/users" component={Users} isPrivate />
                 <Route
                   exact