Merge branch 'main' into improvement/adm-nvbr

GreenGen72 · Jun 4, 2024 · c117291 · c117291
2 parents 70e5880 + a069e96
commit c117291
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/src/components/categoria/listaCategoria/ListaCategoria.tsx b/src/components/categoria/listaCategoria/ListaCategoria.tsx
@@ -1,4 +1,4 @@
-import { useContext, useEffect, useState } from "react";
+import { useContext, useEffect, useRef, useState } from "react";
 import { Triangle } from "react-loader-spinner";
 import { useNavigate } from "react-router-dom";
 import { AuthContext } from "../../../contexts/AuthContext";
@@ -9,6 +9,7 @@ import { toastAlerta } from "../../../utils/toastAlerta";
 
 function ListaCategoria() {
   const [categoria, setCategoria] = useState<Categoria[]>([]);
+  const alertShown = useRef(false);
 
   const navigate = useNavigate();
 
@@ -30,8 +31,13 @@ function ListaCategoria() {
 
   useEffect(() => {
     if (token === "") {
+      if (!alertShown.current) {
       toastAlerta("Você precisa estar logado", "erro");
+      alertShown.current = true;
+      }
       navigate("/login");
+    } else {
+      buscarCategoria();
     }
   }, [token]);
 

diff --git a/src/pages/contato/Contato.tsx b/src/pages/contato/Contato.tsx
@@ -19,7 +19,7 @@ const ContactPage = () => {
   };
 
   const handlePhoneChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const phoneValue = e.target.value.replace(/\D/g, ""); // Remove todos os caracteres não numéricos
+    const phoneValue = e.target.value.replace(/\D/g, "");
     let formattedPhone = "";
 
     if (phoneValue.length <= 11) {
@@ -77,6 +77,7 @@ const ContactPage = () => {
           Entre em Contato
         </h1>
         <p className="text-3x1 text-left text-primary font-semibold">Mande uma mensagem para a gente!</p>
+
         <form onSubmit={handleSubmit} className="">
           <div>
             <label htmlFor="name" className="block text-gray-700">
@@ -90,7 +91,7 @@ const ContactPage = () => {
               value={formData.name}
               onChange={handleChange}
               required
-              className="border-2 border-b-primary rounded p-2 focus:border-2  focus:border-b-accent placeholder-gray-400 text-black w-full"
+              className="border-2 border-b-primary rounded p-2 focus:outline-none placeholder-gray-400 text-black w-full"
             />
           </div>
           <div>
@@ -101,11 +102,11 @@ const ContactPage = () => {
               type="email"
               id="email"
               name="email"
-              placeholder="E-mail"
+              placeholder=""
               value={formData.email}
               onChange={handleEmailChange}
               required
-              className="border-2 border-b-primary rounded p-2 focus:border-2  focus:border-b-accent placeholder-gray-400 text-black w-full"
+              className="border-2 border-b-primary rounded p-2 focus:outline-none placeholder-gray-400 text-black w-full"
             />
           </div>
           <div>
@@ -119,10 +120,10 @@ const ContactPage = () => {
               value={formData.phone}
               onChange={handlePhoneChange}
               required
-              className="border-2  border-b-primary  p-2 focus:border-2  focus:border-b-accent placeholder-gray-400 text-black w-full"
+              className="border-2  border-b-primary  p-2 focus:outline-none placeholder-gray-400 text-black w-full"
             />
           </div>
-          <div>
+          <div className="">
             <label htmlFor="message" className="block text-gray-700">
               Mensagem:
             </label>
@@ -133,7 +134,7 @@ const ContactPage = () => {
               value={formData.message}
               onChange={handleChange}
               required
-              className="border-2 border-b-primary rounded p-2 focus:border-2 bg-transparent focus:border-b-accent placeholder-gray-400 text-black w-full"
+              className="border-2 border-b-primary rounded p-2 focus:outline-none bg-transparent placeholder-gray-400 text-black w-full"
               style={{ minHeight: "150px" }}
             ></textarea>
           </div>

diff --git a/src/pages/login/Login.tsx b/src/pages/login/Login.tsx
@@ -99,7 +99,7 @@ function Login() {
               name="usuario"
               autoComplete="on"
               placeholder="E-mail"
-              className="font-light border-slate  border-b-2 p-2 bg-white placeholder-primary border-0 text-primary w-full  focus:border-primary focus:ring-0 !outline-none "
+              className="font-light border-slate border-b-2 p-2 bg-white placeholder-primary border-0 text-primary w-full  focus:border-primary focus:ring-0 !outline-none "
               value={usuarioLogin.usuario}
               onChange={(e: ChangeEvent<HTMLInputElement>) =>
                 atualizarEstado(e)