From f80cc24adf4d190a8e4564976f1459409a6a62e6 Mon Sep 17 00:00:00 2001 From: Antonio Emerson Date: Fri, 5 Aug 2022 01:27:10 -0300 Subject: [PATCH 1/5] up --- src/components/Category/index.tsx | 4 +- src/components/MenuHeader/index.tsx | 2 +- src/pages/MenuPage/index.tsx | 30 ++++++- src/pages/login/index.tsx | 118 +++++++++++++++++----------- src/pages/menu/index.tsx | 43 +++++++--- src/routes/index.tsx | 4 +- 6 files changed, 139 insertions(+), 62 deletions(-) diff --git a/src/components/Category/index.tsx b/src/components/Category/index.tsx index 1b419a7..94e9792 100644 --- a/src/components/Category/index.tsx +++ b/src/components/Category/index.tsx @@ -47,7 +47,7 @@ export default function Category() {

Categorias

-
+
{cards.map((card) => ( +
+ +
+ +
+
+
); diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx index ad97144..1c55609 100644 --- a/src/pages/login/index.tsx +++ b/src/pages/login/index.tsx @@ -1,55 +1,78 @@ -import { FormEvent, useCallback, useState, useContext } from 'react'; -import { Link, useNavigate } from 'react-router-dom'; -import { AuthContext } from '../../contexts/Auth/AuthLogin/AuthContext'; -import { IFormInputs } from '../../types'; -import Logo from '../../assets/images/logo.png'; +import { FormEvent, useCallback, useState, useContext } from "react"; +import { Link, useNavigate } from "react-router-dom"; +import { AuthContext } from "../../contexts/Auth/AuthLogin/AuthContext"; + +import api from "../../services/api"; +import Logo from "../../assets/images/logo.png"; + +interface IFormInputs { + email: string; + password: string; +} export default function Login() { const [formData, setFormData] = useState({ - email: '', - senha: '', + email: "", + password: "", }); + const auth = useContext(AuthContext); const navigate = useNavigate(); - const handleFormSubmit = useCallback(async (event: FormEvent) => { - event.preventDefault() - const { email, senha } = formData; - const isLogged = await auth.signin(email, senha) - if (email && senha) { - if (isLogged) { - navigate('/'); - return true; + + const handleFormSubmit = useCallback( + async (event: FormEvent) => { + const { email, password } = formData; + + if (email && password) { + const isLogged = await auth.signin(email, password); + if (isLogged) { + navigate("/"); + } else { + alert("Email ou senha incorreto."); + } } - return false - } - }, [formData]); + + const data = { + email, + password, + }; + await api.post("/api/login", data); + console.log(data); + }, + [formData] + ); return ( - <> -
-
- Logo + +
+
+ Logo
- -

+ +

Entrar na Conta

-
+ +
+ setFormData({ ...formData, email: e.target.value })} + type="email" + required + placeholder="Digite seu e-mail" + id="email" + className="box-border w-full rounded-[5px] border border-royalblue py-2 pl-2 pr-2 mb-3 text-sm" + onChange={(e) => + setFormData({ ...formData, email: e.target.value }) + } />
+
+ setFormData({ ...formData, senha: e.target.value })} + type="password" + required + placeholder="Digite sua senha" + id="password" + autoComplete="current-password" + className="w-full rounded-[5px] border border-royalblue py-2 pl-2 pr-2 mb-6 text-sm" + onChange={(e) => + setFormData({ ...formData, password: e.target.value }) + } />
-
+
- + ); } \ No newline at end of file diff --git a/src/pages/menu/index.tsx b/src/pages/menu/index.tsx index 89f57c3..c690a89 100644 --- a/src/pages/menu/index.tsx +++ b/src/pages/menu/index.tsx @@ -1,12 +1,37 @@ - +import Item from "../../components/Item"; +import imgPen from "../../assets/icons/pen.png"; +import { SubCategory } from "../../components/Subcategory"; import Category from "../../components/Category"; +import MenuHeader from "../../components/MenuHeader"; +import { ButtonDelete } from "../../components/Delete"; + +export default function Menu() { + return ( +
+ + +
-export default function MenuPage(){ - return( - <> - - - - - ) + +
+

+ Nome da Categoria +

+ +
+ +
+ +
+
+ +
+
+ ); } \ No newline at end of file diff --git a/src/routes/index.tsx b/src/routes/index.tsx index 233399e..7fa5c34 100644 --- a/src/routes/index.tsx +++ b/src/routes/index.tsx @@ -1,12 +1,12 @@ import { Routes, Route, Link } from "react-router-dom"; -import MenuHeader from "../components/MenuHeader"; import Home from "../pages/homepage"; import Login from "../pages/login"; import SecondStablishmentSignup from "../pages/secondStablishmentSignup"; import Signup from "../pages/signup"; import SuccessfulRegistration from "../pages/successfulRegistration"; -import MenuPage from "../pages/menu"; + import { RequireAuth } from "../contexts/Auth/AuthLogin/RequireAuth"; +import MenuPage from "../pages/MenuPage"; export default function RoutesComponent() { return ( From d0dd70207a6f5bb628a891c0635b2b81fb99526c Mon Sep 17 00:00:00 2001 From: Antonio Emerson Date: Fri, 5 Aug 2022 01:55:31 -0300 Subject: [PATCH 2/5] add --- src/components/Category/index.tsx | 4 ++-- src/components/MenuHeader/index.tsx | 4 ++-- src/components/avatar/index.tsx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/Category/index.tsx b/src/components/Category/index.tsx index 8db5cd4..1ba8d93 100644 --- a/src/components/Category/index.tsx +++ b/src/components/Category/index.tsx @@ -2,11 +2,11 @@ import Edit from "../../assets/icons/edit.png"; import Editsub from "../../assets/icons/editsub.png"; import Drop from "../../assets/icons/drop.png"; -import Plus from "../../assets/icons/sum.png"; + import trash from "../../assets/icons/trash-white.png"; import imgSum from "../../assets/icons/sum-yellowbig.png"; import imgSumy from "../../assets/icons/sum-yellow.png"; -import Plus from "../../assets/icons/Vector.png"; +import Plus from "../../assets/icons/sum.png"; import { useRef, useState } from "react"; import { useForm, SubmitHandler } from "react-hook-form"; import NewItemModal from "../NewItemModal"; diff --git a/src/components/MenuHeader/index.tsx b/src/components/MenuHeader/index.tsx index 3a12517..9c3b130 100644 --- a/src/components/MenuHeader/index.tsx +++ b/src/components/MenuHeader/index.tsx @@ -1,6 +1,6 @@ import { useState } from "react"; -import Avatar from "../avatar"; +import Avatar from "../Avatar"; import { SubmitHandler, useForm} from "react-hook-form"; interface IMenuFormValues{ @@ -26,7 +26,7 @@ export default function MenuHeader() {
- + Date: Fri, 5 Aug 2022 10:38:37 -0300 Subject: [PATCH 3/5] css ajustado --- src/components/Category/index.tsx | 35 +++++++++++++++------------- src/components/MenuHeader/index.tsx | 2 +- src/components/Subcategory/index.tsx | 2 +- src/pages/MenuPage/index.tsx | 22 +++-------------- src/pages/menu/index.tsx | 4 +--- 5 files changed, 25 insertions(+), 40 deletions(-) diff --git a/src/components/Category/index.tsx b/src/components/Category/index.tsx index 9dc8490..30c931d 100644 --- a/src/components/Category/index.tsx +++ b/src/components/Category/index.tsx @@ -2,7 +2,7 @@ import Edit from "../../assets/icons/edit.png"; import Editsub from "../../assets/icons/editsub.png"; import Drop from "../../assets/icons/drop.png"; -import Plus from "../../assets/icons/sum.png"; +import Plus from "../../assets/icons/sum-yellow.png"; import trash from "../../assets/icons/trash-white.png"; import imgSum from "../../assets/icons/sum-yellowbig.png"; import imgSumy from "../../assets/icons/sum-yellow.png"; @@ -39,12 +39,12 @@ export default function Category() { return ( <> -
-

Categorias

+
+

Categorias

-
+
{cards.map((card) => ( - @@ -54,17 +54,17 @@ export default function Category() { className="bg-[#001B42] shadow-md flex w-full max-w-[160px] rounded-lg p-[30px] gap-1 items-center object-cover " > - + Adicionar Categorias{" "} - +
-
+
setEstablishmentName(e.target.value)} @@ -75,12 +75,12 @@ export default function Category() {
-
+
{subcards.map((subcard) => ( -
-
+
+
+ + +