Merge pull request #86 from GreenGen72/improvement/pg-cadastro

💄 atualizando pg de cadastro ... em processo
GreenGen72 · Jun 6, 2024 · 2c0e4cc · 2c0e4cc
2 parents 9fed934 + 6fce16b
commit 2c0e4cc
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 32 deletions.
diff --git a/src/assets/Star.svg b/src/assets/Star.svg
diff --git a/src/assets/Verified.svg b/src/assets/Verified.svg
diff --git a/src/components/navbar/Navbar.tsx b/src/components/navbar/Navbar.tsx
@@ -3,7 +3,7 @@ import { Link, useNavigate } from "react-router-dom";
 import { AuthContext } from "../../contexts/AuthContext";
 import { toastAlerta } from "../../utils/toastAlerta";
 import LogoGreenGen from "../../assets/logo_greengen.svg";
-import Star from "../../assets/Star.svg";
+import Verified from "../../assets/Verified.svg";
 import wpIcon from "../../assets/logos_whatsapp-icon.svg";
 import userIconNB from "../../assets/user_icon_nb.svg";
 import userIconNBDB from "../../assets/user_icon_nb_dd.svg";
@@ -12,8 +12,6 @@ import shoppingCartIconNB from "../../assets/shopping_cart_icon.svg";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faSearch } from "@fortawesome/free-solid-svg-icons/faSearch";
 import { CartContext } from "../../contexts/CartContext";
-
-
 import Avatar from "../avatar/Avatar";
 
 function Navbar() {
@@ -74,7 +72,7 @@ function Navbar() {
               <Avatar foto={usuario.foto} bordercolour="white" size="small" />
             <ul className="grid justify-items-start">
 
-              <li className="text-sm text-white font-light">Olá, </li><li className="flex text-sm text-white font-bold">{usuario.nome.split(" ")[0].length > 24 ? usuario.nome.replace(/(.{24})..+/, "$1...") : usuario.nome.split(" ")[0]}!{isAdmin && (<p className="text-accent font-light italic">(Admin)</p>)}{isAdmin && ( <img src={Star} alt="" /> )}</li>
+              <li className="text-sm text-white font-light">Olá, </li><li className="flex text-sm text-white font-bold gap-2">{usuario.nome.split(" ")[0].length > 24 ? usuario.nome.replace(/(.{24})..+/, "$1...") : usuario.nome.split(" ")[0]}!{isAdmin && (<p className="text-accent font-light italic">(Admin)</p>)}{isAdmin && ( <img src={Verified} alt="" /> )}</li>
             </ul>
             </div>
             <ul

diff --git a/src/pages/register/Register.tsx b/src/pages/register/Register.tsx
@@ -91,7 +91,7 @@ function Register() {
                 id="nome"
                 name="nome"
                 placeholder="Nome"
-                className="border-2 border-slate-700 rounded p-2 bg-white placeholder-gray-400 text-black w-full"
+                className="font-light border-secondary border-b-2 p-2 bg-white placeholder-primary border-0 text-primary w-full  focus:border-primary focus:ring-0 !outline-none "
                 value={usuario.nome}
                 onChange={(e: ChangeEvent<HTMLInputElement>) =>
                   atualizarEstado(e)
@@ -104,8 +104,8 @@ function Register() {
                 type="text"
                 id="usuario"
                 name="usuario"
-                placeholder="Usuario"
-                className="border-2 border-slate-700 rounded p-2 bg-white placeholder-gray-400 text-black w-full"
+                placeholder="Digite seu e-mail"
+                className="font-light border-secondary border-b-2 p-2 bg-white placeholder-primary border-0 text-primary w-full  focus:border-primary focus:ring-0 !outline-none "
                 value={usuario.usuario}
                 onChange={(e: ChangeEvent<HTMLInputElement>) =>
                   atualizarEstado(e)
@@ -118,8 +118,8 @@ function Register() {
                 type="text"
                 id="foto"
                 name="foto"
-                placeholder="Foto"
-                className="border-2 border-slate-700 rounded p-2 bg-white placeholder-gray-400 text-black w-full"
+                placeholder="Cole o link da sua foto aqui"
+                className="font-light border-secondary border-b-2 p-2 bg-white placeholder-primary border-0 text-primary w-full  focus:border-primary focus:ring-0 !outline-none "
                 value={usuario.foto}
                 onChange={(e: ChangeEvent<HTMLInputElement>) =>
                   atualizarEstado(e)
@@ -133,7 +133,7 @@ function Register() {
                 id="senha"
                 name="senha"
                 placeholder="Senha"
-                className="border-2 border-slate-700 rounded p-2 bg-white placeholder-gray-400 text-black w-full"
+                className="font-light border-secondary border-b-2 p-2 bg-white placeholder-primary border-0 text-primary w-full  focus:border-primary focus:ring-0 !outline-none "
                 value={usuario.senha}
                 onChange={(e: ChangeEvent<HTMLInputElement>) =>
                   atualizarEstado(e)
@@ -147,7 +147,7 @@ function Register() {
                 id="confirmarSenha"
                 name="confirmarSenha"
                 placeholder="Confirmar Senha"
-                className="border-2 border-slate-700 rounded p-2 bg-white placeholder-gray-400 text-black w-full"
+                className="font-light border-secondary border-b-2 p-2 bg-white placeholder-primary border-0 text-primary w-full  focus:border-primary focus:ring-0 !outline-none "
                 value={confirmaSenha}
                 onChange={(e: ChangeEvent<HTMLInputElement>) =>
                   handleConfirmarSenha(e)
@@ -164,11 +164,11 @@ function Register() {
 
             </div>
             <hr className="border-slate-800 w-full" />
-            <p>
+            <p className="font-light">
             Já tem uma conta?{" "}
             <Link
               to="/login"
-              className="text-green-700 hover:text-green-800"
+              className="font-bold text-secondary hover:text-primary"
             >
               Logue agora!
             </Link>